Update Welsh translation

22 files changed, 382 insertions, 260 deletions

diff --git a/langs/cy/2.po b/langs/cy/2.po
index 134079b0d..5f60ee11d 100644
--- a/langs/cy/2.po
+++ b/langs/cy/2.po
@@ -20,7 +20,7 @@ msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
 "POT-Creation-Date: 2014-03-20 19:38:15+0000\n"
-"PO-Revision-Date: 2016-01-16 11:01+0000\n"
+"PO-Revision-Date: 2017-09-23 19:39+0000\n"
 "Last-Translator: ciaran\n"
 "Language-Team: Welsh (http://www.transifex.com/MageiaLinux/mageia/language/cy/)\n"
 "MIME-Version: 1.0\n"
diff --git a/langs/cy/3.po b/langs/cy/3.po
index bcec23fc2..aa217130a 100644
--- a/langs/cy/3.po
+++ b/langs/cy/3.po
@@ -20,7 +20,7 @@ msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
 "POT-Creation-Date: 2014-11-27 19:38:42+0000\n"
-"PO-Revision-Date: 2016-01-16 11:01+0000\n"
+"PO-Revision-Date: 2017-09-23 19:39+0000\n"
 "Last-Translator: ciaran\n"
 "Language-Team: Welsh (http://www.transifex.com/MageiaLinux/mageia/language/cy/)\n"
 "MIME-Version: 1.0\n"
diff --git a/langs/cy/4.po b/langs/cy/4.po
index a20035966..c7fdddd1b 100644
--- a/langs/cy/4.po
+++ b/langs/cy/4.po
@@ -18,7 +18,7 @@ msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
 "POT-Creation-Date: 2015-09-19 19:37:12+0000\n"
-"PO-Revision-Date: 2016-01-17 16:16+0000\n"
+"PO-Revision-Date: 2017-09-23 19:39+0000\n"
 "Last-Translator: ciaran\n"
 "Language-Team: Welsh (http://www.transifex.com/MageiaLinux/mageia/language/cy/)\n"
 "MIME-Version: 1.0\n"
diff --git a/langs/cy/404.po b/langs/cy/404.po
index e98b81a1a..c3d69f4ca 100644
--- a/langs/cy/404.po
+++ b/langs/cy/404.po
@@ -16,7 +16,7 @@ msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
 "POT-Creation-Date: 2014-03-16 20:51:22+0000\n"
-"PO-Revision-Date: 2015-12-26 22:45+0000\n"
+"PO-Revision-Date: 2017-09-23 19:38+0000\n"
 "Last-Translator: ciaran\n"
 "Language-Team: Welsh (http://www.transifex.com/MageiaLinux/mageia/language/cy/)\n"
 "MIME-Version: 1.0\n"
diff --git a/langs/cy/5.po b/langs/cy/5.po
index d1f08d4e6..9f04bba2b 100644
--- a/langs/cy/5.po
+++ b/langs/cy/5.po
@@ -18,7 +18,7 @@ msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
 "POT-Creation-Date: 2016-12-13 18:43:43+0000\n"
-"PO-Revision-Date: 2016-12-13 19:46+0000\n"
+"PO-Revision-Date: 2017-09-23 21:18+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Welsh (http://www.transifex.com/MageiaLinux/mageia/language/cy/)\n"
 "MIME-Version: 1.0\n"
diff --git a/langs/cy/about.po b/langs/cy/about.po
index ccb9f7795..88da697cb 100644
--- a/langs/cy/about.po
+++ b/langs/cy/about.po
@@ -1,28 +1,28 @@
 # gettext catalog for about web page(s)
-# Copyright (C) 2014 - 2015 Mageia
+# 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: about
-#
+# 
 # include translation strings from:
 # en/about/index.php
-#
+# 
 # Translators:
-# ciaran, 2015-2016
+# ciaran, 2015-2016,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:55+0000\n"
-"PO-Revision-Date: 2016-01-07 18:53+0000\n"
+"PO-Revision-Date: 2018-07-13 22:20+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/about/index.php +12"
@@ -34,7 +34,8 @@ msgid "Mageia is a Free Software, community-led project. Learn more about it."
 msgstr "Prosiect meddalwedd rydd dan arweiniad y gymuned yw Mageia. Dysgwch fwy amdano."
 
 #: "/web/en/about/index.php +14"
-msgid "mageia, mageia.org, about, mission, contacts, governance, values, timeline"
+msgid ""
+"mageia, mageia.org, about, mission, contacts, governance, values, timeline"
 msgstr "mageia, mageia.org, am, ynghylch, nod, cysylltiadau, rheolaeth, gwerthoedd, llinell amser"
 
 #: "/web/en/about/index.php +35"
@@ -42,7 +43,9 @@ msgid "Mageia is a GNU/Linux-based, Free Software operating system."
 msgstr "System weithredu meddalwedd rydd sy'n seiliedig ar GNU/Linux yw Mageia. "
 
 #: "/web/en/about/index.php +36"
-msgid "It is a <a href=\"../community/\">community project</a>, supported by <a href=\"#mageia.org\">a nonprofit organisation</a> of elected contributors."
+msgid ""
+"It is a <a href=\"../community/\">community project</a>, supported by <a "
+"href=\"#mageia.org\">a nonprofit organisation</a> of elected contributors."
 msgstr " Mae'n <a href=\"../community/\">brosiect cymunedol</a> a gefnogir gan <a href=\"#mageia.org\">sefydliad nid er elw</a> o gyfranwyr etholedig."
 
 #: "/web/en/about/index.php +39"
@@ -50,45 +53,63 @@ msgid "Our mission: to build great tools for people."
 msgstr "Ein nod: creu offer gwych."
 
 #: "/web/en/about/index.php +40"
-#, fuzzy
-msgid "Beyond just delivering a secure, stable and sustainable operating system, the goal is also to become and maintain a credible and recognized community in the free software world."
-msgstr "Ar ben darparu system weithredu ddiogel, sefydlog a chynaliadwy, ein hamcan yw sefydlu system lywodraethu sefydlog a dibynadwy i reoli prosiectau cydweithredol."
+msgid ""
+"Beyond just delivering a secure, stable and sustainable operating system, "
+"the goal is also to become and maintain a credible and recognized community "
+"in the free software world."
+msgstr "Ar ben darparu system weithredu ddiogel, sefydlog a chynaliadwy, y nod yw troi'n gymuned gredadwy a chydnabyddedig ym myd meddalwedd rydd."
 
 #: "/web/en/about/index.php +41"
 msgid "To date, Mageia:"
 msgstr "Hyd yn hyn:"
 
 #: "/web/en/about/index.php +44"
-msgid "<a href=\"2010-sept-announcement.html\">started in September 2010 as a fork</a> of Mandriva Linux,"
+msgid ""
+"<a href=\"2010-sept-announcement.html\">started in September 2010 as a "
+"fork</a> of Mandriva Linux,"
 msgstr "dechreuodd Mageia <a href=\"2010-sept-announcement.html\">fis Medi 2010 fel fforc</a> o Mandriva Linux,"
 
 #: "/web/en/about/index.php +46"
-msgid "gathered <a href=\"../community/\">hundreds of careful individuals and several companies worldwide</a>,"
+msgid ""
+"gathered <a href=\"../community/\">hundreds of careful individuals and "
+"several companies worldwide</a>,"
 msgstr "mae wedi dod â <a href=\"../community/\">channoedd o unigolion gofalus a sawl cwmni</a> ynghyd o bedwar ban y byd,"
 
 #: "/web/en/about/index.php +47"
-msgid "who coproduce the infrastructure, the distribution itself, <a href=\"https://wiki.mageia.org/\">documentation</a>, <a href=\"../downloads/\">delivery</a> and <a href=\"../support/\">support</a>, using Free Software tools;"
+msgid ""
+"who coproduce the infrastructure, the distribution itself, <a "
+"href=\"https://wiki.mageia.org/\">documentation</a>, <a "
+"href=\"../downloads/\">delivery</a> and <a href=\"../support/\">support</a>,"
+" using Free Software tools;"
 msgstr " sy'n cydgynhyrchu'r seilwaith, y dosbarthiad ei hun, <a href=\"https://wiki.mageia.org/\">y ddogfennaeth</a>, <a href=\"../downloads/\">lawrlwythiadau</a> a <a href=\"../support/\">chymorth</a>, gan ddefnyddio offer meddalwedd rhydd;"
 
 #: "/web/en/about/index.php +49"
-#, fuzzy
-msgid "released six major stable releases <a href=\"../1/\">in June 2011</a>, <a href=\"../2/\">in May 2012</a>, <a href=\"../3/\">in May 2013</a>, <a href=\"../4/\">in February 2014</a>, <a href=\"../5/\">in June 2015</a> and <a href=\"../6/\">in July 2017</a>."
-msgstr "rhyddhawyd pum fersiwn sefydlog <a href=\"../1/\"> fis Mehefin 2011</a>, <a href=\"../2/\">Mai 2012</a>, <a href=\"../3/\">Mai 2013</a>, <a href=\"../4/\">Chwefror 2014</a> a <a href=\"../5/\">Mehefin 2015</a>."
+msgid ""
+"released six major stable releases <a href=\"../1/\">in June 2011</a>, <a "
+"href=\"../2/\">in May 2012</a>, <a href=\"../3/\">in May 2013</a>, <a "
+"href=\"../4/\">in February 2014</a>, <a href=\"../5/\">in June 2015</a> and "
+"<a href=\"../6/\">in July 2017</a>."
+msgstr "cyhoeddwyd chwe fersiwn sefydlog ym <a href=\"../1/\">Mehefin 2011</a>, <a href=\"../2/\">Mai 2012</a>, <a href=\"../3/\">Mai 2013</a>, <a href=\"../4/\">Chwefror 2014</a>, <a href=\"../5/\">Mehefin 2015</a> a <a href=\"../6/\">Gorffennaf 2017</a>."
 
 #: "/web/en/about/index.php +70"
