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.desktop b/src/dolphinpart.desktop
index da0a659d3d27ca9a9cce0d1802f8331e6edf1892..a0d7a96b245ea722912542678efc9bbceba01728 100644 (file)
--- a/src/dolphinpart.desktop
+++ b/src/dolphinpart.desktop
@@ -71,6 +71,7 @@ Name[et]=Ikoonid
 Name[fi]=Kuvakkeet
 Name[fr]=Icônes
 Name[gl]=Iconas
+Name[he]=סמלים
 Name[hu]=Ikonok
 Name[ia]=Icones
 Name[id]=Ikon
@@ -118,6 +119,7 @@ Name[et]=Kompaktne
 Name[fi]=Tiivis
 Name[fr]=Concis
 Name[gl]=Compacta
+Name[he]=קומפקטי
 Name[hu]=Kompakt
 Name[ia]=Compacte
 Name[id]=Sederhana
@@ -165,6 +167,7 @@ Name[et]=Üksikasjad
 Name[fi]=Yksityiskohdat
 Name[fr]=Détails
 Name[gl]=Detalles
+Name[he]=פרטים
 Name[hu]=Részletek
 Name[ia]=Detalios
 Name[id]=Detail

diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop
index 63b72d966e9a4f6b7c9871415d5605ee7d442972..f187cef5867b8c50f5abade5bfd68e30491ace8d 100755 (executable)
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -62,6 +62,7 @@ GenericName[et]=Failihaldur
 GenericName[fi]=Tiedostonhallinta
 GenericName[fr]=Gestionnaire de fichiers
 GenericName[gl]=Xestor de ficheiros
+GenericName[he]=מנהל קבצים
 GenericName[hu]=Fájlkezelő
 GenericName[ia]=Gerente de file
 GenericName[id]=Manajer Berkas

diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop
index 556231e4433965f6fcd13f3adf28d29f10eaeda7..eb9809bb82bfe4faa51ded46bfa4a01255218555 100644 (file)
--- a/src/settings/kcm/kcmdolphingeneral.desktop
+++ b/src/settings/kcm/kcmdolphingeneral.desktop
@@ -108,6 +108,7 @@ Name[et]=Üldine
 Name[fi]=Yleiset
 Name[fr]=Général
 Name[gl]=Xerais
+Name[he]=כללי
 Name[hu]=Általános
 Name[ia]=General
 Name[id]=Umum
@@ -191,6 +192,7 @@ X-KDE-Keywords[et]=failihaldur
 X-KDE-Keywords[fi]=tiedostonhallinta
 X-KDE-Keywords[fr]=gestionnaire de fichiers
 X-KDE-Keywords[gl]=xestor de ficheiros
+X-KDE-Keywords[he]=מנהל קבצים
 X-KDE-Keywords[hu]=fájlkezelő
 X-KDE-Keywords[ia]=gerente de file
 X-KDE-Keywords[id]=manajer berkas

diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop
index 9280624d61ed146c880c46fb10a43d84db78e61e..238f5d2669bb2fe1ca07d0e9c4933c7cb9945ca9 100644 (file)
--- a/src/settings/kcm/kcmdolphinnavigation.desktop
+++ b/src/settings/kcm/kcmdolphinnavigation.desktop
@@ -107,6 +107,7 @@ Name[et]=Liikumine
 Name[fi]=Selaus
 Name[fr]=Navigation
 Name[gl]=Navegación
+Name[he]=ניווט
 Name[hu]=Navigálás
 Name[ia]=Navigation
 Name[id]=Navigasi
@@ -192,6 +193,7 @@ X-KDE-Keywords[et]=failihaldur
 X-KDE-Keywords[fi]=tiedostonhallinta
 X-KDE-Keywords[fr]=gestionnaire de fichiers
 X-KDE-Keywords[gl]=xestor de ficheiros
+X-KDE-Keywords[he]=מנהל קבצים
 X-KDE-Keywords[hu]=fájlkezelő
 X-KDE-Keywords[ia]=gerente de file
 X-KDE-Keywords[id]=manajer berkas

diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop
index 42e0538fa956f80459049ae6975ee65ecd71f6e7..0b41019a8293031491ea173459090a2c7ce5344f 100644 (file)
--- a/src/settings/kcm/kcmdolphinservices.desktop
+++ b/src/settings/kcm/kcmdolphinservices.desktop
@@ -66,6 +66,7 @@ Name[et]=Teenused
 Name[fi]=Palvelut
 Name[fr]=Services
 Name[gl]=Servizos
+Name[he]=שירותים
 Name[hu]=Szolgáltatások
 Name[ia]=Servicios
 Name[id]=Layanan
@@ -149,6 +150,7 @@ X-KDE-Keywords[et]=failihaldur
 X-KDE-Keywords[fi]=tiedostonhallinta
 X-KDE-Keywords[fr]=gestionnaire de fichiers
 X-KDE-Keywords[gl]=xestor de ficheiros
+X-KDE-Keywords[he]=מנהל קבצים
 X-KDE-Keywords[hu]=fájlkezelő
 X-KDE-Keywords[ia]=gerente de file
 X-KDE-Keywords[id]=manajer berkas

diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop
index 0be2656a010c586063195f9e08f754592a7e70ba..41062deff1b934a0f75e6a028fbb66ec7f1d6d72 100644 (file)
--- a/src/settings/kcm/kcmdolphinviewmodes.desktop
+++ b/src/settings/kcm/kcmdolphinviewmodes.desktop
@@ -191,6 +191,7 @@ X-KDE-Keywords[et]=failihaldur
 X-KDE-Keywords[fi]=tiedostonhallinta
 X-KDE-Keywords[fr]=gestionnaire de fichiers
 X-KDE-Keywords[gl]=xestor de ficheiros
+X-KDE-Keywords[he]=מנהל קבצים
 X-KDE-Keywords[hu]=fájlkezelő
 X-KDE-Keywords[ia]=gerente de file
 X-KDE-Keywords[id]=manajer berkas