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 fe97910bdb6ccd042ac7cfe39ae977651464401d..94bcb2970662789317a36b282673b69f17e5f861 100644 (file)
--- a/src/dolphinpart.json.in
+++ b/src/dolphinpart.json.in
@@ -27,7 +27,7 @@
         "Name[eo]": "Dolfin-Vido",
         "Name[es]": "Vista de Dolphin",
         "Name[et]": "Dolphini vaade",
         "Name[eo]": "Dolfin-Vido",
         "Name[es]": "Vista de Dolphin",
         "Name[et]": "Dolphini vaade",

-        "Name[eu]": "Dolphin ikuspegia",
+        "Name[eu]": "Dolphin-en ikuspegia",

         "Name[fi]": "Dolphin-näkymä",
         "Name[fr]": "Vue de Dolphin",
         "Name[gl]": "Vista de Dolphin",
         "Name[fi]": "Dolphin-näkymä",
         "Name[fr]": "Vue de Dolphin",
         "Name[gl]": "Vista de Dolphin",

diff --git a/src/itemactions/setfoldericonitemaction.json b/src/itemactions/setfoldericonitemaction.json
index 7090654a2757c6c0bf6d5e046b05801517c576ca..9e68c9cfbc8497a53e9e42f8f4b36ac8aa9175b4 100644 (file)
--- a/src/itemactions/setfoldericonitemaction.json
+++ b/src/itemactions/setfoldericonitemaction.json
@@ -10,6 +10,7 @@
         "Name[ca@valencia]": "Establix la icona de carpeta",
         "Name[ca]": "Estableix la icona de carpeta",
         "Name[es]": "Definir icono de carpeta",
         "Name[ca@valencia]": "Establix la icona de carpeta",
         "Name[ca]": "Estableix la icona de carpeta",
         "Name[es]": "Definir icono de carpeta",

+        "Name[eu]": "Ezarri karpetaren ikonoa",

         "Name[fr]": "Définir l'icône de dossiers",
         "Name[gl]": "Definir a icona do cartafol",
         "Name[he]": "הגדרת סמל תיקייה",
         "Name[fr]": "Définir l'icône de dossiers",
         "Name[gl]": "Definir a icona do cartafol",
         "Name[he]": "הגדרת סמל תיקייה",