diff options
| author | l10n daemon script <[email protected]> | 2022-08-21 01:51:22 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-08-21 01:51:22 +0000 |
| commit | b5de7d79456227aa5a933f9b7e429d004ecb8949 (patch) | |
| tree | 65ed07bf9a0238372bb8caca1e82e158f0f56e22 /src/settings/kcm | |
| parent | 3ccdcc2176bc5e4e03f733c21d05a5a4b0c1af25 (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')
| -rw-r--r-- | src/settings/kcm/kcmdolphingeneral.json | 2 | ||||
| -rw-r--r-- | src/settings/kcm/kcmdolphinnavigation.json | 1 | ||||
| -rw-r--r-- | src/settings/kcm/kcmdolphinviewmodes.json | 1 |
3 files changed, 4 insertions, 0 deletions
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", 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", diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json index dacd44c73..d6347b153 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.json +++ b/src/settings/kcm/kcmdolphinviewmodes.json @@ -7,6 +7,7 @@ "Description[ca@valencia]": "Configura els modes de vista del gestor de fitxers", "Description[ca]": "Configura els modes de vista del gestor de fitxers", "Description[cs]": "Nastavení režimů pohledu správce souborů", + "Description[da]": "Indstil filhåndteringens visningstilstande", "Description[de]": "Dateiverwaltungs-Ansichten einrichten", "Description[en_GB]": "Configure file manager view modes", "Description[es]": "Configurar los modos de vistas del gestor de archivos", |