mirror of
https://invent.kde.org/system/dolphin
synced 2024-07-15 18:01:11 +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
2ceaa0ba1b
commit
0b27270bee
|
@ -8,10 +8,52 @@
|
|||
"inode/directory"
|
||||
],
|
||||
"Name": "Dolphin View",
|
||||
"Name[ar]": "عرض دولفين",
|
||||
"Name[ast]": "Vista de Dolphin",
|
||||
"Name[az]": "Dolphin görünüşü",
|
||||
"Name[ca@valencia]": "Vista de Dolphin",
|
||||
"Name[ca]": "Vista del Dolphin",
|
||||
"Name[da]": "Dolphin-visning",
|
||||
"Name[de]": "Dolphin-Ansicht",
|
||||
"Name[el]": "Dolphin View",
|
||||
"Name[en_GB]": "Dolphin View",
|
||||
"Name[es]": "Vista de Dolphin",
|
||||
"Name[et]": "Dolphini vaade",
|
||||
"Name[eu]": "Dolphin ikuspegia",
|
||||
"Name[fi]": "Dolphin-näkymä",
|
||||
"Name[fr]": "Vue de Dolphin",
|
||||
"Name[gl]": "Vista de Dolphin",
|
||||
"Name[hi]": "डॉल्फ़िन दृश्य",
|
||||
"Name[hu]": "Dolphin nézet",
|
||||
"Name[ia]": "Vista de Dolphin",
|
||||
"Name[id]": "Tampilan Dolphin",
|
||||
"Name[is]": "Dolphin-sýn",
|
||||
"Name[it]": "Vista di Dolphin",
|
||||
"Name[ja]": "Dolphin ビュー",
|
||||
"Name[ko]": "Dolphin 보기",
|
||||
"Name[lt]": "Dolphin rodinys",
|
||||
"Name[lv]": "Dolphin skats",
|
||||
"Name[ml]": "ഡോള്ഫിന് അവതരണരീതി",
|
||||
"Name[my]": "လင်းပိုင် မြင်ကွင်း",
|
||||
"Name[nl]": "Dolphin-weergave",
|
||||
"Name[pa]": "ਡਾਲਫਿਨ ਝਲਕ",
|
||||
"Name[pl]": "Widok Dolphina",
|
||||
"Name[pt_BR]": "Visualização do Dolphin",
|
||||
"Name[ro]": "Dolphin – Vizualizare",
|
||||
"Name[ru]": "Представление Dolphin",
|
||||
"Name[sk]": "Dolphin pohľad",
|
||||
"Name[sl]": "Dolphin - pogled",
|
||||
"Name[sr@ijekavian]": "Делфинов приказ",
|
||||
"Name[sr@ijekavianlatin]": "Dolphinov prikaz",
|
||||
"Name[sr@latin]": "Dolphinov prikaz",
|
||||
"Name[sr]": "Делфинов приказ",
|
||||
"Name[sv]": "Vy i Dolphin",
|
||||
"Name[ta]": "டால்பின் காட்சிமுறை",
|
||||
"Name[tr]": "Dolphin Görünümü",
|
||||
"Name[uk]": "Перегляд Dolphin",
|
||||
"Name[vi]": "Khung xem Dolphin",
|
||||
"Name[x-test]": "xxDolphin Viewxx",
|
||||
"Name[zh_TW]": "Dolphin 檢視",
|
||||
"ServiceTypes": [
|
||||
"KParts/ReadOnlyPart",
|
||||
"Browser/View"
|
||||
|
|
|
@ -11,6 +11,7 @@
|
|||
"Description[it]": "Configura le impostazioni generali del gestore dei file",
|
||||
"Description[ko]": "일반 파일 관리자 설정",
|
||||
"Description[nl]": "Algemene bestandsbeheerderinstellingen configureren",
|
||||
"Description[pl]": "Ustawienia ogólne zarządzania plikami",
|
||||
"Description[pt]": "Configurar as definições gerais do gestor de ficheiros",
|
||||
"Description[pt_BR]": "Configura as opções gerais do gerenciador de arquivos",
|
||||
"Description[ro]": "Configurează opțiuni generale ale gestionarului de fișiere",
|
||||
|
@ -35,6 +36,7 @@
|
|||
"Name[it]": "Generale",
|
||||
"Name[ko]": "일반",
|
||||
"Name[nl]": "Algemeen",
|
||||
"Name[pl]": "Ogólne",
|
||||
"Name[pt]": "Geral",
|
||||
"Name[pt_BR]": "Geral",
|
||||
"Name[ro]": "Generale",
|
||||
|
|
|
@ -11,6 +11,7 @@
|
|||
"Description[it]": "Configura la navigazione col gestore dei file",
|
||||
"Description[ko]": "파일 관리자 탐색 설정",
|
||||
"Description[nl]": "Bestandsbeheerdernavigatie configureren",
|
||||
"Description[pl]": "Ustawienia poruszania się przy zarządzaniu plikami",
|
||||
"Description[pt]": "Configurar a navegação do gestor de ficheiros",
|
||||
"Description[pt_BR]": "Configura a navegação do gerenciador de arquivos",
|
||||
"Description[ro]": "Configurează navigarea cu gestionarul de fișiere",
|
||||
|
@ -57,7 +58,7 @@
|
|||
"Name[nl]": "Navigatie",
|
||||
"Name[nn]": "Navigasjon",
|
||||
"Name[pa]": "ਨੇਵੀਗੇਸ਼ਨ",
|
||||
"Name[pl]": "Nawigacja",
|
||||
"Name[pl]": "Poruszanie się",
|
||||
"Name[pt]": "Navegação",
|
||||
"Name[pt_BR]": "Navegação",
|
||||
"Name[ro]": "Navigare",
|
||||
|
|
|
@ -11,6 +11,7 @@
|
|||
"Description[it]": "Configura le viste del gestore dei file",
|
||||
"Description[ko]": "파일 관리자 보기 모드 설정",
|
||||
"Description[nl]": "Bestandsbeheerderweergavemodussen configureren",
|
||||
"Description[pl]": "Ustawienia trybów widoku zarządzania plikami",
|
||||
"Description[pt]": "Configurar os modos de visualização do gestor de ficheiros",
|
||||
"Description[pt_BR]": "Configura os modos de exibição do gerenciador de arquivos",
|
||||
"Description[ro]": "Configurează regimurile de vizualizare ale gestionarului de fișiere",
|
||||
|
|
Loading…
Reference in a new issue