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"

1 files changed, 10 insertions, 0 deletions

diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop
index 52412b9b9..24ce9c2f4 100644
--- a/src/dolphinpart.desktop
+++ b/src/dolphinpart.desktop
@@ -10,11 +10,14 @@ Name[fr]=Vue de Dolphin
 Name[gl]=Vista de Dolphin
 Name[id]=Tampilan Dolphin
 Name[it]=Vista di Dolphin
+Name[ko]=Dolphin 보기
+Name[nb]=Dolphin visning
 Name[nl]=Dolphin-weergave
 Name[nn]=Dolphin-vising
 Name[pl]=Widok Dolphina
 Name[pt]=Área do Dolphin
 Name[pt_BR]=Visualização do Dolphin
+Name[se]=Dolphinčájeheapmi
 Name[sk]=Dolphin pohľad
 Name[sl]=Dolphin - pogled
 Name[sr]=Делфинов приказ
@@ -49,11 +52,14 @@ Name[fr]=Icônes
 Name[gl]=Iconas
 Name[id]=Ikon
 Name[it]=Icone
+Name[ko]=아이콘
+Name[nb]=Ikoner
 Name[nl]=Pictogrammen
 Name[nn]=Ikon
 Name[pl]=Ikony
 Name[pt]=Ícones
 Name[pt_BR]=Ícones
+Name[se]=Govažat
 Name[sk]=Ikony
 Name[sl]=Ikone
 Name[sr]=Иконе
@@ -79,6 +85,8 @@ Name[fr]=Concis
 Name[gl]=Compacta
 Name[id]=Sederhana
 Name[it]=Compatta
+Name[ko]=축소됨
+Name[nb]=Kompakt
 Name[nl]=Compact
 Name[pl]=Kompaktowy
 Name[pt]=Compacta
@@ -108,6 +116,8 @@ Name[fr]=Détails
 Name[gl]=Detalles
 Name[id]=Detail
 Name[it]=Dettagli
+Name[ko]=자세히
+Name[nb]=Detaljer
 Name[nl]=Details
 Name[nn]=Detaljar
 Name[pl]=Szczegóły