-msgid "is the French, Paris-based legal structure supporting the Mageia project."
+msgid ""
+"is the French, Paris-based legal structure supporting the Mageia project."
 msgstr "Dyma'r strwythur cyfreithiol Ffrenging a leolir ym Mharis sy'n cefnogi prosiect Mageia."
 
 #: "/web/en/about/index.php +73"
-msgid "<a href=%s>Mageia.Org's legal constitution</a> and <a href=%s>governance</a> rules;"
-msgstr "<a href=%s>Cyfansoddiad cyfreithiol Mageia.Org</a> a rheolau'r <a href=%s>rheolaeth</a>;"
+msgid ""
+"<a href=%s>Mageia.Org's legal constitution</a> and <a href=%s>governance</a>"
+" rules;"
+msgstr "<a href=%s>Cyfansoddiad cyfreithiol Mageia.Org</a> a'r rheolau <a href=%s>llywodraethu</a>;"
 
 #: "/web/en/about/index.php +74"
 msgid "\"https://wiki.mageia.org/en/Org\""
 msgstr "\"https://wiki.mageia.org/en/Org\""
 
 #: "/web/en/about/index.php +75"
-msgid "<a href=\"../about/reports/\">financial reports</a>, <a href=\"../thank-you/\">donators</a>."
+msgid ""
+"<a href=\"../about/reports/\">financial reports</a>, <a href=\"../thank-"
+"you/\">donators</a>."
 msgstr "<a href=\"../about/reports/\">Adroddiadau ariannol</a>, <a href=\"../thank-you/\">rhoddwyr</a>."
 
 #: "/web/en/about/index.php +79"
diff --git a/langs/cy/about/code-of-conduct.po b/langs/cy/about/code-of-conduct.po
index 45f25ee67..1560b31ae 100644
--- a/langs/cy/about/code-of-conduct.po
+++ b/langs/cy/about/code-of-conduct.po
@@ -15,7 +15,7 @@ msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
 "POT-Creation-Date: 2014-03-16 20:51:23+0000\n"
-"PO-Revision-Date: 2015-12-26 14:55+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"
 "MIME-Version: 1.0\n"
diff --git a/langs/cy/about/license.po b/langs/cy/about/license.po
index 3b7366e30..97c437154 100644
--- a/langs/cy/about/license.po
+++ b/langs/cy/about/license.po
@@ -16,7 +16,7 @@ msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
 "POT-Creation-Date: 2014-03-22 22:24:02+0000\n"
-"PO-Revision-Date: 2015-12-24 19:21+0000\n"
+"PO-Revision-Date: 2017-09-20 01:13+0000\n"
 "Last-Translator: ciaran\n"
 "Language-Team: Welsh (http://www.transifex.com/MageiaLinux/mageia/language/cy/)\n"
 "MIME-Version: 1.0\n"
diff --git a/langs/cy/about/media.po b/langs/cy/about/media.po
index 1e23812de..102b3aabd 100644
--- a/langs/cy/about/media.po
+++ b/langs/cy/about/media.po
@@ -1,28 +1,28 @@
 # gettext catalog for about/media web page(s)
-# Copyright (C) 2014 - 2014 Mageia
+# 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: about/media
-#
+# 
 # include translation strings from:
 # en/about/media/index.php
-#
+# 
 # Translators:
-# ciaran, 2015
+# ciaran, 2015,2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
 "POT-Creation-Date: 2018-01-24 16:52:04+0000\n"
-"PO-Revision-Date: 2015-12-26 14:26+0000\n"
+"PO-Revision-Date: 2018-07-13 22:25+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/about/media/index.php +12"
@@ -66,68 +66,60 @@ msgid "Mageia 2011 logo"
 msgstr "Logo Mageia 2011"
 
 #: "/web/en/about/media/index.php +56"
-#, fuzzy
 msgid "Mageia CD/DVD covers without version"
-msgstr "Cloriau CD/DVD Mageia 3"
+msgstr "Cloriau CD/DVD Mageia heb rifau fersiynau"
 
 #: "/web/en/about/media/index.php +57"
-#, fuzzy
 msgid "Mageia CD/DVD"
-msgstr "CD/DVD Mageia 1"
+msgstr "CD/DVD Mageia"
 
 #: "/web/en/about/media/index.php +63"
 msgid "Created by zalappy."
-msgstr ""
+msgstr "Crëwyd gan zalappy."
 
 #: "/web/en/about/media/index.php +63"
 msgid "Source is available %shere%s."
-msgstr ""
+msgstr "Mae'r ffynhonnell ar gael %syma%s."
 
 #: "/web/en/about/media/index.php +64"
 msgid "Licensed under <a href=\"%s\">CC-By-SA</a>."
 msgstr ""
 
 #: "/web/en/about/media/index.php +68"
-#, fuzzy
 msgid "Mageia 6 CD/DVD covers"
-msgstr "Cloriau CD/DVD Mageia 3"
+msgstr "Cloriau CD/DVD Mageia 6"
 
 #: "/web/en/about/media/index.php +69"
 msgid "Mageia 6 Classic-Installation 64bit DVD"
-msgstr ""
+msgstr "DVD gosodiad clasurol 64 did Mageia 6"
 
 #: "/web/en/about/media/index.php +70"
 msgid "Mageia 6 Classic-Installation 32bit DVD"
-msgstr ""
+msgstr "DVD gosodiad clasurol 32 did Mageia 6"
 
 #: "/web/en/about/media/index.php +71"
-#, fuzzy
 msgid "Mageia 6 LiveDVD KDE Plasma 64bit"
-msgstr "DVD byw 64did KDE Mageia 3"
+msgstr "DVD byw KDE Plasma 64 did Mageia 6"
 
 #: "/web/en/about/media/index.php +72"
-#, fuzzy
 msgid "Mageia 6 LiveDVD Gnome 64bit"
-msgstr "DVD byw 64did Gnome Mageia 3"
+msgstr "DVD byw Gnome 64 did Mageia 6"
 
 #: "/web/en/about/media/index.php +73"
-#, fuzzy
 msgid "Mageia 6 LiveDVD Xfce 64bit"
-msgstr "DVD 64did Mageia 3"
+msgstr "DVD byw Xfce 64 did Mageia 6"
 
 #: "/web/en/about/media/index.php +74"
-#, fuzzy
 msgid "Mageia 6 LiveDVD Xfce 32bit"
-msgstr "DVD 32did Mageia 3"
+msgstr "DVD byw Xfce 32 did Mageia 6"
 
 #: "/web/en/about/media/index.php +75"
 msgid "Created by Macxi."
-msgstr ""
+msgstr "Crëwyd gan Macxi."
 
 #: "/web/en/about/media/index.php +76"
-#, fuzzy
 msgid "Mageia 6 CD/DVD"
-msgstr "CD/DVD Mageia 1"
+msgstr "CD/DVD Mageia 6"
 
 #: "/web/en/about/media/index.php +84"
 msgid "Mageia 3 CD/DVD covers"
@@ -198,10 +190,11 @@ msgid "Mageia 1 CD/DVD"
 msgstr "CD/DVD Mageia 1"
 
 #: "/web/en/about/media/index.php +109"
-#, fuzzy
 msgid "Licensed under <a href=\"%s\">CC-By-SA</a> by Julie Guennegues."
-msgstr "Trwyddedwyd o dan CC-By-SA gan Julie Gunnegues."
+msgstr ""
 
 #: "/web/en/about/media/index.php +113"
-msgid "Please consult <a href=\"https://wiki.mageia.org/en/Atelier_team\">atelier team</a> if you have questions/concerns about using these files."
+msgid ""
+"Please consult <a href=\"https://wiki.mageia.org/en/Atelier_team\">atelier "
+"team</a> if you have questions/concerns about using these files."
 msgstr "Cysylltwch â <a href=\"https://wiki.mageia.org/en/Atelier_team\">thîm atelier</a> os oes gennych chi gwestiynau/pryderon ynglyn â'r ffeiliau hyn."
diff --git a/langs/cy/about/reports.po b/langs/cy/about/reports.po
index 883f932ec..5f2405551 100644
--- a/langs/cy/about/reports.po
+++ b/langs/cy/about/reports.po
@@ -16,7 +16,7 @@ msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
 "POT-Creation-Date: 2014-04-21 16:18:39+0000\n"
-"PO-Revision-Date: 2015-12-26 14:42+0000\n"
+"PO-Revision-Date: 2017-09-20 01:01+0000\n"
 "Last-Translator: ciaran\n"
 "Language-Team: Welsh (http://www.transifex.com/MageiaLinux/mageia/language/cy/)\n"
 "MIME-Version: 1.0\n"
diff --git a/langs/cy/about/values.po b/langs/cy/about/values.po
index 05b5dd17e..a61b6af00 100644
--- a/langs/cy/about/values.po
+++ b/langs/cy/about/values.po
@@ -16,7 +16,7 @@ msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
 "POT-Creation-Date: 2014-03-16 20:51:26+0000\n"
-"PO-Revision-Date: 2016-09-04 12:35+0000\n"
+"PO-Revision-Date: 2017-09-20 01:01+0000\n"
 "Last-Translator: Agored Open\n"
 "Language-Team: Welsh (http://www.transifex.com/MageiaLinux/mageia/language/cy/)\n"
 "MIME-Version: 1.0\n"
