From fe6bb8bd6a076d8293e2090935ee41577324c760 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 3 Jun 2026 02:24:32 +0000 Subject: 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/itemactions/movetonewfolderitemaction.json | 1 + 1 file changed, 1 insertion(+) (limited to 'src/itemactions/movetonewfolderitemaction.json') diff --git a/src/itemactions/movetonewfolderitemaction.json b/src/itemactions/movetonewfolderitemaction.json index fa0432990..f55754b29 100644 --- a/src/itemactions/movetonewfolderitemaction.json +++ b/src/itemactions/movetonewfolderitemaction.json @@ -49,6 +49,7 @@ "Name[sv]": "Flytta till ny katalog", "Name[ta]": "புதிய அடைவிற்கு நகர்த்து", "Name[tr]": "Yeni Klasöre Taşı", + "Name[ug]": "يېڭى قىسقۇچقا يۆتكە", "Name[uk]": "Пересунути до нової теки", "Name[zh_CN]": "移动到新建文件夹", "Name[zh_TW]": "移動到新資料夾" -- cgit v1.3.1