Merge translation files from master branch.

1 files changed, 27 insertions, 26 deletions

diff --git a/po/nb/kipiplugin_cdarchiving.po b/po/nb/kipiplugin_cdarchiving.po
index 4ac6f33..5a9aed7 100644
--- a/po/nb/kipiplugin_cdarchiving.po
+++ b/po/nb/kipiplugin_cdarchiving.po
@@ -5,22 +5,23 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kipiplugin_cdarchiving\n"
-"POT-Creation-Date: 2008-06-10 23:47+0200\n"
+"POT-Creation-Date: 2019-03-19 18:32+0100\n"
 "PO-Revision-Date: 2006-02-25 23:07+0100\n"
 "Last-Translator: Nils Kristian Tomren <project@nilsk.net>\n"
 "Language-Team: Norwegian Bokmaal <i18n-no@lister.ping.uio.no>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Nils Kristian Tomren"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -273,8 +274,8 @@ msgstr "B&ilder pr. rekke:"
 
 #: cdarchivingdialog.cpp:218
 msgid ""
-"<p>Enter here the number of images per row on the album page. A good value is "
-"'4'."
+"<p>Enter here the number of images per row on the album page. A good value "
+"is '4'."
 msgstr "<p>Angi antall bilder i hver rekke. En god verdi er '4'."
 
 #: cdarchivingdialog.cpp:229
@@ -291,19 +292,19 @@ msgstr "<p>Med denne innstillinga kan du velge formatet på miniatyrbildene.<p>"
 
 #: cdarchivingdialog.cpp:242
 msgid ""
-"<b>JPEG</b>: The Joint Photographic Experts Group's file format is a good Web "
-"file format but it uses lossy data compression."
-"<p><b>PNG</b>: the Portable Network Graphics format is an extensible file "
-"format for the lossless, portable, well-compressed storage of raster images. "
-"PNG provides a patent-free replacement for GIF and can also replace many common "
-"uses of TIFF. PNG is designed to work well in online viewing applications, such "
-"as the World Wide Web, so it is fully streamable with a progressive display "
+"<b>JPEG</b>: The Joint Photographic Experts Group's file format is a good "
+"Web file format but it uses lossy data compression.<p><b>PNG</b>: the "
+"Portable Network Graphics format is an extensible file format for the "
+"lossless, portable, well-compressed storage of raster images. PNG provides a "
+"patent-free replacement for GIF and can also replace many common uses of "
+"TIFF. PNG is designed to work well in online viewing applications, such as "
+"the World Wide Web, so it is fully streamable with a progressive display "
 "option. Also, PNG can store gamma and chromaticity data for improved color "
 "matching on heterogeneous platforms."
 msgstr ""
-"<b>JPEG</b>: Joint Photographic Experts Group filformatet er velegnet til bruk "
-"på WWW, men benytter en komprimeringsmetode som mister bildeinformasjon. "
-"<p><b>PNG</b>: Portable Networks Graphics"
+"<b>JPEG</b>: Joint Photographic Experts Group filformatet er velegnet til "
+"bruk på WWW, men benytter en komprimeringsmetode som mister "
+"bildeinformasjon. <p><b>PNG</b>: Portable Networks Graphics"
 
 #: cdarchivingdialog.cpp:253
 msgid "Thumbnail file format:"
@@ -454,13 +455,13 @@ msgstr "Programparametre:"
 
 #: cdarchivingdialog.cpp:533
 msgid ""
-"<p>Enter parameters which will be used when starting the burning application. "
-"Newer versions of K3b might need --nofork, older versions might not need it. "
-"(128 characters max.)."
+"<p>Enter parameters which will be used when starting the burning "
+"application. Newer versions of K3b might need --nofork, older versions might "
+"not need it. (128 characters max.)."
 msgstr ""
 "<p>Skriv inn parametrene som vil bli brukt ved åpning av brenneprogrammet. "
-"Nyere versjoner av K3b kan trenge --nofork, eldre versjoner trenger det kanskje "
-"ikke. (maks 128 tegn)."
+"Nyere versjoner av K3b kan trenge --nofork, eldre versjoner trenger det "
+"kanskje ikke. (maks 128 tegn)."
 
 #: cdarchivingdialog.cpp:540
 msgid "Advanced Burning Options"
@@ -472,8 +473,8 @@ msgstr "Fortløpende brenning"
 
 #: cdarchivingdialog.cpp:550
 msgid ""
-"<p>This option uses the \"On-The-Fly\" media burning capability; this does not "
-"use a media image."
+"<p>This option uses the \"On-The-Fly\" media burning capability; this does "
+"not use a media image."
 msgstr ""
 "<p>Bruk denne innstillinga for å brenne til mediet \"fortløpende\". "
 "Brennemetoden bruker ikke noe CD-bilde."
@@ -484,11 +485,11 @@ msgstr "Kontroller mediet"
 
 #: cdarchivingdialog.cpp:556
 msgid ""
-"<p>This option verifies the media after the burning process. You must use K3b "
-"release >= 0.10.0"
+"<p>This option verifies the media after the burning process. You must use "
+"K3b release >= 0.10.0"
 msgstr ""
-"<p>Denne innstillinga undersøker mediet etter brenningen. Krever K3b versjon >"
-"= 0.10.0"
+"<p>Denne innstillinga undersøker mediet etter brenningen. Krever K3b versjon "
+">= 0.10.0"
 
 #: cdarchivingdialog.cpp:560
 msgid "Start burning process automatically"