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
5ef1136ea3
commit
4f1d8fef92
|
@ -28,6 +28,7 @@
|
|||
"Name[hu]": "Dolphin nézet",
|
||||
"Name[ia]": "Vista de Dolphin",
|
||||
"Name[id]": "Tampilan Dolphin",
|
||||
"Name[ie]": "Vise de Dolphin",
|
||||
"Name[is]": "Dolphin-sýn",
|
||||
"Name[it]": "Vista di Dolphin",
|
||||
"Name[ja]": "Dolphin ビュー",
|
||||
|
|
|
@ -28,6 +28,7 @@ Name[hi]=प्रतीक
|
|||
Name[hu]=Ikonok
|
||||
Name[ia]=Icones
|
||||
Name[id]=Ikon
|
||||
Name[ie]=Icones
|
||||
Name[is]=Táknmyndir
|
||||
Name[it]=Icone
|
||||
Name[ja]=アイコン
|
||||
|
@ -88,6 +89,7 @@ Name[hi]=सघन
|
|||
Name[hu]=Kompakt
|
||||
Name[ia]=Compacte
|
||||
Name[id]=Ringkas
|
||||
Name[ie]=Compact
|
||||
Name[is]=Þjappað
|
||||
Name[it]=Compatta
|
||||
Name[ja]=コンパクト
|
||||
|
@ -147,6 +149,7 @@ Name[hi]=विवरण
|
|||
Name[hu]=Részletek
|
||||
Name[ia]=Detalios
|
||||
Name[id]=Perincian
|
||||
Name[ie]=Detallies
|
||||
Name[is]=Nánar
|
||||
Name[it]=Dettagli
|
||||
Name[ja]=詳細
|
||||
|
|
|
@ -21,6 +21,7 @@ Name[hi]=डॉल्फ़िन
|
|||
Name[hu]=Dolphin
|
||||
Name[ia]=Dolphin
|
||||
Name[id]=Dolphin
|
||||
Name[ie]=Dolphin
|
||||
Name[is]=Dolphin
|
||||
Name[it]=Dolphin
|
||||
Name[ja]=Dolphin
|
||||
|
@ -81,6 +82,7 @@ GenericName[hi]=फ़ाइल प्रबंधक
|
|||
GenericName[hu]=Fájlkezelő
|
||||
GenericName[ia]=Gerente de file
|
||||
GenericName[id]=Pengelola File
|
||||
GenericName[ie]=Gerente de files
|
||||
GenericName[is]=Skráastjóri
|
||||
GenericName[it]=Gestore dei file
|
||||
GenericName[ja]=ファイルマネージャ
|
||||
|
@ -134,6 +136,7 @@ Keywords[hi]=फ़ाइलें;फ़ाइल प्रबंधन;फ़
|
|||
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[id]=file;berkas;pengelola file;peramban file;samba;pembagian jaringan;Explorer;Finder;
|
||||
Keywords[ie]=files;gestie;gerente;navigation;rete;samba;partite;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[ka]=files;file management;file browsing;samba;network shares;Explorer;Finder;
|
||||
|
|
|
@ -16,6 +16,7 @@
|
|||
"Description[fr]": "Configurer les paramètres généraux pour le gestionnaire de fichiers",
|
||||
"Description[ia]": "Configura preferentias del gerente general de file",
|
||||
"Description[id]": "Konfigurasikan pengaturan pengelola file umum",
|
||||
"Description[ie]": "Configurar li parametres del gerente de files",
|
||||
"Description[is]": "Sýsla með almennar stillingar skráastjóra",
|
||||
"Description[it]": "Configura le impostazioni generali del gestore dei file",
|
||||
"Description[ka]": "ფაილების მმართველის ზოგადი მორგება",
|
||||
|
@ -53,6 +54,7 @@
|
|||
"Name[fr]": "Général",
|
||||
"Name[ia]": "General",
|
||||
"Name[id]": "Umum",
|
||||
"Name[ie]": "General",
|
||||
"Name[is]": "Almennt",
|
||||
"Name[it]": "Generale",
|
||||
"Name[ka]": "მთავარი",
|
||||
|
|
|
@ -16,6 +16,7 @@
|
|||
"Description[fr]": "Configurer la navigation dans le gestionnaire de fichiers",
|
||||
"Description[ia]": "Configura navigation del gerente de file",
|
||||
"Description[id]": "Konfigurasikan navigasi pengelola file",
|
||||
"Description[ie]": "Configurar li navigation del gerente de files",
|
||||
"Description[is]": "Stilla flakkstýringar skráastjóra",
|
||||
"Description[it]": "Configura la navigazione col gestore dei file",
|
||||
"Description[ka]": "ფაილების მმართველის ნავიგაციის მორგება",
|
||||
|
@ -59,6 +60,7 @@
|
|||
"Name[hu]": "Navigálás",
|
||||
"Name[ia]": "Navigation",
|
||||
"Name[id]": "Navigasi",
|
||||
"Name[ie]": "Navigation",
|
||||
"Name[is]": "Flakk",
|
||||
"Name[it]": "Navigazione",
|
||||
"Name[ja]": "ナビゲーション",
|
||||
|
|
|
@ -16,6 +16,7 @@
|
|||
"Description[fr]": "Configurer les modes d'affichage du gestionnaire de fichiers",
|
||||
"Description[ia]": "Configura le modos de vista del gerente de file",
|
||||
"Description[id]": "Konfigurasikan mode tampilan pengelola file",
|
||||
"Description[ie]": "Configurar li modes de vise del gerente de files",
|
||||
"Description[is]": "Stilla skoðunarhami í skráastjóra",
|
||||
"Description[it]": "Configura le viste del gestore dei file",
|
||||
"Description[ka]": "ფაილების მმართველის ხედის რეჟიმების მორგება",
|
||||
|
@ -58,6 +59,7 @@
|
|||
"Name[hu]": "Nézetmódok",
|
||||
"Name[ia]": "Modos de vista",
|
||||
"Name[id]": "Mode Tampilan",
|
||||
"Name[ie]": "Modes de vise",
|
||||
"Name[is]": "Skoðunarhamir",
|
||||
"Name[it]": "Viste",
|
||||
"Name[ja]": "表示モード",
|
||||
|
|
Loading…
Reference in a new issue