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-03-23 04:15:34 +01:00
parent d491ee79e3
commit 9681ae6849
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packageplugins/aurorae/kwin-packagestructure-aurorae.desktop
View file

@ -7,7 +7,7 @@ Name[es]=Aurorae de KWin
Name[hu]=KWin Aurorae
Name[nl]=KWin Aurorae
Name[pt]=Aurora do KWin
Name[sv]=Kwin-aurora
Name[sv]=Kwin Aurora
Name[uk]=KWin Aurorae
Name[x-test]=xxKWin Auroraexx
Name[zh_CN]=KWin 极光

2
plugins/kdecorations/aurorae/src/aurorae.knsrc
View file

@ -21,7 +21,7 @@ Name[sr]=Декорације прозора за Ауроре
Name[sr@ijekavian]=Декорације прозора за Ауроре
Name[sr@ijekavianlatin]=Dekoracije prozora za Aurore
Name[sr@latin]=Dekoracije prozora za Aurore
Name[sv]=Aurorae-fönsterdekorationer
Name[sv]=Aurora-fönsterdekorationer
Name[uk]=Обрамлення вікон Aurorae
Name[x-test]=xxAurorae Window Decorationsxx
Name[zh_CN]=Aurorae 窗口装饰