diff --git a/langs/cy/calendar.po b/langs/cy/calendar.po
index 7a8462a5e..a20c91339 100644
--- a/langs/cy/calendar.po
+++ b/langs/cy/calendar.po
@@ -16,7 +16,7 @@ msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
 "POT-Creation-Date: 2014-03-16 20:51:20+0000\n"
-"PO-Revision-Date: 2015-12-26 22:51+0000\n"
+"PO-Revision-Date: 2017-09-23 19:38+0000\n"
 "Last-Translator: ciaran\n"
 "Language-Team: Welsh (http://www.transifex.com/MageiaLinux/mageia/language/cy/)\n"
 "MIME-Version: 1.0\n"
diff --git a/langs/cy/cauldron.po b/langs/cy/cauldron.po
index dd432610d..3fead0d81 100644
--- a/langs/cy/cauldron.po
+++ b/langs/cy/cauldron.po
@@ -2,14 +2,14 @@
 # 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: cauldron
-#
+# 
 # include translation strings from:
 # en/6/download_index.php
 # en/6/nav.php
-#
+# 
 # Translators:
 # Agored Open, 2016
 # Agored Open, 2016
@@ -19,13 +19,13 @@ msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
 "POT-Creation-Date: 2017-05-24 23:25:23+0000\n"
-"PO-Revision-Date: 2017-03-07 06:21+0000\n"
-"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"PO-Revision-Date: 2017-09-20 01:13+0000\n"
+"Last-Translator: Filip Komar <filip.komar@gmail.com>\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/6/download_index.php +35"
@@ -49,7 +49,9 @@ msgid "Download %s DVD, LiveDVD, network install ISO images."
 msgstr "Lawrlwytho delweddau ISO DVD, DVD byw, gosodiad rhwydwaith %s."
 
 #: "/web/en/6/download_index.php +65"
-msgid "mageia, %s, linux, free, download, iso, torrent, vm, http, ftp, rsync, bittorrent"
+msgid ""
+"mageia, %s, linux, free, download, iso, torrent, vm, http, ftp, rsync, "
+"bittorrent"
 msgstr "mageia, %s, linux, rhydd, am ddim, lawrlwytho, iso, torret, vm, http, ftp, rsync, bettorrent"
 
 #: "/web/en/6/download_index.php +140"
@@ -61,11 +63,17 @@ msgid "Be careful! This is a beta, unstable release."
 msgstr "Byddwch yn ofalus! Fersiwn beta, ansefydlog yw hwn."
 
 #: "/web/en/6/download_index.php +142"
-msgid "It is only intended for developer use. <strong>DO NOT USE THIS IN PRODUCTION OR FOR OFFICIAL REVIEW.</strong>"
+msgid ""
+"It is only intended for developer use. <strong>DO NOT USE THIS IN PRODUCTION"
+" OR FOR OFFICIAL REVIEW.</strong>"
 msgstr ""
 
 #: "/web/en/6/download_index.php +143"
-msgid "This is a Release Candidate. Release Candidate software is software that has graduated Beta testing, and should be a release-ready product suitable for advanced users and reviewers. However, beginning users and critical-applications users may wish to wait for the final release planned for %s."
+msgid ""
+"This is a Release Candidate. Release Candidate software is software that has"
+" graduated Beta testing, and should be a release-ready product suitable for "
+"advanced users and reviewers. However, beginning users and critical-"
+"applications users may wish to wait for the final release planned for %s."
 msgstr ""
 
 #: "/web/en/6/download_index.php +143"
@@ -73,15 +81,22 @@ msgid "June 2017"
 msgstr ""
 
 #: "/web/en/6/download_index.php +143"
-msgid "Release Candidate is intended to identify any remaining bugs or missing packages."
+msgid ""
+"Release Candidate is intended to identify any remaining bugs or missing "
+"packages."
 msgstr ""
 
 #: "/web/en/6/download_index.php +152"
-msgid "It looks like you have JavaScript disable. Please <a href=\"%s\">enable</a> it to have better render. At the <a href=\"%s\">end</a> of this page there will be download link for you. But what is written between is important."
+msgid ""
+"It looks like you have JavaScript disable. Please <a href=\"%s\">enable</a> "
+"it to have better render. At the <a href=\"%s\">end</a> of this page there "
+"will be download link for you. But what is written between is important."
 msgstr "Mae'n ymddangos bod Javascript wedi'u analluogi. <a href=\"%s\">Galluogwch</a> JavaScript i lwytho tudalennau'n well. Ar <a href=\"%s\">waelod</a> y dudalen hon bydd dolen lawrlwytho. Ond mae'r hyn sydd wedi'i ysgrifennu cyn hynny'n bwysig."
 
 #: "/web/en/6/download_index.php +158"
-msgid "Mageia is provided as ISO image files that have to be written to blank <a href=\"%s\">CD or DVD discs</a>."
+msgid ""
+"Mageia is provided as ISO image files that have to be written to blank <a "
+"href=\"%s\">CD or DVD discs</a>."
 msgstr "Darperir Mageia drwy ffeiliau ISO i'w hysgrifennu i <a href=\"%s\">ddisg CD neu DVD</a> gwag."
 
 #: "/web/en/6/download_index.php +158"
@@ -93,15 +108,19 @@ msgid "All ISOs can also be launched from a <a %s>USB drive</a>."
 msgstr "Gellir lansio pob ISO o <a %s>yrrwr USB</a>."
 
 #: "/web/en/6/download_index.php +160"
-msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
+msgid ""
+"https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
 msgstr "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
 
 #: "/web/en/6/download_index.php +162"
-msgid "To <a %s>dump</a> a Mageia installation ISO on a USB stick, you may try one of several tools:"
+msgid ""
+"To <a %s>dump</a> a Mageia installation ISO on a USB stick, you may try one "
+"of several tools:"
 msgstr "I <a %s>ddadlwytho</a> ISO Mageia ar gofbin USB, gallwch ddefnyddio'r offer canlynol:"
 
 #: "/web/en/6/download_index.php +164"
-msgid "For Linux, IsoDumper, available inside repo. Or any tools based on %sdd%s."
+msgid ""
+"For Linux, IsoDumper, available inside repo. Or any tools based on %sdd%s."
 msgstr "I linux, IsoDumper, ar gael o'r storfeydd. Neu unrhyw offer sy'n seiliedig ar %sdd%s."
 
 #: "/web/en/6/download_index.php +165"
@@ -109,19 +128,29 @@ msgid "Unetbootin is not supported."
 msgstr "Ni chefnogir Unetbootin."
 
 #: "/web/en/6/download_index.php +167"
-msgid "For Windows please have a look on our <a href=\"%s\">wiki</a> for your options."
+msgid ""
+"For Windows please have a look on our <a href=\"%s\">wiki</a> for your "
+"options."
 msgstr "I Windows, tarwch olwg ar ein<a href=\"%s\">wici</a> i weld dewisiadau."
 
 #: "/web/en/6/download_index.php +167"
-msgid "https://wiki.mageia.org/en/Dump_Mageia_ISO_on_a_USB_flash_drive_-_Alternative_tools"
+msgid ""
+"https://wiki.mageia.org/en/Dump_Mageia_ISO_on_a_USB_flash_drive_-"
+"_Alternative_tools"
 msgstr "https://wiki.mageia.org/en/Dump_Mageia_ISO_on_a_USB_flash_drive_-_Alternative_tools"
 
 #: "/web/en/6/download_index.php +170"
-msgid "\"Dumping\" an image onto a flash device destroys any prior file-system in the partition; access to any data not destroyed will be lost, and partition capacity will be reduced to the image size. In other words, all prior data on the device is at risk."
+msgid ""
+"\"Dumping\" an image onto a flash device destroys any prior file-system in "
+"the partition; access to any data not destroyed will be lost, and partition "
+"capacity will be reduced to the image size. In other words, all prior data "
+"on the device is at risk."
 msgstr "Mae \"dadlwytho\" i gofbin USB yn dileu unrhyw system ffeiliau sydd eisoes yn bodoli ar y rhaniad; collir unrhyw fynediad at ddata na chollir, a gostyngir cynhwysedd y rhaniad i faint y ddelwedd. Hynny yw, mae data blaenorol y ddyfais mewn perygl."
 
 #: "/web/en/6/download_index.php +173"
-msgid "If you have <a href=\"%s\">UEFI</a>, a procedure is available in the <a href=\"%s\">wiki</a>."
+msgid ""
+"If you have <a href=\"%s\">UEFI</a>, a procedure is available in the <a "
+"href=\"%s\">wiki</a>."
 msgstr "Mae dull gosod ar gyfer systemau <a href=\"%s\">UEFI</a> ar gael yn y <a href=\"%s\">wici</a>."
 
 #: "/web/en/6/download_index.php +173"
@@ -137,7 +166,9 @@ msgid "Classical Installation Flavours"
 msgstr "Blasau gosod clasurol"
 
 #: "/web/en/6/download_index.php +183"
-msgid "The Classical ISO is the traditional way to install Mageia directly. Take a look at the complete <a href=\"%s\">documentation</a> for this installer."
+msgid ""
+"The Classical ISO is the traditional way to install Mageia directly. Take a "
+"look at the complete <a href=\"%s\">documentation</a> for this installer."
 msgstr "Yr ISO clasurol yw'r ffordd draddodiadol o osod Mageia'n uniongyrchol. Tarwch olwg ar <a href=\"%s\">ddogfennaeth</a> lawn y gosodwr hwn."
 
 #: "/web/en/6/download_index.php +185"
