From b72f800ac4b299af5546f70deb4b7664f5890d89 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 19 Nov 2022 01:51:46 +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 00890b763..cd62ec23f 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -21,6 +21,7 @@ "Description[it]": "Configura le impostazioni generali del gestore dei file", "Description[ka]": "ფაილების მმართველის ზოგადი მორგება", "Description[ko]": "일반 파일 관리자 설정", + "Description[lt]": "Konfigūruoti bendras failų tvarkytuvės nuostatas", "Description[nl]": "Algemene bestandsbeheerderinstellingen configureren", "Description[nn]": "Set opp generelle innstillingar for filhandsamaren", "Description[pl]": "Ustawienia ogólne zarządzania plikami", @@ -59,6 +60,7 @@ "Name[it]": "Generale", "Name[ka]": "მთავარი", "Name[ko]": "일반", + "Name[lt]": "Bendrosios", "Name[nl]": "Algemeen", "Name[nn]": "Generelt", "Name[pl]": "Ogólne", -- cgit v1.3.1