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 7e94ba9b7cd28dc75358d8f70a90b7557eee7aab..9a6fc903e3f727c13c2e7359fd098a3fefe27da2 100644 (file)
--- a/src/dolphinpart.desktop.in
+++ b/src/dolphinpart.desktop.in
@@ -25,13 +25,16 @@ Name[ko]=Dolphin 보기
 Name[lt]=Dolphin rodinys
 Name[lv]=Dolphin skats
 Name[ml]=ഡോള്‍ഫിന്‍ അവതരണരീതി
+Name[nb]=Dolphin visning
 Name[nl]=Dolphin-weergave
+Name[nn]=Dolphin-vising
 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
 Name[sl]=Dolphin - pogled
 Name[sr]=Делфинов приказ
@@ -42,6 +45,7 @@ Name[sv]=Vy i Dolphin
 Name[tr]=Dolphin Görünümü
 Name[uk]=Перегляд Dolphin
 Name[vi]=Khung xem Dolphin
+Name[x-test]=xxDolphin Viewxx
 Name[zh_TW]=Dolphin 檢視
 MimeType=inode/directory;
 X-KDE-ServiceTypes=KParts/ReadOnlyPart,Browser/View
@@ -88,13 +92,16 @@ Name[ko]=아이콘
 Name[lt]=Piktogramos
 Name[lv]=Ikonas
 Name[ml]=സൂചനാചിത്രങ്ങള്‍
+Name[nb]=Ikoner
 Name[nl]=Pictogrammen
+Name[nn]=Ikon
 Name[pa]=ਆਈਕਾਨ
 Name[pl]=Ikony
 Name[pt]=Ícones
 Name[pt_BR]=Ícones
 Name[ro]=Pictograme
 Name[ru]=Значки
+Name[se]=Govažat
 Name[sk]=Ikony
 Name[sl]=Ikone
 Name[sr]=Иконице
@@ -105,6 +112,7 @@ Name[sv]=Ikoner
 Name[tr]=Simgeler
 Name[uk]=Піктограми
 Name[vi]=Biểu tượng
+Name[x-test]=xxIconsxx
 Name[zh_TW]=圖示
 Icon=view-list-icons
 # Dummy
@@ -137,7 +145,9 @@ Name[ko]=축소됨
 Name[lt]=Kompaktiškas
 Name[lv]=Kompakts
 Name[ml]=തിങ്ങിയത്
+Name[nb]=Kompakt
 Name[nl]=Compact
+Name[nn]=Kompakt
 Name[pa]=ਸੰਖੇਪ
 Name[pl]=Kompaktowy
 Name[pt]=Compacta
@@ -154,6 +164,7 @@ Name[sv]=Kompakt
 Name[tr]=Sıkışık
 Name[uk]=Компактний
 Name[vi]=Gọn
+Name[x-test]=xxCompactxx
 Name[zh_TW]=簡潔模式
 Icon=view-list-details
 # Dummy
@@ -186,7 +197,9 @@ Name[ko]=자세히
 Name[lt]=Išsamus
 Name[lv]=Detaļas
 Name[ml]=വിശദമായി
+Name[nb]=Detaljer
 Name[nl]=Details
+Name[nn]=Detaljar
 Name[pa]=ਵੇਰਵੇ
 Name[pl]=Szczegóły
 Name[pt]=Detalhes
@@ -203,6 +216,7 @@ Name[sv]=Detaljinformation
 Name[tr]=Ayrıntılar
 Name[uk]=Подробиці
 Name[vi]=Chi tiết
+Name[x-test]=xxDetailsxx
 Name[zh_TW]=詳細模式
 Icon=view-list-tree
 # Dummy