summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-02-04 16:19:41 +0000
committerThierry Vignaud <tv@mandriva.org>2008-02-04 16:19:41 +0000
commitdd9b95ce36b08451c04d330d04340a306bd648a3 (patch)
treedb643365214d0ab661544079575afff5c1a55e24
parent1e165699460b3ede380c17c7303f005f10a002ab (diff)
downloaddrakx-dd9b95ce36b08451c04d330d04340a306bd648a3.tar
drakx-dd9b95ce36b08451c04d330d04340a306bd648a3.tar.gz
drakx-dd9b95ce36b08451c04d330d04340a306bd648a3.tar.bz2
drakx-dd9b95ce36b08451c04d330d04340a306bd648a3.tar.xz
drakx-dd9b95ce36b08451c04d330d04340a306bd648a3.zip
this error is not the same as "crashed"
-rw-r--r--perl-install/standalone/po/fr.po4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/standalone/po/fr.po b/perl-install/standalone/po/fr.po
index 68d32f102..a0ca04174 100644
--- a/perl-install/standalone/po/fr.po
+++ b/perl-install/standalone/po/fr.po
@@ -75,7 +75,7 @@ msgstr ""
"Project-Id-Version: DrakX-fr\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-01-17 14:33+0100\n"
-"PO-Revision-Date: 2008-01-19 22:07+0100\n"
+"PO-Revision-Date: 2008-02-04 17:19+0100\n"
"Last-Translator: Christophe Berthelé <cpjc@free.fr>\n"
"Language-Team: Français <cooker-i18n@mandrivalinux.org>\n"
"MIME-Version: 1.0\n"
@@ -244,7 +244,7 @@ msgstr ""
#: drakbug:64 drakbug:136
#, c-format
msgid "The \"%s\" program has crashed with the following error:"
-msgstr "Le programme « %s » a planté avec l'erreur suivante :"
+msgstr "Le programme « %s » a planté (SEGV) avec l'erreur suivante :"
#: drakbug:75
#, c-format
ug-13680&id=126777bc019a54afb4ec51299f2cf9d2841698aa'>perl-install/share/po/cy.po
@@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: Mandriva DrakX.cy\n"
-"POT-Creation-Date: 2006-03-05 18:57+0800\n"
-"PO-Revision-Date: 2006-03-02 21:50-0000\n"
+"POT-Creation-Date: 2007-03-21 12:10+0100\n"
+"PO-Revision-Date: 2007-01-14 17:31-0000\n"
"Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
"Language-Team: Cymraeg <post@meddal.com>\n"
"MIME-Version: 1.0\n"
@@ -16,838 +16,20 @@ msgstr ""
"X-Poedit-Country: UNITED KINGDOM\n"
"X-Poedit-SourceCharset: utf-8\n"
-#: ../move/move.pm:292
-#, c-format
-msgid "Which USB key do you want to format?"
-msgstr "Pa allwedd USB hoffech ei fformatio?"
-
-#: ../move/move.pm:296
-#, c-format
-msgid ""
-"You are about to format a USB device \"%s\". This will delete all data on "
-"it.\n"
-"Make sure that the selected device is the USB key you want to format. \n"
-"We advise you to unplug all other USB storage devices while doing this "
-"operation."
-msgstr ""
-"Rydych ar fin fformatio dyfais USB \"%s\". Bydd hyn yn dileu'r holl ddata "
-"sydd \n"
-"arno. Gwnewch yn siŵr fod mai hwn yw'r allwedd USB rydych am ei fformatio.\n"
-"Rydym yn eich cynghori i dynnu'r holl ddyfeisiadau storio USB eraill wrth "
-"wneud hyn. "
-
-#: ../move/move.pm:448 ../move/move.pm:460
-#, c-format
-msgid "Key is not writable"
-msgstr "Nid yw'r allwedd yn ysgrifennadwy"
-
-#: ../move/move.pm:450
-#, c-format
-msgid ""
-"The USB key seems to have write protection enabled. Please\n"
-"unplug it, remove write protection, and then plug it again."
-msgstr ""
-"Mae'r allwedd USB i weld a'i ddiogelu rhag ysgrifennu ymlaen.\n"
-"Tynnwch yr allwedd, diffodd y diogelu, ai ailosod."
-
-#: ../move/move.pm:452
-#, c-format
-msgid "Retry"
-msgstr "Ceisio eto"
-
-#: ../move/move.pm:453 ../move/move.pm:497
-#, c-format
-msgid "Continue without USB key"
-msgstr "Parhau heb allwedd USB"
-
-#: ../move/move.pm:462
-#, c-format
-msgid ""
-"The USB key seems to have write protection enabled, but we can not safely\n"
-"unplug it now.\n"
-"\n"
-"\n"
-"Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandriva Move again."
-msgstr ""
-"Mae'r allwedd USB i weld a'i ddiogelu rhag ysgrifennu ymlaen, ond nid oes.\n"
-"modd ei dynnu'n ddiogel.\n"
-"\n"
-"\n"
-"Cliciwch y botwm i ailgychwyn y peiriant, tynnwch yr allwedd, diffodd y\n"
-"diogelu, ailosod y plwg a chychwyn Mandriva Move eto."
-
-#: ../move/move.pm:468 help.pm:410 install_steps_interactive.pm:1303
-#, c-format
-msgid "Reboot"
-msgstr "Ailgychwyn"
-
-#: ../move/move.pm:473
-#, c-format
-msgid ""
-"Your USB key does not have any valid Windows (FAT) partitions.\n"
-"We need one to continue (beside, it's more standard so that you\n"
-"will be able to move and access your files from machines\n"
-"running Windows). Please plug in an USB key containing a\n"
-"Windows partition instead.\n"
-"\n"
-"\n"
-"You may also proceed without an USB key - you'll still be\n"
-"able to use Mandriva Move as a normal live Mandriva\n"
-"Operating System."
-msgstr ""
-"Does gan eich allwedd USB raniadau Windows (FAT) dilys\n"
-"Rhaid cael un i barhau (mae'n fwy safonol i'ch caniatáu i\n"
-"chi symud a chael mynediad i ffeiliau o beiriannau sy'n rhedeg\n"
-"Windows). Rhowch allwedd USB yn cynnwys rhaniad Windows\n"
-"yn ei le nawr.\n"
-"\n"
-"\n"
-"Mae modd mynd yn eich blaen heb allwedd USB - bydd dal\n"
-"modd i chi ddefnyddio Mandriva Move fel System Weithredu\n"
-"Mandriva hyfyw."
-
-#: ../move/move.pm:483
-#, c-format
-msgid ""
-"We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandriva Move will have the ability\n"
-"to transparently save the data in your home directory and\n"
-"system wide configuration, for next boot on this computer\n"
-"or another one. Note: if you plug in a key now, wait several\n"
-"seconds before detecting again.\n"
-"\n"
-"\n"
-"You may also proceed without an USB key - you'll still be\n"
-"able to use Mandriva Move as a normal live Mandriva\n"
-"Operating System."
-msgstr ""
-"Nid ydym wedi canfod allwedd USB ar eich system Os wnewch\n"
-"rhoi'r allwedd USB yn ei le, mae gan Mandriva Move y gallu i\n"
-"gadw eich data yn eich cyfeiriadur cartref a ffurfweddiad system\n"
-"gyfan, ar gyfer ail gychwyn y cyfrifiadur hwn neu un arall\n"
-"Sylwch: os wnewch chi roi'r allwedd yn ei le nawr, arhoswch\n"
-"eiliadau cyn canfod eto.\n"
-"\n"
-"\n"
-"Mae modd mynd yn eich blaen heb allwedd USB - bydd dal\n"
-"modd i chi ddefnyddio Mandriva Move fel system weithredu\n"
-"Mandriva hyfyw."
-
-#: ../move/move.pm:494
-#, c-format
-msgid "Need a key to save your data"
-msgstr "Mae angen allwedd i gadw eich data"
-
-#: ../move/move.pm:496
-#, c-format
-msgid "Detect USB key again"
-msgstr "Canfod allwedd USB eto"
-
-#: ../move/move.pm:517
-#, c-format
-msgid "Setting up USB key"
-msgstr "Gosod allwedd USB"
-
-#: ../move/move.pm:517
-#, c-format
-msgid "Please wait, setting up system configuration files on USB key..."
-msgstr "Arhoswch, gosod ffeiliau caniatáu'r system ar allwedd USB..."
-
-#: ../move/move.pm:546
-#, c-format
-msgid "Enter your user information, password will be used for screensaver"
-msgstr ""
-"Rhowch eich gwybodaeth bersonol, bydd y cyfrinair yn cael ei ddefnyddio ar "
-"gyfer yr arbedwr sgrin"
-
-#: ../move/move.pm:556
-#, c-format
-msgid "Auto configuration"
-msgstr "Awto ffurfweddiad "
-
-#: ../move/move.pm:556
-#, c-format
-msgid "Please wait, detecting and configuring devices..."
-msgstr "Arhoswch, canfod a ffurfweddu dyfeisiau..."
-
-#: ../move/move.pm:604 ../move/move.pm:660 ../move/move.pm:664
-#: diskdrake/dav.pm:75 diskdrake/hd_gtk.pm:113 diskdrake/interactive.pm:231
-#: diskdrake/interactive.pm:244 diskdrake/interactive.pm:405
-#: diskdrake/interactive.pm:423 diskdrake/interactive.pm:560
-#: diskdrake/interactive.pm:565 diskdrake/smbnfs_gtk.pm:41 do_pkgs.pm:19
-#: do_pkgs.pm:39 do_pkgs.pm:52 fsedit.pm:218 install_any.pm:1775
-#: install_any.pm:1827 install_steps.pm:81 install_steps_interactive.pm:37
-#: interactive/http.pm:117 interactive/http.pm:118 modules/interactive.pm:19
-#: network/ndiswrapper.pm:27 network/ndiswrapper.pm:42
-#: network/ndiswrapper.pm:89 network/ndiswrapper.pm:101
-#: network/netconnect.pm:837 network/netconnect.pm:866
-#: network/netconnect.pm:965 network/netconnect.pm:969
-#: network/netconnect.pm:973 network/netconnect.pm:978
-#: network/netconnect.pm:1123 network/netconnect.pm:1127
-#: network/netconnect.pm:1246 network/netconnect.pm:1251
-#: network/netconnect.pm:1271 network/netconnect.pm:1428
-#: network/thirdparty.pm:321 network/thirdparty.pm:328
-#: network/thirdparty.pm:372 network/thirdparty.pm:374
-#: network/thirdparty.pm:395 network/thirdparty.pm:419
-#: printer/printerdrake.pm:244 printer/printerdrake.pm:251
-#: printer/printerdrake.pm:276 printer/printerdrake.pm:422
-#: printer/printerdrake.pm:427 printer/printerdrake.pm:440
-#: printer/printerdrake.pm:450 printer/printerdrake.pm:514
-#: printer/printerdrake.pm:686 printer/printerdrake.pm:690
-#: printer/printerdrake.pm:772 printer/printerdrake.pm:1555
-#: printer/printerdrake.pm:1603 printer/printerdrake.pm:1640
-#: printer/printerdrake.pm:1685 printer/printerdrake.pm:1689
-#: printer/printerdrake.pm:1703 printer/printerdrake.pm:1795
-#: printer/printerdrake.pm:1876 printer/printerdrake.pm:1880
-#: printer/printerdrake.pm:1884 printer/printerdrake.pm:1933
-#: printer/printerdrake.pm:1991 printer/printerdrake.pm:1995
-#: printer/printerdrake.pm:2009 printer/printerdrake.pm:2129
-#: printer/printerdrake.pm:2133 printer/printerdrake.pm:2176
-#: printer/printerdrake.pm:2249 printer/printerdrake.pm:2267
-#: printer/printerdrake.pm:2276 printer/printerdrake.pm:2285
-#: printer/printerdrake.pm:2296 printer/printerdrake.pm:2360
-#: printer/printerdrake.pm:2512 printer/printerdrake.pm:2947
-#: printer/printerdrake.pm:3231 printer/printerdrake.pm:3237
-#: printer/printerdrake.pm:3802 printer/printerdrake.pm:3806
-#: printer/printerdrake.pm:3810 printer/printerdrake.pm:4206
-#: printer/printerdrake.pm:4446 printer/printerdrake.pm:4474
-#: printer/printerdrake.pm:4551 printer/printerdrake.pm:4617
-#: printer/printerdrake.pm:4737 standalone/drakTermServ:422
-#: standalone/drakTermServ:492 standalone/drakTermServ:501
-#: standalone/drakTermServ:812 standalone/drakTermServ:819
-#: standalone/drakTermServ:845 standalone/drakTermServ:894
-#: standalone/drakTermServ:1146 standalone/drakTermServ:1181
-#: standalone/drakTermServ:1634 standalone/drakTermServ:1643
-#: standalone/drakTermServ:1651 standalone/drakTermServ:1656
-#: standalone/drakTermServ:1664 standalone/drakTermServ:1680
-#: standalone/drakTermServ:1700 standalone/drakauth:36
-#: standalone/drakbackup:511 standalone/drakbackup:625
-#: standalone/drakbackup:1110 standalone/drakbackup:1141
-#: standalone/drakbackup:1332 standalone/drakbackup:1664
-#: standalone/drakbackup:1820 standalone/drakbackup:2548
-#: standalone/drakbackup:4463 standalone/drakclock:124
-#: standalone/drakconnect:676 standalone/drakconnect:680
-#: standalone/drakconnect:685 standalone/drakconnect:700
-#: standalone/drakfont:209 standalone/drakfont:222 standalone/drakfont:260
-#: standalone/drakgw:50 standalone/drakgw:188 standalone/drakhosts:98
-#: standalone/drakhosts:246 standalone/drakhosts:253 standalone/drakhosts:260
-#: standalone/draknfs:306 standalone/draknfs:609 standalone/draknfs:616
-#: standalone/draknfs:623 standalone/drakroam:33 standalone/draksambashare:384
-#: standalone/draksambashare:388 standalone/draksambashare:391
-#: standalone/draksambashare:394 standalone/draksambashare:453
-#: standalone/draksambashare:477 standalone/draksambashare:551
-#: standalone/draksambashare:633 standalone/draksambashare:700
-#: standalone/draksambashare:800 standalone/draksambashare:807
-#: standalone/draksambashare:942 standalone/draksambashare:1133
-#: standalone/draksambashare:1142 standalone/draksambashare:1151
-#: standalone/draksambashare:1172 standalone/draksambashare:1181
-#: standalone/draksambashare:1190 standalone/draksambashare:1210
-#: standalone/draksambashare:1218 standalone/draksambashare:1230
-#: standalone/draksplash:162 standalone/drakxtv:107
-#: standalone/finish-install:79 standalone/logdrake:171
-#: standalone/logdrake:439 standalone/logdrake:444 standalone/scannerdrake:59
-#: standalone/scannerdrake:202 standalone/scannerdrake:261
-#: standalone/scannerdrake:732 standalone/scannerdrake:743
-#: standalone/scannerdrake:882 standalone/scannerdrake:893
-#: standalone/scannerdrake:963 wizards.pm:95 wizards.pm:99 wizards.pm:121
-#, c-format
-msgid "Error"
-msgstr "Gwall"
-
-#: ../move/move.pm:605 install_steps.pm:82
-#, c-format
-msgid ""
-"An error occurred, but I do not know how to handle it nicely.\n"
-"Continue at your own risk."
-msgstr ""
-"Digwyddodd gwall ond wn i ddim sut i ddelio ag ef yn dwt.\n"
-"Mae'n beryglus i barhau."
-
-#: ../move/move.pm:660 install_steps_interactive.pm:37
-#, c-format
-msgid "An error occurred"
-msgstr "Digwyddodd gwall"
-
-#: ../move/move.pm:666
-#, c-format
-msgid ""
-"An error occurred:\n"
-"\n"
-"\n"
-"%s\n"
-"\n"
-"This may come from corrupted system configuration files\n"
-"on the USB key, in this case removing them and then\n"
-"rebooting Mandriva Move would fix the problem. To do\n"
-"so, click on the corresponding button.\n"
-"\n"
-"\n"
-"You may also want to reboot and remove the USB key, or\n"
-"examine its contents under another OS, or even have\n"
-"a look at log files in console #3 and #4 to try to\n"
-"guess what's happening."
-msgstr ""
-"Digwyddodd gwall:\n"
-"\n"
-"\n"
-"%s\n"
-"\n"
-"Gall hyn fod wedi dod o ffeiliau ffurfweddu'r system\n"
-"ar yr allwedd USB, yn yr achos yma bydd eu tynnu ac\n"
-"ailgychwyn Mandriva Move yn datrys y broblem. I wneud\n"
-"hynny, cliciwch y botwm perthnasol.\n"
-"\n"
-"\n"
-"Efallai byddwch am ailgychwyn a thynnu'r allwedd USB,\n"
-"archwilio ei gynnwys o dan system weithredu arall, neu gael\n"
-"golwg ar ffeiliau cofnod yng nghonsol #3 a #4 i geisio\n"
-"dyfalu beth sy'n digwydd."
-
-#: ../move/move.pm:681
-#, c-format
-msgid "Remove system config files"
-msgstr "Tynnu ffeiliau ffurfweddu'r system"
-
-#: ../move/move.pm:682
-#, c-format
-msgid "Simply reboot"
-msgstr "Ailgychwyn"
-
-#: ../move/tree/mdk_totem:50 ../move/tree/mdk_totem:96
-#, c-format
-msgid "You can only run with no CDROM support"
-msgstr "Dim ond heb gefnogaeth CD-ROM mae modd rhedeg"
-
-#: ../move/tree/mdk_totem:71
-#, c-format
-msgid "Kill those programs"
-msgstr "Lladd y rhaglenni hyn"
-
-#: ../move/tree/mdk_totem:72
-#, c-format
-msgid "No CDROM support"
-msgstr "Dim cefnogaeth CD-ROM"
-
-#: ../move/tree/mdk_totem:76 diskdrake/hd_gtk.pm:92
-#: diskdrake/interactive.pm:1062 diskdrake/interactive.pm:1072
-#: diskdrake/interactive.pm:1125
-#, c-format
-msgid "Read carefully!"
-msgstr "Darllenwch yn ofalus!"
-
-#: ../move/tree/mdk_totem:77
-#, c-format
-msgid ""
-"You can not use another CDROM when the following programs are running: \n"
-"%s"
-msgstr ""
-"Methu defnyddio CD-ROM pan fo'r rhaglenni canlynol yn rhedeg:\n"
-"%s"
-
-#: ../move/tree/mdk_totem:101
-#, c-format
-msgid "Copying to memory to allow removing the CDROM"
-msgstr "Copïo i'r cof i gael tynnu'r CD-ROM"
-
-#: Xconfig/card.pm:13
-#, c-format
-msgid "256 kB"
-msgstr "256 kB"
-
-#: Xconfig/card.pm:14
-#, c-format
-msgid "512 kB"
-msgstr "512 kB"
-
-#: Xconfig/card.pm:15
-#, c-format
-msgid "1 MB"
-msgstr "1 MB"
-
-#: Xconfig/card.pm:16
-#, c-format
-msgid "2 MB"
-msgstr "2 MB"
-
-#: Xconfig/card.pm:17
-#, c-format
-msgid "4 MB"
-msgstr "4 MB"
-
-#: Xconfig/card.pm:18
-#, c-format
-msgid "8 MB"
-msgstr "8 MB"
-
-#: Xconfig/card.pm:19
-#, c-format
-msgid "16 MB"
-msgstr "16 MB"
-
-#: Xconfig/card.pm:20
-#, c-format
-msgid "32 MB"
-msgstr "32 MB"
-
-#: Xconfig/card.pm:21
-#, c-format
-msgid "64 MB or more"
-msgstr "16 MB neu fwy"
-
-#: Xconfig/card.pm:162
-#, c-format
-msgid "X server"
-msgstr "Gweinydd X"
-
-#: Xconfig/card.pm:163
-#, c-format
-msgid "Choose an X server"
-msgstr "Dewiswch weinydd X"
-
-#: Xconfig/card.pm:195
-#, c-format
-msgid "Multi-head configuration"
-msgstr " ffurfweddiad amlben"
-
-#: Xconfig/card.pm:196
-#, c-format
-msgid ""
-"Your system supports multiple head configuration.\n"
-"What do you want to do?"
-msgstr ""
-"Mae eich system yn cynnal ffurfweddiad amlben.\n"
-"Beth hoffech ei wneud?"
-
-#: Xconfig/card.pm:265
-#, c-format
-msgid "Can not install Xorg package: %s"
-msgstr "Methu gosod pecyn Xorg: %s"
-
-#: Xconfig/card.pm:275
-#, c-format
-msgid "Select the memory size of your graphics card"
-msgstr "Dewiswch faint cof eich cerdyn graffeg"
-
-#: Xconfig/card.pm:371
-#, c-format
-msgid "Xorg configuration"
-msgstr "Ffurfweddiad Xorg"
-
-#: Xconfig/card.pm:373
-#, c-format
-msgid "Which configuration of Xorg do you want to have?"
-msgstr "Pa ffurfweddiad Xorg hoffech ei gael?"
-
-#: Xconfig/card.pm:406
-#, c-format
-msgid "Configure all heads independently"
-msgstr "Ffurfweddu pob pen yn annibynnol"
-
-#: Xconfig/card.pm:407
-#, c-format
-msgid "Use Xinerama extension"
-msgstr "Defnyddiwch estyniad Xinerama"
-
-#: Xconfig/card.pm:412
-#, c-format
-msgid "Configure only card \"%s\"%s"
-msgstr "Ffurfweddu cerdyn \"%s\" %s yn unig"
-
-#: Xconfig/card.pm:424 Xconfig/various.pm:23
-#, c-format
-msgid "Xorg %s"
-msgstr "Xorg: %s"
-
-#: Xconfig/card.pm:431 Xconfig/various.pm:22
-#, c-format
-msgid "Xorg %s with 3D hardware acceleration"
-msgstr "Xorg %s gyda chyflymu caledwedd 3D"
-
-#: Xconfig/card.pm:433
-#, c-format
-msgid "Your card can have 3D hardware acceleration support with Xorg %s."
-msgstr "Mae modd i'ch cerdyn gael cefnogaeth cyflymu caledwedd 3D gyda Xorg %s"
-
-#: Xconfig/card.pm:439
-#, c-format
-msgid "Xorg %s with EXPERIMENTAL 3D hardware acceleration"
-msgstr "Xorg %s gyda chyflymu caledwedd 3D ARBROFOL"
-
-#: Xconfig/card.pm:441
-#, c-format
-msgid ""
-"Your card can have 3D hardware acceleration support with Xorg %s,\n"
-"NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER."
-msgstr ""
-"Mae modd i'ch cerdyn gael cefnogaeth cyflymu caledwedd 3D gyda Xorg %s \n"
-"SYLWER CEFNOGAETH ARBROFOL YW HON AC FE ALL RHEWI EICH CYFRIFIADUR."
-
-#: Xconfig/main.pm:90 Xconfig/main.pm:91 Xconfig/monitor.pm:116 any.pm:1021
-#, c-format
-msgid "Custom"
-msgstr "Arddull"
-
-#: Xconfig/main.pm:127 any.pm:742 diskdrake/dav.pm:26 help.pm:15
-#: install_steps_interactive.pm:1303 printer/printerdrake.pm:882
-#: printer/printerdrake.pm:899 printer/printerdrake.pm:4546
-#: printer/printerdrake.pm:5010 standalone/drakhosts:263
-#: standalone/drakroam:230 standalone/draksplash:93 standalone/logdrake:176
-#: standalone/net_applet:103 standalone/scannerdrake:494
-#, c-format
-msgid "Quit"
-msgstr "Gadael"
-
-#: Xconfig/main.pm:129
-#, c-format
-msgid "Graphic Card"
-msgstr "Cerdyn Graffeg"
-
-#: Xconfig/main.pm:132 Xconfig/monitor.pm:110
-#, c-format
-msgid "Monitor"
-msgstr "Monitor"
-
-#: Xconfig/main.pm:135 Xconfig/resolution_and_depth.pm:289
-#, c-format
-msgid "Resolution"
-msgstr "Cydraniad"
-
-#: Xconfig/main.pm:138
-#, c-format
-msgid "Test"
-msgstr "Prawf"
-
-#: Xconfig/main.pm:143 diskdrake/dav.pm:65 diskdrake/interactive.pm:449
-#: diskdrake/removable.pm:24 diskdrake/smbnfs_gtk.pm:79
-#: printer/printerdrake.pm:1112 standalone/drakfont:493
-#: standalone/drakfont:548
-#, c-format
-msgid "Options"
-msgstr "Dewisiadau"
-
-#: Xconfig/main.pm:178
-#, c-format
-msgid "Your Xorg configuration file is broken, we will ignore it."
-msgstr "Mae eich ffeil ffurfweddu Xorg wedi torri, byddwn yn ei anwybyddu."
-
-#: Xconfig/main.pm:196
-#, c-format
-msgid ""
-"Keep the changes?\n"
-"The current configuration is:\n"
-"\n"
-"%s"
-msgstr ""
-"Cadw'r newid?\n"
-"Y ffurfweddiad presennol yw:\n"
-"\n"
-"%s"
-
-#: Xconfig/monitor.pm:111
-#, c-format
-msgid "Choose a monitor for head #%d"
-msgstr "Dewiswch fonitor ar gyfer #%d"
-
-#: Xconfig/monitor.pm:111
-#, c-format
-msgid "Choose a monitor"
-msgstr "Dewiswch fonitor"
-
-#: Xconfig/monitor.pm:117
-#, c-format
-msgid "Plug'n Play"
-msgstr "Plug'n Play"
-
-#: Xconfig/monitor.pm:118 mouse.pm:49
-#, c-format
-msgid "Generic"
-msgstr "Generig"
-
-#: Xconfig/monitor.pm:119 standalone/drakconnect:591 standalone/harddrake2:54
-#: standalone/harddrake2:88
-#, c-format
-msgid "Vendor"
-msgstr "Gwerthwr"
-
-#: Xconfig/monitor.pm:129
-#, c-format
-msgid "Plug'n Play probing failed. Please select the correct monitor"
-msgstr "Methodd ymholiad Plug'n Play. Dewiswch y dangosydd cywir"
-
-#: Xconfig/monitor.pm:137
-#, c-format
-msgid ""
-"The two critical parameters are the vertical refresh rate, which is the "
-"rate\n"
-"at which the whole screen is refreshed, and most importantly the horizontal\n"
-"sync rate, which is the rate at which scanlines are displayed.\n"
-"\n"
-"It is VERY IMPORTANT that you do not specify a monitor type with a sync "
-"range\n"
-"that is beyond the capabilities of your monitor: you may damage your "
-"monitor.\n"
-" If in doubt, choose a conservative setting."
-msgstr ""
-"Y ddau baramedr pwysig yw'r raddfa adnewyddu fertigol, sef y raddfa mae'r\n"
-"holl sgrin yn cael ei adnewyddu, ac yn fwyaf pwysig y raddfa cydamseru\n"
-"llorweddol, sef y raddfa mae'r llinellau sganio'n cael eu dangos.\n"
-"\n"
-"Mae'n BWYSIG IAWN nad ydych yn enwi monitor gyda graddfa cydamseru\n"
-"sydd tu hwnt i allu eich monitor: mae modd difrodi eich monitor drwy wneud "
-"hynny.\n"
-"Os oes gennych amheuaeth, dewiswch raddfa is."
-
-#: Xconfig/monitor.pm:144
-#, c-format
-msgid "Horizontal refresh rate"
-msgstr "Graddfa adfywio lorweddol"
-
-#: Xconfig/monitor.pm:145
-#, c-format
-msgid "Vertical refresh rate"
-msgstr "Graddfa adfywio fertigol"
-
-#: Xconfig/resolution_and_depth.pm:10
-#, c-format
-msgid "256 colors (8 bits)"
-msgstr "256 lliw (8 did)"
-
-#: Xconfig/resolution_and_depth.pm:11
-#, c-format
-msgid "32 thousand colors (15 bits)"
-msgstr "32 mil o liwiau (15 did)"
-
-#: Xconfig/resolution_and_depth.pm:12
-#, c-format
-msgid "65 thousand colors (16 bits)"
-msgstr "65 mil o liwiau (16 did)"
-
-#: Xconfig/resolution_and_depth.pm:13
-#, c-format
-msgid "16 million colors (24 bits)"
-msgstr "16 miliwn o liwiau (24 did)"
-
-#: Xconfig/resolution_and_depth.pm:127
-#, c-format
-msgid "Resolutions"
-msgstr "Cyfraniadau"
-
-#: Xconfig/resolution_and_depth.pm:311 diskdrake/hd_gtk.pm:336
-#: install_steps_gtk.pm:288 mouse.pm:168 services.pm:162
-#: standalone/drakbackup:1606 standalone/drakperm:250
-#, c-format
-msgid "Other"
-msgstr "Arall"
-
-#: Xconfig/resolution_and_depth.pm:360
-#, c-format
-msgid "Choose the resolution and the color depth"
-msgstr "Dewiswch y cydraniad a'r dyfnder lliw"
-
-#: Xconfig/resolution_and_depth.pm:361
-#, c-format
-msgid "Graphics card: %s"
-msgstr "Cerdyn graffeg: %s"
-
-#: Xconfig/resolution_and_depth.pm:375 interactive.pm:119 interactive.pm:436
-#: interactive/http.pm:103 interactive/http.pm:156 interactive/newt.pm:321
-#: interactive/stdio.pm:39 interactive/stdio.pm:142 interactive/stdio.pm:143
-#: standalone/drakTermServ:222 standalone/drakTermServ:543
-#: standalone/drakbackup:1372 standalone/drakbackup:4123
-#: standalone/drakbackup:4183 standalone/drakbackup:4227
-#: standalone/drakbackup:4481 standalone/drakconnect:158
-#: standalone/drakconnect:852 standalone/drakconnect:939
-#: standalone/drakconnect:1030 standalone/drakfont:569 standalone/drakfont:579
-#: standalone/draksplash:173 standalone/drakups:210 standalone/net_monitor:339
-#: ugtk2.pm:392 ugtk2.pm:490 ugtk2.pm:899 ugtk2.pm:922
-#, c-format
-msgid "Ok"
-msgstr "Iawn"
-
-#: Xconfig/resolution_and_depth.pm:375 diskdrake/smbnfs_gtk.pm:80 help.pm:90
-#: help.pm:445 install_steps_gtk.pm:455 install_steps_interactive.pm:406
-#: install_steps_interactive.pm:811 interactive.pm:120 interactive.pm:437
-#: interactive/http.pm:104 interactive/http.pm:160 interactive/newt.pm:318
-#: interactive/stdio.pm:39 interactive/stdio.pm:142
-#: printer/printerdrake.pm:3882 standalone/drakautoinst:215
-#: standalone/drakbackup:1372 standalone/drakbackup:4052
-#: standalone/drakbackup:4056 standalone/drakbackup:4111
-#: standalone/drakbackup:4481 standalone/drakconnect:157
-#: standalone/drakconnect:937 standalone/drakconnect:1029
-#: standalone/drakfont:579 standalone/drakfont:655 standalone/drakfont:733
-#: standalone/draksplash:173 standalone/drakups:217 standalone/logdrake:176
-#: standalone/net_monitor:338 ugtk2.pm:386 ugtk2.pm:488 ugtk2.pm:497
-#: ugtk2.pm:899
-#, c-format
-msgid "Cancel"
-msgstr "Diddymu"
-
-#: Xconfig/resolution_and_depth.pm:375 diskdrake/hd_gtk.pm:150
-#: install_steps_gtk.pm:232 install_steps_gtk.pm:617 interactive.pm:567
-#: interactive/gtk.pm:682 interactive/gtk.pm:684 standalone/drakTermServ:311
-#: standalone/drakbackup:4048 standalone/drakbug:105
-#: standalone/drakconnect:153 standalone/drakconnect:236
-#: standalone/drakfont:511 standalone/draknfs:206 standalone/drakperm:133
-#: standalone/draksambashare:320 standalone/draksec:344 standalone/draksec:346
-#: standalone/draksec:364 standalone/draksec:366 ugtk2.pm:1031 ugtk2.pm:1032
-#, c-format
-msgid "Help"
-msgstr "Cymorth"
-
-#: Xconfig/test.pm:30
-#, c-format
-msgid "Test of the configuration"
-msgstr "Prawf o'r ffurfweddiad"
-
-#: Xconfig/test.pm:31
-#, c-format
-msgid "Do you want to test the configuration?"
-msgstr "Ydych chi eisiau profi'r ffurfweddiad?"
-
-#: Xconfig/test.pm:31
-#, c-format
-msgid "Warning: testing this graphic card may freeze your computer"
-msgstr "Rhybudd: gall profi'r cerdyn graffeg hwn rewi eich cyfrifiadur"
-
-#: Xconfig/test.pm:69
-#, c-format
-msgid ""
-"An error occurred:\n"
-"%s\n"
-"Try to change some parameters"
-msgstr ""
-"Digwyddodd gwall:\n"
-"%s\n"
-"Ceisiwch newid paramedrau"
-
-#: Xconfig/test.pm:129
-#, c-format
-msgid "Leaving in %d seconds"
-msgstr "Gadael mewn %d eiliad"
-
-#: Xconfig/test.pm:129
-#, c-format
-msgid "Is this the correct setting?"
-msgstr "A'i hwn yw'r gosodiad cywir?"
-
-#: Xconfig/various.pm:29
-#, c-format
-msgid "Keyboard layout: %s\n"
-msgstr "Cynllun allweddell: %s\n"
-
-#: Xconfig/various.pm:30
-#, c-format
-msgid "Mouse type: %s\n"
-msgstr "Math o lygoden: %s\n"
-
-#: Xconfig/various.pm:31
-#, c-format
-msgid "Mouse device: %s\n"
-msgstr "Dyfais llygoden: %s\n"
-
-#: Xconfig/various.pm:33
-#, c-format
-msgid "Monitor: %s\n"
-msgstr "Monitor: %s\n"
-
-#: Xconfig/various.pm:34
-#, c-format
-msgid "Monitor HorizSync: %s\n"
-msgstr "HorizSync Monitor: %s\n"
-
-#: Xconfig/various.pm:35
-#, c-format
-msgid "Monitor VertRefresh: %s\n"
-msgstr "VertRefresh Monitor: %s\n"
-
-#: Xconfig/various.pm:37
-#, c-format
-msgid "Graphics card: %s\n"
-msgstr "Cerdyn graffeg: %s\n"
-
-#: Xconfig/various.pm:38
-#, c-format
-msgid "Graphics memory: %s kB\n"
-msgstr "Cof graffeg: %s kB\n"
-
-#: Xconfig/various.pm:40
-#, c-format
-msgid "Color depth: %s\n"
-msgstr "Dyfnder lliw: %s\n"
-
-#: Xconfig/various.pm:41
-#, c-format
-msgid "Resolution: %s\n"
-msgstr "Cydraniad: %s\n"
-
-#: Xconfig/various.pm:43
-#, c-format
-msgid "Xorg driver: %s\n"
-msgstr "Gyrrwr Xorg: %s\n"
-
-#: Xconfig/various.pm:72
-#, c-format
-msgid "Graphical interface at startup"
-msgstr "Rhyngwyneb graffigol wrth gychwyn"
-
-#: Xconfig/various.pm:74
-#, c-format
-msgid ""
-"I can setup your computer to automatically start the graphical interface "
-"(Xorg) upon booting.\n"
-"Would you like Xorg to start when you reboot?"
-msgstr ""
-"Hoffwn osod eich cyfrifiadur i gychwyn X yn awtomatig ar ôl cychwyn\n"
-"Hoffech chi i Xorg ddechrau wedi i chi ail-gychwyn?"
-
-#: Xconfig/various.pm:87
-#, c-format
-msgid ""
-"Your graphic card seems to have a TV-OUT connector.\n"
-"It can be configured to work using frame-buffer.\n"
-"\n"
-"For this you have to plug your graphic card to your TV before booting your "
-"computer.\n"
-"Then choose the \"TVout\" entry in the bootloader\n"
-"\n"
-"Do you have this feature?"
-msgstr ""
-"Mae'n edrych fel bod gan eich cerdyn graffig gyswllt TV-OUT.\n"
-"Mae modd ei ffurfweddu i weithio drwy fyffer ffrâm.\n"
-"\n"
-"Rhaid cysylltu eich cerdyn graffig â'ch teledu cyn cychwyn eich "
-"cyfrifiadur.\n"
-"Dewiswch \"TV-OUT\" yn y cychwynnwr\n"
-"\n"
-"Ydy'r nodwedd hon gennych?"
-
-#: Xconfig/various.pm:99
-#, c-format
-msgid "What norm is your TV using?"
-msgstr "Pa norm mae eich teledu'n ei ddefnyddio?"
-
-#: Xconfig/xfree.pm:648
-#, c-format
-msgid ""
-"_:weird aspect ratio\n"
-"other"
-msgstr "arall"
-
-#: any.pm:153 harddrake/sound.pm:195 interactive.pm:474 pkgs.pm:474
-#: standalone/drakconnect:160 standalone/drakconnect:635 standalone/draksec:68
-#: standalone/drakups:99 standalone/drakxtv:92 standalone/harddrake2:375
-#: standalone/service_harddrake:235
+#: any.pm:157 diskdrake/interactive.pm:422 diskdrake/interactive.pm:617
+#: diskdrake/interactive.pm:798 diskdrake/interactive.pm:842
+#: diskdrake/interactive.pm:904 diskdrake/interactive.pm:1188 do_pkgs.pm:209
+#: do_pkgs.pm:255 harddrake/sound.pm:195 interactive.pm:576
#, c-format
msgid "Please wait"
msgstr "Arhoswch"
-#: any.pm:153
+#: any.pm:157
#, c-format
msgid "Bootloader installation in progress"
msgstr "Wrthi'n gosod cychwynnwr"
-#: any.pm:164
+#: any.pm:168
#, c-format
msgid ""
"LILO wants to assign a new Volume ID to drive %s. However, changing\n"
@@ -863,12 +45,12 @@ msgstr ""
"\n"
"Neilltuo enw Cyfrol newydd?"
-#: any.pm:175
+#: any.pm:179
#, c-format
msgid "Installation of bootloader failed. The following error occurred:"
msgstr "Methodd gosod cychwynnwr. Digwyddodd y gwall canlynol:"
-#: any.pm:181
+#: any.pm:185
#, c-format
msgid ""
"You may need to change your Open Firmware boot-device to\n"
@@ -885,7 +67,7 @@ msgstr ""
" Yna teipiwch: shut-down\n"
"Wrth gychwyn eto dylech weld anogwr y cychwynnwr."
-#: any.pm:219
+#: any.pm:223
#, c-format
msgid ""
"You decided to install the bootloader on a partition.\n"
@@ -900,258 +82,269 @@ msgstr ""
"\n"
"Gyda pha ddisg ydych chi'n cychwyn?"
-#: any.pm:242 help.pm:740
+#: any.pm:246
#, c-format
msgid "First sector of drive (MBR)"
msgstr "Adran gyntaf o'r disg (MBR)"
-#: any.pm:243
+#: any.pm:247
#, c-format
msgid "First sector of the root partition"
msgstr "Adran gyntaf o'r rhaniad gwraidd"
-#: any.pm:245
+#: any.pm:249
#, c-format
msgid "On Floppy"
msgstr "Ar Ddisg Meddal"
-#: any.pm:247 help.pm:740 printer/printerdrake.pm:4203
+#: any.pm:251
#, c-format
msgid "Skip"
msgstr "Hepgor"
-#: any.pm:251
+#: any.pm:255
#, c-format
msgid "LILO/grub Installation"
msgstr "Gosodiad LILO/grub"
-#: any.pm:252
+#: any.pm:257
#, c-format
msgid "Where do you want to install the bootloader?"
msgstr "Lle rydych chi eisiau gosod y cychwynnwr?"
-#: any.pm:278 standalone/drakboot:269
+#: any.pm:284
#, c-format
msgid "Boot Style Configuration"
msgstr "Ffurfweddu'r Math o Gychwyn"
-#: any.pm:280 any.pm:281 any.pm:314 any.pm:315
+#: any.pm:294 any.pm:326 any.pm:327
#, c-format
msgid "Bootloader main options"
msgstr "Prif ddewisiadau Bootloader"
-#: any.pm:286
-#, c-format
-msgid "Give the ram size in MB"
-msgstr "Rhowch faint RAM mewn MB"
-
-#: any.pm:288
-#, c-format
-msgid ""
-"Option ``Restrict command line options'' is of no use without a password"
-msgstr ""
-"Dewis Nid yw 'cyfyngu dewisiadau llinell orchymyn' o werth heb gyfrinair"
-
-#: any.pm:289 any.pm:628 authentication.pm:192
-#, c-format
-msgid "The passwords do not match"
-msgstr "Nid yw'r cyfrineiriau'n cyd-fynd"
-
-#: any.pm:289 any.pm:628 authentication.pm:192 diskdrake/interactive.pm:1336
+#: any.pm:299
#, c-format
-msgid "Please try again"
-msgstr "Ceisiwch eto"
+msgid "Bootloader"
+msgstr "Cychwynnwr ar waith"
-#: any.pm:294 any.pm:319
+#: any.pm:300 any.pm:331
#, c-format
msgid "Bootloader to use"
msgstr "Bootloader ar waith"
-#: any.pm:296 any.pm:321
+#: any.pm:302 any.pm:333
#, c-format
msgid "Boot device"
msgstr "Dyfais cychwyn"
-#: any.pm:298
+#: any.pm:304
+#, c-format
+msgid "Main options"
+msgstr "Prif ddewisiadau"
+
+#: any.pm:305
#, c-format
msgid "Delay before booting default image"
msgstr "Oedi cyn cychwyn y ddelwedd rhagosodedig"
-#: any.pm:299
+#: any.pm:306
#, c-format
msgid "Enable ACPI"
msgstr "Galluogi ACPI"
-#: any.pm:301
+#: any.pm:307
#, c-format
-msgid "Force no APIC"
-msgstr "Gorfodi dim APIC"
+msgid "Enable APIC"
+msgstr "Galluogi APIC"
-#: any.pm:303
+#: any.pm:308
#, c-format
-msgid "Force No Local APIC"
-msgstr "Peidio Gorfodi APIC Lleol"
+msgid "Enable Local APIC"
+msgstr "Galluogi APIC Lleol"
-#: any.pm:305 any.pm:662 authentication.pm:197 diskdrake/smbnfs_gtk.pm:180
-#: network/netconnect.pm:584 printer/printerdrake.pm:1867
-#: printer/printerdrake.pm:1988 standalone/drakbackup:1650
-#: standalone/drakbackup:3641 standalone/drakups:297
+#: any.pm:310 any.pm:686 authentication.pm:196 diskdrake/smbnfs_gtk.pm:181
#, c-format
msgid "Password"
msgstr "Cyfrinair"
-#: any.pm:306 any.pm:663 authentication.pm:198
+#: any.pm:312 authentication.pm:207
+#, c-format
+msgid "The passwords do not match"
+msgstr "Nid yw'r cyfrineiriau'n cyd-fynd"
+
+#: any.pm:312 authentication.pm:207 diskdrake/interactive.pm:1348
+#, c-format
+msgid "Please try again"
+msgstr "Ceisiwch eto"
+