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"

org.kde.neochat.desktop

@@ -92,6 +92,7 @@ Comment[ca]=Xat a Matrix
 Comment[es]=Chat en Matrix
 Comment[eu]=Berriketa Matrix-en
 Comment[gl]=Charle en Matrix
+Comment[ia]=Conversation en ditecto sur Matrix
 Comment[ka]=ჩატი Matrix-ზე
 Comment[nl]=Chat op Matrix
 Comment[pl]=Rozmawiaj na Matriksie

src/purpose/purposeplugin.json

@@ -26,6 +26,7 @@
                 "Name[nn]": "Tobias Fella",
                 "Name[pl]": "Tobias Fella",
                 "Name[ru]": "Tobias Fella",
+                "Name[sk]": "Tobias Fella",
                 "Name[sl]": "Tobias Fella",
                 "Name[sv]": "Tobias Fella",
                 "Name[ta]": "டோபியாஸ் ஃபெல்லா",
@@ -93,6 +94,7 @@
         "Name[nn]": "NeoChat",
         "Name[pl]": "NeoChat",
         "Name[ru]": "NeoChat",
+        "Name[sk]": "NeoChat",
         "Name[sl]": "NeoChat",
         "Name[sv]": "NeoChat",
         "Name[ta]": "நியோச்சாட்",