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 d5f41b7938367a6c7b7be0d2ad49896b1a1a8cb5..2d56db9046c69723e2124869a680d037f9ebe1e8 100644 (file)
--- a/src/dolphinpart.json.in
+++ b/src/dolphinpart.json.in
@@ -38,6 +38,7 @@
         "Name[nl]": "Dolphin-weergave",
         "Name[pa]": "ਡਾਲਫਿਨ ਝਲਕ",
         "Name[pl]": "Widok Dolphina",
         "Name[nl]": "Dolphin-weergave",
         "Name[pa]": "ਡਾਲਫਿਨ ਝਲਕ",
         "Name[pl]": "Widok Dolphina",

+        "Name[pt]": "Área do Dolphin",

         "Name[pt_BR]": "Visualização do Dolphin",
         "Name[ro]": "Dolphin – Vizualizare",
         "Name[ru]": "Представление Dolphin",
         "Name[pt_BR]": "Visualização do Dolphin",
         "Name[ro]": "Dolphin – Vizualizare",
         "Name[ru]": "Представление Dolphin",