From 83964c2071893b65e6fd8dc96bad5388107c8ef3 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 22 Jan 2023 02:03:57 +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 0ce917ad8..3e31b8e45 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.json +++ b/src/settings/kcm/kcmdolphinviewmodes.json @@ -24,6 +24,7 @@ "Description[ka]": "ფაილების მმართველის ხედის რეჟიმების მორგება", "Description[ko]": "파일 관리자 보기 모드 설정", "Description[lt]": "Konfigūruoti failų tvarkytuvės rodinio veiksenas", + "Description[nb]": "Tilpass filbehandlerens visningsmoduser", "Description[nl]": "Bestandsbeheerderweergavemodussen configureren", "Description[nn]": "Set opp visingsmodusane i filhandsamaren", "Description[pl]": "Ustawienia trybów widoku zarządzania plikami", @@ -73,7 +74,7 @@ "Name[lv]": "Skata režīmi", "Name[ml]": "അവതരണ രീതികള്‍", "Name[my]": "မြင်ကွင်းထုံးနည်းများ", - "Name[nb]": "Visningsmåter", + "Name[nb]": "Visningsmoduser", "Name[nl]": "Weergavemodi", "Name[nn]": "Visingsmodusar", "Name[pa]": "ਵੇਖਣ ਢੰਗ", -- cgit v1.3