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"
2017-05-10 07:42:38 +02:00 · 2017-05-10 07:42:38 +02:00 · 9ad87d3909
commit 9ad87d3909
parent d15cb52682
7 changed files with 7 additions and 0 deletions
--- a/effects/logout/package/metadata.desktop
+++ b/effects/logout/package/metadata.desktop
@ -3,6 +3,7 @@ Name=logout
 Name[ca]=sortida
 Name[ca@valencia]=eixida
 Name[cs]=odhlášení
+Name[de]=Abmeldung
 Name[el]=αποσύνδεση
 Name[es]=cerrar la sesión
 Name[hu]=Kijelentkezés
--- a/kcmkwin/kwincompositing/kwineffect.knsrc
+++ b/kcmkwin/kwincompositing/kwineffect.knsrc
@ -8,6 +8,7 @@ Name[de]=Fensterverwaltungs-Effekte
 Name[el]=Εφέ διαχειριστή παραθύρων
 Name[en_GB]=Window Manager Effects
 Name[es]=Efectos del gestor de ventanas
+Name[fi]=Ikkunaohjelman tehosteet
 Name[hu]=Ablakkezelő-effektusok
 Name[ia]=Gerente de effectos de fenestra
 Name[it]=Effetti del gestore delle finestre
--- a/kcmkwin/kwinscripts/kwinscripts.knsrc
+++ b/kcmkwin/kwinscripts/kwinscripts.knsrc
@ -8,6 +8,7 @@ Name[de]=Fensterverwaltungs-Skripte
 Name[el]=Σενάρια διαχειριστή παραθύρων
 Name[en_GB]=Window Manager Scripts
 Name[es]=Guiones del gestor de ventanas
+Name[fi]=Ikkunaohjelman skriptit
 Name[hu]=Ablakkezelő szkriptek
 Name[ia]=Gerente de scripts de fenestra 
 Name[it]=Script del gestore delle finestre
--- a/kcmkwin/kwintabbox/kwinswitcher.knsrc
+++ b/kcmkwin/kwintabbox/kwinswitcher.knsrc
@ -8,6 +8,7 @@ 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[fi]=Ikkunaohjelman vaihdon asettelut
 Name[hu]=Ablakkezelő-váltó elrendezések
 Name[ia]=Disposition de commutator de gerente de fenestra
 Name[it]=Disposizione scambiafinestre del gestore delle finestre
--- a/packageplugins/aurorae/kwin-packagestructure-aurorae.desktop
+++ b/packageplugins/aurorae/kwin-packagestructure-aurorae.desktop
@ -3,6 +3,7 @@ Name=KWin Aurorae
 Name[ca]=Aurorae del KWin
 Name[ca@valencia]=Aurorae del KWin
 Name[cs]=KWin Aurorae
+Name[de]=KWin Aurorae
 Name[el]=KWin Aurorae
 Name[es]=Aurorae de KWin
 Name[hu]=KWin Aurorae
--- a/packageplugins/decoration/kwin-packagestructure-decoration.desktop
+++ b/packageplugins/decoration/kwin-packagestructure-decoration.desktop
@ -3,6 +3,7 @@ Name=KWin Decoration
 Name[ca]=Decoració del KWin
 Name[ca@valencia]=Decoració del KWin
 Name[cs]=Dekorace KWin
+Name[de]=KWin-Dekoration
 Name[el]=Διακοσμήσεις KWin
 Name[es]=Decoración de KWin
 Name[hu]=KWin dekoráció
--- a/plugins/kdecorations/aurorae/src/aurorae.knsrc
+++ b/plugins/kdecorations/aurorae/src/aurorae.knsrc
@ -8,6 +8,7 @@ Name[de]=Aurorae-Fensterdekoration
 Name[el]=Διακοσμήσεις παραθύρου Aurorae
 Name[en_GB]=Aurorae Window Decorations
 Name[es]=Decoración de ventanas Aurorae
+Name[fi]=Aurorae-ikkunakoristeet
 Name[hu]=Aurorae ablakdekorációk
 Name[ia]=Decorationes de fenestra Aurorae
 Name[it]=Decorazioni delle finestre Aurorae