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/kcmdolphinnavigation.json | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/settings/kcm/kcmdolphinnavigation.json') diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json index bd6b2cef6..68a7b2905 100644 --- a/src/settings/kcm/kcmdolphinnavigation.json +++ b/src/settings/kcm/kcmdolphinnavigation.json @@ -12,6 +12,7 @@ "Description[de]": "Einstellungen zur Navigation mit der Dateiverwaltung", "Description[el]": "Διαμόρφωση πλοήγησης του διαχειριστή αρχείων", "Description[en_GB]": "Configure file manager navigation", + "Description[eo]": "Agordi dosiermastruman navigadon", "Description[es]": "Configurar la navegación del gestor de archivos", "Description[eu]": "Konfiguratu fitxategi-kudeatzailearen nabigatzea", "Description[fi]": "Tiedostonhallinnan selausasetukset", @@ -55,6 +56,7 @@ "Name[de]": "Navigation", "Name[el]": "Πλοήγηση", "Name[en_GB]": "Navigation", + "Name[eo]": "Navigado", "Name[es]": "Navegación", "Name[et]": "Liikumine", "Name[eu]": "Nabigatzea", -- cgit v1.3