updated po file

1 files changed, 217 insertions, 377 deletions

diff --git a/po/cy.po b/po/cy.po
index 96b3ac41..9681c899 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -5,149 +5,148 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.4\n"
-"POT-Creation-Date: 2003-01-19 16:57+0100\n"
-"PO-Revision-Date: 2002-09-13 20:01-0000\n"
-"Last-Translator: Rhoslyn Prys <rhoslyn.prys@ntlworld.com>\n"
+"POT-Creation-Date: 2003-01-30 11:22+0100\n"
+"PO-Revision-Date: 2003-01-28 22:14-0000\n"
+"Last-Translator: Rhoslyn Prys <rhoslyn.prys@meddal.org.uk>\n"
 "Language-Team: Cymraeg/Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-14\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl_.c:39
+#: ../edit-urpm-sources.pl_.c:43
 msgid "Unable to create medium."
 msgstr "Methu creu cyfrwng."
 
-#: ../edit-urpm-sources.pl_.c:40
+#: ../edit-urpm-sources.pl_.c:44
 msgid "Unable to update medium; it will be automatically disabled."
 msgstr "Methu diweddaru'r cyfrwng; bydd yn cael ei anablu'n awtomatig."
 
-#: ../edit-urpm-sources.pl_.c:51
-#, fuzzy
+#: ../edit-urpm-sources.pl_.c:54
 msgid "Add a source"
 msgstr "Ychwanegu ffynhonnell"
 
-#: ../edit-urpm-sources.pl_.c:52
+#: ../edit-urpm-sources.pl_.c:55
 msgid "Local files"
 msgstr "Ffeiliau lleol"
 
-#: ../edit-urpm-sources.pl_.c:52
+#: ../edit-urpm-sources.pl_.c:55
 msgid "Path:"
 msgstr "Llwybr:"
 
-#: ../edit-urpm-sources.pl_.c:53
+#: ../edit-urpm-sources.pl_.c:56
 msgid "FTP server"
 msgstr "Gwasanaethwr FTP"
 
-#: ../edit-urpm-sources.pl_.c:53 ../edit-urpm-sources.pl_.c:54
-#: ../edit-urpm-sources.pl_.c:56 ../edit-urpm-sources.pl_.c:175
+#: ../edit-urpm-sources.pl_.c:56 ../edit-urpm-sources.pl_.c:57
+#: ../edit-urpm-sources.pl_.c:59 ../edit-urpm-sources.pl_.c:187
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl_.c:54
+#: ../edit-urpm-sources.pl_.c:57
 msgid "HTTP server"
 msgstr "Gwasanaethwr HTTP"
 
-#: ../edit-urpm-sources.pl_.c:55
+#: ../edit-urpm-sources.pl_.c:58
 msgid "Path or mount point:"
 msgstr "Llwybr neu bwynt gosod:"
 
-#: ../edit-urpm-sources.pl_.c:55
+#: ../edit-urpm-sources.pl_.c:58
 msgid "Removable device"
 msgstr "Dyfais symudol"
 
-#: ../edit-urpm-sources.pl_.c:56 ../rpmdrake_.c:548
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:550
 msgid "Security updates"
 msgstr "Diweddariadau diogelwch"
 
-#: ../edit-urpm-sources.pl_.c:67
+#: ../edit-urpm-sources.pl_.c:70
 msgid "Browse..."
 msgstr "Pori..."
 
-#: ../edit-urpm-sources.pl_.c:69
+#: ../edit-urpm-sources.pl_.c:72
 msgid "Choose a mirror..."
 msgstr "Dewis drych..."
 
-#: ../edit-urpm-sources.pl_.c:89
+#: ../edit-urpm-sources.pl_.c:92
 msgid "Login:"
 msgstr "Mewngofnod:"
 
-#: ../edit-urpm-sources.pl_.c:89 ../edit-urpm-sources.pl_.c:215
+#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:231
 msgid "Password:"
 msgstr "Cyfrinair:"
 
-#: ../edit-urpm-sources.pl_.c:94
+#: ../edit-urpm-sources.pl_.c:97
 msgid "Name:"
 msgstr "Enw:"
 
-#: ../edit-urpm-sources.pl_.c:96 ../edit-urpm-sources.pl_.c:176
+#: ../edit-urpm-sources.pl_.c:99 ../edit-urpm-sources.pl_.c:188
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Llwybr perthynol i synthesis/hdlist:"
 
-#: ../edit-urpm-sources.pl_.c:104
+#: ../edit-urpm-sources.pl_.c:107
 msgid "You need to fill up at least the two first entries."
 msgstr "Mae angen llanw o leiaf y ddau gofnod cyntaf"
 
-#: ../edit-urpm-sources.pl_.c:116
+#: ../edit-urpm-sources.pl_.c:120
 msgid "Adding a source:"
 msgstr "Ychwanegu ffynhonnell"
 
-#: ../edit-urpm-sources.pl_.c:117
+#: ../edit-urpm-sources.pl_.c:121
 msgid "Type of source:"
 msgstr "Math o ffynonellau:"
 
-#: ../edit-urpm-sources.pl_.c:121 ../edit-urpm-sources.pl_.c:187
-#: ../edit-urpm-sources.pl_.c:219 ../rpmdrake.pm_.c:97 ../rpmdrake.pm_.c:136
-#: ../rpmdrake.pm_.c:319 ../rpmdrake_.c:353 ../rpmdrake_.c:365
-#: ../rpmdrake_.c:369 ../rpmdrake_.c:916 ../rpmdrake_.c:950
+#: ../edit-urpm-sources.pl_.c:125 ../edit-urpm-sources.pl_.c:202
+#: ../edit-urpm-sources.pl_.c:235 ../rpmdrake.pm_.c:100 ../rpmdrake.pm_.c:139
+#: ../rpmdrake.pm_.c:322 ../rpmdrake_.c:355 ../rpmdrake_.c:367
+#: ../rpmdrake_.c:371 ../rpmdrake_.c:918 ../rpmdrake_.c:952
 msgid "Ok"
 msgstr "Iawn"
 
