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 fbf6a94285927d687b2a927921779d7a8e592912..f5596b426d99af088980ee49083d6d8993cb8e2b 100644 (file)
--- a/src/settings/kcm/kcmdolphingeneral.json
+++ b/src/settings/kcm/kcmdolphingeneral.json
@@ -23,6 +23,7 @@
         "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[sk]": "Všeobecné nastavenie správcu súborov",
         "Description[sl]": "Postavi splošne nastavitve upravljalnika datotek",
         "Description[sv]": "Anpassa filhanterarens allmänna inställningar",
         "Description[ta]": "பொதுவான கோப்பு மேலாளி அமைப்புகளை அமையுங்கள்",
@@ -55,6 +56,7 @@
         "Name[pt_BR]": "Geral",
         "Name[ro]": "Generale",
         "Name[ru]": "Основные параметры",
+        "Name[sk]": "Všeobecné",
         "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 30e8b431fee47b1c69048b9cd17b87afb2973855..07b7d245acd8d88fbaa2803325c824f56ee5aad4 100644 (file)
--- a/src/settings/kcm/kcmdolphinnavigation.json
+++ b/src/settings/kcm/kcmdolphinnavigation.json
@@ -23,6 +23,7 @@
         "Description[pt_BR]": "Configura a navegação do gerenciador de arquivos",
         "Description[ro]": "Configurează navigarea cu gestionarul de fișiere",
         "Description[ru]": "Настройка навигации в диспетчере файлов",
+        "Description[sk]": "Nastavenie navigácie správcu súborov",
         "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 5e39fc5e890fe2d061d97beb53a100e07cd76534..5f2f02d662133b02b799e063a6eb660481665946 100644 (file)
--- a/src/settings/kcm/kcmdolphinviewmodes.json
+++ b/src/settings/kcm/kcmdolphinviewmodes.json
@@ -23,6 +23,7 @@
         "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[sk]": "Nastavenie režimov zobrazenia správcu súborov",
         "Description[sl]": "Postavi načine prikaza upravljalnika datotek",
         "Description[sv]": "Anpassa filhanterarens visningslägen",
         "Description[ta]": "கோப்பு உலாவியின் காட்சிமுறைகளை அமையுங்கள்",