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.json.in b/src/dolphinpart.json.in
index b01cb5dfa5692b56afc98d0c926838a7ca46ef4d..f0727c7119f907d29fc120ff7afc20f6515f4e96 100644 (file)
--- a/src/dolphinpart.json.in
+++ b/src/dolphinpart.json.in
@@ -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 ビュー",

diff --git a/src/dolphinpartactions.desktop b/src/dolphinpartactions.desktop
index ed96c55e72ff6b44eee1f3fbaa84fb2971020ca1..459a01a73109b04547edf66fa2336f48e2220597 100644 (file)
--- a/src/dolphinpartactions.desktop
+++ b/src/dolphinpartactions.desktop
@@ -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]=詳細

diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop
index 854997b5687e099af969696f290a028598f1a987..83c289d1930bd05e618e10a206da0896c9586387 100755 (executable)
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -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;

diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json
index bae037992b8ec4369324fcbe6f6c982235071725..00890b763344edcd4b7f80e43bdd87c531d6a1df 100644 (file)
--- a/src/settings/kcm/kcmdolphingeneral.json
+++ b/src/settings/kcm/kcmdolphingeneral.json
@@ -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]": "მთავარი",

diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json
index 0f8530b8815752f207ad9b5815629a44907f16a7..803735a2a5c7818c48c362e225989bc517fc0ead 100644 (file)
--- a/src/settings/kcm/kcmdolphinnavigation.json
+++ b/src/settings/kcm/kcmdolphinnavigation.json
@@ -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]": "ナビゲーション",

diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json
index e77f4906d5fc0967970b5c5a8ae3e0a3bee7c96c..7f330f398a86d488b09fd11fe2f03c272dad00d3 100644 (file)
--- a/src/settings/kcm/kcmdolphinviewmodes.json
+++ b/src/settings/kcm/kcmdolphinviewmodes.json
@@ -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]": "表示モード",