-#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:180
-#: ../edit-urpm-sources.pl_.c:187 ../edit-urpm-sources.pl_.c:220
-#: ../rpmdrake.pm_.c:319 ../rpmdrake.pm_.c:352 ../rpmdrake_.c:353
-#: ../rpmdrake_.c:950
+#: ../edit-urpm-sources.pl_.c:140 ../edit-urpm-sources.pl_.c:196
+#: ../edit-urpm-sources.pl_.c:202 ../edit-urpm-sources.pl_.c:242
+#: ../rpmdrake.pm_.c:322 ../rpmdrake.pm_.c:355 ../rpmdrake_.c:355
+#: ../rpmdrake_.c:952
 msgid "Cancel"
 msgstr "Dileu"
 
-#: ../edit-urpm-sources.pl_.c:140
+#: ../edit-urpm-sources.pl_.c:147
 msgid "Please wait, adding medium..."
 msgstr "Arhoswch, ychwanegu cyfrwng..."
 
-#: ../edit-urpm-sources.pl_.c:158
+#: ../edit-urpm-sources.pl_.c:168
 msgid "Please wait, removing medium..."
 msgstr "Arhoswch, tynnu cyfrwng..."
 
-#: ../edit-urpm-sources.pl_.c:169
+#: ../edit-urpm-sources.pl_.c:181
 msgid "Edit a source"
 msgstr "Golygu ffynhonnell"
 
-#: ../edit-urpm-sources.pl_.c:173
+#: ../edit-urpm-sources.pl_.c:185
 #, c-format
 msgid "Editing source \"%s\":"
 msgstr "Golygu ffynhonnell \"%s\":"
 
-#: ../edit-urpm-sources.pl_.c:179
+#: ../edit-urpm-sources.pl_.c:191
 msgid "Save changes"
 msgstr "Cadw newidiadau"
 
-#: ../edit-urpm-sources.pl_.c:185
+#: ../edit-urpm-sources.pl_.c:200
 msgid "You need to insert the medium to continue"
 msgstr "Rhaid gosod y cyfrwng i mewn i barhau"
 
-#: ../edit-urpm-sources.pl_.c:186
+#: ../edit-urpm-sources.pl_.c:201
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "Er mwyn cadw'r newidiadau, rhaid gosod y cyfrwng yn y gyrrwr."
 
-#: ../edit-urpm-sources.pl_.c:191
+#: ../edit-urpm-sources.pl_.c:206
 msgid "Please wait, updating medium..."
 msgstr "Arhoswch, diweddaru'r cyfrwng..."
 
-#: ../edit-urpm-sources.pl_.c:202
+#: ../edit-urpm-sources.pl_.c:217
 msgid "Configure proxies"
 msgstr "Ffurfweddu'r dirprwyon"
 
-#: ../edit-urpm-sources.pl_.c:207
+#: ../edit-urpm-sources.pl_.c:223
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -155,298 +154,297 @@ msgstr ""
 "Os oes angen dirprwy arnoch, rhowch enw gwesteiwr a phorth dewisol "
 "(cystrawen: <proxyhost[:port]>):"
 
-#: ../edit-urpm-sources.pl_.c:209
+#: ../edit-urpm-sources.pl_.c:225
 msgid "Proxy hostname:"
 msgstr "Enw gwesteiwr y dirprwy:"
 
-#: ../edit-urpm-sources.pl_.c:211
+#: ../edit-urpm-sources.pl_.c:227
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Mae modd i chi enwi defnyddiwr /cyfrinair ar gyfer dilysiad dirprwy:"
 
-#: ../edit-urpm-sources.pl_.c:213
+#: ../edit-urpm-sources.pl_.c:229
 msgid "User:"
 msgstr "Defnyddiwr:"
 
-#: ../edit-urpm-sources.pl_.c:235
+#: ../edit-urpm-sources.pl_.c:255
 msgid "Configure sources"
 msgstr "Ffurfweddu'r ffynonellau"
 
-#: ../edit-urpm-sources.pl_.c:242
+#: ../edit-urpm-sources.pl_.c:262
 msgid "Enabled?"
 msgstr "Galluogwyd?"
 
-#: ../edit-urpm-sources.pl_.c:243
+#: ../edit-urpm-sources.pl_.c:263
 msgid "Source"
 msgstr "Ffynhonell"
 
-#: ../edit-urpm-sources.pl_.c:264 ../rpmdrake_.c:730
+#: ../edit-urpm-sources.pl_.c:286 ../rpmdrake_.c:732
 msgid "Remove"
 msgstr "Tynnu"
 
-#: ../edit-urpm-sources.pl_.c:266
+#: ../edit-urpm-sources.pl_.c:288
 msgid "Edit"
 msgstr "Golygu"
 
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:290
 msgid "Add..."
 msgstr "Ychwanegu..."
 
-#: ../edit-urpm-sources.pl_.c:270
+#: ../edit-urpm-sources.pl_.c:292
 msgid "Update..."
 msgstr "Diweddau..."
 
-#: ../edit-urpm-sources.pl_.c:271
+#: ../edit-urpm-sources.pl_.c:293
 msgid "Proxy..."
 msgstr "Dirprwy..."
 
-#: ../edit-urpm-sources.pl_.c:274
+#: ../edit-urpm-sources.pl_.c:296
 msgid "Save and quit"
 msgstr "Cadw a gadael"
 
-#: ../edit-urpm-sources.pl_.c:275 ../rpmdrake_.c:733
+#: ../edit-urpm-sources.pl_.c:297 ../rpmdrake_.c:735
 msgid "Quit"
 msgstr "Gadael"
 
