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/settings/kcm/kcmdolphinviewmodes.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/settings/kcm') diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json index e5732781e..11ff10228 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.json +++ b/src/settings/kcm/kcmdolphinviewmodes.json @@ -41,7 +41,7 @@ "Name[nn]": "Visingsmodusar", "Name[pa]": "ਵੇਖਣ ਢੰਗ", "Name[pl]": "Tryby widoku", - "Name[pt]": "Modos de Visualização", + "Name[pt]": "Modos de visualização", "Name[pt_BR]": "Modos de exibição", "Name[ro]": "Regimuri de vizualizare", "Name[ru]": "Режимы просмотра", -- cgit v1.3