From 3fad514921f528145d4af3f921afaf3d1908a3cf Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 25 May 2024 01:19:17 +0000 Subject: [PATCH] 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/dolphinpart.json.in | 2 +- src/itemactions/movetonewfolderitemaction.json | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/dolphinpart.json.in b/src/dolphinpart.json.in index 91cfd0f753..d6928ef5ef 100644 --- 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[ka]": "Dolphin -ის ხედი", + "Name[ka]": "Dolphin-ის ხედი", "Name[ko]": "Dolphin 보기", "Name[lt]": "Dolphin rodinys", "Name[lv]": "„Dolphin“ skats", diff --git a/src/itemactions/movetonewfolderitemaction.json b/src/itemactions/movetonewfolderitemaction.json index 069bad6fd3..f3b8243a4e 100644 --- a/src/itemactions/movetonewfolderitemaction.json +++ b/src/itemactions/movetonewfolderitemaction.json @@ -5,6 +5,18 @@ "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" ]