sync with code

1 files changed, 102 insertions, 94 deletions

diff --git a/perl-install/share/po/cy.po b/perl-install/share/po/cy.po
index 92d0b7b11..04dce152d 100644
--- a/perl-install/share/po/cy.po
+++ b/perl-install/share/po/cy.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mandriva DrakX.cy\n"
-"POT-Creation-Date: 2008-08-12 17:53+0200\n"
+"POT-Creation-Date: 2008-08-18 18:01+0200\n"
 "PO-Revision-Date: 2008-03-11 22:19+0100\n"
 "Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
 "Language-Team: Cymraeg <post@meddal.com>\n"
@@ -18,7 +18,7 @@ msgstr ""
 
 #: any.pm:245 diskdrake/interactive.pm:554 diskdrake/interactive.pm:741
 #: diskdrake/interactive.pm:785 diskdrake/interactive.pm:843
-#: diskdrake/interactive.pm:1133 do_pkgs.pm:220 do_pkgs.pm:262
+#: diskdrake/interactive.pm:1133 do_pkgs.pm:221 do_pkgs.pm:267
 #: harddrake/sound.pm:285 interactive.pm:580
 #, c-format
 msgid "Please wait"
@@ -501,7 +501,7 @@ msgstr "Dewiswch y rheolwr ffenestr i redeg:"
 msgid "Release Notes"
 msgstr "Nodiadau Ryddhau"
 
-#: any.pm:878 any.pm:1214 interactive/gtk.pm:766
+#: any.pm:878 any.pm:1217 interactive/gtk.pm:774
 #, c-format
 msgid "Close"
 msgstr "Cau"
@@ -516,27 +516,27 @@ msgstr "Cytundeb trwyddedu"
 msgid "Quit"
 msgstr "Gadael"
 
-#: any.pm:923
+#: any.pm:925
+#, fuzzy, c-format
+msgid "Do you accept this license ?"
+msgstr "Oes gennych un arall?"
+
+#: any.pm:926
 #, c-format
 msgid "Accept"
 msgstr "Derbyn"
 
-#: any.pm:923
+#: any.pm:926
 #, c-format
 msgid "Refuse"
 msgstr "Gwrthod"
 
-#: any.pm:943 any.pm:1009
+#: any.pm:947 any.pm:1012
 #, c-format
 msgid "Please choose a language to use."
 msgstr "Dewiswch iaith i'w defnyddio."
 
-#: any.pm:944 any.pm:1010
-#, c-format
-msgid "Language choice"
-msgstr "Dewis iaith"
-
-#: any.pm:973
+#: any.pm:976
 #, c-format
 msgid ""
 "Mandriva Linux can support multiple languages. Select\n"
@@ -547,72 +547,77 @@ msgstr ""
 "pa iaith yr hoffech ei osod. Byddant ar gael pan fydd eich gosodiad\n"
 "wedi ei gwblhau a phan fyddwch yn ail gychwyn eich system."
 
-#: any.pm:976
+#: any.pm:979
 #, c-format
 msgid "Multi languages"
 msgstr "Amlieithog"
 
-#: any.pm:987 any.pm:1018
+#: any.pm:990 any.pm:1021
 #, c-format
 msgid "Old compatibility (non UTF-8) encoding"
 msgstr "Hen Amgodiad (nid utf-8)"
 
-#: any.pm:989
+#: any.pm:992
 #, c-format
 msgid "All languages"
 msgstr "Pob iaith"
 
-#: any.pm:1065
+#: any.pm:1013
+#, c-format
+msgid "Language choice"
+msgstr "Dewis iaith"
+
+#: any.pm:1068
 #, c-format
 msgid "Country / Region"
 msgstr "Gwlad / Ardal"
 
-#: any.pm:1066
+#: any.pm:1069
 #, c-format
 msgid "Please choose your country."
 msgstr "Dewiswch eich gwlad."
 
