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

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"
icc-effect-5.14.5
l10n daemon script 2016-12-29 14:44:24 +01:00
parent 58361213de
commit d523c91fc4
4 changed files with 4 additions and 0 deletions

View File

@ -1,6 +1,7 @@
[KNewStuff3]
Name=Window Manager Effects
Name[ca]=Efectes del gestor de finestres
Name[ca@valencia]=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

View File

@ -1,6 +1,7 @@
[KNewStuff3]
Name=Window Manager Scripts
Name[ca]=Scripts del gestor de finestres
Name[ca@valencia]=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

View File

@ -1,6 +1,7 @@
[KNewStuff3]
Name=Window Manager Switching Layouts
Name[ca]=Disposicions del commutador del gestor de finestres
Name[ca@valencia]=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

View File

@ -1,6 +1,7 @@
[KNewStuff3]
Name=Aurorae Window Decorations
Name[ca]=Decoracions de finestra Aurorae
Name[ca@valencia]=Decoracions de finestra Aurorae
Name[en_GB]=Aurorae Window Decorations
Name[es]=Decoración de ventanas Aurorae
Name[it]=Decorazioni delle finestre Aurorae