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"

plugins/digitizer/kdeconnect_digitizer.json

@@ -7,6 +7,7 @@
                 "Name": "Martin Sh",
                 "Name[ar]": "مارتن ش",
                 "Name[bg]": "Martin Sh",
+                "Name[ca@valencia]": "Martin Sh",
                 "Name[ca]": "Martin Sh",
                 "Name[fr]": "Martin Sh",
                 "Name[he]": "מרטין ש",
@@ -26,6 +27,7 @@
         "Description": "Use your device as a pressure sensitive drawing tablet",
         "Description[ar]": "استخدم جهازك كلوحة رسم حساسة للضغط",
         "Description[bg]": "Използвайте устройството си като чувствителен на натиск графичен таблет",
+        "Description[ca@valencia]": "Utilitzeu el dispositiu com a una tauleta de dibuix sensible a la pressió",
         "Description[ca]": "Useu el dispositiu com a una tauleta de dibuix sensible a la pressió",
         "Description[fr]": "Utiliser votre périphérique pour une tablette graphique sensible aux appuis tactiles",
         "Description[he]": "אפשר להשתמש במכשיר שלך כלוח ציור שרגיש לחוזק הלחיצה",
@@ -46,6 +48,7 @@
         "Name": "Drawing tablet",
         "Name[ar]": "لوح رسم",
         "Name[bg]": "Графичен таблет",
+        "Name[ca@valencia]": "Tauleta de dibuix",
         "Name[ca]": "Tauleta de dibuix",
         "Name[fr]": "Tablette graphique",
         "Name[he]": "לוח ציור",