-#: any.pm:1068
+#: any.pm:1071
 #, c-format
 msgid "Here is the full list of available countries"
 msgstr "Dyma restr lawn o'r gwledydd sydd ar gael"
 
-#: any.pm:1069
+#: any.pm:1072
 #, c-format
 msgid "Other Countries"
 msgstr "Gwledydd eraill"
 
-#: any.pm:1069 interactive.pm:481
+#: any.pm:1072 interactive.pm:481
 #, c-format
 msgid "Advanced"
 msgstr "Uwch"
 
-#: any.pm:1075
+#: any.pm:1078
 #, c-format
 msgid "Input method:"
 msgstr "Dull mewnbwn:"
 
-#: any.pm:1078
+#: any.pm:1081
 #, c-format
 msgid "None"
 msgstr "Dim"
 
-#: any.pm:1159
+#: any.pm:1162
 #, c-format
 msgid "No sharing"
 msgstr "Peidio rhannu"
 
-#: any.pm:1159
+#: any.pm:1162
 #, c-format
 msgid "Allow all users"
 msgstr "Caniatáu pob defnyddiwr"
 
-#: any.pm:1159
+#: any.pm:1162
 #, c-format
 msgid "Custom"
 msgstr "Arddull"
 
-#: any.pm:1163
+#: any.pm:1166
 #, c-format
 msgid ""
 "Would you like to allow users to share some of their directories?\n"
@@ -627,7 +632,7 @@ msgstr ""
 "\n"
 "\"Addasu\" caniatáu cyfran i'r defnyddwyr.\n"
 
-#: any.pm:1175
+#: any.pm:1178
 #, c-format
 msgid ""
 "NFS: the traditional Unix file sharing system, with less support on Mac and "
@@ -636,7 +641,7 @@ msgstr ""
 "NFS: system rhannu ffeiliau traddodiadol Unix, sydd â llai o gefnogaeth ar "
 "Mac a Windows."
 
-#: any.pm:1178
+#: any.pm:1181
 #, c-format
 msgid ""
 "SMB: a file sharing system used by Windows, Mac OS X and many modern Linux "
@@ -645,19 +650,19 @@ msgstr ""
 "SMB: system rhannu ffeiliau sy'n cael ei ddefnyddio yn Windows, Mac OSX a "
 "nifer o systemau Linux diweddar."
 
-#: any.pm:1186
+#: any.pm:1189
 #, c-format
 msgid ""
 "You can export using NFS or SMB. Please select which you would like to use."
 msgstr ""
 "Gallwch allforio gan ddefnyddio NFS neu SMB. Pa un hoffech chi ei ddefnyddio?"
 
-#: any.pm:1214
+#: any.pm:1217
 #, c-format
 msgid "Launch userdrake"
 msgstr "Cychwyn userdrake"
 
-#: any.pm:1216
+#: any.pm:1219
 #, c-format
 msgid ""
 "The per-user sharing uses the group \"fileshare\". \n"
@@ -666,52 +671,52 @@ msgstr ""
 "Mae'r rhannu yn ôl defnyddiwr yn defnyddio grŵp \"rhannu ffeiliau\" .\n"
 "Mae modd defnyddio userdrake i ychwanegu defnyddiwr i'r grŵp. "
 
-#: any.pm:1308
+#: any.pm:1311
 #, c-format
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "Allgofnodwch ac yna defnyddiwch Ctrl Alt-BackSpace"
 
-#: any.pm:1312
+#: any.pm:1315
 #, c-format
 msgid "You need to log out and back in again for changes to take effect"
 msgstr "Rhaid allgofnodi ac i mewn eto i newidiadau ddigwydd."
 
-#: any.pm:1347
+#: any.pm:1350
 #, c-format
 msgid "Timezone"
 msgstr "Cylchfa amser"
 
