preparing i18n for mga6.1. part1

2 files changed, 68 insertions, 56 deletions

diff --git a/langs/nb/index.po b/langs/nb/index.po
index 5524b3c74..fd86ce839 100644
--- a/langs/nb/index.po
+++ b/langs/nb/index.po
@@ -2,27 +2,27 @@
 # Copyright (C) 2014 - 2018 Mageia
 # This file is distributed under the same license as
 # the content of the corresponding web page(s).
-# 
+#
 # Generated by extract2gettext.php
 # Domain: index
-# 
+#
 # include translation strings from:
 # en/index.php
-# 
+#
 # Translators:
 # Karl Morten Ramberg <karl.m.ramberg@gmail.com>, 2017-2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2018-04-28 13:03:37+0000\n"
+"POT-Creation-Date: 2018-09-29 21:34:52+0000\n"
 "PO-Revision-Date: 2018-08-09 18:16+0000\n"
 "Last-Translator: Karl Morten Ramberg <karl.m.ramberg@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/MageiaLinux/mageia/language/nb/)\n"
+"Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: "/web/en/index.php +14"
@@ -34,9 +34,7 @@ msgid "Mageia is a community-based Linux distribution, for desktop & server."
 msgstr "Mageia er en fellesskaps basert Linux distribusjon for arbeidsstasjoner og tjenere"
 
 #: "/web/en/index.php +16"
-msgid ""
-"linux, mageia, free software, operating system, computer, laptop, desktop, "
-"server, headless, device, mobile, mandriva, mandrake"
+msgid "linux, mageia, free software, operating system, computer, laptop, desktop, server, headless, device, mobile, mandriva, mandrake"
 msgstr "linux, mageia, fri programvare, operativ system, arbeidstasjon, bærbar, tjener , enheter uten grafisk presentasjon, mobilt, mandriva, mandrake"
 
 #: "/web/en/index.php +23"
@@ -48,8 +46,7 @@ msgid "https://blog.mageia.org/en/?feed=rss"
 msgstr "https://blog.mageia.org/en/?feed=rss"
 
 #: "/web/en/index.php +225"
-msgid ""
-"Mageia, a free, community-based Linux distribution for desktop & server."
+msgid "Mageia, a free, community-based Linux distribution for desktop & server."
 msgstr "Mageia en fri, fellesskapsbasert Linux distribusjon for arbeidsstasjoner og tjenere."
 
 #: "/web/en/index.php +233"
@@ -100,6 +97,11 @@ msgstr "Du kan bli en del av dette"
 msgid "Mageia 6"
 msgstr "Mageia 6"
 
+#: "/web/en/index.php +281"
+#, fuzzy
+msgid "Mageia 6.1"
+msgstr "Mageia 6"
+
 #: "/web/en/index.php +282"
 msgid "released in July 2017"
 msgstr "Lansert i Juli 2017"
diff --git a/langs/nb/timeline.po b/langs/nb/timeline.po
index 8b0b396d6..694b9c4d1 100644
--- a/langs/nb/timeline.po
+++ b/langs/nb/timeline.po
@@ -2,176 +2,186 @@
 # Copyright (C) 2014 - 2017 Mageia
 # This file is distributed under the same license as
 # the content of the corresponding web page(s).
-# 
+#
 # Generated by extract2gettext.php
 # Domain: timeline
-# 
+#
 # include translation strings from:
 # en/timeline/index.php
-# 
+#
 # Translators:
 # Karl Morten Ramberg <karl.m.ramberg@gmail.com>, 2017-2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2017-07-16 22:57:54+0000\n"
+"POT-Creation-Date: 2018-09-29 21:34:52+0000\n"
 "PO-Revision-Date: 2018-02-14 00:14+0000\n"
 "Last-Translator: Karl Morten Ramberg <karl.m.ramberg@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/MageiaLinux/mageia/language/nb/)\n"
+"Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: "/web/en/timeline/index.php +39"
+msgid "2018"
+msgstr ""
+
+#: "/web/en/timeline/index.php +40"
+msgid "October"
+msgstr ""
+
+#: "/web/en/timeline/index.php +40"
+#, fuzzy
+msgid "<a href=%s>Mageia 6</a> updated to 6.1."
+msgstr "<a href=%s>Mageia 5</a> oppdatert til 5.1."
+
+#: "/web/en/timeline/index.php +42"
 msgid "2017"
 msgstr "2017"
 
