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 e8c87b8f2b567b1b4fe0c9e018afc8a9d430c867..58c0d9a9cc3e4447b33cf3ef78bc3c01a6f8d728 100644 (file)
--- a/src/dolphinpart.json.in
+++ b/src/dolphinpart.json.in
@@ -25,6 +25,7 @@
         "Name[fi]": "Dolphin-näkymä",
         "Name[fr]": "Vue de Dolphin",
         "Name[gl]": "Vista de Dolphin",
+        "Name[he]": "תצוגת Dolphin",
         "Name[hi]": "डॉल्फ़िन दृश्य",
         "Name[hu]": "Dolphin nézet",
         "Name[ia]": "Vista de Dolphin",

diff --git a/src/dolphinpartactions.desktop b/src/dolphinpartactions.desktop
index 24ee78f7edaf2108c02e33ac51b4694c799f1d14..52cdf58c05926a8ea46c805c031127fc3c3d4048 100644 (file)
--- a/src/dolphinpartactions.desktop
+++ b/src/dolphinpartactions.desktop
@@ -8,6 +8,7 @@ Actions=icons;details;compact;
 [Desktop Action icons]
 Name=Icons
 Name[ar]=الأيقونات
+Name[ast]=Iconos
 Name[az]=İkonlar
 Name[be]=Значкі
 Name[bg]=Икони
@@ -88,7 +89,7 @@ Name[eu]=Trinkoa
 Name[fi]=Tiivis
 Name[fr]=Concis
 Name[gl]=Compacta
-Name[he]=×\97ס×\9b×\95× ×\99ת
+Name[he]=×\9eצ×\95×\9eצ×\9eת
 Name[hi]=सघन
 Name[hu]=Kompakt
 Name[ia]=Compacte
@@ -133,6 +134,7 @@ Exec=dolphin
 [Desktop Action details]
 Name=Details
 Name[ar]=التّفاصيل
+Name[ast]=Detalles
 Name[az]=Ətraflı
 Name[be]=Падрабязы выгляд
 Name[bg]=Подробности

diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop
index b041e02ac98e7667fec78b6679ef664a79a28194..d7d09381bd240f1a9a9031e30fd4ba9c58355cb1 100755 (executable)
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=Dolphin
 Name[ar]=دولفين
+Name[ast]=Dolphin
 Name[az]=Dolphin
 Name[be]=Dolphin
 Name[bg]=Dolphin
@@ -64,6 +65,7 @@ X-DocPath=dolphin/index.html
 Categories=Qt;KDE;System;FileTools;FileManager;
 GenericName=File Manager
 GenericName[ar]=مدير ملفّات
+GenericName[ast]=Xestor de ficheros
 GenericName[az]=Fayl meneceri
 GenericName[be]=Кіраўнік файлаў
 GenericName[bg]=Файлов мениджър
@@ -124,6 +126,7 @@ MimeType=inode/directory;
 InitialPreference=10
 Keywords=files;file management;file browsing;samba;network shares;Explorer;Finder;
 Keywords[ar]=ملف;ملفات;متصفح;سامبا;مشاركة;إدارة;إدارة ملفات;شبكة;
+Keywords[ast]=ficheros;xestión de ficheros;restolar ficheros;samba;esplorador;comparticiones de rede;compartición de rede;
 Keywords[az]=fayllar;fayl idarəetməsi;fayl bələdçisi;smaba:şəbəkədə paylaşımlar;Araşdırmaq;Tapmaq;
 Keywords[be]=файлы;кіраванне файламі;агляд файлаў;samba;сеткавыя рэсурсы;агляд;пошук;
 Keywords[bg]=файлове;управление на файлове;преглед на файлове;samba;мрежове споделяния;Explorer;Търсене на файлове;
@@ -140,6 +143,7 @@ Keywords[eu]=fitxategiak;fitxategi kudeaketa;fitxategiak arakatzea;samba;sare pa
 Keywords[fi]=tiedostot;tiedostonhallinta;tiedostojen selaus;samba;verkko;verkkojaot;Explorer;Finder;
 Keywords[fr]=fichiers ; gestion de fichiers ; navigation parmi les fichiers ; samba ; partages sur réseau ; explorateur ; chercheur ;
 Keywords[gl]=ficheiros;xestión de ficheiros;navegación de ficheiros;samba;comparticións de rede;Explorer;Finder;arquivos
+Keywords[he]=קבצים;ניהול קבצים;מנהל קבצים;שיתופי רשת;עיון בקבצים;דפדפוף בקבצים;דפדפן קבצים;חוקר;מאתר;מוצא;אקספלורר;דפדפן קבצים;סייר קבצים;נווט קבצים;
 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;

diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json
index 57fcaa3dad50c07afafe04237cab8ef4a37bdba8..f168aadda1f30427e95f8722f6d3fb4b7303651d 100644 (file)
--- a/src/settings/kcm/kcmdolphingeneral.json
+++ b/src/settings/kcm/kcmdolphingeneral.json
@@ -3,6 +3,7 @@
         "Icon": "system-file-manager",
         "Name": "General",
         "Name[ar]": "عامّ",
+        "Name[ast]": "Xeneral",
         "Name[az]": "Əsas",
         "Name[be]": "Асноўныя",
         "Name[bg]": "Общи",
@@ -18,6 +19,7 @@
         "Name[fi]": "Perusasetukset",
         "Name[fr]": "Général",
         "Name[gl]": "Xeral",
+        "Name[he]": "כללי",
         "Name[hi]": "साधारण",
         "Name[ia]": "General",
         "Name[id]": "Umum",

diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json
index 3ba03c5fa1cba16717527afe4ff1edb74efd4b56..abb2401a7fa23a808268397ef1a7c96c39a58a3e 100644 (file)
--- a/src/settings/kcm/kcmdolphinviewmodes.json
+++ b/src/settings/kcm/kcmdolphinviewmodes.json
@@ -19,6 +19,7 @@
         "Name[fi]": "Näkymät",
         "Name[fr]": "Modes d'affichage",
         "Name[gl]": "Modos de vista",
+        "Name[he]": "מצבי תצוגה",
         "Name[hi]": "दृश्य मोड्स",
         "Name[hu]": "Nézetmódok",
         "Name[ia]": "Modos de vista",