From ebe3a111e68b14fd5e8e9a7b1764c5de4ef6e351 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 16 Jun 2022 01:56:58 +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 3e85eb8be..45b2786db 100644 --- a/src/settings/kcm/kcmdolphinnavigation.json +++ b/src/settings/kcm/kcmdolphinnavigation.json @@ -5,6 +5,7 @@ "Description[az]": "Fayl meneceri naviqasiyasını tənzimləyin", "Description[ca@valencia]": "Configura la navegació del gestor de fitxers", "Description[ca]": "Configura la navegació del gestor de fitxers", + "Description[de]": "Einstellungen zur Navigation mit der Dateiverwaltung", "Description[es]": "Configurar la navegación del gestor de archivos", "Description[fr]": "Configurer la navigation dans le gestionnaire de fichiers", "Description[ia]": "Configura navigation del gerente de file", -- cgit v1.3