From ab9fcf0041d5ea220e07b4abe4d53bb10c385be2 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 5 May 2022 01:47:17 +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 | 1 + 1 file changed, 1 insertion(+) (limited to 'src/settings/kcm/kcmdolphinviewmodes.json') diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json index ea8b685ba..6c3d666cb 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.json +++ b/src/settings/kcm/kcmdolphinviewmodes.json @@ -9,6 +9,7 @@ "Description[fr]": "Configurer les modes d'affichage du gestionnaire de fichiers", "Description[it]": "Configura le viste del gestore dei file", "Description[nl]": "Bestandsbeheerderweergavemodussen configureren", + "Description[pt]": "Configurar os modos de visualização do gestor de ficheiros", "Description[pt_BR]": "Configura os modos de exibição do gerenciador de arquivos", "Description[ro]": "Configurează regimurile de vizualizare ale gestionarului de fișiere", "Description[sl]": "Postavi načine prikaza upravljalnika datotek", -- cgit v1.3