From d11d4781487243dddc3a3899bd65d21542a93383 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 2 Jan 2023 02:34:18 +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, 1 insertion(+), 1 deletion(-) (limited to 'src/settings/kcm/kcmdolphingeneral.json') diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json index e8fc86d07..835310b85 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -19,7 +19,7 @@ "Description[ia]": "Configura preferentias del gerente general de file", "Description[id]": "Konfigurasikan pengaturan pengelola file umum", "Description[ie]": "Configurar li parametres del gerente de files", - "Description[is]": "Sýsla með almennar stillingar skráastjóra", + "Description[is]": "Grunnstilla almennar stillingar skráastjóra", "Description[it]": "Configura le impostazioni generali del gestore dei file", "Description[ka]": "ფაილების მმართველის ზოგადი მორგება", "Description[ko]": "일반 파일 관리자 설정", -- cgit v1.3.1