-#: any.pm:1347
+#: any.pm:1350
 #, c-format
 msgid "Which is your timezone?"
 msgstr "Pa un yw eich parth amser?"
 
-#: any.pm:1370 any.pm:1372
+#: any.pm:1373 any.pm:1375
 #, c-format
 msgid "Date, Clock & Time Zone Settings"
 msgstr "Gosodiadau Dyddiad Cloc a Chylchedd Amser"
 
-#: any.pm:1373
+#: any.pm:1376
 #, c-format
 msgid "What is the best time?"
 msgstr "Beth yw'r amser gorau?"
 
-#: any.pm:1377
+#: any.pm:1380
 #, c-format
 msgid "%s (hardware clock set to UTC)"
 msgstr "%s (cloc caledwedd wedi ei osod i UTC)"
 
-#: any.pm:1378
+#: any.pm:1381
 #, c-format
 msgid "%s (hardware clock set to local time)"
 msgstr "%s (cloc caledwedd wedi ei osod i'r amser lleol)"
 
-#: any.pm:1380
+#: any.pm:1383
 #, c-format
 msgid "NTP Server"
 msgstr "Gweinydd NTP"
 
-#: any.pm:1381
+#: any.pm:1384
 #, c-format
 msgid "Automatic time synchronization (using NTP)"
 msgstr "Cydweddi amser awtomatig (defnyddio NTP)"
@@ -1196,13 +1201,13 @@ msgstr "Pwynt arosod"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: diskdrake/dav.pm:66 diskdrake/hd_gtk.pm:164 diskdrake/removable.pm:26
+#: diskdrake/dav.pm:66 diskdrake/hd_gtk.pm:167 diskdrake/removable.pm:26
 #: diskdrake/smbnfs_gtk.pm:82 interactive/http.pm:151
 #, c-format
 msgid "Done"
 msgstr "Gorffen"
 
-#: diskdrake/dav.pm:75 diskdrake/hd_gtk.pm:113 diskdrake/hd_gtk.pm:263
+#: diskdrake/dav.pm:75 diskdrake/hd_gtk.pm:113 diskdrake/hd_gtk.pm:265
 #: diskdrake/interactive.pm:233 diskdrake/interactive.pm:246
 #: diskdrake/interactive.pm:480 diskdrake/interactive.pm:485
 #: diskdrake/interactive.pm:603 diskdrake/interactive.pm:861
@@ -1252,6 +1257,11 @@ msgstr "Dewisiadau: %s"
 msgid "Partitioning"
 msgstr "Creu rhaniadau"
 
+#: diskdrake/hd_gtk.pm:66
+#, c-format
+msgid "Click on a partition, choose a filesystem type then choose an action"
+msgstr ""
+
 #: diskdrake/hd_gtk.pm:93 diskdrake/interactive.pm:1010
 #: diskdrake/interactive.pm:1020 diskdrake/interactive.pm:1073
 #, c-format
@@ -1284,18 +1294,13 @@ msgstr ""
 "ddigon)\n"
 "ar ddechrau'r ddisg."
 
-#: diskdrake/hd_gtk.pm:160 interactive.pm:644 interactive/gtk.pm:744
-#: interactive/gtk.pm:759 interactive/gtk.pm:779 ugtk2.pm:938 ugtk2.pm:939
+#: diskdrake/hd_gtk.pm:163 interactive.pm:644 interactive/gtk.pm:752
+#: interactive/gtk.pm:767 interactive/gtk.pm:787 ugtk2.pm:942 ugtk2.pm:943
 #, c-format
 msgid "Help"
 msgstr "Cymorth"
 
-#: diskdrake/hd_gtk.pm:195
-#, c-format
-msgid "Choose action"
-msgstr "Dewiswch weithred"
-
-#: diskdrake/hd_gtk.pm:199
+#: diskdrake/hd_gtk.pm:201
 #, c-format
 msgid ""
 "You have one big Microsoft Windows partition.\n"
