From 8a721c35fcd6393cbda17290ab7dd6891487de44 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 13 Jul 2022 01:48:42 +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 2ad978142..fbf6a9428 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -9,6 +9,7 @@ "Description[cs]": "Obecné nastavení správce souborů", "Description[de]": "Allgemeine Einstellungen an der Dateiverwaltung vornehmen", "Description[es]": "Configurar las preferencias generales del gestor de archivos", + "Description[eu]": "Konfiguratu fitxategi-kudeatzailearen ezarpen orokorrak", "Description[fi]": "Tiedostonhallinnan yleisasetukset", "Description[fr]": "Configurer les paramètres généraux pour le gestionnaire de fichiers", "Description[ia]": "Configura preferentias del gerente general de file", @@ -40,6 +41,7 @@ "Name[cs]": "Obecné", "Name[de]": "Allgemein", "Name[es]": "General", + "Name[eu]": "Orokorra", "Name[fi]": "Perusasetukset", "Name[fr]": "Général", "Name[ia]": "General", -- cgit v1.3