From: l10n daemon script Date: Wed, 25 Jun 2025 01:35:28 +0000 (+0000) Subject: SVN_SILENT made messages (.desktop file) - always resolve ours X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/c7d4b19b88237551bd7cefe0f79670427f1c90c9 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 fe97910bd..94bcb2970 100644 --- 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[eu]": "Dolphin ikuspegia", + "Name[eu]": "Dolphin-en ikuspegia", "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 7090654a2..9e68c9cfb 100644 --- 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[eu]": "Ezarri karpetaren ikonoa", "Name[fr]": "Définir l'icône de dossiers", "Name[gl]": "Definir a icona do cartafol", "Name[he]": "הגדרת סמל תיקייה",