┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/settings/kcm/kcmdolphinnavigation.json
diff options
context:
space:
mode:
authorl10n daemon script <[email protected]>2022-07-10 01:53:09 +0000
committerl10n daemon script <[email protected]>2022-07-10 01:53:09 +0000
commit7fdd9f22d8cef4d07576336bd7c50fc0f31fd849 (patch)
tree5f99bb997035adfea408453df3faea680b6a3062 /src/settings/kcm/kcmdolphinnavigation.json
parent35244bec7574b1e95fc0c7d51b96bf634673b391 (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/kcmdolphinnavigation.json')
-rw-r--r--src/settings/kcm/kcmdolphinnavigation.json1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json
index ddc5d19e6..7fbbb7120 100644
--- a/src/settings/kcm/kcmdolphinnavigation.json
+++ b/src/settings/kcm/kcmdolphinnavigation.json
@@ -9,6 +9,7 @@
"Description[cs]": "Nastavení navigace správce souborů",
"Description[de]": "Einstellungen zur Navigation mit der Dateiverwaltung",
"Description[es]": "Configurar la navegación del gestor de archivos",
+ "Description[fi]": "Tiedostonhallinnan selausasetukset",
"Description[fr]": "Configurer la navigation dans le gestionnaire de fichiers",
"Description[ia]": "Configura navigation del gerente de file",
"Description[id]": "Konfigurasikan navigasi pengelola file",