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"

containments/homescreens/folio/package/metadata.json

@@ -52,6 +52,7 @@
         "Name[es]": "Folio",
         "Name[eu]": "Folio",
         "Name[fr]": "Porte-feuille",
+        "Name[ka]": "ფოლიო",
         "Name[nl]": "Folio",
         "Name[pt]": "Folio",
         "Name[sl]": "Folio",

quicksettings/donotdisturb/metadata.json

@@ -50,6 +50,7 @@
         "Name[es]": "No molestar",
         "Name[eu]": "Zatarik ez",
         "Name[fr]": "Ne pas déranger",
+        "Name[ka]": "არ შემაწუხო",
         "Name[nl]": "Niet storen",
         "Name[pt]": "Não Incomodar",
         "Name[sl]": "Ne moti",