From 36fda229fef526ae306c6efbaa5b26ec5e8dcfce Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 30 Dec 2022 02:12:34 +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 9d9902e8c..e8fc86d07 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -10,6 +10,7 @@ "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[el]": "Διαμόρφωση γενικών ρυθμίσεων διαχείρισης αρχείων", "Description[en_GB]": "Configure general file manager settings", "Description[es]": "Configurar las preferencias generales del gestor de archivos", "Description[eu]": "Konfiguratu fitxategi-kudeatzailearen ezarpen orokorrak", @@ -50,6 +51,7 @@ "Name[cs]": "Obecné", "Name[da]": "Generelt", "Name[de]": "Allgemein", + "Name[el]": "Γενικά", "Name[en_GB]": "General", "Name[es]": "General", "Name[eu]": "Orokorra", -- cgit v1.3