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, 13 insertions, 0 deletions

diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop
index ba8cdefde..752aa2ea5 100644
--- a/src/settings/kcm/kcmdolphingeneral.desktop
+++ b/src/settings/kcm/kcmdolphingeneral.desktop
@@ -31,6 +31,7 @@ Name[pa]=ਡਾਲਫਿਨ ਆਮ
 Name[pl]=Ustawienia Dolphina
 Name[pt]=Geral do Dolphin
 Name[pt_BR]=Geral do Dolphin
+Name[ro]=Dolphin – Generale
 Name[ru]=Основные параметры Dolphin
 Name[se]=Dolphinoppalaččat
 Name[sk]=Všeobecný Dolphin
@@ -137,6 +138,7 @@ Name[pa]=ਆਮ
 Name[pl]=Ogólne
 Name[pt]=Geral
 Name[pt_BR]=Geral
+Name[ro]=Generale
 Name[ru]=Основное
 Name[sk]=Všeobecné
 Name[sl]=Splošno
@@ -183,6 +185,7 @@ Comment[pa]=ਆਮ ਫਾਇਲ ਮੈਨੇਜਰ ਸੈਟਿੰਗ ਸੰਰ�
 Comment[pl]=Ustawienia ogólne zarządzania plikami
 Comment[pt]=Configurar as definições gerais do gestor de ficheiros
 Comment[pt_BR]=Configura as opções gerais do gerenciador de arquivos
+Comment[ro]=Configurează opțiuni generale ale gestionarului de fișiere
 Comment[ru]=Настройка диспетчера файлов
 Comment[sk]=Všeobecné nastavenie správcu súborov
 Comment[sl]=Splošne nastavitve upravljalnika datotek
@@ -230,6 +233,7 @@ X-KDE-Keywords[pa]=ਫਾਇਲ ਮੈਨੇਜਰ
 X-KDE-Keywords[pl]=zarządzanie plikami
 X-KDE-Keywords[pt]=gestor de ficheiros
 X-KDE-Keywords[pt_BR]=gerenciador de arquivos
+X-KDE-Keywords[ro]=gestionar de fișiere
 X-KDE-Keywords[ru]=диспетчер файлов
 X-KDE-Keywords[sk]=správca súborov
 X-KDE-Keywords[sl]=upravljalnik datotek
diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop
index 62e8ca040..eeb28fe86 100644
--- a/src/settings/kcm/kcmdolphinnavigation.desktop
+++ b/src/settings/kcm/kcmdolphinnavigation.desktop
@@ -31,6 +31,7 @@ Name[pa]=ਡਾਲਫਿਨ ਨੇਵੀਗੇਸ਼ਨ
 Name[pl]=Nawigacja Dolphina
 Name[pt]=Navegação do Dolphin
 Name[pt_BR]=Navegação do Dolphin
+Name[ro]=Dolphin – Navigare
 Name[ru]=Навигация в Dolphin
 Name[se]=Dolphinnavigašuvdna
 Name[sk]=Navigácia Dolphinu
@@ -136,6 +137,7 @@ Name[pa]=ਨੇਵੀਗੇਸ਼ਨ
 Name[pl]=Nawigacja
 Name[pt]=Navegação
 Name[pt_BR]=Navegação
+Name[ro]=Navigare
 Name[ru]=Навигация
 Name[se]=Navigašuvdna
 Name[sk]=Navigácia
@@ -231,6 +233,7 @@ X-KDE-Keywords[pa]=ਫਾਇਲ ਮੈਨੇਜਰ
 X-KDE-Keywords[pl]=zarządzanie plikami
 X-KDE-Keywords[pt]=gestor de ficheiros
 X-KDE-Keywords[pt_BR]=gerenciador de arquivos
+X-KDE-Keywords[ro]=gestionar de fișiere
 X-KDE-Keywords[ru]=диспетчер файлов
 X-KDE-Keywords[sk]=správca súborov
 X-KDE-Keywords[sl]=upravljalnik datotek
diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop
index 10e806a81..6eccee850 100644
--- a/src/settings/kcm/kcmdolphinservices.desktop
+++ b/src/settings/kcm/kcmdolphinservices.desktop
@@ -31,6 +31,7 @@ Name[pa]=ਡਾਲਫਿਨ ਸੇਵਾਵਾਂ
 Name[pl]=Usługi Dolphina
 Name[pt]=Serviços do Dolphin
 Name[pt_BR]=Serviços do Dolphin
+Name[ro]=Dolphin – Servicii
 Name[ru]=Действия Dolphin
 Name[sk]=Služby Dolphinu
 Name[sl]=Dolphin - storitve
@@ -89,6 +90,7 @@ Name[pa]=ਸੇਵਾਵਾਂ
 Name[pl]=Usługi
 Name[pt]=Serviços
 Name[pt_BR]=Serviços
+Name[ro]=Servicii
 Name[ru]=Действия
 Name[sk]=Služby
 Name[sl]=Storitve
@@ -182,6 +184,7 @@ X-KDE-Keywords[pa]=ਫਾਇਲ ਮੈਨੇਜਰ
 X-KDE-Keywords[pl]=zarządzanie plikami
 X-KDE-Keywords[pt]=gestor de ficheiros
 X-KDE-Keywords[pt_BR]=gerenciador de arquivos
+X-KDE-Keywords[ro]=gestionar de fișiere
 X-KDE-Keywords[ru]=диспетчер файлов
 X-KDE-Keywords[sk]=správca súborov
 X-KDE-Keywords[sl]=upravljalnik datotek
diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop
index b5ea5d047..ec35fa692 100644
--- a/src/settings/kcm/kcmdolphinviewmodes.desktop
+++ b/src/settings/kcm/kcmdolphinviewmodes.desktop
@@ -31,6 +31,7 @@ Name[pa]=ਡਾਲਫਿਨ ਝਲਕ ਢੰਗ
 Name[pl]=Tryby widoku Dolphina
 Name[pt]=Modos de Visualização do Dolphin
 Name[pt_BR]=Modos de exibição do Dolphin
+Name[ro]=Dolphin – Regimuri de vizualizare
 Name[ru]=Режимы просмотра папок в Dolphin
 Name[se]=Dolphin čájehanmodusat
 Name[sk]=Režimy zobrazenia Dolphinu
@@ -135,6 +136,7 @@ Name[pa]=ਵੇਖਣ ਢੰਗ
 Name[pl]=Tryby widoku
 Name[pt]=Modos de Visualização
 Name[pt_BR]=Modos de exibição
+Name[ro]=Moduri de vizualizare
 Name[ru]=Режимы просмотра
 Name[se]=Čájehanmodusat
 Name[sk]=Režimy zobrazenia
@@ -230,6 +232,7 @@ X-KDE-Keywords[pa]=ਫਾਇਲ ਮੈਨੇਜਰ
 X-KDE-Keywords[pl]=zarządzanie plikami
 X-KDE-Keywords[pt]=gestor de ficheiros
 X-KDE-Keywords[pt_BR]=gerenciador de arquivos
+X-KDE-Keywords[ro]=gestionar de fișiere
 X-KDE-Keywords[ru]=диспетчер файлов
 X-KDE-Keywords[sk]=správca súborov
 X-KDE-Keywords[sl]=upravljalnik datotek