@@ -1306,72 +1311,72 @@ msgstr ""
 "Awgrymir eich bod yn newid maint y rhaniad\n"
 "(cliciwch arno, ac yna clicio \"Newid maint\"]"
 
-#: diskdrake/hd_gtk.pm:201
+#: diskdrake/hd_gtk.pm:203
 #, c-format
 msgid "Please click on a partition"
 msgstr "Cliciwch ar raniad"
 
-#: diskdrake/hd_gtk.pm:215 diskdrake/smbnfs_gtk.pm:63
+#: diskdrake/hd_gtk.pm:217 diskdrake/smbnfs_gtk.pm:63
 #, c-format
 msgid "Details"
 msgstr "Manylion"
 
-#: diskdrake/hd_gtk.pm:263
+#: diskdrake/hd_gtk.pm:265
 #, c-format
 msgid "No hard drives found"
 msgstr "Heb ganfod gyrwyr caled"
 
-#: diskdrake/hd_gtk.pm:290
+#: diskdrake/hd_gtk.pm:292
 #, c-format
 msgid "Unknown"
 msgstr "Anhysbys"
 
-#: diskdrake/hd_gtk.pm:352
+#: diskdrake/hd_gtk.pm:354
 #, c-format
 msgid "Ext3"
 msgstr "Ext3"
 
-#: diskdrake/hd_gtk.pm:352
+#: diskdrake/hd_gtk.pm:354
 #, c-format
 msgid "XFS"
 msgstr "XFS"
 
-#: diskdrake/hd_gtk.pm:352
+#: diskdrake/hd_gtk.pm:354
 #, c-format
 msgid "Swap"
 msgstr "Swap"
 
-#: diskdrake/hd_gtk.pm:352
+#: diskdrake/hd_gtk.pm:354
 #, c-format
 msgid "SunOS"
 msgstr "SunOS"
 
-#: diskdrake/hd_gtk.pm:352
+#: diskdrake/hd_gtk.pm:354
 #, c-format
 msgid "HFS"
 msgstr "HFS"
 
-#: diskdrake/hd_gtk.pm:352
+#: diskdrake/hd_gtk.pm:354
 #, c-format
 msgid "Windows"
 msgstr "Windows"
 
-#: diskdrake/hd_gtk.pm:353 services.pm:158
+#: diskdrake/hd_gtk.pm:355 services.pm:158
 #, c-format
 msgid "Other"
 msgstr "Arall"
 
-#: diskdrake/hd_gtk.pm:353 diskdrake/interactive.pm:1195
+#: diskdrake/hd_gtk.pm:355 diskdrake/interactive.pm:1195
 #, c-format
 msgid "Empty"
 msgstr "Gwag"
 
-#: diskdrake/hd_gtk.pm:357
+#: diskdrake/hd_gtk.pm:362
 #, c-format
 msgid "Filesystem types:"
 msgstr "Mathau o system ffeiliau:"
 
-#: diskdrake/hd_gtk.pm:381 diskdrake/interactive.pm:289
+#: diskdrake/hd_gtk.pm:383 diskdrake/interactive.pm:289
 #: diskdrake/interactive.pm:361 diskdrake/interactive.pm:510
 #: diskdrake/interactive.pm:694 diskdrake/interactive.pm:752
 #: diskdrake/interactive.pm:841 diskdrake/interactive.pm:883
@@ -1382,22 +1387,22 @@ msgstr "Mathau o system ffeiliau:"
 msgid "Warning"
 msgstr "Rhybudd"
 
-#: diskdrake/hd_gtk.pm:381
+#: diskdrake/hd_gtk.pm:383
 #, c-format
 msgid "This partition is already empty"
 msgstr "Mae'r rhaniad eisoes yn wag"
 
-#: diskdrake/hd_gtk.pm:390
+#: diskdrake/hd_gtk.pm:392
 #, c-format
 msgid "Use ``Unmount'' first"
 msgstr "Defnyddiwch \"Dadarosod\" yn gyntaf"
 
