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 9502fd06553c2186d5887d230c5fc72e3630ad5e..b01cb5dfa5692b56afc98d0c926838a7ca46ef4d 100644 (file)
--- a/src/dolphinpart.json.in
+++ b/src/dolphinpart.json.in
@@ -9,7 +9,6 @@
         ],
         "Name": "Dolphin View",
         "Name[ar]": "عرض دولفين",
         ],
         "Name": "Dolphin View",
         "Name[ar]": "عرض دولفين",

-        "Name[ast]": "Vista de Dolphin",

         "Name[az]": "Dolphin görünüşü",
         "Name[bg]": "Изглед на Dolphin",
         "Name[ca@valencia]": "Vista de Dolphin",
         "Name[az]": "Dolphin görünüşü",
         "Name[bg]": "Изглед на Dolphin",
         "Name[ca@valencia]": "Vista de Dolphin",

diff --git a/src/dolphinpartactions.desktop b/src/dolphinpartactions.desktop
index 595df530b54ddded21f4c4d697974962b4a22eae..ed96c55e72ff6b44eee1f3fbaa84fb2971020ca1 100644 (file)
--- a/src/dolphinpartactions.desktop
+++ b/src/dolphinpartactions.desktop
@@ -8,7 +8,6 @@ Actions=icons;details;compact;
 [Desktop Action icons]
 Name=Icons
 Name[ar]=الأيقونات
 [Desktop Action icons]
 Name=Icons
 Name[ar]=الأيقونات

-Name[ast]=Iconos

 Name[az]=İkonlar
 Name[bg]=Икони
 Name[ca]=Icones
 Name[az]=İkonlar
 Name[bg]=Икони
 Name[ca]=Icones


@@ -69,7 +68,6 @@ Exec=dolphin
 [Desktop Action compact]
 Name=Compact
 Name[ar]=متراصّ
 [Desktop Action compact]
 Name=Compact
 Name[ar]=متراصّ

-Name[ast]=Compauta

 Name[az]=Yığcam
 Name[bg]=Компактен
 Name[ca]=Compacta
 Name[az]=Yığcam
 Name[bg]=Компактен
 Name[ca]=Compacta


@@ -129,7 +127,6 @@ Exec=dolphin
 [Desktop Action details]
 Name=Details
 Name[ar]=التّفاصيل
 [Desktop Action details]
 Name=Details
 Name[ar]=التّفاصيل

-Name[ast]=Detalles

 Name[az]=Ətraflı
 Name[bg]=Подробности
 Name[ca]=Detalls
 Name[az]=Ətraflı
 Name[bg]=Подробности
 Name[ca]=Detalls

diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop
index 0d99a03ef8b117f1f68ea18c534b16cc6c53d343..854997b5687e099af969696f290a028598f1a987 100755 (executable)
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -1,7 +1,6 @@
 [Desktop Entry]
 Name=Dolphin
 Name[ar]=دولفين
 [Desktop Entry]
 Name=Dolphin
 Name[ar]=دولفين

-Name[ast]=Dolphin

 Name[az]=Dolphin
 Name[bg]=Dolphin
 Name[ca]=Dolphin
 Name[az]=Dolphin
 Name[bg]=Dolphin
 Name[ca]=Dolphin


@@ -62,7 +61,6 @@ X-DocPath=dolphin/index.html
 Categories=Qt;KDE;System;FileTools;FileManager;
 GenericName=File Manager
 GenericName[ar]=مدير ملفّات
 Categories=Qt;KDE;System;FileTools;FileManager;
 GenericName=File Manager
 GenericName[ar]=مدير ملفّات

-GenericName[ast]=Xestor de ficheros

 GenericName[az]=Fayl meneceri
 GenericName[bg]=Файлов мениджър
 GenericName[ca]=Gestor de fitxers
 GenericName[az]=Fayl meneceri
 GenericName[bg]=Файлов мениджър
 GenericName[ca]=Gestor de fitxers

diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json
index bbeba9a2a02fdc76c928b0a4c35e1c623bb0f7a5..0f8530b8815752f207ad9b5815629a44907f16a7 100644 (file)
--- a/src/settings/kcm/kcmdolphinnavigation.json
+++ b/src/settings/kcm/kcmdolphinnavigation.json
@@ -39,7 +39,6 @@
         "Icon": "preferences-desktop-navigation",
         "Name": "Navigation",
         "Name[ar]": "التّنقّل",
         "Icon": "preferences-desktop-navigation",
         "Name": "Navigation",
         "Name[ar]": "التّنقّل",

-        "Name[ast]": "Navegación",

         "Name[az]": "Naviqasiya",
         "Name[bg]": "Навигация",
         "Name[ca@valencia]": "Navegació",
         "Name[az]": "Naviqasiya",
         "Name[bg]": "Навигация",
         "Name[ca@valencia]": "Navegació",

diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json
index f16bbba6b29a72b0171d75b87dd060196a99052c..e77f4906d5fc0967970b5c5a8ae3e0a3bee7c96c 100644 (file)
--- a/src/settings/kcm/kcmdolphinviewmodes.json
+++ b/src/settings/kcm/kcmdolphinviewmodes.json
@@ -39,7 +39,6 @@
         "Icon": "preferences-desktop-icons",
         "Name": "View Modes",
         "Name[ar]": "أوضاع المنظور",
         "Icon": "preferences-desktop-icons",
         "Name": "View Modes",
         "Name[ar]": "أوضاع المنظور",

-        "Name[ast]": "Moos de vista",

         "Name[az]": "Baxış rejimləri",
         "Name[bg]": "Режими на преглед",
         "Name[ca@valencia]": "Modes de vista",
         "Name[az]": "Baxış rejimləri",
         "Name[bg]": "Режими на преглед",
         "Name[ca@valencia]": "Modes de vista",