@@ -161,7 +192,10 @@ msgid "You will be asked of which kind of Software you want to install."
 msgstr "Cewch eich gofyn pa fath o feddalwedd yr hoffech chi ei gosod."
 
 #: "/web/en/6/download_index.php +193"
-msgid "The installer includes the capability of adding the online Mageia repositories during the installation, which means you can install even more packages than those available on the ISO."
+msgid ""
+"The installer includes the capability of adding the online Mageia "
+"repositories during the installation, which means you can install even more "
+"packages than those available on the ISO."
 msgstr "Mae'r gosodwr yn cynnwys y dewis o ychwanegu storfeydd ar lein Mageia yn ystod y gosod, sy'n golygu y gallwch chi osod hyd yn oed mwy o becynnau na'r rhai sydd ar gael ar yr ISO."
 
 #: "/web/en/6/download_index.php +196"
@@ -173,11 +207,16 @@ msgid "LiveDVDs"
 msgstr "DVDs byw"
 
 #: "/web/en/6/download_index.php +206"
-msgid "Live ISO's let you try %s without installation. You can run Mageia directly from a DVD or USB device, and try it using one of the graphical user interfaces such as GNOME, Plasma or Xfce."
+msgid ""
+"Live ISO's let you try %s without installation. You can run Mageia directly "
+"from a DVD or USB device, and try it using one of the graphical user "
+"interfaces such as GNOME, Plasma or Xfce."
 msgstr ""
 
 #: "/web/en/6/download_index.php +207"
-msgid "If you are happy with the Mageia experience, you can then install it onto your hard drive from the Live media."
+msgid ""
+"If you are happy with the Mageia experience, you can then install it onto "
+"your hard drive from the Live media."
 msgstr "Os yw Mageia yn eich plesio, yna gallwch ei osod i'ch disg caled o'r cyfrwng byw."
 
 #: "/web/en/6/download_index.php +209"
@@ -189,7 +228,9 @@ msgid "DO NOT use these LiveDVDs to upgrade from the prior Mageia release!"
 msgstr "PEIDIWCH â defnyddio'r DVDs byw hyn i uwchraddio o fersiwn blaenorol Mageia!"
 
 #: "/web/en/6/download_index.php +211"
-msgid "Use a classical installation and see <a href=\"%s\" hreflang=\"en\">upgrade guide</a>."
+msgid ""
+"Use a classical installation and see <a href=\"%s\" hreflang=\"en\">upgrade "
+"guide</a>."
 msgstr "Defnyddiwch osodiad clasurol a tharwch olwg ar y <a href=\"%s\" hreflang=\"en\">canllaw uwchraddio</a>."
 
 #: "/web/en/6/download_index.php +214"
@@ -201,7 +242,9 @@ msgid "Wired Network-based Installation CD"
 msgstr "CD gosod drwy rwydwaith gwifrog"
 
 #: "/web/en/6/download_index.php +220"
-msgid "Download quickly and immediately boot into install mode from <em>wired</em> network or a local disk."
+msgid ""
+"Download quickly and immediately boot into install mode from <em>wired</em> "
+"network or a local disk."
 msgstr "Lawrlwytho'n gyflym a chychwyn gosod ar unwaith drwy rwydwaith <em>gwifrog</em> neu ddisg lleol."
 
 #: "/web/en/6/download_index.php +221"
@@ -269,7 +312,9 @@ msgid "Network installer + nonfree firmware CD"
 msgstr "CD gosodwr rhwydwaith a chadarnwedd gyfyng"
 
 #: "/web/en/6/download_index.php +279"
-msgid "Contain nonfree drivers needed for some disc controllers, some network cards, etc."
+msgid ""
+"Contain nonfree drivers needed for some disc controllers, some network "
+"cards, etc."
 msgstr "Yn cynnwys y gyrwyr cyfyng sydd eu hangen i rai rheolyddion disgiau, cardiau rhwydwaith, ac ati weithio'n gywir."
 
 #: "/web/en/6/download_index.php +283"
@@ -285,11 +330,15 @@ msgid "Supported Architecture"
 msgstr "Saernïaeth a gefnogir"
 
 #: "/web/en/6/download_index.php +293"
-msgid "Most new computers support x86-64 (also known as AMD64 and Intel64), but some laptop processors and netbook processors do not support it."
+msgid ""
+"Most new computers support x86-64 (also known as AMD64 and Intel64), but "
+"some laptop processors and netbook processors do not support it."
 msgstr "Mae'r rhan fwyaf o gyfrifiaduron newydd yn cefnogi x86-64 (a adwaenir hefyd fel AMD64 neu Intel64), ond nid yw proseswyr rhai gliniaduron yn ei gefnogi. "
 
 #: "/web/en/6/download_index.php +297"
-msgid "This version runs on all PCs including those that support 64 Bit. If you have more than 3 GB of RAM you should prefer the 64 Bit version though."
+msgid ""
+"This version runs on all PCs including those that support 64 Bit. If you "
+"have more than 3 GB of RAM you should prefer the 64 Bit version though."
 msgstr "Mae'r fersiwn hwn yn rhedeg ar bob cyfrifiadur gan gynnwys y rhai sy'n cefnogi 64did. Fodd bynnag, os oes gennych fwy na 3GB o RAM, dylech ddefnyddio'r fersiwn 64did."
 
 #: "/web/en/6/download_index.php +309"
@@ -309,7 +358,9 @@ msgid "BitTorrent"
 msgstr "BitTorrent"
 
 #: "/web/en/6/download_index.php +319"
-msgid "We recommend you to use <a href=%s>BitTorrent</a> for downloading as it usually give a higher speeds and more reliable download of large files."
+msgid ""
+"We recommend you to use <a href=%s>BitTorrent</a> for downloading as it "
+"usually give a higher speeds and more reliable download of large files."
 msgstr "Rydym ni'n argymell lawrlwytho drwy <a href=%s>BitTorrent</a> am ei fod yn tueddu i gynnig cyflymder lawrlwytho uwch a throsgwlyddiadau ffeiliau mwy dibynadwy."
 
 #: "/web/en/6/download_index.php +319"
@@ -389,7 +440,8 @@ msgid "https://wiki.mageia.org/en/Mageia_6_Errata"
 msgstr "https://wiki.mageia.org/en/Mageia_6_Errata"
 
 #: "/web/en/6/nav.php +9"
-msgid "https://wiki.mageia.org/en/Mageia_6_Release_Notes#Upgrading_from_Mageia_5"
+msgid ""
+"https://wiki.mageia.org/en/Mageia_6_Release_Notes#Upgrading_from_Mageia_5"
 msgstr "https://wiki.mageia.org/en/Mageia_6_Release_Notes#Upgrading_from_Mageia_5"
 
 #: "/web/en/6/nav.php +12"
@@ -415,6 +467,3 @@ msgstr "Errata"
 #: "/web/en/6/nav.php +16"
 msgid "Bugs Reports"
 msgstr "Adroddiadau gwallau"
-
-#~ msgid "May 2015"
-#~ msgstr "Mai 2015"
diff --git a/langs/cy/contact.po b/langs/cy/contact.po
index bb57d928d..b964caefe 100644
--- a/langs/cy/contact.po
+++ b/langs/cy/contact.po
@@ -16,7 +16,7 @@ msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
 "POT-Creation-Date: 2016-08-06 11:27:23+0000\n"
-"PO-Revision-Date: 2016-08-06 11:52+0000\n"
+"PO-Revision-Date: 2017-09-20 01:07+0000\n"
 "Last-Translator: ciaran\n"
 "Language-Team: Welsh (http://www.transifex.com/MageiaLinux/mageia/language/cy/)\n"
 "MIME-Version: 1.0\n"
diff --git a/langs/cy/documentation.po b/langs/cy/documentation.po
index 2e7ae580b..91db32b80 100644
--- a/langs/cy/documentation.po
+++ b/langs/cy/documentation.po
@@ -1,30 +1,30 @@
 # gettext catalog for documentation web page(s)
-# Copyright (C) 2014 - 2016 Mageia
+# 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: documentation
-#
+# 
 # include translation strings from:
 # en/doc/index.php
 # en/doc/archive.php
 # en/doc/doc.php
-#
+# 
 # Translators:
-# ciaran, 2015
+# ciaran, 2015,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"
-"PO-Revision-Date: 2016-09-04 11:44+0000\n"
-"Last-Translator: Filip Komar <filip.komar@gmail.com>\n"
+"PO-Revision-Date: 2018-07-13 22:30+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/doc/index.php +14"
@@ -44,15 +44,23 @@ msgid "Find your documentation"
 msgstr "Dod o hyd i'ch dogfennaeth"
 
 #: "/web/en/doc/index.php +31"
-msgid "Select the manual, the release of Mageia and the language you want to see."
+msgid ""
+"Select the manual, the release of Mageia and the language you want to see."
 msgstr "Dewiswch y canllaw, y fersiwn, a'r iaith yr hoffech eu gweld."
 
 #: "/web/en/doc/index.php +32"
-msgid "Documentation of old versions are available in the <a href=\"archive.php\">archive page</a>."
+msgid ""
+"Documentation of old versions are available in the <a "
+"href=\"archive.php\">archive page</a>."
 msgstr "Cewch weld dogfennaeth fersiynau blaenorol yn yr <a href=\"archive.php\">archif</a>."
 
 #: "/web/en/doc/index.php +33"
