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-13 05:59:44 +02:00 · 2017-05-13 05:59:44 +02:00 · 2281bd19d8
parent 6a4e9cbb58
commit 2281bd19d8
1 changed files with 1 additions and 0 deletions
--- a/kcmkwin/kwinscreenedges/kwintouchscreen.desktop
+++ b/kcmkwin/kwinscreenedges/kwintouchscreen.desktop
@ -14,6 +14,7 @@ Name=Touch Screen
 Name[ca]=Pantalla tàctil
 Name[ca@valencia]=Pantalla tàctil
 Name[cs]=Dotyková obrazovka
+Name[de]=Touchscreen
 Name[es]=Pantalla táctil
 Name[it]=Schermo a sfioramento
 Name[nl]=Aanraakscherm