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 74db701ed738d695867fedf712633e17220571fe..11b41a7a1e42c7c4435fdb7c65e0fbbf93756f84 100644 (file)
--- a/src/settings/kcm/kcmdolphingeneral.json
+++ b/src/settings/kcm/kcmdolphingeneral.json
@@ -17,6 +17,7 @@
         "Description[pt]": "Configurar as definições gerais do gestor de ficheiros",
         "Description[pt_BR]": "Configura as opções gerais do gerenciador de arquivos",
         "Description[ro]": "Configurează opțiuni generale ale gestionarului de fișiere",
+        "Description[ru]": "Настройка основных параметров диспетчера файлов",
         "Description[sl]": "Postavi splošne nastavitve upravljalnika datotek",
         "Description[sv]": "Anpassa filhanterarens allmänna inställningar",
         "Description[ta]": "பொதுவான கோப்பு மேலாளி அமைப்புகளை அமையுங்கள்",
@@ -44,6 +45,7 @@
         "Name[pt]": "Geral",
         "Name[pt_BR]": "Geral",
         "Name[ro]": "Generale",
+        "Name[ru]": "Основные параметры",
         "Name[sl]": "Splošno",
         "Name[sv]": "Allmänt",
         "Name[ta]": "பொதுவானவை",

diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json
index e3c34030991c29186d5e438fd1259c674b16365e..3e85eb8beaa8d99882547c9cf3d84a483721782a 100644 (file)
--- a/src/settings/kcm/kcmdolphinnavigation.json
+++ b/src/settings/kcm/kcmdolphinnavigation.json
@@ -17,6 +17,7 @@
         "Description[pt]": "Configurar a navegação do gestor de ficheiros",
         "Description[pt_BR]": "Configura a navegação do gerenciador de arquivos",
         "Description[ro]": "Configurează navigarea cu gestionarul de fișiere",
+        "Description[ru]": "Настройка навигации в диспетчере файлов",
         "Description[sl]": "Postavi krmarjenje v upravljalniku datotek",
         "Description[sv]": "Anpassa filhanterarens navigering",
         "Description[ta]": "கோப்பு உலாவியில் உலாவலை அமையுங்கள்",

diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json
index 3f3f1c96db90a8e87b1303f082849791cad2e451..a0713967ca6a46d3ffdaa55575db4295d0a26720 100644 (file)
--- a/src/settings/kcm/kcmdolphinviewmodes.json
+++ b/src/settings/kcm/kcmdolphinviewmodes.json
@@ -17,6 +17,7 @@
         "Description[pt]": "Configurar os modos de visualização do gestor de ficheiros",
         "Description[pt_BR]": "Configura os modos de exibição do gerenciador de arquivos",
         "Description[ro]": "Configurează regimurile de vizualizare ale gestionarului de fișiere",
+        "Description[ru]": "Настройка режимов просмотра папок в диспетчере файлов",
         "Description[sl]": "Postavi načine prikaza upravljalnika datotek",
         "Description[sv]": "Anpassa filhanterarens visningslägen",
         "Description[ta]": "கோப்பு உலாவியின் காட்சிமுறைகளை அமையுங்கள்",