-#: ../rpmdrake.pm_.c:93
+#: ../rpmdrake.pm_.c:96
 msgid "Yes"
 msgstr "Iawn"
 
-#: ../rpmdrake.pm_.c:95
+#: ../rpmdrake.pm_.c:98
 msgid "No"
 msgstr "Na"
 
-#: ../rpmdrake.pm_.c:127
+#: ../rpmdrake.pm_.c:130
 msgid "Info..."
 msgstr "Gwybodaeth..."
 
-#: ../rpmdrake.pm_.c:180
+#: ../rpmdrake.pm_.c:183
 msgid "Austria"
 msgstr "Awstria"
 
-#: ../rpmdrake.pm_.c:181
+#: ../rpmdrake.pm_.c:184
 msgid "Australia"
 msgstr "Awstralia"
 
-#: ../rpmdrake.pm_.c:182
+#: ../rpmdrake.pm_.c:185
 msgid "Belgium"
 msgstr "Gwlad Belg"
 
-#: ../rpmdrake.pm_.c:183
+#: ../rpmdrake.pm_.c:186
 msgid "Brazil"
 msgstr "Brasil"
 
-#: ../rpmdrake.pm_.c:184
+#: ../rpmdrake.pm_.c:187
 msgid "Canada"
 msgstr "Canada"
 
-#: ../rpmdrake.pm_.c:185
+#: ../rpmdrake.pm_.c:188
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../rpmdrake.pm_.c:186
+#: ../rpmdrake.pm_.c:189
 msgid "Czech Republic"
 msgstr "Gweriniaeth Tsiec"
 
-#: ../rpmdrake.pm_.c:187
+#: ../rpmdrake.pm_.c:190
 msgid "Germany"
 msgstr "Yr Almaen"
 
-#: ../rpmdrake.pm_.c:188
+#: ../rpmdrake.pm_.c:191
 msgid "Danmark"
 msgstr "Denmarc"
 
-#: ../rpmdrake.pm_.c:189 ../rpmdrake.pm_.c:193
+#: ../rpmdrake.pm_.c:192 ../rpmdrake.pm_.c:196
 msgid "Greece"
 msgstr "Groeg"
 
-#: ../rpmdrake.pm_.c:190
+#: ../rpmdrake.pm_.c:193
 msgid "Spain"
 msgstr "Sbaen"
 
-#: ../rpmdrake.pm_.c:191
+#: ../rpmdrake.pm_.c:194
 msgid "Finland"
 msgstr "Ffindir"
 
-#: ../rpmdrake.pm_.c:192
+#: ../rpmdrake.pm_.c:195
 msgid "France"
 msgstr "Ffrainc"
 
-#: ../rpmdrake.pm_.c:194
+#: ../rpmdrake.pm_.c:197
 msgid "Israel"
 msgstr "Israel"
 
-#: ../rpmdrake.pm_.c:195
+#: ../rpmdrake.pm_.c:198
 msgid "Italy"
 msgstr "Yr Eidal"
 
-#: ../rpmdrake.pm_.c:196
+#: ../rpmdrake.pm_.c:199
 msgid "Japan"
 msgstr "Siapan"
 
-#: ../rpmdrake.pm_.c:197
+#: ../rpmdrake.pm_.c:200
 msgid "Korea"
 msgstr "Corea"
 
-#: ../rpmdrake.pm_.c:198
+#: ../rpmdrake.pm_.c:201
 msgid "Netherlands"
 msgstr "Yr Iseldiroedd"
 
-#: ../rpmdrake.pm_.c:199
+#: ../rpmdrake.pm_.c:202
 msgid "Norway"
 msgstr "Norwy"
 
-#: ../rpmdrake.pm_.c:200
+#: ../rpmdrake.pm_.c:203
 msgid "Poland"
 msgstr "Gwlad Pwyl"
 
-#: ../rpmdrake.pm_.c:201
+#: ../rpmdrake.pm_.c:204
 msgid "Portugal"
 msgstr "Portiwgal"
 
-#: ../rpmdrake.pm_.c:202
+#: ../rpmdrake.pm_.c:205
 msgid "Russia"
 msgstr "Rwsia"
 
-#: ../rpmdrake.pm_.c:203
+#: ../rpmdrake.pm_.c:206
 msgid "Sweden"
 msgstr "Sweden"
 
-#: ../rpmdrake.pm_.c:204
+#: ../rpmdrake.pm_.c:207
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm_.c:205
+#: ../rpmdrake.pm_.c:208
 msgid "United Kingdom"
 msgstr "Y Deyrnas Unideg"
 
-#: ../rpmdrake.pm_.c:206
+#: ../rpmdrake.pm_.c:209
 msgid "China"
 msgstr "Tseina"
 
-#: ../rpmdrake.pm_.c:207 ../rpmdrake.pm_.c:208 ../rpmdrake.pm_.c:209
-#: ../rpmdrake.pm_.c:210 ../rpmdrake.pm_.c:261
+#: ../rpmdrake.pm_.c:210 ../rpmdrake.pm_.c:211 ../rpmdrake.pm_.c:212
+#: ../rpmdrake.pm_.c:213 ../rpmdrake.pm_.c:264
 msgid "United States"
 msgstr "Yr Unod Daleithiau"
 
-#: ../rpmdrake.pm_.c:274
+#: ../rpmdrake.pm_.c:277
 msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr ""
 "Arhoswch, llwytho i lawr cyfeiriaidau drychau o safle gwe MandrakeSoft."
 
-#: ../rpmdrake.pm_.c:280
+#: ../rpmdrake.pm_.c:283
 msgid "Error during download"
 msgstr "Gwall wrth lwytho i lawr"
 
-#: ../rpmdrake.pm_.c:289
+#: ../rpmdrake.pm_.c:292
 msgid "No mirror"
 msgstr "Dim drych"
 
