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

@@ -25,6 +25,7 @@ Name[zh_CN]=Latte
 Name[zh_TW]=Latte
 Comment=Latte default indicator
 Comment[ca]=Indicador predeterminat del Latte
+Comment[ca@valencia]=Indicador predeterminat del Latte
 Comment[gl]=Indicador predeterminado de Latte
 Comment[nl]=Standaard indicator van Latte
 Comment[uk]=Типовий індикатор Латте

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

@@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=Plasma
 Name[ca]=Plasma
+Name[ca@valencia]=Plasma
 Name[gl]=Plasma
 Name[nl]=Plasma
 Name[pt]=Plasma
@@ -8,6 +9,7 @@ Name[uk]=Плазма
 Name[x-test]=xxPlasmaxx
 Comment=Latte Plasma style indicator
 Comment[ca]=Indicador a l'estil Plasma del Latte
+Comment[ca@valencia]=Indicador a l'estil Plasma del Latte
 Comment[gl]=Indicador de estilo Plasma de Latte
 Comment[nl]=Plasma stijlindicator van Latte
 Comment[uk]=Індикатор стилю Плазми Латте

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

@@ -1,12 +1,14 @@
 [Desktop Entry]
 Name=Unity
 Name[ca]=Unity
+Name[ca@valencia]=Unity
 Name[gl]=Unity
 Name[nl]=Unity
 Name[uk]=Unity
 Name[x-test]=xxUnityxx
 Comment=Latte Unity style indicator
 Comment[ca]=Indicador a l'estil Unity del Latte
+Comment[ca@valencia]=Indicador a l'estil Unity del Latte
 Comment[gl]=Indicador de estilo Unity de Latte
 Comment[nl]=Unity stijlindicator van Latte
 Comment[uk]=Індикатор стилю Unity Латте