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 fe0cb0210d767651274f30b0a4885401fa68cbea..887e6c7c486f2a5c4ba3ed79a163be41b99357f0 100644 (file)
--- a/src/dolphinpart.json.in
+++ b/src/dolphinpart.json.in
@@ -42,7 +42,7 @@
         "Name[pl]": "Widok Dolphina",
         "Name[pt]": "Área do Dolphin",
         "Name[pt_BR]": "Visualização do Dolphin",
         "Name[pl]": "Widok Dolphina",
         "Name[pt]": "Área do Dolphin",
         "Name[pt_BR]": "Visualização do Dolphin",

-        "Name[ro]": "Dolphin – Vizualizare",
+        "Name[ro]": "Vizualizare Dolphin",

         "Name[ru]": "Представление Dolphin",
         "Name[se]": "Dolphinčájeheapmi",
         "Name[sk]": "Dolphin pohľad",
         "Name[ru]": "Представление Dolphin",
         "Name[se]": "Dolphinčájeheapmi",
         "Name[sk]": "Dolphin pohľad",