preparing i18n for mga6.1. part1

2 files changed, 68 insertions, 56 deletions

diff --git a/langs/cy/index.po b/langs/cy/index.po
index 824361355..2c1811c0a 100644
--- a/langs/cy/index.po
+++ b/langs/cy/index.po
@@ -2,13 +2,13 @@
 # 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:
 # Agored Open, 2016
 # ciaran, 2015-2016,2018
@@ -16,14 +16,14 @@ 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-07-13 22:42+0000\n"
 "Last-Translator: ciaran\n"
 "Language-Team: Welsh (http://www.transifex.com/MageiaLinux/mageia/language/cy/)\n"
+"Language: cy\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: cy\n"
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
 
 #: "/web/en/index.php +14"
@@ -35,9 +35,7 @@ msgid "Mageia is a community-based Linux distribution, for desktop & server."
 msgstr "Mae Mageia yn ddosbarthiad Linux sy'n seiliedig ar y gymuned, i fyrddau gwaith a gweinyddion."
 
 #: "/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, meddalwed am ddim, rhydd, system weithredu, cyfrifiadur, gliniadur, bwrdd gwaith, gweinydd, dyfais, symundol, mandriva, mandrake"
 
 #: "/web/en/index.php +23"
@@ -49,8 +47,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, dosbarthiad Linux rhydd a rhad ac am ddim sy'n seiliedig ar y gymuned, i fyrddau gwaith a gweinyddion."
 
 #: "/web/en/index.php +233"
@@ -101,6 +98,11 @@ msgstr "Gallwch fod yn rhan ohono"
 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 "rhyddhawyd fis Gorffennaf 2017"