-msgid "Those manuals are the result of common work of <a href=\"https://wiki.mageia.org/en/Documentation_team\">documentation</a> and <a href=\"https://wiki.mageia.org/en/Internationalisation_Team_(i18n)\">translation</a> teams."
+msgid ""
+"Those manuals are the result of common work of <a "
+"href=\"https://wiki.mageia.org/en/Documentation_team\">documentation</a> and"
+" <a "
+"href=\"https://wiki.mageia.org/en/Internationalisation_Team_(i18n)\">translation</a>"
+" teams."
 msgstr "Ffrwyth llafur y timau <a href=\"https://wiki.mageia.org/en/Documentation_team\">dogfennu</a> a <a href=\"https://wiki.mageia.org/en/Internationalisation_Team_(i18n)\">chyfieithu</a> yw'r canllawiau."
 
 #: "/web/en/doc/index.php +34"
@@ -61,7 +69,7 @@ msgstr "Mae croeso i chi ein helpu ni i'w gwella!"
 
 #: "/web/en/doc/index.php +35"
 msgid "Documentation built using the <a href=\"%s\">Calenco tool from NeoDoc</a>."
-msgstr ""
+msgstr "Crëwyd y ddogfennaeth gan ddefnyddio <a href=\"%s\">teclyn Calenco gan NeoDoc</a>."
 
 #: "/web/en/doc/index.php +40"
 msgid "Installer"
@@ -73,18 +81,19 @@ msgstr "Canolfan rheoli"
 
 #: "/web/en/doc/index.php +46"
 msgid "Installation from LIVE medium"
-msgstr ""
+msgstr "Gosodiad cyfrwng byw"
 
 #: "/web/en/doc/index.php +49"
 msgid "Network installation"
-msgstr ""
+msgstr "Gosodiad rhwydwaith"
 
 #: "/web/en/doc/archive.php +12"
 msgid "Mageia Documentation's Archive"
 msgstr "Archif dogfennaeth Mageia"
 
 #: "/web/en/doc/archive.php +13"
-msgid "Documentation for previous releases of Mageia distribution and its tools."
+msgid ""
+"Documentation for previous releases of Mageia distribution and its tools."
 msgstr "Dogfennaeth ar gyfer fersiynau blaenorol dosbarthiad Mageia a'i offer."
 
 #: "/web/en/doc/archive.php +28"
@@ -92,11 +101,15 @@ msgid "Some More documentation"
 msgstr "Rhagor o ddogfennaeth"
 
 #: "/web/en/doc/archive.php +29"
-msgid "Here you will find the documentation for the versions of Mageia that have reached their End-Of-Life."
+msgid ""
+"Here you will find the documentation for the versions of Mageia that have "
+"reached their End-Of-Life."
 msgstr "Yma cewch weld dogfennaeth fersiynau Mageia sydd wedi cyrraedd diwedd eu hoes."
 
 #: "/web/en/doc/archive.php +30"
-msgid "If you are looking for the current versions, see <a href=\"index.php\">here</a>."
+msgid ""
+"If you are looking for the current versions, see <a "
+"href=\"index.php\">here</a>."
 msgstr "Os ydych chi'n chwilio am y fersiynau cyfredol, gweler <a href=\"index.php\">yma</a>."
 
 #: "/web/en/doc/doc.php +70"
@@ -120,9 +133,12 @@ msgid "Other languages:"
 msgstr "Ieithoedd eraill:"
 
 #: "/web/en/doc/doc.php +144"
-msgid "Translation was present in %s before.<br/>Maybe you can check documentation for %s in Mageia %s."
+msgid ""
+"Translation was present in %s before.<br/>Maybe you can check documentation "
+"for %s in Mageia %s."
 msgstr "Roedd cyfieithiad %s ar gael o'r blaen.<br/>Efallai y gallwch gymryd golwg ar ddogfennaeth ar gyfer %s ym Mageia %s."
 
 #: "/web/en/doc/doc.php +151"
-msgid "Please help <a href=\"../community/\">us</a> translate it in your language."
+msgid ""
+"Please help <a href=\"../community/\">us</a> translate it in your language."
 msgstr "Ystyriwch <a href=\"../community/\">helpu</a> cyfieithu i'ch iaith chi."
diff --git a/langs/cy/donate.po b/langs/cy/donate.po
index 5024eb319..741069bc0 100644
--- a/langs/cy/donate.po
+++ b/langs/cy/donate.po
@@ -16,7 +16,7 @@ msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
 "POT-Creation-Date: 2014-03-20 17:21:33+0000\n"
-"PO-Revision-Date: 2016-01-16 21:54+0000\n"
+"PO-Revision-Date: 2017-09-20 01:07+0000\n"
 "Last-Translator: ciaran\n"
 "Language-Team: Welsh (http://www.transifex.com/MageiaLinux/mageia/language/cy/)\n"
 "MIME-Version: 1.0\n"
diff --git a/langs/cy/downloads/get.po b/langs/cy/downloads/get.po
index 2a0e2dfda..317426b27 100644
--- a/langs/cy/downloads/get.po
+++ b/langs/cy/downloads/get.po
@@ -1,29 +1,29 @@
 # gettext catalog for downloads/get web page(s)
-# Copyright (C) 2014 - 2016 Mageia
+# 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: downloads/get
-#
+# 
 # include translation strings from:
 # en/downloads/get/index.php
-#
+# 
 # Translators:
 # Agored Open, 2016
-# ciaran, 2015
+# ciaran, 2015,2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
 "POT-Creation-Date: 2018-02-17 22:34:23+0100\n"
-"PO-Revision-Date: 2016-09-04 12:48+0000\n"
-"Last-Translator: Agored Open\n"
+"PO-Revision-Date: 2018-07-13 22:37+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/downloads/get/index.php +143"
@@ -31,7 +31,9 @@ msgid "This <a href=\"%s\">%s</a> download mirror is located in %s (%s)."
 msgstr "Lleolir y drych lawrlwytho <a href=\"%s\">%s</a> hwn yn %s (%s)."
 
 #: "/web/en/downloads/get/index.php +149"
-msgid "If it does not work well for you, <a href=\"#om\" id=\"other_mirrors_btn\">check out these other mirrors</a>."
+msgid ""
+"If it does not work well for you, <a href=\"#om\" "
+"id=\"other_mirrors_btn\">check out these other mirrors</a>."
 msgstr "Os nad yw'n gweithio'n iawn i chi, <a href=\"#om\" id=\"other_mirrors_btn\">tarwch olwg ar ddrychau eraill</a>."
 
 #: "/web/en/downloads/get/index.php +164"
@@ -48,11 +50,11 @@ msgstr "Lawrlwytho %s"
 
 #: "/web/en/downloads/get/index.php +236"
 msgid "Warning !"
-msgstr ""
+msgstr "Rhybudd!"
 
 #: "/web/en/downloads/get/index.php +237"
 msgid "This file is obsolete, please <a %s>download</a> the latest version."
-msgstr ""
+msgstr "Mae'r ffeil hon wedi ei disodli, <a %s>lawrlwythwch</a> y fersiwn diweddaraf."
 
 #: "/web/en/downloads/get/index.php +241"
 msgid "Your download of %s should start within a few seconds"
@@ -63,15 +65,21 @@ msgid "(download size is about %s)."
 msgstr "(maint lawrlwytho tua %s)."
 
 #: "/web/en/downloads/get/index.php +243"
-msgid "If the download does not start, <a href=\"%s\" rel=\"nofollow\" title=\"%s\">click here</a>."
+msgid ""
+"If the download does not start, <a href=\"%s\" rel=\"nofollow\" "
+"title=\"%s\">click here</a>."
 msgstr "Os na fydd yn cychwyn lawrlwytho, <a href=\"%s\" rel=\"nofollow\" title=\"%s\">cliciwch yma</a>."
 
 #: "/web/en/downloads/get/index.php +268"
-msgid "As soon as your download is complete, you should check that the checksums match:"
+msgid ""
+"As soon as your download is complete, you should check that the checksums "
+"match:"
 msgstr "Unwaith i'r lawrlwytho gwblhau, dylech gadarnhau bod y data checksum yn cyd-fynd:"
 
 #: "/web/en/downloads/get/index.php +273"
-msgid "If checksums do not match, <strong>DO NOT use this ISO</strong>. Double-check and try to download again."
+msgid ""
+"If checksums do not match, <strong>DO NOT use this ISO</strong>. Double-"
+"check and try to download again."
 msgstr "Os nad yw'r data checksum yn cyd-fynd,  <strong>PEIDIWCH â defnyddio'r ISO hwn</strong>. Ailwiriwch a cheisio lawrlwytho eto."
 
 #: "/web/en/downloads/get/index.php +274"
@@ -88,14 +96,16 @@ msgstr ""
 
 #: "/web/en/downloads/get/index.php +280"
 msgid "You can also verify the signature of an ISO."
-msgstr ""
+msgstr "Gallwch hefyd wirio llofnod ISO."
 
 #: "/web/en/downloads/get/index.php +281"
 msgid "They are also available for download as files:"
 msgstr ""
 
 #: "/web/en/downloads/get/index.php +283"
-msgid "First you need to import the \"Mageia Release\" key from a <a href=\"%s\">MIT PGP Public Key Server</a>:"
+msgid ""
+"First you need to import the \"Mageia Release\" key from a <a "
+"href=\"%s\">MIT PGP Public Key Server</a>:"
 msgstr ""
 
 #: "/web/en/downloads/get/index.php +287"
@@ -131,7 +141,10 @@ msgid "Download mirrors"
 msgstr "Drychau lawrlwytho"
 
 #: "/web/en/downloads/get/index.php +327"
