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/kcmdolphinviewmodes.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/settings/kcm/kcmdolphinviewmodes.json') diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json index c4cc111ba..dacd44c73 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.json +++ b/src/settings/kcm/kcmdolphinviewmodes.json @@ -15,6 +15,7 @@ "Description[fr]": "Configurer les modes d'affichage du gestionnaire de fichiers", "Description[ia]": "Configura le modos de vista del gerente de file", "Description[id]": "Konfigurasikan mode tampilan pengelola file", + "Description[is]": "Stilla skoðunarhami í skráastjóra", "Description[it]": "Configura le viste del gestore dei file", "Description[ko]": "파일 관리자 보기 모드 설정", "Description[nl]": "Bestandsbeheerderweergavemodussen configureren", @@ -56,7 +57,7 @@ "Name[hu]": "Nézetmódok", "Name[ia]": "Modos de vista", "Name[id]": "Mode Tampilan", - "Name[is]": "Skoðunarhamur", + "Name[is]": "Skoðunarhamir", "Name[it]": "Viste", "Name[ja]": "表示モード", "Name[ko]": "보기 모드", -- cgit v1.3