From d8461fc02ed4eac062840f0dbd3eee9fe3047101 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 12 Feb 2026 01:41:25 +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 fa243cd6d..7ceb7e468 100644 --- a/src/dolphinpart.json.in +++ b/src/dolphinpart.json.in @@ -52,7 +52,7 @@ "Name[nn]": "Dolphin-vising", "Name[pa]": "ਡਾਲਫਿਨ ਝਲਕ", "Name[pl]": "Widok Dolphina", - "Name[pt]": "Área do Dolphin", + "Name[pt]": "Vista Dolphin", "Name[pt_BR]": "Exibição do Dolphin", "Name[ro]": "Vizualizare Dolphin", "Name[ru]": "Представление Dolphin", -- cgit v1.3