yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
This commit is contained in:
l10n daemon script 2018-05-19 08:07:27 +02:00
parent 57178b2b98
commit ee0c1c4de2
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
effects/slide/slide_config.desktop
View file

@ -67,5 +67,5 @@ Name[ug]=تام تەسۋىر
Name[uk]=Ковзання Name[uk]=Ковзання
Name[wa]=Rider Name[wa]=Rider
Name[x-test]=xxSlidexx Name[x-test]=xxSlidexx
Name[zh_CN]=滑行 Name[zh_CN]=滑动
Name[zh_TW]=滑動 Name[zh_TW]=滑動