-#: diskdrake/hd_gtk.pm:390
+#: diskdrake/hd_gtk.pm:392
 #, c-format
 msgid "Use ``%s'' instead (in expert mode)"
 msgstr "Defnyddiwch \"%s\" yn lle hynny (modd arbenigwr)"
 
-#: diskdrake/hd_gtk.pm:390 diskdrake/interactive.pm:374
+#: diskdrake/hd_gtk.pm:392 diskdrake/interactive.pm:374
 #: diskdrake/interactive.pm:548 diskdrake/interactive.pm:1026
 #: diskdrake/removable.pm:25 diskdrake/removable.pm:48
 #, c-format
@@ -2123,8 +2128,8 @@ msgstr "Newid y math"
 
 #: diskdrake/smbnfs_gtk.pm:81 interactive.pm:126 interactive.pm:543
 #: interactive/curses.pm:260 interactive/http.pm:104 interactive/http.pm:160
-#: interactive/stdio.pm:39 interactive/stdio.pm:148 ugtk2.pm:409 ugtk2.pm:511
-#: ugtk2.pm:520 ugtk2.pm:803
+#: interactive/stdio.pm:39 interactive/stdio.pm:148 ugtk2.pm:411 ugtk2.pm:513
+#: ugtk2.pm:522 ugtk2.pm:807
 #, c-format
 msgid "Cancel"
 msgstr "Diddymu"
@@ -2198,12 +2203,12 @@ msgstr "Mae pecyn gorfodol %s ar goll"
 msgid "The following packages need to be installed:\n"
 msgstr "Mae'r pecynnau canlynol angen eu gosod:\n"
 
-#: do_pkgs.pm:220
+#: do_pkgs.pm:221
 #, c-format
 msgid "Installing packages..."
 msgstr "Gosod pecynnau..."
 
-#: do_pkgs.pm:262
+#: do_pkgs.pm:267
 #, c-format
 msgid "Removing packages..."
 msgstr "Tynnu pecyn..."
@@ -2570,7 +2575,7 @@ msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: fs/partitioning_wizard.pm:165 interactive.pm:542 interactive/curses.pm:263
-#: ugtk2.pm:513
+#: ugtk2.pm:515
 #, c-format
 msgid "Next"
 msgstr "Nesaf"
@@ -3304,18 +3309,18 @@ msgstr "Math o diwniwr:"
 
 #: interactive.pm:125 interactive.pm:542 interactive/curses.pm:263
 #: interactive/http.pm:103 interactive/http.pm:156 interactive/stdio.pm:39
-#: interactive/stdio.pm:148 interactive/stdio.pm:149 ugtk2.pm:415 ugtk2.pm:513
-#: ugtk2.pm:803 ugtk2.pm:826
+#: interactive/stdio.pm:148 interactive/stdio.pm:149 ugtk2.pm:417 ugtk2.pm:515
+#: ugtk2.pm:807 ugtk2.pm:830
 #, c-format
 msgid "Ok"
 msgstr "Iawn"
 
-#: interactive.pm:224 modules/interactive.pm:71 ugtk2.pm:802 wizards.pm:156
+#: interactive.pm:224 modules/interactive.pm:71 ugtk2.pm:806 wizards.pm:156
 #, c-format
 msgid "Yes"
 msgstr "Iawn"
 
-#: interactive.pm:224 modules/interactive.pm:71 ugtk2.pm:802 wizards.pm:156
+#: interactive.pm:224 modules/interactive.pm:71 ugtk2.pm:806 wizards.pm:156
 #, c-format
 msgid "No"
 msgstr "Na"
@@ -3325,32 +3330,32 @@ msgstr "Na"
 msgid "Choose a file"
 msgstr "Dewis ffeil"
 
