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-01-09 06:04:42 +01:00
parent 006d127b09
commit e322a025f0
3 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
kcmkwin/kwincompositing/kwineffect.knsrc
View file

@ -2,6 +2,7 @@
Name=Window Manager Effects
Name[ca]=Efectes del gestor de finestres
Name[ca@valencia]=Efectes del gestor de finestres
Name[de]=Fensterverwaltungs-Effekte
Name[en_GB]=Window Manager Effects
Name[es]=Efectos del gestor de ventanas
Name[ia]=Gerente de effectos de fenestra

1
kcmkwin/kwinscripts/kwinscripts.knsrc
View file

@ -2,6 +2,7 @@
Name=Window Manager Scripts
Name[ca]=Scripts del gestor de finestres
Name[ca@valencia]=Scripts del gestor de finestres
Name[de]=Fensterverwaltungs-Skripte
Name[en_GB]=Window Manager Scripts
Name[es]=Guiones del gestor de ventanas
Name[ia]=Gerente de scripts de fenestra

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

@ -2,6 +2,7 @@
Name=Aurorae Window Decorations
Name[ca]=Decoracions de finestra Aurorae
Name[ca@valencia]=Decoracions de finestra Aurorae
Name[de]=Aurorae-Fensterdekoration
Name[en_GB]=Aurorae Window Decorations
Name[es]=Decoración de ventanas Aurorae
Name[ia]=Decorationes de fenestra Aurorae