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"

4 files changed, 6 insertions, 0 deletions

diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop
index 0747ff430..49253cd9e 100644
--- a/src/settings/kcm/kcmdolphingeneral.desktop
+++ b/src/settings/kcm/kcmdolphingeneral.desktop
@@ -80,6 +80,7 @@ Comment[pa]=ਇਹ ਸਰਵਿਸ ਆਮ ਡਾਲਫਿਨ ਸੈਟਿੰਗ
 Comment[pl]=Ta usługa pozwala na ogólne ustawienie Dolphina.
 Comment[pt]=Este serviço permite a configuração das definições gerais do Dolphin.
 Comment[pt_BR]=Este serviço permite configurar as opções gerais do Dolphin.
+Comment[ro]=Acest serviciu permite configurarea opțiunilor generale Dolphin.
 Comment[ru]=Эта служба позволяет настраивать основные параметры Dolphin
 Comment[sk]=Táto služba umožňuje všeobecné nastavenie Dolphinu.
 Comment[sl]=Ta storitev omogoča spreminjanje splošnih nastavitev programa Dolphin.
diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop
index 834176a27..c90ef9046 100644
--- a/src/settings/kcm/kcmdolphinnavigation.desktop
+++ b/src/settings/kcm/kcmdolphinnavigation.desktop
@@ -80,6 +80,7 @@ Comment[pa]=ਇਹ ਸਰਵਿਸ ਡਾਲਫਿਨ ਨੇਵੀਗੇਸ਼�
 Comment[pl]=Ta usługa umożliwia ustawienie nawigacji w Dolphinie.
 Comment[pt]=Este serviço permite a configuração da navegação do Dolphin.
 Comment[pt_BR]=Este serviço permite configurar a navegação do Dolphin.
+Comment[ro]=Acest serviciu permite configurarea navigării Dolphin.
 Comment[ru]=Эта служба позволяет настраивать навигацию в Dolphin
 Comment[sk]=Táto služba umožňuje nastavenie navigácie v Dolphine.
 Comment[sl]=Ta storitev omogoča spreminjanje nastavitev krmarjenja programa Dolphin.
@@ -188,6 +189,7 @@ Comment[pa]=ਫਾਇਲ ਮੈਨੇਜਰ ਨੇਵੀਗੇਸ਼ਨ ਸੰ�
 Comment[pl]=Ustawienia nawigacji w zarządzaniu plikami
 Comment[pt]=Configurar a navegação do gestor de ficheiros
 Comment[pt_BR]=Configura a navegação do gerenciador de arquivos
+Comment[ro]=Configurează navigarea cu gestionarul de fișiere
 Comment[ru]=Настройка навигации в диспетчере файлов
 Comment[se]=Heivet fiilagieđahallannavigašuvdna
 Comment[sk]=Nastavenie navigácie správcu súborov
diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop
index 0660fe587..5d96779a1 100644
--- a/src/settings/kcm/kcmdolphinservices.desktop
+++ b/src/settings/kcm/kcmdolphinservices.desktop
@@ -139,6 +139,7 @@ Comment[pa]=ਫਾਇਲ ਮੈਨੇਜਰ ਦੀਆਂ ਸਰਵਿਸਾਂ �
 Comment[pl]=Ustawienia usług zarządzania plikami
 Comment[pt]=Configurar os serviços do gestor de ficheiros
 Comment[pt_BR]=Configura os serviços do gerenciador de arquivos
+Comment[ro]=Configurează serviciile gestionarului de fișiere
 Comment[ru]=Настройка действий в диспетчере файлов
 Comment[sk]=Nastavenie služieb správcu súborov
 Comment[sl]=Nastavitve storitev upravljalnika datotek
diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop
index b09bf0e94..f79aae390 100644
--- a/src/settings/kcm/kcmdolphinviewmodes.desktop
+++ b/src/settings/kcm/kcmdolphinviewmodes.desktop
@@ -80,6 +80,7 @@ Comment[pa]=ਇਹ ਸਰਵਿਸ ਡਾਲਫਿਨ ਝਲਕ ਮੋਡ ਦੀ
 Comment[pl]=Ta usługa umożliwia ustawienie trybów widoku Dolphina.
 Comment[pt]=Este serviço permite a configuração dos modos de visualização do Dolphin.
 Comment[pt_BR]=Este serviço permite configurar os modos de exibição do Dolphin.
+Comment[ro]=Acest serviciu permite configurarea regimurilor de vizualizare Dolphin.
 Comment[ru]=Эта служба позволяет настраивать режимы просмотра папок в Dolphin
 Comment[sk]=Táto služba umožňuje nastavenie režimov zobrazenia Dolphinu.
 Comment[sl]=Ta storitev omogoča spreminjanje nastavitev načinov prikaza programa Dolphin.
@@ -187,6 +188,7 @@ Comment[pa]=ਫਾਇਲ ਮੈਨੇਜਰ ਝਲਕ ਮੋਡ ਸੰਰਚਨ�
 Comment[pl]=Ustawienia trybów widoku zarządzania plikami
 Comment[pt]=Configurar os modos de visualização do gestor de ficheiros
 Comment[pt_BR]=Configura os modos de exibição do gerenciador de arquivos
+Comment[ro]=Configurează regimurile de vizualizare ale gestionarului de fișiere
 Comment[ru]=Настройка режимов просмотра папок в диспетчере файлов
 Comment[se]=Heivet fiilagieđahalli čájehanmodusat
 Comment[sk]=Nastavenie režimov zobrazenia správcu súborov