-#: ../rpmdrake.pm_.c:307
+#: ../rpmdrake.pm_.c:310
 msgid "Please choose the desired mirror."
 msgstr "Dewiswch ddrych"
 
-#: ../rpmdrake.pm_.c:339 ../rpmdrake_.c:627
+#: ../rpmdrake.pm_.c:342 ../rpmdrake_.c:629
 msgid "Update source(s)"
 msgstr "Diweddaru ffynonellau"
 
-#: ../rpmdrake.pm_.c:343
+#: ../rpmdrake.pm_.c:346
 msgid "Select the source(s) you wish to update:"
 msgstr "Dewiswch y ffynhonellau i'w diweddaru:"
 
-#: ../rpmdrake.pm_.c:347
+#: ../rpmdrake.pm_.c:350
 msgid "Update"
 msgstr "Diweddaru"
 
-#: ../rpmdrake.pm_.c:358
+#: ../rpmdrake.pm_.c:360
 msgid "Please wait, updating media..."
 msgstr "Arhoswch, diweddaru cyfrwng..."
 
-#: ../rpmdrake_.c:99
+#: ../rpmdrake_.c:101
 msgid "Other"
 msgstr "Arall"
 
-#: ../rpmdrake_.c:121 ../rpmdrake_.c:135 ../rpmdrake_.c:227 ../rpmdrake_.c:298
+#: ../rpmdrake_.c:123 ../rpmdrake_.c:137 ../rpmdrake_.c:229 ../rpmdrake_.c:300
 msgid "(none)"
 msgstr "(dim)"
 
-#: ../rpmdrake_.c:141 ../rpmdrake_.c:482 ../rpmdrake_.c:483
+#: ../rpmdrake_.c:143 ../rpmdrake_.c:484 ../rpmdrake_.c:485
 msgid "(Not available)"
 msgstr "(Dim ar gael)"
 
-#: ../rpmdrake_.c:151 ../rpmdrake_.c:208
+#: ../rpmdrake_.c:153 ../rpmdrake_.c:210
 msgid "Search results"
 msgstr "Canlyniadau'r chwilio"
 
-#: ../rpmdrake_.c:151
+#: ../rpmdrake_.c:153
 msgid "Search results (none)"
 msgstr "Canlyniadau'r chwilio (dim)"
 
-#: ../rpmdrake_.c:161 ../rpmdrake_.c:172
+#: ../rpmdrake_.c:163 ../rpmdrake_.c:174
 msgid "Please wait, searching..."
 msgstr "Arhoswch, chwilio..."
 
-#: ../rpmdrake_.c:175
+#: ../rpmdrake_.c:177
 msgid "Stop"
 msgstr "Atal"
 
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
+#: ../rpmdrake_.c:211 ../rpmdrake_.c:321
 msgid "Addable"
 msgstr "Ychwanegadwy"
 
-#: ../rpmdrake_.c:209 ../rpmdrake_.c:319
+#: ../rpmdrake_.c:211 ../rpmdrake_.c:321
 msgid "Upgradable"
 msgstr "Diweddariadwy"
 
-#: ../rpmdrake_.c:211
+#: ../rpmdrake_.c:213
 msgid "Not selected"
 msgstr "Heb ddewis"
 
-#: ../rpmdrake_.c:211
+#: ../rpmdrake_.c:213
 msgid "Selected"
 msgstr "Dewiswyd"
 
-#: ../rpmdrake_.c:240
+#: ../rpmdrake_.c:242
 msgid "rpmdrake"
 msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:258 ../rpmdrake_.c:360 ../rpmdrake_.c:362
+#: ../rpmdrake_.c:260 ../rpmdrake_.c:362 ../rpmdrake_.c:364
 msgid "More information on package..."
 msgstr "Rhagor o wybodaethar becyn..."
 
-#: ../rpmdrake_.c:259
+#: ../rpmdrake_.c:261
 msgid "One of the following packages is needed:"
 msgstr "Mae angen un o'r pecynnau canlynol:"
 
-#: ../rpmdrake_.c:259
+#: ../rpmdrake_.c:261
 msgid "Please choose"
 msgstr "Dewiswch"
 
-#: ../rpmdrake_.c:275
+#: ../rpmdrake_.c:277
 msgid "unknown package "
 msgstr "pecyn anhysbys"
 
-#: ../rpmdrake_.c:285
+#: ../rpmdrake_.c:287
 msgid "Please wait, listing packages..."
 msgstr "Arhoswch, rhestri pecynnau..."
 
-#: ../rpmdrake_.c:300
+#: ../rpmdrake_.c:302
 msgid "No update"
 msgstr "Dim diweddariad"
 
-#: ../rpmdrake_.c:353 ../rpmdrake_.c:354
+#: ../rpmdrake_.c:355 ../rpmdrake_.c:356
 msgid "More infos"
-msgstr ""
+msgstr "Mwy o wybodaeth"
 
-#: ../rpmdrake_.c:355
-#, fuzzy
+#: ../rpmdrake_.c:357
 msgid "Information on packages"
-msgstr "Rhagor o wybodaethar becyn..."
+msgstr "Rhagor o wybodaeth ar becyn..."
 
-#: ../rpmdrake_.c:376
+#: ../rpmdrake_.c:378
 msgid "Some additional packages need to be removed"
 msgstr "Mae angen tynnu rhai pecynnau ychwanegol"
 
-#: ../rpmdrake_.c:377
+#: ../rpmdrake_.c:379
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -456,17 +454,19 @@ msgstr ""
 "hefyd: \n"
 "\n"
 
-#: ../rpmdrake_.c:383 ../rpmdrake_.c:391
+#: ../rpmdrake_.c:385 ../rpmdrake_.c:393
 msgid "Some packages can't be removed"
 msgstr "Nid oes modd tynnu rhai pecynnau"
 
-#: ../rpmdrake_.c:384
+#: ../rpmdrake_.c:386
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
 msgstr ""
