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/kcmdolphingeneral.json | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/settings/kcm/kcmdolphingeneral.json') diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json index 4fd797730..825e51854 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -15,6 +15,7 @@ "Description[ta]": "பொதுவான கோப்பு மேலாளி அமைப்புகளை அமையுங்கள்", "Description[tr]": "Genel dosya yöneticisi ayarlarını yapılandır", "Description[uk]": "Налаштувати загальні параметри менеджера файлів", + "Description[vi]": "Cấu hình các thiết lập chung cho trình quản lí tệp", "Description[x-test]": "xxConfigure general file manager settingsxx", "Description[zh_CN]": "配置文件管理器常规设置", "Icon": "system-file-manager", @@ -33,6 +34,7 @@ "Name[ta]": "பொதுவானவை", "Name[tr]": "Genel", "Name[uk]": "Загальне", + "Name[vi]": "Chung", "Name[x-test]": "xxGeneralxx", "Name[zh_CN]": "常规", "ServiceTypes": [ -- cgit v1.3.1