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/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 803735a2a..cb6942729 100644 --- a/src/settings/kcm/kcmdolphinnavigation.json +++ b/src/settings/kcm/kcmdolphinnavigation.json @@ -21,6 +21,7 @@ "Description[it]": "Configura la navigazione col gestore dei file", "Description[ka]": "ფაილების მმართველის ნავიგაციის მორგება", "Description[ko]": "파일 관리자 탐색 설정", + "Description[lt]": "Konfigūruoti failų tvarkytuvės naršymą", "Description[nl]": "Bestandsbeheerdernavigatie configureren", "Description[nn]": "Set opp navigasjonen i filhandsamaren", "Description[pl]": "Ustawienia poruszania się przy zarządzaniu plikami", -- cgit v1.3