+"Bydd tynnu'r pecynnau hyn yn torri eich system, sori\n"
+"\n"
 
-#: ../rpmdrake_.c:392 ../rpmdrake_.c:451
+#: ../rpmdrake_.c:394 ../rpmdrake_.c:453
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -475,11 +475,11 @@ msgstr ""
 "Oherwydd eu dibyniaethau, rhaid i'r pecyn(nau) canlynol gael\n"
 "eu dad-ddewis nawr:\n"
 
-#: ../rpmdrake_.c:421
+#: ../rpmdrake_.c:423
 msgid "Additional packages needed"
 msgstr "Pecynnau ychwanegol angenrheidiol"
 
-#: ../rpmdrake_.c:422
+#: ../rpmdrake_.c:424
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -489,11 +489,11 @@ msgstr ""
 "hefyd:\n"
 "\n"
 
-#: ../rpmdrake_.c:435
+#: ../rpmdrake_.c:437
 msgid "Some packages can't be installed"
 msgstr "Nid oes modd gosod rhai pecynnau"
 
-#: ../rpmdrake_.c:436
+#: ../rpmdrake_.c:438
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -501,256 +501,255 @@ msgstr ""
 "Yn anffodus, nid oes modd dewis y pecyn(nau) canlynol:\n"
 "\n"
 
-#: ../rpmdrake_.c:450 ../rpmdrake_.c:684
+#: ../rpmdrake_.c:452 ../rpmdrake_.c:686
 msgid "Some packages need to be removed"
 msgstr "Rhaid tynnu rhai pecynnau"
 
-#: ../rpmdrake_.c:472
+#: ../rpmdrake_.c:474
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Dewiswyd: %d MB / Lle gwag ar ddisg: %d MB"
 
-#: ../rpmdrake_.c:474
+#: ../rpmdrake_.c:476
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Maint dewisiwyd: %d MB"
 
-#: ../rpmdrake_.c:482
+#: ../rpmdrake_.c:484
 msgid "Files:\n"
 msgstr "Ffeiliau:\n"
 
-#: ../rpmdrake_.c:483
+#: ../rpmdrake_.c:485
 msgid "Changelog:\n"
 msgstr "Cofnod Newid:\n"
 
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:488
 msgid "Source: "
 msgstr "Ffynhonell: "
 
-#: ../rpmdrake_.c:487
+#: ../rpmdrake_.c:489
 msgid "Currently installed version: "
 msgstr "Fersiwn sydd wedi ei osod ar hyn o bryd:"
 
-#: ../rpmdrake_.c:491
+#: ../rpmdrake_.c:493
 msgid "Reason for update: "
 msgstr "Rheswm am y diweddariad:"
 
-#: ../rpmdrake_.c:493
+#: ../rpmdrake_.c:495
 msgid "Name: "
 msgstr "Enw: "
 
-#: ../rpmdrake_.c:494
+#: ../rpmdrake_.c:496
 msgid "Version: "
 msgstr "Fersiwn: "
 
-#: ../rpmdrake_.c:495
+#: ../rpmdrake_.c:497
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake_.c:495
+#: ../rpmdrake_.c:497
 msgid "Size: "
 msgstr "Maint: "
 
-#: ../rpmdrake_.c:497
+#: ../rpmdrake_.c:499
 msgid "Importance: "
 msgstr "Pwysigrwydd: "
 
-#: ../rpmdrake_.c:498
+#: ../rpmdrake_.c:500
 msgid "Summary: "
 msgstr "Crynodeb: "
 
-#: ../rpmdrake_.c:499
+#: ../rpmdrake_.c:501
 msgid "Description: "
 msgstr "Disgrifiadau: "
 
-#: ../rpmdrake_.c:548
+#: ../rpmdrake_.c:550
 msgid "Bugfixes updates"
 msgstr "Diweddariad cywiro gwallau"
 
-#: ../rpmdrake_.c:548
+#: ../rpmdrake_.c:550
 msgid "Normal updates"
 msgstr "Diweddariadau arferol"
 
-#: ../rpmdrake_.c:567
+#: ../rpmdrake_.c:569
 msgid "Mandrake choices"
 msgstr "Dewisiadau Mandrake"
 
-#: ../rpmdrake_.c:568
+#: ../rpmdrake_.c:570
 msgid "All packages, alphabetical"
 msgstr "Pob pecyn, trefn yr wyddor"
 
-#: ../rpmdrake_.c:569
+#: ../rpmdrake_.c:571
 msgid "All packages,"
 msgstr "Pob pecyn,"
 
-#: ../rpmdrake_.c:592
+#: ../rpmdrake_.c:594
 msgid "by group"
-msgstr "yn ôl grwp"
+msgstr "yn ôl grwp"
 
-#: ../rpmdrake_.c:592
+#: ../rpmdrake_.c:594
 msgid "by size"
-msgstr "yn ôl maint"
+msgstr "yn ôl maint"
 
-#: ../rpmdrake_.c:593
+#: ../rpmdrake_.c:595
 msgid "by selection state"
-msgstr "yn ôl cyflwr dewis"
+msgstr "yn ôl cyflwr dewis"
 
-#: ../rpmdrake_.c:594
+#: ../rpmdrake_.c:596
 msgid "by source repository"
-msgstr "yn ôl ffynhonnell eu tarddiad"
+msgstr "yn ôl ffynhonnell eu tarddiad"
 
-#: ../rpmdrake_.c:594
+#: ../rpmdrake_.c:596
 msgid "by update availability"
-msgstr "yn ôl diweddariad"
+msgstr "yn ôl diweddariad"
 
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:617
 msgid "in descriptions"
 msgstr "disgrifiadau"
 
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:617
 msgid "in files"
 msgstr "mewn ffeiliau"
 
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:617
 msgid "in names"
 msgstr "enwau"
 
