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/kcmdolphinnavigation.json | 1 + 1 file changed, 1 insertion(+) (limited to 'src/settings/kcm/kcmdolphinnavigation.json') diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json index 596624f5f..08d591d8b 100644 --- a/src/settings/kcm/kcmdolphinnavigation.json +++ b/src/settings/kcm/kcmdolphinnavigation.json @@ -10,6 +10,7 @@ "Description[cs]": "Nastavení navigace správce souborů", "Description[da]": "Indstil navigation i filhåndtering", "Description[de]": "Einstellungen zur Navigation mit der Dateiverwaltung", + "Description[el]": "Διαμόρφωση πλοήγησης του διαχειριστή αρχείων", "Description[en_GB]": "Configure file manager navigation", "Description[es]": "Configurar la navegación del gestor de archivos", "Description[eu]": "Konfiguratu fitxategi-kudeatzailearen nabigatzea", -- cgit v1.3