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"

indicators/default/metadata.desktop

@@ -1,5 +1,28 @@
 [Desktop Entry]
 Name=Latte
+Name[ca]=Latte
+Name[ca@valencia]=Latte
+Name[cs]=Latte
+Name[da]=Latte
+Name[de]=Latte
+Name[el]=Latte
+Name[en_GB]=Latte
+Name[es]=Latte
+Name[eu]=Latte
+Name[fi]=Latte
+Name[gl]=Latte
+Name[it]=Latte
+Name[nl]=Latte
+Name[nn]=Latte
+Name[pl]=Latte
+Name[pt]=Latte
+Name[pt_BR]=Latte
+Name[ru]=Latte
+Name[sv]=Latte
+Name[uk]=Латте
+Name[x-test]=xxLattexx
+Name[zh_CN]=Latte
+Name[zh_TW]=Latte
 Comment=Latte default indicator
 
 Type=Service
@@ -16,4 +39,4 @@ X-KDE-PluginInfo-Version=0.1
 X-KDE-PluginInfo-Category=Latte Indicator
 X-KDE-PluginInfo-License=GPL v2+
 X-KDE-PluginInfo-EnabledByDefault=true
- 
+

indicators/org.kde.latte.plasma/metadata.desktop

@@ -14,4 +14,4 @@ X-KDE-PluginInfo-Version=0.1
 X-KDE-PluginInfo-Category=Latte Indicator
 X-KDE-PluginInfo-License=GPL v2+
 X-KDE-PluginInfo-EnabledByDefault=true
- 
+

indicators/org.kde.latte.unity/metadata.desktop

@@ -14,4 +14,4 @@ X-KDE-PluginInfo-Version=0.1
 X-KDE-PluginInfo-Category=Latte Indicator
 X-KDE-PluginInfo-License=GPL v2+
 X-KDE-PluginInfo-EnabledByDefault=true
- 
+