-msgid "The making and the distribution of Mageia worldwide is made possible by all the <a href=\"%s\">people and organizations that mirror our software</a> and that <a href=\"%s\">donate money, hardware, hosting and more</a>."
+msgid ""
+"The making and the distribution of Mageia worldwide is made possible by all "
+"the <a href=\"%s\">people and organizations that mirror our software</a> and"
+" that <a href=\"%s\">donate money, hardware, hosting and more</a>."
 msgstr ""
 
 #: "/web/en/downloads/get/index.php +328"
@@ -143,15 +156,21 @@ msgid "Sorry!"
 msgstr "Mae'n ddrwg gennym!"
 
 #: "/web/en/downloads/get/index.php +334"
-msgid "Your download could not complete, as we could not find this file. Please try again from the <a href=\"%s\">main downloads page</a>."
+msgid ""
+"Your download could not complete, as we could not find this file. Please try"
+" again from the <a href=\"%s\">main downloads page</a>."
 msgstr ""
 
 #: "/web/en/downloads/get/index.php +336"
-msgid "If you still encounter this error and think IT SHOULD NOT HAPPEN &ndash; please tell us:"
+msgid ""
+"If you still encounter this error and think IT SHOULD NOT HAPPEN &ndash; "
+"please tell us:"
 msgstr ""
 
 #: "/web/en/downloads/get/index.php +338"
-msgid "directly on <a href=\"irc://irc.freenode.net/#mageia-atelier\">#mageia-atelier on Freenode IRC</a>,"
+msgid ""
+"directly on <a href=\"irc://irc.freenode.net/#mageia-atelier\">#mageia-"
+"atelier on Freenode IRC</a>,"
 msgstr "yn uniongyrchol drwy <a href=\"irc://irc.freenode.net/#mageia-atelier\">#mageia-atelier ar Freenode IRC</a>,"
 
 #: "/web/en/downloads/get/index.php +339"
@@ -159,15 +178,21 @@ msgid "or <a href=\"https://twitter.com/mageia_org\">via our Twitter account</a>
 msgstr "neu <a href=\"https://twitter.com/mageia_org\">drwy ein cyfrif Twitter</a>,"
 
 #: "/web/en/downloads/get/index.php +340"
-msgid "or with a <a href=\"https://ml.mageia.org/l/info/atelier-discuss\">notice on the Atelier team mailing-list</a>,"
+msgid ""
+"or with a <a href=\"https://ml.mageia.org/l/info/atelier-discuss\">notice on"
+" the Atelier team mailing-list</a>,"
 msgstr ""
 
 #: "/web/en/downloads/get/index.php +341"
-msgid "or a <a href=\"https://bugs.mageia.org/enter_bug.cgi?product=Websites&amp;format=guided&amp;component=www.mageia.org\">bug report</a>."
+msgid ""
+"or a <a "
+"href=\"https://bugs.mageia.org/enter_bug.cgi?product=Websites&amp;format=guided&amp;component=www.mageia.org\">bug"
+" report</a>."
 msgstr ""
 
 #: "/web/en/downloads/get/index.php +344"
-msgid "Please copy and report us the above address that returned you to this page."
+msgid ""
+"Please copy and report us the above address that returned you to this page."
 msgstr ""
 
 #: "/web/en/downloads/get/index.php +344"
@@ -180,12 +205,14 @@ msgstr "yn ôl i dudalen flaen wych Mageia"
 
 #: "/web/en/downloads/get/index.php +350"
 msgid "By clicking this button, you agree to the use of HTTP cookies."
-msgstr ""
+msgstr "Drwy glicio'r botwm hwn, rydych chi'n cytuno â'n defnydd o friwsion HTTP."
 
 #: "/web/en/downloads/get/index.php +350"
-msgid "They enable you to share content from this page via social network sharing buttons."
+msgid ""
+"They enable you to share content from this page via social network sharing "
+"buttons."
 msgstr ""
 
 #: "/web/en/downloads/get/index.php +350"
 msgid "Share"
-msgstr ""
+msgstr "Rhannu"
diff --git a/langs/cy/index.po b/langs/cy/index.po
index aae81678d..824361355 100644
--- a/langs/cy/index.po
+++ b/langs/cy/index.po
@@ -1,29 +1,29 @@
 # gettext catalog for index web page(s)
-# Copyright (C) 2014 - 2016 Mageia
+# 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
+# ciaran, 2015-2016,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"
-"PO-Revision-Date: 2016-09-04 11:57+0000\n"
-"Last-Translator: Agored Open\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,7 +35,9 @@ 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"
@@ -47,7 +49,8 @@ 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"
@@ -59,24 +62,20 @@ msgid "https://blog.mageia.org/en/"
 msgstr "https://blog.mageia.org/en/"
 
 #: "/web/en/index.php +246"
-#, fuzzy
 msgid "Latest news from our <a href=\"%s\">localized planet</a>:"
-msgstr "Y newyddion diweddaraf o'n <a href=\"%s\">blog</a>:"
+msgstr ""
 
 #: "/web/en/index.php +248"
-#, fuzzy
 msgid "Latest news from our <a href=\"%s\">localized blog</a>:"
-msgstr "Y newyddion diweddaraf o'n <a href=\"%s\">blog</a>:"
+msgstr ""
 
 #: "/web/en/index.php +250"
-#, fuzzy
 msgid "Latest news from our <a href=\"%s\">English planet</a>:"
-msgstr "Y newyddion diweddaraf o'n <a href=\"%s\">blog</a>:"
+msgstr "Y newyddion diweddaraf o'n <a href=\"%s\">planed (Saesneg)</a>:"
 
 #: "/web/en/index.php +252"
-#, fuzzy
 msgid "Latest news from our <a href=\"%s\">English blog</a>:"
-msgstr "Y newyddion diweddaraf o'n <a href=\"%s\">blog</a>:"
+msgstr "Y newyddion diweddaraf o'n <a href=\"%s\">blog (Saesneg)</a>:"
 
 #: "/web/en/index.php +267"
 msgid "Change your perspective"
@@ -99,32 +98,28 @@ msgid "You can be part of it"
 msgstr "Gallwch fod yn rhan ohono"
 
 #: "/web/en/index.php +281"
-#, fuzzy
 msgid "Mageia 6"
-msgstr "Mageia 5"
+msgstr "Mageia 6"
 
 #: "/web/en/index.php +282"
-#, fuzzy
 msgid "released in July 2017"
-msgstr "rhyddhawyd fis Mehefin 2015"
+msgstr "rhyddhawyd fis Gorffennaf 2017"
 
 #: "/web/en/index.php +286"
 msgid "<a href=\"%s\" hreflang=\"en\">Release notes</a>"
 msgstr "<a href=\"%s\" hreflang=\"en\">Nodiadau'r fersiwn</a>"
 
 #: "/web/en/index.php +286"
-#, fuzzy
 msgid "https://wiki.mageia.org/en/Mageia_6_Release_Notes"
-msgstr "https://wiki.mageia.org/en/Mageia_5_Release_Notes"
+msgstr "https://wiki.mageia.org/en/Mageia_6_Release_Notes"
 
 #: "/web/en/index.php +287"
 msgid "<a href=\"%s\" hreflang=\"en\">errata</a>"
 msgstr "<a href=\"%s\" hreflang=\"en\">gwallau</a>"
 
 #: "/web/en/index.php +287"
-#, fuzzy
 msgid "https://wiki.mageia.org/en/Mageia_6_Errata"
-msgstr "https://wiki.mageia.org/en/Mageia_5_Errata"
+msgstr "https://wiki.mageia.org/en/Mageia_6_Errata"
 
 #: "/web/en/index.php +292"
 msgid "<strong>Get involved</strong> in the next version"
diff --git a/langs/cy/map.po b/langs/cy/map.po
index 617b839a0..1899a5ef1 100644
--- a/langs/cy/map.po
+++ b/langs/cy/map.po
@@ -1,14 +1,14 @@
 # gettext catalog for map web page(s)
-# Copyright (C) 2014 - 2016 Mageia
+# 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: map
-#
+# 
 # include translation strings from:
 # en/map/index.php
-#
+# 
 # Translators:
 # Agored Open, 2016
 # ciaran, 2015
@@ -17,13 +17,13 @@ msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
 "POT-Creation-Date: 2017-07-16 22:57:55+0000\n"
-"PO-Revision-Date: 2016-09-04 12:08+0000\n"
-"Last-Translator: Agored Open\n"
+"PO-Revision-Date: 2017-09-20 01:07+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/map/index.php +9"
@@ -111,9 +111,8 @@ msgid "Downloads"
 msgstr "Lawrlwytho"
 
 #: "/web/en/map/index.php +40"
-#, fuzzy
 msgid "6 (July 2017)"
-msgstr "5 (Mehefin 2015)"
+msgstr ""
 
 #: "/web/en/map/index.php +41"
 msgid "5 (June 2015)"
@@ -276,8 +275,6 @@ msgid "Site Map"
 msgstr "Map y wefan"
 
 #: "/web/en/map/index.php +140"
-msgid "You still can not find what you were looking for? Try searching mageia.org:"
+msgid ""
+"You still can not find what you were looking for? Try searching mageia.org:"
 msgstr "Methu dod o'r hyn rydych chi'n chwilio amdano? Chwiliwch mageia.org:"
-
-#~ msgid "6 (in development)"
-#~ msgstr "6 (datblygu)"
diff --git a/langs/cy/support.po b/langs/cy/support.po
index 933dff311..e636b4945 100644
--- a/langs/cy/support.po
+++ b/langs/cy/support.po
@@ -1,14 +1,14 @@
 # gettext catalog for support web page(s)
-# Copyright (C) 2014 - 2016 Mageia
+# 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: support
-#
+# 
 # include translation strings from:
 # en/support/index.php
-#
+# 
 # Translators:
 # ciaran, 2015-2016
 msgid ""
