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"

diff --git a/src/dolphinpart.json.in b/src/dolphinpart.json.in
index 91cfd0f753b052d7532f008cdd544676c18b512a..d6928ef5efe0695c40397c6bd31199d3e818bcbc 100644 (file)
--- a/src/dolphinpart.json.in
+++ b/src/dolphinpart.json.in
@@ -33,7 +33,7 @@
         "Name[is]": "Dolphin-yfirlit",
         "Name[it]": "Vista di Dolphin",
         "Name[ja]": "Dolphin ビュー",
         "Name[is]": "Dolphin-yfirlit",
         "Name[it]": "Vista di Dolphin",
         "Name[ja]": "Dolphin ビュー",

-        "Name[ka]": "Dolphin -ის ხედი",
+        "Name[ka]": "Dolphin-ის ხედი",

         "Name[ko]": "Dolphin 보기",
         "Name[lt]": "Dolphin rodinys",
         "Name[lv]": "„Dolphin“ skats",
         "Name[ko]": "Dolphin 보기",
         "Name[lt]": "Dolphin rodinys",
         "Name[lv]": "„Dolphin“ skats",

diff --git a/src/itemactions/movetonewfolderitemaction.json b/src/itemactions/movetonewfolderitemaction.json
index 069bad6fd374245a11ad9ac7564d5b6fc973e419..f3b8243a4eb351b53c353a7d08dd7c2c78434000 100644 (file)
--- a/src/itemactions/movetonewfolderitemaction.json
+++ b/src/itemactions/movetonewfolderitemaction.json
@@ -5,6 +5,18 @@
             "application/octet-stream"
         ],
         "Name": "Move to New Folder",
             "application/octet-stream"
         ],
         "Name": "Move to New Folder",

+        "Name[ca@valencia]": "Mou cap a una carpeta nova",
+        "Name[ca]": "Mou a una carpeta nova",
+        "Name[en_GB]": "Move to New Folder",
+        "Name[es]": "Mover a una nueva carpeta",
+        "Name[he]": "העברה לתיקייה חדשה",
+        "Name[ia]": "Move a nove dossier",
+        "Name[ka]": "გადატანა ახალ საქაღალდეში",
+        "Name[nl]": "Naar nieuwe map verplaatsen",
+        "Name[sl]": "Premakni v novo mapo",
+        "Name[tr]": "Yeni Klasöre Taşı",
+        "Name[uk]": "Пересунути до нової теки",
+        "Name[x-test]": "xxMove to New Folderxx",

         "ServiceTypes": [
             "KFileItemAction/Plugin"
         ]
         "ServiceTypes": [
             "KFileItemAction/Plugin"
         ]