fixed very serious i18n bug (a sentence must never be split in translations)

1 files changed, 52 insertions, 54 deletions

diff --git a/po/cy.po b/po/cy.po
index fae4e4fa..2ab1d414 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 0.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-28 14:29+0200\n"
+"POT-Creation-Date: 2004-09-29 15:47+0200\n"
 "PO-Revision-Date: 2004-08-23 20:53-0000\n"
 "Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
 "Language-Team: Cymraeg/Welsh <rhoslyn.prys@meddal.org.uk>\n"
@@ -59,7 +59,7 @@ msgstr "Nid yw'r gwasanaeth ar gael. Cliciwch \"Gwefan Ar-lein\""
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:108 ../mdkapplet:157
+#: ../mdkapplet:108 ../mdkapplet:158
 #, c-format
 msgid "Install updates"
 msgstr "Gosod diweddariadau"
@@ -89,129 +89,129 @@ msgstr "Ffurfweddu'r Rhwydwaith"
 msgid "Configure Now!"
 msgstr "Ffurfweddu!"
 
-#: ../mdkapplet:145
+#: ../mdkapplet:146
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Rhaglennig Diweddaru Mandrakelinux"
 
-#: ../mdkapplet:155
+#: ../mdkapplet:156
 #, c-format
 msgid "Actions"
 msgstr "Gweithredoedd"
 
-#: ../mdkapplet:158
+#: ../mdkapplet:159
 #, c-format
 msgid "Configure"
 msgstr "Ffurfweddu"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:160
 #, c-format
 msgid "Check updates"
 msgstr "Gwirio diweddariad"
 
-#: ../mdkapplet:160
+#: ../mdkapplet:161
 #, c-format
 msgid "See logs"
 msgstr "Darllen cofnodion"
 
-#: ../mdkapplet:163
+#: ../mdkapplet:164
 #, c-format
 msgid "Status"
 msgstr "Statws"
 
-#: ../mdkapplet:167 ../mdkapplet:356
+#: ../mdkapplet:168 ../mdkapplet:363
 #, c-format
 msgid "Close"
 msgstr "Cau"
 
-#: ../mdkapplet:202
+#: ../mdkapplet:203
 #, c-format
 msgid "Network Connection: "
 msgstr "Cyswllt Rhwydwaith:"
 
-#: ../mdkapplet:202
+#: ../mdkapplet:203
 #, c-format
 msgid "Up"
 msgstr "Fyny"
 
-#: ../mdkapplet:202
+#: ../mdkapplet:203
 #, c-format
 msgid "Down"
 msgstr "Lawr"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:204
 #, c-format
 msgid "Last check: "
 msgstr "Gwiriad diwethaf:"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:205
 #, c-format
 msgid "Updates: "
 msgstr "Diweddariadau:"
 
-#: ../mdkapplet:208
+#: ../mdkapplet:209
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Cychwyn drakconnect\n"
 
-#: ../mdkapplet:212
+#: ../mdkapplet:213
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Cychwyn mdkupdate --applet\n"
 
-#: ../mdkapplet:216
+#: ../mdkapplet:217
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 "Mae Mandrakeonline i'w weld wedi ei ail osod, ail lwytho'r rhaglennig..."
 
-#: ../mdkapplet:224
+#: ../mdkapplet:225
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Cyfrifo diweddariadau newydd...\n"
 
-#: ../mdkapplet:226
+#: ../mdkapplet:227
 #, c-format
 msgid "Connecting to"
 msgstr "Cysylltu â"
 
-#: ../mdkapplet:249
+#: ../mdkapplet:250
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Gwirio... Mae diweddariadau ar gael\n"
 
-#: ../mdkapplet:253
+#: ../mdkapplet:254
 #, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:254
+#: ../mdkapplet:255
 #, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:255
+#: ../mdkapplet:256
 #, c-format
 msgid "Unknown state"
 msgstr "Cyflwr anhysbys"
 
-#: ../mdkapplet:256
+#: ../mdkapplet:257
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 "Mae'r gwasanaethau ar-lein wedi eu hatal. Cysylltwch â safle Mandrakeonline\n"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:258
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "Y cyfrinair anghywir\n"
 
-#: ../mdkapplet:258
+#: ../mdkapplet:259
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Gweithred, gwestai neu fewngofnod anghywir.\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:260
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
@@ -220,47 +220,47 @@ msgstr ""
 "Mae rhywbeth o'i le ar osodiadau eich rhwydwaith (gwiriwch eich llwybr, mur "
 "cadarn neu osodiadau dirprwy)\n"
 
-#: ../mdkapplet:263
+#: ../mdkapplet:264
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Mae'r system yn gyfredol\n"
 
-#: ../mdkapplet:299
+#: ../mdkapplet:303
 #, c-format
 msgid "No check"
 msgstr "Dim gwiriad"
 
-#: ../mdkapplet:312
+#: ../mdkapplet:316
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Gwirio'r Rhwydwaith: i weld wedi ei anablu\n"
 
