Merge translation files from master branch.

1 files changed, 42 insertions, 37 deletions

diff --git a/tde-i18n-nb/messages/tdegraphics/kpovmodeler.po b/tde-i18n-nb/messages/tdegraphics/kpovmodeler.po
index b4f9f0193ec..685d55eda5a 100644
--- a/tde-i18n-nb/messages/tdegraphics/kpovmodeler.po
+++ b/tde-i18n-nb/messages/tdegraphics/kpovmodeler.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kpovmodeler\n"
-"POT-Creation-Date: 2020-09-27 21:15+0200\n"
+"POT-Creation-Date: 2021-10-21 20:21+0000\n"
 "PO-Revision-Date: 2005-11-07 20:47+0100\n"
 "Last-Translator: Axel Bojer <axelb@skolelinux.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-no@lister.ping.uio.no>\n"
@@ -178,7 +178,7 @@ msgid "Strength:"
 msgstr "Styrke:"
 
 #: pmblobedit.cpp:39 pmisosurfaceedit.cpp:85 pmmediaedit.cpp:94
-#: pmpreviewsettings.cpp:107 pmrendermodesdialog.cpp:332
+#: pmpreviewsettings.cpp:107 pmrendermodesdialog.cpp:331
 msgid "Threshold:"
 msgstr "Terskel:"
 
@@ -870,7 +870,7 @@ msgstr "Metallisk:"
 msgid "Iridiscence"
 msgstr "Opalescering"
 
-#: pmfinishedit.cpp:105 pmrendermodesdialog.cpp:344
+#: pmfinishedit.cpp:105 pmrendermodesdialog.cpp:343
 msgid "Amount:"
 msgstr "Mengde:"
 
@@ -944,7 +944,7 @@ msgid "Lambda:"
 msgstr "Lambda:"
 
 #: pmfogedit.cpp:96 pmlistpatternedit.cpp:59 pmpatternedit.cpp:250
-#: pmpreviewsettings.cpp:103 pmrendermodesdialog.cpp:336
+#: pmpreviewsettings.cpp:103 pmrendermodesdialog.cpp:335
 msgid "Depth:"
 msgstr "Dybde:"
 
@@ -1601,11 +1601,11 @@ msgstr "Faneblad"
 msgid "Floating"
 msgstr "Flytende"
 
-#: pmlayoutsettings.cpp:147 pmrainbowedit.cpp:59 pmrendermodesdialog.cpp:274
+#: pmlayoutsettings.cpp:147 pmrainbowedit.cpp:59 pmrendermodesdialog.cpp:273
 msgid "Width:"
 msgstr "Bredde:"
 
-#: pmlayoutsettings.cpp:148 pmrendermodesdialog.cpp:278 pmslopeedit.cpp:45
+#: pmlayoutsettings.cpp:148 pmrendermodesdialog.cpp:277 pmslopeedit.cpp:45
 msgid "Height:"
 msgstr "Høyde:"
 
@@ -1681,7 +1681,7 @@ msgstr "Klarte ikke lage nytt under-bibliotek."
 msgid "Name: "
 msgstr "Navn: "
 
-#: pmlibraryentrypreview.cpp:67 pmrendermodesdialog.cpp:255
+#: pmlibraryentrypreview.cpp:67 pmrendermodesdialog.cpp:254
 msgid "Description:"
 msgstr "Beskrivelse:"
 
@@ -1817,7 +1817,7 @@ msgstr "Adaptiv:"
 msgid "Orient"
 msgstr "Orient"
 
-#: pmlightedit.cpp:90 pmrendermodesdialog.cpp:341
+#: pmlightedit.cpp:90 pmrendermodesdialog.cpp:340
 msgid "Jitter"
 msgstr "Dirring"
 
@@ -1951,7 +1951,7 @@ msgstr "stoff-kart"
 msgid "media"
 msgstr "media"
 
-#: pmmediaedit.cpp:46 pmrendermodesdialog.cpp:326
+#: pmmediaedit.cpp:46 pmrendermodesdialog.cpp:325
 msgid "Method:"
 msgstr "Metode:"
 
@@ -2286,7 +2286,7 @@ msgstr "Importer …"
 msgid "&Export..."
 msgstr "&Eksporter …"
 
-#: pmpart.cpp:254 pmrendermodesdialog.cpp:41 pmrendermodesdialog.cpp:243
+#: pmpart.cpp:254 pmrendermodesdialog.cpp:41 pmrendermodesdialog.cpp:242
 msgid "Render Modes"
 msgstr "Tegnemodi"
 
@@ -2560,7 +2560,7 @@ msgstr "Rå Povray"
 msgid "Iso Surface"
 msgstr "Iso-flate"
 
-#: pmpart.cpp:520 pmrendermodesdialog.cpp:350
+#: pmpart.cpp:520
 msgid "Radiosity"
 msgstr "Radiositet"
 
