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 2016-12-22 05:55:50 +01:00
parent 696ce96e9b
commit 1d622fbbc3
4 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
kcmkwin/kwincompositing/kwineffect.knsrc
View file

@ -1,5 +1,11 @@
[KNewStuff3]
Name=Window Manager Effects
Name[ca]=Efectes del gestor de finestres
Name[nl]=Effecten van vensterbeheerder
Name[pt]=Efeitos do Gestor de Janelas
Name[sv]=Fönsterhanteringseffekter
Name[uk]=Ефекти засобу керування вікнами
Name[x-test]=xxWindow Manager Effectsxx
ProvidersUrl=http://download.kde.org/ocs/providers.xml
Categories=KWin Effects

6
kcmkwin/kwinscripts/kwinscripts.knsrc
View file

@ -1,5 +1,11 @@
[KNewStuff3]
Name=Window Manager Scripts
Name[ca]=Scripts del gestor de finestres
Name[nl]=Scripts van vensterbeheerder
Name[pt]=Programas do Gestor de Janelas
Name[sv]=Fönsterhanteringsskript
Name[uk]=Скрипти засобу керування вікнами
Name[x-test]=xxWindow Manager Scriptsxx
ProvidersUrl=http://download.kde.org/ocs/providers.xml
Categories=KWin Scripts

6
kcmkwin/kwintabbox/kwinswitcher.knsrc
View file

@ -1,5 +1,11 @@
[KNewStuff3]
Name=Window Manager Switching Layouts
Name[ca]=Disposicions del commutador del gestor de finestres
Name[nl]=Omschakelende indelingen van vensterbeheerder
Name[pt]=Disposições da Mudança de Janelas do KWin
Name[sv]=Fönsterbyteslayouter
Name[uk]=Компонування засобу перемикання вікон
Name[x-test]=xxWindow Manager Switching Layoutsxx
ProvidersUrl=http://download.kde.org/ocs/providers.xml
Categories=KWin Switching Layouts

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

@ -1,5 +1,11 @@
[KNewStuff3]
Name=Aurorae Window Decorations
Name[ca]=Decoracions de finestra Aurorae
Name[nl]=Aurorea-vensterdecoraties
Name[pt]=Decorações das Janelas do Aurorae
Name[sv]=Aurorae-fönsterdekorationer
Name[uk]=Обрамлення вікон Aurorae
Name[x-test]=xxAurorae Window Decorationsxx
ProvidersUrl=http://download.kde.org/ocs/providers.xml
Categories=Window Decoration Aurorae