From b5de7d79456227aa5a933f9b7e429d004ecb8949 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 21 Aug 2022 01:51:22 +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 b747cc8da..13ca8e341 100644 --- a/src/settings/kcm/kcmdolphinnavigation.json +++ b/src/settings/kcm/kcmdolphinnavigation.json @@ -7,6 +7,7 @@ "Description[ca@valencia]": "Configura la navegació del gestor de fitxers", "Description[ca]": "Configura la navegació del gestor de fitxers", "Description[cs]": "Nastavení navigace správce souborů", + "Description[da]": "Indstil navigation i filhåndtering", "Description[de]": "Einstellungen zur Navigation mit der Dateiverwaltung", "Description[en_GB]": "Configure file manager navigation", "Description[es]": "Configurar la navegación del gestor de archivos", -- cgit v1.3