From 83964c2071893b65e6fd8dc96bad5388107c8ef3 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
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/kcmdolphingeneral.json    | 2 ++
 src/settings/kcm/kcmdolphinnavigation.json | 1 +
 src/settings/kcm/kcmdolphinviewmodes.json  | 3 ++-
 3 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/settings')

diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json
index 835310b85..4db008487 100644
--- a/src/settings/kcm/kcmdolphingeneral.json
+++ b/src/settings/kcm/kcmdolphingeneral.json
@@ -24,6 +24,7 @@
         "Description[ka]": "ფაილების მმართველის ზოგადი მორგება",
         "Description[ko]": "일반 파일 관리자 설정",
         "Description[lt]": "Konfigūruoti bendras failų tvarkytuvės nuostatas",
+        "Description[nb]": "Sett opp generelle innstillinger for filbehandleren",
         "Description[nl]": "Algemene bestandsbeheerderinstellingen configureren",
         "Description[nn]": "Set opp generelle innstillingar for filhandsamaren",
         "Description[pl]": "Ustawienia ogólne zarządzania plikami",
@@ -65,6 +66,7 @@
         "Name[ka]": "მთავარი",
         "Name[ko]": "일반",
         "Name[lt]": "Bendrosios",
+        "Name[nb]": "Generelt",
         "Name[nl]": "Algemeen",
         "Name[nn]": "Generelt",
         "Name[pl]": "Ogólne",
diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json
index d7607fa30..e7e152f27 100644
--- a/src/settings/kcm/kcmdolphinnavigation.json
+++ b/src/settings/kcm/kcmdolphinnavigation.json
@@ -24,6 +24,7 @@
         "Description[ka]": "ფაილების მმართველის ნავიგაციის მორგება",
         "Description[ko]": "파일 관리자 탐색 설정",
         "Description[lt]": "Konfigūruoti failų tvarkytuvės naršymą",
+        "Description[nb]": "Sett opp navigasjon i filbehandleren",
         "Description[nl]": "Bestandsbeheerdernavigatie configureren",
         "Description[nn]": "Set opp navigasjonen i filhandsamaren",
         "Description[pl]": "Ustawienia poruszania się przy zarządzaniu plikami",
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