From 86c103e765231f1d4daa0507698548af035d0048 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 3 Aug 2022 01:49:02 +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 337932850..b747cc8da 100644 --- a/src/settings/kcm/kcmdolphinnavigation.json +++ b/src/settings/kcm/kcmdolphinnavigation.json @@ -15,6 +15,7 @@ "Description[fr]": "Configurer la navigation dans le gestionnaire de fichiers", "Description[ia]": "Configura navigation del gerente de file", "Description[id]": "Konfigurasikan navigasi pengelola file", + "Description[is]": "Stilla flakkstýringar skráastjóra", "Description[it]": "Configura la navigazione col gestore dei file", "Description[ko]": "파일 관리자 탐색 설정", "Description[nl]": "Bestandsbeheerdernavigatie configureren", -- cgit v1.3