sync with code

1 files changed, 139 insertions, 114 deletions

diff --git a/po/cy.po b/po/cy.po
index acb1a17f..3b20ce33 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 0.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-25 16:58+0100\n"
+"POT-Creation-Date: 2010-01-27 18:22+0100\n"
 "PO-Revision-Date: 2009-10-01 16:32+0100\n"
 "Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: Meddal.com\n"
@@ -19,17 +19,17 @@ msgstr ""
 "X-Poedit-Country: UK\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:72
+#: ../mdkapplet:71
 #, c-format
 msgid "Will check updates at %s"
 msgstr "Gwirio diweddariadau ar %s"
 
-#: ../mdkapplet:80
+#: ../mdkapplet:79
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Mae'r system yn gyfredol"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:84
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -38,63 +38,48 @@ msgstr ""
 "Problemau ffurfweddu'r gwasanaethwr. Gwiriwch gofnodion ac anfon e-byst at "
 "support@mandrivaonline.com"
 
-#: ../mdkapplet:91
+#: ../mdkapplet:90
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Arhoswch, canfod pecynnau sydd ar gael..."
 
-#: ../mdkapplet:96
+#: ../mdkapplet:95
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Mae diweddariadau newydd ar gael ar gyfer eich system"
 
-#: ../mdkapplet:102
+#: ../mdkapplet:101
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr "Mae dosbarthiad newydd o Mandriva Linux wedi ei ryddhau"
 
-#: ../mdkapplet:108
-#, c-format
-msgid ""
-"This version of the distribution is no longer supported. There will be no "
-"further updates. You should upgrade to a newer version of the %s "
-"distribution."
-msgstr ""
-"Nid yw'r dosbarthiad yn cael ei gynnal bellach. Ni fydd diweddariadau "
-"pellach. Dylech ddiweddaru i fersiwn mwy diweddar o ddosbarthiad %s."
-
-#: ../mdkapplet:108
-#, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
-
-#: ../mdkapplet:114 ../mdkapplet:151
+#: ../mdkapplet:119 ../mdkapplet:156
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr "Mae cyfrwng pecynnau ychwanegol ar gael ar gyfer eich dosbarthiad."
 
-#: ../mdkapplet:119
+#: ../mdkapplet:124
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Nid yw'r rhwydwaith ar gael.  Ffurfweddwch eich rhwydwaith"
 
-#: ../mdkapplet:125
+#: ../mdkapplet:130
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Nid yw'r gwasanaeth ar gael. Cliciwch \"Gwefan Ar-lein\""
 
-#: ../mdkapplet:130 ../mdkapplet:136
+#: ../mdkapplet:135 ../mdkapplet:141
 #, c-format
 msgid "urpmi database locked"
 msgstr "Cronfa ddata urpmi wedi cloi"
 
-#: ../mdkapplet:141
+#: ../mdkapplet:146
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "Nid yw'r rhyddhad yn cael ei gynnal (mae'n rhy hen neu'n rhyddhad datblygu)"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:151
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -102,7 +87,7 @@ msgstr ""
 "Heb ganfod cyfrwng. Rhaid ychwanegu cyfrwng drwy'r \"Rheolwr Cyfrwng "
 "Meddalwedd\""
 
-#: ../mdkapplet:156
+#: ../mdkapplet:161
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -119,129 +104,163 @@ msgstr ""
 "\n"
 "Yna ailgychwyn %s."
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, c-format
 msgid "Enabled"
 msgstr "Galluogwyd"
 
-#: ../mdkapplet:174
+#: ../mdkapplet:179
 #, c-format
 msgid "Error updating media"
 msgstr "Gwall wrth diweddaru cyfrwng"
 
-#: ../mdkapplet:214 ../mdkapplet:791
+#: ../mdkapplet:219 ../mdkapplet:880
 #, c-format
 msgid "Install updates"
 msgstr "Gosod diweddariadau"
 
-#: ../mdkapplet:215 ../mdkapplet:216
+#: ../mdkapplet:220 ../mdkapplet:221
 #, c-format
 msgid "Add additional package medium"
 msgstr "Ychwanegu cyfrwng pecynnau ychwanegol"
 
-#: ../mdkapplet:217
+#: ../mdkapplet:222
 #, c-format
 msgid "Check Updates"
 msgstr "Gwirio Diweddariad"
 
