mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-28 03:21:56 +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
0fc218fd26
commit
2ceaa0ba1b
|
@ -8,58 +8,10 @@
|
||||||
"inode/directory"
|
"inode/directory"
|
||||||
],
|
],
|
||||||
"Name": "Dolphin View",
|
"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[cs]": "Pohled 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[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@ijekavian]": "Делфинов приказ",
|
"Name[sr@ijekavian]": "Делфинов приказ",
|
||||||
"Name[sr@ijekavianlatin]": "Dolphinov prikaz",
|
"Name[sr@ijekavianlatin]": "Dolphinov prikaz",
|
||||||
"Name[sr@latin]": "Dolphinov prikaz",
|
"Name[sr@latin]": "Dolphinov prikaz",
|
||||||
"Name[sr]": "Делфинов приказ",
|
"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_CN]": "Dolphin 视图",
|
|
||||||
"Name[zh_TW]": "Dolphin 檢視",
|
|
||||||
"ServiceTypes": [
|
"ServiceTypes": [
|
||||||
"KParts/ReadOnlyPart",
|
"KParts/ReadOnlyPart",
|
||||||
"Browser/View"
|
"Browser/View"
|
||||||
|
|
|
@ -129,6 +129,7 @@ Keywords[fr]=fichiers ; gestion de fichiers ; navigation parmi les fichiers ;
|
||||||
Keywords[hi]=फ़ाइलें;फ़ाइल प्रबंधन;फ़ाइल ब्राउज़िंग;सांबा;नेटवर्क शेयर;एक्सप्लोरर;खोजक;
|
Keywords[hi]=फ़ाइलें;फ़ाइल प्रबंधन;फ़ाइल ब्राउज़िंग;सांबा;नेटवर्क शेयर;एक्सप्लोरर;खोजक;
|
||||||
Keywords[hu]=fájlok;fájlkezelés;fájlböngészés;samba;hálózati megosztások;Explorer;Finder;
|
Keywords[hu]=fájlok;fájlkezelés;fájlböngészés;samba;hálózati megosztások;Explorer;Finder;
|
||||||
Keywords[ia]=files; gestion de file; navigation de file;samba; partes de rete;Explorator;Trovator;
|
Keywords[ia]=files; gestion de file; navigation de file;samba; partes de rete;Explorator;Trovator;
|
||||||
|
Keywords[id]=files;file management;file browsing;samba;network shares;Explorer;Finder;manajer;
|
||||||
Keywords[is]=skrár;skráastjórn;skráaskoðun;samba;netsameignir;Explorer;Finder;
|
Keywords[is]=skrár;skráastjórn;skráaskoðun;samba;netsameignir;Explorer;Finder;
|
||||||
Keywords[it]=file;gestione dei file;navigazione dei file;samba;condivisioni di rete;Explorer;Finder;
|
Keywords[it]=file;gestione dei file;navigazione dei file;samba;condivisioni di rete;Explorer;Finder;
|
||||||
Keywords[ko]=files;file management;file browsing;samba;network shares;Explorer;Finder;파일;파일 관리;파일 관리자;탐색;탐색기;삼바;네트워크 공유;
|
Keywords[ko]=files;file management;file browsing;samba;network shares;Explorer;Finder;파일;파일 관리;파일 관리자;탐색;탐색기;삼바;네트워크 공유;
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
"Description[ca]": "Configura les opcions generals del gestor de fitxers",
|
"Description[ca]": "Configura les opcions generals del gestor de fitxers",
|
||||||
"Description[es]": "Configurar las preferencias generales del gestor de archivos",
|
"Description[es]": "Configurar las preferencias generales del gestor de archivos",
|
||||||
"Description[fr]": "Configurer les paramètres généraux pour le gestionnaire de fichiers",
|
"Description[fr]": "Configurer les paramètres généraux pour le gestionnaire de fichiers",
|
||||||
|
"Description[id]": "Konfigurasikan pengaturan pengelola file umum",
|
||||||
"Description[it]": "Configura le impostazioni generali del gestore dei file",
|
"Description[it]": "Configura le impostazioni generali del gestore dei file",
|
||||||
"Description[ko]": "일반 파일 관리자 설정",
|
"Description[ko]": "일반 파일 관리자 설정",
|
||||||
"Description[nl]": "Algemene bestandsbeheerderinstellingen configureren",
|
"Description[nl]": "Algemene bestandsbeheerderinstellingen configureren",
|
||||||
|
@ -30,6 +31,7 @@
|
||||||
"Name[cs]": "Obecné",
|
"Name[cs]": "Obecné",
|
||||||
"Name[es]": "General",
|
"Name[es]": "General",
|
||||||
"Name[fr]": "Général",
|
"Name[fr]": "Général",
|
||||||
|
"Name[id]": "Umum",
|
||||||
"Name[it]": "Generale",
|
"Name[it]": "Generale",
|
||||||
"Name[ko]": "일반",
|
"Name[ko]": "일반",
|
||||||
"Name[nl]": "Algemeen",
|
"Name[nl]": "Algemeen",
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
"Description[ca]": "Configura la navegació del gestor de fitxers",
|
"Description[ca]": "Configura la navegació del gestor de fitxers",
|
||||||
"Description[es]": "Configurar la navegación del gestor de archivos",
|
"Description[es]": "Configurar la navegación del gestor de archivos",
|
||||||
"Description[fr]": "Configurer la navigation dans le gestionnaire de fichiers",
|
"Description[fr]": "Configurer la navigation dans le gestionnaire de fichiers",
|
||||||
|
"Description[id]": "Konfigurasikan navigasi pengelola file",
|
||||||
"Description[it]": "Configura la navigazione col gestore dei file",
|
"Description[it]": "Configura la navigazione col gestore dei file",
|
||||||
"Description[ko]": "파일 관리자 탐색 설정",
|
"Description[ko]": "파일 관리자 탐색 설정",
|
||||||
"Description[nl]": "Bestandsbeheerdernavigatie configureren",
|
"Description[nl]": "Bestandsbeheerdernavigatie configureren",
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
"Description[ca]": "Configura els modes de vista del gestor de fitxers",
|
"Description[ca]": "Configura els modes de vista del gestor de fitxers",
|
||||||
"Description[es]": "Configurar los modos de vistas del gestor de archivos",
|
"Description[es]": "Configurar los modos de vistas del gestor de archivos",
|
||||||
"Description[fr]": "Configurer les modes d'affichage du gestionnaire de fichiers",
|
"Description[fr]": "Configurer les modes d'affichage du gestionnaire de fichiers",
|
||||||
|
"Description[id]": "Konfigurasikan mode tampilan pengelola file",
|
||||||
"Description[it]": "Configura le viste del gestore dei file",
|
"Description[it]": "Configura le viste del gestore dei file",
|
||||||
"Description[ko]": "파일 관리자 보기 모드 설정",
|
"Description[ko]": "파일 관리자 보기 모드 설정",
|
||||||
"Description[nl]": "Bestandsbeheerderweergavemodussen configureren",
|
"Description[nl]": "Bestandsbeheerderweergavemodussen configureren",
|
||||||
|
|
Loading…
Reference in a new issue