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 64effdda9a9ddf115bc2806baee49953f038f115..c42d98ca7213f22fad990aad30a8a52bb35d6615 100644 (file)
--- a/src/settings/kcm/kcmdolphingeneral.json
+++ b/src/settings/kcm/kcmdolphingeneral.json
@@ -4,19 +4,27 @@
         "Description[ca@valencia]": "Configura les opcions generals del gestor de fitxers",
         "Description[ca]": "Configura les opcions generals del gestor de fitxers",
         "Description[es]": "Configurar las preferencias generales del gestor de archivos",
+        "Description[fr]": "Configurer les paramètres généraux pour le gestionnaire de fichiers",
         "Description[nl]": "Algemene bestandsbeheerderinstellingen configureren",
+        "Description[sv]": "Anpassa filhanterarens allmänna inställningar",
+        "Description[ta]": "பொதுவான கோப்பு மேலாளி அமைப்புகளை அமையுங்கள்",
         "Description[tr]": "Genel dosya yöneticisi ayarlarını yapılandır",
         "Description[uk]": "Налаштувати загальні параметри менеджера файлів",
         "Description[x-test]": "xxConfigure general file manager settingsxx",
+        "Description[zh_CN]": "配置文件管理器常规设置",
         "Icon": "system-file-manager",
         "Name": "General",
         "Name[ca@valencia]": "General",
         "Name[ca]": "General",
         "Name[es]": "General",
+        "Name[fr]": "Général",
         "Name[nl]": "Algemeen",
+        "Name[sv]": "Allmänt",
+        "Name[ta]": "பொதுவானவை",
         "Name[tr]": "Genel",
         "Name[uk]": "Загальне",
         "Name[x-test]": "xxGeneralxx",
+        "Name[zh_CN]": "常规",
         "ServiceTypes": [
             "KCModule"
         ]

diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json
index 060dbc5ceb4a52ed22679dbb1d797e14dc2baefe..1b0f9ba9d756809203a22d9f3921920e3ba553dd 100644 (file)
--- a/src/settings/kcm/kcmdolphinnavigation.json
+++ b/src/settings/kcm/kcmdolphinnavigation.json
@@ -4,10 +4,14 @@
         "Description[ca@valencia]": "Configura la navegació del gestor de fitxers",
         "Description[ca]": "Configura la navegació del gestor de fitxers",
         "Description[es]": "Configurar la navegación del gestor de archivos",
+        "Description[fr]": "Configurer la navigation dans le gestionnaire de fichiers",
         "Description[nl]": "Bestandsbeheerdernavigatie configureren",
+        "Description[sv]": "Anpassa filhanterarens navigering",
+        "Description[ta]": "கோப்பு உலாவியில் உலாவலை அமையுங்கள்",
         "Description[tr]": "Dosya yöneticisi dolaşımını yapılandır",
         "Description[uk]": "Налаштувати навігацію у менеджері файлів",
         "Description[x-test]": "xxConfigure file manager navigationxx",
+        "Description[zh_CN]": "配置文件管理器导航功能",
         "Icon": "preferences-desktop-navigation",
         "Name": "Navigation",
         "Name[ar]": "التّنقّل",

diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json
index 849b953d8cb78262a25e3a6e8f7cae0a9ce50f67..164dbc135537fe78942c05c44025a8bb8c65c43f 100644 (file)
--- a/src/settings/kcm/kcmdolphinviewmodes.json
+++ b/src/settings/kcm/kcmdolphinviewmodes.json
@@ -4,10 +4,14 @@
         "Description[ca@valencia]": "Configura els modes de vista del gestor de fitxers",
         "Description[ca]": "Configura els modes de vista del gestor de fitxers",
         "Description[es]": "Configurar los modos de vistas del gestor de archivos",
+        "Description[fr]": "Configurer les modes d'affichage du gestionnaire de fichiers",
         "Description[nl]": "Bestandsbeheerderweergavemodussen configureren",
+        "Description[sv]": "Anpassa filhanterarens visningslägen",
+        "Description[ta]": "கோப்பு உலாவியின் காட்சிமுறைகளை அமையுங்கள்",
         "Description[tr]": "Dosya yöneticisi görünüm kiplerini yapılandır",
         "Description[uk]": "Налаштувати режими перегляду менеджера файлів",
         "Description[x-test]": "xxConfigure file manager view modesxx",
+        "Description[zh_CN]": "配置文件管理器视图模式",
         "Icon": "preferences-desktop-icons",
         "Name": "View Modes",
         "Name[ar]": "أوضاع المنظور",