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"
9 years ago · f22a9b5fe8
parent 04ed182cf1
commit f22a9b5fe8
2 changed files with 2 additions and 0 deletions
--- a/components/shellprivate/widgetexplorer/plasmoids.knsrc
+++ b/components/shellprivate/widgetexplorer/plasmoids.knsrc
@ -2,6 +2,7 @@
 Name=Plasma Widgets
 Name[ca]=Estris del Plasma
 Name[ca@valencia]=Estris del Plasma
+Name[de]=Plasma-Miniprogramme
 Name[en_GB]=Plasma Widgets
 Name[es]=Elementos gráficos de Plasma
 Name[it]=Oggetti di Plasma
--- a/wallpapers/image/wallpaper.knsrc
+++ b/wallpapers/image/wallpaper.knsrc
@ -2,6 +2,7 @@
 Name=Wallpapers
 Name[ca]=Fons d'escriptori
 Name[ca@valencia]=Fons d'escriptori
+Name[de]=Hintergrundbilder
 Name[en_GB]=Wallpapers
 Name[es]=Fondos del escritorio
 Name[it]=Sfondi