From d185e218871f7fb8016291994564bf266dd5df70 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 12 Feb 2023 02:02:18 +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 c3c9bda9e..81b52a32c 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -12,6 +12,7 @@ "Description[de]": "Allgemeine Einstellungen an der Dateiverwaltung vornehmen", "Description[el]": "Διαμόρφωση γενικών ρυθμίσεων διαχείρισης αρχείων", "Description[en_GB]": "Configure general file manager settings", + "Description[eo]": "Agordi ĝeneralajn dosiermastrumajn metojn", "Description[es]": "Configurar las preferencias generales del gestor de archivos", "Description[eu]": "Konfiguratu fitxategi-kudeatzailearen ezarpen orokorrak", "Description[fi]": "Tiedostonhallinnan yleisasetukset", @@ -55,6 +56,7 @@ "Name[de]": "Allgemein", "Name[el]": "Γενικά", "Name[en_GB]": "General", + "Name[eo]": "Ĝenerala", "Name[es]": "General", "Name[eu]": "Orokorra", "Name[fi]": "Perusasetukset", -- cgit v1.3.1