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/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 7fbbb7120..30e8b431f 100644 --- a/src/settings/kcm/kcmdolphinnavigation.json +++ b/src/settings/kcm/kcmdolphinnavigation.json @@ -9,6 +9,7 @@ "Description[cs]": "Nastavení navigace správce souborů", "Description[de]": "Einstellungen zur Navigation mit der Dateiverwaltung", "Description[es]": "Configurar la navegación del gestor de archivos", + "Description[eu]": "Konfiguratu fitxategi-kudeatzailearen nabigatzea", "Description[fi]": "Tiedostonhallinnan selausasetukset", "Description[fr]": "Configurer la navigation dans le gestionnaire de fichiers", "Description[ia]": "Configura navigation del gerente de file", -- cgit v1.3