From 4b438da3cb4699d395565a0d5e71d7f7d77c945d Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 1 Sep 2020 10:13:23 +0200
Subject: 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"
---
 src/dolphinpart.desktop | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/dolphinpart.desktop')

diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop
index abd206d6a..5865b0acf 100644
--- 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
-- 
cgit v1.3