From ebe3a111e68b14fd5e8e9a7b1764c5de4ef6e351 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 16 Jun 2022 01:56:58 +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 11b41a7a1..c37f276e9 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -5,6 +5,7 @@ "Description[az]": "Əsas fayl meneceri ayarlarını tənzimləyin", "Description[ca@valencia]": "Configura les opcions generals del gestor de fitxers", "Description[ca]": "Configura les opcions generals del gestor de fitxers", + "Description[de]": "Allgemeine Einstellungen an der Dateiverwaltung vornehmen", "Description[es]": "Configurar las preferencias generales del gestor de archivos", "Description[fr]": "Configurer les paramètres généraux pour le gestionnaire de fichiers", "Description[ia]": "Configura preferentias del gerente general de file", @@ -33,6 +34,7 @@ "Name[ca@valencia]": "General", "Name[ca]": "General", "Name[cs]": "Obecné", + "Name[de]": "Allgemein", "Name[es]": "General", "Name[fr]": "Général", "Name[ia]": "General", -- cgit v1.3