-#: interactive.pm:383 interactive/gtk.pm:420
+#: interactive.pm:383 interactive/gtk.pm:428
 #, c-format
 msgid "Add"
 msgstr "Ychwanegu"
 
-#: interactive.pm:383 interactive/gtk.pm:420
+#: interactive.pm:383 interactive/gtk.pm:428
 #, c-format
 msgid "Modify"
 msgstr "Newid"
 
-#: interactive.pm:383 interactive/gtk.pm:420
+#: interactive.pm:383 interactive/gtk.pm:428
 #, c-format
 msgid "Remove"
 msgstr "Tynnu"
 
-#: interactive.pm:542 interactive/curses.pm:263 ugtk2.pm:513
+#: interactive.pm:542 interactive/curses.pm:263 ugtk2.pm:515
 #, c-format
 msgid "Finish"
 msgstr "Gorffen"
 
-#: interactive.pm:543 interactive/curses.pm:260 ugtk2.pm:511
+#: interactive.pm:543 interactive/curses.pm:260 ugtk2.pm:513
 #, c-format
 msgid "Previous"
 msgstr "Blaenorol"
 
-#: interactive/gtk.pm:548
+#: interactive/gtk.pm:556
 #, c-format
 msgid "Beware, Caps Lock is enabled"
 msgstr "Gwyliwch, Mae Caps Lock ymlaen"
@@ -6467,7 +6472,7 @@ msgid ""
 "about this service, sorry."
 msgstr "Dim gwybodaeth ychwanegol am y gwasanaeth hwn."
 
-#: services.pm:221 ugtk2.pm:913
+#: services.pm:221 ugtk2.pm:917
 #, c-format
 msgid "Info"
 msgstr "Gwybodaeth"
@@ -6802,47 +6807,47 @@ msgstr "Cyfundeb Rwsia"
 msgid "Yugoslavia"
 msgstr "Iwgoslafia"
 
-#: ugtk2.pm:803
+#: ugtk2.pm:807
 #, c-format
 msgid "Is this correct?"
 msgstr "Ydi hyn yn gywir?"
 
-#: ugtk2.pm:863
+#: ugtk2.pm:867
 #, c-format
 msgid "No file chosen"
 msgstr "Heb ddewis ffeil"
 
-#: ugtk2.pm:865
+#: ugtk2.pm:869
 #, c-format
 msgid "You have chosen a file, not a directory"
 msgstr "Rydych wedi dewis ffeil, nid cyfeiriadur"
 
-#: ugtk2.pm:867
+#: ugtk2.pm:871
 #, c-format
 msgid "You have chosen a directory, not a file"
 msgstr "Rydych wedi dewis cyfeiriadur, nid ffeil"
 
-#: ugtk2.pm:869
+#: ugtk2.pm:873
 #, c-format
 msgid "No such directory"
 msgstr "Dim cyfeiriadur o'r fath ar gael"
 
-#: ugtk2.pm:869
+#: ugtk2.pm:873
 #, c-format
 msgid "No such file"
 msgstr "Dim ffeil o'r fath ar gael"
 
-#: ugtk2.pm:948
+#: ugtk2.pm:952
 #, c-format
 msgid "Expand Tree"
 msgstr "Estyn y goeden"
 
-#: ugtk2.pm:949
+#: ugtk2.pm:953
 #, c-format
 msgid "Collapse Tree"
 msgstr "Cau'r goeden"
 
-#: ugtk2.pm:950
+#: ugtk2.pm:954
 #, c-format
 msgid "Toggle between flat and group sorted"
 msgstr "Newid rhwng gwastad a'r grŵp wedi ei ddidoli"
@@ -6861,6 +6866,9 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Methodd y gosod"
 
+#~ msgid "Choose action"
+#~ msgstr "Dewiswch weithred"
+
 #~ msgid "Active Directory with SFU"
 #~ msgstr "Cyfeiriadur byw gyda SFU"