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 d99151f72ef5ed951319243ecf2b89d9b33649cd..fe0cb0210d767651274f30b0a4885401fa68cbea 100644 (file)
--- a/src/dolphinpart.json.in
+++ b/src/dolphinpart.json.in
@@ -57,6 +57,7 @@
         "Name[uk]": "Перегляд Dolphin",
         "Name[vi]": "Khung xem Dolphin",
         "Name[x-test]": "xxDolphin Viewxx",
         "Name[uk]": "Перегляд Dolphin",
         "Name[vi]": "Khung xem Dolphin",
         "Name[x-test]": "xxDolphin Viewxx",

+        "Name[zh_CN]": "Dolphin 视图",

         "Name[zh_TW]": "Dolphin 檢視",
         "ServiceTypes": [
             "KParts/ReadOnlyPart",
         "Name[zh_TW]": "Dolphin 檢視",
         "ServiceTypes": [
             "KParts/ReadOnlyPart",