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 fbfa4156aaf7fb51c0691b45d36734abf4119433..64effdda9a9ddf115bc2806baee49953f038f115 100644 (file)
--- a/src/settings/kcm/kcmdolphingeneral.json
+++ b/src/settings/kcm/kcmdolphingeneral.json
@@ -1,8 +1,22 @@
 {
     "KPlugin": {
         "Description": "Configure general file manager settings",
 {
     "KPlugin": {
         "Description": "Configure general file manager settings",

+        "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[nl]": "Algemene bestandsbeheerderinstellingen configureren",
+        "Description[tr]": "Genel dosya yöneticisi ayarlarını yapılandır",
+        "Description[uk]": "Налаштувати загальні параметри менеджера файлів",
+        "Description[x-test]": "xxConfigure general file manager settingsxx",

         "Icon": "system-file-manager",
         "Name": "General",
         "Icon": "system-file-manager",
         "Name": "General",

+        "Name[ca@valencia]": "General",
+        "Name[ca]": "General",
+        "Name[es]": "General",
+        "Name[nl]": "Algemeen",
+        "Name[tr]": "Genel",
+        "Name[uk]": "Загальне",
+        "Name[x-test]": "xxGeneralxx",

         "ServiceTypes": [
             "KCModule"
         ]
         "ServiceTypes": [
             "KCModule"
         ]

diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json
index ca4b6b8f5f1527549a5b2f5cc151710a24027842..060dbc5ceb4a52ed22679dbb1d797e14dc2baefe 100644 (file)
--- a/src/settings/kcm/kcmdolphinnavigation.json
+++ b/src/settings/kcm/kcmdolphinnavigation.json
@@ -1,6 +1,13 @@
 {
     "KPlugin": {
         "Description": "Configure file manager navigation",
 {
     "KPlugin": {
         "Description": "Configure file manager navigation",

+        "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[nl]": "Bestandsbeheerdernavigatie configureren",
+        "Description[tr]": "Dosya yöneticisi dolaşımını yapılandır",
+        "Description[uk]": "Налаштувати навігацію у менеджері файлів",
+        "Description[x-test]": "xxConfigure file manager navigationxx",

         "Icon": "preferences-desktop-navigation",
         "Name": "Navigation",
         "Name[ar]": "التّنقّل",
         "Icon": "preferences-desktop-navigation",
         "Name": "Navigation",
         "Name[ar]": "التّنقّل",

diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json
index 4b2b3993d6b1b39450afd24648e40f16b79bb06d..849b953d8cb78262a25e3a6e8f7cae0a9ce50f67 100644 (file)
--- a/src/settings/kcm/kcmdolphinviewmodes.json
+++ b/src/settings/kcm/kcmdolphinviewmodes.json
@@ -1,6 +1,13 @@
 {
     "KPlugin": {
         "Description": "Configure file manager view modes",
 {
     "KPlugin": {
         "Description": "Configure file manager view modes",

+        "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[nl]": "Bestandsbeheerderweergavemodussen configureren",
+        "Description[tr]": "Dosya yöneticisi görünüm kiplerini yapılandır",
+        "Description[uk]": "Налаштувати режими перегляду менеджера файлів",
+        "Description[x-test]": "xxConfigure file manager view modesxx",

         "Icon": "preferences-desktop-icons",
         "Name": "View Modes",
         "Name[ar]": "أوضاع المنظور",
         "Icon": "preferences-desktop-icons",
         "Name": "View Modes",
         "Name[ar]": "أوضاع المنظور",