@@ -16,13 +16,13 @@ msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
 "POT-Creation-Date: 2018-01-24 16:52:04+0000\n"
-"PO-Revision-Date: 2016-09-04 12:08+0000\n"
+"PO-Revision-Date: 2018-01-24 17:46+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/support/index.php +11"
@@ -70,7 +70,9 @@ msgid "Bugs Reports"
 msgstr "Adroddiadau gwallau"
 
 #: "/web/en/support/index.php +38"
-msgid "You can look up existing %sdocumentation here%s. You may too look into our %sWiki%s."
+msgid ""
+"You can look up existing %sdocumentation here%s. You may too look into our "
+"%sWiki%s."
 msgstr "Cewch chwilio drwy'r %sddogfennaeth yma%s, a phori yn ein %sWici yma%s."
 
 #: "/web/en/support/index.php +40"
@@ -78,11 +80,15 @@ msgid "https://wiki.mageia.org"
 msgstr "https://wiki.mageia.org"
 
 #: "/web/en/support/index.php +43"
-msgid "Updates are available for %s and %s (security and bug fixes) and published on an ongoing basis."
+msgid ""
+"Updates are available for %s and %s (security and bug fixes) and published "
+"on an ongoing basis."
 msgstr "Cyhoeddir diweddariadau i %s a %s (cywiriadau i wallau a diogelwch) yn rheolaidd."
 
 #: "/web/en/support/index.php +44"
-msgid "Updates are available for %s (security and bug fixes) and published on an ongoing basis."
+msgid ""
+"Updates are available for %s (security and bug fixes) and published on an "
+"ongoing basis."
 msgstr "Cyhoeddir diweddariadau i %s (cywiriadau i wallau a diogelwch) yn rheolaidd."
 
 #: "/web/en/support/index.php +45"
@@ -98,28 +104,26 @@ msgid "Mageia releases are supported at least for 18 months."
 msgstr "Cefnogir fersiynau Mageia am o leiaf 18 mis."
 
 #: "/web/en/support/index.php +52"
-#, fuzzy
 msgid "Mageia 6 will be supported until January 16th, 2019."
-msgstr "Cefnogwyd Mageia 5 tan 16 Rhagfyr, 2016."
+msgstr ""
 
 #: "/web/en/support/index.php +52"
-#, fuzzy
 msgid "Mageia 6 was supported until January 16th, 2019."
-msgstr "Cefnogwyd Mageia 5 tan 16 Rhagfyr, 2016."
+msgstr ""
 
 #: "/web/en/support/index.php +54"
-#, fuzzy
 msgid "Mageia 5 was supported until December 31st, 2017."
-msgstr "Cefnogwyd Mageia 1 tan 1 Rhagfyr, 2012."
+msgstr ""
 
 #: "/web/en/support/index.php +55"
-msgid "More details and advice are available on our %swiki page%s and from %sour blog%s."
+msgid ""
+"More details and advice are available on our %swiki page%s and from %sour "
+"blog%s."
 msgstr ""
 
 #: "/web/en/support/index.php +56"
-#, fuzzy
 msgid "https://wiki.mageia.org/en/From_Mageia_5_to_6"
-msgstr "https://wiki.mageia.org/en/QA_Team"
+msgstr ""
 
 #: "/web/en/support/index.php +57"
 msgid "https://blog.mageia.org/en/2017/11/07/mageia-5-eol-postponed/"
@@ -142,31 +146,50 @@ msgid "Mageia 1 was supported until December 1st, 2012."
 msgstr "Cefnogwyd Mageia 1 tan 1 Rhagfyr, 2012."
 
 #: "/web/en/support/index.php +68"
-msgid "If you need help, information or directions about the Mageia distribution you installed or about the project, you can try to reach us through:"
+msgid ""
+"If you need help, information or directions about the Mageia distribution "
+"you installed or about the project, you can try to reach us through:"
 msgstr "Os oes arnoch angen cymorth, gwybodaeth, neu gyfarwyddiadau am y dosbarthiad Mageia rydych wedi ei osod neu am y prosiect, gallwch gysylltu â ni drwy:"
 
 #: "/web/en/support/index.php +71"
-msgid "<a href=\"https://forums.mageia.org/en/\">Community support forums</a> in English &ndash; see <a href=\"https://forums.mageia.org/en/viewforum.php?f=20\">other Mageia community forums</a> for support in your language;"
+msgid ""
+"<a href=\"https://forums.mageia.org/en/\">Community support forums</a> in "
+"English &ndash; see <a "
+"href=\"https://forums.mageia.org/en/viewforum.php?f=20\">other Mageia "
+"community forums</a> for support in your language;"
 msgstr "<a href=\"https://forums.mageia.org/en/\">fforymau cymorth cymunedol</a> Saesneg &ndash; gweler <a href=\"https://forums.mageia.org/en/viewforum.php?f=20\">fforymau eraill cymuned Mageia</a> am gymorth yn eich iaith chi;"
 
 #: "/web/en/support/index.php +72"
-msgid "IRC channels where you can discuss live with other Mageia users and contributors: <a href=\"irc://irc.freenode.net/#mageia\" hreflang=\"en\">#mageia</a> or other localized <a href=\"https://wiki.mageia.org/en/IRC#channels_in_other_languages\">channels</a>;"
+msgid ""
+"IRC channels where you can discuss live with other Mageia users and "
+"contributors: <a href=\"irc://irc.freenode.net/#mageia\" "
+"hreflang=\"en\">#mageia</a> or other localized <a "
+"href=\"https://wiki.mageia.org/en/IRC#channels_in_other_languages\">channels</a>;"
 msgstr "sianeli IRC lle gallwch drafod gyda defnyddwyr a chyfranwyr Mageia eraill yn fyw: <a href=\"irc://irc.freenode.net/#mageia\" hreflang=\"en\">#mageia</a> neu <a href=\"https://wiki.mageia.org/en/IRC#channels_in_other_languages\">sianeli</a> wedi'u lleoleiddio;"
 
 #: "/web/en/support/index.php +73"
-msgid "our <a href=\"https://wiki.mageia.org/en/\">Wiki</a> (still rough at the time, we are working on it!);"
+msgid ""
+"our <a href=\"https://wiki.mageia.org/en/\">Wiki</a> (still rough at the "
+"time, we are working on it!);"
 msgstr "ein <a href=\"https://wiki.mageia.org/en/\">Wici</a>;"
 
 #: "/web/en/support/index.php +74"
-msgid "our <a href=\"https://wiki.mageia.org/en/Mailing_lists\" hreflang=\"en\">mailing-lists</a>;"
+msgid ""
+"our <a href=\"https://wiki.mageia.org/en/Mailing_lists\" hreflang=\"en"
+"\">mailing-lists</a>;"
 msgstr "ein <a href=\"https://wiki.mageia.org/en/Mailing_lists\" hreflang=\"en\">rhestrau postio</a>;"
 
 #: "/web/en/support/index.php +75"
-msgid "local events: follow our <a href=\"https://blog.mageia.org/en/\">blog</a> and <a href=\"https://www.mageia.org/en/calendar/\">calendar</a>."
+msgid ""
+"local events: follow our <a href=\"https://blog.mageia.org/en/\">blog</a> "
+"and <a href=\"https://www.mageia.org/en/calendar/\">calendar</a>."
 msgstr "digwyddiadau lleol: dilynwch ein <a href=\"https://blog.mageia.org/en/\">blog</a> a'n <a href=\"https://www.mageia.org/en/calendar/\">calendr</a>."
 
 #: "/web/en/support/index.php +80"
-msgid "Mageia.Org does not provide or endorse commercial/professional support or other services around the distribution. But there are organizations providing such services and more."
+msgid ""
+"Mageia.Org does not provide or endorse commercial/professional support or "
+"other services around the distribution. But there are organizations "
+"providing such services and more."
 msgstr "Nid yw Mageia.Org yn cynnig na chymeradwyo cymorth masnachol/proffesiynol neu wasanaethau eraill ynghylch y dosbarthiad. Fodd bynnag, mae yna sefydliadau sy'n cynnwys gwasanaethau o'r fath."
 
 #: "/web/en/support/index.php +81"
@@ -178,9 +201,10 @@ msgid "https://wiki.mageia.org/en/Commercial_vendors"
 msgstr "https://wiki.mageia.org/en/Commercial_vendors"
 
 #: "/web/en/support/index.php +86"
-#, fuzzy
-msgid "Each release of Mageia software runs on most i586 and x86_64 computer systems available at the release time."
-msgstr "Gellir defnyddio meddalwedd Mageia ar y rhan fwyaf o systemau cyfrifiadurol x86 sydd ar gael heddiw, Ebrill 2011."
+msgid ""
+"Each release of Mageia software runs on most i586 and x86_64 computer "
+"systems available at the release time."
+msgstr ""
 
 #: "/web/en/support/index.php +87"
 msgid "You can follow this hardware requirements list:"
@@ -195,23 +219,33 @@ msgid "Memory (RAM): 512MB minimum, 2GB recommended;"
 msgstr "Cof (RAM): o leiaf 512MB, argymhellir 2GB;"
 
 #: "/web/en/support/index.php +92"
-msgid "Storage (HDD or SSD): 5GB for a minimal installation, 20GB for a casual setup;"
+msgid ""
+"Storage (HDD or SSD): 5GB for a minimal installation, 20GB for a casual "
+"setup;"
 msgstr "Lle storio (HDD neu SDD): 5GB ar gyfer gosodiad elfennol, 20GB ar gyfer gosodiad arferfol;"
 
 #: "/web/en/support/index.php +93"
