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 2017-12-10 04:43:39 +01:00
parent 1d3d4b1013
commit c9023582aa
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/logout/package/metadata.desktop
View file

@ -31,7 +31,7 @@ Name[sr@ijekavianlatin]=Odjava
Name[sr@latin]=Odjava Name[sr@latin]=Odjava
Name[sv]=utloggning Name[sv]=utloggning
Name[tr]=çıkış yap Name[tr]=çıkış yap
Name[uk]=вихід Name[uk]=Вихід
Name[x-test]=xxlogoutxx Name[x-test]=xxlogoutxx
Name[zh_CN]=注销 Name[zh_CN]=注销
Name[zh_TW]=登出 Name[zh_TW]=登出