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..7f5ad8440f983ce1d7bfe1bfd327d73f8ad3ef53 100644 (file)
--- a/src/dolphinpart.json.in
+++ b/src/dolphinpart.json.in
@@ -60,7 +60,6 @@
         "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": [

diff --git a/src/dolphinpartactions.desktop b/src/dolphinpartactions.desktop
index 24ee78f7edaf2108c02e33ac51b4694c799f1d14..87d4931717043264498abbe1a34495343e9090c8 100644 (file)
--- a/src/dolphinpartactions.desktop
+++ b/src/dolphinpartactions.desktop
@@ -61,7 +61,6 @@ Name[ta]=சின்னங்கள்
 Name[tr]=Simgeler
 Name[uk]=Піктограми
 Name[vi]=Biểu tượng
-Name[x-test]=xxIconsxx
 Name[zh_CN]=图标
 Name[zh_TW]=圖示
 Icon=view-list-icons
@@ -123,7 +122,6 @@ Name[ta]=சுருக்கமானது
 Name[tr]=Sıkışık
 Name[uk]=Компактний
 Name[vi]=Gọn
-Name[x-test]=xxCompactxx
 Name[zh_CN]=紧凑
 Name[zh_TW]=簡潔模式
 Icon=view-list-details
@@ -185,7 +183,6 @@ Name[ta]=விவரங்கள்
 Name[tr]=Ayrıntılar
 Name[uk]=Подробиці
 Name[vi]=Chi tiết
-Name[x-test]=xxDetailsxx
 Name[zh_CN]=详情
 Name[zh_TW]=詳細模式
 Icon=view-list-tree

diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop
index b041e02ac98e7667fec78b6679ef664a79a28194..7f05df7668b1570a85db52fa23bfb6a639b4cce7 100755 (executable)
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -54,7 +54,6 @@ Name[ta]=டால்பின்
 Name[tr]=Dolphin
 Name[uk]=Dolphin
 Name[vi]=Dolphin
-Name[x-test]=xxDolphinxx
 Name[zh_CN]=Dolphin 文件管理器
 Name[zh_TW]=Dolphin
 Exec=dolphin %u
@@ -117,7 +116,6 @@ GenericName[ta]=கோப்பு உலாவி
 GenericName[tr]=Dosya Yöneticisi
 GenericName[uk]=Менеджер файлів
 GenericName[vi]=Trình quản lí tệp
-GenericName[x-test]=xxFile Managerxx
 GenericName[zh_CN]=文件管理器
 GenericName[zh_TW]=檔案管理員
 MimeType=inode/directory;
@@ -165,7 +163,6 @@ Keywords[ta]=files;file management;file browsing;samba;network shares;Explorer;F
 Keywords[tr]=dosyalar;dosya yönetimi;dosya göz at;samba;ağ paylaşımları;Explorer;Finder;
 Keywords[uk]=files;file management;file browsing;samba;network shares;Explorer;Finder;файли;керування файлами;навігація;самба;спільні ресурси;мережа;експлорер;провідник;файндер;
 Keywords[vi]=files;file management;file browsing;samba;network shares;Explorer;Finder;tệp;quản lí tệp;duyệt tệp;chia sẻ mạng;
-Keywords[x-test]=xxfilesxx;xxfile managementxx;xxfile browsingxx;xxsambaxx;xxnetwork sharesxx;xxExplorerxx;xxFinderxx;
 Keywords[zh_CN]=files;file management;file browsing;samba;network shares;文件;文件管理;文件浏览;共享;共享文件夹;网络共享;浏览器;访达;查找器;
 Keywords[zh_TW]=files;file management;file browsing;samba;network shares;Explorer;Finder;檔案總管;檔案管理員;檔案;
 X-DBUS-ServiceName=org.kde.dolphin

diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json
index 57fcaa3dad50c07afafe04237cab8ef4a37bdba8..27db6ba1765efc0ed63ef8820378ed6be27b849c 100644 (file)
--- a/src/settings/kcm/kcmdolphingeneral.json
+++ b/src/settings/kcm/kcmdolphingeneral.json
@@ -42,7 +42,6 @@
         "Name[tr]": "Genel",
         "Name[uk]": "Загальне",
         "Name[vi]": "Chung",
-        "Name[x-test]": "xxGeneralxx",
         "Name[zh_CN]": "常规",
         "Name[zh_TW]": "一般"
     },

diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json
index 3ba03c5fa1cba16717527afe4ff1edb74efd4b56..aeaba2eb569ec6f6ca06be1502fb6e436881366a 100644 (file)
--- a/src/settings/kcm/kcmdolphinviewmodes.json
+++ b/src/settings/kcm/kcmdolphinviewmodes.json
@@ -54,7 +54,6 @@
         "Name[tr]": "Görünüm Kipleri",
         "Name[uk]": "Режими перегляду",
         "Name[vi]": "Các chế độ xem",
-        "Name[x-test]": "xxView Modesxx",
         "Name[zh_CN]": "视图模式",
         "Name[zh_TW]": "檢視模式"
     },