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-25 05:59:29 +01:00
parent d9e7498593
commit a18f055779
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

@ -3,6 +3,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[el]=Εφέ διαχειριστή παραθύρων
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

@ -3,6 +3,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[el]=Σενάρια διαχειριστή παραθύρων
Name[en_GB]=Window Manager Scripts
Name[es]=Guiones del gestor de ventanas
Name[ia]=Gerente de scripts de fenestra

1
kcmkwin/kwintabbox/kwinswitcher.knsrc
View file

@ -3,6 +3,7 @@ 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[de]=Wechsel-Layout für Fensterverwaltung
Name[el]=Διατάξεις εναλλαγής διαχειριστή παραθύρων
Name[en_GB]=Window Manager Switching Layouts
Name[es]=Esquemas de cambio del gestor de ventanas
Name[ia]=Disposition de commutator de gerente de fenestra

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

@ -2,6 +2,7 @@
Name=KWin Script
Name[ca]=Script del KWin
Name[ca@valencia]=Script del KWin
Name[el]=Σενάριο KWin
Name[en_GB]=KWin Script
Name[it]=Script di KWin
Name[ko]=KWin 스크립트

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

@ -2,6 +2,7 @@
Name=KWin Window Switcher
Name[ca]=Commutador de finestres del KWin
Name[ca@valencia]=Commutador de finestres del KWin
Name[el]=Εφαρμογή εναλλαγής παραθύρων Kwin
Name[en_GB]=KWin Window Switcher
Name[it]=Scambiafinestre di KWin
Name[ko]=KWin 창 전환기

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

@ -3,6 +3,7 @@ Name=Aurorae Window Decorations
Name[ca]=Decoracions de finestra Aurorae
Name[ca@valencia]=Decoracions de finestra Aurorae
Name[de]=Aurorae-Fensterdekoration
Name[el]=Διακοσμήσεις παραθύρου Aurorae
Name[en_GB]=Aurorae Window Decorations
Name[es]=Decoración de ventanas Aurorae
Name[ia]=Decorationes de fenestra Aurorae