From 1a8be1544d791e098256cfa5e2ab045e44d42320 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 30 Apr 2022 01:42:27 +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 f799446ce..6b0c56a40 100644 --- a/src/settings/kcm/kcmdolphinnavigation.json +++ b/src/settings/kcm/kcmdolphinnavigation.json @@ -6,7 +6,9 @@ "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[it]": "Configura la navigazione col gestore dei file", "Description[nl]": "Bestandsbeheerdernavigatie configureren", + "Description[sl]": "Postavi krmarjenje v upravljalniku datotek", "Description[sv]": "Anpassa filhanterarens navigering", "Description[ta]": "கோப்பு உலாவியில் உலாவலை அமையுங்கள்", "Description[tr]": "Dosya yöneticisi dolaşımını yapılandır", -- cgit v1.3