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/itemactions/setfoldericonitemaction.json b/src/itemactions/setfoldericonitemaction.json
index 5d02aeb06577dd01159a721f665a27d8f146aa13..19648c9da4eee5927ba18ec13eb6eb6b7e7edbed 100644 (file)
--- a/src/itemactions/setfoldericonitemaction.json
+++ b/src/itemactions/setfoldericonitemaction.json
@@ -9,6 +9,7 @@
         "Name[bg]": "Задаване на икона на папка",
         "Name[ca@valencia]": "Establix la icona de carpeta",
         "Name[ca]": "Estableix la icona de carpeta",
         "Name[bg]": "Задаване на икона на папка",
         "Name[ca@valencia]": "Establix la icona de carpeta",
         "Name[ca]": "Estableix la icona de carpeta",

+        "Name[de]": "Ordnersymbol festlegen",

         "Name[es]": "Definir icono de carpeta",
         "Name[eu]": "Ezarri karpetaren ikonoa",
         "Name[fi]": "Aseta kansiokuvake",
         "Name[es]": "Definir icono de carpeta",
         "Name[eu]": "Ezarri karpetaren ikonoa",
         "Name[fi]": "Aseta kansiokuvake",

diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop
index 581013d2bf92a73b37c69795d34e3c5040494ee7..42376d26061885171882c5b3e3c094810a45e1ee 100755 (executable)
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -138,6 +138,7 @@ Comment[fi]=Hallinnoi tiedostojasi
 Comment[fr]=Gérer vos fichiers
 Comment[gl]=Xestione os seus ficheiros.
 Comment[he]=ניהול הקבצים שלך
 Comment[fr]=Gérer vos fichiers
 Comment[gl]=Xestione os seus ficheiros.
 Comment[he]=ניהול הקבצים שלך

+Comment[hu]=Kezelje fájljait

 Comment[ia]=Gere tu files
 Comment[is]=Hafðu umsjón með skránum þínum
 Comment[it]=Gestisci i tuoi file
 Comment[ia]=Gere tu files
 Comment[is]=Hafðu umsjón með skránum þínum
 Comment[it]=Gestisci i tuoi file