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/plugins/kpackage/decoration/kwin-packagestructure-decoration.json

@@ -70,7 +70,7 @@
         "Name[ko]": "KWin 장식",
         "Name[lt]": "KWin dekoracijos",
         "Name[nl]": "KWin-decoraties",
-        "Name[nn]": "KWin-dekorasjon",
+        "Name[nn]": "KWin-pynt",
         "Name[pl]": "Wygląd KWin",
         "Name[pt]": "Decoração do KWin",
         "Name[pt_BR]": "Decoração do KWin",