@@ -3343,7 +3343,7 @@ msgstr "Gulv"
 msgid "Enable floor"
 msgstr "Slå på gulv"
 
-#: pmpreviewsettings.cpp:96 pmrendermodesdialog.cpp:321
+#: pmpreviewsettings.cpp:96 pmrendermodesdialog.cpp:320
 msgid "Antialiasing"
 msgstr "Antialiasing"
 
@@ -3599,7 +3599,7 @@ msgstr "foran"
 msgid "back"
 msgstr "bak"
 
-#: pmrendermode.cpp:51
+#: pmrendermode.cpp:49
 msgid "New mode"
 msgstr "Ny modus"
 
@@ -3620,7 +3620,8 @@ msgid "5: Render shadows, including extended lights"
 msgstr "5: Tegner opp skygger, med utvidet lys"
 
 #: pmrendermodesdialog.cpp:232
-msgid "6, 7: Compute texture patterns"
+#, fuzzy
+msgid "6, 7: Compute texture patterns, compute photons"
 msgstr "6, 7: Beregn teksturmønstre"
 
 #: pmrendermodesdialog.cpp:233
@@ -3628,66 +3629,58 @@ msgid "8: Compute reflected, refracted, and transmitted rays"
 msgstr "8: Beregn reflekser, reflekterte, og overførte stråler"
 
 #: pmrendermodesdialog.cpp:234
-msgid "9: Compute media"
-msgstr "9: Beregn media"
-
-#: pmrendermodesdialog.cpp:235
-msgid "10: Compute radiosity but no media"
-msgstr "10: Beregn «radiositet» uten media"
-
-#: pmrendermodesdialog.cpp:236
-msgid "11: Compute radiosity and media"
-msgstr "11: Beregn «radiositet» og media"
+msgid "9, 10, 11: Compute media, radiosity and subsurface light transport"
+msgstr ""
 
-#: pmrendermodesdialog.cpp:269
+#: pmrendermodesdialog.cpp:268
 msgid "Size"
 msgstr "Størrelse"
 
-#: pmrendermodesdialog.cpp:284
+#: pmrendermodesdialog.cpp:283
 msgid "Subsection"
 msgstr "Underdel"
 
-#: pmrendermodesdialog.cpp:289
+#: pmrendermodesdialog.cpp:288
 msgid "Start column:"
 msgstr "Startkolonne:"
 
-#: pmrendermodesdialog.cpp:293
+#: pmrendermodesdialog.cpp:292
 msgid "End column:"
 msgstr "Sluttkolonne:"
 
-#: pmrendermodesdialog.cpp:297
+#: pmrendermodesdialog.cpp:296
 msgid "Start row:"
 msgstr "Startrad:"
 
-#: pmrendermodesdialog.cpp:301
+#: pmrendermodesdialog.cpp:300
 msgid "End row:"
 msgstr "Sluttrad:"
 
-#: pmrendermodesdialog.cpp:311
+#: pmrendermodesdialog.cpp:310
 msgid "Quality"
 msgstr "Kvalitet"
 
-#: pmrendermodesdialog.cpp:315
+#: pmrendermodesdialog.cpp:314
 msgid "Quality:"
 msgstr "Kvalitet:"
 
-#: pmrendermodesdialog.cpp:329
+#: pmrendermodesdialog.cpp:328
 msgid "Non Recursive"
 msgstr "Ikke-rekursiv"
 
-#: pmrendermodesdialog.cpp:330
+#: pmrendermodesdialog.cpp:329
 msgid "Recursive"
 msgstr "Rekursiv"
 
-#: pmrendermodesdialog.cpp:357
+#: pmrendermodesdialog.cpp:353
 msgid "Output"
 msgstr "Utdata"
 
-#: pmrendermodesdialog.cpp:360
+#: pmrendermodesdialog.cpp:356
 msgid "Alpha"
 msgstr "Alpha"
 
-#: pmrendermodesdialog.cpp:449
+#: pmrendermodesdialog.cpp:443
 msgid "Please enter a description for the render mode."
 msgstr "Skriv en beskrivelse for opptegningsmodus"
 
@@ -4300,6 +4293,15 @@ msgstr "Diverse objekter"
 msgid "Povray Rendering"
 msgstr "Povray opptegning"
 
+#~ msgid "9: Compute media"
+#~ msgstr "9: Beregn media"
+
+#~ msgid "10: Compute radiosity but no media"
+#~ msgstr "10: Beregn «radiositet» uten media"
+
+#~ msgid "11: Compute radiosity and media"
+#~ msgstr "11: Beregn «radiositet» og media"
+
 #, fuzzy
 #~ msgid "Center"
 #~ msgstr "Senter:"
@@ -4387,3 +4389,6 @@ msgstr "Povray opptegning"
 #, fuzzy
 #~ msgid "Main Toolbar"
 #~ msgstr "Bibliotek verktøylinje"
+
+#~ msgid "6, 7: Compute texture patterns"
+#~ msgstr "6, 7: Beregn teksturmønstre"