From 8076b54a2ce8c1253385c9ee3f24938bdbf4773c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 27 Apr 2022 01:46:00 +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 | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/settings/kcm/kcmdolphinnavigation.json') diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json index 060dbc5ce..1b0f9ba9d 100644 --- a/src/settings/kcm/kcmdolphinnavigation.json +++ b/src/settings/kcm/kcmdolphinnavigation.json @@ -4,10 +4,14 @@ "Description[ca@valencia]": "Configura la navegació del gestor de fitxers", "Description[ca]": "Configura la navegació del gestor de fitxers", "Description[es]": "Configurar la navegación del gestor de archivos", + "Description[fr]": "Configurer la navigation dans le gestionnaire de fichiers", "Description[nl]": "Bestandsbeheerdernavigatie configureren", + "Description[sv]": "Anpassa filhanterarens navigering", + "Description[ta]": "கோப்பு உலாவியில் உலாவலை அமையுங்கள்", "Description[tr]": "Dosya yöneticisi dolaşımını yapılandır", "Description[uk]": "Налаштувати навігацію у менеджері файлів", "Description[x-test]": "xxConfigure file manager navigationxx", + "Description[zh_CN]": "配置文件管理器导航功能", "Icon": "preferences-desktop-navigation", "Name": "Navigation", "Name[ar]": "التّنقّل", -- cgit v1.3