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"

kdecoration/breeze.json

@@ -8,6 +8,7 @@
         "Description[da]": "Vinduesdekoration som bruger den visuelle stil Breeze til Plasma-skrivebordet",
         "Description[de]": "Fensterdekoration im Breeze-Design für die Plasma-Arbeitsfläche",
         "Description[el]": "Διακοσμήσεις παραθύρων με το στιλ του Breeze για την επιφάνεια εργασίας Plasma",
+        "Description[en_GB]": "Window decoration using the Breeze visual style for the Plasma Desktop",
         "Description[es]": "Decoración de ventanas que usa el estilo visual Brisa para el escritorio Plasma",
         "Description[et]": "Plasma töölaua akende dekoratsioon Breeze'i visuaalse stiiliga",
         "Description[eu]": "Leiho apainketa Plasma mahaigainerako Breeze ikus-estiloa erabiliz",
@@ -44,21 +45,41 @@
         "Name[ar]": "نسيم",
         "Name[ca@valencia]": "Brisa",
         "Name[ca]": "Brisa",
+        "Name[cs]": "Breeze",
+        "Name[da]": "Breeze",
+        "Name[de]": "Breeze",
+        "Name[el]": "Breeze",
+        "Name[en_GB]": "Breeze",
         "Name[es]": "Brisa",
+        "Name[et]": "Breeze",
+        "Name[eu]": "Breeze",
+        "Name[fi]": "Breeze",
         "Name[fr]": "Brise",
+        "Name[gl]": "Breeze",
+        "Name[hu]": "Breeze",
         "Name[ia]": "Brisa (Breeze)",
+        "Name[id]": "Breeze",
         "Name[it]": "Brezza",
+        "Name[ko]": "Breeze",
+        "Name[nb]": "Breeze",
+        "Name[nl]": "Breeze",
+        "Name[nn]": "Breeze",
         "Name[pl]": "Bryza",
         "Name[pt]": "Brisa",
+        "Name[pt_BR]": "Breeze",
+        "Name[ru]": "Breeze",
         "Name[sk]": "Vánok",
         "Name[sl]": "Sapica",
         "Name[sr@ijekavian]": "Поветарац",
         "Name[sr@ijekavianlatin]": "Povetarac",
         "Name[sr@latin]": "Povetarac",
         "Name[sr]": "Поветарац",
+        "Name[sv]": "Breeze",
         "Name[tr]": "Esinti",
+        "Name[uk]": "Breeze",
         "Name[x-test]": "xxBreezexx",
         "Name[zh_CN]": "微风",
+        "Name[zh_TW]": "Breeze",
         "ServiceTypes": [
             "org.kde.kdecoration2"
         ]