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-27 12:44:11 +01:00
parent 4d669b1912
commit 2b51b85aa1
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,11 +1,17 @@
[KNewStuff3]
Name=Window Manager Effects
Name[ca]=Efectes del gestor de finestres
Name[en_GB]=Window Manager Effects
Name[es]=Efectos del gestor de ventanas
Name[it]=Effetti del gestore delle finestre
Name[nl]=Effecten van vensterbeheerder
Name[pl]=Efekty zarządzania oknami
Name[pt]=Efeitos do Gestor de Janelas
Name[sk]=Efekty správcu okien
Name[sr]=Ефекти менаџера прозора
Name[sr@ijekavian]=Ефекти менаџера прозора
Name[sr@ijekavianlatin]=Efekti menadžera prozora
Name[sr@latin]=Efekti menadžera prozora
Name[sv]=Fönsterhanteringseffekter
Name[uk]=Ефекти засобу керування вікнами
Name[x-test]=xxWindow Manager Effectsxx

6
kcmkwin/kwinscripts/kwinscripts.knsrc
View file

@ -1,11 +1,17 @@
[KNewStuff3]
Name=Window Manager Scripts
Name[ca]=Scripts del gestor de finestres
Name[en_GB]=Window Manager Scripts
Name[es]=Guiones del gestor de ventanas
Name[it]=Script del gestore delle finestre
Name[nl]=Scripts van vensterbeheerder
Name[pl]=Skrypty zarządzania oknami
Name[pt]=Programas do Gestor de Janelas
Name[sk]=Skripty správcu okien
Name[sr]=Скрипте менаџера прозора
Name[sr@ijekavian]=Скрипте менаџера прозора
Name[sr@ijekavianlatin]=Skripte menadžera prozora
Name[sr@latin]=Skripte menadžera prozora
Name[sv]=Fönsterhanteringsskript
Name[uk]=Скрипти засобу керування вікнами
Name[x-test]=xxWindow Manager Scriptsxx

6
kcmkwin/kwintabbox/kwinswitcher.knsrc
View file

@ -1,11 +1,17 @@
[KNewStuff3]
Name=Window Manager Switching Layouts
Name[ca]=Disposicions del commutador del gestor de finestres
Name[en_GB]=Window Manager Switching Layouts
Name[es]=Esquemas de cambio del gestor de ventanas
Name[it]=Disposizione scambiafinestre del gestore delle finestre
Name[nl]=Omschakelende indelingen van vensterbeheerder
Name[pl]=Układ przełączania zarządzana oknami
Name[pt]=Disposições da Mudança de Janelas do KWin
Name[sk]=Prepínanie rozložení správcu okien
Name[sr]=Распореди пребацивања менаџера прозора
Name[sr@ijekavian]=Распореди пребацивања менаџера прозора
Name[sr@ijekavianlatin]=Rasporedi prebacivanja menadžera prozora
Name[sr@latin]=Rasporedi prebacivanja menadžera prozora
Name[sv]=Fönsterbyteslayouter
Name[uk]=Компонування засобу перемикання вікон
Name[x-test]=xxWindow Manager Switching Layoutsxx

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

@ -1,11 +1,17 @@
[KNewStuff3]
Name=Aurorae Window Decorations
Name[ca]=Decoracions de finestra Aurorae
Name[en_GB]=Aurorae Window Decorations
Name[es]=Decoración de ventanas Aurorae
Name[it]=Decorazioni delle finestre Aurorae
Name[nl]=Aurorea-vensterdecoraties
Name[pl]=Ozdoby okienne Aurorae
Name[pt]=Decorações das Janelas do Aurorae
Name[sk]=Dekorácie okien Aurorae
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[uk]=Обрамлення вікон Aurorae
Name[x-test]=xxAurorae Window Decorationsxx