From c7d4b19b88237551bd7cefe0f79670427f1c90c9 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 25 Jun 2025 01:35:28 +0000 Subject: 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" --- src/dolphinpart.json.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/dolphinpart.json.in') 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", -- cgit v1.3.1