From 30b62a1c042c150daa5700bbd86bb14df80b7744 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 22 May 2022 01:44:35 +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/kcmdolphingeneral.json | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/settings/kcm/kcmdolphingeneral.json') diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json index 9536dc751..74db701ed 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -12,6 +12,7 @@ "Description[it]": "Configura le impostazioni generali del gestore dei file", "Description[ko]": "일반 파일 관리자 설정", "Description[nl]": "Algemene bestandsbeheerderinstellingen configureren", + "Description[nn]": "Set opp generelle innstillingar for filhandsamaren", "Description[pl]": "Ustawienia ogólne zarządzania plikami", "Description[pt]": "Configurar as definições gerais do gestor de ficheiros", "Description[pt_BR]": "Configura as opções gerais do gerenciador de arquivos", @@ -38,6 +39,7 @@ "Name[it]": "Generale", "Name[ko]": "일반", "Name[nl]": "Algemeen", + "Name[nn]": "Generelt", "Name[pl]": "Ogólne", "Name[pt]": "Geral", "Name[pt_BR]": "Geral", -- cgit v1.3