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.in b/src/dolphinpart.desktop.in
index 642ce15e08e1b85746e4a1372a4f1b6b713ac445..71690ead950bc2fd78d061f57883d211252df7e9 100644 (file)
--- a/src/dolphinpart.desktop.in
+++ b/src/dolphinpart.desktop.in
@@ -6,6 +6,7 @@ Name[ast]=Vista de Dolphin
 Name[az]=Dolphin görünüşü
 Name[ca]=Vista del Dolphin
 Name[ca@valencia]=Vista del Dolphin
 Name[az]=Dolphin görünüşü
 Name[ca]=Vista del Dolphin
 Name[ca@valencia]=Vista del Dolphin

+Name[cs]=Pohled Dolphin

 Name[da]=Dolphin-visning
 Name[de]=Dolphin-Ansicht
 Name[el]=Dolphin View
 Name[da]=Dolphin-visning
 Name[de]=Dolphin-Ansicht
 Name[el]=Dolphin View


@@ -73,6 +74,7 @@ Name[ast]=Iconos
 Name[az]=İkonlar
 Name[ca]=Icones
 Name[ca@valencia]=Icones
 Name[az]=İkonlar
 Name[ca]=Icones
 Name[ca@valencia]=Icones

+Name[cs]=Ikony

 Name[da]=Ikoner
 Name[de]=Symbole
 Name[el]=Εικονίδια
 Name[da]=Ikoner
 Name[de]=Symbole
 Name[el]=Εικονίδια


@@ -127,6 +129,7 @@ Name[ast]=Compauta
 Name[az]=Yığcam
 Name[ca]=Compacta
 Name[ca@valencia]=Compacta
 Name[az]=Yığcam
 Name[ca]=Compacta
 Name[ca@valencia]=Compacta

+Name[cs]=Kompaktní

 Name[da]=Kompakt
 Name[de]=Kompakt
 Name[el]=Σύμπτυξη
 Name[da]=Kompakt
 Name[de]=Kompakt
 Name[el]=Σύμπτυξη


@@ -180,6 +183,7 @@ Name[ast]=Detalles
 Name[az]=Ətraflı
 Name[ca]=Detalls
 Name[ca@valencia]=Detalls
 Name[az]=Ətraflı
 Name[ca]=Detalls
 Name[ca@valencia]=Detalls

+Name[cs]=Podrobnosti

 Name[da]=Detaljer
 Name[de]=Details
 Name[el]=Λεπτομέρειες
 Name[da]=Detaljer
 Name[de]=Details
 Name[el]=Λεπτομέρειες