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"

src/plasma/packagestructure/containmentactions-packagestructure.json

@@ -46,4 +46,4 @@
         "Version": "1"
     }, 
     "X-KDE-ParentApp": "org.kde.plasmashell"
-}
+}

src/plasma/packagestructure/dataengine-packagestructure.json

@@ -48,4 +48,4 @@
         "Version": "1"
     }, 
     "X-KDE-ParentApp": "org.kde.plasmashell"
-}
+}

src/plasma/packagestructure/plasmageneric-packagestructure.json

@@ -47,4 +47,4 @@
         "Version": "1"
     }, 
     "X-KDE-ParentApp": "org.kde.plasmashell"
-}
+}

src/plasma/packagestructure/plasmatheme-packagestructure.json

@@ -48,4 +48,4 @@
         "Version": "1"
     }, 
     "X-KDE-ParentApp": "org.kde.plasmashell"
-}
+}

src/plasma/packagestructure/plasmoid-packagestructure.json

@@ -38,4 +38,4 @@
         "Version": "1"
     }, 
     "X-KDE-ParentApp": "org.kde.plasmashell"
-}
+}