-msgid "This includes a few GB for user files. If you need more than you should take that in account too."
+msgid ""
+"This includes a few GB for user files. If you need more than you should take"
+" that in account too."
 msgstr "Mae hyn yn cynnwys ambell i GB ar gyfer ffeiliau defnyddwyr. Os oes angen mwy, dylech ystyried hynny."
 
 #: "/web/en/support/index.php +94"
-msgid "Custom installations on less space are possible but this requires intermediate linux knowledge."
+msgid ""
+"Custom installations on less space are possible but this requires "
+"intermediate linux knowledge."
 msgstr "Mae gosodiadau addasedig sy'n defnyddio llai o le'n bosibl ond mae angen dealltwriaeth gadarn o linux."
 
 #: "/web/en/support/index.php +95"
-msgid "Bootable USB port or optical drive capable of using media with a storage capacity of at least 4GB used for installation."
+msgid ""
+"Bootable USB port or optical drive capable of using media with a storage "
+"capacity of at least 4GB used for installation."
 msgstr ""
 
 #: "/web/en/support/index.php +96"
-msgid "Smaller media capacity is used for network installation, but a reliable Internet connection is needed."
+msgid ""
+"Smaller media capacity is used for network installation, but a reliable "
+"Internet connection is needed."
 msgstr ""
 
 #: "/web/en/support/index.php +97"
@@ -219,7 +253,8 @@ msgid "More information at %sdownloads page%s."
 msgstr ""
 
 #: "/web/en/support/index.php +98"
-msgid "Graphic card: any AMD/ATI, Intel, Matrox, Nvidia, SiS or VIA graphic card;"
+msgid ""
+"Graphic card: any AMD/ATI, Intel, Matrox, Nvidia, SiS or VIA graphic card;"
 msgstr "Cerdyn graffeg: unrhyw gerdyn AMD/ATI, Intel, Matrox, Nvidia, SiS neu VIA;"
 
 #: "/web/en/support/index.php +99"
@@ -227,11 +262,20 @@ msgid "Sound card: any AC97, HDA or Sound Blaster sound card."
 msgstr "Cerdyn sain: unrhyw gerdyn AC97, HDA neu Sound Blaster."
 
 #: "/web/en/support/index.php +102"
-msgid "For some kinds of hardware (Wi-Fi chipsets, 3D graphic cards) to work properly, specific firmware or software may be needed, this is available in a specific online repository called \"nonfree\" (<a href=\"https://wiki.mageia.org/en/Install_media_in_Mageia_2_for_beginner#Types_of_Mageia_media\">learn more</a>)."
+msgid ""
+"For some kinds of hardware (Wi-Fi chipsets, 3D graphic cards) to work "
+"properly, specific firmware or software may be needed, this is available in "
+"a specific online repository called \"nonfree\" (<a "
+"href=\"https://wiki.mageia.org/en/Install_media_in_Mageia_2_for_beginner#Types_of_Mageia_media\">learn"
+" more</a>)."
 msgstr "I rai mathau o galedwedd (setiau microgylchedau di-wifr, cardiau graffeg 3D) weithio'n gywir, efallai y bydd angen cadarnwedd neu feddalwedd benodol. Mae hyn ar gael mewn storfa ar-lein benodol a elwir yn \"gyfyng\" (cewch <a href=\"https://wiki.mageia.org/en/Install_media_in_Mageia_2_for_beginner#Types_of_Mageia_media\">ddysgu mwy</a> yma)."
 
 #: "/web/en/support/index.php +103"
-msgid "We may set up a hardware compatibility list/directory as well as a hardware certification process; but that's still at the planning stage. Feel free to join/contact our <a href=\"%s\">Web</a> and <a href=\"%s\">QA</a> teams if you would like to help in this regard."
+msgid ""
+"We may set up a hardware compatibility list/directory as well as a hardware "
+"certification process; but that's still at the planning stage. Feel free to "
+"join/contact our <a href=\"%s\">Web</a> and <a href=\"%s\">QA</a> teams if "
+"you would like to help in this regard."
 msgstr "Efallai y byddwn yn creu rhestr/cyfeiriadur cydweddoldeb caledwedd yn ogystal â phroses ardystio caledwedd, ond rydym ni'n dal i fod yn y cam cynllunio. Mae croeso i chi ymuno/cysylltu â'n timau <a href=\"%s\">gwe</a> a <a href=\"%s\">sicrhau ansawdd</a> os hoffech chi roi help llaw  gyda hyn."
 
 #: "/web/en/support/index.php +103"
@@ -243,24 +287,7 @@ msgid "https://wiki.mageia.org/en/QA_Team"
 msgstr "https://wiki.mageia.org/en/QA_Team"
 
 #: "/web/en/support/index.php +107"
-msgid "You may check and report bugs on <a href=\"%s\">our Bugzilla (bugs.mageia.org)</a>."
+msgid ""
+"You may check and report bugs on <a href=\"%s\">our Bugzilla "
+"(bugs.mageia.org)</a>."
 msgstr "Cewch wirio ac adrodd gwallau ar <a href=\"%s\">ein Bugzilla (bugs.mageia.org)</a>."
-
-#, fuzzy
-#~ msgid "Mageia 5 EOL is postponed until December 31st, 2017."
-#~ msgstr "Cefnogwyd Mageia 1 tan 1 Rhagfyr, 2012."
-
-#~ msgid "Optical drive: CD or DVD depending on the ISO you use (network, USB key installation available);"
-#~ msgstr "Gyriant optegol: CD neu DVD gan ddibynnu ar yr ISO rydych chi'n ei ddefnyddio (gellir gosod drwy'r rhwydwaith neu gofbin USB hefyd);  "
-
-#, fuzzy
-#~ msgid "Mageia 5 will be supported until October 31th, 2017."
-#~ msgstr "Cefnogwyd Mageia 5 tan 16 Rhagfyr, 2016."
-
-#, fuzzy
-#~ msgid "Mageia 5 was supported until October 31th, 2017."
-#~ msgstr "Cefnogwyd Mageia 5 tan 16 Rhagfyr, 2016."
-
-#, fuzzy
-#~ msgid "Mageia 5 will be supported until 3 months after the release of Mageia 6."
-#~ msgstr "Cefnogir Mageia 5 tan 16 Rhagfyr, 2016."
diff --git a/langs/cy/thank-you.po b/langs/cy/thank-you.po
index 0451f41eb..9ccc785b1 100644
--- a/langs/cy/thank-you.po
+++ b/langs/cy/thank-you.po
@@ -16,7 +16,7 @@ msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
 "POT-Creation-Date: 2014-03-18 17:16:00+0000\n"
-"PO-Revision-Date: 2015-12-27 13:32+0000\n"
+"PO-Revision-Date: 2017-09-20 01:07+0000\n"
 "Last-Translator: ciaran\n"
 "Language-Team: Welsh (http://www.transifex.com/MageiaLinux/mageia/language/cy/)\n"
 "MIME-Version: 1.0\n"
diff --git a/langs/cy/timeline.po b/langs/cy/timeline.po
index f52fc05ed..a234558cb 100644
--- a/langs/cy/timeline.po
+++ b/langs/cy/timeline.po
@@ -1,14 +1,14 @@
 # gettext catalog for timeline web page(s)
-# Copyright (C) 2014 - 2015 Mageia
+# 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 ""
@@ -16,13 +16,13 @@ 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"
-"PO-Revision-Date: 2015-12-26 14:50+0000\n"
-"Last-Translator: ciaran\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"
@@ -34,37 +34,32 @@ msgid "July"
 msgstr ""
 
 #: "/web/en/timeline/index.php +40"
-#, fuzzy
 msgid "<a href=%s>Mageia 6</a> is released."
-msgstr "Rhyddhawyd <a href=%s>Mageia 5</a>."
+msgstr ""
 
 #: "/web/en/timeline/index.php +41"
 msgid "February"
 msgstr "Chwefror"
 
 #: "/web/en/timeline/index.php +41"
-#, fuzzy
 msgid "Seventh General Assembly during FOSDEM in Brussels, Belgium."
-msgstr "Y pumed cynulliad cyffredinol yn ystod FOSDEM ym Mrwsel, Gwlad Belg."
+msgstr ""
 
 #: "/web/en/timeline/index.php +43"
 msgid "2016"
 msgstr ""
 
 #: "/web/en/timeline/index.php +44"
-#, fuzzy
 msgid "December"
-msgstr "Medi"
+msgstr ""
 
 #: "/web/en/timeline/index.php +44"
-#, fuzzy
 msgid "<a href=%s>Mageia 5</a> updated to 5.1."
-msgstr "Rhyddhawyd <a href=%s>Mageia 5</a>."
+msgstr ""
 
 #: "/web/en/timeline/index.php +45"
-#, fuzzy
 msgid "Sixth General Assembly during FOSDEM in Brussels, Belgium."
-msgstr "Y pumed cynulliad cyffredinol yn ystod FOSDEM ym Mrwsel, Gwlad Belg."
+msgstr ""
 
 #: "/web/en/timeline/index.php +47"
 msgid "2015"
@@ -87,9 +82,8 @@ msgid "2014"
 msgstr "2014"
 
 #: "/web/en/timeline/index.php +52"
-#, fuzzy
 msgid "<a href=%s>Mageia 4</a> updated to 4.1."
-msgstr "Rhyddhawyd <a href=%s>Mageia 5</a>."
+msgstr ""
 
 #: "/web/en/timeline/index.php +54"
 msgid "<a href=\"/4/\">Mageia 4</a> is released."
@@ -160,7 +154,8 @@ 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)."
+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"
@@ -168,7 +163,9 @@ 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>."
+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"