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"
2018-10-07 06:07:19 +02:00 · 2018-10-07 06:07:19 +02:00 · c244ee5e3e
commit c244ee5e3e
parent cefc15e573
3 changed files with 4 additions and 0 deletions
--- a/effects/scale/scale_config.desktop
+++ b/effects/scale/scale_config.desktop
@ -22,6 +22,7 @@ Name[nn]=Skalering
 Name[pl]=Skala
 Name[pt]=Escala
 Name[pt_BR]=Escala
+Name[ru]=Масштабирование
 Name[sk]=Škálovať
 Name[sv]=Skala
 Name[uk]=Масштабування
--- a/effects/showpaint/showpaint_config.desktop
+++ b/effects/showpaint/showpaint_config.desktop
@ -33,6 +33,7 @@ Name[hne]=पेंट देखाव
 Name[hr]=Prikaz nedavnih promjena
 Name[hu]=Megmutatja a kirajzolt területeket
 Name[ia]=Monstra pictura
+Name[id]=Show Paint
 Name[is]=Sýna teikningu
 Name[it]=Mostra il ridisegno
 Name[kk]=Бояулау
--- a/packageplugins/effect/kwin-packagestructure-effect.desktop
+++ b/packageplugins/effect/kwin-packagestructure-effect.desktop
@ -3,10 +3,12 @@ Name=KWin Effect
 Name[ca]=Efecte del KWin
 Name[ca@valencia]=Efecte del KWin
 Name[es]=Efecto de KWin
+Name[id]=KWin Effect
 Name[it]=Effetto di KWin
 Name[nl]=KWin-effect
 Name[pt]=Efeito do KWin
 Name[pt_BR]=Efeito do KWin
+Name[ru]=Эффект диспетчера окон
 Name[sv]=Kwin-effekt
 Name[uk]=Ефект KWin
 Name[x-test]=xxKWin Effectxx