From e34eba7e0fe1720830fd410e4df42205d28f355a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 17 May 2022 01:46:51 +0000 Subject: [PATCH] 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 | 1 + 1 file changed, 1 insertion(+) diff --git a/src/dolphinpart.json.in b/src/dolphinpart.json.in index d5f41b793..2d56db904 100644 --- a/src/dolphinpart.json.in +++ b/src/dolphinpart.json.in @@ -38,6 +38,7 @@ "Name[nl]": "Dolphin-weergave", "Name[pa]": "ਡਾਲਫਿਨ ਝਲਕ", "Name[pl]": "Widok Dolphina", + "Name[pt]": "Área do Dolphin", "Name[pt_BR]": "Visualização do Dolphin", "Name[ro]": "Dolphin – Vizualizare", "Name[ru]": "Представление Dolphin", -- 2.47.3