-#: ../rpmdrake_.c:626
+#: ../rpmdrake_.c:628
 msgid "Reload the packages list"
 msgstr "Ail lwytho'r rhestr pecynnau"
 
-#: ../rpmdrake_.c:626
+#: ../rpmdrake_.c:628
 msgid "Reset the selection"
 msgstr "Ailosod y dewis"
 
-#: ../rpmdrake_.c:652
+#: ../rpmdrake_.c:654
 msgid "Maximum information"
 msgstr "Gwybodath lawn"
 
-#: ../rpmdrake_.c:652
+#: ../rpmdrake_.c:654
 msgid "Normal information"
 msgstr "Gwybodaeth arferol"
 
-#: ../rpmdrake_.c:674
+#: ../rpmdrake_.c:676
 msgid "Too many packages are selected"
 msgstr "Mae gormod o becynnau wedi eu dewis"
 
-#: ../rpmdrake_.c:720
+#: ../rpmdrake_.c:722
 msgid "Find:"
 msgstr "Canfod:"
 
-#: ../rpmdrake_.c:725
+#: ../rpmdrake_.c:727
 msgid "Search"
 msgstr "Chwilio"
 
-#: ../rpmdrake_.c:731
+#: ../rpmdrake_.c:733
 msgid "Install"
 msgstr "Gosod"
 
-#: ../rpmdrake_.c:738 data/mandrakeupdate.desktop.in.h:1
+#: ../rpmdrake_.c:740 data/mandrakeupdate.desktop.in.h:1
 msgid "Mandrake Update"
 msgstr "Diweddaru Mandrake"
 
-#: ../rpmdrake_.c:738
+#: ../rpmdrake_.c:740
 msgid "Software Packages Installation"
 msgstr "Gosodiad Pecynnau Meddalwedd"
 
-#: ../rpmdrake_.c:738
+#: ../rpmdrake_.c:740
 msgid "Software Packages Removal"
 msgstr "Tynnu Pecynnau Meddalwedd"
 
-#: ../rpmdrake_.c:779
+#: ../rpmdrake_.c:781
 msgid "Please wait, contacting mirror to update packages information."
-msgstr "Arhoswch, yn cysylltu â'r drych i ddiweddaru gwybodaeth am y pecynnau."
+msgstr "Arhoswch, yn cysylltu â'r drych i ddiweddaru gwybodaeth am y pecynnau."
 
-#: ../rpmdrake_.c:781
+#: ../rpmdrake_.c:783
 msgid "Error updating medium"
 msgstr "Gwall wrth ddiweddaru'r cyfrwng"
 
-#: ../rpmdrake_.c:782
+#: ../rpmdrake_.c:784
 msgid "There was an unrecoverable error while updating packages information."
 msgstr ""
 "Digwyddodd gwall anadferadwy wrth ddiweddaru'r wybodaeth am y pecynnau."
 
-#: ../rpmdrake_.c:787
+#: ../rpmdrake_.c:789
 msgid "How to choose manually your mirror"
 msgstr "Sut i ddewis drych gyda llaw."
 
-#: ../rpmdrake_.c:795
+#: ../rpmdrake_.c:797
 msgid "Please wait, contacting mirror to initialize updates packages."
-msgstr "Arhoswch, yn cysylltu â'r drych i gychwyn pecynnau diweddaru."
+msgstr "Arhoswch, yn cysylltu â'r drych i gychwyn pecynnau diweddaru."
 
-#: ../rpmdrake_.c:798
+#: ../rpmdrake_.c:800
 msgid "Error adding update medium"
 msgstr "Gwall wrth ychwanegu cyfrwng diweddaru"
 
-#: ../rpmdrake_.c:829
+#: ../rpmdrake_.c:831
 msgid "Please wait, finding available packages..."
 msgstr "Arhoswch, canfod pecynnau sydd ar gael..."
 
-#: ../rpmdrake_.c:861
+#: ../rpmdrake_.c:863
 #, c-format
 msgid "Inspecting %s"
 msgstr "Archwilio %s"
 
-#: ../rpmdrake_.c:880
-#, fuzzy
+#: ../rpmdrake_.c:882
 msgid "changes:"
-msgstr "Cadw newidiadau"
+msgstr "newidiadau:"
 
-#: ../rpmdrake_.c:884
+#: ../rpmdrake_.c:886
 #, c-format
 msgid "Remove .%s"
 msgstr "Tynnu .%s"
 
-#: ../rpmdrake_.c:886
+#: ../rpmdrake_.c:888
 #, c-format
 msgid "Use .%s as main file"
 msgstr "Defnyddio .%s fel y brif ffeil"
 
-#: ../rpmdrake_.c:888
+#: ../rpmdrake_.c:890
 msgid "Do nothing"
 msgstr "Gwneud dim"
 
-#: ../rpmdrake_.c:900
+#: ../rpmdrake_.c:902
 msgid "Installation finished"
 msgstr "Gorffennodd y gosodiad"
 
-#: ../rpmdrake_.c:910
+#: ../rpmdrake_.c:912
 msgid "Inspect..."
 msgstr "Archwilio..."
 
-#: ../rpmdrake_.c:925
+#: ../rpmdrake_.c:927
 msgid "Program missing"
 msgstr "Rhaglen ar goll"
 
-#: ../rpmdrake_.c:926
+#: ../rpmdrake_.c:928
 msgid "A required program is missing (grpmi). Check your installation."
 msgstr "Mae rhaglen angenrheidiol ar goll (grpmi). Gwiriwch eich gosodiad."
 
-#: ../rpmdrake_.c:940
+#: ../rpmdrake_.c:942
 msgid "Unable to get source packages."
 msgstr "Methu estyn pecynnau ffynhonnell."
 
-#: ../rpmdrake_.c:941
+#: ../rpmdrake_.c:943
 msgid "Unable to get source packages, sorry."
 msgstr "Methu estyn pecynnau ffynhonnell."
 