-#: ../mdkapplet:218
+#: ../mdkapplet:223
 #, c-format
 msgid "Configure Network"
 msgstr "Ffurfweddu'r Rhwydwaith"
 
-#: ../mdkapplet:219
+#: ../mdkapplet:224
 #, c-format
 msgid "Upgrade the system"
 msgstr "Diweddaru'r system"
 
-#: ../mdkapplet:385
+#: ../mdkapplet:378
+#, c-format
+msgid ""
+"Basic maintenance for this distribution has expired. Thanks to your "
+"subscription to extended maintenance, your system will be kept up to date "
+"until %s"
+msgstr ""
+
+#: ../mdkapplet:399
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Cychwyn drakconnect\n"
 
-#: ../mdkapplet:396 ../mdkapplet:529
+#: ../mdkapplet:412 ../mdkapplet:571
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr "Fersiwn newydd o ddosbarthiad Mandriva Linux"
 
-#: ../mdkapplet:401
+#: ../mdkapplet:417
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:410
+#: ../mdkapplet:426
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr "Mae dosbarthiad newydd o Mandriva Linux wedi ei ryddhau."
 
-#: ../mdkapplet:412 ../mdkapplet:478
+#: ../mdkapplet:428 ../mdkapplet:517
 #, c-format
 msgid "More info about this new version"
 msgstr "Mwy o wybodaeth am y fersiwn newydd"
 
-#: ../mdkapplet:414 ../mdkapplet:476
+#: ../mdkapplet:430 ../mdkapplet:515
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "Hoffech chi ddiweddaru i ddosbarthiad '%s'??"
 
-#: ../mdkapplet:416 ../mdkapplet:486 ../mdkapplet:899 ../mdkapplet:925
+#: ../mdkapplet:432 ../mdkapplet:525 ../mdkapplet:965 ../mdkapplet:991
 #, c-format
 msgid "Do not ask me next time"
 msgstr "Peidio gofyn y tro nesaf"
 
-#: ../mdkapplet:418
+#: ../mdkapplet:434
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:419
+#: ../mdkapplet:435
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:425
+#: ../mdkapplet:441
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:429 ../mdkapplet:491 ../mdkapplet:555 ../mdkapplet:900
-#: ../mdkapplet:926 ../mdkapplet-enterprise-update-helper:89
+#: ../mdkapplet:445 ../mdkapplet:530 ../mdkapplet:597 ../mdkapplet:966
+#: ../mdkapplet:992 ../mdkapplet-enterprise-update-helper:89
 #: ../mdkapplet-restricted-helper:95
 #, c-format
 msgid "Next"
 msgstr "Nesaf"
 
-#: ../mdkapplet:429 ../mdkapplet:491 ../mdkapplet:555 ../mdkapplet:900
-#: ../mdkapplet:926 ../mdkapplet-enterprise-update-helper:89
+#: ../mdkapplet:445 ../mdkapplet:530 ../mdkapplet:597 ../mdkapplet:966
+#: ../mdkapplet:992 ../mdkapplet-enterprise-update-helper:89
 #: ../mdkapplet-restricted-helper:95 ../mdkapplet-upgrade-helper:131
 #: ../mdkapplet-upgrade-helper:150
 #, c-format
 msgid "Cancel"
 msgstr "Diddymu"
 
-#: ../mdkapplet:445
-#, fuzzy, c-format
+#: ../mdkapplet:460
+#, c-format
 msgid ""
-"The version of Mandriva Linux installed on your system is no longer "
-"supported."
-msgstr "Mae dosbarthiad newydd o Mandriva Linux wedi ei ryddhau."
+"This Mandriva Linux system maintenance has ended. It means it will not "
+"receive any new software update."
+msgstr ""
 
-#: ../mdkapplet:446
+#: ../mdkapplet:466
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:455
+#: ../mdkapplet:472
+#, c-format
+msgid "Mandriva Linux"
+msgstr "Mandriva Linux"
+
+#: ../mdkapplet:478
+#, c-format
+msgid "You should get extended maintenance."
+msgstr ""
+
+#: ../mdkapplet:480
+#, fuzzy, c-format
+msgid ""
+"You should either get extended maintenance or upgrade to a newer version of "
+"the %s distribution."
+msgstr ""
+"Nid yw'r dosbarthiad yn cael ei gynnal bellach. Ni fydd diweddariadau "
+"pellach. Dylech ddiweddaru i fersiwn mwy diweddar o ddosbarthiad %s."
+
+#: ../mdkapplet:484
+#, fuzzy, c-format
+msgid "You should upgrade to a newer version of the %s distribution."
+msgstr "Hoffech chi ddiweddaru i ddosbarthiad '%s'??"
+
+#: ../mdkapplet:494
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:465
+#: ../mdkapplet:504
 #, c-format