-#: "/web/en/timeline/index.php +40"
+#: "/web/en/timeline/index.php +43"
 msgid "July"
 msgstr "Juli"
 
-#: "/web/en/timeline/index.php +40"
+#: "/web/en/timeline/index.php +43"
 msgid "<a href=%s>Mageia 6</a> is released."
 msgstr "<a href=%s>Mageia 6</a> er lansert."
 
-#: "/web/en/timeline/index.php +41"
+#: "/web/en/timeline/index.php +44"
 msgid "February"
 msgstr "Februar"
 
-#: "/web/en/timeline/index.php +41"
+#: "/web/en/timeline/index.php +44"
 msgid "Seventh General Assembly during FOSDEM in Brussels, Belgium."
 msgstr "Sjuende generasjon samling på FOSDEM i Brussels, Belgia."
 
-#: "/web/en/timeline/index.php +43"
+#: "/web/en/timeline/index.php +46"
 msgid "2016"
 msgstr "2016"
 
-#: "/web/en/timeline/index.php +44"
+#: "/web/en/timeline/index.php +47"
 msgid "December"
 msgstr "Desember"
 
-#: "/web/en/timeline/index.php +44"
+#: "/web/en/timeline/index.php +47"
 msgid "<a href=%s>Mageia 5</a> updated to 5.1."
 msgstr "<a href=%s>Mageia 5</a> oppdatert til 5.1."
 
-#: "/web/en/timeline/index.php +45"
+#: "/web/en/timeline/index.php +48"
 msgid "Sixth General Assembly during FOSDEM in Brussels, Belgium."
 msgstr "Sjette generasjon samling på  FOSDEM i Brussels, Belgia."
 
-#: "/web/en/timeline/index.php +47"
+#: "/web/en/timeline/index.php +50"
 msgid "2015"
 msgstr "2015"
 
-#: "/web/en/timeline/index.php +48"
+#: "/web/en/timeline/index.php +51"
 msgid "June"
 msgstr "Juni"
 
-#: "/web/en/timeline/index.php +48"
+#: "/web/en/timeline/index.php +51"
 msgid "<a href=%s>Mageia 5</a> is released."
 msgstr "<a href=%s>Mageia 5</a> er lansert."
 
-#: "/web/en/timeline/index.php +49"
+#: "/web/en/timeline/index.php +52"
 msgid "Fifth General Assembly during FOSDEM in Brussels, Belgium."
 msgstr "Femte generasjon samling på FOSDEM i Brussels, Belgia."
 
-#: "/web/en/timeline/index.php +51"
+#: "/web/en/timeline/index.php +54"
 msgid "2014"
 msgstr "2014"
 
-#: "/web/en/timeline/index.php +52"
+#: "/web/en/timeline/index.php +55"
 msgid "<a href=%s>Mageia 4</a> updated to 4.1."
 msgstr "<a href=%s>Mageia 4</a> oppdatert til 4.1."
 
-#: "/web/en/timeline/index.php +54"
+#: "/web/en/timeline/index.php +57"
 msgid "<a href=\"/4/\">Mageia 4</a> is released."
 msgstr "<a href=\"/4/\">Mageia 4</a> lansert.."
 
-#: "/web/en/timeline/index.php +55"
+#: "/web/en/timeline/index.php +58"
 msgid "Fourth General Assembly during FOSDEM in Brussels, Belgium."
 msgstr "Fjerde generasjon samling på FOSDEM i Brussels, Belgia."
 
-#: "/web/en/timeline/index.php +58"
+#: "/web/en/timeline/index.php +61"
 msgid "2013"
 msgstr "2013"
 
-#: "/web/en/timeline/index.php +59"
+#: "/web/en/timeline/index.php +62"
 msgid "May"
 msgstr "Mai"
 
-#: "/web/en/timeline/index.php +59"
+#: "/web/en/timeline/index.php +62"
 msgid "<a href=\"/3/\">Mageia 3</a> is released."
 msgstr "<a href=\"/3/\">Mageia 3</a> er lansert."
 
