push mga5 support from October 31th, 2017 to December 31st, 2017

1 files changed, 56 insertions, 35 deletions

diff --git a/langs/cy/support.po b/langs/cy/support.po
index 4c3b83227..41ce20599 100644
--- a/langs/cy/support.po
+++ b/langs/cy/support.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2017-07-16 15:15:54+0200\n"
+"POT-Creation-Date: 2017-11-08 21:36:24+0000\n"
 "PO-Revision-Date: 2016-09-04 12:08+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Welsh (http://www.transifex.com/MageiaLinux/mageia/language/cy/)\n"
@@ -107,128 +107,149 @@ msgstr "Cefnogwyd Mageia 5 tan 16 Rhagfyr, 2016."
 msgid "Mageia 6 was supported until January 16th, 2019."
 msgstr "Cefnogwyd Mageia 5 tan 16 Rhagfyr, 2016."
 
-#: "/web/en/support/index.php +53"
+#: "/web/en/support/index.php +54"
 #, fuzzy
-msgid "Mageia 5 will be supported until October 31th, 2017."
-msgstr "Cefnogwyd Mageia 5 tan 16 Rhagfyr, 2016."
+msgid "Mageia 5 EOL is postponed until December 31st, 2017."
+msgstr "Cefnogwyd Mageia 1 tan 1 Rhagfyr, 2012."
 
-#: "/web/en/support/index.php +53"
+#: "/web/en/support/index.php +55"
+msgid "More details including a helpfull advice and %sa wiki page%s on %sour blog%s."
+msgstr ""
+
+#: "/web/en/support/index.php +56"
 #, fuzzy
-msgid "Mageia 5 was supported until October 31th, 2017."
-msgstr "Cefnogwyd Mageia 5 tan 16 Rhagfyr, 2016."
+msgid "https://wiki.mageia.org/en/From_Mageia_5_to_6"
+msgstr "https://wiki.mageia.org/en/QA_Team"
 
-#: "/web/en/support/index.php +54"
+#: "/web/en/support/index.php +57"
+msgid "https://blog.mageia.org/en/2017/11/07/mageia-5-eol-postponed/"
+msgstr ""
+
+#: "/web/en/support/index.php +58"
+#, fuzzy
+msgid "Mageia 5 was supported until December 31st, 2017."
+msgstr "Cefnogwyd Mageia 1 tan 1 Rhagfyr, 2012."
+
+#: "/web/en/support/index.php +60"
 msgid "Mageia 4 was supported until September 19th, 2015."
 msgstr "Cefnogwyd Mageia 4 tan 19 Medi, 2015."
 
-#: "/web/en/support/index.php +55"
+#: "/web/en/support/index.php +61"
 msgid "Mageia 3 was supported until November 26th, 2014."
 msgstr "Cefnogwyd Mageia 3 tan 26 Tachwedd, 2014."
 
-#: "/web/en/support/index.php +56"
+#: "/web/en/support/index.php +62"
 msgid "Mageia 2 was supported until November 22nd, 2013."
 msgstr "Cefnogwyd Mageia 2 tan 22 Tachwedd, 2013."
 
-#: "/web/en/support/index.php +57"
+#: "/web/en/support/index.php +63"
 msgid "Mageia 1 was supported until December 1st, 2012."
 msgstr "Cefnogwyd Mageia 1 tan 1 Rhagfyr, 2012."
 
-#: "/web/en/support/index.php +62"
+#: "/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:"
 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 +65"
+#: "/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;"
 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 +66"
+#: "/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>;"
 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 +67"
+#: "/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!);"
 msgstr "ein <a href=\"https://wiki.mageia.org/en/\">Wici</a>;"
 
-#: "/web/en/support/index.php +68"
+#: "/web/en/support/index.php +74"
 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 +69"
+#: "/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>."
 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 +74"
+#: "/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."
 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 +75"
+#: "/web/en/support/index.php +81"
 msgid "Please check the <a href=\"%s\">commercial vendors</a> list"
 msgstr "Tarwch olwg ar y rhestr <a href=\"%s\">gwerthwyr masnachol</a>"
 
-#: "/web/en/support/index.php +75"
+#: "/web/en/support/index.php +81"
 msgid "https://wiki.mageia.org/en/Commercial_vendors"
 msgstr "https://wiki.mageia.org/en/Commercial_vendors"
 
-#: "/web/en/support/index.php +80"
+#: "/web/en/support/index.php +86"
 msgid "Mageia software runs on most x86 computer systems available as of today, April 2011."
 msgstr "Gellir defnyddio meddalwedd Mageia ar y rhan fwyaf o systemau cyfrifiadurol x86 sydd ar gael heddiw, Ebrill 2011."
 
-#: "/web/en/support/index.php +81"
+#: "/web/en/support/index.php +87"
 msgid "You can follow this hardware requirements list:"
 msgstr "Cewch ddilyn y gofynion caledwedd hyn:"
 
-#: "/web/en/support/index.php +84"
+#: "/web/en/support/index.php +90"
 msgid "Processor: any AMD, Intel or VIA processor;"
 msgstr "Prosesydd: unrhyw brosesydd AMD, Intel neu VIA;"
 
-#: "/web/en/support/index.php +85"
+#: "/web/en/support/index.php +91"
 msgid "Memory (RAM): 512MB minimum, 2GB recommended;"
 msgstr "Cof (RAM): o leiaf 512MB, argymhellir 2GB;"
 
-#: "/web/en/support/index.php +86"
+#: "/web/en/support/index.php +92"
 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 +87"
+#: "/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."
 msgstr "Mae hyn yn cynnwys ambell i GB ar gyfer ffeiliau defnyddwyr. Os oes angen mwy, dylech ystyried hynny."
 
-#: "/web/en/support/index.php +88"
+#: "/web/en/support/index.php +94"
 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 +89"
+#: "/web/en/support/index.php +95"
 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);  "
 
-#: "/web/en/support/index.php +90"
+#: "/web/en/support/index.php +96"
 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 +91"
+#: "/web/en/support/index.php +97"
 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 +94"
+#: "/web/en/support/index.php +100"
 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 +95"
+#: "/web/en/support/index.php +101"
 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 +95"
+#: "/web/en/support/index.php +101"
 msgid "https://wiki.mageia.org/en/Web_team"
 msgstr "https://wiki.mageia.org/en/Web_team"
 
-#: "/web/en/support/index.php +95"
+#: "/web/en/support/index.php +101"
 msgid "https://wiki.mageia.org/en/QA_Team"
 msgstr "https://wiki.mageia.org/en/QA_Team"
 
-#: "/web/en/support/index.php +99"
+#: "/web/en/support/index.php +105"
 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 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."