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-02-12 05:49:00 +01:00
parent 40de5fa75f
commit 56767ad31a
6 changed files with 6 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=Window Manager Effects
Name[ca]=Efectes del gestor de finestres Name[ca]=Efectes del gestor de finestres
Name[ca@valencia]=Efectes del gestor de finestres Name[ca@valencia]=Efectes del gestor de finestres
Name[da]=Vindueshåndteringseffekter
Name[de]=Fensterverwaltungs-Effekte Name[de]=Fensterverwaltungs-Effekte
Name[el]=Εφέ διαχειριστή παραθύρων Name[el]=Εφέ διαχειριστή παραθύρων
Name[en_GB]=Window Manager Effects Name[en_GB]=Window Manager Effects

1
kcmkwin/kwinscripts/kwinscripts.knsrc
View file

@ -2,6 +2,7 @@
Name=Window Manager Scripts Name=Window Manager Scripts
Name[ca]=Scripts del gestor de finestres Name[ca]=Scripts del gestor de finestres
Name[ca@valencia]=Scripts del gestor de finestres Name[ca@valencia]=Scripts del gestor de finestres
Name[da]=Vindueshåndteringsscripts
Name[de]=Fensterverwaltungs-Skripte Name[de]=Fensterverwaltungs-Skripte
Name[el]=Σενάρια διαχειριστή παραθύρων Name[el]=Σενάρια διαχειριστή παραθύρων
Name[en_GB]=Window Manager Scripts Name[en_GB]=Window Manager Scripts

1
kcmkwin/kwintabbox/kwinswitcher.knsrc
View file

@ -2,6 +2,7 @@
Name=Window Manager Switching Layouts Name=Window Manager Switching Layouts
Name[ca]=Disposicions del commutador del gestor de finestres Name[ca]=Disposicions del commutador del gestor de finestres
Name[ca@valencia]=Disposicions del commutador del gestor de finestres Name[ca@valencia]=Disposicions del commutador del gestor de finestres
Name[da]=Skifterlayouts til vindueshåndtering
Name[de]=Wechsel-Layout für Fensterverwaltung Name[de]=Wechsel-Layout für Fensterverwaltung
Name[el]=Διατάξεις εναλλαγής διαχειριστή παραθύρων Name[el]=Διατάξεις εναλλαγής διαχειριστή παραθύρων
Name[en_GB]=Window Manager Switching Layouts Name[en_GB]=Window Manager Switching Layouts

1
packageplugins/scripts/kwin-packagestructure-scripts.desktop
View file

@ -2,6 +2,7 @@
Name=KWin Script Name=KWin Script
Name[ca]=Script del KWin Name[ca]=Script del KWin
Name[ca@valencia]=Script del KWin Name[ca@valencia]=Script del KWin
Name[da]=KWin-script
Name[el]=Σενάριο KWin Name[el]=Σενάριο KWin
Name[en_GB]=KWin Script Name[en_GB]=KWin Script
Name[es]=Guion de KWin Name[es]=Guion de KWin

1
packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop
View file

@ -2,6 +2,7 @@
Name=KWin Window Switcher Name=KWin Window Switcher
Name[ca]=Commutador de finestres del KWin Name[ca]=Commutador de finestres del KWin
Name[ca@valencia]=Commutador de finestres del KWin Name[ca@valencia]=Commutador de finestres del KWin
Name[da]=KWin vinduesskifter
Name[el]=Εφαρμογή εναλλαγής παραθύρων Kwin Name[el]=Εφαρμογή εναλλαγής παραθύρων Kwin
Name[en_GB]=KWin Window Switcher Name[en_GB]=KWin Window Switcher
Name[es]=Cambiador de ventanas de KWin Name[es]=Cambiador de ventanas de KWin

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

@ -2,6 +2,7 @@
Name=Aurorae Window Decorations Name=Aurorae Window Decorations
Name[ca]=Decoracions de finestra Aurorae Name[ca]=Decoracions de finestra Aurorae
Name[ca@valencia]=Decoracions de finestra Aurorae Name[ca@valencia]=Decoracions de finestra Aurorae
Name[da]=Aurorae vinduesdekorationer
Name[de]=Aurorae-Fensterdekoration Name[de]=Aurorae-Fensterdekoration
Name[el]=Διακοσμήσεις παραθύρου Aurorae Name[el]=Διακοσμήσεις παραθύρου Aurorae
Name[en_GB]=Aurorae Window Decorations Name[en_GB]=Aurorae Window Decorations