-msgid "Get long term support for your currently installed distribution"
+msgid ""
+"Purchase a maintenance extension for this version (%s) and keep it running "
+"until."
 msgstr ""
 
-#: ../mdkapplet:546
+#: ../mdkapplet:588
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -250,17 +269,17 @@ msgstr ""
 "Mae'r diweddariad yn gofyn am gysylltiad rhwydwaith band llydan cyflym "
 "(cebl, xDSL,...) a gall gymryd rhai oriau i'w gwblhau."
 
-#: ../mdkapplet:548
+#: ../mdkapplet:590
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "Amcan o'r data i'w lwytho i lawr yw %s"
 
-#: ../mdkapplet:549
+#: ../mdkapplet:591
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr "Dylech gau pob rhaglen sy'n rhedeg cyn parhau."
 
-#: ../mdkapplet:552
+#: ../mdkapplet:594
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -269,95 +288,95 @@ msgstr ""
 "Dylech osod eich gliniadur ar gyflenwad trydan ac mae ethernet yn well na'r "
 "diwifr, os yn bosib."
 
-#: ../mdkapplet:583
+#: ../mdkapplet:626
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Cychwyn MandrivaUpdate\n"
 
-#: ../mdkapplet:604
+#: ../mdkapplet:658
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Cyfrifo diweddariadau newydd...\n"
 
-#: ../mdkapplet:712
+#: ../mdkapplet:765
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Mae'r system yn gyfredol\n"
 
-#: ../mdkapplet:740
+#: ../mdkapplet:805
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Gwirio'r Rhwydwaith: i weld wedi ei anablu\n"
 
-#: ../mdkapplet:782
-#, c-format
-msgid "Warning"
-msgstr "Rhybudd"
-
-#: ../mdkapplet:785 ../mdkapplet:793 ../mdkapplet:795
-#: ../mdkapplet-enterprise-update-helper:150
-#: ../mdkapplet-restricted-helper:156
-#, c-format
-msgid "More Information"
-msgstr "Rhagor o Wybodaeth"
-
-#: ../mdkapplet:797
-#, c-format
-msgid "Add media"
-msgstr "Ychwanegu cyfrwng"
-
-#: ../mdkapplet:812
-#, c-format
-msgid "About..."
-msgstr "Ynghylch..."
-
-#: ../mdkapplet:816
+#: ../mdkapplet:832
 #, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online %s"
 
-#: ../mdkapplet:817
+#: ../mdkapplet:833
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Hawlfraint (C) %s  Mandriva"
 
-#: ../mdkapplet:820
+#: ../mdkapplet:836
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "Mandriva Online yw gwasanaethau gwe Mandriva."
 
-#: ../mdkapplet:822
+#: ../mdkapplet:838
 #, c-format
 msgid "Online WebSite"
 msgstr "Gwefan Ar-lein"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../mdkapplet:827
+#: ../mdkapplet:843
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "-:Rhoslyn Prys <post@meddal.com>\n"
 
-#: ../mdkapplet:836 ../mdkapplet-config:69
+#: ../mdkapplet:871
+#, c-format
+msgid "Warning"
+msgstr "Rhybudd"
+
+#: ../mdkapplet:874 ../mdkapplet:882 ../mdkapplet:884
+#: ../mdkapplet-enterprise-update-helper:150
+#: ../mdkapplet-restricted-helper:156
+#, c-format
+msgid "More Information"
+msgstr "Rhagor o Wybodaeth"
+
+#: ../mdkapplet:886
+#, c-format
+msgid "Add media"
+msgstr "Ychwanegu cyfrwng"
+
+#: ../mdkapplet:901
+#, c-format
+msgid "About..."
+msgstr "Ynghylch..."
+
+#: ../mdkapplet:903 ../mdkapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "Ffurfweddiad Diweddaru"
 
-#: ../mdkapplet:838
+#: ../mdkapplet:905
 #, c-format
 msgid "Always launch on startup"
 msgstr "Cychwyn wrth gychwyn"
 
-#: ../mdkapplet:840
+#: ../mdkapplet:907
 #, c-format
 msgid "Quit"
 msgstr "Gadael"
 