diff --git a/langs/cy/timeline.po b/langs/cy/timeline.po
index a234558cb..9da985cab 100644
--- a/langs/cy/timeline.po
+++ b/langs/cy/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:
 # ciaran, 2015
 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: 2017-09-20 01:01+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Welsh (http://www.transifex.com/MageiaLinux/mageia/language/cy/)\n"
+"Language: cy\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: cy\n"
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
 
 #: "/web/en/timeline/index.php +39"
-msgid "2017"
+msgid "2018"
 msgstr ""
 
 #: "/web/en/timeline/index.php +40"
-msgid "July"
+msgid "October"
 msgstr ""
 
 #: "/web/en/timeline/index.php +40"
+#, fuzzy
+msgid "<a href=%s>Mageia 6</a> updated to 6.1."
+msgstr "Rhyddhawyd <a href=%s>Mageia 5</a>."
+
+#: "/web/en/timeline/index.php +42"
+msgid "2017"
+msgstr ""
+
+#: "/web/en/timeline/index.php +43"
+msgid "July"
+msgstr ""
+
+#: "/web/en/timeline/index.php +43"
 msgid "<a href=%s>Mageia 6</a> is released."
 msgstr ""
 
-#: "/web/en/timeline/index.php +41"
+#: "/web/en/timeline/index.php +44"
 msgid "February"
 msgstr "Chwefror"
 
-#: "/web/en/timeline/index.php +41"
+#: "/web/en/timeline/index.php +44"
 msgid "Seventh General Assembly during FOSDEM in Brussels, Belgium."
 msgstr ""
 
-#: "/web/en/timeline/index.php +43"
+#: "/web/en/timeline/index.php +46"
 msgid "2016"
 msgstr ""
 
-#: "/web/en/timeline/index.php +44"
+#: "/web/en/timeline/index.php +47"
 msgid "December"
 msgstr ""
 
-#: "/web/en/timeline/index.php +44"
+#: "/web/en/timeline/index.php +47"
 msgid "<a href=%s>Mageia 5</a> updated to 5.1."
 msgstr ""
 
-#: "/web/en/timeline/index.php +45"
+#: "/web/en/timeline/index.php +48"
 msgid "Sixth General Assembly during FOSDEM in Brussels, Belgium."
 msgstr ""
 
-#: "/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 "Mehefin"
 
-#: "/web/en/timeline/index.php +48"
+#: "/web/en/timeline/index.php +51"
 msgid "<a href=%s>Mageia 5</a> is released."
 msgstr "Rhyddhawyd <a href=%s>Mageia 5</a>."
 
-#: "/web/en/timeline/index.php +49"
+#: "/web/en/timeline/index.php +52"
 msgid "Fifth General Assembly during FOSDEM in Brussels, Belgium."
 msgstr "Y pumed cynulliad cyffredinol yn ystod FOSDEM ym Mrwsel, Gwlad Belg."
 
-#: "/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 ""
 
-#: "/web/en/timeline/index.php +54"
+#: "/web/en/timeline/index.php +57"
 msgid "<a href=\"/4/\">Mageia 4</a> is released."
 msgstr "Rhyddhawyd <a href=\"/4/\">Mageia 4</a>."
 
-#: "/web/en/timeline/index.php +55"
+#: "/web/en/timeline/index.php +58"
 msgid "Fourth General Assembly during FOSDEM in Brussels, Belgium."
 msgstr "Y pedwerydd cynulliad cyffredinol yn ystod FOSDEM ym Mrwsel, Gwlad Belg."
 
-#: "/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 "Rhyddhawyd <a href=\"/3/\">Mageia 3</a>."
 
-#: "/web/en/timeline/index.php +60"
+#: "/web/en/timeline/index.php +63"
 msgid "Third General Assembly during FOSDEM in Brussels, Belgium."
 msgstr "Y trydydd cynulliad cyffredinol yn ystod FOSDEM ym Mrwsel, Gwlad Belg."
 
-#: "/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 "Rhyddhawyd <a href=\"/2/\">Mageia 2</a>."
 
-#: "/web/en/timeline/index.php +64"
+#: "/web/en/timeline/index.php +67"
 msgid "Second General Assembly during FOSDEM in Brussels, Belgium."
 msgstr "Yr ail gynulliad cyffredinol yn ystod FOSDEM ym Mrwsel, Gwlad Belg."
 
-#: "/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 "Rhyddhawyd <a href=\"/1/\">Mageia 1</a>."
 
-#: "/web/en/timeline/index.php +68"
+#: "/web/en/timeline/index.php +71"
 msgid "First General Assembly during FOSDEM in Brussels, Belgium."
 msgstr "Y cynulliad cyffredinol cyntaf yn ystod FOSDEM ym Mrwsel, Gwlad Belg."
 
-#: "/web/en/timeline/index.php +69"
+#: "/web/en/timeline/index.php +72"
 msgid "January"
 msgstr "Ionawr"
 
-#: "/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 "Daeth y system adeiladu'n barod i'w rhedeg ar gyfer yr ISOs alffa cyntaf."
 
-#: "/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 "Diwedd y flwyddyn"
 
-#: "/web/en/timeline/index.php +73"
+#: "/web/en/timeline/index.php +76"
 msgid "With an incredible response, first donations and discussions abound."
 msgstr "Gydag ymateb anhygoel, daeth llu o roddion a thrafodaethau."
 
-#: "/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 "Strwythurwyd y prosiect, ffurfiwyd y rheolaeth (y bwrdd cyntaf, timau)."
 
-#: "/web/en/timeline/index.php +76"
+#: "/web/en/timeline/index.php +79"
 msgid "September"
 msgstr "Medi"
 
-#: "/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 "Dechreuodd Mageia fel <a href=\"../about/2010-sept-announcement.html\">fforch Mandriva Linux</a>."
 
-#: "/web/en/timeline/index.php +78"
+#: "/web/en/timeline/index.php +81"
 msgid "Mageia.Org is registered in Paris, France."
 msgstr "Cofrestrwyd Mageia.Org ym Mharis, Ffrainc."
 
-#: "/web/en/timeline/index.php +87"
+#: "/web/en/timeline/index.php +90"
 msgid "Mageia Timeline"
 msgstr "Amserlen Mageia"