┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/settings/kcm/kcmdolphinviewmodes.json
diff options
context:
space:
mode:
authorl10n daemon script <[email protected]>2022-05-05 01:47:17 +0000
committerl10n daemon script <[email protected]>2022-05-05 01:47:17 +0000
commitab9fcf0041d5ea220e07b4abe4d53bb10c385be2 (patch)
treec92c246f17c7cdaa5a00121f2d865b4ea43348b2 /src/settings/kcm/kcmdolphinviewmodes.json
parent6b46ebe64882651c535ee97f17c5b8d96bb26009 (diff)
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"
Diffstat (limited to 'src/settings/kcm/kcmdolphinviewmodes.json')
-rw-r--r--src/settings/kcm/kcmdolphinviewmodes.json1
1 files changed, 1 insertions, 0 deletions
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",