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"

diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json
index 4fd7977309748e5a8885c8e725f5fb49bcbb2877..825e5185426f069c53d69a29bf518b2846545b4a 100644 (file)
--- 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": [

diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json
index 340a0f06e51df074e6ed16d26d87da26dac72cc4..f5254d0961c51d5caeca8d8f6de6390909ceb941 100644 (file)
--- 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",

diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json
index 219c2053f0c43be5faf2324e40f8339d66d71d61..cd2e83e947b8d9e8e04b6790d605c7fa2cd96e8c 100644 (file)
--- a/src/settings/kcm/kcmdolphinviewmodes.json
+++ b/src/settings/kcm/kcmdolphinviewmodes.json
@@ -15,6 +15,7 @@
         "Description[ta]": "கோப்பு உலாவியின் காட்சிமுறைகளை அமையுங்கள்",
         "Description[tr]": "Dosya yöneticisi görünüm kiplerini yapılandır",
         "Description[uk]": "Налаштувати режими перегляду менеджера файлів",
+        "Description[vi]": "Cấu hình các chế độ xem trình quản lí tệp",
         "Description[x-test]": "xxConfigure file manager view modesxx",
         "Description[zh_CN]": "配置文件管理器视图模式",
         "Icon": "preferences-desktop-icons",