From d958aa57d87ba1b391bac8043949f49fb23fb43c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 3 May 2022 01:50:40 +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/kcmdolphinnavigation.json | 1 + 1 file changed, 1 insertion(+) (limited to 'src/settings/kcm/kcmdolphinnavigation.json') diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json index 340a0f06e..f5254d096 100644 --- a/src/settings/kcm/kcmdolphinnavigation.json +++ b/src/settings/kcm/kcmdolphinnavigation.json @@ -15,6 +15,7 @@ "Description[ta]": "கோப்பு உலாவியில் உலாவலை அமையுங்கள்", "Description[tr]": "Dosya yöneticisi dolaşımını yapılandır", "Description[uk]": "Налаштувати навігацію у менеджері файлів", + "Description[vi]": "Cấu hình điều hướng trình quản lí tệp", "Description[x-test]": "xxConfigure file manager navigationxx", "Description[zh_CN]": "配置文件管理器导航功能", "Icon": "preferences-desktop-navigation", -- cgit v1.3.1