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"

diff --git a/src/dolphinpart.json.in b/src/dolphinpart.json.in
index d48aff759ef2ac92de4a1b05176ce1f60602dfd2..9510ce34e2adde314152fcaa3741ad1159fd21f8 100644 (file)
--- a/src/dolphinpart.json.in
+++ b/src/dolphinpart.json.in
@@ -39,7 +39,7 @@
         "Name[lv]": "Dolphin skats",
         "Name[ml]": "ഡോള്‍ഫിന്‍ അവതരണരീതി",
         "Name[my]": "လင်းပိုင် မြင်ကွင်း",
-        "Name[nb]": "Dolphin visning",
+        "Name[nb]": "Dolphin-visning",
         "Name[nl]": "Dolphin-weergave",
         "Name[nn]": "Dolphin-vising",
         "Name[pa]": "ਡਾਲਫਿਨ ਝਲਕ",

diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop
index 6726dbc9ea7fc2990c16383e27dff3a367fdbfd6..4f8f268ec4ef5955ddbecc2027e98724ae579c20 100755 (executable)
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -146,6 +146,7 @@ Keywords[it]=file;gestione dei file;navigazione dei file;samba;condivisioni di r
 Keywords[ka]=files;file management;file browsing;samba;network shares;Explorer;Finder;
 Keywords[ko]=files;file management;file browsing;samba;network shares;Explorer;Finder;파일;파일 관리;파일 관리자;탐색;탐색기;삼바;네트워크 공유;
 Keywords[lt]=failai;failų valdymas;failu valdymas;failų tvarkymas;failu tvarkymas;failų naršymas;failu narsymas;samba;tinklo viešiniai;tinklo viesiniai;Finder;Explorer
+Keywords[nb]=filer;filbehandling;filutforskning;samba;nettverksressurser;Explorer;Finder;
 Keywords[nl]=bestanden;bestandsbeheer;bladeren in bestanden;samba;netwerk-shares;verkenner;zoeksysteem;
 Keywords[nn]=filer;filhandsaming;filutforsking;samba;nettverksressursar;Explorer;Finder;
 Keywords[pl]=pliki;zarządzenie plikami;przeglądanie plików;samba;udziały sieciowe;Przeglądarka;Finder;

diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json
index 835310b85d0d14c6e00da41ba958c1848369669a..4db0084871fbb7e26f150a00bcf37aa8694578dd 100644 (file)
--- 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 d7607fa304a7cfe37879803eac26d9ca93bedafe..e7e152f27b6ef852f77a72ee371a9bee4572cb66 100644 (file)
--- 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 0ce917ad8cbf014cc596f59be88376f0da7dda9f..3e31b8e4571203a77d7011f2c027c443260a292f 100644 (file)
--- 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]": "ਵੇਖਣ ਢੰਗ",