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-06-25 05:43:31 +02:00 · 2017-06-25 05:43:31 +02:00 · 3deb48b252
commit 3deb48b252
parent 8765f5b4c3
2 changed files with 2 additions and 1 deletions
--- a/kcmkwin/kwinscreenedges/kwintouchscreen.desktop
+++ b/kcmkwin/kwinscreenedges/kwintouchscreen.desktop
@ -22,6 +22,7 @@ Name[eu]=Ukimen-pantaila
 Name[fi]=Kosketusnäyttö
 Name[he]=מסך מגע
 Name[it]=Schermo a sfioramento
+Name[lt]=Jutiklinis ekranas
 Name[nl]=Aanraakscherm
 Name[pl]=Ekran dotykowy
 Name[pt]=Ecrã Táctil
--- a/scripts/minimizeall/metadata.desktop
+++ b/scripts/minimizeall/metadata.desktop
@ -19,7 +19,7 @@ Name[ia]=MaximizaOmne
 Name[it]=Minimizza tutto
 Name[ja]=すべて最小化
 Name[ko]=모두최소화
-Name[lt]=SumažintiVisus
+Name[lt]=Sumažinti visus
 Name[nb]=Minimer alt
 Name[nl]=Alles-minimaliseren
 Name[nn]=Minimer alle