From 506cdf329c3e1de5a876f0c562b4d46a2a96a657 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 4 May 2022 01:46:27 +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/kcmdolphinnavigation.json | 1 + 1 file changed, 1 insertion(+) (limited to 'src/settings/kcm/kcmdolphinnavigation.json') diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json index f5254d096..26f696651 100644 --- a/src/settings/kcm/kcmdolphinnavigation.json +++ b/src/settings/kcm/kcmdolphinnavigation.json @@ -9,6 +9,7 @@ "Description[fr]": "Configurer la navigation dans le gestionnaire de fichiers", "Description[it]": "Configura la navigazione col gestore dei file", "Description[nl]": "Bestandsbeheerdernavigatie configureren", + "Description[pt_BR]": "Configura a navegação do gerenciador de arquivos", "Description[ro]": "Configurează navigarea cu gestionarul de fișiere", "Description[sl]": "Postavi krmarjenje v upravljalniku datotek", "Description[sv]": "Anpassa filhanterarens navigering", -- cgit v1.3