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/dolphinpart.desktop b/src/dolphinpart.desktop
index abd206d6a512c1aa58f610596e821fdc768a60c5..5865b0acfa5c1cb25b89067d21693ddf93f1d1ff 100644 (file)
--- a/src/dolphinpart.desktop
+++ b/src/dolphinpart.desktop
@@ -33,6 +33,7 @@ Name[pa]=ਡਾਲਫਿਨ ਝਲਕ
 Name[pl]=Widok Dolphina
 Name[pt]=Área do Dolphin
 Name[pt_BR]=Visualização do Dolphin
+Name[ro]=Dolphin – Vizualizare
 Name[ru]=Представление Dolphin
 Name[se]=Dolphinčájeheapmi
 Name[sk]=Dolphin pohľad
@@ -95,6 +96,7 @@ Name[pa]=ਆਈਕਾਨ
 Name[pl]=Ikony
 Name[pt]=Ícones
 Name[pt_BR]=Ícones
+Name[ro]=Pictograme
 Name[ru]=Значки
 Name[se]=Govažat
 Name[sk]=Ikony
@@ -148,6 +150,7 @@ Name[pa]=ਸੰਖੇਪ
 Name[pl]=Kompaktowy
 Name[pt]=Compacta
 Name[pt_BR]=Compacto
+Name[ro]=Compactă
 Name[ru]=Столбцы
 Name[sk]=Kompaktný
 Name[sl]=Strnjeno
@@ -200,6 +203,7 @@ Name[pa]=ਵੇਰਵੇ
 Name[pl]=Szczegóły
 Name[pt]=Detalhes
 Name[pt_BR]=Detalhes
+Name[ro]=Detalii
 Name[ru]=Таблица
 Name[sk]=Podrobnosti
 Name[sl]=Podrobnosti

diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop
index 94682ce6d927549375153cecfae63391c2a415e2..167bbd06fd4508203a163bfef9f8d77752832c66 100755 (executable)
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -32,6 +32,7 @@ Name[pa]=ਡਾਲਫਿਨ
 Name[pl]=Dolphin
 Name[pt]=Dolphin
 Name[pt_BR]=Dolphin
+Name[ro]=Dolphin
 Name[ru]=Dolphin
 Name[se]=Dolphin
 Name[sk]=Dolphin
@@ -85,6 +86,7 @@ GenericName[pa]=ਫਾਇਲ ਮੈਨੇਜਰ
 GenericName[pl]=Zarządzanie plikami
 GenericName[pt]=Gestor de Ficheiros
 GenericName[pt_BR]=Gerenciador de arquivos
+GenericName[ro]=Gestionar de fișiere
 GenericName[ru]=Диспетчер файлов
 GenericName[se]=Fiilagieđahalli
 GenericName[sk]=Správca súborov

diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop
index ba8cdefde7782d2eaa33085051c1086e5744d2d1..752aa2ea5bce06ddd6d588e0612292d6b1ceed95 100644 (file)
--- 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 fd649b54816305d7fc3655f8e6db2cb90e283870..a6f3a4ddc8546d10a5286cf6c3ecbdf9fe52bb0c 100644 (file)
--- 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 10e806a817c7c2cd04392d71357ef0ae60b36ba6..6eccee85076edb52d41d6811330342c14cdaa454 100644 (file)
--- 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 b5ea5d047ad52e818895026cc2b0ca9c57f1894e..ec35fa692b449db7bd453c6a7b23d391a9ce0ba1 100644 (file)
--- 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