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 9b30895428cca2f3faa8def8b9d7fce45721d927..da0a659d3d27ca9a9cce0d1802f8331e6edf1892 100644 (file)
--- a/src/dolphinpart.desktop
+++ b/src/dolphinpart.desktop
@@ -152,6 +152,7 @@ Exec=dolphin
 [Desktop Action details]
 Name=Details
 Name[ar]=التّفاصيل
+Name[ast]=Detalles
 Name[ca]=Detalls
 Name[ca@valencia]=Detalls
 Name[cs]=Podrobnosti

diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop
index f50ef2b6c09574c8a860c6685afefcb5d7e1317c..63b72d966e9a4f6b7c9871415d5605ee7d442972 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[ca]=Dolphin
 Name[ca@valencia]=Dolphin
 Name[cs]=Dolphin
@@ -48,6 +49,7 @@ X-DocPath=dolphin/index.html
 Categories=Qt;KDE;System;FileTools;FileManager;
 GenericName=File Manager
 GenericName[ar]=مدير ملفّات
+GenericName[ast]=Xestor de ficheros
 GenericName[ca]=Gestor de fitxers
 GenericName[ca@valencia]=Gestor de fitxers
 GenericName[cs]=Správce souborů

diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop
index 499fe739129507e05d16801b5714635a1afa7baa..556231e4433965f6fcd13f3adf28d29f10eaeda7 100644 (file)
--- a/src/settings/kcm/kcmdolphingeneral.desktop
+++ b/src/settings/kcm/kcmdolphingeneral.desktop
@@ -95,6 +95,7 @@ X-DocPath=dolphin/index.html#preferences-dialog-general
 # ctxt: Random file browsing settings.
 Name=General
 Name[ar]=عامّ
+Name[ast]=Xeneral
 Name[ca]=General
 Name[ca@valencia]=General
 Name[cs]=Obecné
@@ -177,6 +178,7 @@ Comment[zh_CN]=配置常规文件管理器设置
 Comment[zh_TW]=設定一般檔案管理員
 X-KDE-Keywords=file manager
 X-KDE-Keywords[ar]=مدير ملفّات ملفات الملفّات الملفات
+X-KDE-Keywords[ast]=xestor de ficheros
 X-KDE-Keywords[ca]=gestor de fitxers
 X-KDE-Keywords[ca@valencia]=gestor de fitxers
 X-KDE-Keywords[cs]=správce souborů

diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop
index e03a336deaffbd987090288db64bdfc1c7083279..9280624d61ed146c880c46fb10a43d84db78e61e 100644 (file)
--- a/src/settings/kcm/kcmdolphinnavigation.desktop
+++ b/src/settings/kcm/kcmdolphinnavigation.desktop
@@ -94,6 +94,7 @@ X-KDE-ParentApp=kcontrol
 X-DocPath=dolphin/index.html#preferences-dialog-navigation
 Name=Navigation
 Name[ar]=التّنقّل
+Name[ast]=Navegación
 Name[ca]=Navegació
 Name[ca@valencia]=Navegació
 Name[cs]=Navigace
@@ -178,6 +179,7 @@ Comment[zh_CN]=配置文件管理器导航
 Comment[zh_TW]=設定檔案管理員導覽
 X-KDE-Keywords=file manager
 X-KDE-Keywords[ar]=مدير ملفّات ملفات الملفّات الملفات
+X-KDE-Keywords[ast]=xestor de ficheros
 X-KDE-Keywords[ca]=gestor de fitxers
 X-KDE-Keywords[ca@valencia]=gestor de fitxers
 X-KDE-Keywords[cs]=správce souborů

diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop
index 2905db14bcfb8381a7a11ab60350db3c0070ea99..42e0538fa956f80459049ae6975ee65ecd71f6e7 100644 (file)
--- a/src/settings/kcm/kcmdolphinservices.desktop
+++ b/src/settings/kcm/kcmdolphinservices.desktop
@@ -1,5 +1,6 @@
 Name=Dolphin Services
 Name[ar]=خدمات دولفين
+Name[ast]=Servicios de Dolphin
 Name[ca]=Serveis del Dolphin
 Name[ca@valencia]=Serveis del Dolphin
 Name[cs]=Služby Dolphinu
@@ -52,6 +53,7 @@ X-KDE-ParentApp=kcontrol
 X-DocPath=dolphin/index.html#preferences-dialog-services
 Name=Services
 Name[ar]=الخدمات
+Name[ast]=Servicios
 Name[ca]=Serveis
 Name[ca@valencia]=Serveis
 Name[cs]=Služby
@@ -134,6 +136,7 @@ Comment[zh_CN]=配置文件管理器服务
 Comment[zh_TW]=設定檔案管理員服務
 X-KDE-Keywords=file manager
 X-KDE-Keywords[ar]=مدير ملفّات ملفات الملفّات الملفات
+X-KDE-Keywords[ast]=xestor de ficheros
 X-KDE-Keywords[ca]=gestor de fitxers
 X-KDE-Keywords[ca@valencia]=gestor de fitxers
 X-KDE-Keywords[cs]=správce souborů

diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop
index 21ee6cf75a2208bccdd9365a82a7b46ef633dce6..0be2656a010c586063195f9e08f754592a7e70ba 100644 (file)
--- a/src/settings/kcm/kcmdolphinviewmodes.desktop
+++ b/src/settings/kcm/kcmdolphinviewmodes.desktop
@@ -178,6 +178,7 @@ Comment[zh_CN]=配置文件管理器视图模式
 Comment[zh_TW]=設定檔案管理員檢視模式
 X-KDE-Keywords=file manager
 X-KDE-Keywords[ar]=مدير ملفّات ملفات الملفّات الملفات
+X-KDE-Keywords[ast]=xestor de ficheros
 X-KDE-Keywords[ca]=gestor de fitxers
 X-KDE-Keywords[ca@valencia]=gestor de fitxers
 X-KDE-Keywords[cs]=správce souborů