-#: ../rpmdrake_.c:948
+#: ../rpmdrake_.c:950
 msgid "Change medium"
 msgstr "Newid cyfrwng"
 
-#: ../rpmdrake_.c:949
+#: ../rpmdrake_.c:951
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Rhowch gyfrwng \"%s\" ar ddyfais [%s]"
 
-#: ../rpmdrake_.c:957
+#: ../rpmdrake_.c:959
 msgid "Installation failed"
 msgstr "Methodd y gosodiad"
 
-#: ../rpmdrake_.c:958
+#: ../rpmdrake_.c:960
 msgid ""
 "Installation failed, some files are missing.\n"
 "You may want to update your sources database."
@@ -758,11 +757,11 @@ msgstr ""
 "Methodd y gosodiad, mae rhai ffeiliau ar goll.\n"
 "Efallai'r hoffech ddiweddaru eich cronfa ddata o ffynonellau."
 
-#: ../rpmdrake_.c:961
+#: ../rpmdrake_.c:963
 msgid "Please wait, removing packages to allow others to be upgraded..."
 msgstr "Arhoswch, tynnu pecynnau i eraill gael eu diweddaru"
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake_.c:984
 #, c-format
 msgid ""
 "The installation is finished; %s.\n"
@@ -775,7 +774,7 @@ msgstr ""
 "Cafodd rhai ffeiliau ffurfweddu eu creu fel  `.rpmnew' neu `.rpmsave',\n"
 "mae modd eu harchwilio i weithredu arnynt:"
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake_.c:984
 msgid ""
 "some packages failed to install\n"
 "correctly"
@@ -783,31 +782,31 @@ msgstr ""
 "methodd rhai pecynnau a chael eu gosod\n"
 "yn gywir"
 
-#: ../rpmdrake_.c:983
+#: ../rpmdrake_.c:985
 msgid "everything was installed correctly"
 msgstr "gosodwyd popeth yn llwyddiannus"
 
-#: ../rpmdrake_.c:985
+#: ../rpmdrake_.c:987
 msgid "Everything installed successfully"
 msgstr "Gosodwyd popeth yn llwyddiannus"
 
-#: ../rpmdrake_.c:986
+#: ../rpmdrake_.c:988
 msgid "All requested packages were installed successfully."
 msgstr "Gosodwyd pob pecyn angenrheidiol yn llwyddiannus."
 
-#: ../rpmdrake_.c:989
+#: ../rpmdrake_.c:991
 msgid "Everything already installed."
 msgstr "Popeth wedi ei osod eisoes"
 
-#: ../rpmdrake_.c:990
+#: ../rpmdrake_.c:992
 msgid "Everything already installed (is this supposed to happen at all?)."
 msgstr "Mae popeth wedi ei osod (ydy hyn i fod i ddigwydd o gwbl?)"
 
-#: ../rpmdrake_.c:997
+#: ../rpmdrake_.c:999
 msgid "Problem during installation"
 msgstr "Problem wrth osod y rhaglen"
 
-#: ../rpmdrake_.c:998
+#: ../rpmdrake_.c:1000
 #, c-format
 msgid ""
 "There was a problem during the installation:\n"
@@ -818,31 +817,30 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake_.c:1012
+#: ../rpmdrake_.c:1014
 msgid "Please wait, reading packages database..."
 msgstr "Arhoswch, darlen cronfa ddata'r pecynnau..."
 
-#: ../rpmdrake_.c:1053
+#: ../rpmdrake_.c:1055
 msgid "Please wait, removing packages..."
 msgstr "Arhoswch tynnu'r pecynnau..."
 
-#: ../rpmdrake_.c:1056
-#, fuzzy
+#: ../rpmdrake_.c:1058
 msgid "Problem during removal"
-msgstr "Problem wrth osod y rhaglen"
+msgstr "Problem wrth dynnu"
 
-#: ../rpmdrake_.c:1057
-#, fuzzy, c-format
+#: ../rpmdrake_.c:1059
+#, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
 "%s"
 msgstr ""
-"Problem wrth osod y rhaglen\n"
+"Problem wrth dynnu pecynnau:\n"
 "\n"
 "%s"
 
-#: ../rpmdrake_.c:1089
+#: ../rpmdrake_.c:1091
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -854,7 +852,7 @@ msgstr ""
 "Bydd yr offeryn hwn yn eich cynorthwyo o ddewis pa feddalwedd rydych\n"
 "am ei dynnu oddi ar eich cyfrifiadur."
 
-#: ../rpmdrake_.c:1094
+#: ../rpmdrake_.c:1096
 msgid ""
 "Welcome to MandrakeUpdate!\n"
 "\n"
@@ -865,7 +863,7 @@ msgstr ""
 "Bydd yr offeryn hwn yn eich cynorthwyo i ddewis diweddariadau i'w gosod\n"
 "ar eich cyfrifiadur."
 
-#: ../rpmdrake_.c:1099
+#: ../rpmdrake_.c:1101
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -890,161 +888,3 @@ msgstr "Rheolwr Ffynhonnell Meddalwedd"
 #: data/rpmdrake.desktop.in.h:1
 msgid "Install Software"
 msgstr "Gosod Meddalwedd"