-#: ../mdkapplet:889 ../mdkapplet:894 ../mdkapplet:915 ../mdkapplet:920
+#: ../mdkapplet:955 ../mdkapplet:960 ../mdkapplet:981 ../mdkapplet:986
 #, c-format
 msgid "New medium available"
 msgstr "Cyfrwng newydd ar gael"
 
-#: ../mdkapplet:896 ../mdkapplet:922
+#: ../mdkapplet:962 ../mdkapplet:988
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
@@ -366,12 +385,12 @@ msgstr ""
 "Rydych yn defnyddio dosbarthiad '%s' ac o ganlyniad mae gennych fynediad "
 "breintiedig i feddalwedd ychwanegol."
 
-#: ../mdkapplet:898 ../mdkapplet:924
+#: ../mdkapplet:964 ../mdkapplet:990
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr "Hoffech chi osod y storfa o feddalwedd ychwanegol?"
 
-#: ../mdkapplet:923 ../mdkonline.pm:149
+#: ../mdkapplet:989 ../mdkonline.pm:168
 #, c-format
 msgid "Mandriva Enterprise Server"
 msgstr "Mandriva Enterprise Server"
@@ -386,37 +405,37 @@ msgstr "Mandriva Enterprise Server"
 msgid "Adding an additional package medium"
 msgstr "Ychwanegu cyfrwng pecynnau ychwanegol"
 
-#: ../mdkapplet-config:70
+#: ../mdkapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr "Yma mae modd ffurfweddu'r rhaglennig diweddaru"
 
-#: ../mdkapplet-config:72
+#: ../mdkapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr "Amlder diweddaru (awr)"
 
-#: ../mdkapplet-config:81
+#: ../mdkapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr "Oedi gwiriad cyntaf (munud)"
 
-#: ../mdkapplet-config:90
+#: ../mdkapplet-config:89
 #, c-format
 msgid "Check for newer \"%s\" releases"
 msgstr ""
 
-#: ../mdkapplet-config:96 ../mdkapplet-config:102
+#: ../mdkapplet-config:95 ../mdkapplet-config:101
 #, c-format
 msgid "Check for missing \"%s\" media"
 msgstr ""
 
-#: ../mdkapplet-config:96
+#: ../mdkapplet-config:95
 #, c-format
 msgid "Restricted"
 msgstr ""
 
-#: ../mdkapplet-config:102
+#: ../mdkapplet-config:101
 #, c-format
 msgid "Enterprise"
 msgstr ""
@@ -565,32 +584,32 @@ msgstr ""
 msgid "Failure when adding medium"
 msgstr "Methu ychwanegu cyfrwng"
 
-#: ../mdkonline.pm:144
+#: ../mdkonline.pm:163
 #, fuzzy, c-format
 msgid "Mandriva Flash"
 msgstr "Mandriva Online %s"
 
-#: ../mdkonline.pm:145
+#: ../mdkonline.pm:164
 #, fuzzy, c-format
 msgid "Mandriva Free"
 msgstr "Mandriva Linux"
 
-#: ../mdkonline.pm:146
+#: ../mdkonline.pm:165
 #, fuzzy, c-format
 msgid "Mandriva Mini"
 msgstr "Mandriva Linux"
 
-#: ../mdkonline.pm:147
+#: ../mdkonline.pm:166
 #, fuzzy, c-format
 msgid "Mandriva One"
 msgstr "Mandriva Online %s"
 
-#: ../mdkonline.pm:148
+#: ../mdkonline.pm:167
 #, c-format
 msgid "Mandriva PowerPack"
 msgstr "Mandriva PowerPack"
 
-#: ../mdkonline.pm:160
+#: ../mdkonline.pm:181
 #, c-format
 msgid "Distribution Upgrade"
 msgstr "Diweddaru'r Dosbarthiad"
@@ -643,6 +662,12 @@ msgid "Unable to update packages from update_source medium.\n"
 msgstr "Methu diweddaru pecynnau o gyfrwng update_source.\n"
 
 #, fuzzy
+#~ msgid ""
+#~ "The version of Mandriva Linux installed on your system is no longer "
+#~ "supported."
+#~ msgstr "Mae dosbarthiad newydd o Mandriva Linux wedi ei ryddhau."
+
+#, fuzzy
 #~ msgid "You are using '%s' distribution."
 #~ msgstr "Hoffech chi ddiweddaru i ddosbarthiad '%s'??"