mirror of
https://invent.kde.org/system/dolphin
synced 2024-08-22 01:40:02 +00:00
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"
This commit is contained in:
parent
f8d1b494db
commit
8c4d4b9a12
|
@ -6,7 +6,6 @@ Name[ast]=Vista de 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
|
||||
|
@ -26,16 +25,13 @@ 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]=Делфинов приказ
|
||||
|
@ -46,8 +42,6 @@ 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_CN]=Dolphin 视图
|
||||
Name[zh_TW]=Dolphin 檢視
|
||||
MimeType=inode/directory;
|
||||
X-KDE-ServiceTypes=KParts/ReadOnlyPart,Browser/View
|
||||
|
@ -74,7 +68,6 @@ Name[ast]=Iconos
|
|||
Name[az]=İkonlar
|
||||
Name[ca]=Icones
|
||||
Name[ca@valencia]=Icones
|
||||
Name[cs]=Ikony
|
||||
Name[da]=Ikoner
|
||||
Name[de]=Symbole
|
||||
Name[el]=Εικονίδια
|
||||
|
@ -95,16 +88,13 @@ 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]=Иконице
|
||||
|
@ -115,8 +105,6 @@ Name[sv]=Ikoner
|
|||
Name[tr]=Simgeler
|
||||
Name[uk]=Піктограми
|
||||
Name[vi]=Biểu tượng
|
||||
Name[x-test]=xxIconsxx
|
||||
Name[zh_CN]=图标
|
||||
Name[zh_TW]=圖示
|
||||
Icon=view-list-icons
|
||||
# Dummy
|
||||
|
@ -129,7 +117,6 @@ Name[ast]=Compauta
|
|||
Name[az]=Yığcam
|
||||
Name[ca]=Compacta
|
||||
Name[ca@valencia]=Compacta
|
||||
Name[cs]=Kompaktní
|
||||
Name[da]=Kompakt
|
||||
Name[de]=Kompakt
|
||||
Name[el]=Σύμπτυξη
|
||||
|
@ -150,9 +137,7 @@ 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
|
||||
|
@ -169,8 +154,6 @@ Name[sv]=Kompakt
|
|||
Name[tr]=Sıkışık
|
||||
Name[uk]=Компактний
|
||||
Name[vi]=Gọn
|
||||
Name[x-test]=xxCompactxx
|
||||
Name[zh_CN]=紧凑
|
||||
Name[zh_TW]=簡潔模式
|
||||
Icon=view-list-details
|
||||
# Dummy
|
||||
|
@ -183,7 +166,6 @@ Name[ast]=Detalles
|
|||
Name[az]=Ətraflı
|
||||
Name[ca]=Detalls
|
||||
Name[ca@valencia]=Detalls
|
||||
Name[cs]=Podrobnosti
|
||||
Name[da]=Detaljer
|
||||
Name[de]=Details
|
||||
Name[el]=Λεπτομέρειες
|
||||
|
@ -204,9 +186,7 @@ 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
|
||||
|
@ -223,8 +203,6 @@ Name[sv]=Detaljinformation
|
|||
Name[tr]=Ayrıntılar
|
||||
Name[uk]=Подробиці
|
||||
Name[vi]=Chi tiết
|
||||
Name[x-test]=xxDetailsxx
|
||||
Name[zh_CN]=详细
|
||||
Name[zh_TW]=詳細模式
|
||||
Icon=view-list-tree
|
||||
# Dummy
|
||||
|
|
Loading…
Reference in a new issue