-
-#~ msgid ""
-#~ "There is already a medium by that name, do you\n"
-#~ "really want to replace it?"
-#~ msgstr ""
-#~ "Mae cyfrwng o'r enw hynny'n bodoli eisoes.\n"
-#~ "Ydych chi wir am ei newid?"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-#~ "Ydi hi'n iawn parhau?"
-
-#~ msgid ""
-#~ "Welcome to the packages source editor!\n"
-#~ "\n"
-#~ "This tool will help you configure the packages sources you wish to use "
-#~ "on\n"
-#~ "your computer. They will then be available to install new software "
-#~ "package\n"
-#~ "or to perform updates."
-#~ msgstr ""
-#~ "Croeso i olygydd ffynhonnell pecynnau.\n"
-#~ "\n"
-#~ "Bydd yr offeryn yn eich cynorthwyo i ffurfweddi ffynhonellau yr hoffech "
-#~ "eu\n"
-#~ "defnyddio ar eich cyfrifiadur. Byddant ar gael i osod pecynnau "
-#~ "meddalwedd\n"
-#~ "newydd neu i wneud diweddariadau."
-
-#~ msgid ""
-#~ "I need to contact MandrakeSoft website to get the mirrors list.\n"
-#~ "Please check that your network is currently running.\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "Mae angen araf gysylltu â safle MandrakeSoft i gael y rhestr drych.\n"
-#~ "Gwiriwch fod eich rhwydwaith yn rhedeg.\n"
-#~ "\n"
-#~ "Ydi hi'n iawn parhau?"
-
-#~ msgid ""
-#~ "There was an error downloading the mirrors list:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "The network, or MandrakeSoft website, are maybe unavailable.\n"
-#~ "Please try again later."
-#~ msgstr ""
-#~ "Digwyddodd wall wrth lwytho'r rhestr drychau i lawr:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "Efallai nad yw'r rhwydwaith neu safle gwe MandrakeSoft ar gael.\n"
-#~ "Ceisiwch eto'n hwyrach."
-
-#~ msgid ""
-#~ "I can't find any suitable mirror.\n"
-#~ "\n"
-#~ "There can be many reasons for this problem; the most frequent is\n"
-#~ "the case when the architecture of your processor is not supported\n"
-#~ "by Mandrake Linux Official Updates."
-#~ msgstr ""
-#~ "Methu canfod drych addas.\n"
-#~ "\n"
-#~ "Gall fod nifer o resymau am hyn; yr amlycaf yw lle nad yw pensaerniaeth "
-#~ "eich prosesydd yn cael ei gynnal gan Ddiweddariad Swyddogol Mandrake "
-#~ "Linux."
-
-#~ msgid ""
-#~ "The list of updates is void. This means that either there is\n"
-#~ "no available update for the packages installed on your computer,\n"
-#~ "or you already installed all of them."
-#~ msgstr ""
-#~ "Mae'r rhestr diweddariadau'n wag. Mae hyn yn golygu nad oes\n"
-#~ "diweddariad ar gyfer y pecynnau ar eich cyfrifiadur, neu eich bod\n"
-#~ "wedi eu gosod."
-
-#~ msgid ""
-#~ "Warning: it seems that you are attempting to add so much\n"
-#~ "packages that your filesystem may run out of free diskspace,\n"
-#~ "during or after package installation ; this is particularly\n"
-#~ "dangerous and should be considered with care.\n"
-#~ "\n"
-#~ "Do you really want to install all the selected packages?"
-#~ msgstr ""
-#~ "Rhybudd mae'n ymddangos fel eich bod yn ceisio\n"
-#~ "ychwanegu gymaint o becynnau fel bydd eich system\n"
-#~ "ffeilio'n rhedeg allan o le, yn ystod neu ar ôl y gosodiad;\n"
-#~ "mae hyn yn beryglus iawn a dylid ei ystyried gyda gofal.\n"
-#~ "\n"
-#~ "Ydych chi wir eisiau gosod yr holl becynnau hyn?"
-
-#~ msgid ""
-#~ "The following packages have to be removed for others to be upgraded:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "Mae'r pecynnau canlynol wedi eu tynnu i eraill gael eu diweddaru:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Ydi hi'n iawn parhau?"
-
-#~ msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#~ msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-
-#~ msgid ""
-#~ "I need to contact the mirror to get latest update packages.\n"
-#~ "Please check that your network is currently running.\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "Mae angen i mi gysylltu â'r drych i estyn y pecynnau diweddaraf.\n"
-#~ "Gwiriwch fod eich rhwydwaith yn rhedeg.\n"
-#~ "\n"
-#~ "Ydi hi'n iawn i mi barhau?"
-
-#~ msgid ""
-#~ "You may also choose your desired mirror manually: to do so,\n"
-#~ "launch the Software Sources Manager, and then add a `Security\n"
-#~ "updates' source.\n"
-#~ "\n"
-#~ "Then, restart MandrakeUpdate."
-#~ msgstr ""
-#~ "Medrwch ddewis eich drych gyda llaw: i wneud hynny,\n"
-#~ "cychwynnwch y Rheolwr Ffynhonnell Meddalwedd, ac yna\n"
-#~ "ychwanegu tarddiad 'Diweddariadau Diogelwch'.\n"
-#~ "\n"
-#~ "Yna ailgychwynnwch MandrakeUpdate."
-
-#~ msgid ""
-#~ "There was an error while adding the update medium via urpmi.\n"
-#~ "\n"
-#~ "This may be due to a broken or temporary unavailable mirror, or when "
-#~ "your\n"
-#~ "Mandrake Linux version (%s) is not yet / no more supported by Mandrake "
-#~ "Linux\n"
-#~ "Official Updates.\n"
-#~ "\n"
-#~ "Do you want to try another mirror?"
-#~ msgstr ""
-#~ "Digwyddodd gwall wrth ychwanegu cyfrwng diweddaru drwy urpmi.\n"
-#~ "\n"
-#~ "Gall hyn fod oherwydd fod drych wedi tori neu nid yw ar gael, neu nad yw "
-#~ "eich\n"
-#~ "fersiwn o Linux Mandrake (%s) yn cael / heb gale ei gynnal gan "
-#~ "Ddiweddariadau\n"
-#~ "Swyddogol Linux Mandrake.\n"
-#~ "\n"
-#~ "Hoffech chi drio drych arall?"
-
-#~ msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
-#~ msgstr "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"