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 6da2823c96dd5427836d38e0a19857c54ad1d88e..9d94b3c38e53720dab4dc8df0e6bd3f4af08ee62 100644 (file)
--- a/src/dolphinpart.json.in
+++ b/src/dolphinpart.json.in
@@ -8,58 +8,10 @@
             "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[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@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_CN]": "Dolphin 视图",
-        "Name[zh_TW]": "Dolphin 檢視",
         "ServiceTypes": [
             "KParts/ReadOnlyPart",
             "Browser/View"

diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop
index d3a4e8680ad07dc09b0a3bb24736545dbbcb7d15..bd6d921ef9f25beea94a96388c370ab012fc3e80 100755 (executable)
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -129,6 +129,7 @@ Keywords[fr]=fichiers ; gestion de fichiers ; navigation parmi les fichiers ;
 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]=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[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;파일;파일 관리;파일 관리자;탐색;탐색기;삼바;네트워크 공유;

diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json
index bd7bff9abd48692d3d81198bddf8f56ec6dac712..bb5b5d10b64d32b7bdb62ac3d971e8af481df1e4 100644 (file)
--- a/src/settings/kcm/kcmdolphingeneral.json
+++ b/src/settings/kcm/kcmdolphingeneral.json
@@ -7,6 +7,7 @@
         "Description[ca]": "Configura les opcions generals del gestor de fitxers",
         "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[id]": "Konfigurasikan pengaturan pengelola file umum",
         "Description[it]": "Configura le impostazioni generali del gestore dei file",
         "Description[ko]": "일반 파일 관리자 설정",
         "Description[nl]": "Algemene bestandsbeheerderinstellingen configureren",
@@ -30,6 +31,7 @@
         "Name[cs]": "Obecné",
         "Name[es]": "General",
         "Name[fr]": "Général",
+        "Name[id]": "Umum",
         "Name[it]": "Generale",
         "Name[ko]": "일반",
         "Name[nl]": "Algemeen",

diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json
index b84fb310effe17046896e7c6df80be319a800ccf..c18d5624266306d10bf7ced18526baf0f0eef757 100644 (file)
--- a/src/settings/kcm/kcmdolphinnavigation.json
+++ b/src/settings/kcm/kcmdolphinnavigation.json
@@ -7,6 +7,7 @@
         "Description[ca]": "Configura la navegació del gestor de fitxers",
         "Description[es]": "Configurar la navegación del gestor de archivos",
         "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[ko]": "파일 관리자 탐색 설정",
         "Description[nl]": "Bestandsbeheerdernavigatie configureren",

diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json
index 3f1d927abf653f492e8600e69572c53a7170b58b..29460f2af6c39495300a0036a9525840c502a3b8 100644 (file)
--- a/src/settings/kcm/kcmdolphinviewmodes.json
+++ b/src/settings/kcm/kcmdolphinviewmodes.json
@@ -7,6 +7,7 @@
         "Description[ca]": "Configura els modes de vista del gestor de fitxers",
         "Description[es]": "Configurar los modos de vistas del gestor de archivos",
         "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[ko]": "파일 관리자 보기 모드 설정",
         "Description[nl]": "Bestandsbeheerderweergavemodussen configureren",