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/kcmdolphingeneral.json | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/settings/kcm/kcmdolphingeneral.json') diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json index fb440b7a2..6bfdcc643 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -7,6 +7,7 @@ "Description[ca@valencia]": "Configura les opcions generals del gestor de fitxers", "Description[ca]": "Configura les opcions generals del gestor de fitxers", "Description[cs]": "Obecné nastavení správce souborů", + "Description[da]": "Konfiguration af generelle indstillinger for filhåndtering", "Description[de]": "Allgemeine Einstellungen an der Dateiverwaltung vornehmen", "Description[en_GB]": "Configure general file manager settings", "Description[es]": "Configurar las preferencias generales del gestor de archivos", @@ -42,6 +43,7 @@ "Name[ca@valencia]": "General", "Name[ca]": "General", "Name[cs]": "Obecné", + "Name[da]": "Generelt", "Name[de]": "Allgemein", "Name[en_GB]": "General", "Name[es]": "General", -- cgit v1.3.1