-#: "/web/en/timeline/index.php +60"
+#: "/web/en/timeline/index.php +63"
 msgid "Third General Assembly during FOSDEM in Brussels, Belgium."
 msgstr "Tredje generasjon samling på FOSDEM i Brussels, Belgia."
 
-#: "/web/en/timeline/index.php +62"
+#: "/web/en/timeline/index.php +65"
 msgid "2012"
 msgstr "2012"
 
-#: "/web/en/timeline/index.php +63"
+#: "/web/en/timeline/index.php +66"
 msgid "<a href=\"/2/\">Mageia 2</a> is released."
 msgstr "<a href=\"/2/\">Mageia 2</a>  er lansert.."
 
-#: "/web/en/timeline/index.php +64"
+#: "/web/en/timeline/index.php +67"
 msgid "Second General Assembly during FOSDEM in Brussels, Belgium."
 msgstr "Andre generasjon samling på FOSDEM i Brussels, Belgia."
 
-#: "/web/en/timeline/index.php +66"
+#: "/web/en/timeline/index.php +69"
 msgid "2011"
 msgstr "2011"
 
-#: "/web/en/timeline/index.php +67"
+#: "/web/en/timeline/index.php +70"
 msgid "<a href=\"/1/\">Mageia 1</a> is released."
 msgstr "<a href=\"/21/\">Mageia 1</a>  er lansert.."
 
-#: "/web/en/timeline/index.php +68"
+#: "/web/en/timeline/index.php +71"
 msgid "First General Assembly during FOSDEM in Brussels, Belgium."
 msgstr "Første generasjonens samling på FOSDEM i Brussels, Belgia."
 
-#: "/web/en/timeline/index.php +69"
+#: "/web/en/timeline/index.php +72"
 msgid "January"
 msgstr "Januar"
 
-#: "/web/en/timeline/index.php +69"
+#: "/web/en/timeline/index.php +72"
 msgid "Build system is ready to run for the first alpha ISOs."
 msgstr "Byggesystemet er klart til å kjøres for første Alfa ISO'er."
 
-#: "/web/en/timeline/index.php +71"
+#: "/web/en/timeline/index.php +74"
 msgid "2010"
 msgstr "2010"
 
-#: "/web/en/timeline/index.php +72"
+#: "/web/en/timeline/index.php +75"
 msgid "End of year"
 msgstr "Slutten på året."
 
-#: "/web/en/timeline/index.php +73"
+#: "/web/en/timeline/index.php +76"
 msgid "With an incredible response, first donations and discussions abound."
 msgstr "Med et utrolig   gjensvar florerer diskusjonene og de første donasjonene."
 
-#: "/web/en/timeline/index.php +74"
-msgid ""
-"Project gets structured, governance takes slowly shape (first board, teams)."
+#: "/web/en/timeline/index.php +77"
+msgid "Project gets structured, governance takes slowly shape (first board, teams)."
 msgstr "Prosjektet blir strkturert, styringen tar sakte form (første styremedlemmer, grupper)."
 
-#: "/web/en/timeline/index.php +76"
+#: "/web/en/timeline/index.php +79"
 msgid "September"
 msgstr "September"
 
-#: "/web/en/timeline/index.php +77"
-msgid ""
-"Mageia starts as a <a href=\"../about/2010-sept-announcement.html\">fork of "
-"Mandriva Linux</a>."
+#: "/web/en/timeline/index.php +80"
+msgid "Mageia starts as a <a href=\"../about/2010-sept-announcement.html\">fork of Mandriva Linux</a>."
 msgstr "Mageia starter som en  <a href=\"../about/2010-sept-announcement.html\"> forgreining av Mandriva Linux</a>."
 
-#: "/web/en/timeline/index.php +78"
+#: "/web/en/timeline/index.php +81"
 msgid "Mageia.Org is registered in Paris, France."
 msgstr "Mageia.Org er registrert i  Paris, Frankrike."
 
-#: "/web/en/timeline/index.php +87"
+#: "/web/en/timeline/index.php +90"
 msgid "Mageia Timeline"
 msgstr "Mageia Tidslinje"