From 58a7772a19204f467432d098253a32f0fc705b34 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 2 Jul 2022 02:06:49 +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 45b2786db..d75414e60 100644 --- a/src/settings/kcm/kcmdolphinnavigation.json +++ b/src/settings/kcm/kcmdolphinnavigation.json @@ -3,6 +3,7 @@ "Description": "Configure file manager navigation", "Description[ar]": "اضبط التّنقّل في مدير الملفّات", "Description[az]": "Fayl meneceri naviqasiyasını tənzimləyin", + "Description[bg]": "Конфигуриране на настройките за навигация на файловия мениджър", "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", @@ -32,6 +33,7 @@ "Name[ar]": "التّنقّل", "Name[ast]": "Navegación", "Name[az]": "Naviqasiya", + "Name[bg]": "Навигация", "Name[ca@valencia]": "Navegació", "Name[ca]": "Navegació", "Name[cs]": "Navigace", -- cgit v1.3.1