-#: ../mdkapplet:315
+#: ../mdkapplet:319
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Gwirio ffeil ffurfweddiad: Nid yw ar gael\n"
 
-#: ../mdkapplet:346
+#: ../mdkapplet:353
 #, c-format
 msgid "Logs"
 msgstr "Cofnodion"
 
-#: ../mdkapplet:362
+#: ../mdkapplet:369
 #, c-format
 msgid "Clear"
 msgstr "Clirio"
 
-#: ../mdkapplet:389
+#: ../mdkapplet:396
 #, c-format
 msgid "About..."
 msgstr "Ynghylch..."
 
-#: ../mdkapplet:390
+#: ../mdkapplet:397
 #, c-format
 msgid "Always launch on startup"
 msgstr "Cychwyn wrth gychwyn"
 
-#: ../mdkapplet:392
+#: ../mdkapplet:399
 #, c-format
 msgid "Quit"
 msgstr "Gadael"
@@ -302,15 +302,10 @@ msgid "Create a Mandrakeonline Account"
 msgstr "Creu cyfrif Mandrakeonline "
 
 #: ../mdkonline:108
-#, c-format
-msgid "I don't have a Mandrakeonline account and I want to "
+#, fuzzy, c-format
+msgid "I don't have a Mandrakeonline account and I want to subscribe"
 msgstr "Nid oes gennyf gyfrif Mandrakeonline ac mi rydw i eisiau"
 
-#: ../mdkonline:108
-#, c-format
-msgid "Subscribe"
-msgstr "Tanysgrifio"
-
 #: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:113 ../mdkonline_tui:144
 #, c-format
 msgid "Login:"
@@ -395,12 +390,12 @@ msgstr ""
 msgid "Finish"
 msgstr "Gorffen"
 
-#: ../mdkonline:146 ../mdkonline_tui:171
+#: ../mdkonline:146 ../mdkonline_tui:166
 #, c-format
 msgid "Your upload was successful!"
 msgstr "Roedd eich llwytho i fyny'n llwyddiant!"
 
-#: ../mdkonline:146 ../mdkonline_tui:171
+#: ../mdkonline:146 ../mdkonline_tui:166
 #, c-format
 msgid ""
 "From now you will receive on security and updates \n"
@@ -409,7 +404,7 @@ msgstr ""
 "O hyn ymlaen byddwch yn derbyn cyhoeddiadau\n"
 "diogelwch a diweddariadau gan Mandrakeonline."
 
-#: ../mdkonline:146 ../mdkonline_tui:171
+#: ../mdkonline:146 ../mdkonline_tui:166
 #, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
@@ -433,7 +428,7 @@ msgstr "Gwlad:"
 msgid "Error"
 msgstr "Gwall"
 
-#: ../mdkonline:184 ../mdkonline_tui:152
+#: ../mdkonline:184 ../mdkonline_tui:151
 #, c-format
 msgid "Please provide a login"
 msgstr "Rhowch fewngofnod"
@@ -447,28 +442,28 @@ msgstr ""
 "Nid yw'r cyfrineiriau'n cydweddu\n"
 "Ceisiwch eto\n"
 
-#: ../mdkonline:188 ../mdkonline_tui:153
+#: ../mdkonline:188 ../mdkonline_tui:151
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Nid yw'n gyfeiriad e-bost dilys!\n"
 
-#: ../mdkonline:200 ../mdkonline_tui:77 ../mdkonline_tui:81
+#: ../mdkonline:200 ../mdkonline_tui:77
 #, c-format
 msgid "Reading configuration\n"
 msgstr "Darllen ffurfweddiad\n"
 
-#: ../mdkonline:205
+#: ../mdkonline:205 ../mdkonline_tui:81
 #, c-format
 msgid "Sending configuration..."
 msgstr "Anfon ffurfweddiad..."
 
-#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:129 ../mdkonline_tui:173
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:129 ../mdkonline_tui:168
 #: ../mdkupdate:124 ../mdkupdate:195
 #, c-format
 msgid "Connection problem"
 msgstr "Problem cysylltu"
 
-#: ../mdkonline:214 ../mdkonline_tui:173
+#: ../mdkonline:214 ../mdkonline_tui:168
 #, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "Mae problem yn digwydd wrth lwytho ffeiliau i fyny, ceisiwch eto."
@@ -575,14 +570,14 @@ msgstr ""
 msgid "wrong password:"
 msgstr "Y cyfrinair anghywir"
 
-#: ../mdkonline_tui:162
+#: ../mdkonline_tui:157
 #, c-format
 msgid ""
 "Mandrakeonline Account successfully created.\n"
 "Please click \"Next\" to authenticate and upload your configuration\n"
 msgstr ""
 
-#: ../mdkonline_tui:179
+#: ../mdkonline_tui:174
 #, fuzzy, c-format
 msgid "Country"
 msgstr "Gwlad:"
@@ -645,3 +640,6 @@ msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
 "mandrakeonline [dot] net"
 msgstr ""
+
+#~ msgid "Subscribe"
+#~ msgstr "Tanysgrifio"