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/settings/kcm/kcmdolphinviewmodes.json | 1 + 1 file changed, 1 insertion(+) (limited to 'src/settings/kcm/kcmdolphinviewmodes.json') diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json index 11ff10228..8eab5147b 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.json +++ b/src/settings/kcm/kcmdolphinviewmodes.json @@ -56,6 +56,7 @@ "Name[sv]": "Visningslägen", "Name[ta]": "காட்சிமுறைகள்", "Name[tr]": "Görünüm Kipleri", + "Name[ug]": "كۆرۈنۈش ھالىتى", "Name[uk]": "Режими перегляду", "Name[vi]": "Các chế độ xem", "Name[zh_CN]": "视图模式", -- cgit v1.3.1