summaryrefslogtreecommitdiffstats
path: root/perl-install/share/po
diff options
context:
space:
mode:
authorPablo Saratxaga <pablo@mandriva.com>2002-09-03 05:13:58 +0000
committerPablo Saratxaga <pablo@mandriva.com>2002-09-03 05:13:58 +0000
commitf833b05a6fcb54bf64bacaedb4c3ce3c698c2ef5 (patch)
tree323e0711217fa369507498307a06308d0680f53c /perl-install/share/po
parent539a27ec80d473c981454a685d37ee9ceb95dd32 (diff)
downloaddrakx-f833b05a6fcb54bf64bacaedb4c3ce3c698c2ef5.tar
drakx-f833b05a6fcb54bf64bacaedb4c3ce3c698c2ef5.tar.gz
drakx-f833b05a6fcb54bf64bacaedb4c3ce3c698c2ef5.tar.bz2
drakx-f833b05a6fcb54bf64bacaedb4c3ce3c698c2ef5.tar.xz
drakx-f833b05a6fcb54bf64bacaedb4c3ce3c698c2ef5.zip
updated Chinese file
Diffstat (limited to 'perl-install/share/po')
-rw-r--r--perl-install/share/po/zh_CN.po5077
1 files changed, 2618 insertions, 2459 deletions
diff --git a/perl-install/share/po/zh_CN.po b/perl-install/share/po/zh_CN.po
index d9520eaf8..5c3d2128f 100644
--- a/perl-install/share/po/zh_CN.po
+++ b/perl-install/share/po/zh_CN.po
@@ -1,22 +1,20 @@
# drakbootdisk messages in Simplified Chinese
# Copyright (C) 2000 Free Software Foundation, Inc.
-#
-# Jesse Kuang <kjx@mandrakesoft.com>, 2002
# Danny Zeng <danny@zeng.com.cn>, 2000, 2002
-#
-# Last translator
# Jesse Kuang <kjx@mandrakesoft.com>, 2002
#
+#
msgid ""
msgstr ""
"Project-Id-Version: DrakX 9.0\n"
-"POT-Creation-Date: 2002-08-21 15:44+0200\n"
-"PO-Revision-Date: 2002-08-15 22:30+0800\n"
+"POT-Creation-Date: 2002-09-02 20:14+0200\n"
+"PO-Revision-Date: 2002-09-03 11:55+0800\n"
"Last-Translator: Danny Zeng <danny@zeng.com.cn>\n"
-"Language-Team: Chinese <future-cjk@mandrakesoft.com>\n"
+"Language-Team: Simplified Chinese <zh@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=gb2312\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 0.9.5\n"
#: ../../Xconfig/card.pm_.c:16
msgid "256 kB"
@@ -54,19 +52,19 @@ msgstr "32 MB"
msgid "64 MB or more"
msgstr "64 MB ������"
-#: ../../Xconfig/card.pm_.c:201
+#: ../../Xconfig/card.pm_.c:203
msgid "Choose a X server"
msgstr "��ѡ��һ�� X ������"
-#: ../../Xconfig/card.pm_.c:201
+#: ../../Xconfig/card.pm_.c:203
msgid "X server"
msgstr "X ������"
-#: ../../Xconfig/card.pm_.c:228
+#: ../../Xconfig/card.pm_.c:230
msgid "Multi-head configuration"
msgstr "����ʾ������"
-#: ../../Xconfig/card.pm_.c:229
+#: ../../Xconfig/card.pm_.c:231
msgid ""
"Your system support multiple head configuration.\n"
"What do you want to do?"
@@ -74,27 +72,27 @@ msgstr ""
"����ϵͳ֧�ֶ���ʾ��.\n"
"�Ƿ��������?"
-#: ../../Xconfig/card.pm_.c:284
+#: ../../Xconfig/card.pm_.c:286
msgid "Select the memory size of your graphics card"
msgstr "��ѡ������ʾ�����ڴ�Ĵ�С"
-#: ../../Xconfig/card.pm_.c:345
+#: ../../Xconfig/card.pm_.c:347
msgid "XFree configuration"
msgstr "XFree ����"
-#: ../../Xconfig/card.pm_.c:347
+#: ../../Xconfig/card.pm_.c:349
msgid "Which configuration of XFree do you want to have?"
msgstr "��ϣ��ӵ���ĸ� XFree ����?"
-#: ../../Xconfig/card.pm_.c:379
+#: ../../Xconfig/card.pm_.c:381
msgid "Configure all heads independently"
msgstr "����������ʾ��"
-#: ../../Xconfig/card.pm_.c:380
+#: ../../Xconfig/card.pm_.c:382
msgid "Use Xinerama extension"
msgstr "ʹ�� Xinerama ��չ"
-#: ../../Xconfig/card.pm_.c:384
+#: ../../Xconfig/card.pm_.c:386
#, c-format
msgid "Configure only card \"%s\"%s"
msgstr "ֻ���� \"%s\"%s ��"
@@ -105,13 +103,13 @@ msgstr "ֻ���� \"%s\"%s ��"
msgid "XFree %s"
msgstr "XFree %s"
-#: ../../Xconfig/card.pm_.c:409 ../../Xconfig/card.pm_.c:435
+#: ../../Xconfig/card.pm_.c:410 ../../Xconfig/card.pm_.c:436
#: ../../Xconfig/various.pm_.c:23
#, c-format
msgid "XFree %s with 3D hardware acceleration"
msgstr "XFree %s ����Ӳ�� 3D ���ٵ�֧��"
-#: ../../Xconfig/card.pm_.c:412
+#: ../../Xconfig/card.pm_.c:413
#, c-format
msgid ""
"Your card can have 3D hardware acceleration support but only with XFree %s.\n"
@@ -120,17 +118,17 @@ msgstr ""
"ʹ�� XFree %s, ������ʾ�����Եõ� 3D Ӳ������֧��.\n"
"XFree %s ֧��������ʾ��, �����ṩ���õ� 2D ֧��."
-#: ../../Xconfig/card.pm_.c:414 ../../Xconfig/card.pm_.c:437
+#: ../../Xconfig/card.pm_.c:415 ../../Xconfig/card.pm_.c:438
#, c-format
msgid "Your card can have 3D hardware acceleration support with XFree %s."
msgstr "ʹ�� XFree %s, ������ʾ�����Եõ� 3D Ӳ������֧��."
-#: ../../Xconfig/card.pm_.c:422 ../../Xconfig/card.pm_.c:443
+#: ../../Xconfig/card.pm_.c:423 ../../Xconfig/card.pm_.c:444
#, c-format
msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
msgstr "XFree %s ��������׶ε�3DӲ������֧��"
-#: ../../Xconfig/card.pm_.c:425
+#: ../../Xconfig/card.pm_.c:426
#, c-format
msgid ""
"Your card can have 3D hardware acceleration support but only with XFree %s,\n"
@@ -141,7 +139,7 @@ msgstr ""
"ע����������׶ε�֧��, �����ܻ�ʹ���ĵ���ʧȥ��Ӧ\n"
"XFree %s ֧��������ʾ��, �����ṩ���õ� 2D ֧��."
-#: ../../Xconfig/card.pm_.c:428 ../../Xconfig/card.pm_.c:445
+#: ../../Xconfig/card.pm_.c:429 ../../Xconfig/card.pm_.c:446
#, c-format
msgid ""
"Your card can have 3D hardware acceleration support with XFree %s,\n"
@@ -150,52 +148,53 @@ msgstr ""
"ʹ�� XFree %s, ������ʾ�����Եõ� 3D Ӳ������֧��.\n"
"ע����������׶ε�֧��, �����ܻ�ʹ���ĵ���ʧȥ��Ӧ."
-#: ../../Xconfig/card.pm_.c:451
+#: ../../Xconfig/card.pm_.c:452
msgid "Xpmac (installation display driver)"
msgstr "Xpmac (��װ�Կ�����)"
-#: ../../Xconfig/main.pm_.c:78 ../../Xconfig/main.pm_.c:79
-#: ../../Xconfig/monitor.pm_.c:94 ../../any.pm_.c:974
+#: ../../Xconfig/main.pm_.c:76 ../../Xconfig/main.pm_.c:77
+#: ../../Xconfig/monitor.pm_.c:96 ../../any.pm_.c:977
msgid "Custom"
msgstr "����"
-#: ../../Xconfig/main.pm_.c:104
+#: ../../Xconfig/main.pm_.c:102
msgid "Graphic Card"
msgstr "ͼ�ο�"
-#: ../../Xconfig/main.pm_.c:107 ../../Xconfig/monitor.pm_.c:91
+#: ../../Xconfig/main.pm_.c:105 ../../Xconfig/monitor.pm_.c:93
msgid "Monitor"
msgstr "��ʾ��"
-#: ../../Xconfig/main.pm_.c:110 ../../Xconfig/resolution_and_depth.pm_.c:209
+#: ../../Xconfig/main.pm_.c:108 ../../Xconfig/resolution_and_depth.pm_.c:209
msgid "Resolution"
msgstr "��Ļ�ֱ���"
-#: ../../Xconfig/main.pm_.c:114
+#: ../../Xconfig/main.pm_.c:113
msgid "Test"
msgstr "����"
-#: ../../Xconfig/main.pm_.c:118 ../../diskdrake/dav.pm_.c:59
-#: ../../diskdrake/interactive.pm_.c:377 ../../diskdrake/removable.pm_.c:25
+#: ../../Xconfig/main.pm_.c:118 ../../diskdrake/dav.pm_.c:63
+#: ../../diskdrake/interactive.pm_.c:381 ../../diskdrake/removable.pm_.c:25
#: ../../diskdrake/removable_gtk.pm_.c:16 ../../diskdrake/smbnfs_gtk.pm_.c:86
msgid "Options"
msgstr "ѡ��"
#: ../../Xconfig/main.pm_.c:121 ../../Xconfig/resolution_and_depth.pm_.c:268
-#: ../../install_gtk.pm_.c:79 ../../install_steps_gtk.pm_.c:281
+#: ../../install_gtk.pm_.c:79 ../../install_steps_gtk.pm_.c:275
#: ../../interactive.pm_.c:127 ../../interactive.pm_.c:142
-#: ../../interactive.pm_.c:351 ../../interactive/http.pm_.c:104
+#: ../../interactive.pm_.c:354 ../../interactive/http.pm_.c:104
#: ../../interactive/newt.pm_.c:174 ../../interactive/newt.pm_.c:176
#: ../../interactive/stdio.pm_.c:39 ../../interactive/stdio.pm_.c:143
-#: ../../interactive/stdio.pm_.c:144 ../../my_gtk.pm_.c:156
-#: ../../my_gtk.pm_.c:284 ../../my_gtk.pm_.c:307
-#: ../../standalone/drakbackup_.c:3324 ../../standalone/drakbackup_.c:3419
-#: ../../standalone/drakbackup_.c:3438
+#: ../../interactive/stdio.pm_.c:144 ../../my_gtk.pm_.c:159
+#: ../../my_gtk.pm_.c:287 ../../my_gtk.pm_.c:310
+#: ../../standalone/drakbackup_.c:3972 ../../standalone/drakbackup_.c:4067
+#: ../../standalone/drakbackup_.c:4086
msgid "Ok"
msgstr "ȷ��"
#: ../../Xconfig/main.pm_.c:121 ../../diskdrake/dav.pm_.c:24
-#: ../../printerdrake.pm_.c:2933 ../../standalone/logdrake_.c:224
+#: ../../harddrake/ui.pm_.c:98 ../../printerdrake.pm_.c:3155
+#: ../../standalone/logdrake_.c:224
msgid "Quit"
msgstr "����"
@@ -212,27 +211,27 @@ msgstr ""
"\n"
"%s"
-#: ../../Xconfig/monitor.pm_.c:91
+#: ../../Xconfig/monitor.pm_.c:93
msgid "Choose a monitor"
msgstr "��ѡ��һ����ʾ��"
-#: ../../Xconfig/monitor.pm_.c:95
+#: ../../Xconfig/monitor.pm_.c:97
msgid "Plug'n Play"
msgstr "���弴��"
-#: ../../Xconfig/monitor.pm_.c:96 ../../mouse.pm_.c:45
+#: ../../Xconfig/monitor.pm_.c:98 ../../mouse.pm_.c:46
msgid "Generic"
msgstr "��ͨ"
-#: ../../Xconfig/monitor.pm_.c:97 ../../harddrake/ui.pm_.c:36
+#: ../../Xconfig/monitor.pm_.c:99 ../../harddrake/ui.pm_.c:37
msgid "Vendor"
msgstr "����"
-#: ../../Xconfig/monitor.pm_.c:107
+#: ../../Xconfig/monitor.pm_.c:109
msgid "Plug'n Play probing failed. Please choose a precise monitor"
-msgstr ""
+msgstr "���弴�ü��ʧ��. ����ȷѡ��һ����ʾ��"
-#: ../../Xconfig/monitor.pm_.c:112
+#: ../../Xconfig/monitor.pm_.c:114
msgid ""
"The two critical parameters are the vertical refresh rate, which is the "
"rate\n"
@@ -253,11 +252,11 @@ msgstr ""
"��ǡ�������ÿ��ܻ���������ʾ��!\n"
"����û����ʱ, ������ѡ���ص��趨."
-#: ../../Xconfig/monitor.pm_.c:119
+#: ../../Xconfig/monitor.pm_.c:121
msgid "Horizontal refresh rate"
msgstr "ˮƽ����Ƶ��"
-#: ../../Xconfig/monitor.pm_.c:120
+#: ../../Xconfig/monitor.pm_.c:122
msgid "Vertical refresh rate"
msgstr "��ֱ����Ƶ��"
@@ -294,36 +293,40 @@ msgstr "ѡȡ��Ļ�ֱ����Լ���ɫ���"
msgid "Graphics card: %s"
msgstr "��ʾ��: %s"
-#: ../../Xconfig/resolution_and_depth.pm_.c:268 ../../any.pm_.c:1015
-#: ../../bootlook.pm_.c:334 ../../diskdrake/smbnfs_gtk.pm_.c:87
-#: ../../install_steps_gtk.pm_.c:412 ../../install_steps_gtk.pm_.c:470
-#: ../../install_steps_interactive.pm_.c:576 ../../interactive.pm_.c:142
-#: ../../interactive.pm_.c:351 ../../interactive/http.pm_.c:105
+#: ../../Xconfig/resolution_and_depth.pm_.c:268 ../../any.pm_.c:1018
+#: ../../bootlook.pm_.c:338 ../../diskdrake/smbnfs_gtk.pm_.c:87
+#: ../../install_steps_gtk.pm_.c:406 ../../install_steps_gtk.pm_.c:464
+#: ../../install_steps_interactive.pm_.c:560 ../../interactive.pm_.c:142
+#: ../../interactive.pm_.c:354 ../../interactive/http.pm_.c:105
#: ../../interactive/newt.pm_.c:174 ../../interactive/stdio.pm_.c:39
-#: ../../interactive/stdio.pm_.c:143 ../../my_gtk.pm_.c:155
-#: ../../my_gtk.pm_.c:159 ../../my_gtk.pm_.c:284
-#: ../../network/netconnect.pm_.c:46 ../../printerdrake.pm_.c:1990
-#: ../../standalone/drakautoinst_.c:203 ../../standalone/drakbackup_.c:3278
-#: ../../standalone/drakbackup_.c:3311 ../../standalone/drakbackup_.c:3337
-#: ../../standalone/drakbackup_.c:3364 ../../standalone/drakbackup_.c:3391
-#: ../../standalone/drakbackup_.c:3451 ../../standalone/drakbackup_.c:3478
-#: ../../standalone/drakbackup_.c:3504 ../../standalone/drakconnect_.c:115
-#: ../../standalone/drakconnect_.c:147 ../../standalone/drakconnect_.c:289
-#: ../../standalone/drakconnect_.c:537 ../../standalone/drakconnect_.c:679
-#: ../../standalone/drakfloppy_.c:234 ../../standalone/drakfloppy_.c:383
-#: ../../standalone/drakfont_.c:970 ../../standalone/drakgw_.c:598
-#: ../../standalone/logdrake_.c:224 ../../standalone/logdrake_.c:528
-#: ../../standalone/tinyfirewall_.c:64
+#: ../../interactive/stdio.pm_.c:143 ../../my_gtk.pm_.c:158
+#: ../../my_gtk.pm_.c:162 ../../my_gtk.pm_.c:287
+#: ../../network/netconnect.pm_.c:46 ../../printerdrake.pm_.c:2124
+#: ../../standalone/drakautoinst_.c:203 ../../standalone/drakbackup_.c:3926
+#: ../../standalone/drakbackup_.c:3959 ../../standalone/drakbackup_.c:3985
+#: ../../standalone/drakbackup_.c:4012 ../../standalone/drakbackup_.c:4039
+#: ../../standalone/drakbackup_.c:4099 ../../standalone/drakbackup_.c:4126
+#: ../../standalone/drakbackup_.c:4156 ../../standalone/drakbackup_.c:4182
+#: ../../standalone/drakconnect_.c:115 ../../standalone/drakconnect_.c:147
+#: ../../standalone/drakconnect_.c:289 ../../standalone/drakconnect_.c:537
+#: ../../standalone/drakconnect_.c:679 ../../standalone/drakfloppy_.c:234
+#: ../../standalone/drakfloppy_.c:383 ../../standalone/drakfont_.c:970
+#: ../../standalone/drakgw_.c:536 ../../standalone/logdrake_.c:224
+#: ../../standalone/logdrake_.c:526
msgid "Cancel"
msgstr "ȡ��"
-#: ../../Xconfig/test.pm_.c:26
+#: ../../Xconfig/test.pm_.c:30
+msgid "Test of the configuration"
+msgstr "�����趨ֵ"
+
+#: ../../Xconfig/test.pm_.c:31
msgid "Do you want to test the configuration?"
msgstr "����Ҫ���������趨ֵ�� ?"
-#: ../../Xconfig/test.pm_.c:26
-msgid "Test of the configuration"
-msgstr "�����趨ֵ"
+#: ../../Xconfig/test.pm_.c:31
+msgid "Warning: testing this graphic card may freeze your computer"
+msgstr "����: �������ͼ�ο����ܻ��������ĵ���"
#: ../../Xconfig/various.pm_.c:29
#, c-format
@@ -465,26 +468,22 @@ msgstr "��DOS/Windows����"
msgid "Yaboot"
msgstr "������"
-#: ../../any.pm_.c:158 ../../any.pm_.c:190
+#: ../../any.pm_.c:159 ../../any.pm_.c:190
msgid "Bootloader main options"
msgstr "���������������Ҫѡ��"
-#: ../../any.pm_.c:159 ../../any.pm_.c:191
+#: ../../any.pm_.c:160 ../../any.pm_.c:191
msgid "Bootloader to use"
msgstr "������������"
-#: ../../any.pm_.c:161
+#: ../../any.pm_.c:162
msgid "Bootloader installation"
msgstr "������������װ"
-#: ../../any.pm_.c:163 ../../any.pm_.c:193
+#: ../../any.pm_.c:164 ../../any.pm_.c:193
msgid "Boot device"
msgstr "���������豸"
-#: ../../any.pm_.c:164
-msgid "LBA (doesn't work on old BIOSes)"
-msgstr "LBA (���Ͼɵ� BIOS �ϲ��ܹ���)"
-
#: ../../any.pm_.c:165
msgid "Compact"
msgstr "����"
@@ -501,16 +500,17 @@ msgstr "��ʾģʽ"
msgid "Delay before booting default image"
msgstr "�����Ⱥ�ʱ��"
-#: ../../any.pm_.c:170 ../../any.pm_.c:786
+#: ../../any.pm_.c:170 ../../any.pm_.c:788
#: ../../diskdrake/smbnfs_gtk.pm_.c:179
-#: ../../install_steps_interactive.pm_.c:1111 ../../network/modem.pm_.c:48
-#: ../../printerdrake.pm_.c:743 ../../printerdrake.pm_.c:858
-#: ../../standalone/drakconnect_.c:624 ../../standalone/drakconnect_.c:649
+#: ../../install_steps_interactive.pm_.c:1096 ../../network/modem.pm_.c:48
+#: ../../printerdrake.pm_.c:850 ../../printerdrake.pm_.c:965
+#: ../../standalone/drakbackup_.c:3528 ../../standalone/drakconnect_.c:624
+#: ../../standalone/drakconnect_.c:649
msgid "Password"
msgstr "����"
-#: ../../any.pm_.c:171 ../../any.pm_.c:787
-#: ../../install_steps_interactive.pm_.c:1112
+#: ../../any.pm_.c:171 ../../any.pm_.c:789
+#: ../../install_steps_interactive.pm_.c:1097
msgid "Password (again)"
msgstr "���� (��һ��)"
@@ -544,14 +544,14 @@ msgid ""
"Option ``Restrict command line options'' is of no use without a password"
msgstr "û�п����ʹ�� ``�޶�����ѡ��''"
-#: ../../any.pm_.c:184 ../../any.pm_.c:762
-#: ../../diskdrake/interactive.pm_.c:1180
-#: ../../install_steps_interactive.pm_.c:1106
+#: ../../any.pm_.c:184 ../../any.pm_.c:764
+#: ../../diskdrake/interactive.pm_.c:1191
+#: ../../install_steps_interactive.pm_.c:1091
msgid "Please try again"
msgstr "������һ��"
-#: ../../any.pm_.c:184 ../../any.pm_.c:762
-#: ../../install_steps_interactive.pm_.c:1106
+#: ../../any.pm_.c:184 ../../any.pm_.c:764
+#: ../../install_steps_interactive.pm_.c:1091
msgid "The passwords do not match"
msgstr "���ο����"
@@ -601,16 +601,16 @@ msgstr ""
"������������Ŀ.\n"
"���������ӻ��Ǹ����Ѵ��ڵ���Ŀ"
-#: ../../any.pm_.c:257 ../../standalone/drakbackup_.c:1483
-#: ../../standalone/drakbackup_.c:1596 ../../standalone/drakfont_.c:1011
+#: ../../any.pm_.c:257 ../../standalone/drakbackup_.c:1558
+#: ../../standalone/drakbackup_.c:1671 ../../standalone/drakfont_.c:1011
#: ../../standalone/drakfont_.c:1054
msgid "Add"
msgstr "����"
-#: ../../any.pm_.c:257 ../../any.pm_.c:774 ../../diskdrake/dav.pm_.c:60
+#: ../../any.pm_.c:257 ../../any.pm_.c:776 ../../diskdrake/dav.pm_.c:64
#: ../../diskdrake/hd_gtk.pm_.c:153 ../../diskdrake/removable.pm_.c:27
#: ../../diskdrake/smbnfs_gtk.pm_.c:88 ../../interactive/http.pm_.c:153
-#: ../../standalone/drakbackup_.c:2696
+#: ../../printerdrake.pm_.c:3155 ../../standalone/drakbackup_.c:2772
msgid "Done"
msgstr "���"
@@ -622,7 +622,7 @@ msgstr "�޸�"
msgid "Which type of entry do you want to add?"
msgstr "Ҫ���ӵ���Ŀ��ʲô����?"
-#: ../../any.pm_.c:266 ../../standalone/drakbackup_.c:1630
+#: ../../any.pm_.c:266 ../../standalone/drakbackup_.c:1705
msgid "Linux"
msgstr "Linux"
@@ -716,13 +716,13 @@ msgstr "������������ ?"
msgid "Do you have any %s interfaces?"
msgstr "���������� %s �ӿ��� ?"
-#: ../../any.pm_.c:660 ../../any.pm_.c:821 ../../interactive.pm_.c:132
-#: ../../my_gtk.pm_.c:283
+#: ../../any.pm_.c:660 ../../any.pm_.c:823 ../../interactive.pm_.c:132
+#: ../../my_gtk.pm_.c:286
msgid "No"
msgstr "��"
-#: ../../any.pm_.c:660 ../../any.pm_.c:820 ../../interactive.pm_.c:132
-#: ../../my_gtk.pm_.c:283
+#: ../../any.pm_.c:660 ../../any.pm_.c:822 ../../interactive.pm_.c:132
+#: ../../my_gtk.pm_.c:286
msgid "Yes"
msgstr "��"
@@ -821,37 +821,45 @@ msgstr "����ʹ��\"su\"ָ��"
msgid "access to administrative files"
msgstr "��������ϵͳ�����ļ�"
-#: ../../any.pm_.c:758
+#: ../../any.pm_.c:754
+msgid "access to network tools"
+msgstr "����ʹ�����繤��"
+
+#: ../../any.pm_.c:755
+msgid "access to compilation tools"
+msgstr "����ʹ�ñ��빤��"
+
+#: ../../any.pm_.c:760
#, c-format
msgid "(already added %s)"
msgstr "(�Ѿ������� %s)"
-#: ../../any.pm_.c:763
+#: ../../any.pm_.c:765
msgid "This password is too simple"
msgstr "����̫��"
-#: ../../any.pm_.c:764
+#: ../../any.pm_.c:766
msgid "Please give a user name"
msgstr "������й��û���"
-#: ../../any.pm_.c:765
+#: ../../any.pm_.c:767
msgid ""
"The user name must contain only lower cased letters, numbers, `-' and `_'"
msgstr "�û���ֻ����Сд��ĸ�����֣�`-' �� `_'"
-#: ../../any.pm_.c:766
+#: ../../any.pm_.c:768
msgid "The user name is too long"
msgstr "���û���̫��"
-#: ../../any.pm_.c:767
+#: ../../any.pm_.c:769
msgid "This user name is already added"
msgstr "���û����Ѿ�����"
-#: ../../any.pm_.c:771
+#: ../../any.pm_.c:773
msgid "Add user"
msgstr "�������û�"
-#: ../../any.pm_.c:772
+#: ../../any.pm_.c:774
#, c-format
msgid ""
"Enter a user\n"
@@ -860,32 +868,32 @@ msgstr ""
"������һ���û���\n"
"%s"
-#: ../../any.pm_.c:773
+#: ../../any.pm_.c:775
msgid "Accept user"
msgstr "���ܸ��û�"
-#: ../../any.pm_.c:784
+#: ../../any.pm_.c:786
msgid "Real name"
msgstr "�û���ʵ����"
-#: ../../any.pm_.c:785 ../../printerdrake.pm_.c:742
-#: ../../printerdrake.pm_.c:857
+#: ../../any.pm_.c:787 ../../printerdrake.pm_.c:849
+#: ../../printerdrake.pm_.c:964
msgid "User name"
msgstr "�û���¼��"
-#: ../../any.pm_.c:788
+#: ../../any.pm_.c:790
msgid "Shell"
msgstr "Shell"
-#: ../../any.pm_.c:790
+#: ../../any.pm_.c:792
msgid "Icon"
msgstr "ͼ��"
-#: ../../any.pm_.c:817
+#: ../../any.pm_.c:819
msgid "Autologin"
msgstr "�Զ���¼"
-#: ../../any.pm_.c:818
+#: ../../any.pm_.c:820
msgid ""
"I can set up your computer to automatically log on one user.\n"
"Do you want to use this feature?"
@@ -893,54 +901,54 @@ msgstr ""
"�������������趨����ʱ�Զ���ij�û������ݵ���ϵͳ.\n"
"��ϣ��ʹ����������� ?"
-#: ../../any.pm_.c:822
+#: ../../any.pm_.c:824
msgid "Choose the default user:"
msgstr "ѡ��ȱʡ���û�:"
-#: ../../any.pm_.c:823
+#: ../../any.pm_.c:825
msgid "Choose the window manager to run:"
msgstr "ѡ��Ҫ���еĴ��ڹ�������:"
-#: ../../any.pm_.c:838
+#: ../../any.pm_.c:840
msgid "Please choose a language to use."
msgstr "��ѡ��ϵͳȱʡʹ�õ�����."
-#: ../../any.pm_.c:840
+#: ../../any.pm_.c:842
msgid ""
"Mandrake Linux can support multiple languages. Select\n"
"the languages you would like to install. They will be available\n"
"when your installation is complete and you restart your system."
msgstr "����������������ϵͳ���������õ�����"
-#: ../../any.pm_.c:854 ../../install_steps_interactive.pm_.c:708
+#: ../../any.pm_.c:856 ../../install_steps_interactive.pm_.c:692
#: ../../standalone/drakxtv_.c:73
msgid "All"
msgstr "ȫ��"
-#: ../../any.pm_.c:974
+#: ../../any.pm_.c:977
msgid "Allow all users"
msgstr "���������û�ʹ��"
-#: ../../any.pm_.c:974
+#: ../../any.pm_.c:977
msgid "No sharing"
msgstr "��ֹ����"
-#: ../../any.pm_.c:984 ../../standalone.pm_.c:57
+#: ../../any.pm_.c:987 ../../install_any.pm_.c:1183 ../../standalone.pm_.c:58
#, c-format
msgid "The package %s needs to be installed. Do you want to install it?"
msgstr "��Ҫ��װ������ %s .��ͬ�ⰲװ�� ?"
-#: ../../any.pm_.c:987
+#: ../../any.pm_.c:990
msgid ""
"You can export using NFS or Samba. Please select which you'd like to use."
msgstr "������ͨ�� NFS �� Samba �������ļ�. ��ϣ��ʹ����һ��? "
-#: ../../any.pm_.c:995 ../../standalone.pm_.c:61
+#: ../../any.pm_.c:998 ../../install_any.pm_.c:1188 ../../standalone.pm_.c:63
#, c-format
msgid "Mandatory package %s is missing"
msgstr "�޷��ҵ������������ %s"
-#: ../../any.pm_.c:1001
+#: ../../any.pm_.c:1004
msgid ""
"Would you like to allow users to share some of their directories?\n"
"Allowing this will permit users to simply click on \"Share\" in konqueror "
@@ -952,11 +960,11 @@ msgstr ""
"������ѡ������, �û��������� KDE �� Gnome ���ļ��������е�� \"����\"�˵���\n"
"\"����\" �������ղ�ͬ�û�ϸ������.\n"
-#: ../../any.pm_.c:1015
+#: ../../any.pm_.c:1018
msgid "Launch userdrake"
msgstr "���� Userdrakeħ���û�����"
-#: ../../any.pm_.c:1017
+#: ../../any.pm_.c:1020
msgid ""
"The per-user sharing uses the group \"fileshare\". \n"
"You can use userdrake to add a user in this group."
@@ -964,31 +972,31 @@ msgstr ""
"���û��Ĺ���ʹ����\"fileshare\". \n"
"������ʹ�� userdrake ����һ���û��������."
-#: ../../any.pm_.c:1068
+#: ../../any.pm_.c:1071
msgid "Welcome To Crackers"
msgstr "��ӭ������"
-#: ../../any.pm_.c:1069
+#: ../../any.pm_.c:1072
msgid "Poor"
msgstr "��"
-#: ../../any.pm_.c:1070 ../../mouse.pm_.c:31
+#: ../../any.pm_.c:1073 ../../mouse.pm_.c:31
msgid "Standard"
msgstr "��׼"
-#: ../../any.pm_.c:1071
+#: ../../any.pm_.c:1074
msgid "High"
msgstr "��"
-#: ../../any.pm_.c:1072
+#: ../../any.pm_.c:1075
msgid "Higher"
msgstr "����"
-#: ../../any.pm_.c:1073
+#: ../../any.pm_.c:1076
msgid "Paranoid"
msgstr "����"
-#: ../../any.pm_.c:1076
+#: ../../any.pm_.c:1079
msgid ""
"This level is to be used with care. It makes your system more easy to use,\n"
"but very sensitive: it must not be used for a machine connected to others\n"
@@ -998,13 +1006,13 @@ msgstr ""
"��һ����Ӧ����ʹ��. ��������ϵͳʹ�ø���, Ȼ��Ҳ������:\n"
"������̨������Ҫ�����������������߽��뻥����, ���Բ�Ҫ�����������."
-#: ../../any.pm_.c:1079
+#: ../../any.pm_.c:1082
msgid ""
"Password are now enabled, but use as a networked computer is still not "
"recommended."
msgstr "�����˿����鹦��. �����Բ��������������ĵ���."
-#: ../../any.pm_.c:1080
+#: ../../any.pm_.c:1083
msgid ""
"This is the standard security recommended for a computer that will be used "
"to connect to the Internet as a client."
@@ -1012,13 +1020,13 @@ msgstr ""
"��׼��ȫ����: \n"
"�Ƽ�����Ϊ�ͻ����ӻ������ĵ�����ʹ��."
-#: ../../any.pm_.c:1081
+#: ../../any.pm_.c:1084
msgid ""
"There are already some restrictions, and more automatic checks are run every "
"night."
msgstr "������ijЩ����, ÿ��ҹ���Զ�ִ�и�����."
-#: ../../any.pm_.c:1082
+#: ../../any.pm_.c:1085
msgid ""
"With this security level, the use of this system as a server becomes "
"possible.\n"
@@ -1031,7 +1039,7 @@ msgstr ""
"ӵ���㹻�İ�ȫ��, ϵͳ������Ϊ���������������ڶ�ͻ�������.ע��: ������Ļ���"
"���ڻ��������ṩ����, ��ѡ��һ���ϵͼ���."
-#: ../../any.pm_.c:1085
+#: ../../any.pm_.c:1088
msgid ""
"This is similar to the previous level, but the system is entirely closed and "
"security features are at their maximum."
@@ -1039,28 +1047,28 @@ msgstr ""
"������ǰһ��ȫ����, ����ϵͳ������ȫ���״̬.\n"
"���а�ȫ���Դﵽ����޶�."
-#: ../../any.pm_.c:1091
+#: ../../any.pm_.c:1094
msgid "DrakSec Basic Options"
msgstr "DrakSec��ȫ���þ��� ����ѡ��"
-#: ../../any.pm_.c:1092
+#: ../../any.pm_.c:1095
msgid "Please choose the desired security level"
msgstr "��ѡ�������İ�ȫ����"
-#: ../../any.pm_.c:1095
+#: ../../any.pm_.c:1098
msgid "Security level"
msgstr "��ȫ����"
-#: ../../any.pm_.c:1097
+#: ../../any.pm_.c:1100
msgid "Use libsafe for servers"
msgstr "������ʹ�� libsafe"
-#: ../../any.pm_.c:1098
+#: ../../any.pm_.c:1101
msgid ""
"A library which defends against buffer overflow and format string attacks."
msgstr "��ֹ��������ʹ���ʽ����"
-#: ../../any.pm_.c:1099
+#: ../../any.pm_.c:1102
msgid "Security Administrator (login or email)"
msgstr "��ȫ����Ա (��¼���� email)"
@@ -1092,57 +1100,57 @@ msgstr ""
#. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
#. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:935
+#: ../../bootloader.pm_.c:932
msgid "Welcome to GRUB the operating system chooser!"
msgstr "Welcome to GRUB the operating system chooser!"
#. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
#. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:938
+#: ../../bootloader.pm_.c:935
#, c-format
msgid "Use the %c and %c keys for selecting which entry is highlighted."
msgstr "Use the %c and %c keys for selecting which entry is highlighted."
#. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
#. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:941
+#: ../../bootloader.pm_.c:938
msgid "Press enter to boot the selected OS, 'e' to edit the"
msgstr "Press enter to boot the selected OS, 'e' to edit the"
#. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
#. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:944
+#: ../../bootloader.pm_.c:941
msgid "commands before booting, or 'c' for a command-line."
msgstr "commands before booting, or 'c' for a command-line."
#. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
#. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:947
+#: ../../bootloader.pm_.c:944
#, c-format
msgid "The highlighted entry will be booted automatically in %d seconds."
msgstr "The highlighted entry will be booted automatically in %d seconds."
-#: ../../bootloader.pm_.c:951
+#: ../../bootloader.pm_.c:948
msgid "not enough room in /boot"
msgstr " /boot ��û���㹻�ռ�"
#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
#. -PO: so you may need to put them in English or in a different language if MS-windows doesn't exist in your language
-#: ../../bootloader.pm_.c:1051
+#: ../../bootloader.pm_.c:1048
msgid "Desktop"
msgstr "����"
#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../bootloader.pm_.c:1053
+#: ../../bootloader.pm_.c:1050
msgid "Start Menu"
msgstr "��ʼ�˵�"
-#: ../../bootloader.pm_.c:1072
+#: ../../bootloader.pm_.c:1069
#, c-format
msgid "You can't install the bootloader on a %s partition\n"
msgstr "%s �������ܰ�װ������������\n"
-#: ../../bootlook.pm_.c:45
+#: ../../bootlook.pm_.c:45 ../../standalone/draksplash_.c:25
msgid "no help implemented yet.\n"
msgstr "��������δʵ��.\n"
@@ -1150,8 +1158,8 @@ msgstr "��������δʵ��.\n"
msgid "Boot Style Configuration"
msgstr "��������"
-#: ../../bootlook.pm_.c:78 ../../harddrake/ui.pm_.c:59
-#: ../../harddrake/ui.pm_.c:60 ../../standalone/drakfloppy_.c:81
+#: ../../bootlook.pm_.c:78 ../../harddrake/ui.pm_.c:62
+#: ../../harddrake/ui.pm_.c:63 ../../standalone/drakfloppy_.c:81
#: ../../standalone/logdrake_.c:101
msgid "/_File"
msgstr "/_F �ļ�"
@@ -1161,7 +1169,7 @@ msgstr "/_F �ļ�"
msgid "/File/_Quit"
msgstr "/F �ļ�/_Q �˳�"
-#: ../../bootlook.pm_.c:79 ../../harddrake/ui.pm_.c:60
+#: ../../bootlook.pm_.c:79 ../../harddrake/ui.pm_.c:63
#: ../../standalone/drakfloppy_.c:82 ../../standalone/logdrake_.c:107
msgid "<control>Q"
msgstr "<control>Q"
@@ -1202,54 +1210,59 @@ msgstr "��װ����"
msgid "Display theme under console"
msgstr "����̨����ʾ����"
-#: ../../bootlook.pm_.c:166
+#: ../../bootlook.pm_.c:145
+msgid "Create new theme"
+msgstr "�����µ�����"
+
+#: ../../bootlook.pm_.c:169
msgid "Can't create Bootsplash preview"
msgstr "�޷�������������Ԥ��"
-#: ../../bootlook.pm_.c:166 ../../bootlook.pm_.c:184 ../../bootlook.pm_.c:187
-#: ../../bootlook.pm_.c:190 ../../bootlook.pm_.c:220 ../../bootlook.pm_.c:222
-#: ../../bootlook.pm_.c:232 ../../bootlook.pm_.c:241 ../../bootlook.pm_.c:248
-#: ../../diskdrake/hd_gtk.pm_.c:116 ../../diskdrake/interactive.pm_.c:336
-#: ../../diskdrake/interactive.pm_.c:351 ../../diskdrake/interactive.pm_.c:464
-#: ../../diskdrake/interactive.pm_.c:469 ../../diskdrake/smbnfs_gtk.pm_.c:45
+#: ../../bootlook.pm_.c:169 ../../bootlook.pm_.c:187 ../../bootlook.pm_.c:190
+#: ../../bootlook.pm_.c:193 ../../bootlook.pm_.c:223 ../../bootlook.pm_.c:225
+#: ../../bootlook.pm_.c:235 ../../bootlook.pm_.c:244 ../../bootlook.pm_.c:251
+#: ../../diskdrake/dav.pm_.c:73 ../../diskdrake/hd_gtk.pm_.c:116
+#: ../../diskdrake/interactive.pm_.c:340 ../../diskdrake/interactive.pm_.c:355
+#: ../../diskdrake/interactive.pm_.c:469 ../../diskdrake/interactive.pm_.c:474
+#: ../../diskdrake/smbnfs_gtk.pm_.c:45 ../../fsedit.pm_.c:239
#: ../../install_steps.pm_.c:75 ../../install_steps_interactive.pm_.c:67
-#: ../../install_steps_interactive.pm_.c:365 ../../interactive/http.pm_.c:119
-#: ../../interactive/http.pm_.c:120 ../../standalone/diskdrake_.c:80
+#: ../../interactive/http.pm_.c:119 ../../interactive/http.pm_.c:120
+#: ../../standalone/draksplash_.c:32
msgid "Error"
msgstr "����"
-#: ../../bootlook.pm_.c:183
+#: ../../bootlook.pm_.c:186
#, c-format
msgid "Backup %s to %s.old"
msgstr "�� %s ���ݵ� %s.old"
-#: ../../bootlook.pm_.c:184
+#: ../../bootlook.pm_.c:187
msgid "unable to backup lilo message"
msgstr "�޷����� LILO ��Ϣ"
-#: ../../bootlook.pm_.c:186
+#: ../../bootlook.pm_.c:189
#, c-format
msgid "Copy %s to %s"
msgstr "�� %s ���Ƶ� %s"
-#: ../../bootlook.pm_.c:187
+#: ../../bootlook.pm_.c:190
msgid "can't change lilo message"
msgstr "�޷��޸� LILO ��Ϣ"
-#: ../../bootlook.pm_.c:190
+#: ../../bootlook.pm_.c:193
msgid "Lilo message not found"
msgstr "û���ҵ� LILO ��Ϣ"
-#: ../../bootlook.pm_.c:220
+#: ../../bootlook.pm_.c:223
msgid "Can't write /etc/sysconfig/bootsplash."
msgstr "�޷�д�� /etc/sysconfig/bootsplash."
-#: ../../bootlook.pm_.c:220
+#: ../../bootlook.pm_.c:223
#, c-format
msgid "Write %s"
msgstr "� %s"
-#: ../../bootlook.pm_.c:222
+#: ../../bootlook.pm_.c:225
msgid ""
"Can't write /etc/sysconfig/bootsplash\n"
"File not found."
@@ -1257,17 +1270,17 @@ msgstr ""
"�޷�д�� /etc/sysconfig/bootsplash.\n"
"û���ҵ��ļ�."
-#: ../../bootlook.pm_.c:233
+#: ../../bootlook.pm_.c:236
#, c-format
msgid "Can't launch mkinitrd -f /boot/initrd-%s.img %s."
msgstr "�޷��� mkinitrd -f /boot/initrd-%s.img %s."
-#: ../../bootlook.pm_.c:236
+#: ../../bootlook.pm_.c:239
#, c-format
-msgid "Make initrd 'mkinird -f /boot/initrd-%s.img %s'."
-msgstr "���� initrd 'mkinird -f /boot/initrd-%s.img %s'."
+msgid "Make initrd 'mkinitrd -f /boot/initrd-%s.img %s'."
+msgstr "���� initrd 'mkinitrd -f /boot/initrd-%s.img %s'."
-#: ../../bootlook.pm_.c:242
+#: ../../bootlook.pm_.c:245
msgid ""
"Can't relaunch LiLo!\n"
"Launch \"lilo\" as root in command line to complete LiLo theme installation."
@@ -1275,23 +1288,24 @@ msgstr ""
"�޷������� LiLo!\n"
"�� root �������� \"lilo\" ����, ����� LiLo ���ⰲװ."
-#: ../../bootlook.pm_.c:246
+#: ../../bootlook.pm_.c:249
msgid "Relaunch 'lilo'"
msgstr "������ 'liLo'"
-#: ../../bootlook.pm_.c:248
+#: ../../bootlook.pm_.c:251 ../../standalone/draksplash_.c:161
+#: ../../standalone/draksplash_.c:330 ../../standalone/draksplash_.c:454
msgid "Notice"
msgstr "ע��"
-#: ../../bootlook.pm_.c:249
+#: ../../bootlook.pm_.c:252
msgid "LiLo and Bootsplash themes installation successfull"
msgstr "LiLo �� Bootsplash ���ⰲװ�ɹ�"
-#: ../../bootlook.pm_.c:249
+#: ../../bootlook.pm_.c:252
msgid "Theme installation failed!"
msgstr "���ⰲװʧ��!"
-#: ../../bootlook.pm_.c:258
+#: ../../bootlook.pm_.c:261
#, c-format
msgid ""
"You are currently using %s as your boot manager.\n"
@@ -1300,22 +1314,21 @@ msgstr ""
"��Ŀǰʹ�� %s ��Ϊ�������������.\n"
"��� '����' ��ť�������þ���."
-#: ../../bootlook.pm_.c:260 ../../standalone/drakbackup_.c:2352
-#: ../../standalone/drakbackup_.c:2362 ../../standalone/drakbackup_.c:2372
-#: ../../standalone/drakbackup_.c:2380 ../../standalone/drakgw_.c:592
-#: ../../standalone/tinyfirewall_.c:58
+#: ../../bootlook.pm_.c:263 ../../standalone/drakbackup_.c:2427
+#: ../../standalone/drakbackup_.c:2437 ../../standalone/drakbackup_.c:2447
+#: ../../standalone/drakbackup_.c:2455 ../../standalone/drakgw_.c:530
msgid "Configure"
msgstr "����"
-#: ../../bootlook.pm_.c:267
+#: ../../bootlook.pm_.c:270
msgid "Splash selection"
msgstr "ѡ���𶯻���"
-#: ../../bootlook.pm_.c:270
+#: ../../bootlook.pm_.c:273
msgid "Themes"
msgstr "����"
-#: ../../bootlook.pm_.c:272
+#: ../../bootlook.pm_.c:275
msgid ""
"\n"
"Select a theme for\n"
@@ -1327,44 +1340,44 @@ msgstr ""
"ѡ������ lilo �� bootsplash ������,\n"
"�����Էֱ�ѡ��"
-#: ../../bootlook.pm_.c:275
+#: ../../bootlook.pm_.c:278
msgid "Lilo screen"
msgstr "Lilo ��Ļ"
-#: ../../bootlook.pm_.c:279
+#: ../../bootlook.pm_.c:283
msgid "Bootsplash"
msgstr "Bootsplash ��������"
-#: ../../bootlook.pm_.c:314
+#: ../../bootlook.pm_.c:318
msgid "System mode"
msgstr "ϵͳģʽ"
-#: ../../bootlook.pm_.c:316
+#: ../../bootlook.pm_.c:320
msgid "Launch the graphical environment when your system starts"
msgstr "����ʱ����X����"
-#: ../../bootlook.pm_.c:321
+#: ../../bootlook.pm_.c:325
msgid "No, I don't want autologin"
msgstr "������Ҫ�Զ�¼��"
-#: ../../bootlook.pm_.c:323
+#: ../../bootlook.pm_.c:327
msgid "Yes, I want autologin with this (user, desktop)"
msgstr "��, ��(�û�,����)¼��"
-#: ../../bootlook.pm_.c:333 ../../network/netconnect.pm_.c:101
+#: ../../bootlook.pm_.c:337 ../../network/netconnect.pm_.c:101
#: ../../standalone/drakTermServ_.c:173 ../../standalone/drakTermServ_.c:300
-#: ../../standalone/drakTermServ_.c:405 ../../standalone/drakbackup_.c:3513
-#: ../../standalone/drakbackup_.c:4290 ../../standalone/drakconnect_.c:108
+#: ../../standalone/drakTermServ_.c:405 ../../standalone/drakbackup_.c:4191
+#: ../../standalone/drakbackup_.c:4952 ../../standalone/drakconnect_.c:108
#: ../../standalone/drakconnect_.c:140 ../../standalone/drakconnect_.c:296
#: ../../standalone/drakconnect_.c:435 ../../standalone/drakconnect_.c:521
#: ../../standalone/drakconnect_.c:564 ../../standalone/drakconnect_.c:667
#: ../../standalone/drakfloppy_.c:376 ../../standalone/drakfont_.c:612
#: ../../standalone/drakfont_.c:799 ../../standalone/drakfont_.c:876
-#: ../../standalone/drakfont_.c:963 ../../standalone/logdrake_.c:521
+#: ../../standalone/drakfont_.c:963 ../../standalone/logdrake_.c:519
msgid "OK"
msgstr "ȷ��"
-#: ../../bootlook.pm_.c:403
+#: ../../bootlook.pm_.c:407
#, c-format
msgid "can not open /etc/inittab for reading: %s"
msgstr "�޷��� /etc/inittab ��: %s"
@@ -1461,49 +1474,50 @@ msgstr "�µ���"
msgid "United States"
msgstr "����"
-#: ../../detect_devices.pm_.c:599 ../../detect_devices.pm_.c:641
-#: ../../detect_devices.pm_.c:803
-msgid "Unknown Model"
-msgstr "δ֪�ͺ�"
-
#: ../../diskdrake/dav.pm_.c:23
-#, fuzzy
msgid "New"
msgstr "�½�"
-#: ../../diskdrake/dav.pm_.c:57
+#: ../../diskdrake/dav.pm_.c:59 ../../diskdrake/interactive.pm_.c:388
+#: ../../diskdrake/smbnfs_gtk.pm_.c:81
+msgid "Unmount"
+msgstr "�"
+
+#: ../../diskdrake/dav.pm_.c:60 ../../diskdrake/interactive.pm_.c:385
+#: ../../diskdrake/smbnfs_gtk.pm_.c:82
+msgid "Mount"
+msgstr "װ��"
+
+#: ../../diskdrake/dav.pm_.c:61
msgid "Server"
msgstr "������"
-#: ../../diskdrake/dav.pm_.c:58 ../../diskdrake/interactive.pm_.c:375
-#: ../../diskdrake/interactive.pm_.c:558 ../../diskdrake/interactive.pm_.c:585
+#: ../../diskdrake/dav.pm_.c:62 ../../diskdrake/interactive.pm_.c:379
+#: ../../diskdrake/interactive.pm_.c:568 ../../diskdrake/interactive.pm_.c:595
#: ../../diskdrake/removable.pm_.c:24 ../../diskdrake/removable_gtk.pm_.c:15
#: ../../diskdrake/smbnfs_gtk.pm_.c:85
msgid "Mount point"
msgstr "װ�ص�"
-#: ../../diskdrake/dav.pm_.c:68
-#, fuzzy
+#: ../../diskdrake/dav.pm_.c:81
msgid "Please enter the WebDAV server URL"
-msgstr "��������̻��ٶ�."
+msgstr "������ WebDAV �������� URL"
-#: ../../diskdrake/dav.pm_.c:71
-#, fuzzy
+#: ../../diskdrake/dav.pm_.c:84
msgid "The URL must begin with http:// or https://"
-msgstr "Url Ӧ������ 'ftp:' �� 'http:'��ͷ"
+msgstr "Url Ӧ������ 'http://' �� 'https://'��ͷ"
-#: ../../diskdrake/dav.pm_.c:92
-#, fuzzy
+#: ../../diskdrake/dav.pm_.c:105
msgid "Server: "
-msgstr "������"
+msgstr "������:"
-#: ../../diskdrake/dav.pm_.c:93 ../../diskdrake/interactive.pm_.c:435
-#: ../../diskdrake/interactive.pm_.c:1079
-#: ../../diskdrake/interactive.pm_.c:1153
+#: ../../diskdrake/dav.pm_.c:106 ../../diskdrake/interactive.pm_.c:440
+#: ../../diskdrake/interactive.pm_.c:1089
+#: ../../diskdrake/interactive.pm_.c:1164
msgid "Mount point: "
msgstr "���ص�:"
-#: ../../diskdrake/dav.pm_.c:94 ../../diskdrake/interactive.pm_.c:1159
+#: ../../diskdrake/dav.pm_.c:107 ../../diskdrake/interactive.pm_.c:1170
#, c-format
msgid "Options: %s"
msgstr "ѡ��: %s"
@@ -1512,8 +1526,9 @@ msgstr "ѡ��: %s"
msgid "Please make a backup of your data first"
msgstr "���ȱ�����������"
-#: ../../diskdrake/hd_gtk.pm_.c:94 ../../diskdrake/interactive.pm_.c:924
-#: ../../diskdrake/interactive.pm_.c:933 ../../diskdrake/interactive.pm_.c:999
+#: ../../diskdrake/hd_gtk.pm_.c:94 ../../diskdrake/interactive.pm_.c:934
+#: ../../diskdrake/interactive.pm_.c:943
+#: ../../diskdrake/interactive.pm_.c:1009
msgid "Read carefully!"
msgstr "����ϸ�Ķ�!"
@@ -1551,10 +1566,14 @@ msgid "Please click on a partition"
msgstr "��ѡ��һ������"
#: ../../diskdrake/hd_gtk.pm_.c:205 ../../diskdrake/smbnfs_gtk.pm_.c:69
-#: ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_gtk.pm_.c:465
msgid "Details"
msgstr "��ϸ���"
+#: ../../diskdrake/hd_gtk.pm_.c:252
+msgid "No hard drives found"
+msgstr "û�з��ִ�ӡ��"
+
#: ../../diskdrake/hd_gtk.pm_.c:323
msgid "Ext2"
msgstr "Ext2"
@@ -1579,13 +1598,13 @@ msgstr "SunOS"
msgid "Swap"
msgstr "��������"
-#: ../../diskdrake/hd_gtk.pm_.c:324 ../../diskdrake/interactive.pm_.c:1095
+#: ../../diskdrake/hd_gtk.pm_.c:324 ../../diskdrake/interactive.pm_.c:1105
msgid "Empty"
msgstr "��"
-#: ../../diskdrake/hd_gtk.pm_.c:324 ../../install_steps_gtk.pm_.c:331
-#: ../../install_steps_gtk.pm_.c:389 ../../mouse.pm_.c:162
-#: ../../services.pm_.c:157 ../../standalone/drakbackup_.c:1679
+#: ../../diskdrake/hd_gtk.pm_.c:324 ../../install_steps_gtk.pm_.c:325
+#: ../../install_steps_gtk.pm_.c:383 ../../mouse.pm_.c:165
+#: ../../services.pm_.c:157 ../../standalone/drakbackup_.c:1754
msgid "Other"
msgstr "����"
@@ -1593,12 +1612,12 @@ msgstr "����"
msgid "Filesystem types:"
msgstr "�ļ�ϵͳ����:"
-#: ../../diskdrake/hd_gtk.pm_.c:345 ../../diskdrake/interactive.pm_.c:397
+#: ../../diskdrake/hd_gtk.pm_.c:345 ../../diskdrake/interactive.pm_.c:402
msgid "Create"
msgstr "�½�"
-#: ../../diskdrake/hd_gtk.pm_.c:345 ../../diskdrake/interactive.pm_.c:376
-#: ../../diskdrake/interactive.pm_.c:521 ../../diskdrake/removable.pm_.c:26
+#: ../../diskdrake/hd_gtk.pm_.c:345 ../../diskdrake/interactive.pm_.c:380
+#: ../../diskdrake/interactive.pm_.c:531 ../../diskdrake/removable.pm_.c:26
#: ../../diskdrake/removable.pm_.c:49 ../../diskdrake/removable_gtk.pm_.c:17
msgid "Type"
msgstr "����"
@@ -1608,7 +1627,7 @@ msgstr "����"
msgid "Use ``%s'' instead"
msgstr "�� ``%s'' ����"
-#: ../../diskdrake/hd_gtk.pm_.c:347 ../../diskdrake/interactive.pm_.c:385
+#: ../../diskdrake/hd_gtk.pm_.c:347 ../../diskdrake/interactive.pm_.c:389
msgid "Delete"
msgstr "ɾ��"
@@ -1616,108 +1635,108 @@ msgstr "ɾ��"
msgid "Use ``Unmount'' first"
msgstr "������ ``Unmount'' "
-#: ../../diskdrake/hd_gtk.pm_.c:352 ../../diskdrake/interactive.pm_.c:513
+#: ../../diskdrake/hd_gtk.pm_.c:352 ../../diskdrake/interactive.pm_.c:518
#, c-format
msgid ""
"After changing type of partition %s, all data on this partition will be lost"
msgstr "�ڸı������ %s ������֮��, ����������ϵ��������Ͻ�Ҫ�����"
-#: ../../diskdrake/interactive.pm_.c:173
+#: ../../diskdrake/interactive.pm_.c:174
msgid "Choose a partition"
msgstr "ѡ�����"
-#: ../../diskdrake/interactive.pm_.c:173
+#: ../../diskdrake/interactive.pm_.c:174
msgid "Choose another partition"
msgstr "ѡ����������"
-#: ../../diskdrake/interactive.pm_.c:198
+#: ../../diskdrake/interactive.pm_.c:199
msgid "Exit"
msgstr "�˳�"
-#: ../../diskdrake/interactive.pm_.c:220
+#: ../../diskdrake/interactive.pm_.c:221
msgid "Toggle to expert mode"
msgstr "����ר��ģʽ"
-#: ../../diskdrake/interactive.pm_.c:220
+#: ../../diskdrake/interactive.pm_.c:221
msgid "Toggle to normal mode"
msgstr "��������ģʽ"
-#: ../../diskdrake/interactive.pm_.c:220
+#: ../../diskdrake/interactive.pm_.c:221
msgid "Undo"
msgstr "����"
-#: ../../diskdrake/interactive.pm_.c:239
+#: ../../diskdrake/interactive.pm_.c:240
msgid "Continue anyway?"
msgstr "ð�ռ���ִ��?"
-#: ../../diskdrake/interactive.pm_.c:244
+#: ../../diskdrake/interactive.pm_.c:245
msgid "Quit without saving"
msgstr "������ı���˳�"
-#: ../../diskdrake/interactive.pm_.c:244
+#: ../../diskdrake/interactive.pm_.c:245
msgid "Quit without writing the partition table?"
msgstr "��д����������˳�?"
-#: ../../diskdrake/interactive.pm_.c:249
+#: ../../diskdrake/interactive.pm_.c:250
msgid "Do you want to save /etc/fstab modifications"
msgstr "����Ҫ���� /etc/fstab �޸��� ?"
-#: ../../diskdrake/interactive.pm_.c:261
+#: ../../diskdrake/interactive.pm_.c:263
msgid "Auto allocate"
msgstr "�Զ�����"
-#: ../../diskdrake/interactive.pm_.c:261
+#: ../../diskdrake/interactive.pm_.c:263
msgid "Clear all"
msgstr "ȫ�����"
-#: ../../diskdrake/interactive.pm_.c:261
+#: ../../diskdrake/interactive.pm_.c:263
#: ../../install_steps_interactive.pm_.c:214
msgid "More"
msgstr "����"
-#: ../../diskdrake/interactive.pm_.c:264
+#: ../../diskdrake/interactive.pm_.c:267
msgid "Hard drive information"
msgstr "Ӳ����Ϣ"
-#: ../../diskdrake/interactive.pm_.c:294
+#: ../../diskdrake/interactive.pm_.c:298
msgid "All primary partitions are used"
msgstr "������Ŀ�Ѿ�����"
-#: ../../diskdrake/interactive.pm_.c:295
+#: ../../diskdrake/interactive.pm_.c:299
msgid "I can't add any more partition"
msgstr "���޷��������κη�����"
-#: ../../diskdrake/interactive.pm_.c:296
+#: ../../diskdrake/interactive.pm_.c:300
msgid ""
"To have more partitions, please delete one to be able to create an extended "
"partition"
msgstr "�����Ҫ����ķ�������ɾ��һ���������Դ�����չ����"
-#: ../../diskdrake/interactive.pm_.c:306
+#: ../../diskdrake/interactive.pm_.c:310
msgid "Save partition table"
msgstr "���������"
-#: ../../diskdrake/interactive.pm_.c:307
+#: ../../diskdrake/interactive.pm_.c:311
msgid "Restore partition table"
msgstr "���ڳ��Իָ�������"
-#: ../../diskdrake/interactive.pm_.c:308
+#: ../../diskdrake/interactive.pm_.c:312
msgid "Rescue partition table"
msgstr "���ڳ����޸�������"
-#: ../../diskdrake/interactive.pm_.c:310
+#: ../../diskdrake/interactive.pm_.c:314
msgid "Reload partition table"
msgstr "���¶�ȡ������"
-#: ../../diskdrake/interactive.pm_.c:315
+#: ../../diskdrake/interactive.pm_.c:319
msgid "Removable media automounting"
msgstr "�Զ�װ�ؿ��ƶ�����"
-#: ../../diskdrake/interactive.pm_.c:324 ../../diskdrake/interactive.pm_.c:344
+#: ../../diskdrake/interactive.pm_.c:328 ../../diskdrake/interactive.pm_.c:348
msgid "Select file"
msgstr "ѡ���ļ�"
-#: ../../diskdrake/interactive.pm_.c:331
+#: ../../diskdrake/interactive.pm_.c:335
msgid ""
"The backup partition table has not the same size\n"
"Still continue?"
@@ -1725,11 +1744,11 @@ msgstr ""
"���ݷ������Ĵ�С��ԭ���IJ�ͬ\n"
"������ ?"
-#: ../../diskdrake/interactive.pm_.c:345
+#: ../../diskdrake/interactive.pm_.c:349
msgid "Warning"
msgstr "����"
-#: ../../diskdrake/interactive.pm_.c:346
+#: ../../diskdrake/interactive.pm_.c:350
msgid ""
"Insert a floppy in drive\n"
"All data on this floppy will be lost"
@@ -1737,79 +1756,71 @@ msgstr ""
"�����������в���һ������\n"
"�������������е����ݽ�Ҫ�����"
-#: ../../diskdrake/interactive.pm_.c:357
+#: ../../diskdrake/interactive.pm_.c:361
msgid "Trying to rescue partition table"
msgstr "���ڳ��Իָ�������"
-#: ../../diskdrake/interactive.pm_.c:363
+#: ../../diskdrake/interactive.pm_.c:367
msgid "Detailed information"
msgstr "��ϸ��Ϣ"
-#: ../../diskdrake/interactive.pm_.c:378 ../../diskdrake/interactive.pm_.c:652
+#: ../../diskdrake/interactive.pm_.c:382 ../../diskdrake/interactive.pm_.c:662
msgid "Resize"
msgstr "�ı��С"
-#: ../../diskdrake/interactive.pm_.c:379 ../../diskdrake/interactive.pm_.c:705
+#: ../../diskdrake/interactive.pm_.c:383 ../../diskdrake/interactive.pm_.c:715
msgid "Move"
msgstr "�ƶ�"
-#: ../../diskdrake/interactive.pm_.c:380
+#: ../../diskdrake/interactive.pm_.c:384
msgid "Format"
msgstr "��ʽ��"
-#: ../../diskdrake/interactive.pm_.c:381 ../../diskdrake/smbnfs_gtk.pm_.c:82
-msgid "Mount"
-msgstr "װ��"
-
-#: ../../diskdrake/interactive.pm_.c:382
+#: ../../diskdrake/interactive.pm_.c:386
msgid "Add to RAID"
msgstr "�����������"
-#: ../../diskdrake/interactive.pm_.c:383
+#: ../../diskdrake/interactive.pm_.c:387
msgid "Add to LVM"
msgstr "�����������"
-#: ../../diskdrake/interactive.pm_.c:384 ../../diskdrake/smbnfs_gtk.pm_.c:81
-msgid "Unmount"
-msgstr "�"
-
-#: ../../diskdrake/interactive.pm_.c:386
+#: ../../diskdrake/interactive.pm_.c:390
msgid "Remove from RAID"
msgstr "�Ӵ����������Ƴ�"
-#: ../../diskdrake/interactive.pm_.c:387
+#: ../../diskdrake/interactive.pm_.c:391
msgid "Remove from LVM"
msgstr "�Ӵ����������Ƴ�"
-#: ../../diskdrake/interactive.pm_.c:388
+#: ../../diskdrake/interactive.pm_.c:392
msgid "Modify RAID"
msgstr "���Ĵ��������趨"
-#: ../../diskdrake/interactive.pm_.c:389
+#: ../../diskdrake/interactive.pm_.c:393
msgid "Use for loopback"
msgstr "���ڻػ�"
-#: ../../diskdrake/interactive.pm_.c:428
+#: ../../diskdrake/interactive.pm_.c:433
msgid "Create a new partition"
msgstr "����һ���µķ���"
-#: ../../diskdrake/interactive.pm_.c:431
+#: ../../diskdrake/interactive.pm_.c:436
msgid "Start sector: "
msgstr "��ʼ����: "
-#: ../../diskdrake/interactive.pm_.c:433 ../../diskdrake/interactive.pm_.c:805
+#: ../../diskdrake/interactive.pm_.c:438 ../../diskdrake/interactive.pm_.c:815
msgid "Size in MB: "
msgstr "��С (MB) "
-#: ../../diskdrake/interactive.pm_.c:434 ../../diskdrake/interactive.pm_.c:806
+#: ../../diskdrake/interactive.pm_.c:439 ../../diskdrake/interactive.pm_.c:816
msgid "Filesystem type: "
msgstr "�ļ�ϵͳ����: "
-#: ../../diskdrake/interactive.pm_.c:439
+#: ../../diskdrake/interactive.pm_.c:444
msgid "Preference: "
msgstr "ƫ���趨"
-#: ../../diskdrake/interactive.pm_.c:464
+#: ../../diskdrake/interactive.pm_.c:469
msgid ""
"You can't create a new partition\n"
"(since you reached the maximal number of primary partitions).\n"
@@ -1819,33 +1830,33 @@ msgstr ""
"(������������������������).\n"
"����ɾ��һ��������, Ȼ�󴴽�һ����չ����."
-#: ../../diskdrake/interactive.pm_.c:494
+#: ../../diskdrake/interactive.pm_.c:499
msgid "Remove the loopback file?"
msgstr "ɾ���ػ�(loopback)�ļ�?"
-#: ../../diskdrake/interactive.pm_.c:519
+#: ../../diskdrake/interactive.pm_.c:529
msgid "Change partition type"
msgstr "�ı��������"
-#: ../../diskdrake/interactive.pm_.c:520 ../../diskdrake/removable.pm_.c:48
+#: ../../diskdrake/interactive.pm_.c:530 ../../diskdrake/removable.pm_.c:48
msgid "Which filesystem do you want?"
msgstr "��ϣ��ʹ�������ļ�ϵͳ?"
-#: ../../diskdrake/interactive.pm_.c:526
+#: ../../diskdrake/interactive.pm_.c:536
msgid "Switching from ext2 to ext3"
msgstr "��ext2������ext3"
-#: ../../diskdrake/interactive.pm_.c:556
+#: ../../diskdrake/interactive.pm_.c:566
#, c-format
msgid "Where do you want to mount loopback file %s?"
msgstr "����ѻػ�(loopback)�ļ� %s װ�ص�����?"
-#: ../../diskdrake/interactive.pm_.c:557
+#: ../../diskdrake/interactive.pm_.c:567
#, c-format
msgid "Where do you want to mount device %s?"
msgstr "������豸 %s װ�ص�����?"
-#: ../../diskdrake/interactive.pm_.c:563
+#: ../../diskdrake/interactive.pm_.c:573
msgid ""
"Can't unset mount point as this partition is used for loop back.\n"
"Remove the loopback first"
@@ -1853,135 +1864,135 @@ msgstr ""
"�޷�ȡ���趨��װ�ص�, ������������ڻػ�.\n"
"����ɾ���ػ�"
-#: ../../diskdrake/interactive.pm_.c:584
-#, fuzzy, c-format
+#: ../../diskdrake/interactive.pm_.c:594
+#, c-format
msgid "Where do you want to mount %s?"
-msgstr "������豸 %s װ�ص�����?"
+msgstr "����� %s װ�ص�����?"
-#: ../../diskdrake/interactive.pm_.c:608
+#: ../../diskdrake/interactive.pm_.c:618
msgid "Computing FAT filesystem bounds"
msgstr "���� FAT �ļ�ϵͳ�ı߽�"
-#: ../../diskdrake/interactive.pm_.c:608 ../../diskdrake/interactive.pm_.c:667
-#: ../../install_interactive.pm_.c:131
+#: ../../diskdrake/interactive.pm_.c:618 ../../diskdrake/interactive.pm_.c:677
+#: ../../install_interactive.pm_.c:133
msgid "Resizing"
msgstr "���ڸı��С"
-#: ../../diskdrake/interactive.pm_.c:640
+#: ../../diskdrake/interactive.pm_.c:650
msgid "This partition is not resizeable"
msgstr "���ܸı���������Ĵ�С"
-#: ../../diskdrake/interactive.pm_.c:645
+#: ../../diskdrake/interactive.pm_.c:655
msgid "All data on this partition should be backed-up"
msgstr "Ӧ���ȱ�������������ϵ���������"
-#: ../../diskdrake/interactive.pm_.c:647
+#: ../../diskdrake/interactive.pm_.c:657
#, c-format
msgid "After resizing partition %s, all data on this partition will be lost"
msgstr "�ı���� %s �Ĵ�С֮��, ������������е��������Ͻ������"
-#: ../../diskdrake/interactive.pm_.c:652
+#: ../../diskdrake/interactive.pm_.c:662
msgid "Choose the new size"
msgstr "ѡ���µĴ�С"
-#: ../../diskdrake/interactive.pm_.c:653
+#: ../../diskdrake/interactive.pm_.c:663
msgid "New size in MB: "
msgstr "�´�С (MB): "
-#: ../../diskdrake/interactive.pm_.c:706
+#: ../../diskdrake/interactive.pm_.c:716
msgid "Which disk do you want to move it to?"
msgstr "�����ƶ����ĸ��� ?"
-#: ../../diskdrake/interactive.pm_.c:707
+#: ../../diskdrake/interactive.pm_.c:717
msgid "Sector"
msgstr "����"
-#: ../../diskdrake/interactive.pm_.c:708
+#: ../../diskdrake/interactive.pm_.c:718
msgid "Which sector do you want to move it to?"
msgstr "�����ƶ����ĸ����� ?"
-#: ../../diskdrake/interactive.pm_.c:711
+#: ../../diskdrake/interactive.pm_.c:721
msgid "Moving"
msgstr "�ƶ���"
-#: ../../diskdrake/interactive.pm_.c:711
+#: ../../diskdrake/interactive.pm_.c:721
msgid "Moving partition..."
msgstr "�����ƶ�����..."
-#: ../../diskdrake/interactive.pm_.c:728
+#: ../../diskdrake/interactive.pm_.c:738
msgid "Choose an existing RAID to add to"
msgstr "ѡ�����һ���Ѵ��ڵ� RAID"
-#: ../../diskdrake/interactive.pm_.c:729 ../../diskdrake/interactive.pm_.c:746
+#: ../../diskdrake/interactive.pm_.c:739 ../../diskdrake/interactive.pm_.c:756
msgid "new"
msgstr "�½�"
-#: ../../diskdrake/interactive.pm_.c:744
+#: ../../diskdrake/interactive.pm_.c:754
msgid "Choose an existing LVM to add to"
msgstr "ѡ�����һ���Ѵ��ڵ� LVM"
-#: ../../diskdrake/interactive.pm_.c:749
+#: ../../diskdrake/interactive.pm_.c:759
msgid "LVM name?"
msgstr "LVM����?"
-#: ../../diskdrake/interactive.pm_.c:790
+#: ../../diskdrake/interactive.pm_.c:800
msgid "This partition can't be used for loopback"
msgstr "����������ܱ����ڻػ�"
-#: ../../diskdrake/interactive.pm_.c:803
+#: ../../diskdrake/interactive.pm_.c:813
msgid "Loopback"
msgstr "�ػ�"
-#: ../../diskdrake/interactive.pm_.c:804
+#: ../../diskdrake/interactive.pm_.c:814
msgid "Loopback file name: "
msgstr "�ػ��ļ���: "
-#: ../../diskdrake/interactive.pm_.c:809
+#: ../../diskdrake/interactive.pm_.c:819
msgid "Give a file name"
msgstr "�ļ���"
-#: ../../diskdrake/interactive.pm_.c:812
+#: ../../diskdrake/interactive.pm_.c:822
msgid "File already used by another loopback, choose another one"
msgstr "�ļ��Ѿ�����һ���ػ�ʹ��, ��ѡ������"
-#: ../../diskdrake/interactive.pm_.c:813
+#: ../../diskdrake/interactive.pm_.c:823
msgid "File already exists. Use it?"
msgstr "�ļ��Ѿ�����. ʹ�����е��ļ�?"
-#: ../../diskdrake/interactive.pm_.c:836
+#: ../../diskdrake/interactive.pm_.c:846
msgid "Mount options"
msgstr "װ��ѡ��"
-#: ../../diskdrake/interactive.pm_.c:843
+#: ../../diskdrake/interactive.pm_.c:853
msgid "Various"
msgstr "����"
-#: ../../diskdrake/interactive.pm_.c:907 ../../standalone/drakfloppy_.c:103
+#: ../../diskdrake/interactive.pm_.c:917 ../../standalone/drakfloppy_.c:103
msgid "device"
msgstr "�豸"
-#: ../../diskdrake/interactive.pm_.c:908
+#: ../../diskdrake/interactive.pm_.c:918
msgid "level"
msgstr "����"
-#: ../../diskdrake/interactive.pm_.c:909
+#: ../../diskdrake/interactive.pm_.c:919
msgid "chunk size"
msgstr "����С"
-#: ../../diskdrake/interactive.pm_.c:924
+#: ../../diskdrake/interactive.pm_.c:934
msgid "Be careful: this operation is dangerous."
msgstr "С��: ���������Σ��."
-#: ../../diskdrake/interactive.pm_.c:939
+#: ../../diskdrake/interactive.pm_.c:949
msgid "What type of partitioning?"
msgstr "��������������?"
-#: ../../diskdrake/interactive.pm_.c:955
+#: ../../diskdrake/interactive.pm_.c:965
#, c-format
msgid "The package %s is needed. Install it?"
msgstr "��Ҫ��װ������ %s . ��ͬ�ⰲװ��?"
-#: ../../diskdrake/interactive.pm_.c:969
+#: ../../diskdrake/interactive.pm_.c:979
msgid ""
"Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
"1024).\n"
@@ -1992,7 +2003,7 @@ msgstr ""
"�����ʹ�� LILO, ��û����������; ��������ʹ�� LILO, \n"
"����Ҫ���� /boot ����"
-#: ../../diskdrake/interactive.pm_.c:973
+#: ../../diskdrake/interactive.pm_.c:983
msgid ""
"The partition you've selected to add as root (/) is physically located "
"beyond\n"
@@ -2003,7 +2014,7 @@ msgstr ""
"������û�д��� /boot ����.\n"
"������ƻ�ʹ�� LILO ������������, �����ʵ�λ�ü��� /boot ����."
-#: ../../diskdrake/interactive.pm_.c:979
+#: ../../diskdrake/interactive.pm_.c:989
msgid ""
"You've selected a software RAID partition as root (/).\n"
"No bootloader is able to handle this without a /boot partition.\n"
@@ -2013,44 +2024,44 @@ msgstr ""
"���û�� /boot ����, �������������޷������������.\n"
"����, ������һ�� /boot ����."
-#: ../../diskdrake/interactive.pm_.c:999
+#: ../../diskdrake/interactive.pm_.c:1009
#, c-format
msgid "Partition table of drive %s is going to be written to disk!"
msgstr "������ %s �ķ���������д������� !"
-#: ../../diskdrake/interactive.pm_.c:1003
+#: ../../diskdrake/interactive.pm_.c:1013
msgid "You'll need to reboot before the modification can take place"
msgstr "���������¿���ʹ�����ĸ�����Ч"
-#: ../../diskdrake/interactive.pm_.c:1014
+#: ../../diskdrake/interactive.pm_.c:1024
#, c-format
msgid "After formatting partition %s, all data on this partition will be lost"
msgstr "��ʽ������ %s ֮��, ����������ϵ��������Ͻ�Ҫ�����"
-#: ../../diskdrake/interactive.pm_.c:1016
+#: ../../diskdrake/interactive.pm_.c:1026
msgid "Formatting"
msgstr "���ڸ�ʽ��"
-#: ../../diskdrake/interactive.pm_.c:1017
+#: ../../diskdrake/interactive.pm_.c:1027
#, c-format
msgid "Formatting loopback file %s"
msgstr "���ڸ�ʽ���ػ�(loopback)�ļ� %s"
-#: ../../diskdrake/interactive.pm_.c:1018
-#: ../../install_steps_interactive.pm_.c:476
+#: ../../diskdrake/interactive.pm_.c:1028
+#: ../../install_steps_interactive.pm_.c:459
#, c-format
msgid "Formatting partition %s"
msgstr "���ڸ�ʽ������ %s"
-#: ../../diskdrake/interactive.pm_.c:1029
+#: ../../diskdrake/interactive.pm_.c:1039
msgid "Hide files"
msgstr "�����ļ�"
-#: ../../diskdrake/interactive.pm_.c:1029
+#: ../../diskdrake/interactive.pm_.c:1039
msgid "Move files to the new partition"
msgstr "�ƶ��ļ����·���"
-#: ../../diskdrake/interactive.pm_.c:1030
+#: ../../diskdrake/interactive.pm_.c:1040
#, c-format
msgid ""
"Directory %s already contains data\n"
@@ -2059,83 +2070,83 @@ msgstr ""
"Ŀ¼ %s �Ѿ���������\n"
"(%s)"
-#: ../../diskdrake/interactive.pm_.c:1041
+#: ../../diskdrake/interactive.pm_.c:1051
msgid "Moving files to the new partition"
msgstr "�����ƶ��ļ����·���"
-#: ../../diskdrake/interactive.pm_.c:1045
+#: ../../diskdrake/interactive.pm_.c:1055
#, c-format
msgid "Copying %s"
msgstr "���� %s"
-#: ../../diskdrake/interactive.pm_.c:1049
+#: ../../diskdrake/interactive.pm_.c:1059
#, c-format
msgid "Removing %s"
msgstr "ɾ�� %s"
-#: ../../diskdrake/interactive.pm_.c:1059
+#: ../../diskdrake/interactive.pm_.c:1069
#, c-format
msgid "partition %s is now known as %s"
msgstr "���� %s ���ڳ�Ϊ %s"
-#: ../../diskdrake/interactive.pm_.c:1080
-#: ../../diskdrake/interactive.pm_.c:1139
+#: ../../diskdrake/interactive.pm_.c:1090
+#: ../../diskdrake/interactive.pm_.c:1149
msgid "Device: "
msgstr "�豸: "
-#: ../../diskdrake/interactive.pm_.c:1081
+#: ../../diskdrake/interactive.pm_.c:1091
#, c-format
msgid "DOS drive letter: %s (just a guess)\n"
msgstr "DOS �µ��̷�: %s ( ֻ�Dz²� )\n"
-#: ../../diskdrake/interactive.pm_.c:1085
-#: ../../diskdrake/interactive.pm_.c:1093
-#: ../../diskdrake/interactive.pm_.c:1157
+#: ../../diskdrake/interactive.pm_.c:1095
+#: ../../diskdrake/interactive.pm_.c:1103
+#: ../../diskdrake/interactive.pm_.c:1168
msgid "Type: "
msgstr "����: "
-#: ../../diskdrake/interactive.pm_.c:1089
+#: ../../diskdrake/interactive.pm_.c:1099
msgid "Name: "
msgstr "����: "
-#: ../../diskdrake/interactive.pm_.c:1097
+#: ../../diskdrake/interactive.pm_.c:1107
#, c-format
msgid "Start: sector %s\n"
msgstr "��ʼ: �� %s ����\n"
-#: ../../diskdrake/interactive.pm_.c:1098
+#: ../../diskdrake/interactive.pm_.c:1108
#, c-format
msgid "Size: %s"
msgstr "��С: %s"
-#: ../../diskdrake/interactive.pm_.c:1100
+#: ../../diskdrake/interactive.pm_.c:1110
#, c-format
msgid ", %s sectors"
msgstr ", �� %s ����"
-#: ../../diskdrake/interactive.pm_.c:1102
+#: ../../diskdrake/interactive.pm_.c:1112
#, c-format
msgid "Cylinder %d to %d\n"
msgstr " ���� %d �� %d\n"
-#: ../../diskdrake/interactive.pm_.c:1103
+#: ../../diskdrake/interactive.pm_.c:1113
msgid "Formatted\n"
msgstr "�Ѹ�ʽ��\n"
-#: ../../diskdrake/interactive.pm_.c:1104
+#: ../../diskdrake/interactive.pm_.c:1114
msgid "Not formatted\n"
msgstr "δ��ʽ��\n"
-#: ../../diskdrake/interactive.pm_.c:1105
+#: ../../diskdrake/interactive.pm_.c:1115
msgid "Mounted\n"
msgstr "��װ��\n"
-#: ../../diskdrake/interactive.pm_.c:1106
+#: ../../diskdrake/interactive.pm_.c:1116
#, c-format
msgid "RAID md%s\n"
msgstr "�������� (RAID) md%s\n"
-#: ../../diskdrake/interactive.pm_.c:1108
+#: ../../diskdrake/interactive.pm_.c:1118
#, c-format
msgid ""
"Loopback file(s):\n"
@@ -2144,7 +2155,7 @@ msgstr ""
"�ػ��ļ�:\n"
" %s\n"
-#: ../../diskdrake/interactive.pm_.c:1109
+#: ../../diskdrake/interactive.pm_.c:1119
msgid ""
"Partition booted by default\n"
" (for MS-DOS boot, not for lilo)\n"
@@ -2152,27 +2163,27 @@ msgstr ""
"Ԥ��Ŀ�������\n"
" (�� MS-DOS ���������õ�, �� lilo �޹�)\n"
-#: ../../diskdrake/interactive.pm_.c:1111
+#: ../../diskdrake/interactive.pm_.c:1121
#, c-format
msgid "Level %s\n"
msgstr "���� %s\n"
-#: ../../diskdrake/interactive.pm_.c:1112
+#: ../../diskdrake/interactive.pm_.c:1122
#, c-format
msgid "Chunk size %s\n"
msgstr "����С %s\n"
-#: ../../diskdrake/interactive.pm_.c:1113
+#: ../../diskdrake/interactive.pm_.c:1123
#, c-format
msgid "RAID-disks %s\n"
msgstr "RAID ���� %s\n"
-#: ../../diskdrake/interactive.pm_.c:1115
+#: ../../diskdrake/interactive.pm_.c:1125
#, c-format
msgid "Loopback file name: %s"
msgstr "�ػ��ļ�����: %s"
-#: ../../diskdrake/interactive.pm_.c:1118
+#: ../../diskdrake/interactive.pm_.c:1128
msgid ""
"\n"
"Chances are, this partition is\n"
@@ -2183,7 +2194,7 @@ msgstr ""
"����������������\n"
"�벻Ҫ����.\n"
-#: ../../diskdrake/interactive.pm_.c:1121
+#: ../../diskdrake/interactive.pm_.c:1131
msgid ""
"\n"
"This special Bootstrap\n"
@@ -2194,57 +2205,61 @@ msgstr ""
"�����������ر�\n"
"�DZ�����˫������ϵͳ\n"
-#: ../../diskdrake/interactive.pm_.c:1140
+#: ../../diskdrake/interactive.pm_.c:1150
+msgid "Read-only"
+msgstr "ֻ��"
+
+#: ../../diskdrake/interactive.pm_.c:1151
#, c-format
msgid "Size: %s\n"
msgstr "��С: %s\n"
-#: ../../diskdrake/interactive.pm_.c:1141
+#: ../../diskdrake/interactive.pm_.c:1152
#, c-format
msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
msgstr "Ӳ�̲���: %s ����, %s ��ͷ, %s ����\n"
-#: ../../diskdrake/interactive.pm_.c:1142
+#: ../../diskdrake/interactive.pm_.c:1153
msgid "Info: "
msgstr "��Ϣ: "
-#: ../../diskdrake/interactive.pm_.c:1143
+#: ../../diskdrake/interactive.pm_.c:1154
#, c-format
msgid "LVM-disks %s\n"
msgstr "LVM ���� %s\n"
-#: ../../diskdrake/interactive.pm_.c:1144
+#: ../../diskdrake/interactive.pm_.c:1155
#, c-format
msgid "Partition table type: %s\n"
msgstr "����������: %s\n"
-#: ../../diskdrake/interactive.pm_.c:1145
+#: ../../diskdrake/interactive.pm_.c:1156
#, c-format
msgid "on channel %d id %d\n"
msgstr "ͨ�� %d id %d\n"
-#: ../../diskdrake/interactive.pm_.c:1175
+#: ../../diskdrake/interactive.pm_.c:1186
msgid "Filesystem encryption key"
msgstr "�ļ�ϵͳ����"
-#: ../../diskdrake/interactive.pm_.c:1176
+#: ../../diskdrake/interactive.pm_.c:1187
msgid "Choose your filesystem encryption key"
msgstr "��ѡ����ļ�ϵͳ�Ŀ���"
-#: ../../diskdrake/interactive.pm_.c:1179
+#: ../../diskdrake/interactive.pm_.c:1190
#, c-format
msgid "This encryption key is too simple (must be at least %d characters long)"
msgstr "�������̫���� (����Ҫ�� %d ���ַ�)"
-#: ../../diskdrake/interactive.pm_.c:1180
+#: ../../diskdrake/interactive.pm_.c:1191
msgid "The encryption keys do not match"
msgstr "���ο����"
-#: ../../diskdrake/interactive.pm_.c:1183
+#: ../../diskdrake/interactive.pm_.c:1194
msgid "Encryption key"
msgstr "����"
-#: ../../diskdrake/interactive.pm_.c:1184
+#: ../../diskdrake/interactive.pm_.c:1195
msgid "Encryption key (again)"
msgstr "���� (��һ��)"
@@ -2278,7 +2293,7 @@ msgid ""
"Please enter your username, password and domain name to access this host."
msgstr "Ҫ���ʴ�����, �����������û���, ���������"
-#: ../../diskdrake/smbnfs_gtk.pm_.c:178
+#: ../../diskdrake/smbnfs_gtk.pm_.c:178 ../../standalone/drakbackup_.c:3527
msgid "Username"
msgstr "�û���"
@@ -2290,23 +2305,23 @@ msgstr "��"
msgid "Search servers"
msgstr "����������"
-#: ../../fs.pm_.c:552 ../../fs.pm_.c:562 ../../fs.pm_.c:566 ../../fs.pm_.c:570
-#: ../../fs.pm_.c:574 ../../fs.pm_.c:578
+#: ../../fs.pm_.c:544 ../../fs.pm_.c:554 ../../fs.pm_.c:558 ../../fs.pm_.c:562
+#: ../../fs.pm_.c:566 ../../fs.pm_.c:570
#, c-format
msgid "%s formatting of %s failed"
msgstr "%s, ��ʽ�� %s ʧ��"
-#: ../../fs.pm_.c:615
+#: ../../fs.pm_.c:607
#, c-format
msgid "I don't know how to format %s in type %s"
msgstr "��֪����θ�ʽ�� %s �� %s ����"
-#: ../../fs.pm_.c:687 ../../fs.pm_.c:731
+#: ../../fs.pm_.c:681 ../../fs.pm_.c:724
#, c-format
msgid "mounting partition %s in directory %s failed"
msgstr "������ %s ������Ŀ¼ %s ʧ��"
-#: ../../fs.pm_.c:746 ../../partition_table.pm_.c:602
+#: ../../fs.pm_.c:739 ../../partition_table.pm_.c:598
#, c-format
msgid "error unmounting %s: %s"
msgstr "ж�� %s ʧ��: %s"
@@ -2323,134 +2338,192 @@ msgstr "�� /usr"
msgid "server"
msgstr "������"
-#: ../../fsedit.pm_.c:472
+#: ../../fsedit.pm_.c:240
+#, c-format
+msgid ""
+"I can't read the partition table of device %s, it's too corrupted for me :(\n"
+"I can try to go on, erasing over bad partitions (ALL DATA will be lost!).\n"
+"The other solution is to not allow DrakX to modify the partition table.\n"
+"(the error is %s)\n"
+"\n"
+"Do you agree to loose all the partitions?\n"
+msgstr ""
+"���޷���ȡ�豸 %s �ķ�����, ����������ƻ���̫������ :(\n"
+"�ҿ��Գ������������ (���е����ݽ������!) Ȼ�����.\n"
+"����һ������취�ǽ�ֹ DrakX �޸ķ�����.\n"
+"(������ %s)\n"
+"\n"
+"��ͬ��������з�����?\n"
+
+#: ../../fsedit.pm_.c:501
msgid "You can't use JFS for partitions smaller than 16MB"
msgstr "�����ܰ� JFS ����С�� 16 MB �ķ���"
-#: ../../fsedit.pm_.c:473
+#: ../../fsedit.pm_.c:502
msgid "You can't use ReiserFS for partitions smaller than 32MB"
msgstr "�����ܰ� ReiserFS ����С�� 32 MB �ķ���"
-#: ../../fsedit.pm_.c:492
+#: ../../fsedit.pm_.c:521
msgid "Mount points must begin with a leading /"
msgstr "��������Ҫ�� / Ϊ��ͷ"
-#: ../../fsedit.pm_.c:493
+#: ../../fsedit.pm_.c:522
#, c-format
msgid "There is already a partition with mount point %s\n"
msgstr "�Ѿ���һ��������װ�ص��� %s\n"
-#: ../../fsedit.pm_.c:497
+#: ../../fsedit.pm_.c:526
#, c-format
msgid "You can't use a LVM Logical Volume for mount point %s"
msgstr "������LVM�߼����� %s �����"
-#: ../../fsedit.pm_.c:499
+#: ../../fsedit.pm_.c:528
msgid "This directory should remain within the root filesystem"
msgstr "���Ŀ¼Ӧ�ñ����ڸ�������"
-#: ../../fsedit.pm_.c:501
+#: ../../fsedit.pm_.c:530
msgid ""
"You need a true filesystem (ext2/ext3, reiserfs, xfs, or jfs) for this mount "
"point\n"
msgstr "������ص���Ҫһ���������ļ�ϵͳ(ext2/ext3, reiserfs, xfs �� jfs)\n"
-#: ../../fsedit.pm_.c:503
+#: ../../fsedit.pm_.c:532
#, c-format
msgid "You can't use an encrypted file system for mount point %s"
msgstr "����� %s ����ʹ���ü��ܵ��ļ�ϵͳ"
-#: ../../fsedit.pm_.c:570
+#: ../../fsedit.pm_.c:599
msgid "Not enough free space for auto-allocating"
msgstr "û���㹻�Ŀ��пռ乩�Զ�����"
-#: ../../fsedit.pm_.c:572
+#: ../../fsedit.pm_.c:601
msgid "Nothing to do"
msgstr "�����"
-#: ../../fsedit.pm_.c:665
+#: ../../fsedit.pm_.c:694
#, c-format
msgid "Error opening %s for writing: %s"
msgstr "�ڴ� %s д��ʱ��������: %s"
-#: ../../fsedit.pm_.c:750
+#: ../../harddrake/sound.pm_.c:155
+msgid "No alternative driver"
+msgstr "û���������������"
+
+#: ../../harddrake/sound.pm_.c:156
+#, c-format
+msgid "There's no known OSS/ALSA alternative driver for your sound card (%s)"
+msgstr "û����֪�� OSS/ALSA �������������������������� (%s) ��"
+
+#: ../../harddrake/sound.pm_.c:158
+msgid "Sound configuration"
+msgstr "��������"
+
+#: ../../harddrake/sound.pm_.c:159
+#, c-format
msgid ""
-"An error occurred - no valid devices were found on which to create new "
-"filesystems. Please check your hardware for the cause of this problem"
+"Here you can select an alternative driver (either OSS or ALSA) for your "
+"sound card (%s)"
msgstr ""
-"��������! �½��ļ�ϵͳʱ�Ҳ������õ��豸��\n"
-"��������Ӳ����ȷ�������ԭ�� !"
+"���������������ÿ��������������� (%s) �ϵ������������ (����ѡ��OSS �� ALSA)"
+
+#: ../../harddrake/sound.pm_.c:162
+msgid "Driver:"
+msgstr "��������:"
+
+#: ../../harddrake/sound.pm_.c:173
+msgid "No known driver"
+msgstr "û����֪��������"
+
+#: ../../harddrake/sound.pm_.c:174
+#, c-format
+msgid "There's no known driver for your sound card (%s)"
+msgstr "û����֪������������������������� (%s) ��"
-#: ../../fsedit.pm_.c:773
-msgid "You don't have any partitions!"
-msgstr "������һ������Ҳû��!"
+#: ../../harddrake/sound.pm_.c:177
+msgid "Unkown driver"
+msgstr "δ֪����������"
-#: ../../harddrake/ui.pm_.c:15
+#: ../../harddrake/sound.pm_.c:178
+#, c-format
+msgid ""
+"The \"%s\" driver for your sound card is unlisted\n"
+"\n"
+"Please send the output of the \"lspcidrake -v\" command to\n"
+"<install at mandrakesoft dot com>\n"
+"with subject: unlisted sound driver \"%s\""
+msgstr ""
+"���������� \"%s\" �������������\n"
+"\n"
+"��ִ��\"lspcidrake -v\" ����, �ѽ������\n"
+"<install at mandrakesoft dot com>\n"
+"����д: unlisted sound driver \"%s\""
+
+#: ../../harddrake/ui.pm_.c:16
msgid "Model"
msgstr "�ͺ�"
-#: ../../harddrake/ui.pm_.c:15
+#: ../../harddrake/ui.pm_.c:16
msgid "hard disk model"
msgstr "Ӳ���ͺ�"
-#: ../../harddrake/ui.pm_.c:16
+#: ../../harddrake/ui.pm_.c:17
msgid "Channel"
msgstr "ͨ��"
-#: ../../harddrake/ui.pm_.c:16
+#: ../../harddrake/ui.pm_.c:17
msgid "EIDE/SCSI channel"
msgstr "EIDE/SCSI ͨ��"
-#: ../../harddrake/ui.pm_.c:18
+#: ../../harddrake/ui.pm_.c:19
msgid "Bus"
msgstr "����"
-#: ../../harddrake/ui.pm_.c:19
+#: ../../harddrake/ui.pm_.c:20
msgid ""
"this is the physical bus on which the device is plugged (eg: PCI, USB, ...)"
msgstr "�豸�����ڵ��������� (����: PCI, USB, ...)"
-#: ../../harddrake/ui.pm_.c:20
+#: ../../harddrake/ui.pm_.c:21
msgid "Module"
msgstr "ģ��"
-#: ../../harddrake/ui.pm_.c:20
+#: ../../harddrake/ui.pm_.c:21
msgid "the module of the GNU/Linux kernel that handle that device"
msgstr "�������豸�� GNU/Linux �ں�ģ��"
-#: ../../harddrake/ui.pm_.c:21
+#: ../../harddrake/ui.pm_.c:22
msgid "Media class"
msgstr "���ʷ���"
-#: ../../harddrake/ui.pm_.c:21
+#: ../../harddrake/ui.pm_.c:22
msgid "class of hardware device"
msgstr "Ӳ���豸�ķ���"
-#: ../../harddrake/ui.pm_.c:22 ../../printerdrake.pm_.c:1404
+#: ../../harddrake/ui.pm_.c:23 ../../printerdrake.pm_.c:1517
msgid "Description"
msgstr "����"
-#: ../../harddrake/ui.pm_.c:22
+#: ../../harddrake/ui.pm_.c:23
msgid "this field describe the device"
msgstr "�豸������"
-#: ../../harddrake/ui.pm_.c:24
+#: ../../harddrake/ui.pm_.c:25
msgid "Bus identification"
msgstr "���߱�ʶ"
-#: ../../harddrake/ui.pm_.c:25
+#: ../../harddrake/ui.pm_.c:26
msgid ""
-"- PCI and USB devices : this list the vendor, device, subvendor and "
-"subdevice PCI/USB ids"
+"- PCI and USB devices: this list the vendor, device, subvendor and subdevice "
+"PCI/USB ids"
msgstr ""
"- PCI �� USB �豸 :�г� PCI/USB �� vendor, device, subvendor �� subdevice ��"
"��"
-#: ../../harddrake/ui.pm_.c:27
+#: ../../harddrake/ui.pm_.c:28
msgid "Location on the bus"
msgstr "�������ϵ�λ��"
-#: ../../harddrake/ui.pm_.c:28
+#: ../../harddrake/ui.pm_.c:29
msgid ""
"- pci devices: this gives the PCI slot, device and function of this card\n"
"- eide devices: the device is either a slave or a master device\n"
@@ -2460,48 +2533,56 @@ msgstr ""
"- eide �豸: ���豸����豸\n"
"- scsi �豸: �г� scsi ���ߺ� scsi �豸��"
-#: ../../harddrake/ui.pm_.c:31
+#: ../../harddrake/ui.pm_.c:32
msgid "Old device file"
msgstr "�ɵ��豸�ļ�"
-#: ../../harddrake/ui.pm_.c:32
+#: ../../harddrake/ui.pm_.c:33
msgid "old static device name used in dev package"
msgstr "dev ��������ʹ�õľɵľ�̬�豸��"
-#: ../../harddrake/ui.pm_.c:33
+#: ../../harddrake/ui.pm_.c:34
msgid "New devfs device"
msgstr "�µ� devfs �豸"
-#: ../../harddrake/ui.pm_.c:34
+#: ../../harddrake/ui.pm_.c:35
msgid "new dinamic device name generated by incore kernel devfs"
msgstr "�ں��Դ��� devfs ��ʹ�õ��µĶ�̬�豸��"
-#: ../../harddrake/ui.pm_.c:35
+#: ../../harddrake/ui.pm_.c:36
msgid "Number of buttons"
msgstr "������Ŀ"
-#: ../../harddrake/ui.pm_.c:36
+#: ../../harddrake/ui.pm_.c:37
msgid "the vendor name of the device"
msgstr "�豸�ij�������"
-#: ../../harddrake/ui.pm_.c:60
+#: ../../harddrake/ui.pm_.c:38
+msgid "Alternative drivers"
+msgstr "�������������"
+
+#: ../../harddrake/ui.pm_.c:39
+msgid "the list of alternative drivers for this sound card"
+msgstr "���������������������б�"
+
+#: ../../harddrake/ui.pm_.c:63
msgid "/_Quit"
msgstr "_Q ����"
-#: ../../harddrake/ui.pm_.c:61 ../../harddrake/ui.pm_.c:62
-#: ../../harddrake/ui.pm_.c:68 ../../standalone/logdrake_.c:110
+#: ../../harddrake/ui.pm_.c:64 ../../harddrake/ui.pm_.c:65
+#: ../../harddrake/ui.pm_.c:71 ../../standalone/logdrake_.c:110
msgid "/_Help"
msgstr "/_H ����"
-#: ../../harddrake/ui.pm_.c:62
+#: ../../harddrake/ui.pm_.c:65
msgid "/_Help..."
msgstr "/_H ����..."
-#: ../../harddrake/ui.pm_.c:63
+#: ../../harddrake/ui.pm_.c:66
msgid "Harddrake help"
msgstr "Harddrake ����"
-#: ../../harddrake/ui.pm_.c:64
+#: ../../harddrake/ui.pm_.c:67
msgid ""
"Description of the fields:\n"
"\n"
@@ -2509,15 +2590,15 @@ msgstr ""
"�����ֶε�����:\n"
"\n"
-#: ../../harddrake/ui.pm_.c:68
+#: ../../harddrake/ui.pm_.c:71
msgid "/_About..."
msgstr "/_A ����..."
-#: ../../harddrake/ui.pm_.c:69
+#: ../../harddrake/ui.pm_.c:72
msgid "About Harddrake"
msgstr "���� Harddrakeħ��Ӳ������"
-#: ../../harddrake/ui.pm_.c:70
+#: ../../harddrake/ui.pm_.c:73
msgid ""
"This is HardDrake, a Mandrake hardware configuration tool.\n"
"Version:"
@@ -2525,51 +2606,51 @@ msgstr ""
"���� Harddrakeħ��Ӳ������, Mandrake ��Ӳ�����ù���.\n"
"�汾 :"
-#: ../../harddrake/ui.pm_.c:71
+#: ../../harddrake/ui.pm_.c:74
msgid "Author:"
msgstr "���� :"
-#: ../../harddrake/ui.pm_.c:83
+#: ../../harddrake/ui.pm_.c:86
msgid "Harddrake2 version "
msgstr "Harddrake2 �汾 "
-#: ../../harddrake/ui.pm_.c:91
+#: ../../harddrake/ui.pm_.c:103
msgid "Detected hardware"
msgstr "��⵽��Ӳ��"
-#: ../../harddrake/ui.pm_.c:92
+#: ../../harddrake/ui.pm_.c:105
+msgid "Information"
+msgstr "��Ϣ"
+
+#: ../../harddrake/ui.pm_.c:108
msgid "Configure module"
msgstr "����ģ��"
-#: ../../harddrake/ui.pm_.c:92
-msgid "Informations"
-msgstr "��Ϣ"
-
-#: ../../harddrake/ui.pm_.c:92
+#: ../../harddrake/ui.pm_.c:109
msgid "Run config tool"
msgstr "�������ù���"
-#: ../../harddrake/ui.pm_.c:96
+#: ../../harddrake/ui.pm_.c:113
msgid "Detection in progress"
msgstr "��������"
-#: ../../harddrake/ui.pm_.c:96 ../../interactive.pm_.c:388
+#: ../../harddrake/ui.pm_.c:113 ../../interactive.pm_.c:391
msgid "Please wait"
msgstr "���Ժ�"
-#: ../../harddrake/ui.pm_.c:139
+#: ../../harddrake/ui.pm_.c:156
msgid "primary"
msgstr "��"
-#: ../../harddrake/ui.pm_.c:139
+#: ../../harddrake/ui.pm_.c:156
msgid "secondary"
msgstr "��"
-#: ../../harddrake/ui.pm_.c:176
+#: ../../harddrake/ui.pm_.c:197
msgid "You can configure each parameter of the module here."
msgstr "����������ģ��ĸ�������"
-#: ../../harddrake/ui.pm_.c:192
+#: ../../harddrake/ui.pm_.c:213
#, c-format
msgid "Running \"%s\" ..."
msgstr "�������� \"%s\" ..."
@@ -2602,15 +2683,15 @@ msgstr ""
"ʱ�����õ��ӿ�����"
#: ../../harddrake/v4l.pm_.c:213
-msgid "Card model :"
+msgid "Card model:"
msgstr "�����ͺ� :"
#: ../../harddrake/v4l.pm_.c:214
-msgid "Tuner type :"
+msgid "Tuner type:"
msgstr "�������� :"
#: ../../harddrake/v4l.pm_.c:215
-msgid "Number of capture buffers :"
+msgid "Number of capture buffers:"
msgstr "���񻺳������� :"
#: ../../harddrake/v4l.pm_.c:215
@@ -2618,11 +2699,11 @@ msgid "number of capture buffers for mmap'ed capture"
msgstr "����mmap����Ļ��������� :"
#: ../../harddrake/v4l.pm_.c:217
-msgid "PLL setting :"
+msgid "PLL setting:"
msgstr "PLL ���� :"
#: ../../harddrake/v4l.pm_.c:218
-msgid "Radio support :"
+msgid "Radio support:"
msgstr "���ߵ�֧�� :"
#: ../../harddrake/v4l.pm_.c:218
@@ -2634,22 +2715,22 @@ msgid ""
"GNU/Linux is a multiuser system, and this means that each user can have his\n"
"own preferences, his own files and so on. You can read the ``User Guide''\n"
"to learn more. But unlike \"root\", which is the administrator, the users\n"
-"you will add here will not be entitled to change anything except their own\n"
-"files and their own configuration. You will have to create at least one\n"
-"regular user for yourself. That account is where you should log in for\n"
-"routine use. Although it is very practical to log in as \"root\" everyday,\n"
-"it may also be very dangerous! The slightest mistake could mean that your\n"
-"system would not work any more. If you make a serious mistake as a regular\n"
-"user, you may only lose some information, but not the entire system.\n"
+"you add here will not be entitled to change anything except their own files\n"
+"and their own configuration. You will have to create at least one regular\n"
+"user for yourself. That account is where you should log in for routine use.\n"
+"Although it is very practical to log in as \"root\" everyday, it may also\n"
+"be very dangerous! The slightest mistake could mean that your system would\n"
+"not work any more. If you make a serious mistake as a regular user, you may\n"
+"only lose some information, but not the entire system.\n"
"\n"
"First, you have to enter your real name. This is not mandatory, of course -\n"
"as you can actually enter whatever you want. DrakX will then take the first\n"
"word you have entered in the box and will bring it over to the \"User\n"
"name\". This is the name this particular user will use to log onto the\n"
"system. You can change it. You then have to enter a password here. A\n"
-"non-privileged (regular) user's password is not as crucial as \"root\"' one\n"
-"from a security point of view, but that is no reason to neglect it: after\n"
-"all, your files are at risk.\n"
+"non-privileged (regular) user's password is not as crucial as the \"root\"'\n"
+"one from a security point of view, but that is no reason to neglect it:\n"
+"after all, your files are at risk.\n"
"\n"
"If you click on \"Accept user\", you can then add as many as you want. Add\n"
"a user for each one of your friends: your father or your sister, for\n"
@@ -2761,7 +2842,7 @@ msgid ""
"to have a graphical workstation!\n"
"\n"
"Moving the mouse cursor over a group name will display a short explanatory\n"
-"text about that group. If you deselect all groups when performing a regular\n"
+"text about that group. If you unselect all groups when performing a regular\n"
"installation (by opposition to an upgrade), a dialog will pop up proposing\n"
"different options for a minimal installation:\n"
"\n"
@@ -2822,10 +2903,10 @@ msgstr ""
#: ../../help.pm_.c:128
msgid ""
-"Finally, depending on whether or not you selected individual packages, you\n"
-"will be presented a tree containing all packages classified by groups and\n"
-"subgroups. While browsing the tree, you can select entire groups,\n"
-"subgroups, or individual packages.\n"
+"Finally, depending on whether or not you chose to be able to select\n"
+"individual packages, you will be presented a tree containing all packages\n"
+"classified by groups and subgroups. While browsing the tree, you can select\n"
+"entire groups, subgroups, or individual packages.\n"
"\n"
"Whenever you select a package on the tree, a description appears on the\n"
"right. When your selection is finished, click the \"Install\" button which\n"
@@ -2885,11 +2966,11 @@ msgstr ""
#: ../../help.pm_.c:164
msgid ""
-"You are now proposed to set up your Internet/network connection. If you\n"
-"wish to connect your computer to the Internet or to a local network, click\n"
-"\"OK\". The autodetection of network devices and modem will be launched. If\n"
-"this detection fails, uncheck the \"Use auto detection\" box next time. You\n"
-"may also choose not to configure the network, or do it later; in that case,\n"
+"You are now able to set up your Internet/network connection. If you wish to\n"
+"connect your computer to the Internet or to a local network, click \"OK\".\n"
+"The autodetection of network devices and modem will be launched. If this\n"
+"detection fails, uncheck the \"Use auto detection\" box next time. You may\n"
+"also choose not to configure the network, or do it later; in that case,\n"
"simply click the \"Cancel\" button.\n"
"\n"
"Available connections are: traditional modem, ISDN modem, ADSL connection,\n"
@@ -2959,7 +3040,7 @@ msgstr ""
msgid ""
"GNU/Linux manages time in GMT (Greenwich Mean Time) and translates it in\n"
"local time according to the time zone you selected. It is however possible\n"
-"to deactivate this by deselecting \"Hardware clock set to GMT\" so that the\n"
+"to deactivate this by unselecting \"Hardware clock set to GMT\" so that the\n"
"hardware clock is the same as the system clock. This is useful when the\n"
"machine is hosting another operating system like Windows.\n"
"\n"
@@ -2998,7 +3079,9 @@ msgid ""
"If you can see the message during the test, and answer \"Yes\", then DrakX\n"
"will proceed to the next step. If you cannot see the message, it simply\n"
"means that the configuration was wrong and the test will automatically end\n"
-"after 10 seconds, restoring the screen."
+"after 10 seconds, restoring the screen. Refer then to the Video\n"
+"configuration section of the user guide for more information on how to\n"
+"configure your display."
msgstr ""
"X (����ϵͳ) �� GNU/Linux ��ͼ�ν��������, Mandrake Linux �ĸ���\n"
"ͼ�λ���(KDE, GNOME, AfterStep, WindowMaker, �ȵ�.)��������.\n"
@@ -3013,27 +3096,7 @@ msgstr ""
"��������Կ������Ե�����, ���ش� \"��\", DrakX �������һ��.\n"
"��������ܿ�������, ��Ȼ�����д���, ���Ի��� 10 ���Ӻ�������ָ���ʾ."
-#: ../../help.pm_.c:237
-msgid ""
-"The first time you try the X configuration, you may not be very satisfied\n"
-"with its display (screen is too small, shifted left or right...). Hence,\n"
-"even if X starts up correctly, DrakX then asks you if the configuration\n"
-"suits you. It will also propose to change it by displaying a list of valid\n"
-"modes it could find, asking you to select one.\n"
-"\n"
-"As a last resort, if you still cannot get X to work, choose \"Change\n"
-"graphics card\", select \"Unlisted card\", and when prompted on which\n"
-"server, choose \"FBDev\". This is a failsafe option which works with any\n"
-"modern graphics card. Then choose \"Test again\" to be sure."
-msgstr ""
-"�Զ����Ľ��δ������������(��Ļ̫С, ƫ���ƫ��...), ����\n"
-"DrakX �����������Ƿ����. ���������г����п��õ���ʾģʽ����ѡ��.\n"
-"\n"
-"���,��� DrakX ��Ȼ�޷���ȷ����, �����\n"
-"\"�ı�ͼ�ο�\",ѡ��\"������\", ��ѡ��\"FBDev\", \n"
-"������Ա�֤�������ִ�ͼ�ο��Ϲ���. ѡ��\"���²���\"��ȷ��."
-
-#: ../../help.pm_.c:249
+#: ../../help.pm_.c:239
msgid ""
"Finally, you will be asked whether you want to see the graphical interface\n"
"at boot. Note this question will be asked even if you chose not to test the\n"
@@ -3045,7 +3108,7 @@ msgstr ""
"����\n"
"��Ȼ, ��������������Ϊ������, ����������ʾ���û�û�гɹ�, ��Ӧ��ѡ��\"��\"."
-#: ../../help.pm_.c:256
+#: ../../help.pm_.c:246
msgid ""
"The Mandrake Linux CD-ROM has a built-in rescue mode. You can access it by\n"
"booting from the CD-ROM, press the >>F1<< key at boot and type >>rescue<<\n"
@@ -3065,29 +3128,30 @@ msgid ""
"crashed due to a power failure, an unfortunate typing error, a typo in a\n"
"password, or any other reason.\n"
"\n"
-"When you click on this step, you will be asked to enter a disk inside the\n"
-"drive. The floppy disk you will insert must be empty or contain data which\n"
-"you do not need. You will not have to format it since DrakX will rewrite\n"
-"the whole disk."
+"If you say \"Yes\", you will be asked to enter a disk inside the drive. The\n"
+"floppy disk you will insert must be empty or contain data which you do not\n"
+"need. You will not have to format it since DrakX will rewrite the whole\n"
+"disk."
msgstr ""
"Mandrake Linux CD-ROM �����õļ��ȹ���. ������ù����𶯻���,\n"
"�ڿ������水 >>F1<< ��, Ȼ������ʾ������ >>rescue<<, �ͻ���뼱��ģʽ.\n"
-"������Ļ������ܴӹ�����, CD-ROM, ������������������Իص���һ���õ�����:\n"
+"��һ���Ļ������ܴӹ�����, ������������� �����Իص���һ���õ�����:\n"
"\n"
" * �ڰ�װ������������ʱ, DrakX ����д������Ӳ�̵���������¼(MBR)\n"
-"(����������װ�µĿ�����������). �������ĵ���Ҳ��װ��Windows, ��ij������Ҫ\n"
-"���°�װ Windows, Microsoft �İ�װ�����������������¼, \n"
-"������޷����� GNU/Linux!\n"
+"(������ʹ������������������) �Ա���ѡ��Ҫ�����IJ���ϵͳ(��������\n"
+"����Ҳ��װ����������ϵͳ), ��һij������Ҫ���°�װ Windows,\n"
+"Microsoft �İ�װ����������������¼, ��������޷����� GNU/Linux!\n"
"\n"
-" * �������ʲô����, ���� GNU/Linux ��Ӳ����, ������������������� GNU/"
-"Linux ��Ψһ;��.\n"
-"�������˸������õĹ���, �����޸���Ϊͣ��, ���ǿ���, ���ҵĴ�������ȵ�ԭ����"
-"�ɵ�\n"
-"ϵͳ����.\n"
+" * �������ʲô����, ���� GNU/Linux �޷���Ӳ����, \n"
+"������������������� GNU/Linux ��Ψһ;��.\n"
+"�������˸������õĹ���, �����޸���Ϊͣ��, ���ǿ���,\n"
+"���ҵĴ�������, �����еĴ��ִ���ȵ�ԭ����ɵ�ϵͳ����.\n"
"\n"
-"����Ҫ׼��һ�ſյ�����, DrakX ����д������Ƭ, ���Բ������ȸ�ʽ��."
+"�����ѡ��\"��\", ����ʾ���������������з�һƬ����. \n"
+"��ʹ�õ����̱����ǿյĻ�����������Ҫ���������.\n"
+"DrakX ����д������Ƭ, �������������ȸ�ʽ��."
-#: ../../help.pm_.c:280
+#: ../../help.pm_.c:270
msgid ""
"At this point, you need to choose where you want to install the Mandrake\n"
"Linux operating system on your hard drive. If your hard drive is empty or\n"
@@ -3120,7 +3184,9 @@ msgid ""
"\n"
" * \"Use existing partition\": the wizard has detected one or more existing\n"
"Linux partitions on your hard drive. If you want to use them, choose this\n"
-"option;\n"
+"option. You will then be asked to choose the mount points associated to\n"
+"each of the partitions. The legacy mount points are selected by default,\n"
+"and you should generally keep them.\n"
"\n"
" * \"Use the free space on the Windows; partition\": if Microsoft Windows\n"
"is installed on your hard drive and takes all the space available on it,\n"
@@ -3153,7 +3219,9 @@ msgid ""
" * \"Expert mode\": choose this option if you want to manually partition\n"
"your hard drive. Be careful - it is a powerful but dangerous choice. You\n"
"can very easily lose all your data. Hence, do not choose this unless you\n"
-"know what you are doing."
+"know what you are doing. To know how do use the DiskDrake utility used\n"
+"here, refer to the section ``Managing Your Partitions'' of the ````User\n"
+"Guide''''"
msgstr ""
"����, ����Ҫ��Ӳ����ѡ��������װ Mandrake Linux ����ϵͳ��λ��.\n"
"��������ǿյ�, �����ִ�IJ���ϵͳʹ���˴����ϵ�ȫ���ռ�, ����Ҫ\n"
@@ -3202,7 +3270,7 @@ msgstr ""
" ��ʼ֮ǰ����ϸ����. ��������dz�����Ҳ�dz�Σ��.\n"
" ���������׵Ļٻ����е�����. �����������벻Ҫʹ����.."
-#: ../../help.pm_.c:347
+#: ../../help.pm_.c:341
msgid ""
"There you are. Installation is now complete and your GNU/Linux system is\n"
"ready to use. Just click \"OK\" to reboot the system. You can start\n"
@@ -3257,7 +3325,7 @@ msgstr ""
"(*) ����Ҫ FAT ��ʽ�������� (Ҫ�� GNU/Linux ��������, ��������\n"
"\"mformat a:\")"
-#: ../../help.pm_.c:378
+#: ../../help.pm_.c:372
msgid ""
"Any partitions that have been newly defined must be formatted for use\n"
"(formatting means creating a filesystem).\n"
@@ -3298,7 +3366,7 @@ msgstr ""
"\n"
"���\"ȡ��\"ѡ������������װ Mandrake Linux ϵͳ."
-#: ../../help.pm_.c:404
+#: ../../help.pm_.c:398
msgid ""
"Your new Mandrake Linux operating system is currently being installed.\n"
"Depending on the number of packages you will be installing and the speed of\n"
@@ -3313,12 +3381,12 @@ msgstr ""
"\n"
"�����ĵȴ�."
-#: ../../help.pm_.c:412
+#: ../../help.pm_.c:406
msgid ""
"At the time you are installing Mandrake Linux, it is likely that some\n"
"packages have been updated since the initial release. Some bugs may have\n"
"been fixed, and security issues solved. To allow you to benefit from these\n"
-"updates, you are now proposed to download them from the Internet. Choose\n"
+"updates, you are now able to download them from the Internet. Choose\n"
"\"Yes\" if you have a working Internet connection, or \"No\" if you prefer\n"
"to install updated packages later.\n"
"\n"
@@ -3338,7 +3406,7 @@ msgstr ""
"֮������һ���������ص��������嵥: ���ѡ��Ȼ���� \"��װ\" ����ȡ\n"
"����װѡ�е�������, Ҳֹͣ��ѡ��\"ȡ��\"."
-#: ../../help.pm_.c:425
+#: ../../help.pm_.c:419
msgid ""
"Before continuing, you should read carefully the terms of the license. It\n"
"covers the whole Mandrake Linux distribution, and if you do not agree with\n"
@@ -3351,14 +3419,14 @@ msgstr ""
"ȫ������, ���� \"�ܾ�\" ��ť, ��װ���̽�����ֹͣ. \n"
"���\"����\" ��ť��������װ."
-#: ../../help.pm_.c:432
+#: ../../help.pm_.c:426
msgid ""
"At this point, it is time to choose the security level desired for the\n"
"machine. As a rule of thumb, the more exposed the machine is, and the more\n"
"the data stored in it is crucial, the higher the security level should be.\n"
"However, a higher security level is generally obtained at the expense of\n"
-"easiness of use. Refer to the \"msec\" chapter of the ``Reference Manual''\n"
-"to get more information about the meaning of these levels.\n"
+"ease of use. Refer to the \"msec\" chapter of the ``Reference Manual'' to\n"
+"get more information about the meaning of these levels.\n"
"\n"
"If you do not know what to choose, keep the default option."
msgstr ""
@@ -3370,7 +3438,7 @@ msgstr ""
"\n"
"û���ر���Ҫ�Ͳ���ȱʡ����."
-#: ../../help.pm_.c:442
+#: ../../help.pm_.c:436
msgid ""
"At this point, you need to choose which partition(s) will be used for the\n"
"installation of your Mandrake Linux system. If partitions have already been\n"
@@ -3387,26 +3455,26 @@ msgid ""
" * \"Clear all\": this option deletes all partitions on the selected hard\n"
"drive;\n"
"\n"
-" * \"Auto allocate\": this option enables to automatically create \"Ext2\"\n"
-"and swap partitions in free space of your hard drive;\n"
+" * \"Auto allocate\": this option enables to automatically create ext3 and\n"
+"swap partitions in free space of your hard drive;\n"
"\n"
-" * \"More\": gives access to additional features:\n"
+"\"More\": gives access to additional features:\n"
"\n"
-" * \"Save partition table\": saves the partition table to a floppy.\n"
-"Useful for later partition-table recovery if necessary. It is strongly\n"
-"recommended to perform this step;\n"
+" * \"Save partition table\": saves the partition table to a floppy. Useful\n"
+"for later partition-table recovery if necessary. It is strongly recommended\n"
+"to perform this step;\n"
"\n"
-" * \"Restore partition table\": allows to restore a previously saved\n"
+" * \"Restore partition table\": allows to restore a previously saved\n"
"partition table from floppy disk;\n"
"\n"
-" * \"Rescue partition table\": if your partition table is damaged, you\n"
-"can try to recover it using this option. Please be careful and remember\n"
-"that it can fail;\n"
+" * \"Rescue partition table\": if your partition table is damaged, you can\n"
+"try to recover it using this option. Please be careful and remember that it\n"
+"can fail;\n"
"\n"
-" * \"Reload partition table\": discards all changes and loads your\n"
-"initial partition table;\n"
+" * \"Reload partition table\": discards all changes and loads your initial\n"
+"partition table;\n"
"\n"
-" * \"Removable media automounting\": unchecking this option will force\n"
+" * \"Removable media automounting\": unchecking this option will force\n"
"users to manually mount and unmount removable medias such as floppies and\n"
"CD-ROMs.\n"
"\n"
@@ -3434,7 +3502,7 @@ msgid ""
" * Ctrl-m to set the mount point.\n"
"\n"
"To get information about the different filesystem types available, please\n"
-"read the ext2fs chapter from the ``Reference Manual''.\n"
+"read the ext2FS chapter from the ``Reference Manual''.\n"
"\n"
"If you are installing on a PPC machine, you will want to create a small HFS\n"
"``bootstrap'' partition of at least 1MB, which will be used by the yaboot\n"
@@ -3498,7 +3566,7 @@ msgstr ""
"1MB, �������ڰ�װ�������� yaboot. ��������������������һЩ, ���� 50MB, \n"
"���ᷢ��������ʺϴ�Ž�����ʱ���õ��ı����ں�, �Լ� ramdisk ����."
-#: ../../help.pm_.c:513
+#: ../../help.pm_.c:507
msgid ""
"More than one Microsoft partition has been detected on your hard drive.\n"
"Please choose the one you want to resize in order to install your new\n"
@@ -3536,34 +3604,34 @@ msgstr ""
"\n"
"������ \"Linux ����\", \"Windows ����\", \"����\"�б�."
-#: ../../help.pm_.c:544
+#: ../../help.pm_.c:538
msgid "Please be patient. This operation can take several minutes."
msgstr "�����ĵȴ�. �ò������ܻ��ü�����."
-#: ../../help.pm_.c:547
+#: ../../help.pm_.c:541
msgid ""
"DrakX now needs to know if you want to perform a default (\"Recommended\")\n"
"installation or if you want to have greater control (\"Expert\"). You can\n"
"also choose to do a new install or an upgrade of an existing Mandrake Linux\n"
"system:\n"
"\n"
-" * \"Install\": completely wipes out the old system. In fact, depending on\n"
-"what currently holds your machine, you will be able to keep some old (Linux\n"
-"or other) partitions unchanged;\n"
+" * \"Install\": completely wipes out the old system, however, depending on\n"
+"what is currently installed on your machine, you may be able to keep some\n"
+"old partitions (Linux or otherwise) unchanged;\n"
"\n"
" * \"Upgrade\": this installation class allows to simply update the\n"
"packages currently installed on your Mandrake Linux system. It keeps the\n"
"current partitions of your hard drives as well as user configurations. All\n"
-"other configuration steps remain available with respect to plain\n"
+"other configuration steps remain available, similar to a normal\n"
"installation;\n"
"\n"
-" * \"Upgrade Packages Only\": this brand new class allows to upgrade an\n"
-"existing Mandrake Linux system while keeping all system configurations\n"
-"unchanged. Adding new packages to the current installation is also\n"
-"possible.\n"
+" * \"Upgrade Packages Only\": this new installation class allows you to\n"
+"upgrade an existing Mandrake Linux system while keeping all system\n"
+"configurations unchanged. Adding new packages to the current installation\n"
+"is also possible.\n"
"\n"
-"Upgrades should work fine for Mandrake Linux systems starting from \"8.1\"\n"
-"release.\n"
+"Upgrades should work fine on Mandrake Linux systems containing version\n"
+"\"8.1\" or later.\n"
"\n"
"Depending on your knowledge of GNU/Linux, select one of the following\n"
"choices:\n"
@@ -3572,11 +3640,11 @@ msgid ""
"operating system. The installation will be very easy and you will only be\n"
"asked a few questions;\n"
"\n"
-" * Expert: if you have a good knowledge of GNU/Linux, you can choose this\n"
-"installation class. The expert installation will allow you to perform a\n"
-"highly-customized installation. Answering some of the questions can be\n"
-"difficult if you do not have a good knowledge of GNU/Linux, so do not\n"
-"choose this unless you know what you are doing."
+" * Expert: if you have a good understanding of GNU/Linux, you may wish to\n"
+"perform a highly customized installation. Some of the decisions you will\n"
+"have to make may be difficult if you do not have good knowledge of\n"
+"GNU/Linux, so it is not recommended that those without a fair amount of\n"
+"experience select this installation class."
msgstr ""
"DrakX ������Ҫ֪����ѡ��ȱʡ��(\"����\")��װ����Ը���Լ����ƾ���(\"ר��\").\n"
"��������ѡ����ȫ�°�װ, ��������һ�����е� Mandrake Linux ϵͳ.\n"
@@ -3604,27 +3672,32 @@ msgstr ""
" ���˽�, �������ѻش�ijЩ����. ����, �����������ᷢ��ʲô, �벻Ҫѡ�������"
"��."
-#: ../../help.pm_.c:584
+#: ../../help.pm_.c:578
msgid ""
"Normally, DrakX selects the right keyboard for you (depending on the\n"
-"language you have chosen) and you won't even see this step. However, you\n"
-"might not have a keyboard that corresponds exactly to your language: for\n"
-"example, if you are an English speaking Swiss person, you may still want\n"
-"your keyboard to be a Swiss keyboard. Or if you speak English but are\n"
-"located in Quebec, you may find yourself in the same situation. In both\n"
-"cases, you will have to go back to this installation step and select an\n"
-"appropriate keyboard from the list.\n"
+"language you have chosen). However, you might not have a keyboard that\n"
+"corresponds exactly to your language: for example, if you are an English\n"
+"speaking Swiss person, you may still want your keyboard to be a Swiss\n"
+"keyboard. Or if you speak English but are located in Quebec, you may find\n"
+"yourself in the same situation. In both cases, you will have to go back to\n"
+"this installation step and select an appropriate keyboard from the list.\n"
"\n"
"Click on the \"More\" button to be presented with the complete list of\n"
-"supported keyboards."
+"supported keyboards.\n"
+"\n"
+"If you choose a keyboard layout based on a non-latin alphabet, you will be\n"
+"asked on next dialog to choose the key binding that will switch the\n"
+"keyboard layout between the latin and non latin layouts."
msgstr ""
"ͨ��, DrakX ������ѡ�������ѡ�����ú��ʵļ���. \n"
"������ļ��̲����ϸ�������Ե�Ҫ��, �����Դ��б���ѡ����Ҫ�ļ���.\n"
"\n"
"��� \"����\" ��ť���г�����֧�ֵļ���."
-#: ../../help.pm_.c:597
+#: ../../help.pm_.c:594
msgid ""
+"The first step is to choose your preferred language.\n"
+"\n"
"Please choose your preferred language for installation and system usage.\n"
"\n"
"Clicking on the \"Advanced\" button will allow you to select other\n"
@@ -3645,7 +3718,7 @@ msgstr ""
"\n"
"������ѡ����ָ��ӵ����Ժ͵�������, ���\"ȷ��\" ����."
-#: ../../help.pm_.c:610
+#: ../../help.pm_.c:609
msgid ""
"DrakX generally detects the number of buttons your mouse has. If not, it\n"
"assumes you have a two-button mouse and will set it up for third-button\n"
@@ -3658,7 +3731,14 @@ msgid ""
"If you choose a mouse other than the default, a test screen will be\n"
"displayed. Use the buttons and wheel to verify that the settings are\n"
"correct. If the mouse is not working well, press the space bar or [Return]\n"
-"to \"Cancel\" and choose again."
+"to \"Cancel\" and choose again.\n"
+"\n"
+"Wheel mouses are sometimes not automatically detected. You will need to\n"
+"manually select it in the list. Be sure to select the one corresponding to\n"
+"the correct port it is attached to. After you have pressed the \"OK\"\n"
+"button, a mouse image is displayed. You then need to move the wheel of your\n"
+"mouse to activate it correctly. Then test all buttons and movements are\n"
+"correct."
msgstr ""
"DrakX ͨ���ܼ����������ж��ٰ���. ���û�м�⵽, �����������������,\n"
"������ģ�������. DrakX ���Զ��ֱ� PS/2, ����, �� USB ���.\n"
@@ -3668,7 +3748,7 @@ msgstr ""
"�����ѡ��IJ���ȱʡ����, ����ֲ��Դ���, �����԰����������͹���, ȷ��\n"
"������ȷ, �����겻��������, ���ո���� [Return] ���� \"ȡ��\" Ȼ������ѡ��."
-#: ../../help.pm_.c:624
+#: ../../help.pm_.c:630
msgid ""
"Please select the correct port. For example, the \"COM1\" port under\n"
"Windows is named \"ttyS0\" under GNU/Linux."
@@ -3676,7 +3756,7 @@ msgstr ""
"��ѡ����ȷ�Ķ˿�. ����, \n"
"MS Windows ��� COM1, �� GNU/Linux ������� ttyS0."
-#: ../../help.pm_.c:628
+#: ../../help.pm_.c:634
msgid ""
"This is the most crucial decision point for the security of your GNU/Linux\n"
"system: you have to enter the \"root\" password. \"root\" is the system\n"
@@ -3706,9 +3786,9 @@ msgid ""
"In Expert mode, you will be asked if you will be connecting to an\n"
"authentication server, like NIS or LDAP.\n"
"\n"
-"If your network uses the LDAP (or NIS) protocol for authentication, select\n"
-"\"LDAP\" (or \"NIS\") as authentication. If you do not know, ask your\n"
-"network administrator.\n"
+"If your network uses either of the LDAP, NIS, or PDC Windows Domain\n"
+"authentication services, select the appropriate one as \"authentication\".\n"
+"If you do not know, ask your network administrator.\n"
"\n"
"If your computer is not connected to any administrated network, you will\n"
"want to choose \"Local files\" for authentication."
@@ -3747,7 +3827,7 @@ msgstr ""
"������ĵ���û�к���������, ������ѡ��\n"
"ʹ�� \"�����ļ�\" ��֤."
-#: ../../help.pm_.c:664
+#: ../../help.pm_.c:670
msgid ""
"LILO and grub are GNU/Linux bootloaders. This stage, normally, is totally\n"
"automated. In fact, DrakX analyzes the disk boot sector and acts\n"
@@ -3786,16 +3866,7 @@ msgid ""
"options. !!\n"
"\n"
"Clicking the \"Advanced\" button in this dialog will offer many advanced\n"
-"options, which are reserved to the expert user.\n"
-"\n"
-"After you have configured the general bootloader parameters, the list of\n"
-"boot options which will be available at boot time will be displayed.\n"
-"\n"
-"If there is another operating system installed on your machine, it will\n"
-"automatically be added to the boot menu. Here, you can choose to fine-tune\n"
-"the existing options. Select an entry and click \"Modify\" to modify or\n"
-"remove it; \"Add\" creates a new entry; and \"Done\" goes on to the next\n"
-"installation step."
+"options, which are reserved for the expert user."
msgstr ""
"LILO �� grub �� GNU/Linux ������������. �������ͨ����\n"
"ȫ�Զ���. DrakX ��������̵���������, ������\n"
@@ -3845,13 +3916,16 @@ msgstr ""
"\"����\" ����һ������Ŀ; ��\"���\" ������\n"
"��һ����װ����."
-#: ../../help.pm_.c:713
+#: ../../help.pm_.c:710
msgid ""
-"LILO (the LInux LOader) and grub are bootloaders: they are able to boot\n"
-"either GNU/Linux or any other operating system present on your computer.\n"
-"Normally, these other operating systems are correctly detected and\n"
-"installed. If this is not the case, you can add an entry by hand in this\n"
-"screen. Be careful to choose the correct parameters.\n"
+"After you have configured the general bootloader parameters, the list of\n"
+"boot options which will be available at boot time will be displayed.\n"
+"\n"
+"If there is another operating system installed on your machine, it will\n"
+"automatically be added to the boot menu. Here, you can choose to fine-tune\n"
+"the existing options. Select an entry and click \"Modify\" to modify or\n"
+"remove it; \"Add\" creates a new entry; and \"Done\" goes on to the next\n"
+"installation step.\n"
"\n"
"You may also not want to give access to these other operating systems to\n"
"anyone. In which case, you can delete the corresponding entries. But then,\n"
@@ -3937,18 +4011,18 @@ msgstr ""
#: ../../help.pm_.c:759
msgid ""
-"DrakX now detects any IDE device present in your computer. It will also\n"
-"scan for one or more PCI SCSI card(s) on your system. If a SCSI card is\n"
+"DrakX now detects any IDE devices present in your computer. It will also\n"
+"scan for one or more PCI SCSI cards on your system. If a SCSI card is\n"
"found, DrakX will automatically install the appropriate driver.\n"
"\n"
"Because hardware detection does not always detect a piece of hardware,\n"
"DrakX will ask you to confirm if a PCI SCSI card is present. Click \"Yes\"\n"
"if you know that there is a SCSI card installed in your machine. You will\n"
-"be presented a list of SCSI cards to choose from. Click \"No\" if you have\n"
-"no SCSI hardware. If you are unsure, you can check the list of hardware\n"
-"detected in your machine by selecting \"See hardware info\" and clicking\n"
-"\"OK\". Examine the list of hardware and then click on the \"OK\" button to\n"
-"return to the SCSI interface question.\n"
+"be presented with a list of SCSI cards to choose from. Click \"No\" if you\n"
+"have no SCSI hardware. If you are unsure, you can check the list of\n"
+"hardware detected in your machine by selecting \"See hardware info\" and\n"
+"clicking \"OK\". Examine the list of hardware and then click on the \"OK\"\n"
+"button to return to the SCSI interface question.\n"
"\n"
"If you have to manually specify your adapter, DrakX will ask if you want to\n"
"specify options for it. You should allow DrakX to probe the hardware for\n"
@@ -4151,7 +4225,9 @@ msgid ""
"order to configure the clock according to the time zone you are in;\n"
"\n"
" * \"Printer\": clicking on the \"No Printer\" button will open the printer\n"
-"configuration wizard;\n"
+"configuration wizard. Consult the corresponding chapter of the ``User\n"
+"Guide'' for more information on how to setup a new printer. The interface\n"
+"presented there is similar to the one used during installation;\n"
"\n"
" * \"Sound card\": if a sound card is detected on your system, it is\n"
"displayed here. No modification possible at installation time;\n"
@@ -4191,7 +4267,7 @@ msgstr ""
"������������ʾ. �����Ե����ť, \n"
"�޸������йصIJ���."
-#: ../../help.pm_.c:894
+#: ../../help.pm_.c:896
msgid ""
"Choose the hard drive you want to erase in order to install your new\n"
"Mandrake Linux partition. Be careful, all data present on it will be lost\n"
@@ -4200,7 +4276,7 @@ msgstr ""
"ѡ��Ӳ����׼���������װ Mandrake����.\n"
"ע�⣬�������ݽ���ʧ�����޷��ָ�."
-#: ../../help.pm_.c:899
+#: ../../help.pm_.c:901
msgid ""
"Click on \"OK\" if you want to delete all data and partitions present on\n"
"this hard drive. Be careful, after clicking on \"OK\", you will not be able\n"
@@ -4231,7 +4307,7 @@ msgstr ""
msgid "You must also format %s"
msgstr "���������ʽ�� %s"
-#: ../../install_any.pm_.c:418
+#: ../../install_any.pm_.c:423
#, c-format
msgid ""
"You have selected the following server(s): %s\n"
@@ -4254,30 +4330,51 @@ msgstr ""
"\n"
"���氲װ��Щ����?\n"
-#: ../../install_any.pm_.c:453
+#: ../../install_any.pm_.c:441
+#, c-format
+msgid ""
+"The following packages will be removed to allow upgrading your system: %s\n"
+"\n"
+"\n"
+"Do you really want to remove these packages?\n"
+msgstr ""
+"Ϊ������������ϵͳ, ��Ҫɾ�����е�������: %s\n"
+"\n"
+"\n"
+"��ȷ��Ҫɾ����Щ��������?\n"
+
+#: ../../install_any.pm_.c:471
msgid "Can't use broadcast with no NIS domain"
msgstr "û��NIS�� �޷�ʹ�ù㲥"
-#: ../../install_any.pm_.c:841
+#: ../../install_any.pm_.c:862
#, c-format
msgid "Insert a FAT formatted floppy in drive %s"
msgstr "�����һ��DOS���̵������� %s"
-#: ../../install_any.pm_.c:845
+#: ../../install_any.pm_.c:866
msgid "This floppy is not FAT formatted"
msgstr "����DOS��ʽ������"
-#: ../../install_any.pm_.c:857
+#: ../../install_any.pm_.c:878
msgid ""
"To use this saved packages selection, boot installation with ``linux "
"defcfg=floppy''"
msgstr "ʹ�ñ����������ѡ��, ��''linux defcfg=floppy''����"
-#: ../../install_any.pm_.c:880 ../../partition_table.pm_.c:771
+#: ../../install_any.pm_.c:901 ../../partition_table.pm_.c:767
#, c-format
msgid "Error reading file %s"
msgstr "��ȡ�ļ� %s ���� "
+#: ../../install_any.pm_.c:1023
+msgid ""
+"An error occurred - no valid devices were found on which to create new "
+"filesystems. Please check your hardware for the cause of this problem"
+msgstr ""
+"��������! �½��ļ�ϵͳʱ�Ҳ������õ��豸��\n"
+"��������Ӳ����ȷ�������ԭ�� !"
+
#: ../../install_interactive.pm_.c:23
#, c-format
msgid ""
@@ -4311,59 +4408,59 @@ msgstr ""
"\n"
"Ҫ������?"
-#: ../../install_interactive.pm_.c:67 ../../install_steps.pm_.c:168
+#: ../../install_interactive.pm_.c:67 ../../install_steps.pm_.c:169
msgid "You must have a FAT partition mounted in /boot/efi"
msgstr "��������һ��FAT���� ���� /boot/efi"
-#: ../../install_interactive.pm_.c:91
+#: ../../install_interactive.pm_.c:92
msgid "Use free space"
msgstr "ʹ�ÿ��пռ�"
-#: ../../install_interactive.pm_.c:93
+#: ../../install_interactive.pm_.c:94
msgid "Not enough free space to allocate new partitions"
msgstr "û���㹻���пռ������·���"
-#: ../../install_interactive.pm_.c:101
+#: ../../install_interactive.pm_.c:102
msgid "Use existing partitions"
msgstr "ʹ���ִ�ķ���"
-#: ../../install_interactive.pm_.c:103
+#: ../../install_interactive.pm_.c:104
msgid "There is no existing partition to use"
msgstr "�ִ�ķ����޷�ʹ��"
-#: ../../install_interactive.pm_.c:110
+#: ../../install_interactive.pm_.c:111
msgid "Use the Windows partition for loopback"
msgstr "���� Windows ���������"
-#: ../../install_interactive.pm_.c:113
+#: ../../install_interactive.pm_.c:114
msgid "Which partition do you want to use for Linux4Win?"
msgstr "������Ҫ����һ��������� Linux4Win?"
-#: ../../install_interactive.pm_.c:115
+#: ../../install_interactive.pm_.c:116
msgid "Choose the sizes"
msgstr "ѡ���С"
-#: ../../install_interactive.pm_.c:116
+#: ../../install_interactive.pm_.c:117
msgid "Root partition size in MB: "
msgstr "��������С(MB): "
-#: ../../install_interactive.pm_.c:117
+#: ../../install_interactive.pm_.c:118
msgid "Swap partition size in MB: "
msgstr "����������С (MB): "
-#: ../../install_interactive.pm_.c:126
+#: ../../install_interactive.pm_.c:128
msgid "Use the free space on the Windows partition"
msgstr "ʹ���� Windows �����ϵĿ��пռ�"
-#: ../../install_interactive.pm_.c:129
+#: ../../install_interactive.pm_.c:131
msgid "Which partition do you want to resize?"
msgstr "����Ҫ�ı��ĸ������Ĵ�С?"
-#: ../../install_interactive.pm_.c:131
+#: ../../install_interactive.pm_.c:133
msgid "Resizing Windows partition"
msgstr "���� Windows �ļ�ϵͳ�ı߽�"
-#: ../../install_interactive.pm_.c:134
+#: ../../install_interactive.pm_.c:136
#, c-format
msgid ""
"The FAT resizer is unable to handle your partition, \n"
@@ -4372,7 +4469,7 @@ msgstr ""
"�ı� FAT ������С�ij����޷������������, \n"
"���������´���: %s"
-#: ../../install_interactive.pm_.c:137
+#: ../../install_interactive.pm_.c:139
msgid ""
"Your Windows partition is too fragmented. Please reboot your computer under "
"Windows, run the ``defrag'' utility, then restart the Mandrake Linux "
@@ -4381,7 +4478,7 @@ msgstr ""
"���� Windows ������̫����Ƭ, ��������, ���� Windows, ���� ``defrag''Ȼ����"
"�¿�ʼ��װ Mandrake Linux"
-#: ../../install_interactive.pm_.c:138
+#: ../../install_interactive.pm_.c:140
msgid ""
"WARNING!\n"
"\n"
@@ -4399,52 +4496,52 @@ msgstr ""
"׼��, Ȼ�����¿�ʼ��װ.\n"
"һ�о�����, �밴 \"ȷ��\"."
-#: ../../install_interactive.pm_.c:148
+#: ../../install_interactive.pm_.c:150
msgid "Which size do you want to keep for Windows on"
msgstr "�����������ٿռ�� windows?"
-#: ../../install_interactive.pm_.c:149
+#: ../../install_interactive.pm_.c:151
#, c-format
msgid "partition %s"
msgstr "���� %s"
-#: ../../install_interactive.pm_.c:156
+#: ../../install_interactive.pm_.c:158
#, c-format
msgid "FAT resizing failed: %s"
msgstr "�Զ�������Сʧ��: %s"
-#: ../../install_interactive.pm_.c:171
+#: ../../install_interactive.pm_.c:173
msgid ""
"There is no FAT partition to resize or to use as loopback (or not enough "
"space left)"
msgstr "û�п��Ե�����С���������ػ��� FAT ���� (����û���㹻ʣ��ռ�)"
-#: ../../install_interactive.pm_.c:177
+#: ../../install_interactive.pm_.c:179
msgid "Erase entire disk"
msgstr "�����������"
-#: ../../install_interactive.pm_.c:177
+#: ../../install_interactive.pm_.c:179
msgid "Remove Windows(TM)"
msgstr "ɾ�� Windows(TM)"
-#: ../../install_interactive.pm_.c:180
+#: ../../install_interactive.pm_.c:182
msgid "You have more than one hard drive, which one do you install linux on?"
msgstr "���в�ֻһ��Ӳ��, ��Ҫ���ĸ����氲װ Linux?"
-#: ../../install_interactive.pm_.c:183
+#: ../../install_interactive.pm_.c:185
#, c-format
msgid "ALL existing partitions and their data will be lost on drive %s"
msgstr "���� %s ���ִ�����з����������Ͻ������"
-#: ../../install_interactive.pm_.c:191
+#: ../../install_interactive.pm_.c:193
msgid "Custom disk partitioning"
msgstr "���Ʒ���"
-#: ../../install_interactive.pm_.c:195
+#: ../../install_interactive.pm_.c:197
msgid "Use fdisk"
msgstr "ʹ�� fdisk"
-#: ../../install_interactive.pm_.c:198
+#: ../../install_interactive.pm_.c:200
#, c-format
msgid ""
"You can now partition %s.\n"
@@ -4453,28 +4550,28 @@ msgstr ""
"�����ڿ����� %s ��������\n"
"����֮��, ��Ҫ������ `w' ����������޸�"
-#: ../../install_interactive.pm_.c:227
+#: ../../install_interactive.pm_.c:229
msgid "You don't have enough free space on your Windows partition"
msgstr "�� Windows ������û���㹻�Ŀ��пռ�"
-#: ../../install_interactive.pm_.c:243
+#: ../../install_interactive.pm_.c:245
msgid "I can't find any room for installing"
msgstr "���޷��ҵ���װ��Ҫ�Ŀռ�"
-#: ../../install_interactive.pm_.c:246
+#: ../../install_interactive.pm_.c:248
msgid "The DrakX Partitioning wizard found the following solutions:"
msgstr "DrakX ������ʦ������Щ����취:"
-#: ../../install_interactive.pm_.c:250
+#: ../../install_interactive.pm_.c:252
#, c-format
msgid "Partitioning failed: %s"
msgstr "����ʧ��: %s"
-#: ../../install_interactive.pm_.c:260
+#: ../../install_interactive.pm_.c:262
msgid "Bringing up the network"
msgstr "������������"
-#: ../../install_interactive.pm_.c:265
+#: ../../install_interactive.pm_.c:267
msgid "Bringing down the network"
msgstr "���ڽ������繦��"
@@ -4486,12 +4583,12 @@ msgstr ""
"��������, �����Ҳ�֪�������������ź�.\n"
"������ȥ�������Ϳ�����������."
-#: ../../install_steps.pm_.c:210
+#: ../../install_steps.pm_.c:211
#, c-format
msgid "Duplicate mount point %s"
msgstr "�ظ���װ�ص� %s"
-#: ../../install_steps.pm_.c:379
+#: ../../install_steps.pm_.c:380
msgid ""
"Some important packages didn't get installed properly.\n"
"Either your cdrom drive or your cdrom is defective.\n"
@@ -4502,12 +4599,12 @@ msgstr ""
"����һ̨��װ�õĵ����ϼ�����, ������\n"
"\"rpm -qpl Mandrake/RPMS/*.rpm\"\n"
-#: ../../install_steps.pm_.c:451
+#: ../../install_steps.pm_.c:452
#, c-format
msgid "Welcome to %s"
msgstr "��ӭ���� %s"
-#: ../../install_steps.pm_.c:530 ../../install_steps.pm_.c:770
+#: ../../install_steps.pm_.c:531 ../../install_steps.pm_.c:772
msgid "No floppy drive available"
msgstr "û�п��õ�����������."
@@ -4536,69 +4633,69 @@ msgstr "��װ���"
msgid "Please choose one of the following classes of installation:"
msgstr "������а�װ�����ѡ��һ��:"
-#: ../../install_steps_gtk.pm_.c:243 ../../install_steps_interactive.pm_.c:694
+#: ../../install_steps_gtk.pm_.c:237 ../../install_steps_interactive.pm_.c:678
msgid "Package Group Selection"
msgstr "������ѡ��"
-#: ../../install_steps_gtk.pm_.c:276 ../../install_steps_interactive.pm_.c:709
+#: ../../install_steps_gtk.pm_.c:270 ../../install_steps_interactive.pm_.c:693
msgid "Individual package selection"
msgstr "ѡ�񵥸�������"
-#: ../../install_steps_gtk.pm_.c:299 ../../install_steps_interactive.pm_.c:633
+#: ../../install_steps_gtk.pm_.c:293 ../../install_steps_interactive.pm_.c:617
#, c-format
msgid "Total size: %d / %d MB"
msgstr "�ܹ���С: %d / %d MB"
-#: ../../install_steps_gtk.pm_.c:341
+#: ../../install_steps_gtk.pm_.c:335
msgid "Bad package"
msgstr "���������"
-#: ../../install_steps_gtk.pm_.c:342
+#: ../../install_steps_gtk.pm_.c:336
#, c-format
msgid "Name: %s\n"
msgstr "����: %s\n"
-#: ../../install_steps_gtk.pm_.c:343
+#: ../../install_steps_gtk.pm_.c:337
#, c-format
msgid "Version: %s\n"
msgstr "�汾: %s\n"
-#: ../../install_steps_gtk.pm_.c:344
+#: ../../install_steps_gtk.pm_.c:338
#, c-format
msgid "Size: %d KB\n"
msgstr "��С: %d KB\n"
-#: ../../install_steps_gtk.pm_.c:345
+#: ../../install_steps_gtk.pm_.c:339
#, c-format
msgid "Importance: %s\n"
msgstr "��Ҫ��: %s\n"
-#: ../../install_steps_gtk.pm_.c:367
+#: ../../install_steps_gtk.pm_.c:361
msgid ""
"You can't select this package as there is not enough space left to install it"
msgstr "��������ѡ�����������. û���㹻�ռ䰲װ��."
-#: ../../install_steps_gtk.pm_.c:372
+#: ../../install_steps_gtk.pm_.c:366
msgid "The following packages are going to be installed"
msgstr "������������Ҫ����װ"
-#: ../../install_steps_gtk.pm_.c:373
+#: ../../install_steps_gtk.pm_.c:367
msgid "The following packages are going to be removed"
msgstr "������������Ҫ��ж��"
-#: ../../install_steps_gtk.pm_.c:385
+#: ../../install_steps_gtk.pm_.c:379
msgid "You can't select/unselect this package"
msgstr "�����ܸı������������ѡ��"
-#: ../../install_steps_gtk.pm_.c:397
+#: ../../install_steps_gtk.pm_.c:391
msgid "This is a mandatory package, it can't be unselected"
msgstr "����������DZ����, ����ȡ��ѡ��"
-#: ../../install_steps_gtk.pm_.c:399
+#: ../../install_steps_gtk.pm_.c:393
msgid "You can't unselect this package. It is already installed"
msgstr "��������ȡ��ѡ�����������. ���Ѿ���װ����."
-#: ../../install_steps_gtk.pm_.c:402
+#: ../../install_steps_gtk.pm_.c:396
msgid ""
"This package must be upgraded.\n"
"Are you sure you want to deselect it?"
@@ -4606,74 +4703,74 @@ msgstr ""
"��������������������.\n"
"�����Ҫɾ������?"
-#: ../../install_steps_gtk.pm_.c:405
+#: ../../install_steps_gtk.pm_.c:399
msgid "You can't unselect this package. It must be upgraded"
msgstr "�����ܲ�ѡ�����������, ����������"
-#: ../../install_steps_gtk.pm_.c:410
+#: ../../install_steps_gtk.pm_.c:404
msgid "Show automatically selected packages"
msgstr "��ʾ�Զ�ѡ�е�������"
-#: ../../install_steps_gtk.pm_.c:411 ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_gtk.pm_.c:405 ../../install_steps_interactive.pm_.c:255
#: ../../install_steps_interactive.pm_.c:259
-#: ../../standalone/drakbackup_.c:3600
+#: ../../standalone/drakbackup_.c:4257
msgid "Install"
msgstr "��װ"
-#: ../../install_steps_gtk.pm_.c:414
+#: ../../install_steps_gtk.pm_.c:408
msgid "Load/Save on floppy"
msgstr "��������/����"
-#: ../../install_steps_gtk.pm_.c:415
+#: ../../install_steps_gtk.pm_.c:409
msgid "Updating package selection"
msgstr "����������ѡ��"
-#: ../../install_steps_gtk.pm_.c:420
+#: ../../install_steps_gtk.pm_.c:414
msgid "Minimal install"
msgstr "��С��װ"
-#: ../../install_steps_gtk.pm_.c:435 ../../install_steps_interactive.pm_.c:538
+#: ../../install_steps_gtk.pm_.c:429 ../../install_steps_interactive.pm_.c:522
msgid "Choose the packages you want to install"
msgstr "ѡ����Ҫ��װ��������"
-#: ../../install_steps_gtk.pm_.c:451 ../../install_steps_interactive.pm_.c:778
+#: ../../install_steps_gtk.pm_.c:445 ../../install_steps_interactive.pm_.c:762
msgid "Installing"
msgstr "���ڰ�װ"
-#: ../../install_steps_gtk.pm_.c:457
+#: ../../install_steps_gtk.pm_.c:451
msgid "Estimating"
msgstr "���ڹ���"
-#: ../../install_steps_gtk.pm_.c:464
+#: ../../install_steps_gtk.pm_.c:458
msgid "Time remaining "
msgstr "ʣ��ʱ��"
-#: ../../install_steps_gtk.pm_.c:476
+#: ../../install_steps_gtk.pm_.c:470
msgid "Please wait, preparing installation..."
msgstr "����׼����װ"
-#: ../../install_steps_gtk.pm_.c:560
+#: ../../install_steps_gtk.pm_.c:554
#, c-format
msgid "%d packages"
msgstr "%d ������"
-#: ../../install_steps_gtk.pm_.c:565
+#: ../../install_steps_gtk.pm_.c:559
#, c-format
msgid "Installing package %s"
msgstr "���ڰ�װ���� %s"
-#: ../../install_steps_gtk.pm_.c:602 ../../install_steps_interactive.pm_.c:189
-#: ../../install_steps_interactive.pm_.c:802
+#: ../../install_steps_gtk.pm_.c:596 ../../install_steps_interactive.pm_.c:189
+#: ../../install_steps_interactive.pm_.c:786
#: ../../standalone/drakautoinst_.c:202
msgid "Accept"
msgstr "����"
-#: ../../install_steps_gtk.pm_.c:602 ../../install_steps_interactive.pm_.c:189
-#: ../../install_steps_interactive.pm_.c:802
+#: ../../install_steps_gtk.pm_.c:596 ../../install_steps_interactive.pm_.c:189
+#: ../../install_steps_interactive.pm_.c:786
msgid "Refuse"
msgstr "�ܾ�"
-#: ../../install_steps_gtk.pm_.c:603 ../../install_steps_interactive.pm_.c:803
+#: ../../install_steps_gtk.pm_.c:597 ../../install_steps_interactive.pm_.c:787
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -4687,17 +4784,17 @@ msgstr ""
"�����������в������ \"%s\" �Ĺ���, Ȼ���� 'ȷ��'.\n"
"�����û�����Ź���, ���� 'ȡ��', ������װ��������ϵ�����."
-#: ../../install_steps_gtk.pm_.c:617 ../../install_steps_gtk.pm_.c:621
-#: ../../install_steps_interactive.pm_.c:815
-#: ../../install_steps_interactive.pm_.c:819
+#: ../../install_steps_gtk.pm_.c:611 ../../install_steps_gtk.pm_.c:615
+#: ../../install_steps_interactive.pm_.c:799
+#: ../../install_steps_interactive.pm_.c:803
msgid "Go on anyway?"
msgstr "���Ҫ����"
-#: ../../install_steps_gtk.pm_.c:617 ../../install_steps_interactive.pm_.c:815
+#: ../../install_steps_gtk.pm_.c:611 ../../install_steps_interactive.pm_.c:799
msgid "There was an error ordering packages:"
msgstr "����������ʱ����"
-#: ../../install_steps_gtk.pm_.c:621 ../../install_steps_interactive.pm_.c:819
+#: ../../install_steps_gtk.pm_.c:615 ../../install_steps_interactive.pm_.c:803
msgid "There was an error installing packages:"
msgstr "��װ������ʱ����:"
@@ -5016,7 +5113,7 @@ msgid "Are you sure you refuse the licence?"
msgstr "�����Ҫ�ܾ��������Э����?"
#: ../../install_steps_interactive.pm_.c:211
-#: ../../install_steps_interactive.pm_.c:1038
+#: ../../install_steps_interactive.pm_.c:1023
#: ../../standalone/keyboarddrake_.c:31
msgid "Keyboard"
msgstr "����"
@@ -5064,11 +5161,11 @@ msgstr "ֻ����������"
msgid "Please choose the type of your mouse."
msgstr "��ѡ�������������."
-#: ../../install_steps_interactive.pm_.c:281 ../../standalone/mousedrake_.c:59
+#: ../../install_steps_interactive.pm_.c:281 ../../standalone/mousedrake_.c:60
msgid "Mouse Port"
msgstr "���˿�"
-#: ../../install_steps_interactive.pm_.c:282 ../../standalone/mousedrake_.c:60
+#: ../../install_steps_interactive.pm_.c:282 ../../standalone/mousedrake_.c:61
msgid "Please choose on which serial port your mouse is connected to."
msgstr "��ѡ��������������ӵ��Ǹ����п� ?"
@@ -5100,119 +5197,94 @@ msgstr "�������� IDE"
msgid "IDE"
msgstr "IDE"
-#: ../../install_steps_interactive.pm_.c:336
+#: ../../install_steps_interactive.pm_.c:338
msgid "No partition available"
msgstr "û�п��õ�Ӳ�̷���"
-#: ../../install_steps_interactive.pm_.c:339
+#: ../../install_steps_interactive.pm_.c:341
msgid "Scanning partitions to find mount points"
msgstr "����ɨ�����������Ѱ��װ�ص�"
-#: ../../install_steps_interactive.pm_.c:347
+#: ../../install_steps_interactive.pm_.c:349
msgid "Choose the mount points"
msgstr "ѡ��װ�ص�"
-#: ../../install_steps_interactive.pm_.c:366
-#, c-format
-msgid ""
-"I can't read your partition table, it's too corrupted for me :(\n"
-"I can try to go on, erasing over bad partitions (ALL DATA will be lost!).\n"
-"The other solution is to not allow DrakX to modify the partition table.\n"
-"(the error is %s)\n"
-"\n"
-"Do you agree to loose all the partitions?\n"
-msgstr ""
-"���޷���ȡ���ķ�����, ����������ƻ���̫������ :(\n"
-"�ҿ��Գ������������ (���е����ݽ������!)\n"
-"����һ������취�ǽ�ֹ DrakX �޸ķ�����.\n"
-"(������ %s)\n"
-"\n"
-"��ͬ��������з�����?\n"
-
#: ../../install_steps_interactive.pm_.c:379
msgid ""
-"DiskDrake failed to read correctly the partition table.\n"
-"Continue at your own risk!"
-msgstr ""
-"DiskDrake �޷���ȷ����������������.\n"
-"������ȥ�������Ϳ�����������!"
-
-#: ../../install_steps_interactive.pm_.c:396
-msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
"system, you'll need to create the bootstrap partition in DiskDrake"
msgstr ""
"�޷��������������ռ�(1MB)! ��װ������, ����������ϵͳ, ������DiskDrake������"
"������"
-#: ../../install_steps_interactive.pm_.c:405
+#: ../../install_steps_interactive.pm_.c:388
msgid "No root partition found to perform an upgrade"
msgstr "����û���ҵ���Ŀ¼����"
-#: ../../install_steps_interactive.pm_.c:406
+#: ../../install_steps_interactive.pm_.c:389
msgid "Root Partition"
msgstr "��Ŀ¼����"
-#: ../../install_steps_interactive.pm_.c:407
+#: ../../install_steps_interactive.pm_.c:390
msgid "What is the root partition (/) of your system?"
msgstr "���ĸ�Ŀ¼����(/)����һ�� ?"
-#: ../../install_steps_interactive.pm_.c:421
+#: ../../install_steps_interactive.pm_.c:404
msgid "You need to reboot for the partition table modifications to take place"
msgstr "������Ҫ��������ʹ�ı���Ч"
-#: ../../install_steps_interactive.pm_.c:445
+#: ../../install_steps_interactive.pm_.c:428
msgid "Choose the partitions you want to format"
msgstr "��ѡ����Ҫ��ʽ���ķ���"
-#: ../../install_steps_interactive.pm_.c:446
+#: ../../install_steps_interactive.pm_.c:429
msgid "Check bad blocks?"
msgstr "�Ƿ��黵�ſ�?"
-#: ../../install_steps_interactive.pm_.c:473
+#: ../../install_steps_interactive.pm_.c:456
msgid "Formatting partitions"
msgstr "���ڸ�ʽ����������"
-#: ../../install_steps_interactive.pm_.c:475
+#: ../../install_steps_interactive.pm_.c:458
#, c-format
msgid "Creating and formatting file %s"
msgstr "���ڴ����͸�ʽ���ļ� %s"
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:463
#, c-format
msgid ""
"Failed to check filesystem %s. Do you want to repair the errors? (beware, "
"you can loose data)"
msgstr "�޷�����ļ�ϵͳ %s. �����޸�������? (ע��, �п��ܶ�ʧ����)"
-#: ../../install_steps_interactive.pm_.c:482
+#: ../../install_steps_interactive.pm_.c:465
msgid "Not enough swap space to fulfill installation, please add some"
msgstr "�Ի��ռ�̫��, �޷���ɰ�װ, �����󽻻�����."
-#: ../../install_steps_interactive.pm_.c:489
+#: ../../install_steps_interactive.pm_.c:472
msgid "Looking for available packages and rebuilding rpm database..."
msgstr "Ѱ�ҿɰ�װ�ij����ؽ� rpm ���ݿ�..."
-#: ../../install_steps_interactive.pm_.c:490
+#: ../../install_steps_interactive.pm_.c:473
msgid "Looking for available packages..."
msgstr "Ѱ�ҿɰ�װ�ij���..."
-#: ../../install_steps_interactive.pm_.c:493
+#: ../../install_steps_interactive.pm_.c:476
msgid "Looking at packages already installed..."
msgstr "�����Ѿ���װ����������."
-#: ../../install_steps_interactive.pm_.c:497
+#: ../../install_steps_interactive.pm_.c:480
msgid "Finding packages to upgrade..."
msgstr "Ѱ�ҿ������ij���..."
-#: ../../install_steps_interactive.pm_.c:515
+#: ../../install_steps_interactive.pm_.c:498
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%d "
"> %d)"
msgstr "����ϵͳ��ʣ��Ŀռ䲻�����а�װ������ (%d > %d)"
-#: ../../install_steps_interactive.pm_.c:550
+#: ../../install_steps_interactive.pm_.c:534
msgid ""
"Please choose load or save package selection on floppy.\n"
"The format is the same as auto_install generated floppies."
@@ -5220,53 +5292,53 @@ msgstr ""
"��ѡ������������򱣴�������ѡ����Ϣ.\n"
"��ʽ���Զ���װ���ɵ�����һ��"
-#: ../../install_steps_interactive.pm_.c:553
+#: ../../install_steps_interactive.pm_.c:537
msgid "Load from floppy"
msgstr "����������"
-#: ../../install_steps_interactive.pm_.c:555
+#: ../../install_steps_interactive.pm_.c:539
msgid "Loading from floppy"
msgstr "������������"
-#: ../../install_steps_interactive.pm_.c:555
+#: ../../install_steps_interactive.pm_.c:539
msgid "Package selection"
msgstr "������ѡ��"
-#: ../../install_steps_interactive.pm_.c:560
+#: ../../install_steps_interactive.pm_.c:544
msgid "Insert a floppy containing package selection"
msgstr "�����������ѡ������"
-#: ../../install_steps_interactive.pm_.c:572
+#: ../../install_steps_interactive.pm_.c:556
msgid "Save on floppy"
msgstr "����������"
-#: ../../install_steps_interactive.pm_.c:646
+#: ../../install_steps_interactive.pm_.c:630
msgid "Selected size is larger than available space"
msgstr "��ѡ��ij������ÿռ�"
-#: ../../install_steps_interactive.pm_.c:660
+#: ../../install_steps_interactive.pm_.c:644
msgid "Type of install"
msgstr "��װ����"
-#: ../../install_steps_interactive.pm_.c:661
+#: ../../install_steps_interactive.pm_.c:645
msgid ""
"You haven't selected any group of packages.\n"
"Please choose the minimal installation you want:"
msgstr "��û��ѡ���κε����, ��ѡ����С��װ"
-#: ../../install_steps_interactive.pm_.c:664
+#: ../../install_steps_interactive.pm_.c:648
msgid "With X"
msgstr "��װ X Window ϵͳ"
-#: ../../install_steps_interactive.pm_.c:666
+#: ../../install_steps_interactive.pm_.c:650
msgid "With basic documentation (recommended!)"
msgstr "��װ�����ĵ� (����)"
-#: ../../install_steps_interactive.pm_.c:667
+#: ../../install_steps_interactive.pm_.c:651
msgid "Truly minimal install (especially no urpmi)"
msgstr "��С��װ (�ް���������)"
-#: ../../install_steps_interactive.pm_.c:752
+#: ../../install_steps_interactive.pm_.c:736
msgid ""
"If you have all the CDs in the list below, click Ok.\n"
"If you have none of those CDs, click Cancel.\n"
@@ -5276,16 +5348,16 @@ msgstr ""
"�����û���κ�һ��, ��� ȡ��.\n"
"�����ֻȱ����һЩ, ��ѡ����, Ȼ���� ȷ��."
-#: ../../install_steps_interactive.pm_.c:757
+#: ../../install_steps_interactive.pm_.c:741
#, c-format
msgid "Cd-Rom labeled \"%s\""
msgstr "��� %s ��CD-ROM "
-#: ../../install_steps_interactive.pm_.c:778
+#: ../../install_steps_interactive.pm_.c:762
msgid "Preparing installation"
msgstr "����׼����װ"
-#: ../../install_steps_interactive.pm_.c:787
+#: ../../install_steps_interactive.pm_.c:771
#, c-format
msgid ""
"Installing package %s\n"
@@ -5294,21 +5366,21 @@ msgstr ""
"���ڰ�װ������ %s \n"
"%d%%"
-#: ../../install_steps_interactive.pm_.c:833
+#: ../../install_steps_interactive.pm_.c:817
msgid "Post-install configuration"
msgstr "��װ�������"
-#: ../../install_steps_interactive.pm_.c:839
+#: ../../install_steps_interactive.pm_.c:823
#, c-format
msgid "Please insert the Boot floppy used in drive %s"
msgstr "�����һ���������̵������� %s"
-#: ../../install_steps_interactive.pm_.c:845
+#: ../../install_steps_interactive.pm_.c:829
#, c-format
msgid "Please insert the Update Modules floppy in drive %s"
msgstr "���������� %s �в���һ�Ÿ���ģ������"
-#: ../../install_steps_interactive.pm_.c:865
+#: ../../install_steps_interactive.pm_.c:849
msgid ""
"You now have the opportunity to download encryption software.\n"
"\n"
@@ -5371,7 +5443,7 @@ msgstr ""
"Altadena California 91001\n"
"USA"
-#: ../../install_steps_interactive.pm_.c:904
+#: ../../install_steps_interactive.pm_.c:888
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
"have been released after the distribution was released. They may\n"
@@ -5386,154 +5458,154 @@ msgstr ""
"\n"
"���Ƿ�Ҫ��װ����?"
-#: ../../install_steps_interactive.pm_.c:919
+#: ../../install_steps_interactive.pm_.c:903
msgid ""
"Contacting Mandrake Linux web site to get the list of available mirrors..."
msgstr "�������� Mandrake Linux ��վ�Ի�þ�����վ�б�..."
-#: ../../install_steps_interactive.pm_.c:924
+#: ../../install_steps_interactive.pm_.c:908
msgid "Choose a mirror from which to get the packages"
msgstr "ѡ��һ��������վ��ȡ�ó���"
-#: ../../install_steps_interactive.pm_.c:933
+#: ../../install_steps_interactive.pm_.c:917
msgid "Contacting the mirror to get the list of available packages..."
msgstr "�������Ӿ�����վ��ȡ�ÿɹ���װ������б�..."
-#: ../../install_steps_interactive.pm_.c:960
+#: ../../install_steps_interactive.pm_.c:945
msgid "Which is your timezone?"
msgstr "�����ڵ�ʱ��?"
-#: ../../install_steps_interactive.pm_.c:965
+#: ../../install_steps_interactive.pm_.c:950
msgid "Hardware clock set to GMT"
msgstr "����ϵͳʱ���趨Ϊ GMT"
-#: ../../install_steps_interactive.pm_.c:966
+#: ../../install_steps_interactive.pm_.c:951
msgid "Automatic time synchronization (using NTP)"
msgstr "�Զ�ʱ��ͬ��(ʹ��NTP)"
-#: ../../install_steps_interactive.pm_.c:973
+#: ../../install_steps_interactive.pm_.c:958
msgid "NTP Server"
msgstr "NTP ������"
-#: ../../install_steps_interactive.pm_.c:1007
-#: ../../install_steps_interactive.pm_.c:1015
+#: ../../install_steps_interactive.pm_.c:992
+#: ../../install_steps_interactive.pm_.c:1000
msgid "Remote CUPS server"
msgstr "Զ�� CUPS ������"
-#: ../../install_steps_interactive.pm_.c:1008
+#: ../../install_steps_interactive.pm_.c:993
msgid "No printer"
msgstr "û�д�ӡ��"
-#: ../../install_steps_interactive.pm_.c:1025
+#: ../../install_steps_interactive.pm_.c:1010
msgid "Do you have an ISA sound card?"
msgstr "���� ISA ������?"
-#: ../../install_steps_interactive.pm_.c:1027
+#: ../../install_steps_interactive.pm_.c:1012
msgid "Run \"sndconfig\" after installation to configure your sound card"
msgstr "��װ֮������ \"sndconfig\"��������������"
-#: ../../install_steps_interactive.pm_.c:1029
+#: ../../install_steps_interactive.pm_.c:1014
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr "û���ҵ�����. ���ڰ�װ֮����\"harddrake\"."
-#: ../../install_steps_interactive.pm_.c:1034 ../../steps.pm_.c:27
+#: ../../install_steps_interactive.pm_.c:1019 ../../steps.pm_.c:27
msgid "Summary"
msgstr "��Ҫ"
-#: ../../install_steps_interactive.pm_.c:1037
+#: ../../install_steps_interactive.pm_.c:1022
msgid "Mouse"
msgstr "���"
-#: ../../install_steps_interactive.pm_.c:1039
+#: ../../install_steps_interactive.pm_.c:1024
msgid "Timezone"
msgstr "ʱ��"
-#: ../../install_steps_interactive.pm_.c:1040 ../../printerdrake.pm_.c:2728
-#: ../../printerdrake.pm_.c:2814
+#: ../../install_steps_interactive.pm_.c:1025 ../../printerdrake.pm_.c:2937
+#: ../../printerdrake.pm_.c:3026
msgid "Printer"
msgstr "��ӡ��"
-#: ../../install_steps_interactive.pm_.c:1042
+#: ../../install_steps_interactive.pm_.c:1027
msgid "ISDN card"
msgstr "���� ISDN ��"
-#: ../../install_steps_interactive.pm_.c:1045
-#: ../../install_steps_interactive.pm_.c:1047
+#: ../../install_steps_interactive.pm_.c:1030
+#: ../../install_steps_interactive.pm_.c:1032
msgid "Sound card"
msgstr "����"
-#: ../../install_steps_interactive.pm_.c:1049
+#: ../../install_steps_interactive.pm_.c:1034
msgid "TV card"
msgstr "TV ��"
-#: ../../install_steps_interactive.pm_.c:1089
-#: ../../install_steps_interactive.pm_.c:1114
-#: ../../install_steps_interactive.pm_.c:1118
+#: ../../install_steps_interactive.pm_.c:1074
+#: ../../install_steps_interactive.pm_.c:1099
+#: ../../install_steps_interactive.pm_.c:1103
msgid "LDAP"
msgstr "LDAP"
-#: ../../install_steps_interactive.pm_.c:1090
-#: ../../install_steps_interactive.pm_.c:1114
-#: ../../install_steps_interactive.pm_.c:1127
+#: ../../install_steps_interactive.pm_.c:1075
+#: ../../install_steps_interactive.pm_.c:1099
+#: ../../install_steps_interactive.pm_.c:1112
msgid "NIS"
msgstr "ʹ��NIS"
-#: ../../install_steps_interactive.pm_.c:1091
-#: ../../install_steps_interactive.pm_.c:1114
-#: ../../install_steps_interactive.pm_.c:1135
-#: ../../install_steps_interactive.pm_.c:1141
+#: ../../install_steps_interactive.pm_.c:1076
+#: ../../install_steps_interactive.pm_.c:1099
+#: ../../install_steps_interactive.pm_.c:1120
+#: ../../install_steps_interactive.pm_.c:1126
msgid "Windows Domain"
msgstr "Windows ��"
-#: ../../install_steps_interactive.pm_.c:1092
-#: ../../install_steps_interactive.pm_.c:1114
+#: ../../install_steps_interactive.pm_.c:1077
+#: ../../install_steps_interactive.pm_.c:1099
msgid "Local files"
msgstr "�����ļ�"
-#: ../../install_steps_interactive.pm_.c:1101
-#: ../../install_steps_interactive.pm_.c:1102 ../../steps.pm_.c:24
+#: ../../install_steps_interactive.pm_.c:1086
+#: ../../install_steps_interactive.pm_.c:1087 ../../steps.pm_.c:24
msgid "Set root password"
msgstr "�����û�����"
-#: ../../install_steps_interactive.pm_.c:1103
+#: ../../install_steps_interactive.pm_.c:1088
msgid "No password"
msgstr "û�п���"
-#: ../../install_steps_interactive.pm_.c:1108
+#: ../../install_steps_interactive.pm_.c:1093
#, c-format
msgid "This password is too short (it must be at least %d characters long)"
msgstr "�������̫���� (����Ҫ�� %d ���ַ�)"
-#: ../../install_steps_interactive.pm_.c:1114 ../../network/modem.pm_.c:49
+#: ../../install_steps_interactive.pm_.c:1099 ../../network/modem.pm_.c:49
#: ../../standalone/drakconnect_.c:625 ../../standalone/logdrake_.c:172
msgid "Authentication"
msgstr "��֤"
-#: ../../install_steps_interactive.pm_.c:1122
+#: ../../install_steps_interactive.pm_.c:1107
msgid "Authentication LDAP"
msgstr "LDAP ��֤"
-#: ../../install_steps_interactive.pm_.c:1123
+#: ../../install_steps_interactive.pm_.c:1108
msgid "LDAP Base dn"
msgstr "LDAP ����Ŀ¼�� dn"
-#: ../../install_steps_interactive.pm_.c:1124
+#: ../../install_steps_interactive.pm_.c:1109
msgid "LDAP Server"
msgstr "LDAP ������"
-#: ../../install_steps_interactive.pm_.c:1130
+#: ../../install_steps_interactive.pm_.c:1115
msgid "Authentication NIS"
msgstr "NIS ��֤"
-#: ../../install_steps_interactive.pm_.c:1131
+#: ../../install_steps_interactive.pm_.c:1116
msgid "NIS Domain"
msgstr "NIS ����"
-#: ../../install_steps_interactive.pm_.c:1132
+#: ../../install_steps_interactive.pm_.c:1117
msgid "NIS Server"
msgstr "NIS ������"
-#: ../../install_steps_interactive.pm_.c:1138
+#: ../../install_steps_interactive.pm_.c:1123
msgid ""
"For this to work for a W2K PDC, you will probably need to have the admin "
"run: C:\\>net localgroup \"Pre-Windows 2000 Compatible Access\" everyone /"
@@ -5557,19 +5629,19 @@ msgstr ""
"���� -U �û�%����' �������� Windows(tm) ����, �͹���Ա���û���/����.\n"
"���� 'wbinfo -t' �����������֤�����Ƿ����."
-#: ../../install_steps_interactive.pm_.c:1140
+#: ../../install_steps_interactive.pm_.c:1125
msgid "Authentication Windows Domain"
msgstr "��֤ Windows ��"
-#: ../../install_steps_interactive.pm_.c:1142
+#: ../../install_steps_interactive.pm_.c:1127
msgid "Domain Admin User Name"
msgstr "�����Ա�û���"
-#: ../../install_steps_interactive.pm_.c:1143
+#: ../../install_steps_interactive.pm_.c:1128
msgid "Domain Admin Password"
msgstr "�����Ա����"
-#: ../../install_steps_interactive.pm_.c:1178
+#: ../../install_steps_interactive.pm_.c:1163
msgid ""
"A custom bootdisk provides a way of booting into your Linux system without\n"
"depending on the normal bootloader. This is useful if you don't want to "
@@ -5593,19 +5665,19 @@ msgstr ""
"���ھ͸�����ϵͳ��һ�ſ�������, ����? \n"
"�ڵ�һ���������������һƬ����, Ȼ��\"ȷ��\""
-#: ../../install_steps_interactive.pm_.c:1194
+#: ../../install_steps_interactive.pm_.c:1179
msgid "First floppy drive"
msgstr "��һ������������"
-#: ../../install_steps_interactive.pm_.c:1195
+#: ../../install_steps_interactive.pm_.c:1180
msgid "Second floppy drive"
msgstr "�ڶ�������������"
-#: ../../install_steps_interactive.pm_.c:1196 ../../printerdrake.pm_.c:2277
+#: ../../install_steps_interactive.pm_.c:1181 ../../printerdrake.pm_.c:2470
msgid "Skip"
msgstr "�Թ�"
-#: ../../install_steps_interactive.pm_.c:1201
+#: ../../install_steps_interactive.pm_.c:1186
#, c-format
msgid ""
"A custom bootdisk provides a way of booting into your Linux system without\n"
@@ -5627,7 +5699,7 @@ msgstr ""
"���ھ͸�����ϵͳ��һ�ſ�������, ����?\n"
"%s"
-#: ../../install_steps_interactive.pm_.c:1207
+#: ../../install_steps_interactive.pm_.c:1192
msgid ""
"\n"
"\n"
@@ -5641,28 +5713,28 @@ msgstr ""
"�ܿ����޷���һ�� 1.44 Mb �����ϴ�������,\n"
"��Ϊ XFS ��Ҫһ���ܴ����������)."
-#: ../../install_steps_interactive.pm_.c:1215
+#: ../../install_steps_interactive.pm_.c:1200
msgid "Sorry, no floppy drive available"
msgstr "��Ǹ��û�п��õ����̻�"
-#: ../../install_steps_interactive.pm_.c:1219
+#: ../../install_steps_interactive.pm_.c:1204
msgid "Choose the floppy drive you want to use to make the bootdisk"
msgstr "ѡ����Ҫ�����������̵����̻�"
-#: ../../install_steps_interactive.pm_.c:1223
+#: ../../install_steps_interactive.pm_.c:1208
#, c-format
msgid "Insert a floppy in %s"
msgstr "�����һ�����̵������� %s"
-#: ../../install_steps_interactive.pm_.c:1226
+#: ../../install_steps_interactive.pm_.c:1211
msgid "Creating bootdisk..."
msgstr "����������������"
-#: ../../install_steps_interactive.pm_.c:1233
+#: ../../install_steps_interactive.pm_.c:1218
msgid "Preparing bootloader..."
msgstr "׼��������������"
-#: ../../install_steps_interactive.pm_.c:1244
+#: ../../install_steps_interactive.pm_.c:1229
msgid ""
"You appear to have an OldWorld or Unknown\n"
" machine, the yaboot bootloader will not work for you.\n"
@@ -5673,11 +5745,11 @@ msgstr ""
"yaboot�޷���������.\n"
"Ҫ������װ, ���ʹ��BootX����"
-#: ../../install_steps_interactive.pm_.c:1250
+#: ../../install_steps_interactive.pm_.c:1235
msgid "Do you want to use aboot?"
msgstr "��Ҫʹ�� aboot ��?"
-#: ../../install_steps_interactive.pm_.c:1253
+#: ../../install_steps_interactive.pm_.c:1238
msgid ""
"Error installing aboot, \n"
"try to force installation even if that destroys the first partition?"
@@ -5685,15 +5757,15 @@ msgstr ""
"��װ aboot ʱ����, \n"
"ǿ�Ȱ�װ��ٻ���һ������, Ҫ������?"
-#: ../../install_steps_interactive.pm_.c:1260
+#: ../../install_steps_interactive.pm_.c:1245
msgid "Installing bootloader"
msgstr "��װ��������"
-#: ../../install_steps_interactive.pm_.c:1266
+#: ../../install_steps_interactive.pm_.c:1251
msgid "Installation of bootloader failed. The following error occured:"
msgstr "��װϵͳ��������ʧ�ܣ��������д���:"
-#: ../../install_steps_interactive.pm_.c:1274
+#: ../../install_steps_interactive.pm_.c:1259
#, c-format
msgid ""
"You may need to change your Open Firmware boot-device to\n"
@@ -5709,17 +5781,17 @@ msgstr ""
" Ȼ������: shut-down\n"
"�㽫���´ο���ʱ��������������ʾ."
-#: ../../install_steps_interactive.pm_.c:1308
+#: ../../install_steps_interactive.pm_.c:1293
#: ../../standalone/drakautoinst_.c:79
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "���������� %s �в���һ�ſհ�����"
-#: ../../install_steps_interactive.pm_.c:1312
+#: ../../install_steps_interactive.pm_.c:1297
msgid "Creating auto install floppy..."
msgstr "���ڴ����Զ���װ����"
-#: ../../install_steps_interactive.pm_.c:1323
+#: ../../install_steps_interactive.pm_.c:1308
msgid ""
"Some steps are not completed.\n"
"\n"
@@ -5729,7 +5801,7 @@ msgstr ""
"\n"
"��ȷ��Ҫ�����˳���?"
-#: ../../install_steps_interactive.pm_.c:1334
+#: ../../install_steps_interactive.pm_.c:1319
#, c-format
msgid ""
"Congratulations, installation is complete.\n"
@@ -5760,15 +5832,15 @@ msgstr ""
"\n"
"���������������ϵͳ, ��鿴 Mandrake Linux �û��ֲ�."
-#: ../../install_steps_interactive.pm_.c:1347
+#: ../../install_steps_interactive.pm_.c:1332
msgid "http://www.mandrakelinux.com/en/90errata.php3"
msgstr "http://www.mandrakelinux.com/en/90errata.php3"
-#: ../../install_steps_interactive.pm_.c:1352
+#: ../../install_steps_interactive.pm_.c:1337
msgid "Generate auto install floppy"
msgstr "���ڴ����Զ���װ����"
-#: ../../install_steps_interactive.pm_.c:1354
+#: ../../install_steps_interactive.pm_.c:1339
msgid ""
"The auto install can be fully automated if wanted,\n"
"in that case it will take over the hard drive!!\n"
@@ -5777,15 +5849,15 @@ msgid ""
"You may prefer to replay the installation.\n"
msgstr "�Զ���װ��ȫ�Զ�����Ӳ�̰�װ, �����Ը�����ְ�װ.\n"
-#: ../../install_steps_interactive.pm_.c:1359
+#: ../../install_steps_interactive.pm_.c:1344
msgid "Automated"
msgstr "�Զ�"
-#: ../../install_steps_interactive.pm_.c:1359
+#: ../../install_steps_interactive.pm_.c:1344
msgid "Replay"
msgstr "����"
-#: ../../install_steps_interactive.pm_.c:1362
+#: ../../install_steps_interactive.pm_.c:1347
msgid "Save packages selection"
msgstr "����������ѡ��"
@@ -5794,7 +5866,8 @@ msgstr "����������ѡ��"
msgid "Mandrake Linux Installation %s"
msgstr "Mandrake Linux ��װ %s"
-#: ../../install_steps_newt.pm_.c:34
+#. -PO This string must fit in a 80-char wide text screen
+#: ../../install_steps_newt.pm_.c:35
msgid ""
" <Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen "
msgstr " <Tab>/<Alt-Tab> ����Ŀ���ƶ� | <Space> ѡ�� | <F12> �¸����� "
@@ -5811,22 +5884,22 @@ msgstr "ȱ�� consolehelper"
msgid "Choose a file"
msgstr "ѡ���ļ�"
-#: ../../interactive.pm_.c:317
+#: ../../interactive.pm_.c:320
msgid "Advanced"
msgstr "�߼�"
-#: ../../interactive.pm_.c:318
+#: ../../interactive.pm_.c:321
msgid "Basic"
msgstr "����"
-#: ../../interactive/newt.pm_.c:174 ../../my_gtk.pm_.c:155
-#: ../../printerdrake.pm_.c:1990
+#: ../../interactive/newt.pm_.c:174 ../../my_gtk.pm_.c:158
+#: ../../printerdrake.pm_.c:2124
msgid "<- Previous"
msgstr "<-ǰһ��"
#: ../../interactive/newt.pm_.c:174 ../../interactive/newt.pm_.c:176
-#: ../../standalone/drakbackup_.c:3464 ../../standalone/drakbackup_.c:3491
-#: ../../standalone/drakbackup_.c:3517
+#: ../../standalone/drakbackup_.c:4112 ../../standalone/drakbackup_.c:4139
+#: ../../standalone/drakbackup_.c:4169 ../../standalone/drakbackup_.c:4195
msgid "Next"
msgstr "��һ��"
@@ -5856,7 +5929,7 @@ msgstr "����ѡ�� ? (0/1, ȱʡ %s) "
#: ../../interactive/stdio.pm_.c:95
#, c-format
msgid "Button `%s': %s"
-msgstr "��ť: %s : %s"
+msgstr "��ť: %s: %s"
#: ../../interactive/stdio.pm_.c:96
msgid "Do you want to click on this button?"
@@ -5899,375 +5972,371 @@ msgstr ""
msgid "Re-submit"
msgstr "�����ύ"
-#: ../../keyboard.pm_.c:173 ../../keyboard.pm_.c:208
+#: ../../keyboard.pm_.c:152 ../../keyboard.pm_.c:187
msgid "Czech (QWERTZ)"
msgstr "�ݿ� (QWERTZ)"
-#: ../../keyboard.pm_.c:174 ../../keyboard.pm_.c:210
+#: ../../keyboard.pm_.c:153 ../../keyboard.pm_.c:189
msgid "German"
msgstr "�¹�"
-#: ../../keyboard.pm_.c:175
+#: ../../keyboard.pm_.c:154
msgid "Dvorak"
msgstr "Dvorak"
-#: ../../keyboard.pm_.c:176 ../../keyboard.pm_.c:218
+#: ../../keyboard.pm_.c:155 ../../keyboard.pm_.c:197
msgid "Spanish"
msgstr "������"
-#: ../../keyboard.pm_.c:177 ../../keyboard.pm_.c:219
+#: ../../keyboard.pm_.c:156 ../../keyboard.pm_.c:198
msgid "Finnish"
msgstr "����"
-#: ../../keyboard.pm_.c:178 ../../keyboard.pm_.c:220
+#: ../../keyboard.pm_.c:157 ../../keyboard.pm_.c:199
msgid "French"
msgstr "����"
-#: ../../keyboard.pm_.c:179 ../../keyboard.pm_.c:252
+#: ../../keyboard.pm_.c:158 ../../keyboard.pm_.c:231
msgid "Norwegian"
msgstr "Ų��"
-#: ../../keyboard.pm_.c:180
+#: ../../keyboard.pm_.c:159
msgid "Polish"
msgstr "����"
-#: ../../keyboard.pm_.c:181 ../../keyboard.pm_.c:260
+#: ../../keyboard.pm_.c:160 ../../keyboard.pm_.c:239
msgid "Russian"
msgstr "����"
-#: ../../keyboard.pm_.c:183 ../../keyboard.pm_.c:262
+#: ../../keyboard.pm_.c:162 ../../keyboard.pm_.c:241
msgid "Swedish"
msgstr "�����"
-#: ../../keyboard.pm_.c:184 ../../keyboard.pm_.c:278
+#: ../../keyboard.pm_.c:163 ../../keyboard.pm_.c:257
msgid "UK keyboard"
msgstr "Ӣ��"
-#: ../../keyboard.pm_.c:185 ../../keyboard.pm_.c:279
+#: ../../keyboard.pm_.c:164 ../../keyboard.pm_.c:258
msgid "US keyboard"
msgstr "��������"
-#: ../../keyboard.pm_.c:187
+#: ../../keyboard.pm_.c:166
msgid "Albanian"
msgstr "����������"
-#: ../../keyboard.pm_.c:188
+#: ../../keyboard.pm_.c:167
msgid "Armenian (old)"
msgstr "���� (��ʽ)"
-#: ../../keyboard.pm_.c:189
+#: ../../keyboard.pm_.c:168
msgid "Armenian (typewriter)"
msgstr "���� (����)"
-#: ../../keyboard.pm_.c:190
+#: ../../keyboard.pm_.c:169
msgid "Armenian (phonetic)"
msgstr "���� (����)"
-#: ../../keyboard.pm_.c:195
+#: ../../keyboard.pm_.c:174
msgid "Azerbaidjani (latin)"
msgstr "Azerbaidjani (latin)"
-#: ../../keyboard.pm_.c:197
+#: ../../keyboard.pm_.c:176
msgid "Belgian"
msgstr "����ʱ"
-#: ../../keyboard.pm_.c:198
-#, fuzzy
+#: ../../keyboard.pm_.c:177
msgid "Bengali"
-msgstr "����"
+msgstr "�ϼ���"
-#: ../../keyboard.pm_.c:199
+#: ../../keyboard.pm_.c:178
msgid "Bulgarian (phonetic)"
msgstr "�������� (����)"
-#: ../../keyboard.pm_.c:200
+#: ../../keyboard.pm_.c:179
msgid "Bulgarian (BDS)"
msgstr "�������� (BDS)"
-#: ../../keyboard.pm_.c:201
+#: ../../keyboard.pm_.c:180
msgid "Brazilian (ABNT-2)"
msgstr "���� (ABNT-2)"
-#: ../../keyboard.pm_.c:204
-#, fuzzy
+#: ../../keyboard.pm_.c:183
msgid "Bosnian"
-msgstr "��˹������"
+msgstr "��˹����"
-#: ../../keyboard.pm_.c:205
+#: ../../keyboard.pm_.c:184
msgid "Belarusian"
msgstr "�׶���˹"
-#: ../../keyboard.pm_.c:206
+#: ../../keyboard.pm_.c:185
msgid "Swiss (German layout)"
msgstr "��ʿ (���ﲼ��)"
-#: ../../keyboard.pm_.c:207
+#: ../../keyboard.pm_.c:186
msgid "Swiss (French layout)"
msgstr "��ʿ (���ﲼ��)"
-#: ../../keyboard.pm_.c:209
+#: ../../keyboard.pm_.c:188
msgid "Czech (QWERTY)"
msgstr "�ݿ� (QWERTY)"
-#: ../../keyboard.pm_.c:211
+#: ../../keyboard.pm_.c:190
msgid "German (no dead keys)"
msgstr "�¹� (û��dead keys)"
-#: ../../keyboard.pm_.c:212
+#: ../../keyboard.pm_.c:191
msgid "Devanagari"
-msgstr ""
+msgstr "����"
-#: ../../keyboard.pm_.c:213
+#: ../../keyboard.pm_.c:192
msgid "Danish"
msgstr "����"
-#: ../../keyboard.pm_.c:214
+#: ../../keyboard.pm_.c:193
msgid "Dvorak (US)"
msgstr "Dvorak (US)"
-#: ../../keyboard.pm_.c:215
+#: ../../keyboard.pm_.c:194
msgid "Dvorak (Norwegian)"
msgstr "Dvorak (Norwegian)"
-#: ../../keyboard.pm_.c:216
+#: ../../keyboard.pm_.c:195
msgid "Dvorak (Swedish)"
msgstr "Dvorak (Swedish)"
-#: ../../keyboard.pm_.c:217
+#: ../../keyboard.pm_.c:196
msgid "Estonian"
msgstr "��˹������"
-#: ../../keyboard.pm_.c:221
+#: ../../keyboard.pm_.c:200
msgid "Georgian (\"Russian\" layout)"
msgstr "��³����(\"����\"����)"
-#: ../../keyboard.pm_.c:222
+#: ../../keyboard.pm_.c:201
msgid "Georgian (\"Latin\" layout)"
msgstr "��³����(\"����\" ����)"
-#: ../../keyboard.pm_.c:223
+#: ../../keyboard.pm_.c:202
msgid "Greek"
msgstr "ϣ��"
-#: ../../keyboard.pm_.c:224
+#: ../../keyboard.pm_.c:203
msgid "Gujarati"
-msgstr ""
+msgstr "Gujarati"
-#: ../../keyboard.pm_.c:225
+#: ../../keyboard.pm_.c:204
msgid "Gurmukhi"
-msgstr ""
+msgstr "Gurmukhi"
-#: ../../keyboard.pm_.c:226
+#: ../../keyboard.pm_.c:205
msgid "Hungarian"
msgstr "������"
-#: ../../keyboard.pm_.c:227
+#: ../../keyboard.pm_.c:206
msgid "Croatian"
msgstr "���޵���"
-#: ../../keyboard.pm_.c:228
+#: ../../keyboard.pm_.c:207
msgid "Israeli"
msgstr "��ɫ��"
-#: ../../keyboard.pm_.c:229
+#: ../../keyboard.pm_.c:208
msgid "Israeli (Phonetic)"
msgstr "��ɫ�� (����)"
-#: ../../keyboard.pm_.c:230
+#: ../../keyboard.pm_.c:209
msgid "Iranian"
msgstr "����"
-#: ../../keyboard.pm_.c:231
+#: ../../keyboard.pm_.c:210
msgid "Icelandic"
msgstr "����"
-#: ../../keyboard.pm_.c:232
+#: ../../keyboard.pm_.c:211
msgid "Italian"
msgstr "�����"
-#: ../../keyboard.pm_.c:233
+#: ../../keyboard.pm_.c:212
msgid "Inuktitut"
-msgstr ""
+msgstr "Inuktitut"
-#: ../../keyboard.pm_.c:234
+#: ../../keyboard.pm_.c:213
msgid "Japanese 106 keys"
msgstr "����106����"
-#: ../../keyboard.pm_.c:237
+#: ../../keyboard.pm_.c:216
msgid "Korean keyboard"
msgstr "��������"
-#: ../../keyboard.pm_.c:238
+#: ../../keyboard.pm_.c:217
msgid "Latin American"
msgstr "��������"
-#: ../../keyboard.pm_.c:239
-#, fuzzy
+#: ../../keyboard.pm_.c:218
msgid "Laotian"
-msgstr "������"
+msgstr "����"
-#: ../../keyboard.pm_.c:240
+#: ../../keyboard.pm_.c:219
msgid "Lithuanian AZERTY (old)"
msgstr "������ AZERTY (��ʽ)"
-#: ../../keyboard.pm_.c:242
+#: ../../keyboard.pm_.c:221
msgid "Lithuanian AZERTY (new)"
msgstr "������ AZERTY (��ʽ)"
-#: ../../keyboard.pm_.c:243
+#: ../../keyboard.pm_.c:222
msgid "Lithuanian \"number row\" QWERTY"
msgstr "������ \"number row\" QWERTY"
-#: ../../keyboard.pm_.c:244
+#: ../../keyboard.pm_.c:223
msgid "Lithuanian \"phonetic\" QWERTY"
msgstr "������ \"phonetic\" QWERTY"
-#: ../../keyboard.pm_.c:245
+#: ../../keyboard.pm_.c:224
msgid "Latvian"
msgstr "������"
-#: ../../keyboard.pm_.c:246
+#: ../../keyboard.pm_.c:225
msgid "Macedonian"
msgstr "�����"
-#: ../../keyboard.pm_.c:247
+#: ../../keyboard.pm_.c:226
msgid "Myanmar (Burmese)"
-msgstr ""
+msgstr "��� (Burmese)"
-#: ../../keyboard.pm_.c:248
-#, fuzzy
+#: ../../keyboard.pm_.c:227
msgid "Mongolian (cyrillic)"
-msgstr "������ (cyrillic)"
+msgstr "�ɹ� (cyrillic)"
-#: ../../keyboard.pm_.c:249
+#: ../../keyboard.pm_.c:228
msgid "Maltese (UK)"
-msgstr ""
+msgstr "Maltese (UK)"
-#: ../../keyboard.pm_.c:250
+#: ../../keyboard.pm_.c:229
msgid "Maltese (US)"
-msgstr ""
+msgstr "Maltese (US)"
-#: ../../keyboard.pm_.c:251
+#: ../../keyboard.pm_.c:230
msgid "Dutch"
msgstr "����"
-#: ../../keyboard.pm_.c:253
+#: ../../keyboard.pm_.c:232
msgid "Polish (qwerty layout)"
msgstr "���� (QWERTY ����)"
-#: ../../keyboard.pm_.c:254
+#: ../../keyboard.pm_.c:233
msgid "Polish (qwertz layout)"
msgstr "���� (QWERTZ ����)"
-#: ../../keyboard.pm_.c:255
+#: ../../keyboard.pm_.c:234
msgid "Portuguese"
msgstr "��������"
-#: ../../keyboard.pm_.c:256
+#: ../../keyboard.pm_.c:235
msgid "Canadian (Quebec)"
msgstr "���ô� (������)"
-#: ../../keyboard.pm_.c:258
+#: ../../keyboard.pm_.c:237
msgid "Romanian (qwertz)"
msgstr "�������� (QWERTZ ����)"
-#: ../../keyboard.pm_.c:259
+#: ../../keyboard.pm_.c:238
msgid "Romanian (qwerty)"
msgstr "�������� (QWERTY ����)"
-#: ../../keyboard.pm_.c:261
+#: ../../keyboard.pm_.c:240
msgid "Russian (Yawerty)"
msgstr "���� (YAWERTY ����)"
-#: ../../keyboard.pm_.c:263
+#: ../../keyboard.pm_.c:242
msgid "Slovenian"
msgstr "˹��������"
-#: ../../keyboard.pm_.c:264
+#: ../../keyboard.pm_.c:243
msgid "Slovakian (QWERTZ)"
msgstr "˹�工�� (QWERTZ ����)"
-#: ../../keyboard.pm_.c:265
+#: ../../keyboard.pm_.c:244
msgid "Slovakian (QWERTY)"
msgstr "˹�工�� (QWERTY ����)"
-#: ../../keyboard.pm_.c:267
+#: ../../keyboard.pm_.c:246
msgid "Serbian (cyrillic)"
msgstr "������ (cyrillic)"
-#: ../../keyboard.pm_.c:269
+#: ../../keyboard.pm_.c:248
msgid "Tamil (Unicode)"
msgstr "̹�׶� (Unicode)"
-#: ../../keyboard.pm_.c:270
+#: ../../keyboard.pm_.c:249
msgid "Tamil (TSCII)"
msgstr "̹�׶� (TSCII)"
-#: ../../keyboard.pm_.c:271
+#: ../../keyboard.pm_.c:250
msgid "Thai keyboard"
msgstr "̩������"
-#: ../../keyboard.pm_.c:273
+#: ../../keyboard.pm_.c:252
msgid "Tajik keyboard"
msgstr "̩����"
-#: ../../keyboard.pm_.c:274
+#: ../../keyboard.pm_.c:253
msgid "Turkish (traditional \"F\" model)"
msgstr "������ (��ͳ \"F\" ʽ)"
-#: ../../keyboard.pm_.c:275
+#: ../../keyboard.pm_.c:254
msgid "Turkish (modern \"Q\" model)"
msgstr "������ (�ִ� \"Q\" ʽ)"
-#: ../../keyboard.pm_.c:277
+#: ../../keyboard.pm_.c:256
msgid "Ukrainian"
msgstr "�ڿ���"
-#: ../../keyboard.pm_.c:280
+#: ../../keyboard.pm_.c:259
msgid "US keyboard (international)"
msgstr "��ʽ���� (����)"
-#: ../../keyboard.pm_.c:281
+#: ../../keyboard.pm_.c:260
msgid "Vietnamese \"numeric row\" QWERTY"
msgstr "Խ�ϼ��� \"number row\" QWERTY"
-#: ../../keyboard.pm_.c:282
+#: ../../keyboard.pm_.c:261
msgid "Yugoslavian (latin)"
msgstr "��˹���� (����)"
-#: ../../keyboard.pm_.c:289
+#: ../../keyboard.pm_.c:268
msgid "Right Alt key"
msgstr "�ұߵ� ALT ��"
-#: ../../keyboard.pm_.c:290
+#: ../../keyboard.pm_.c:269
msgid "Both Shift keys simultaneously"
msgstr "ͬʱ������ Shift ��"
-#: ../../keyboard.pm_.c:291
+#: ../../keyboard.pm_.c:270
msgid "Control and Shift keys simultaneously"
msgstr "ͬʱ�� Ctrl �� Shift ��"
-#: ../../keyboard.pm_.c:292
+#: ../../keyboard.pm_.c:271
msgid "CapsLock key"
msgstr "CapsLock ��"
-#: ../../keyboard.pm_.c:293
+#: ../../keyboard.pm_.c:272
msgid "Ctrl and Alt keys simultaneously"
msgstr "ͬʱ�� Ctrl �� Alt ��"
-#: ../../keyboard.pm_.c:294
+#: ../../keyboard.pm_.c:273
msgid "Alt and Shift keys simultaneously"
msgstr "ͬʱ�� Alt �� Shift ��"
-#: ../../keyboard.pm_.c:295
+#: ../../keyboard.pm_.c:274
msgid "\"Menu\" key"
msgstr "\"�˵�\"��"
-#: ../../keyboard.pm_.c:296
+#: ../../keyboard.pm_.c:275
msgid "Left \"Windows\" key"
msgstr "�� \"����\" ��"
-#: ../../keyboard.pm_.c:297
+#: ../../keyboard.pm_.c:276
msgid "Right \"Windows\" key"
msgstr "�� \"����\" ��"
@@ -6323,11 +6392,11 @@ msgstr "��ͨ PS2 �������"
msgid "GlidePoint"
msgstr "GlidePoint"
-#: ../../mouse.pm_.c:36 ../../mouse.pm_.c:63
+#: ../../mouse.pm_.c:36 ../../mouse.pm_.c:65
msgid "Kensington Thinking Mouse"
msgstr "Kensington Thinking Mouse"
-#: ../../mouse.pm_.c:37 ../../mouse.pm_.c:59
+#: ../../mouse.pm_.c:37 ../../mouse.pm_.c:61
msgid "Genius NetMouse"
msgstr "Genius NetMouse"
@@ -6335,115 +6404,123 @@ msgstr "Genius NetMouse"
msgid "Genius NetScroll"
msgstr "Genius NetScroll"
-#: ../../mouse.pm_.c:43 ../../mouse.pm_.c:68
+#: ../../mouse.pm_.c:39 ../../mouse.pm_.c:48
+msgid "Microsoft Explorer"
+msgstr "΢�������"
+
+#: ../../mouse.pm_.c:44 ../../mouse.pm_.c:70
msgid "1 button"
msgstr "�� ��"
-#: ../../mouse.pm_.c:44 ../../mouse.pm_.c:51
+#: ../../mouse.pm_.c:45 ../../mouse.pm_.c:53
msgid "Generic 2 Button Mouse"
msgstr "��ͨ 2 �����"
-#: ../../mouse.pm_.c:46
+#: ../../mouse.pm_.c:47
msgid "Wheel"
msgstr "����"
-#: ../../mouse.pm_.c:49
+#: ../../mouse.pm_.c:51
msgid "serial"
msgstr "����"
-#: ../../mouse.pm_.c:52
+#: ../../mouse.pm_.c:54
msgid "Generic 3 Button Mouse"
msgstr "��ͨ 3 �����"
-#: ../../mouse.pm_.c:53
+#: ../../mouse.pm_.c:55
msgid "Microsoft IntelliMouse"
msgstr "΢���������"
-#: ../../mouse.pm_.c:54
+#: ../../mouse.pm_.c:56
msgid "Logitech MouseMan"
msgstr "�޼� MouseMan"
-#: ../../mouse.pm_.c:55
+#: ../../mouse.pm_.c:57
msgid "Mouse Systems"
msgstr "Mouse Systems"
-#: ../../mouse.pm_.c:57
+#: ../../mouse.pm_.c:59
msgid "Logitech CC Series"
msgstr "Logitech CC Series"
-#: ../../mouse.pm_.c:58
+#: ../../mouse.pm_.c:60
msgid "Logitech MouseMan+/FirstMouse+"
msgstr "Logitech MouseMan+/FirstMouse+"
-#: ../../mouse.pm_.c:60
+#: ../../mouse.pm_.c:62
msgid "MM Series"
msgstr "MM Series"
-#: ../../mouse.pm_.c:61
+#: ../../mouse.pm_.c:63
msgid "MM HitTablet"
msgstr "MM HitTablet"
-#: ../../mouse.pm_.c:62
+#: ../../mouse.pm_.c:64
msgid "Logitech Mouse (serial, old C7 type)"
msgstr "Logitech Mouse (serial, old C7 type)"
-#: ../../mouse.pm_.c:66
+#: ../../mouse.pm_.c:68
msgid "busmouse"
msgstr "busmouse"
-#: ../../mouse.pm_.c:69
+#: ../../mouse.pm_.c:71
msgid "2 buttons"
msgstr "2 ��"
-#: ../../mouse.pm_.c:70
+#: ../../mouse.pm_.c:72
msgid "3 buttons"
msgstr "3 ��"
-#: ../../mouse.pm_.c:73
+#: ../../mouse.pm_.c:75
msgid "none"
msgstr "û��"
-#: ../../mouse.pm_.c:75
+#: ../../mouse.pm_.c:77
msgid "No mouse"
msgstr "û�����"
-#: ../../mouse.pm_.c:445
+#: ../../mouse.pm_.c:482
msgid "Please test the mouse"
msgstr "������������."
-#: ../../mouse.pm_.c:446
+#: ../../mouse.pm_.c:483
msgid "To activate the mouse,"
msgstr "Ҫ�������,"
-#: ../../mouse.pm_.c:447
+#: ../../mouse.pm_.c:484
msgid "MOVE YOUR WHEEL!"
msgstr "ת������!"
-#: ../../my_gtk.pm_.c:156
+#: ../../my_gtk.pm_.c:64
+msgid "-adobe-utopia-regular-r-*-*-25-*-*-*-p-*-iso8859-*,*-r-*"
+msgstr "-adobe-utopia-regular-r-*-*-25-*-*-*-p-*-iso8859-*,*-r-*"
+
+#: ../../my_gtk.pm_.c:159
msgid "Finish"
msgstr "���"
-#: ../../my_gtk.pm_.c:156 ../../printerdrake.pm_.c:1992
+#: ../../my_gtk.pm_.c:159 ../../printerdrake.pm_.c:2126
msgid "Next ->"
msgstr "��һ�� ->"
-#: ../../my_gtk.pm_.c:284
+#: ../../my_gtk.pm_.c:287
msgid "Is this correct?"
msgstr "������ȷ��?"
-#: ../../my_gtk.pm_.c:356 ../../services.pm_.c:222
+#: ../../my_gtk.pm_.c:359 ../../services.pm_.c:222
msgid "Info"
msgstr "��Ϣ"
-#: ../../my_gtk.pm_.c:377
+#: ../../my_gtk.pm_.c:380
msgid "Expand Tree"
msgstr "չ��������"
-#: ../../my_gtk.pm_.c:378
+#: ../../my_gtk.pm_.c:381
msgid "Collapse Tree"
msgstr "����������"
-#: ../../my_gtk.pm_.c:379
+#: ../../my_gtk.pm_.c:382
msgid "Toggle between flat and group sorted"
msgstr "�л�ƽ�̻��������"
@@ -6481,6 +6558,73 @@ msgstr "ʹ�� pppoe"
msgid "use pptp"
msgstr "ʹ�� pptp"
+#: ../../network/drakfirewall.pm_.c:12
+msgid "Web Server"
+msgstr "WEB ������"
+
+#: ../../network/drakfirewall.pm_.c:17
+msgid "Domain Name Server"
+msgstr "����������"
+
+#: ../../network/drakfirewall.pm_.c:32
+msgid "Mail Server"
+msgstr "�ʼ�������"
+
+#: ../../network/drakfirewall.pm_.c:37
+msgid "POP and IMAP Server"
+msgstr "POP �� IMAP ������"
+
+#: ../../network/drakfirewall.pm_.c:111
+msgid "No network card"
+msgstr "û�����翨"
+
+#: ../../network/drakfirewall.pm_.c:129
+msgid ""
+"drakfirewall configurator\n"
+"\n"
+"This configures a personal firewall for this Mandrake Linux machine.\n"
+"For a powerful dedicated firewall solution, please look to the\n"
+"specialized MandrakeSecurity Firewall distribution."
+msgstr ""
+"drakfirewall ����ǽ����\n"
+"\n"
+"�������Ϊ���� Mandrake Linux �������ø��˷���ǽ.\n"
+"���Ҫ����ǿ���ר�÷���ǽ, �뿼��ʹ��ר�ŵ�\n"
+"MandrakeSecurity ����ǽ���а�."
+
+#: ../../network/drakfirewall.pm_.c:147
+msgid "Which services would you like to allow the Internet to connect to?"
+msgstr "����Ҫ�������������ӵ���Щ����?"
+
+#: ../../network/drakfirewall.pm_.c:148
+msgid ""
+"You can enter miscellaneous ports. \n"
+"Valid examples are: 139/tcp 139/udp.\n"
+"Have a look at /etc/services for information."
+msgstr ""
+"������������ֶ˿�. \n"
+"����, ��������: 139/tcp 139/udp.\n"
+"��ο� /etc/services �ļ�."
+
+#: ../../network/drakfirewall.pm_.c:154
+#, c-format
+msgid ""
+"Invalid port given: %s.\n"
+"The proper format is \"port/tcp\" or \"port/udp\", \n"
+"where port is between 1 and 65535."
+msgstr ""
+"ָ���Ķ˿���Ч: %s.\n"
+"��ȷ�ĸ�ʽ�� \"port/tcp\" �� \"port/udp\", \n"
+"���� port Ҫ�� 1 �� 65535 ֮��."
+
+#: ../../network/drakfirewall.pm_.c:162
+msgid "Everything (no firewall)"
+msgstr "ȫ�� (������)"
+
+#: ../../network/drakfirewall.pm_.c:164
+msgid "Other ports"
+msgstr "�����˿�"
+
#: ../../network/ethernet.pm_.c:37
msgid ""
"Which dhcp client do you want to use?\n"
@@ -6497,7 +6641,7 @@ msgstr ""
"û��������ϵͳ�﷢����̫����. \n"
"�޷����������������."
-#: ../../network/ethernet.pm_.c:92 ../../standalone/drakgw_.c:247
+#: ../../network/ethernet.pm_.c:92 ../../standalone/drakgw_.c:240
msgid "Choose the network interface"
msgstr "ѡ������ӿ�"
@@ -6510,7 +6654,7 @@ msgstr "��ѡ�����ĸ��������ӻ�����."
msgid "no network card found"
msgstr "�Ҳ������翨"
-#: ../../network/ethernet.pm_.c:202 ../../network/network.pm_.c:365
+#: ../../network/ethernet.pm_.c:202 ../../network/network.pm_.c:366
msgid "Configuring network"
msgstr "������������"
@@ -6526,7 +6670,7 @@ msgstr ""
"�����������Ʊ����Ǹ���ȫ�޶��������֣�\n"
"���� ``mybox.mylab.myco.com''"
-#: ../../network/ethernet.pm_.c:207 ../../network/network.pm_.c:370
+#: ../../network/ethernet.pm_.c:207 ../../network/network.pm_.c:371
msgid "Host name"
msgstr "��������"
@@ -6822,13 +6966,13 @@ msgstr "ѡ��Ҫ���õ�profile"
msgid "Use auto detection"
msgstr "ʹ���Զ����"
-#: ../../network/netconnect.pm_.c:172 ../../printerdrake.pm_.c:2930
+#: ../../network/netconnect.pm_.c:172 ../../printerdrake.pm_.c:3151
#: ../../standalone/drakconnect_.c:274 ../../standalone/drakconnect_.c:277
#: ../../standalone/drakfloppy_.c:145
msgid "Expert Mode"
msgstr "ר��ģʽ"
-#: ../../network/netconnect.pm_.c:178 ../../printerdrake.pm_.c:283
+#: ../../network/netconnect.pm_.c:178 ../../printerdrake.pm_.c:386
msgid "Detecting devices..."
msgstr "����̽���豸..."
@@ -6990,11 +7134,11 @@ msgstr "�Զ����� IP"
msgid "Start at boot"
msgstr "����ʱ����"
-#: ../../network/network.pm_.c:336 ../../printerdrake.pm_.c:753
+#: ../../network/network.pm_.c:336 ../../printerdrake.pm_.c:860
msgid "IP address should be in format 1.2.3.4"
msgstr "IP ��ַ�ĸ�ʽӦ���� 1.2.3.4"
-#: ../../network/network.pm_.c:366
+#: ../../network/network.pm_.c:367
msgid ""
"Please enter your host name.\n"
"Your host name should be a fully-qualified host name,\n"
@@ -7005,43 +7149,55 @@ msgstr ""
"�����������Ʊ����Ǹ���ȫ�޶������ƣ����� ``mybox.mylab.myco.com''\n"
"����������صĻ���Ҳ�������� IP ��ַ"
-#: ../../network/network.pm_.c:371
+#: ../../network/network.pm_.c:372
msgid "DNS server"
msgstr "DNS ������"
-#: ../../network/network.pm_.c:372
+#: ../../network/network.pm_.c:373
#, c-format
msgid "Gateway (e.g. %s)"
msgstr "���� (�� %s )"
-#: ../../network/network.pm_.c:374
+#: ../../network/network.pm_.c:375
msgid "Gateway device"
msgstr "�����豸"
-#: ../../network/network.pm_.c:386
+#: ../../network/network.pm_.c:387
msgid "Proxies configuration"
msgstr "��������������"
-#: ../../network/network.pm_.c:387
+#: ../../network/network.pm_.c:388
msgid "HTTP proxy"
msgstr "HTTP ����������"
-#: ../../network/network.pm_.c:388
+#: ../../network/network.pm_.c:389
msgid "FTP proxy"
msgstr "FTP ����������"
-#: ../../network/network.pm_.c:389
+#: ../../network/network.pm_.c:390
msgid "Track network card id (useful for laptops)"
msgstr "��¼������־"
-#: ../../network/network.pm_.c:392
+#: ../../network/network.pm_.c:393
msgid "Proxy should be http://..."
msgstr "����������Ӧ������ http://..."
-#: ../../network/network.pm_.c:393
+#: ../../network/network.pm_.c:394
msgid "Proxy should be ftp://..."
msgstr "����������Ӧ������ ftp://..."
+#: ../../network/shorewall.pm_.c:24
+msgid "Firewalling configuration detected!"
+msgstr "���ַ���ǽ����!"
+
+#: ../../network/shorewall.pm_.c:25
+msgid ""
+"Warning! An existing firewalling configuration has been detected. You may "
+"need some manual fix after installation."
+msgstr ""
+"����! ����ԭ�������������˷���ǽ����.\n"
+"����Ҫ�ڰ�װ֮���ֹ��޸�."
+
#: ../../network/tools.pm_.c:41
msgid "Internet configuration"
msgstr "�������趨"
@@ -7147,15 +7303,15 @@ msgstr "�ʻ�����"
msgid "United Kingdom"
msgstr "Ӣ��"
-#: ../../partition_table.pm_.c:606
+#: ../../partition_table.pm_.c:602
msgid "mount failed: "
msgstr "װ��ʧ��: "
-#: ../../partition_table.pm_.c:670
+#: ../../partition_table.pm_.c:666
msgid "Extended partition not supported on this platform"
msgstr "���ƽ̨�ϲ�֧����չ����"
-#: ../../partition_table.pm_.c:688
+#: ../../partition_table.pm_.c:684
msgid ""
"You have a hole in your partition table but I can't use it.\n"
"The only solution is to move your primary partitions to have the hole next "
@@ -7164,21 +7320,21 @@ msgstr ""
"����������һ���ǿյ�, ������û��ʹ����.\n"
"Ψһ�İ취���ƶ�����������, �ѿ��в��ֻ�������չ�������ڵ�λ��."
-#: ../../partition_table.pm_.c:778
+#: ../../partition_table.pm_.c:774
#, c-format
msgid "Restoring from file %s failed: %s"
msgstr "���ļ� %s �ָ�ʧ��: %s"
-#: ../../partition_table.pm_.c:780
+#: ../../partition_table.pm_.c:776
msgid "Bad backup file"
msgstr "����ı����ļ�"
-#: ../../partition_table.pm_.c:802
+#: ../../partition_table.pm_.c:798
#, c-format
msgid "Error writing to file %s"
msgstr "д���ļ� %s ʧ��"
-#: ../../partition_table/raw.pm_.c:187
+#: ../../partition_table/raw.pm_.c:189
msgid ""
"Something bad is happening on your drive. \n"
"A test to check the integrity of data has failed. \n"
@@ -7224,150 +7380,154 @@ msgstr "LPD - ��ʽ��ӡ����"
msgid "PDQ - Print, Don't Queue"
msgstr "PDQ - ��ӡ�� ���Ŷ���"
-#: ../../printer.pm_.c:35 ../../printer.pm_.c:854
+#: ../../printer.pm_.c:34 ../../printer.pm_.c:1125
msgid "CUPS"
msgstr "CUPS"
-#: ../../printer.pm_.c:36
+#: ../../printer.pm_.c:35
msgid "LPRng"
msgstr "LPRng"
-#: ../../printer.pm_.c:37
+#: ../../printer.pm_.c:36
msgid "LPD"
msgstr "LPD"
-#: ../../printer.pm_.c:38
+#: ../../printer.pm_.c:37
msgid "PDQ"
msgstr "PDQ"
-#: ../../printer.pm_.c:50
+#: ../../printer.pm_.c:49
msgid "Local printer"
msgstr "������ӡ��"
-#: ../../printer.pm_.c:51
+#: ../../printer.pm_.c:50
msgid "Remote printer"
msgstr "Զ�̴�ӡ��"
-#: ../../printer.pm_.c:52
+#: ../../printer.pm_.c:51
msgid "Printer on remote CUPS server"
msgstr "Զ�� CUPS �������Ĵ�ӡ��"
-#: ../../printer.pm_.c:53 ../../printerdrake.pm_.c:776
+#: ../../printer.pm_.c:52 ../../printerdrake.pm_.c:883
msgid "Printer on remote lpd server"
msgstr "Զ�� lpd �������Ĵ�ӡ��"
-#: ../../printer.pm_.c:54
+#: ../../printer.pm_.c:53
msgid "Network printer (TCP/Socket)"
msgstr "�����ӡ�� (TCP/Socket)"
-#: ../../printer.pm_.c:55
+#: ../../printer.pm_.c:54
msgid "Printer on SMB/Windows 95/98/NT server"
msgstr "SMB/Windows 95/98/NT�ϵĴ�ӡ��"
-#: ../../printer.pm_.c:56
+#: ../../printer.pm_.c:55
msgid "Printer on NetWare server"
msgstr "Novell��������ӡ��"
-#: ../../printer.pm_.c:57 ../../printerdrake.pm_.c:780
+#: ../../printer.pm_.c:56 ../../printerdrake.pm_.c:887
msgid "Enter a printer device URI"
msgstr "��ӡ���豸URI"
-#: ../../printer.pm_.c:58
+#: ../../printer.pm_.c:57
msgid "Pipe job into a command"
msgstr "��ҵpipe��������"
-#: ../../printer.pm_.c:487 ../../printer.pm_.c:678 ../../printer.pm_.c:1000
-#: ../../printerdrake.pm_.c:2070 ../../printerdrake.pm_.c:3189
+#: ../../printer.pm_.c:324 ../../printer.pm_.c:366 ../../printer.pm_.c:533
+msgid "Unknown Model"
+msgstr "δ֪�ͺ�"
+
+#: ../../printer.pm_.c:735 ../../printer.pm_.c:926 ../../printer.pm_.c:1318
+#: ../../printerdrake.pm_.c:2260 ../../printerdrake.pm_.c:3414
msgid "Unknown model"
msgstr "δ֪ģʽ"
-#: ../../printer.pm_.c:515
+#: ../../printer.pm_.c:763
msgid "Local Printers"
msgstr "������ӡ��"
-#: ../../printer.pm_.c:517 ../../printer.pm_.c:855
+#: ../../printer.pm_.c:765 ../../printer.pm_.c:1126
msgid "Remote Printers"
msgstr "Զ�̴�ӡ��"
-#: ../../printer.pm_.c:524 ../../printerdrake.pm_.c:301
+#: ../../printer.pm_.c:772 ../../printerdrake.pm_.c:404
#, c-format
msgid " on parallel port \\/*%s"
msgstr " ���п� \\/*%s"
-#: ../../printer.pm_.c:527 ../../printerdrake.pm_.c:303
+#: ../../printer.pm_.c:775 ../../printerdrake.pm_.c:406
#, c-format
msgid ", USB printer \\/*%s"
msgstr ", USB ��ӡ�� \\/*%s"
-#: ../../printer.pm_.c:532
+#: ../../printer.pm_.c:780
#, c-format
msgid ", multi-function device on parallel port \\/*%s"
msgstr ", ���ж˿��ϵĶ๦���豸 \\/*%s"
-#: ../../printer.pm_.c:535
+#: ../../printer.pm_.c:783
msgid ", multi-function device on USB"
msgstr ", USB �˿��ϵĶ๦���豸"
-#: ../../printer.pm_.c:537
+#: ../../printer.pm_.c:785
msgid ", multi-function device on HP JetDirect"
msgstr ", HP JetDirect ��ӡ�������ϵĶ๦���豸"
-#: ../../printer.pm_.c:539
+#: ../../printer.pm_.c:787
msgid ", multi-function device"
msgstr ", �๦���豸"
-#: ../../printer.pm_.c:542
+#: ../../printer.pm_.c:790
#, c-format
msgid ", printing to %s"
msgstr ", ��ӡ�� %s"
-#: ../../printer.pm_.c:544
+#: ../../printer.pm_.c:792
#, c-format
msgid " on LPD server \"%s\", printer \"%s\""
msgstr "LPD ������ \"%s\" �ϵĴ�ӡ�� \"%s\""
-#: ../../printer.pm_.c:546
+#: ../../printer.pm_.c:794
#, c-format
msgid ", TCP/IP host \"%s\", port %s"
msgstr ", TCP/IP ���� \"%s\", �˿� %s"
-#: ../../printer.pm_.c:550
+#: ../../printer.pm_.c:798
#, c-format
msgid " on SMB/Windows server \"%s\", share \"%s\""
msgstr "SMB/Windows ������ \"%s\" �ϵĹ��� \"%s\""
-#: ../../printer.pm_.c:554
+#: ../../printer.pm_.c:802
#, c-format
msgid " on Novell server \"%s\", printer \"%s\""
msgstr "Novell ��ӡ������ \"%s\"�ϵĴ�ӡ�� \"%s\""
-#: ../../printer.pm_.c:556
+#: ../../printer.pm_.c:804
#, c-format
msgid ", using command %s"
msgstr ", ʹ������ %s"
-#: ../../printer.pm_.c:675 ../../printerdrake.pm_.c:1540
+#: ../../printer.pm_.c:923 ../../printerdrake.pm_.c:1656
msgid "Raw printer (No driver)"
msgstr "ֱ�Ӵ�ӡ��� (��ʹ����������)"
-#: ../../printer.pm_.c:824
+#: ../../printer.pm_.c:1095
#, c-format
msgid "(on %s)"
msgstr "(�� %s)"
-#: ../../printer.pm_.c:826
+#: ../../printer.pm_.c:1097
msgid "(on this machine)"
msgstr "(�ڸû�����)"
-#: ../../printer.pm_.c:851
+#: ../../printer.pm_.c:1122
#, c-format
msgid "On CUPS server \"%s\""
msgstr "�� CUPS ������ \"%s\""
-#: ../../printer.pm_.c:857 ../../printerdrake.pm_.c:2851
-#: ../../printerdrake.pm_.c:2862 ../../printerdrake.pm_.c:3078
-#: ../../printerdrake.pm_.c:3130 ../../printerdrake.pm_.c:3156
-#: ../../printerdrake.pm_.c:3326 ../../printerdrake.pm_.c:3328
+#: ../../printer.pm_.c:1128 ../../printerdrake.pm_.c:3071
+#: ../../printerdrake.pm_.c:3082 ../../printerdrake.pm_.c:3303
+#: ../../printerdrake.pm_.c:3355 ../../printerdrake.pm_.c:3381
+#: ../../printerdrake.pm_.c:3556 ../../printerdrake.pm_.c:3558
msgid " (Default)"
msgstr " (ȱʡ)"
@@ -7392,11 +7552,11 @@ msgstr ""
msgid "Printer auto-detection (Local, TCP/Socket, and SMB printers)"
msgstr "��ӡ���Զ���� (����, TCP/Socket �� SMB ��ӡ��)"
-#: ../../printerdrake.pm_.c:84 ../../printerdrake.pm_.c:2914
+#: ../../printerdrake.pm_.c:84 ../../printerdrake.pm_.c:3135
msgid "CUPS configuration"
msgstr "CUPS ��ӡ����"
-#: ../../printerdrake.pm_.c:85 ../../printerdrake.pm_.c:2915
+#: ../../printerdrake.pm_.c:85 ../../printerdrake.pm_.c:3136
msgid "Specify CUPS server"
msgstr "ָ�� CUPS ��ӡ������"
@@ -7435,7 +7595,7 @@ msgstr ""
msgid "The IP address should look like 192.168.1.20"
msgstr "IP ��ַ�ĸ�ʽӦ������ 1.2.3.4"
-#: ../../printerdrake.pm_.c:95 ../../printerdrake.pm_.c:987
+#: ../../printerdrake.pm_.c:95 ../../printerdrake.pm_.c:1094
msgid "The port number should be an integer!"
msgstr "�˿���Ϊ����!"
@@ -7443,7 +7603,7 @@ msgstr "�˿���Ϊ����!"
msgid "CUPS server IP"
msgstr "CUPS ������ IP"
-#: ../../printerdrake.pm_.c:103 ../../printerdrake.pm_.c:1007
+#: ../../printerdrake.pm_.c:103 ../../printerdrake.pm_.c:1114
msgid "Port"
msgstr "�˿�"
@@ -7451,12 +7611,139 @@ msgstr "�˿�"
msgid "Automatic CUPS configuration"
msgstr "CUPS�Զ���������"
-#: ../../printerdrake.pm_.c:183 ../../printerdrake.pm_.c:192
-#: ../../printerdrake.pm_.c:2897 ../../printerdrake.pm_.c:3017
+#: ../../printerdrake.pm_.c:177 ../../printerdrake.pm_.c:247
+#: ../../printerdrake.pm_.c:1529 ../../printerdrake.pm_.c:1533
+#: ../../printerdrake.pm_.c:1651 ../../printerdrake.pm_.c:2203
+#: ../../printerdrake.pm_.c:2356 ../../printerdrake.pm_.c:2415
+#: ../../printerdrake.pm_.c:2488 ../../printerdrake.pm_.c:2509
+#: ../../printerdrake.pm_.c:2699 ../../printerdrake.pm_.c:2740
+#: ../../printerdrake.pm_.c:2745 ../../printerdrake.pm_.c:2779
+#: ../../printerdrake.pm_.c:2784 ../../printerdrake.pm_.c:2821
+#: ../../printerdrake.pm_.c:2874 ../../printerdrake.pm_.c:2894
+#: ../../printerdrake.pm_.c:2908 ../../printerdrake.pm_.c:2942
+#: ../../printerdrake.pm_.c:2988 ../../printerdrake.pm_.c:3006
+#: ../../printerdrake.pm_.c:3095 ../../printerdrake.pm_.c:3169
+#: ../../printerdrake.pm_.c:3471 ../../printerdrake.pm_.c:3526
+#: ../../printerdrake.pm_.c:3579 ../../standalone/printerdrake_.c:57
+msgid "Printerdrake"
+msgstr "��ӡ��������"
+
+#: ../../printerdrake.pm_.c:178
+msgid "Checking your system..."
+msgstr "�������ϵͳ ..."
+
+#: ../../printerdrake.pm_.c:186
+msgid ""
+"There are no printers found which are directly connected to your machine"
+msgstr "û�з��ִ�ӡ��ֱ�����������Ļ�����"
+
+#: ../../printerdrake.pm_.c:198
+msgid ""
+"The following printers\n"
+"\n"
+msgstr ""
+"������������Ҫ��ж��\n"
+"\n"
+
+#: ../../printerdrake.pm_.c:199
+msgid ""
+"The following printer\n"
+"\n"
+msgstr ""
+"���д�ӡ��\n"
+"\n"
+
+#: ../../printerdrake.pm_.c:201
+msgid ""
+"\n"
+"and one unknown printer are "
+msgstr ""
+"\n"
+"�Լ�һ��δ֪�Ĵ�ӡ�� "
+
+#: ../../printerdrake.pm_.c:203
+#, c-format
+msgid ""
+"\n"
+"and %d unknown printers are "
+msgstr ""
+"\n"
+"�� %d ��δ֪�Ĵ�ӡ�� "
+
+#: ../../printerdrake.pm_.c:207
+msgid ""
+"\n"
+"are "
+msgstr ""
+"\n"
+" "
+
+#: ../../printerdrake.pm_.c:208
+msgid ""
+"\n"
+"is "
+msgstr ""
+"\n"
+" "
+
+#: ../../printerdrake.pm_.c:210
+msgid "directly connected to your system"
+msgstr "ֱ������������ϵͳ"
+
+#: ../../printerdrake.pm_.c:213
+msgid ""
+"\n"
+"There is one unknown printer directly connected to your system"
+msgstr ""
+"\n"
+"��һ��δ֪�Ĵ�ӡ��ֱ������������ϵͳ"
+
+#: ../../printerdrake.pm_.c:215
+#, c-format
+msgid ""
+"\n"
+"There are %d unknown printers directly connected to your system"
+msgstr ""
+"\n"
+"�� %d ��δ֪�Ĵ�ӡ��ֱ������������ϵͳ"
+
+#: ../../printerdrake.pm_.c:221
+msgid " (Make sure that all your printers are connected and turned on).\n"
+msgstr " (��ȷ�����Ĵ�ӡ���Ѿ����Ӻò��ҽ�ͨ�˵�Դ).\n"
+
+#: ../../printerdrake.pm_.c:235
+msgid ""
+"Do you want to enable printing on the printers mentioned above or on "
+"printers in the local network?\n"
+msgstr "���뼤��������ӡ���Ĵ�ӡ����, ����Ҫʹ�ñ�������Ĵ�ӡ������ӡ?\n"
+
+#: ../../printerdrake.pm_.c:236
+msgid "Do you want to enable printing on printers in the local network?\n"
+msgstr "����ʹ�ñ�������Ĵ�ӡ������ӡ��?\n"
+
+#: ../../printerdrake.pm_.c:238
+msgid "Do you want to enable printing on the printers mentioned above?\n"
+msgstr "���Ƿ�ϣ���������Ĵ�ӡ���Ͻ��д�ӡ?\n"
+
+#: ../../printerdrake.pm_.c:239
+msgid "Are you sure that you want to set up printing on this machine?\n"
+msgstr "��ȷ��Ҫ����̨���������ô�ӡ��?\n"
+
+#: ../../printerdrake.pm_.c:240
+#, c-format
+msgid ""
+"NOTE: Depending on the printer model and the printing system up to %d MB of "
+"additional software will be installed."
+msgstr ""
+"ע��: ���ݲ�ͬ�Ĵ�ӡ���ͺźʹ�ӡϵͳ, ��Ҫ��װ���ӵ�����, ������Ҫ %d MB ��"
+"��."
+
+#: ../../printerdrake.pm_.c:269 ../../printerdrake.pm_.c:278
+#: ../../printerdrake.pm_.c:3117 ../../printerdrake.pm_.c:3242
msgid "Add a new printer"
msgstr "���Ӵ�ӡ��"
-#: ../../printerdrake.pm_.c:184
+#: ../../printerdrake.pm_.c:270
msgid ""
"\n"
"Welcome to the Printer Setup Wizard\n"
@@ -7473,7 +7760,7 @@ msgstr ""
"\n"
"���������ñ����������ϵĴ�ӡ��."
-#: ../../printerdrake.pm_.c:193
+#: ../../printerdrake.pm_.c:280
msgid ""
"\n"
"Welcome to the Printer Setup Wizard\n"
@@ -7482,7 +7769,7 @@ msgid ""
"computer, connected directly to the network or to a remote Windows machine.\n"
"\n"
"If you have printer(s) connected to this machine, Please plug it/them in on "
-"this computer and turn it/them on so that they can be auto-detected. Also "
+"this computer and turn it/them on so that it/they can be auto-detected. Also "
"your network printer(s) and you Windows machines must be connected and "
"turned on.\n"
"\n"
@@ -7501,14 +7788,38 @@ msgstr ""
"��Զ�̵� Windows ������.\n"
"\n"
"������Ĵ�ӡ��Ҫֱ��������̨����, �����(��)��ӵ� ��̨���Բ��򿪵�Դ, ������"
-"���Զ����. �� ���������ӡ���� Windows ����Ҳ�������Ӻ� ���ҿ���.\n"
+"���Զ����. ���������ӡ�������� Windows ����ҲҪ���Ӻò���ͨ��Դ.\n"
"\n"
"ע���Զ���������ϵĴ�ӡ���ȼ�������ڱ����Ĵ�ӡ������ʱ��Ҫ��. ��� ������"
"Ҫ, ��رն������ӡ����Windows��ӡ�����Զ����.\n"
"\n"
"׼���þ͵�� \"��һ��\" , ����������������ô�ӡ��, ��� \"ȡ��\"."
-#: ../../printerdrake.pm_.c:202
+#: ../../printerdrake.pm_.c:289 ../../printerdrake.pm_.c:306
+msgid ""
+"\n"
+"Welcome to the Printer Setup Wizard\n"
+"\n"
+"This wizard will help you to install your printer(s) connected to this "
+"computer.\n"
+"\n"
+"If you have printer(s) connected to this machine, Please plug it/them in on "
+"this computer and turn it/them on so that it/they can be auto-detected.\n"
+"\n"
+" Click on \"Next\" when you are ready, and on \"Cancel\" when you do not "
+"want to set up your printer(s) now."
+msgstr ""
+"\n"
+"��ӡ�����þ��黶ӭ��!\n"
+"\n"
+"�ҽ�����������ֱ����������̨���ԵĴ�ӡ��.\n"
+"\n"
+"������Ĵ�ӡ��ֱ��������̨����, �����(��)��ӵ� ��̨���Բ��򿪵�Դ, ��������"
+"�Զ����.\n"
+"\n"
+"׼���þ͵�� \"��һ��\" , ����������������ô�ӡ��, ��� \"ȡ��\"."
+
+#: ../../printerdrake.pm_.c:297
msgid ""
"\n"
"Welcome to the Printer Setup Wizard\n"
@@ -7517,7 +7828,7 @@ msgid ""
"computer or connected directly to the network.\n"
"\n"
"If you have printer(s) connected to this machine, Please plug it/them in on "
-"this computer and turn it/them on so that they can be auto-detected. Also "
+"this computer and turn it/them on so that it/they can be auto-detected. Also "
"your network printer(s) must be connected and turned on.\n"
"\n"
"Note that auto-detecting printers on the network takes longer than the auto-"
@@ -7530,35 +7841,34 @@ msgstr ""
"\n"
"��ӡ�����þ��黶ӭ��!\n"
"\n"
-"�ҽ��������������Ĵ�ӡ��, ������ֱ�������� ��̨����, ֱ������������, ��������"
-"��Զ�̵� Windows ������.\n"
+"�ҽ��������������Ĵ�ӡ��, ������������ ��̨����, ����ֱ������������.\n"
"\n"
"������Ĵ�ӡ��Ҫֱ��������̨����, �����(��)��ӵ� ��̨���Բ��򿪵�Դ, ������"
-"���Զ����. �� ���������ӡ���� Windows ����Ҳ�������Ӻ� ���ҿ���.\n"
+"���Զ����. ���������ӡ��ҲҪ���Ӻò���ͨ��Դ..\n"
"\n"
"ע���Զ���������ϵĴ�ӡ���ȼ�������ڱ����Ĵ�ӡ������ʱ��Ҫ��. ��� ������"
-"Ҫ, ��رն������ӡ����Windows��ӡ�����Զ����.\n"
+"Ҫ, ��رն������ӡ�����Զ����.\n"
"\n"
"׼���þ͵�� \"��һ��\" , ����������������ô�ӡ��, ��� \"ȡ��\"."
-#: ../../printerdrake.pm_.c:213
+#: ../../printerdrake.pm_.c:315
msgid "Auto-detect printers connected to this machine"
msgstr "�Զ�̽����̨�������ӵĴ�ӡ��"
-#: ../../printerdrake.pm_.c:215
+#: ../../printerdrake.pm_.c:318
msgid "Auto-detect printers connected directly to the local network"
msgstr "�Զ�̽��ֱ�����ӵ���������Ĵ�ӡ��"
-#: ../../printerdrake.pm_.c:218
+#: ../../printerdrake.pm_.c:321
msgid "Auto-detect printers connected to machines running Microsoft Windows"
msgstr "�Զ�̽������ Microsoft Windows �Ļ������ӵĴ�ӡ��"
-#: ../../printerdrake.pm_.c:245 ../../printerdrake.pm_.c:459
-#: ../../printerdrake.pm_.c:484
+#: ../../printerdrake.pm_.c:348 ../../printerdrake.pm_.c:562
+#: ../../printerdrake.pm_.c:587
msgid "Local Printer"
msgstr "������ӡ��"
-#: ../../printerdrake.pm_.c:246
+#: ../../printerdrake.pm_.c:349
msgid ""
"\n"
"Congratulations, your printer is now installed and configured!\n"
@@ -7579,49 +7889,49 @@ msgstr ""
"����Ժ�Ҫ����, ɾ����ӡ��, �ı��ӡ������, ������Ҫ�޸�ȱʡ��ӡ���� (��ֽ"
"��, �������, ...), �� Mandrake �������ĵ� \"Ӳ��\"����ѡ��\"��ӡ��\"."
-#: ../../printerdrake.pm_.c:283 ../../printerdrake.pm_.c:474
-#: ../../printerdrake.pm_.c:683 ../../printerdrake.pm_.c:923
+#: ../../printerdrake.pm_.c:386 ../../printerdrake.pm_.c:577
+#: ../../printerdrake.pm_.c:790 ../../printerdrake.pm_.c:1030
msgid "Printer auto-detection"
msgstr "��ӡ���Զ����"
-#: ../../printerdrake.pm_.c:305
+#: ../../printerdrake.pm_.c:408
#, c-format
msgid ", network printer \"%s\", port %s"
msgstr ", �����ӡ�� \"%s\", �˿� %s"
-#: ../../printerdrake.pm_.c:307
+#: ../../printerdrake.pm_.c:410
#, c-format
msgid ", printer \"%s\" on SMB/Windows server \"%s\""
msgstr ", ��ӡ�� \"%s\" �� SMB/Windows ������ \"%s\" ��"
-#: ../../printerdrake.pm_.c:313
+#: ../../printerdrake.pm_.c:416
#, c-format
msgid "Detected %s"
msgstr "��⵽ %s"
-#: ../../printerdrake.pm_.c:317 ../../printerdrake.pm_.c:348
-#: ../../printerdrake.pm_.c:367
+#: ../../printerdrake.pm_.c:420 ../../printerdrake.pm_.c:451
+#: ../../printerdrake.pm_.c:470
#, c-format
msgid "Printer on parallel port \\/*%s"
msgstr "���ж˿ڴ�ӡ�� \\/*%s"
-#: ../../printerdrake.pm_.c:319 ../../printerdrake.pm_.c:350
-#: ../../printerdrake.pm_.c:372
+#: ../../printerdrake.pm_.c:422 ../../printerdrake.pm_.c:453
+#: ../../printerdrake.pm_.c:475
#, c-format
msgid "USB printer \\/*%s"
msgstr "USB ��ӡ�� \\/*%s"
-#: ../../printerdrake.pm_.c:321
+#: ../../printerdrake.pm_.c:424
#, c-format
msgid "Network printer \"%s\", port %s"
msgstr "�����ӡ�� \"%s\", �˿� %s"
-#: ../../printerdrake.pm_.c:323
+#: ../../printerdrake.pm_.c:426
#, c-format
msgid "Printer \"%s\" on SMB/Windows server \"%s\""
msgstr "��ӡ�� \"%s\" �� SMB/Windows ��������ӡ�� \"%s\" ��"
-#: ../../printerdrake.pm_.c:460
+#: ../../printerdrake.pm_.c:563
msgid ""
"No local printer found! To manually install a printer enter a device name/"
"file name in the input line (Parallel Ports: /dev/lp0, /dev/lp1, ..., "
@@ -7632,19 +7942,19 @@ msgstr ""
"lp0, /dev/lp1, ..., �൱�� LPT1:, LPT2:, ..., ��һ�� USB ��ӡ��: /dev/usb/"
"lp0, �ڶ��� USB ��ӡ��: /dev/usb/lp1, ...)."
-#: ../../printerdrake.pm_.c:464
+#: ../../printerdrake.pm_.c:567
msgid "You must enter a device or file name!"
msgstr "����Ҫ�����ӡ���豸����һ�ļ���!"
-#: ../../printerdrake.pm_.c:475
+#: ../../printerdrake.pm_.c:578
msgid "No printer found!"
msgstr "û�з��ִ�ӡ��!"
-#: ../../printerdrake.pm_.c:485
+#: ../../printerdrake.pm_.c:588
msgid "Available printers"
msgstr "���ô�ӡ��"
-#: ../../printerdrake.pm_.c:489
+#: ../../printerdrake.pm_.c:592
msgid ""
"The following printer was auto-detected, if it is not the one you want to "
"configure, enter a device name/file name in the input line"
@@ -7652,7 +7962,7 @@ msgstr ""
"�Զ���ⷢ�������д�ӡ��, �����Ҫʹ�õĴ�ӡ������������������������һ���豸"
"�����ļ���"
-#: ../../printerdrake.pm_.c:490
+#: ../../printerdrake.pm_.c:593
msgid ""
"Here is a list of all auto-detected printers. Please choose the printer you "
"want to set up or enter a device name/file name in the input line"
@@ -7660,7 +7970,7 @@ msgstr ""
"�Զ���ⷢ�������д�ӡ��, ��ѡ����Ҫʹ�õĴ�ӡ��, ����������������һ���豸��"
"���ļ���"
-#: ../../printerdrake.pm_.c:492
+#: ../../printerdrake.pm_.c:595
msgid ""
"The following printer was auto-detected. The configuration of the printer "
"will work fully automatically. If your printer was not correctly detected or "
@@ -7670,7 +7980,7 @@ msgstr ""
"�Զ���ⷢ�������д�ӡ��, ��ӡ�������� ����ȫ�Զ�����. ������Ĵ�ӡ��û�б���"
"ȷ��� �������붨�ƴ�ӡ������, ѡ�� \"�ֹ� ����\"."
-#: ../../printerdrake.pm_.c:493
+#: ../../printerdrake.pm_.c:596
msgid ""
"Here is a list of all auto-detected printers. Please choose the printer you "
"want to set up. The configuration of the printer will work fully "
@@ -7680,17 +7990,17 @@ msgstr ""
"�����г������м�⵽�Ĵ�ӡ��. ��ѡ����ϣ�����õĴ�ӡ��. ������Ĵ�ӡ��û�б�"
"��ȷ��� �������붨�ƴ�ӡ������, ѡ�� \"�ֹ� ����\"."
-#: ../../printerdrake.pm_.c:495
+#: ../../printerdrake.pm_.c:598
msgid ""
"Please choose the port where your printer is connected to or enter a device "
"name/file name in the input line"
msgstr "��ѡ������ӡ��ʹ�õĶ˿ڻ�������������һ�Ϸ��豸���ļ�"
-#: ../../printerdrake.pm_.c:496
+#: ../../printerdrake.pm_.c:599
msgid "Please choose the port where your printer is connected to."
msgstr "�������Ĵ�ӡ�������ӵ��Ǹ��˿�?"
-#: ../../printerdrake.pm_.c:498
+#: ../../printerdrake.pm_.c:601
msgid ""
" (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., "
"1st USB printer: /dev/usb/lp0, 2nd USB printer: /dev/usb/lp1, ...)."
@@ -7698,19 +8008,19 @@ msgstr ""
" (���п�: /dev/lp0, /dev/lp1, ..., �൱�� LPT1:, LPT2:, ..., ��һ�� USB �豸"
"��: /dev/usb/lp0, �ڶ��� USB �豸��: /dev/usb/lp1, ...)."
-#: ../../printerdrake.pm_.c:503
+#: ../../printerdrake.pm_.c:606
msgid "You must choose/enter a printer/device!"
msgstr "����Ҫ����һ̨��ӡ���豸"
-#: ../../printerdrake.pm_.c:523
+#: ../../printerdrake.pm_.c:626
msgid "Manual configuration"
msgstr "�ֹ�����"
-#: ../../printerdrake.pm_.c:577
+#: ../../printerdrake.pm_.c:680
msgid "Remote lpd Printer Options"
msgstr "Զ�� lpd ��ӡ��ѡ��"
-#: ../../printerdrake.pm_.c:578
+#: ../../printerdrake.pm_.c:681
msgid ""
"To use a remote lpd printer, you need to supply the hostname of the printer "
"server and the printer name on that server."
@@ -7718,46 +8028,46 @@ msgstr ""
"Ҫʹ��һ��Զ�˵� lpd ��ӡ����, ����Ҫָ����ӡ��������\n"
"�������ʹ�ӡ����Ҫ�����Ĵ�ӡ���е�����."
-#: ../../printerdrake.pm_.c:579
+#: ../../printerdrake.pm_.c:682
msgid "Remote host name"
msgstr "Զ��������"
-#: ../../printerdrake.pm_.c:580
+#: ../../printerdrake.pm_.c:683
msgid "Remote printer name"
msgstr "Զ�̴�ӡ����"
-#: ../../printerdrake.pm_.c:583
+#: ../../printerdrake.pm_.c:686
msgid "Remote host name missing!"
msgstr "δ�ҵ�Զ������!"
-#: ../../printerdrake.pm_.c:587
+#: ../../printerdrake.pm_.c:690
msgid "Remote printer name missing!"
msgstr "û���ҵ�Զ�˴�ӡ��!"
-#: ../../printerdrake.pm_.c:609 ../../printerdrake.pm_.c:1119
+#: ../../printerdrake.pm_.c:712 ../../printerdrake.pm_.c:1225
#, c-format
msgid "Detected model: %s %s"
msgstr "��⵽�ͺ�: %s %s"
-#: ../../printerdrake.pm_.c:683 ../../printerdrake.pm_.c:923
+#: ../../printerdrake.pm_.c:790 ../../printerdrake.pm_.c:1030
msgid "Scanning network..."
msgstr "����ɨ������..."
-#: ../../printerdrake.pm_.c:692 ../../printerdrake.pm_.c:713
+#: ../../printerdrake.pm_.c:799 ../../printerdrake.pm_.c:820
#, c-format
msgid ", printer \"%s\" on server \"%s\""
msgstr ", ��ӡ�� \"%s\"�ڷ����� \"%s\"��"
-#: ../../printerdrake.pm_.c:695 ../../printerdrake.pm_.c:716
+#: ../../printerdrake.pm_.c:802 ../../printerdrake.pm_.c:823
#, c-format
msgid "Printer \"%s\" on server \"%s\""
msgstr "��ӡ�� \"%s\"�ڷ����� \"%s\"��"
-#: ../../printerdrake.pm_.c:736
+#: ../../printerdrake.pm_.c:843
msgid "SMB (Windows 9x/NT) Printer Options"
msgstr "SMB (Windows 9x/NT) ��ӡ��ѡ��"
-#: ../../printerdrake.pm_.c:737
+#: ../../printerdrake.pm_.c:844
msgid ""
"To print to a SMB printer, you need to provide the SMB host name (Note! It "
"may be different from its TCP/IP hostname!) and possibly the IP address of "
@@ -7769,7 +8079,7 @@ msgstr ""
"�ھ��￴����������, ���������� TCP/IP ��������ͬ,), ���ܻ���Ҫ���� IP ��ַ,\n"
"�Լ���Ȩ���ʴ�ӡ�����û���, ������Ϳ���, ��Ȼ���д�ӡ���Ĺ�����. "
-#: ../../printerdrake.pm_.c:738
+#: ../../printerdrake.pm_.c:845
msgid ""
" If the desired printer was auto-detected, simply choose it from the list "
"and then add user name, password, and/or workgroup if needed."
@@ -7777,39 +8087,39 @@ msgstr ""
"����Զ���ⷢ������Ҫ�Ĵ�ӡ��, ֻҪ���б���ѡ����, Ȼ�������û���, ����, ��"
"��������Ҫ����������."
-#: ../../printerdrake.pm_.c:739
+#: ../../printerdrake.pm_.c:846
msgid "SMB server host"
msgstr "SMB ����������"
-#: ../../printerdrake.pm_.c:740
+#: ../../printerdrake.pm_.c:847
msgid "SMB server IP"
msgstr "SMB ������ IP"
-#: ../../printerdrake.pm_.c:741
+#: ../../printerdrake.pm_.c:848
msgid "Share name"
msgstr "������"
-#: ../../printerdrake.pm_.c:744
+#: ../../printerdrake.pm_.c:851
msgid "Workgroup"
msgstr "������"
-#: ../../printerdrake.pm_.c:746
+#: ../../printerdrake.pm_.c:853
msgid "Auto-detected"
msgstr "�Զ���⵽"
-#: ../../printerdrake.pm_.c:757
+#: ../../printerdrake.pm_.c:864
msgid "Either the server name or the server's IP must be given!"
msgstr "��������������������IP"
-#: ../../printerdrake.pm_.c:761
+#: ../../printerdrake.pm_.c:868
msgid "Samba share name missing!"
msgstr "ȱ�� Samba ������!"
-#: ../../printerdrake.pm_.c:767
+#: ../../printerdrake.pm_.c:874
msgid "SECURITY WARNING!"
msgstr "��ȫ����!"
-#: ../../printerdrake.pm_.c:768
+#: ../../printerdrake.pm_.c:875
#, c-format
msgid ""
"You are about to set up printing to a Windows account with password. Due to "
@@ -7846,7 +8156,7 @@ msgstr ""
"�鰴�� \"%s\" ���ӷ�ʽ ���ô�ӡ��.\n"
"\n"
-#: ../../printerdrake.pm_.c:778
+#: ../../printerdrake.pm_.c:885
#, c-format
msgid ""
"Set up your Windows server to make the printer available under the IPP "
@@ -7858,7 +8168,7 @@ msgstr ""
"�鰴�� \"%s\" ���ӷ�ʽ ���ô�ӡ��.\n"
"\n"
-#: ../../printerdrake.pm_.c:781
+#: ../../printerdrake.pm_.c:888
msgid ""
"Connect your printer to a Linux server and let your Windows machine(s) "
"connect to it as a client.\n"
@@ -7869,11 +8179,11 @@ msgstr ""
"\n"
"�����Ҫ�����������ô�ӡ����?"
-#: ../../printerdrake.pm_.c:853
+#: ../../printerdrake.pm_.c:960
msgid "NetWare Printer Options"
msgstr "NetWare ��ӡ��ѡ��"
-#: ../../printerdrake.pm_.c:854
+#: ../../printerdrake.pm_.c:961
msgid ""
"To print on a NetWare printer, you need to provide the NetWare print server "
"name (Note! it may be different from its TCP/IP hostname!) as well as the "
@@ -7884,37 +8194,37 @@ msgstr ""
"���������� TCP/IP ��������ͬ), �Լ���Ȩ���ʴ�ӡ�����û����Ϳ���, \n"
"��Ȼ���д�ӡ���Ĵ�ӡ������. "
-#: ../../printerdrake.pm_.c:855
+#: ../../printerdrake.pm_.c:962
msgid "Printer Server"
msgstr "��ӡ������"
-#: ../../printerdrake.pm_.c:856
+#: ../../printerdrake.pm_.c:963
msgid "Print Queue Name"
msgstr "��ӡ������"
-#: ../../printerdrake.pm_.c:861
+#: ../../printerdrake.pm_.c:968
msgid "NCP server name missing!"
msgstr "NCP ������δ�ҵ�"
-#: ../../printerdrake.pm_.c:865
+#: ../../printerdrake.pm_.c:972
msgid "NCP queue name missing!"
msgstr "NCP ������δ�ҵ�"
-#: ../../printerdrake.pm_.c:932 ../../printerdrake.pm_.c:952
+#: ../../printerdrake.pm_.c:1039 ../../printerdrake.pm_.c:1059
#, c-format
msgid ", host \"%s\", port %s"
msgstr ", ���� \"%s\", �˿� %s"
-#: ../../printerdrake.pm_.c:935 ../../printerdrake.pm_.c:955
+#: ../../printerdrake.pm_.c:1042 ../../printerdrake.pm_.c:1062
#, c-format
msgid "Host \"%s\", port %s"
msgstr "���� \"%s\", �˿� %s"
-#: ../../printerdrake.pm_.c:975
+#: ../../printerdrake.pm_.c:1082
msgid "TCP/Socket Printer Options"
msgstr "TCP/Socket ��ӡ��ѡ��"
-#: ../../printerdrake.pm_.c:977
+#: ../../printerdrake.pm_.c:1084
msgid ""
"Choose one of the auto-detected printers from the list or enter the hostname "
"or IP and the optional port number (default is 9100) into the input fields."
@@ -7922,7 +8232,7 @@ msgstr ""
"���Զ���⵽�Ĵ�ӡ���б���ѡ��һ��, �����������ֶ��������������� IP, �Լ���ѡ"
"�Ķ˿ں� (ȱʡ�� 9100)."
-#: ../../printerdrake.pm_.c:978
+#: ../../printerdrake.pm_.c:1085
msgid ""
"To print to a TCP or socket printer, you need to provide the host name or IP "
"of the printer and optionally the port number (default is 9100). On HP "
@@ -7933,19 +8243,19 @@ msgstr ""
"(ȱʡ�� 9100). HP JetDirect ��ӡ������ͨ���ö˿�9100, ����������������������"
"�˿�. ���������Ӳ���ֲ�."
-#: ../../printerdrake.pm_.c:983
+#: ../../printerdrake.pm_.c:1090
msgid "Printer host name or IP missing!"
msgstr "ȱ�ٴ�ӡ���������� IP ��ַ!"
-#: ../../printerdrake.pm_.c:1005
+#: ../../printerdrake.pm_.c:1112
msgid "Printer host name or IP"
msgstr "��ӡ���������� IP ��ַ"
-#: ../../printerdrake.pm_.c:1054 ../../printerdrake.pm_.c:1056
+#: ../../printerdrake.pm_.c:1160 ../../printerdrake.pm_.c:1162
msgid "Printer Device URI"
msgstr "��ӡ���豸 URI"
-#: ../../printerdrake.pm_.c:1055
+#: ../../printerdrake.pm_.c:1161
msgid ""
"You can specify directly the URI to access the printer. The URI must fulfill "
"either the CUPS or the Foomatic specifications. Note that not all URI types "
@@ -7954,11 +8264,11 @@ msgstr ""
"�����ֱ��ʹ�� URI ���ʴ�ӡ��. URI �������CUPS �� Foomatic �涨.��ע�ⲻ����"
"�еĴ�ӡ���� (spooler) ��֧�� URI."
-#: ../../printerdrake.pm_.c:1070
+#: ../../printerdrake.pm_.c:1176
msgid "A valid URI must be entered!"
msgstr "����������URI!"
-#: ../../printerdrake.pm_.c:1402
+#: ../../printerdrake.pm_.c:1515
msgid ""
"Every printer needs a name (for example \"printer\"). The Description and "
"Location fields do not need to be filled in. They are comments for the users."
@@ -7966,27 +8276,27 @@ msgstr ""
"ÿ̨��ӡ����Ҫһ������(�� \"printer\").\n"
"��ӡ��������λ���ǿ�ѡ��."
-#: ../../printerdrake.pm_.c:1403
+#: ../../printerdrake.pm_.c:1516
msgid "Name of printer"
msgstr "��ӡ������"
-#: ../../printerdrake.pm_.c:1405
+#: ../../printerdrake.pm_.c:1518
msgid "Location"
msgstr "�"
-#: ../../printerdrake.pm_.c:1416 ../../printerdrake.pm_.c:1536
+#: ../../printerdrake.pm_.c:1530 ../../printerdrake.pm_.c:1652
msgid "Reading printer database..."
msgstr "��ȡ��ӡ�����ݿ�..."
-#: ../../printerdrake.pm_.c:1419
+#: ../../printerdrake.pm_.c:1534
msgid "Preparing printer database..."
msgstr "׼����ӡ������..."
-#: ../../printerdrake.pm_.c:1516
+#: ../../printerdrake.pm_.c:1631
msgid "Your printer model"
msgstr "���Ĵ�ӡ���ͺ�"
-#: ../../printerdrake.pm_.c:1517
+#: ../../printerdrake.pm_.c:1632
#, c-format
msgid ""
"Printerdrake has compared the model name resulting from the printer auto-"
@@ -8009,24 +8319,24 @@ msgstr ""
"\n"
"%s"
-#: ../../printerdrake.pm_.c:1522 ../../printerdrake.pm_.c:1525
+#: ../../printerdrake.pm_.c:1637 ../../printerdrake.pm_.c:1640
msgid "The model is correct"
msgstr "�ͺ���ȷ"
-#: ../../printerdrake.pm_.c:1523 ../../printerdrake.pm_.c:1524
-#: ../../printerdrake.pm_.c:1527
+#: ../../printerdrake.pm_.c:1638 ../../printerdrake.pm_.c:1639
+#: ../../printerdrake.pm_.c:1642
msgid "Select model manually"
msgstr "�ֹ�ѡ���ͺ�"
-#: ../../printerdrake.pm_.c:1543
+#: ../../printerdrake.pm_.c:1659
msgid "Printer model selection"
msgstr "��ӡ���ͺ�ѡ��"
-#: ../../printerdrake.pm_.c:1544
+#: ../../printerdrake.pm_.c:1660
msgid "Which printer model do you have?"
msgstr "��������ӡ�����ͺ� ?"
-#: ../../printerdrake.pm_.c:1545
+#: ../../printerdrake.pm_.c:1661
msgid ""
"\n"
"\n"
@@ -8039,17 +8349,17 @@ msgstr ""
"����Զ����ѡ����ͺ��Ƿ���ȷ. �ù��ָ������ȷ���ͺŻ�\"δ֪��ӡ��\", Ȼ��"
"���б���ѡ����ȷ���ͺ�."
-#: ../../printerdrake.pm_.c:1548
+#: ../../printerdrake.pm_.c:1664
msgid ""
"If your printer is not listed, choose a compatible (see printer manual) or a "
"similar one."
msgstr "Ȼ�����Ĵ�ӡ�������б���, ѡ����ݵ�(�ο���ӡ���ֲ�) �����Ƶ��ͺ�."
-#: ../../printerdrake.pm_.c:1624
+#: ../../printerdrake.pm_.c:1741
msgid "OKI winprinter configuration"
msgstr "OKI winprinter ��ӡ������"
-#: ../../printerdrake.pm_.c:1625
+#: ../../printerdrake.pm_.c:1742
msgid ""
"You are configuring an OKI laser winprinter. These printers\n"
"use a very special communication protocol and therefore they work only when "
@@ -8059,34 +8369,79 @@ msgid ""
"not work. Your connection type setting will be ignored by the driver."
msgstr "����������OKI win��ӡ��, ����ʹ���ر��ͨѶЭ��, ֻ�����ڵ�һ����ӡ��."
-#: ../../printerdrake.pm_.c:1668 ../../printerdrake.pm_.c:1695
+#: ../../printerdrake.pm_.c:1785 ../../printerdrake.pm_.c:1812
msgid "Lexmark inkjet configuration"
msgstr "����(Lexmark)��ī��ӡ���趨"
-#: ../../printerdrake.pm_.c:1669
+#: ../../printerdrake.pm_.c:1786
msgid ""
"The inkjet printer drivers provided by Lexmark only support local printers, "
"no printers on remote machines or print server boxes. Please connect your "
"printer to a local port or configure it on the machine where it is connected "
"to."
-msgstr "������ī��ӡ������֧�ֱ��ش�ӡ."
+msgstr ""
+"�����ṩ����ī��ӡ�������������֧�ֱ��ش�ӡ��, ����Զ���������ӡ������ϵ�"
+"��ӡ��.��Ѵ�ӡ�����ӵ����ı����˿�, �����������˴�ӡ���ĵ����Ͻ�������."
-#: ../../printerdrake.pm_.c:1696
+#: ../../printerdrake.pm_.c:1813
msgid ""
"To be able to print with your Lexmark inkjet and this configuration, you "
"need the inkjet printer drivers provided by Lexmark (http://www.lexmark."
-"com/). Go to the US site and click on the \"Drivers\" button. Then choose "
-"your model and afterwards \"Linux\" as operating system. The drivers come as "
-"RPM packages or shell scripts with interactive graphical installation. You "
-"do not need to do this configuration by the graphical frontends. Cancel "
-"directly after the license agreement. Then print printhead alignment pages "
-"with \"lexmarkmaintain\" and adjust the head alignment settings with this "
-"program."
-msgstr ""
-"����������ī��ӡ����Ҫ��������վ(http://www.lexmark.com/)\n"
-"����\"Linux\"����."
-
-#: ../../printerdrake.pm_.c:1912
+"com/). Click on the \"Drivers\" link. Then choose your model and afterwards "
+"\"Linux\" as operating system. The drivers come as RPM packages or shell "
+"scripts with interactive graphical installation. You do not need to do this "
+"configuration by the graphical frontends. Cancel directly after the license "
+"agreement. Then print printhead alignment pages with \"lexmarkmaintain\" and "
+"adjust the head alignment settings with this program."
+msgstr ""
+"Ҫ����������ī��ӡ����Ҫ��������վ(http://www.lexmark.com/)\n"
+"������ī��ӡ����������. ��� \"Drivers\" ����. Ȼ����ѡ�����ͺ� ��ѡ��\"Linux"
+"\"����ϵͳ. �����������ʽ�� RPM ������л���ʽͼ�ν���Ľű�����. �����ʹ��"
+"������ù���, �Ͳ���ʹ��ͼ�ν���İ�װ����. ������Э��֮��ֱ�Ӱ� Cancel. �� "
+"\"lexmarkmaintain\" �����ӡ��ͷ�������ҳ, Ȼ����������������ͷ����."
+
+#: ../../printerdrake.pm_.c:1816
+msgid "GDI Laser Printer using the Zenographics ZJ-Stream Format"
+msgstr "ʹ�� Zenographics ZJ-Stream ��ʽ��GDI �����ӡ��"
+
+#: ../../printerdrake.pm_.c:1817
+msgid ""
+"Your printer belongs to the group of GDI laser printers (winprinters) sold "
+"by different manufacturers which uses the Zenographics ZJ-stream raster "
+"format for the data sent to the printer. The driver for these printers is "
+"still in a very early development stage and so it will perhaps not always "
+"work properly. Especially it is possible that the printer only works when "
+"you choose the A4 paper size.\n"
+"\n"
+"Some of these printers, as the HP LaserJet 1000, for which this driver was "
+"originally created, need their firmware to be uploaded to them after they "
+"are turned on. In the case of the HP LaserJet 1000 you have to search the "
+"printer's Windows driver CD or your Windows partition for the file "
+"\"sihp1000.img\" and upload the file to the printer with one of the "
+"following commands:\n"
+"\n"
+" lpr -o raw sihp1000.img\n"
+" cat sihp1000.img > /dev/usb/lp0\n"
+"\n"
+"The first command can be given by any normal user, the second must be given "
+"as root. After having done so you can print normally.\n"
+msgstr ""
+"���Ĵ�ӡ������GDI �����ӡ�� (��ν winprinter), �������Ӳ�ͬ ���Ƕ����� "
+"Zenographics ZJ-stream ��դ��ʽ�����ݴ��䵽��ӡ��. �����ӡ��������������Ȼ��"
+"��ǰ�ڿ����׶�, ������δ��������������. �ر��Ǵ�ӡ������ֻ��ѡ�� A4 ֽ�ųߴ�"
+"ʱ���ܹ���.\n"
+"\n"
+"��Щ��ӡ���� HP LaserJet 1000, ��Ҫ�ڿ���֮�����ع̼�. �� HP LaserJet 1000, "
+"����Ҫ�ڴ�ӡ���� Windows ����������̻� Windows ���̷����ϲ��� \"sihp1000.img"
+"\" Ȼ��ʹ����������֮һ������ļ�������ӡ��:\n"
+"\n"
+" lpr -o raw sihp1000.img\n"
+" cat sihp1000.img > /dev/usb/lp0\n"
+"\n"
+"�κ���ͨ�û�������ʹ�õ�һ������, �ڶ������������ root ִ��.�����̼�֮������"
+"����������ӡ��.\n"
+
+#: ../../printerdrake.pm_.c:2040
msgid ""
"Printer default settings\n"
"\n"
@@ -8098,22 +8453,22 @@ msgstr ""
"��ӡ��ȱʡ����\n"
"��ֽ�Ŵ�С��īˮ���͵ȵ�."
-#: ../../printerdrake.pm_.c:1921
+#: ../../printerdrake.pm_.c:2049
#, c-format
msgid "Option %s must be an integer number!"
msgstr "ѡ�� %s ����������!"
-#: ../../printerdrake.pm_.c:1925
+#: ../../printerdrake.pm_.c:2053
#, c-format
msgid "Option %s must be a number!"
msgstr "ѡ�� %s ����������!"
-#: ../../printerdrake.pm_.c:1930
+#: ../../printerdrake.pm_.c:2058
#, c-format
msgid "Option %s out of range!"
msgstr "ѡ�� %s ������Χ!"
-#: ../../printerdrake.pm_.c:1969
+#: ../../printerdrake.pm_.c:2097
#, c-format
msgid ""
"Do you want to set this printer (\"%s\")\n"
@@ -8122,11 +8477,11 @@ msgstr ""
"��ϣ�����������ӡ��(\"%s\")\n"
"��Ϊȱʡ��ӡ����?"
-#: ../../printerdrake.pm_.c:1986
+#: ../../printerdrake.pm_.c:2120
msgid "Test pages"
msgstr "����ҳ"
-#: ../../printerdrake.pm_.c:1987
+#: ../../printerdrake.pm_.c:2121
msgid ""
"Please select the test pages you want to print.\n"
"Note: the photo test page can take a rather long time to get printed and on "
@@ -8137,39 +8492,39 @@ msgstr ""
"ע��: ��ijЩ��ӡ���ϴ�ӡ��Ƭ����Ҫ���൱����ʱ��.\n"
"һ����ѡ���׼����ҳ."
-#: ../../printerdrake.pm_.c:1991
+#: ../../printerdrake.pm_.c:2125
msgid "No test pages"
msgstr "û�в���ҳ"
-#: ../../printerdrake.pm_.c:1992
+#: ../../printerdrake.pm_.c:2126
msgid "Print"
msgstr "��ӡ"
-#: ../../printerdrake.pm_.c:1994
+#: ../../printerdrake.pm_.c:2183
msgid "Standard test page"
msgstr "��׼����ҳ"
-#: ../../printerdrake.pm_.c:1997
+#: ../../printerdrake.pm_.c:2186
msgid "Alternative test page (Letter)"
msgstr "�ɻ�����ҳ(��ֽ)"
-#: ../../printerdrake.pm_.c:2000
+#: ../../printerdrake.pm_.c:2189
msgid "Alternative test page (A4)"
msgstr "�滻����ҳ (A4)"
-#: ../../printerdrake.pm_.c:2002
+#: ../../printerdrake.pm_.c:2191
msgid "Photo test page"
msgstr "��Ƭ����ҳ"
-#: ../../printerdrake.pm_.c:2006
+#: ../../printerdrake.pm_.c:2195
msgid "Do not print any test page"
msgstr "����ӡ�κβ���ҳ"
-#: ../../printerdrake.pm_.c:2014 ../../printerdrake.pm_.c:2166
+#: ../../printerdrake.pm_.c:2204 ../../printerdrake.pm_.c:2357
msgid "Printing test page(s)..."
msgstr "���ڴ�ӡ����ҳ..."
-#: ../../printerdrake.pm_.c:2039
+#: ../../printerdrake.pm_.c:2229
#, c-format
msgid ""
"Test page(s) have been sent to the printer.\n"
@@ -8183,21 +8538,21 @@ msgstr ""
"%s\n"
"\n"
-#: ../../printerdrake.pm_.c:2043
+#: ../../printerdrake.pm_.c:2233
msgid ""
"Test page(s) have been sent to the printer.\n"
"It may take some time before the printer starts.\n"
msgstr "����ҳ�Ѿ����͵���ӡ����̨����. ��һ�ٶ�ʱ���ӡ������ʼ����.\n"
-#: ../../printerdrake.pm_.c:2050
+#: ../../printerdrake.pm_.c:2240
msgid "Did it work properly?"
msgstr "��������?"
-#: ../../printerdrake.pm_.c:2072 ../../printerdrake.pm_.c:3191
+#: ../../printerdrake.pm_.c:2262 ../../printerdrake.pm_.c:3416
msgid "Raw printer"
msgstr "���ӡ��"
-#: ../../printerdrake.pm_.c:2098
+#: ../../printerdrake.pm_.c:2288
#, c-format
msgid ""
"To print a file from the command line (terminal window) you can either use "
@@ -8208,7 +8563,7 @@ msgstr ""
"Ҫ�������д�ӡ�ļ���ʹ������\"%s <�ļ�>\" ��ͼ�δ�ӡ����: \"xpp <�ļ�>\" �� "
"\"kprinter <�ļ�>\". ͼ�ι��������Ƚ����׵�ѡ���ӡ�����޸Ĵ�ӡѡ��.\n"
-#: ../../printerdrake.pm_.c:2100
+#: ../../printerdrake.pm_.c:2290
msgid ""
"These commands you can also use in the \"Printing command\" field of the "
"printing dialogs of many applications, but here do not supply the file name "
@@ -8217,8 +8572,8 @@ msgstr ""
"�����������������Ӧ�õĴ�ӡ�Ի����\"��ӡ����\"��,��ΪӦ�ó�����ṩҪ��ӡ��"
"�ļ�, �������ﲻ��д�ļ���.\n"
-#: ../../printerdrake.pm_.c:2103 ../../printerdrake.pm_.c:2120
-#: ../../printerdrake.pm_.c:2130
+#: ../../printerdrake.pm_.c:2293 ../../printerdrake.pm_.c:2310
+#: ../../printerdrake.pm_.c:2320
#, c-format
msgid ""
"\n"
@@ -8229,7 +8584,7 @@ msgstr ""
"\n"
"\"%s\"����Ҳ�������޸Ĵ�ӡ��ҵ��ѡ��, ����: \"%s <file>\". "
-#: ../../printerdrake.pm_.c:2106 ../../printerdrake.pm_.c:2146
+#: ../../printerdrake.pm_.c:2296 ../../printerdrake.pm_.c:2336
#, c-format
msgid ""
"To know about the options available for the current printer read either the "
@@ -8239,7 +8594,7 @@ msgstr ""
"Ҫ�˽⵱ǰ��ӡ�����õ�ѡ��, �뿴������б�, ���ߵ��\"��ӡѡ���б�\".%s%s\n"
"\n"
-#: ../../printerdrake.pm_.c:2110
+#: ../../printerdrake.pm_.c:2300
msgid ""
"Here is a list of the available printing options for the current printer:\n"
"\n"
@@ -8247,35 +8602,35 @@ msgstr ""
"�����ǿ����ڵ�ǰ��ӡ����һЩ��ӡѡ��: \n"
"\n"
-#: ../../printerdrake.pm_.c:2115 ../../printerdrake.pm_.c:2125
+#: ../../printerdrake.pm_.c:2305 ../../printerdrake.pm_.c:2315
#, c-format
msgid ""
"To print a file from the command line (terminal window) use the command \"%s "
"<file>\".\n"
msgstr "�����д�ӡ�ļ�ʹ������\"%s <�ļ�>\".\n"
-#: ../../printerdrake.pm_.c:2117 ../../printerdrake.pm_.c:2127
-#: ../../printerdrake.pm_.c:2137
+#: ../../printerdrake.pm_.c:2307 ../../printerdrake.pm_.c:2317
+#: ../../printerdrake.pm_.c:2327
msgid ""
"This command you can also use in the \"Printing command\" field of the "
"printing dialogs of many applications. But here do not supply the file name "
"because the file to print is provided by the application.\n"
msgstr "�����������������Ӧ�õĴ�ӡ�Ի����\"��ӡ����\"��.\n"
-#: ../../printerdrake.pm_.c:2122 ../../printerdrake.pm_.c:2132
+#: ../../printerdrake.pm_.c:2312 ../../printerdrake.pm_.c:2322
msgid ""
"To get a list of the options available for the current printer click on the "
"\"Print option list\" button."
msgstr "���\"��ӡѡ��\"��ť�����оٵ�ǰ��ӡ���Ŀ���ѡ��."
-#: ../../printerdrake.pm_.c:2135
+#: ../../printerdrake.pm_.c:2325
#, c-format
msgid ""
"To print a file from the command line (terminal window) use the command \"%s "
"<file>\" or \"%s <file>\".\n"
msgstr "������\"%s <�ļ�>\"��\"%s <�ļ�>\"��ӡ�ļ�.\n"
-#: ../../printerdrake.pm_.c:2139
+#: ../../printerdrake.pm_.c:2329
msgid ""
"You can also use the graphical interface \"xpdq\" for setting options and "
"handling printing jobs.\n"
@@ -8287,7 +8642,7 @@ msgstr ""
"�������ͼ�νӿ�\"xpdq\"���ô�ӡѡ��ʹ�����ӡ��ҵ.\n"
"�����ʹ��KDE, ��������\"ֹͣ��ӡ��!\"��ť����ȡ����ӡ��ҵ.\n"
-#: ../../printerdrake.pm_.c:2143
+#: ../../printerdrake.pm_.c:2333
#, c-format
msgid ""
"\n"
@@ -8298,40 +8653,40 @@ msgstr ""
"\n"
"\"%s\"��\"%s\"���������޸Ĵ�ӡ��ҵ��ѡ��, ����: \"%s <file>\".\n"
-#: ../../printerdrake.pm_.c:2153
+#: ../../printerdrake.pm_.c:2343
#, c-format
msgid "Printing/Scanning/Photo Cards on \"%s\""
msgstr "��\"%s\"��ӡ���ϵĴ�ӡ/ɨ��/��Ƭ��"
-#: ../../printerdrake.pm_.c:2154
+#: ../../printerdrake.pm_.c:2344
#, c-format
msgid "Printing/Scanning on \"%s\""
msgstr "��\"%s\"��ӡ���ϵĴ�ӡ/ɨ��"
-#: ../../printerdrake.pm_.c:2156
+#: ../../printerdrake.pm_.c:2346
#, c-format
msgid "Printing/Photo Card Access on \"%s\""
msgstr "\"%s\"��ӡ���ϵĴ�ӡ/��Ƭ������"
-#: ../../printerdrake.pm_.c:2157
+#: ../../printerdrake.pm_.c:2347
#, c-format
msgid "Printing on the printer \"%s\""
msgstr "����\"%s\"��ӡ���ϴ�ӡ"
-#: ../../printerdrake.pm_.c:2160 ../../printerdrake.pm_.c:2163
-#: ../../printerdrake.pm_.c:2164 ../../printerdrake.pm_.c:2165
-#: ../../printerdrake.pm_.c:3175 ../../standalone/drakTermServ_.c:248
-#: ../../standalone/drakbackup_.c:1485 ../../standalone/drakbackup_.c:3530
-#: ../../standalone/drakbug_.c:129 ../../standalone/drakfont_.c:705
+#: ../../printerdrake.pm_.c:2350 ../../printerdrake.pm_.c:2353
+#: ../../printerdrake.pm_.c:2354 ../../printerdrake.pm_.c:2355
+#: ../../printerdrake.pm_.c:3400 ../../standalone/drakTermServ_.c:248
+#: ../../standalone/drakbackup_.c:1560 ../../standalone/drakbackup_.c:4208
+#: ../../standalone/drakbug_.c:130 ../../standalone/drakfont_.c:705
#: ../../standalone/drakfont_.c:1014
msgid "Close"
msgstr "�ر�"
-#: ../../printerdrake.pm_.c:2163
+#: ../../printerdrake.pm_.c:2353
msgid "Print option list"
msgstr "��ӡ��ѡ��"
-#: ../../printerdrake.pm_.c:2182
+#: ../../printerdrake.pm_.c:2373
#, c-format
msgid ""
"Your multi-function device was configured automatically to be able to scan. "
@@ -8351,7 +8706,7 @@ msgstr ""
"\n"
"��Ҫ������豸ʹ�� \"scannerdrakeɨ�������ù���\"!"
-#: ../../printerdrake.pm_.c:2202
+#: ../../printerdrake.pm_.c:2394
msgid ""
"Your printer was configured automatically to give you access to the photo "
"card drives from your PC. Now you can access your photo cards using the "
@@ -8370,17 +8725,17 @@ msgstr ""
"����Ƭ���� HP ��ӡ�����Բ鿴�������̷�. �� \"MtoolsFM\" �� ���������ļ��б���"
"���Ͻ��л��̷�."
-#: ../../printerdrake.pm_.c:2223 ../../printerdrake.pm_.c:2673
-#: ../../printerdrake.pm_.c:2945
+#: ../../printerdrake.pm_.c:2416 ../../printerdrake.pm_.c:2875
+#: ../../printerdrake.pm_.c:3170
msgid "Reading printer data..."
msgstr "��ȡ��ӡ������..."
-#: ../../printerdrake.pm_.c:2243 ../../printerdrake.pm_.c:2271
-#: ../../printerdrake.pm_.c:2306
+#: ../../printerdrake.pm_.c:2436 ../../printerdrake.pm_.c:2464
+#: ../../printerdrake.pm_.c:2499
msgid "Transfer printer configuration"
-msgstr "���ʹ�ӡ������"
+msgstr "Ǩ�ƴ�ӡ������"
-#: ../../printerdrake.pm_.c:2244
+#: ../../printerdrake.pm_.c:2437
#, c-format
msgid ""
"You can copy the printer configuration which you have done for the spooler %"
@@ -8389,61 +8744,61 @@ msgid ""
"overtaken, but jobs will not be transferred.\n"
"Not all queues can be transferred due to the following reasons:\n"
msgstr ""
-"����Ը������õĴ�ӡ�����ô� %s ����ǰ�� %s .\n"
-"�����������ݽ������ǣ���ӡ��ҵ���ᴫ��.\n"
-"��������ԭ��ijЩ��ӡ��ҵ���ᱻ����:\n"
+"����԰����õĴ�ӡ�����ôӶ��� %s ���Ƶ� %s, ����ǰ�Ķ���.\n"
+"�����������ݽ������ǣ����Ǵ�ӡ��ҵ����Ǩ��.\n"
+"��������ԭ��, ijЩ��ӡ�����޷�Ǩ��:\n"
-#: ../../printerdrake.pm_.c:2247
+#: ../../printerdrake.pm_.c:2440
msgid ""
"CUPS does not support printers on Novell servers or printers sending the "
"data into a free-formed command.\n"
msgstr "CUPS��֧��Novell�������ϵĴ�ӡ�����������ݵ��޸�ʽ����Ĵ�ӡ��.\n"
-#: ../../printerdrake.pm_.c:2249
+#: ../../printerdrake.pm_.c:2442
msgid ""
"PDQ only supports local printers, remote LPD printers, and Socket/TCP "
"printers.\n"
-msgstr "PDQֻ֧�ֱ��ش�ӡ��,Զ��LPD��ӡ��, �� Socket/TCP ��ӡ��.\n"
+msgstr "PDQֻ֧�ֱ��ش�ӡ��, Զ��LPD��ӡ��, �� Socket/TCP ��ӡ��.\n"
-#: ../../printerdrake.pm_.c:2251
+#: ../../printerdrake.pm_.c:2444
msgid "LPD and LPRng do not support IPP printers.\n"
msgstr "LPD �� LPRng��֧��IPP��ӡ��.\n"
-#: ../../printerdrake.pm_.c:2253
+#: ../../printerdrake.pm_.c:2446
msgid ""
"In addition, queues not created with this program or \"foomatic-configure\" "
"cannot be transferred."
msgstr ""
-"�ó���û�н������л�\n"
-"\"foomatic ����\"�޷�����"
+"����, ������в��������������� \"foomatic-configure\" ������, ���޷�Ǩ��."
-#: ../../printerdrake.pm_.c:2254
+#: ../../printerdrake.pm_.c:2447
msgid ""
"\n"
"Also printers configured with the PPD files provided by their manufacturers "
"or with native CUPS drivers cannot be transferred."
msgstr ""
"\n"
-"��ӡ�������ṩ�� PPD ���ӡ���� CUPS ���������޷�����."
+"����, �����ӡ����Ҫʹ�ó����ṩ�� PPD�ļ�����, ���ӡ���������õ� CUPS ����"
+"����, �����޷�Ǩ��."
-#: ../../printerdrake.pm_.c:2255
+#: ../../printerdrake.pm_.c:2448
msgid ""
"\n"
"Mark the printers which you want to transfer and click \n"
"\"Transfer\"."
msgstr ""
"\n"
-"ѡ����Ҫ���͵Ĵ�ӡ�������\"����\"."
+"�����ҪǨ�ƵĴ�ӡ�������\"Ǩ��\"."
-#: ../../printerdrake.pm_.c:2258
+#: ../../printerdrake.pm_.c:2451
msgid "Do not transfer printers"
-msgstr "�����ʹ�ӡ��"
+msgstr "��Ǩ�ƴ�ӡ��"
-#: ../../printerdrake.pm_.c:2259 ../../printerdrake.pm_.c:2276
+#: ../../printerdrake.pm_.c:2452 ../../printerdrake.pm_.c:2469
msgid "Transfer"
-msgstr "����"
+msgstr "Ǩ��"
-#: ../../printerdrake.pm_.c:2272
+#: ../../printerdrake.pm_.c:2465
#, c-format
msgid ""
"A printer named \"%s\" already exists under %s. \n"
@@ -8451,14 +8806,14 @@ msgid ""
"You can also type a new name or skip this printer."
msgstr ""
"��ӡ��\"%s\"�Ѿ���%s����.\n"
-"��� \"����\" ��������.\n"
+"��� \"Ǩ��\" ��������.\n"
"��Ҳ����ѡ���µ����ƻ��Թ��ô�ӡ��."
-#: ../../printerdrake.pm_.c:2280
+#: ../../printerdrake.pm_.c:2473
msgid "Name of printer should contain only letters, numbers and the underscore"
msgstr "��ӡ�����ƿ��԰�����ĸ, ���� �� �»���"
-#: ../../printerdrake.pm_.c:2285
+#: ../../printerdrake.pm_.c:2478
#, c-format
msgid ""
"The printer \"%s\" already exists,\n"
@@ -8467,47 +8822,47 @@ msgstr ""
"��ӡ�� \"%s\"�Ѿ�����,\n"
"��ĸ�������?"
-#: ../../printerdrake.pm_.c:2293
+#: ../../printerdrake.pm_.c:2486
msgid "New printer name"
msgstr "�´�ӡ������"
-#: ../../printerdrake.pm_.c:2296
+#: ../../printerdrake.pm_.c:2489
#, c-format
msgid "Transferring %s..."
-msgstr "���� %s ..."
+msgstr "Ǩ�� %s ..."
-#: ../../printerdrake.pm_.c:2307
+#: ../../printerdrake.pm_.c:2500
#, c-format
msgid ""
"You have transferred your former default printer (\"%s\"), Should it be also "
"the default printer under the new printing system %s?"
msgstr ""
-"���Ѿ�������ǰϵͳ�е�ȱʡ��ӡ��(\"%s\"),\n"
+"���Ѿ�Ǩ����ǰϵͳ�е�ȱʡ��ӡ��(\"%s\"),\n"
"�Ƿ�����Ϊ�´�ӡϵͳ��ȱʡ��ӡ�� %s?"
-#: ../../printerdrake.pm_.c:2316
+#: ../../printerdrake.pm_.c:2510
msgid "Refreshing printer data..."
msgstr "ˢ�´�ӡ������..."
-#: ../../printerdrake.pm_.c:2324 ../../printerdrake.pm_.c:2395
-#: ../../printerdrake.pm_.c:2407
+#: ../../printerdrake.pm_.c:2518 ../../printerdrake.pm_.c:2590
+#: ../../printerdrake.pm_.c:2602
msgid "Configuration of a remote printer"
msgstr "����Զ�̴�ӡ��"
-#: ../../printerdrake.pm_.c:2325
+#: ../../printerdrake.pm_.c:2519
msgid "Starting network..."
msgstr "������������..."
-#: ../../printerdrake.pm_.c:2359 ../../printerdrake.pm_.c:2363
-#: ../../printerdrake.pm_.c:2365
+#: ../../printerdrake.pm_.c:2554 ../../printerdrake.pm_.c:2558
+#: ../../printerdrake.pm_.c:2560
msgid "Configure the network now"
msgstr "������������"
-#: ../../printerdrake.pm_.c:2360
+#: ../../printerdrake.pm_.c:2555
msgid "Network functionality not configured"
msgstr "������������"
-#: ../../printerdrake.pm_.c:2361
+#: ../../printerdrake.pm_.c:2556
msgid ""
"You are going to configure a remote printer. This needs working network "
"access, but your network is not configured yet. If you go on without network "
@@ -8517,11 +8872,11 @@ msgstr ""
"��������Զ�̴�ӡ��. ����Զ�̴�ӡ��Ҫ�������,\n"
"���㻹û����������. ������?"
-#: ../../printerdrake.pm_.c:2364
+#: ../../printerdrake.pm_.c:2559
msgid "Go on without configuring the network"
msgstr "�Թ���������"
-#: ../../printerdrake.pm_.c:2397
+#: ../../printerdrake.pm_.c:2592
msgid ""
"The network configuration done during the installation cannot be started "
"now. Please check whether the network gets accessable after booting your "
@@ -8534,7 +8889,7 @@ msgstr ""
"��������������� Mandrake ���������޸�,�� \"�����������\"/\"����\", Ȼ����"
"\"Ӳ��\"/\"��ӡ��\"���ô�ӡ��"
-#: ../../printerdrake.pm_.c:2398
+#: ../../printerdrake.pm_.c:2593
msgid ""
"The network access was not running and could not be started. Please check "
"your configuration and your hardware. Then try to configure your remote "
@@ -8543,24 +8898,24 @@ msgstr ""
"������ʳ��ִ���.\n"
"����Ӳ��������. Ȼ��������Զ�̴�ӡ."
-#: ../../printerdrake.pm_.c:2408
+#: ../../printerdrake.pm_.c:2603
msgid "Restarting printing system..."
msgstr "����������ӡ��ϵͳ ..."
-#: ../../printerdrake.pm_.c:2446
+#: ../../printerdrake.pm_.c:2641
msgid "high"
msgstr "��"
-#: ../../printerdrake.pm_.c:2446
+#: ../../printerdrake.pm_.c:2641
msgid "paranoid"
msgstr "�ϸ�"
-#: ../../printerdrake.pm_.c:2447
+#: ../../printerdrake.pm_.c:2642
#, c-format
msgid "Installing a printing system in the %s security level"
msgstr "�� %s ��ȫ�����ϰ�װ��ӡϵͳ"
-#: ../../printerdrake.pm_.c:2448
+#: ../../printerdrake.pm_.c:2643
#, c-format
msgid ""
"You are about to install the printing system %s on a system running in the %"
@@ -8582,11 +8937,11 @@ msgstr ""
"\n"
"��Ҫ���ô�ӡ��?"
-#: ../../printerdrake.pm_.c:2480
+#: ../../printerdrake.pm_.c:2675
msgid "Starting the printing system at boot time"
msgstr "����ʱ������ӡϵͳ"
-#: ../../printerdrake.pm_.c:2481
+#: ../../printerdrake.pm_.c:2676
#, c-format
msgid ""
"The printing system (%s) will not be started automatically when the machine "
@@ -8603,74 +8958,71 @@ msgstr ""
"\n"
"��ϣ���ô�ӡϵͳ�Զ�������?"
-#: ../../printerdrake.pm_.c:2504 ../../printerdrake.pm_.c:2544
-#: ../../printerdrake.pm_.c:2581 ../../printerdrake.pm_.c:2621
-#: ../../printerdrake.pm_.c:2733
+#: ../../printerdrake.pm_.c:2700 ../../printerdrake.pm_.c:2741
+#: ../../printerdrake.pm_.c:2780 ../../printerdrake.pm_.c:2822
+#: ../../printerdrake.pm_.c:2943
msgid "Checking installed software..."
msgstr "����Ѿ���װ������..."
-#: ../../printerdrake.pm_.c:2548
+#: ../../printerdrake.pm_.c:2746
msgid "Removing LPRng..."
msgstr "ɾ�� LPRng..."
-#: ../../printerdrake.pm_.c:2585
+#: ../../printerdrake.pm_.c:2785
msgid "Removing LPD..."
msgstr "ɾ�� LPD ..."
-#: ../../printerdrake.pm_.c:2657
+#: ../../printerdrake.pm_.c:2858
msgid "Select Printer Spooler"
msgstr "ѡ���ӡ��"
-#: ../../printerdrake.pm_.c:2658
+#: ../../printerdrake.pm_.c:2859
msgid "Which printing system (spooler) do you want to use?"
msgstr "����Ҫʹ�����ִ�ӡϵͳ?"
-#: ../../printerdrake.pm_.c:2691
+#: ../../printerdrake.pm_.c:2895
#, c-format
msgid "Configuring printer \"%s\"..."
msgstr "�����趨��ӡ��\"%s\" ..."
-#: ../../printerdrake.pm_.c:2704
+#: ../../printerdrake.pm_.c:2909
msgid "Installing Foomatic..."
msgstr "���ڰ�װ Foomatic ����..."
-#: ../../printerdrake.pm_.c:2769 ../../printerdrake.pm_.c:2808
-#: ../../printerdrake.pm_.c:3192 ../../printerdrake.pm_.c:3262
+#: ../../printerdrake.pm_.c:2979 ../../printerdrake.pm_.c:3020
+#: ../../printerdrake.pm_.c:3417 ../../printerdrake.pm_.c:3490
msgid "Printer options"
msgstr "��ӡ��ѡ��"
-#: ../../printerdrake.pm_.c:2778
-msgid "Preparing PrinterDrake..."
-msgstr "׼����ӡ��������..."
+#: ../../printerdrake.pm_.c:2989
+msgid "Preparing Printerdrake..."
+msgstr "׼����ӡ��������Printerdrake..."
-#: ../../printerdrake.pm_.c:2795 ../../printerdrake.pm_.c:3349
+#: ../../printerdrake.pm_.c:3007 ../../printerdrake.pm_.c:3580
msgid "Configuring applications..."
msgstr "����Ӧ�ó��� ..."
-#: ../../printerdrake.pm_.c:2815
+#: ../../printerdrake.pm_.c:3027
msgid "Would you like to configure printing?"
msgstr "����Ҫ���ô�ӡ���� ?"
-#: ../../printerdrake.pm_.c:2827
+#: ../../printerdrake.pm_.c:3039
msgid "Printing system: "
msgstr "��ӡϵͳ:"
-#: ../../printerdrake.pm_.c:2875
-msgid "Printerdrake"
-msgstr "��ӡ��������"
-
-#: ../../printerdrake.pm_.c:2879
+#: ../../printerdrake.pm_.c:3099
msgid ""
"The following printers are configured. Double-click on a printer to change "
"its settings; to make it the default printer; to view information about it; "
"or to make a printer on a remote CUPS server available for Star Office/"
-"OpenOffice.org."
+"OpenOffice.org/GIMP."
msgstr ""
"���д�ӡ��������.\n"
"�ڴ�ӡ��������˫�������޸���������; �������ó�ȱʡ��ӡ��; �鿴������Ϣ;\n"
-"������ Star Office/OpenOffice.org ����Զ�� CUPS �������Ĵ�ӡ���ϴ�ӡ�ĵ�."
+"������ Star Office/OpenOffice.org/GIMP ����Զ�� CUPS �������Ĵ�ӡ���ϴ�ӡ��"
+"��."
-#: ../../printerdrake.pm_.c:2880
+#: ../../printerdrake.pm_.c:3100
msgid ""
"The following printers are configured. Double-click on a printer to change "
"its settings; to make it the default printer; or to view information about "
@@ -8680,28 +9032,28 @@ msgstr ""
"���ȥ�޸Ļ��ȡ��Ϣ,\n"
"���\"���Ӵ�ӡ��\"�����µĴ�ӡ��."
-#: ../../printerdrake.pm_.c:2906
+#: ../../printerdrake.pm_.c:3127
msgid "Refresh printer list (to display all available remote CUPS printers)"
msgstr "�����б� (��ʾԶ�� CUPS ��ӡ������)"
-#: ../../printerdrake.pm_.c:2924
+#: ../../printerdrake.pm_.c:3145
msgid "Change the printing system"
msgstr "�޸Ĵ�ӡϵͳ"
-#: ../../printerdrake.pm_.c:2929 ../../standalone/drakconnect_.c:277
+#: ../../printerdrake.pm_.c:3150 ../../standalone/drakconnect_.c:277
msgid "Normal Mode"
msgstr "��ͨģʽ"
-#: ../../printerdrake.pm_.c:3085 ../../printerdrake.pm_.c:3135
-#: ../../printerdrake.pm_.c:3343
+#: ../../printerdrake.pm_.c:3310 ../../printerdrake.pm_.c:3360
+#: ../../printerdrake.pm_.c:3573
msgid "Do you want to configure another printer?"
msgstr "����Ҫ����������ӡ���� ?"
-#: ../../printerdrake.pm_.c:3170
+#: ../../printerdrake.pm_.c:3395
msgid "Modify printer configuration"
msgstr "�޸Ĵ�ӡ������"
-#: ../../printerdrake.pm_.c:3172
+#: ../../printerdrake.pm_.c:3397
#, c-format
msgid ""
"Printer %s\n"
@@ -8710,100 +9062,102 @@ msgstr ""
"��ӡ�� %s\n"
"Ҫ�޸���?"
-#: ../../printerdrake.pm_.c:3176
+#: ../../printerdrake.pm_.c:3401
msgid "Do it!"
msgstr "ִ��!"
-#: ../../printerdrake.pm_.c:3181 ../../printerdrake.pm_.c:3236
+#: ../../printerdrake.pm_.c:3406 ../../printerdrake.pm_.c:3461
msgid "Printer connection type"
msgstr "��ӡ����������"
-#: ../../printerdrake.pm_.c:3182 ../../printerdrake.pm_.c:3240
+#: ../../printerdrake.pm_.c:3407 ../../printerdrake.pm_.c:3465
msgid "Printer name, description, location"
msgstr "��ӡ������, ����, λ��"
-#: ../../printerdrake.pm_.c:3184 ../../printerdrake.pm_.c:3255
+#: ../../printerdrake.pm_.c:3409 ../../printerdrake.pm_.c:3483
msgid "Printer manufacturer, model, driver"
msgstr "��ӡ������, �ͺ�, ����"
-#: ../../printerdrake.pm_.c:3185 ../../printerdrake.pm_.c:3256
+#: ../../printerdrake.pm_.c:3410 ../../printerdrake.pm_.c:3484
msgid "Printer manufacturer, model"
msgstr "��ӡ������, �ͺ�"
-#: ../../printerdrake.pm_.c:3194 ../../printerdrake.pm_.c:3266
+#: ../../printerdrake.pm_.c:3419 ../../printerdrake.pm_.c:3494
msgid "Set this printer as the default"
msgstr "���øô�ӡ��Ϊȴʡ"
-#: ../../printerdrake.pm_.c:3196 ../../printerdrake.pm_.c:3271
-msgid "Add this printer to Star Office/OpenOffice.org"
-msgstr "�������ӡ�����ӵ�Star Office/OpenOffice.org"
+#: ../../printerdrake.pm_.c:3421 ../../printerdrake.pm_.c:3499
+msgid "Add this printer to Star Office/OpenOffice.org/GIMP"
+msgstr "�������ӡ�����ӵ�Star Office/OpenOffice.org/GIMP"
-#: ../../printerdrake.pm_.c:3197 ../../printerdrake.pm_.c:3280
-msgid "Remove this printer from Star Office/OpenOffice.org"
-msgstr "��Star Office/OpenOffice.orgɾ�������ӡ��"
+#: ../../printerdrake.pm_.c:3422 ../../printerdrake.pm_.c:3508
+msgid "Remove this printer from Star Office/OpenOffice.org/GIMP"
+msgstr "��Star Office/OpenOffice.org/GIMPɾ�������ӡ��"
-#: ../../printerdrake.pm_.c:3198 ../../printerdrake.pm_.c:3289
+#: ../../printerdrake.pm_.c:3423 ../../printerdrake.pm_.c:3517
msgid "Print test pages"
msgstr "��ӡ����ҳ"
-#: ../../printerdrake.pm_.c:3199 ../../printerdrake.pm_.c:3291
+#: ../../printerdrake.pm_.c:3424 ../../printerdrake.pm_.c:3519
msgid "Know how to use this printer"
msgstr "֪������ʹ�ô˴�ӡ��"
-#: ../../printerdrake.pm_.c:3201 ../../printerdrake.pm_.c:3293
+#: ../../printerdrake.pm_.c:3426 ../../printerdrake.pm_.c:3521
msgid "Remove printer"
msgstr "ɾ����ӡ��"
-#: ../../printerdrake.pm_.c:3245
+#: ../../printerdrake.pm_.c:3472
#, c-format
msgid "Removing old printer \"%s\"..."
msgstr "ɾ���ɴ�ӡ��\"%s\" ..."
-#: ../../printerdrake.pm_.c:3269
+#: ../../printerdrake.pm_.c:3497
msgid "Default printer"
msgstr "ȱʡ��ӡ��"
-#: ../../printerdrake.pm_.c:3270
+#: ../../printerdrake.pm_.c:3498
#, c-format
msgid "The printer \"%s\" is set as the default printer now."
msgstr "��ӡ�� \"%s\" ��Ϊȴʡ��ӡ��."
-#: ../../printerdrake.pm_.c:3274 ../../printerdrake.pm_.c:3277
-msgid "Adding printer to Star Office/OpenOffice.org"
-msgstr "���Ӵ�ӡ����Star Office/OpenOffice.org"
+#: ../../printerdrake.pm_.c:3502 ../../printerdrake.pm_.c:3505
+msgid "Adding printer to Star Office/OpenOffice.org/GIMP"
+msgstr "���Ӵ�ӡ����Star Office/OpenOffice.org/GIMP"
-#: ../../printerdrake.pm_.c:3275
+#: ../../printerdrake.pm_.c:3503
#, c-format
msgid ""
-"The printer \"%s\" was successfully added to Star Office/OpenOffice.org."
-msgstr "��ӡ��\"%s\"�ɹ����ӵ�Star Office/OpenOffice.org"
+"The printer \"%s\" was successfully added to Star Office/OpenOffice.org/GIMP."
+msgstr "��ӡ��\"%s\"�ɹ����ӵ�Star Office/OpenOffice.org/GIMP"
-#: ../../printerdrake.pm_.c:3278
+#: ../../printerdrake.pm_.c:3506
#, c-format
-msgid "Failed to add the printer \"%s\" to Star Office/OpenOffice.org."
-msgstr "δ�����Ӵ�ӡ�� \"%s\" ��Star Office/OpenOffice.org"
+msgid "Failed to add the printer \"%s\" to Star Office/OpenOffice.org/GIMP."
+msgstr "δ�����Ӵ�ӡ�� \"%s\" ��Star Office/OpenOffice.org/GIMP"
-#: ../../printerdrake.pm_.c:3283 ../../printerdrake.pm_.c:3286
-msgid "Removing printer from Star Office/OpenOffice.org"
-msgstr "�� Star Office/OpenOffice.org ɾ����ӡ��"
+#: ../../printerdrake.pm_.c:3511 ../../printerdrake.pm_.c:3514
+msgid "Removing printer from Star Office/OpenOffice.org/GIMP"
+msgstr "�� Star Office/OpenOffice.org/GIMP ɾ����ӡ��"
-#: ../../printerdrake.pm_.c:3284
+#: ../../printerdrake.pm_.c:3512
#, c-format
msgid ""
-"The printer \"%s\" was successfully removed from Star Office/OpenOffice.org."
-msgstr "�ɹ��Ĵ� Star Office/OpenOffice.org ɾ����ӡ�� \"%s\"."
+"The printer \"%s\" was successfully removed from Star Office/OpenOffice.org/"
+"GIMP."
+msgstr "�ɹ��Ĵ� Star Office/OpenOffice.org/GIMP ɾ����ӡ�� \"%s\"."
-#: ../../printerdrake.pm_.c:3287
+#: ../../printerdrake.pm_.c:3515
#, c-format
-msgid "Failed to remove the printer \"%s\" from Star Office/OpenOffice.org."
-msgstr "δ�ܴ� Star Office/OpenOffice.org ɾ����ӡ�� \"%s\"."
+msgid ""
+"Failed to remove the printer \"%s\" from Star Office/OpenOffice.org/GIMP."
+msgstr "δ�ܴ� Star Office/OpenOffice.org/GIMP ɾ����ӡ�� \"%s\"."
-#: ../../printerdrake.pm_.c:3295
+#: ../../printerdrake.pm_.c:3523
#, c-format
msgid "Do you really want to remove the printer \"%s\"?"
msgstr "���Ҫɾ����ӡ��\"%s\"?"
-#: ../../printerdrake.pm_.c:3297
+#: ../../printerdrake.pm_.c:3527
#, c-format
msgid "Removing printer \"%s\"..."
msgstr "����ɾ����ӡ��\"%s\" ..."
@@ -8959,9 +9313,7 @@ msgstr ""
#: ../../services.pm_.c:28
msgid ""
"Apache is a World Wide Web server. It is used to serve HTML files and CGI."
-msgstr ""
-"Apache ��һ�� WWW ��ά��������. ���ṩ HTML �ļ�\n"
-"�� CGI �ȷ���."
+msgstr "Apache ��һ�� WWW ��ά��������. ���ṩ HTML �ļ��� CGI �ȷ���."
#: ../../services.pm_.c:29
msgid ""
@@ -8972,7 +9324,7 @@ msgid ""
"disables\n"
"all of the services it is responsible for."
msgstr ""
-"������������̨������ (������ inetd) ����Ҫʱ�����ܶ������Ļ���������.\n"
+"������������̨������ (������ inetd) ����Ҫʱ�������������Ļ���������.\n"
"��������Ӧ���ַ���, ���� telnet, ftp, rsh, �� rlogin.\n"
"��ֹ inetd ��ͬʱ��ֹ������������з���."
@@ -9184,7 +9536,7 @@ msgstr "������"
msgid "File sharing"
msgstr "�ļ�����"
-#: ../../services.pm_.c:128 ../../standalone/drakbackup_.c:1669
+#: ../../services.pm_.c:128 ../../standalone/drakbackup_.c:1744
msgid "System"
msgstr "ϵͳ"
@@ -9235,204 +9587,239 @@ msgstr "����"
msgid "Stop"
msgstr "ֹͣ"
-#: ../../share/advertising/00-thanks.pl_.c:9
-msgid "Thank you for choosing Mandrake Linux 8.2"
-msgstr "��л��ѡ�� Mandrake Linux"
+#: ../../share/advertising/01-thanks.pl_.c:9
+msgid "Thank you for choosing Mandrake Linux 9.0"
+msgstr "��л��ѡ�� Mandrake Linux 9.0"
-#: ../../share/advertising/00-thanks.pl_.c:10
+#: ../../share/advertising/01-thanks.pl_.c:10
msgid "Welcome to the Open Source world"
-msgstr "��ӭ���뿪��Դ������"
+msgstr "��ӭ���뿪��Դ��������"
-#: ../../share/advertising/00-thanks.pl_.c:11
+#: ../../share/advertising/01-thanks.pl_.c:11
msgid ""
"The success of MandrakeSoft is based upon the principle of Free Software. "
"Your new operating system is the result of collaborative work on the part of "
"the worldwide Linux Community"
msgstr ""
-"MandrakeSoft �ijɹ�ֲ��������������ԭ��. ����ʹ�õ��²���ϵͳ��ȫ���� Linux "
-"�����ߺ����ijɹ�"
+"MandrakeSoft �ijɹ�ֲ��������������ԭ��. �����²���ϵͳ��ȫ���� Linux ���ź�"
+"���ijɹ�"
-#: ../../share/advertising/01-gnu.pl_.c:9
-msgid "Join the Free Software world"
+#: ../../share/advertising/02-community.pl_.c:9
+msgid "Get involved in the Free Software world"
msgstr "������������������"
-#: ../../share/advertising/01-gnu.pl_.c:10
+#: ../../share/advertising/02-community.pl_.c:10
+msgid "Want to know more about the Open Source community?"
+msgstr "������˽⿪��Դ��������?"
+
+#: ../../share/advertising/02-community.pl_.c:11
msgid ""
-"Get to know the Open Source community and become a member. Learn, teach, and "
-"help others by joining the many discussion forums that you will find in our "
-"\"Community\" webpages"
+"To share your own knowledge and help build Linux tools, join the discussions "
+"forum you'll find on our \"Community\" webpages"
msgstr ""
-"���˽⿪��Դ��, ����Ϊ������һԱ. �����ǵ�\"����\"��ҳ��ʼ, �����ڶ��������"
-"��������һ��, ����ѧϰ, �������"
+"������˷�������֪ʶ, ������������õ� Linux ������? ��������ǵ�\"����\"��ҳ"
+"��������"
-#: ../../share/advertising/02-internet.pl_.c:9
-msgid "Internet and Messaging"
-msgstr "��������ͨ��"
+#: ../../share/advertising/03-internet.pl_.c:9
+msgid "Get the most from the Internet"
+msgstr "������û�������Դ"
-#: ../../share/advertising/02-internet.pl_.c:10
+#: ../../share/advertising/03-internet.pl_.c:10
msgid ""
-"Mandrake Linux 8.2 provides the best software to access everything the "
-"Internet has to offer: Surf the web & view animations with Mozilla and "
-"Konqueror, exchange email & organize your personal information with "
-"Evolution and Kmail, and much more"
+"Mandrake Linux 9.0 has selected the best software for you. Surf the Web and "
+"view animations with Mozilla and Konqueror, or read your mail and handle "
+"your personal information with Evolution and Kmail"
msgstr ""
-"Mandrake Linux �ṩ����õ����������ʻ��������ṩ�ĸ��ֺö���: Mozilla �� "
-"Konquerro �������ϳ���, Evolution �� Kmail �����շ������ʼ����������ĸ�����"
-"Ϣ, ���и������������"
+"Mandrake Linux 9.0 Ϊ����ѡ����õ�����. Mozilla �� Konquerro �������ϳ��˺�"
+"���Ͷ���, Evolution �� Kmail �����շ������ʼ����������ĸ�����Ϣ"
-#: ../../share/advertising/03-graphic.pl_.c:9
-msgid "Multimedia and Graphics"
-msgstr "��ý���ͼ��"
+#: ../../share/advertising/04-multimedia.pl_.c:9
+msgid "Discover the most up-to-date graphics and multimedia tools!"
+msgstr "�������µ�ͼ��Ͷ�ý�幤��!"
-#: ../../share/advertising/03-graphic.pl_.c:10
+#: ../../share/advertising/04-multimedia.pl_.c:10
+msgid "Push multimedia to its limits!"
+msgstr "�Ѷ�ý��������!"
+
+#: ../../share/advertising/04-multimedia.pl_.c:11
msgid ""
-"Mandrake Linux 8.2 lets you push your multimedia computer to its limits! Use "
-"the latest software to play music and audio files, edit and organize your "
-"images and photos, watch TV and videos, and much more"
+"Mandrake Linux 9.0 enables you to use the very latest software to play audio "
+"files, edit and handle your images or photos, and play videos"
msgstr ""
-"Mandrake Linux �����Ķ�ý�����������! ʹ�����µ��������������ֺ���Ƶ�ļ�,"
-"�༭����֯����ͼ�����Ƭ, �����Ӻ�ӰƬ, ���и������������"
+"Mandrake Linux 9.0 ʹ�����µ��������������ֺ���Ƶ�ļ�,�༭����֯����ͼ�����"
+"Ƭ, ���ŵ��Ӻ�ӰƬ"
-#: ../../share/advertising/04-develop.pl_.c:9
-msgid "Development"
-msgstr "����ƽ̨"
+#: ../../share/advertising/05-games.pl_.c:9
+msgid "Games"
+msgstr "��Ϸ"
-#: ../../share/advertising/04-develop.pl_.c:10
+#: ../../share/advertising/05-games.pl_.c:10
msgid ""
-"Mandrake Linux 8.2 is the ultimate development platform. Discover the power "
-"of the GNU gcc compiler as well as the best Open Source development "
-"environments"
+"Mandrake Linux 9.0 provides the best Open Source games - arcade, action, "
+"cards, sports, strategy..."
msgstr ""
-"Mandrake Linux �����յĿ���ƽ̨. ������ GNU gcc ��������ǿ��������������Ŀ�"
-"��Դ�뿪������"
+"Mandrake Linux 9.0 ��������õĿ���Դ����Ϸ - ����, ����, ֽ��, ����, ����..."
-#: ../../share/advertising/05-contcenter.pl_.c:9
-#: ../../standalone/drakbug_.c:69
+#: ../../share/advertising/06-mcc.pl_.c:9 ../../standalone/drakbug_.c:69
msgid "Mandrake Control Center"
msgstr "Mandrake ��������"
-#: ../../share/advertising/05-contcenter.pl_.c:10
+#: ../../share/advertising/06-mcc.pl_.c:10
msgid ""
-"The Mandrake Linux 8.2 Control Center is a one-stop location for fully "
-"customizing and configuring your Mandrake system"
-msgstr "Mandrake Linux ��������������һ���������� Mandrake ϵͳ�ķ�������."
+"Mandrake Linux 9.0 provides a powerful tool to fully customize and configure "
+"your machine"
+msgstr "Mandrake Linux 9.0 �ṩ��ǿ��Ĺ���, ����ȫ�水������Ҫ����������ϵͳ."
-#: ../../share/advertising/06-user.pl_.c:9
+#: ../../share/advertising/07-desktop.pl_.c:9
msgid "User interfaces"
msgstr "�û�����"
-#: ../../share/advertising/06-user.pl_.c:10
+#: ../../share/advertising/07-desktop.pl_.c:10
msgid ""
-"Mandrake Linux 8.2 provides 11 different graphical desktop environments and "
-"window managers to choose from including GNOME 1.4, KDE 2.2.2, Window Maker "
-"0.8, and the rest"
+"Mandrake Linux 9.0 provides 11 user interfaces which can be fully modified: "
+"KDE 3, Gnome 2, WindowMaker..."
msgstr ""
-"Mandrake Linux �ṩ�� 11 �ֲ�ͬ��ͼ�����滷���ʹ��ڹ�������, ����ѡ�����а�"
-"�� GNOME, KDE, Window Maker, �ȵ�"
+"Mandrake Linux 9.0 �ṩ 11 �ֲ�ͬ��ȫ��Ľ����û�����: KDE 3, Gnome 2, "
+"WindowMaker..."
+
+#: ../../share/advertising/08-development.pl_.c:9
+msgid "Development simplified"
+msgstr "�򻯵Ŀ���"
-#: ../../share/advertising/07-server.pl_.c:9
-msgid "Server Software"
-msgstr "����������"
+#: ../../share/advertising/08-development.pl_.c:10
+msgid "Mandrake Linux 9.0 is the ultimate development platform"
+msgstr "Mandrake Linux 9.0 �����յĿ���ƽ̨"
-#: ../../share/advertising/07-server.pl_.c:10
+#: ../../share/advertising/08-development.pl_.c:11
msgid ""
-"Transform your machine into a powerful server with just a few clicks of the "
-"mouse: Web server, email, firewall, router, file and print server, ..."
+"Use the full power of the GNU gcc 3 compiler as well as the best Open Source "
+"development environments"
+msgstr "���� GNU gcc 3 ��������ǿ������, ��������Ŀ���Դ�뿪������"
+
+#: ../../share/advertising/09-server.pl_.c:9
+msgid "Turn your machine into a reliable server"
+msgstr "�����Ļ�����ɿɿ����еķ�����"
+
+#: ../../share/advertising/09-server.pl_.c:10
+msgid ""
+"Transform your machine into a powerful server in a few clicks of your mouse: "
+"Web server, mail, firewall, router, file and print server..."
msgstr ""
-"���㼸��, ���Ļ������ܱ��һ̨ǿ��ķ�����:��վ����, �����ʼ�, ����ǽ, ·��"
-"��, �ļ�����ӡ����, ..."
+"���㼸��, ���Ļ������ܱ��һ̨ǿ��ķ�����: ��վ����, �����ʼ�, ����ǽ, ·"
+"����, �ļ�����ӡ����, ..."
-#: ../../share/advertising/08-games.pl_.c:9
-msgid "Games"
-msgstr "��Ϸ"
+#: ../../share/advertising/10-mnf.pl_.c:9
+msgid "Optimize your security"
+msgstr "��ȫ���Ż�"
+
+#: ../../share/advertising/10-mnf.pl_.c:10
+msgid ""
+"The MandrakeSecurity range includes the Multi Network Firewall product (M.N."
+"F.)"
+msgstr "MandrakeSecurity ϵ�а������������ǽ (M.N.F.)��Ʒ"
+
+#: ../../share/advertising/10-mnf.pl_.c:11
+msgid ""
+"This firewall product includes network features which allow you to fulfill "
+"all your security needs"
+msgstr "�������ǽ��Ʒ�ṩ�����繦�ܽ����������еİ�ȫ��Ҫ��"
+
+#: ../../share/advertising/10-mnf.pl_.c:12
+msgid "This product is available on MandrakeStore website"
+msgstr "�˲�Ʒ���Դ� MandrakeStore ��վ���"
-#: ../../share/advertising/08-games.pl_.c:10
+#: ../../share/advertising/11-mdkstore.pl_.c:9
+msgid "The official MandrakeSoft store"
+msgstr "MandrakeSoft �ٷ������̵�"
+
+#: ../../share/advertising/11-mdkstore.pl_.c:10
msgid ""
-"Mandrake Linux 8.2 provides the best Open Source games - arcade, action, "
-"cards, sports, strategy, ..."
-msgstr "Mandrake Linux ��������õĿ���Դ����Ϸ -����, ����, ֽ��, ����, ..."
+"Our full range of Linux solutions, as well as special offers on products and "
+"'goodies', are available online at our e-store"
+msgstr "ȫ�׵� Linux ��Ʒ�ͷ���, �����ع���Ʒ�ͺ������, �������ǵ������̳�"
-#: ../../share/advertising/09-MDKcampus.pl_.c:9
-msgid "MandrakeCampus"
-msgstr "MandrakeУ԰"
+#: ../../share/advertising/12-mdkstore.pl_.c:9
+msgid "Strategic partners"
+msgstr "ս�Ժ������"
-#: ../../share/advertising/09-MDKcampus.pl_.c:10
+#: ../../share/advertising/12-mdkstore.pl_.c:10
msgid ""
-"Would you like to learn Linux simply, quickly, and for free? MandrakeSoft "
-"provides free Linux training, as well as a way to test your progress, at "
-"MandrakeCampus -- our online training center"
+"MandrakeSoft works alongside a selection of companies offering professional "
+"solutions compatible with Mandrake Linux; a list of these partners is "
+"available on the MandrakeStore"
msgstr ""
-"������, ���, ��ʡǮ��ѧϰ Linxu? MandrakeSoft �ṩ��ѵ� Linux ��ѵ, �Լ�"
-"�������Լ������İ취, ���� MandrakeУ԰ -- ���ǵ�������ѵ����"
+"MandrakeSoft ��һЩ������ѡ�Ĺ�˾����, �ṩ�� Mandrake Linux ���ݵ�רҵ�����"
+"��; �� MandrakeStore �����ҵ���Щ�������"
-#: ../../share/advertising/10-MDKexpert.pl_.c:9
-msgid "MandrakeExpert"
-msgstr "Mandrakeר��"
+#: ../../share/advertising/13-mdkcampus.pl_.c:9
+msgid "Discover MandrakeSoft's training catalogue Linux-Campus"
+msgstr "MandrakeSoft ����ѵ�γ� Linux-Campus"
-#: ../../share/advertising/10-MDKexpert.pl_.c:10
+#: ../../share/advertising/13-mdkcampus.pl_.c:10
msgid ""
-"Quality support from the Linux Community, and from MandrakeSoft, is just "
-"around the corner. And if you're already a Linux veteran, become an \"Expert"
-"\" and share your knowledge at our support website"
-msgstr ""
-"���� Linux ����������֧�ַ���, ������ߵ� Mandrakeר�� -- ���ǵ�����֧������."
-"�������ͨ Linux, ���������ǵ�\"ר��\", ��������������ľ���."
+"The training program has been create to respond to the needs of both users "
+"and experts (Network and System administrations)"
+msgstr "Ӧ����û��������ϵͳ����ר�ҵ�Ҫ��, MandrakeSoft �������µ���ѵ�ƻ�"
-#: ../../share/advertising/11-consul.pl_.c:9
-msgid "MandrakeConsulting"
-msgstr "Mandrake����"
+#: ../../share/advertising/13-mdkcampus.pl_.c:11
+msgid "Certify yourself on Linux"
+msgstr "������� Linux ��֤"
-#: ../../share/advertising/11-consul.pl_.c:10
+#: ../../share/advertising/13-mdkcampus.pl_.c:12
msgid ""
-"For all of your IT projects, our consultants are ready to analyze your "
-"requirements and offer a customized solution. Benefit from MandrakeSoft's "
-"vast experience as a Linux producer to provide a true IT alternative for "
-"your business organization"
+"Whether you choose to teach yourself online or via our network of training "
+"partners, the Linux-Campus catalogue prepares you for the acknowledged LPI "
+"certification program (worldwide professional technical certification)"
msgstr ""
-"���ǵĹ��ʶ�����ʱ׼��������, ��������ʵ������ IT ��Ŀ.MandrakeSoft ��Ϊ "
-"Linux �ṩ�������۵ijɹ�����, �ؽ�Ϊ������ҵ�ṩ���õ� IT �������"
+"������ѡ�����ߵ���ѧ���߲μ����ǵ���ѵ���Ŀγ�, Linux-Campus �γ̰�����Ϊ"
+"�μ������� LPI ��֤�ƻ�(ȫ���רҵ������֤)����׼��"
-#: ../../share/advertising/12-MDKstore.pl_.c:9
-msgid "MandrakeStore"
-msgstr "Mandrake�̳�"
+#: ../../share/advertising/14-mdkexpert.pl_.c:9
+msgid "Become a MandrakeExpert"
+msgstr "��Ϊ Mandrake ר��"
-#: ../../share/advertising/12-MDKstore.pl_.c:10
+#: ../../share/advertising/14-mdkexpert.pl_.c:10
msgid ""
-"A full range of Linux solutions, as well as special offers on products and "
-"'goodies', are available online at our e-store"
-msgstr "ȫ�׵� Linux ��Ʒ�ͷ���, �����ع���Ʒ�������, �������ǵ������̳�"
+"Find the solutions to your problems via MandrakeSoft's online support "
+"platform"
+msgstr "������������� MandrakeSoft ������֧��ƽ̨�ҵ���"
-#: ../../share/advertising/13-Nvert.pl_.c:9
+#: ../../share/advertising/14-mdkexpert.pl_.c:11
msgid ""
-"For more information on MandrakeSoft's Professional Services and commercial "
-"offerings, please see the following web page:"
-msgstr "Ҫ�����˽� MandrakeSoft ��רҵ����ͺ�������, �뵽������ҳ:"
+"Join the MandrakeSoft support teams and the Linux Community online to share "
+"your knowledge and help others by becoming a recognized Expert on the online "
+"technical support website:"
+msgstr ""
+"���߼��� MandrakeSoft ֧�ֶ���� Linux ����, ��������֪ʶ, ��������,�� "
+"MandrakeSoft �����߼���֧����վ, ������������Ŀ��ר��:"
+
+#: ../../share/advertising/15-mdkexpert-corporate.pl_.c:9
+msgid "MandrakeExpert Corporate"
+msgstr "MandrakeExpert ��ҵ��"
-#: ../../share/advertising/13-Nvert.pl_.c:11
-msgid "http://www.mandrakesoft.com/sales/contact"
-msgstr "http://www.mandrakesoft.com/sales/contact"
+#: ../../share/advertising/15-mdkexpert-corporate.pl_.c:10
+msgid "An online platform to respond to company's specific support needs"
+msgstr "רΪ��Ӧ��ҵ������Ҫ���ṩרҵ���������֧��ƽ̨"
-#: ../../standalone.pm_.c:40
+#: ../../share/advertising/15-mdkexpert-corporate.pl_.c:11
+msgid ""
+"All incidents will be followed up by a single qualified MandrakeSoft "
+"technical expert."
+msgstr "רְ�� MandrakeSoft ����ר�һḺ����ÿ�����¼�"
+
+#: ../../standalone.pm_.c:41
msgid "Installing packages..."
msgstr "���ڰ�װ���� ..."
-#: ../../standalone/XFdrake_.c:143
+#: ../../standalone/XFdrake_.c:145
msgid "Please log out and then use Ctrl-Alt-BackSpace"
msgstr "���˳�, Ȼ��ͬʱ�� Ctrl-Alt-BackSpace"
-#: ../../standalone/XFdrake_.c:147
+#: ../../standalone/XFdrake_.c:149
#, c-format
msgid "Please relog into %s to activate the changes"
msgstr "�����µ�¼�� %s ʹ�������ĸ�����Ч"
-#: ../../standalone/diskdrake_.c:81
-msgid ""
-"I can't read your partition table, it's too corrupted for me :(\n"
-"I'll try to go on blanking bad partitions"
-msgstr ""
-"�Ҷ�����������, ����������ƻ���̫������ :(\n"
-"�����ڳ������������."
-
#: ../../standalone/drakTermServ_.c:188
msgid "Mandrake Terminal Server Configuration"
msgstr "Mandrake �ն˷���������"
@@ -9469,12 +9856,13 @@ msgstr "����/ɾ���û�"
msgid "Add/Del Clients"
msgstr "����/ɾ���û�"
-#: ../../standalone/drakTermServ_.c:246 ../../standalone/drakbackup_.c:3282
-#: ../../standalone/drakbackup_.c:3315 ../../standalone/drakbackup_.c:3341
-#: ../../standalone/drakbackup_.c:3368 ../../standalone/drakbackup_.c:3395
-#: ../../standalone/drakbackup_.c:3434 ../../standalone/drakbackup_.c:3455
-#: ../../standalone/drakbackup_.c:3482 ../../standalone/drakbackup_.c:3508
-#: ../../standalone/drakbackup_.c:3533 ../../standalone/drakfont_.c:700
+#: ../../standalone/drakTermServ_.c:246 ../../standalone/drakbackup_.c:3930
+#: ../../standalone/drakbackup_.c:3963 ../../standalone/drakbackup_.c:3989
+#: ../../standalone/drakbackup_.c:4016 ../../standalone/drakbackup_.c:4043
+#: ../../standalone/drakbackup_.c:4082 ../../standalone/drakbackup_.c:4103
+#: ../../standalone/drakbackup_.c:4130 ../../standalone/drakbackup_.c:4160
+#: ../../standalone/drakbackup_.c:4186 ../../standalone/drakbackup_.c:4211
+#: ../../standalone/drakfont_.c:700
msgid "Help"
msgstr "����"
@@ -9632,8 +10020,8 @@ msgstr ""
"\n"
"����г����Զ���װ���õ�ѡ��"
-#: ../../standalone/drakautoinst_.c:239 ../../standalone/drakgw_.c:548
-#: ../../standalone/scannerdrake_.c:105
+#: ../../standalone/drakautoinst_.c:239 ../../standalone/drakgw_.c:484
+#: ../../standalone/scannerdrake_.c:119
msgid "Congratulations!"
msgstr "��ϲ!"
@@ -9657,20 +10045,23 @@ msgstr "������Ŀ"
msgid "Remove the last item"
msgstr "ɾ�����һ����?"
-#: ../../standalone/drakbackup_.c:625
+#: ../../standalone/drakbackup_.c:619
msgid "Cron not available yet as non-root"
-msgstr ""
+msgstr "�� root �û�������ʹ�� cron"
-#: ../../standalone/drakbackup_.c:731
+#: ../../standalone/drakbackup_.c:725
msgid "WARNING"
-msgstr ""
+msgstr "����"
-#: ../../standalone/drakbackup_.c:732
-#, fuzzy
+#: ../../standalone/drakbackup_.c:726
msgid "FATAL"
-msgstr "FAT"
+msgstr "���ش���"
-#: ../../standalone/drakbackup_.c:744
+#: ../../standalone/drakbackup_.c:727
+msgid "INFO"
+msgstr "INFO - ��Ϣ"
+
+#: ../../standalone/drakbackup_.c:739
msgid ""
"\n"
" DrakBackup Report \n"
@@ -9681,7 +10072,7 @@ msgstr ""
" ħ�������򵼱��� \n"
"\n"
-#: ../../standalone/drakbackup_.c:745
+#: ../../standalone/drakbackup_.c:740
msgid ""
"\n"
" DrakBackup Daemon Report\n"
@@ -9693,7 +10084,7 @@ msgstr ""
" ħ�������� �ػ����̱���\n"
"\n"
-#: ../../standalone/drakbackup_.c:749
+#: ../../standalone/drakbackup_.c:744
msgid ""
"\n"
" DrakBackup Report Details\n"
@@ -9705,12 +10096,22 @@ msgstr ""
" DrakBackup ��ϸ����\n"
"\n"
-#: ../../standalone/drakbackup_.c:770 ../../standalone/drakbackup_.c:840
-#: ../../standalone/drakbackup_.c:894
+#: ../../standalone/drakbackup_.c:765 ../../standalone/drakbackup_.c:835
+#: ../../standalone/drakbackup_.c:889
msgid "Total progess"
msgstr "�ܽ���"
-#: ../../standalone/drakbackup_.c:822
+#: ../../standalone/drakbackup_.c:788
+msgid ""
+"Sorry, perl-Expect is not installed/enabled. To use\n"
+"this feature, install perl-Expect and comment lines 772-774,\n"
+" as well as 788,789. Then uncomment line 787."
+msgstr ""
+"�Բ���, perl-Expect û�а�װ��û�м���. Ҫʹ��\n"
+"�������, �밲װ perl-Expect ��ע�͵�\n"
+" 772-774 ��, �� 788,789 ��. ��ȡ�� 787 �е�ע��."
+
+#: ../../standalone/drakbackup_.c:817
#, c-format
msgid ""
"%s exists, delete?\n"
@@ -9723,16 +10124,41 @@ msgstr ""
"����: ��������������������, ��������Ҫ\n"
"�ӷ������ĵ� authorized_keys ɾ������Ŀ."
-#: ../../standalone/drakbackup_.c:831
+#: ../../standalone/drakbackup_.c:826
msgid "This may take a moment to generate the keys."
msgstr "����һ��Կ����ҪһЩʱ��."
-#: ../../standalone/drakbackup_.c:838
+#: ../../standalone/drakbackup_.c:833
#, c-format
msgid "ERROR: Cannot spawn %s."
msgstr "����: �޷����� %s."
-#: ../../standalone/drakbackup_.c:865
+#: ../../standalone/drakbackup_.c:850
+#, c-format
+msgid "No password prompt on %s at port %s"
+msgstr "%s �ϵĶ˿� %s û�п�����ʾ"
+
+#: ../../standalone/drakbackup_.c:851
+#, c-format
+msgid "Bad password on %s"
+msgstr "%s ������Ч"
+
+#: ../../standalone/drakbackup_.c:852
+#, c-format
+msgid "Permission denied transferring %s to %s"
+msgstr "û��Ȩ�ް� %s Ǩ�Ƶ� %s"
+
+#: ../../standalone/drakbackup_.c:853
+#, c-format
+msgid "Can't find %s on %s"
+msgstr "û�� %s �� %s ��"
+
+#: ../../standalone/drakbackup_.c:856
+#, c-format
+msgid "%s not responding"
+msgstr "%s û�л�Ӧ"
+
+#: ../../standalone/drakbackup_.c:860
#, c-format
msgid ""
"Transfer successful\n"
@@ -9742,68 +10168,71 @@ msgid ""
"\n"
"without being prompted for a password."
msgstr ""
-"���ͳɹ�\n"
+"Ǩ�Ƴɹ�\n"
"Ҫ��֤�����Ե�¼��������, ������:\n"
"\n"
"ssh -i %s %s\\@%s\n"
"\n"
"�����������ʿ���."
-#: ../../standalone/drakbackup_.c:908
+#: ../../standalone/drakbackup_.c:903
msgid "WebDAV remote site already in sync!"
-msgstr ""
+msgstr "WebDAV Զ��վ���Ѿ�ͬ��!"
-#: ../../standalone/drakbackup_.c:912
+#: ../../standalone/drakbackup_.c:907
msgid "WebDAV transfer failed!"
-msgstr ""
+msgstr "WebDAV ����ʧ��!"
-#: ../../standalone/drakbackup_.c:934
+#: ../../standalone/drakbackup_.c:928
msgid "No CDR/DVDR in drive!"
-msgstr ""
+msgstr "��������û�� CDR/DVDR"
-#: ../../standalone/drakbackup_.c:938
+#: ../../standalone/drakbackup_.c:932
msgid "Does not appear to be recordable media!"
-msgstr ""
+msgstr "���ʲ����ǿ���д���!"
-#: ../../standalone/drakbackup_.c:942
+#: ../../standalone/drakbackup_.c:936
msgid "Not erasable media!"
-msgstr ""
+msgstr "���ʲ������!"
-#: ../../standalone/drakbackup_.c:981
-#, fuzzy
+#: ../../standalone/drakbackup_.c:975
msgid "This may take a moment to erase the media."
-msgstr "����һ��Կ����ҪһЩʱ��."
+msgstr "��ս�����ҪһЩʱ��."
-#: ../../standalone/drakbackup_.c:1045
+#: ../../standalone/drakbackup_.c:1060
msgid "Permission problem accessing CD."
-msgstr ""
+msgstr "û���ʵ���Ȩ�޶�д CD."
-#: ../../standalone/drakbackup_.c:1144 ../../standalone/drakbackup_.c:1193
+#: ../../standalone/drakbackup_.c:1087
+#, c-format
+msgid "No tape in %s!"
+msgstr "%s ��û�дŴ�!"
+
+#: ../../standalone/drakbackup_.c:1199 ../../standalone/drakbackup_.c:1248
msgid "Backup system files..."
msgstr "����ϵͳ�ļ�..."
-#: ../../standalone/drakbackup_.c:1194 ../../standalone/drakbackup_.c:1261
+#: ../../standalone/drakbackup_.c:1249 ../../standalone/drakbackup_.c:1316
msgid "Hard Disk Backup files..."
msgstr "����Ӳ���ļ�..."
-#: ../../standalone/drakbackup_.c:1206
+#: ../../standalone/drakbackup_.c:1261
msgid "Backup User files..."
msgstr "�����û��ļ�..."
-#: ../../standalone/drakbackup_.c:1207
+#: ../../standalone/drakbackup_.c:1262
msgid "Hard Disk Backup Progress..."
msgstr "Ӳ���ļ����ݽ���..."
-#: ../../standalone/drakbackup_.c:1260
+#: ../../standalone/drakbackup_.c:1315
msgid "Backup Other files..."
msgstr "���������ļ�..."
-#: ../../standalone/drakbackup_.c:1266
-#, fuzzy
+#: ../../standalone/drakbackup_.c:1321
msgid "No changes to backup!"
-msgstr "ʹ�ôŴ�����"
+msgstr "û����Ҫ���ݵ��޸�!"
-#: ../../standalone/drakbackup_.c:1282 ../../standalone/drakbackup_.c:1305
+#: ../../standalone/drakbackup_.c:1337 ../../standalone/drakbackup_.c:1360
#, c-format
msgid ""
"\n"
@@ -9814,62 +10243,62 @@ msgstr ""
"Drakbackup ʹ�� %s:\n"
"\n"
-#: ../../standalone/drakbackup_.c:1289
+#: ../../standalone/drakbackup_.c:1344
#, c-format
msgid ""
-"file list sent by FTP : %s\n"
+"file list sent by FTP: %s\n"
" "
msgstr ""
"ͨ�� FTP ���͵��ļ��б�: %s\n"
" "
-#: ../../standalone/drakbackup_.c:1292
+#: ../../standalone/drakbackup_.c:1347
msgid ""
"\n"
" FTP connection problem: It was not possible to send your backup files by "
"FTP.\n"
msgstr ""
"\n"
-"FTP ���Ӵ���: �޷�ͨ�� FTP �������ı����ļ�.\n"
+"FTP ���Ӵ���: �޷�ͨ�� FTP �������ı����ļ�.\n"
-#: ../../standalone/drakbackup_.c:1310
+#: ../../standalone/drakbackup_.c:1365
msgid ""
"\n"
"Drakbackup activities via CD:\n"
"\n"
msgstr ""
"\n"
-"Drakbackup ʹ�� CD:\n"
+"Drakbackup �Ĺ��̲���:\n"
"\n"
-#: ../../standalone/drakbackup_.c:1315
+#: ../../standalone/drakbackup_.c:1370
msgid ""
"\n"
"Drakbackup activities via tape:\n"
"\n"
msgstr ""
"\n"
-"Drakbackup ʹ�ôŴ�:\n"
+"Drakbackup �ĴŴ�����:\n"
"\n"
-#: ../../standalone/drakbackup_.c:1324
+#: ../../standalone/drakbackup_.c:1379
msgid " Error during mail sending. \n"
msgstr "���͵����ʼ�����. \n"
-#: ../../standalone/drakbackup_.c:1346
+#: ../../standalone/drakbackup_.c:1404
msgid "Can't create catalog!"
-msgstr ""
+msgstr "�޷����� catalog!"
-#: ../../standalone/drakbackup_.c:1459 ../../standalone/drakbackup_.c:1470
-#: ../../standalone/drakbackup_.c:1481 ../../standalone/drakfont_.c:1004
+#: ../../standalone/drakbackup_.c:1517 ../../standalone/drakbackup_.c:1528
+#: ../../standalone/drakfont_.c:1004
msgid "File Selection"
msgstr "ѡ���ļ�"
-#: ../../standalone/drakbackup_.c:1486
+#: ../../standalone/drakbackup_.c:1556
msgid "Select the files or directories and click on 'Add'"
msgstr "ѡ���ļ���Ŀ¼, Ȼ���� '����'"
-#: ../../standalone/drakbackup_.c:1525
+#: ../../standalone/drakbackup_.c:1600
msgid ""
"\n"
"Please check all options that you need.\n"
@@ -9877,62 +10306,66 @@ msgstr ""
"\n"
"��ѡ������Ҫ������ѡ��.\n"
-#: ../../standalone/drakbackup_.c:1526
+#: ../../standalone/drakbackup_.c:1601
msgid ""
"These options can backup and restore all files in your /etc directory.\n"
msgstr "��Щѡ����ݺͻָ����� /etc Ŀ¼�е�ȫ���ļ�\n"
-#: ../../standalone/drakbackup_.c:1527
+#: ../../standalone/drakbackup_.c:1602
msgid "Backup your System files. (/etc directory)"
msgstr "����ϵͳ�ļ�. (/etc Ŀ¼)"
-#: ../../standalone/drakbackup_.c:1528
+#: ../../standalone/drakbackup_.c:1603
msgid "Use incremental backup (do not replace old backups)"
msgstr "ʹ���������� (���ƻ��ϱ���)"
-#: ../../standalone/drakbackup_.c:1529
+#: ../../standalone/drakbackup_.c:1604
msgid "Do not include critical files (passwd, group, fstab)"
msgstr "�������ؼ��ļ� (passwd, group, fstab) "
-#: ../../standalone/drakbackup_.c:1530
+#: ../../standalone/drakbackup_.c:1605
msgid ""
"With this option you will be able to restore any version\n"
" of your /etc directory."
msgstr "����ѡ��������/etc Ŀ¼���Իָ����κ���ǰ�İ汾."
-#: ../../standalone/drakbackup_.c:1547
+#: ../../standalone/drakbackup_.c:1622
msgid "Please check all users that you want to include in your backup."
msgstr "��ѡ����ϣ�����ݵ��û�"
-#: ../../standalone/drakbackup_.c:1574
+#: ../../standalone/drakbackup_.c:1649
msgid "Do not include the browser cache"
msgstr "���������������"
-#: ../../standalone/drakbackup_.c:1575 ../../standalone/drakbackup_.c:1599
+#: ../../standalone/drakbackup_.c:1650 ../../standalone/drakbackup_.c:1674
msgid "Use Incremental Backups (do not replace old backups)"
msgstr "ʹ���������� (���ƻ��ϱ���)"
-#: ../../standalone/drakbackup_.c:1597 ../../standalone/drakfont_.c:1058
+#: ../../standalone/drakbackup_.c:1672 ../../standalone/drakfont_.c:1058
msgid "Remove Selected"
msgstr "ɾ������ѡ�е�"
-#: ../../standalone/drakbackup_.c:1635
+#: ../../standalone/drakbackup_.c:1710
msgid "Windows (FAT32)"
msgstr "Windows(FAT32)"
-#: ../../standalone/drakbackup_.c:1674
+#: ../../standalone/drakbackup_.c:1749
msgid "Users"
msgstr "�û�"
-#: ../../standalone/drakbackup_.c:1700
+#: ../../standalone/drakbackup_.c:1775
msgid "Use network connection to backup"
msgstr "ʹ����������������"
-#: ../../standalone/drakbackup_.c:1706
+#: ../../standalone/drakbackup_.c:1777
+msgid "Net Method:"
+msgstr "���緽��:"
+
+#: ../../standalone/drakbackup_.c:1781
msgid "Use Expect for SSH"
msgstr "�� Expect ���� SSH"
-#: ../../standalone/drakbackup_.c:1707
+#: ../../standalone/drakbackup_.c:1782
msgid ""
"Create/Transfer\n"
"backup keys for SSH"
@@ -9940,7 +10373,7 @@ msgstr ""
"����/����\n"
" SSH �ı�����Կ"
-#: ../../standalone/drakbackup_.c:1708
+#: ../../standalone/drakbackup_.c:1783
msgid ""
" Transfer \n"
"Now"
@@ -9948,15 +10381,15 @@ msgstr ""
" ���� \n"
"����"
-#: ../../standalone/drakbackup_.c:1709
+#: ../../standalone/drakbackup_.c:1784
msgid "Keys in place already"
msgstr "�Ѿ�����Կ��"
-#: ../../standalone/drakbackup_.c:1713
+#: ../../standalone/drakbackup_.c:1788
msgid "Please enter the host name or IP."
msgstr "�������������� IP ��ַ."
-#: ../../standalone/drakbackup_.c:1718
+#: ../../standalone/drakbackup_.c:1793
msgid ""
"Please enter the directory (or module) to\n"
" put the backup on this host."
@@ -9964,67 +10397,62 @@ msgstr ""
"��������������ϴ�ű��ݵ�\n"
" Ŀ¼(��ģ��)."
-#: ../../standalone/drakbackup_.c:1723
+#: ../../standalone/drakbackup_.c:1798
msgid "Please enter your login"
msgstr "���������ĵ�¼��"
-#: ../../standalone/drakbackup_.c:1728
+#: ../../standalone/drakbackup_.c:1803
msgid "Please enter your password"
msgstr "���������Ŀ���"
-#: ../../standalone/drakbackup_.c:1734
+#: ../../standalone/drakbackup_.c:1809
msgid "Remember this password"
msgstr "��ס����"
-#: ../../standalone/drakbackup_.c:1745
+#: ../../standalone/drakbackup_.c:1820
msgid "Need hostname, username and password!"
msgstr "��Ҫ ������, �û���, �Ϳ���!"
-#: ../../standalone/drakbackup_.c:1841
+#: ../../standalone/drakbackup_.c:1915
msgid "Use CD/DVDROM to backup"
msgstr "ʹ�� CD/DVDROM ����"
-#: ../../standalone/drakbackup_.c:1844
+#: ../../standalone/drakbackup_.c:1918
msgid ""
"Please choose your CD/DVD device\n"
"(Press Enter to propogate settings to other fields.\n"
"This field isn't necessary, only a tool to fill in the form.)"
msgstr "��ѡ������ CD/DVD �豸"
-#: ../../standalone/drakbackup_.c:1849
+#: ../../standalone/drakbackup_.c:1923
msgid "Please choose your CD/DVD media size"
msgstr "��ѡ����ʹ�õ� CD/DVD ��������."
-#: ../../standalone/drakbackup_.c:1855
-#, fuzzy
+#: ../../standalone/drakbackup_.c:1929
msgid "Please check for multisession CD"
-msgstr "�����ʹ�� CDRW ����, ��ѡ������"
+msgstr "�����ʹ�ö�� CD, ��ѡ������"
-#: ../../standalone/drakbackup_.c:1861
+#: ../../standalone/drakbackup_.c:1935
msgid "Please check if you are using CDRW media"
msgstr "�����ʹ�� CDRW ����, ��ѡ������"
-#: ../../standalone/drakbackup_.c:1867
-#, fuzzy
+#: ../../standalone/drakbackup_.c:1941
msgid "Please check if you want to erase your RW media (1st Session)"
-msgstr "�����Ҫ������� RW ����, ��ѡ������"
+msgstr "�����Ҫ������� RW ����(��һ��), ��ѡ������"
-#: ../../standalone/drakbackup_.c:1868
-#, fuzzy
+#: ../../standalone/drakbackup_.c:1942
msgid " Erase Now "
-msgstr ""
-" ���� \n"
-"����"
+msgstr " ������� "
-#: ../../standalone/drakbackup_.c:1874
+#: ../../standalone/drakbackup_.c:1948
msgid "Please check if you are using a DVDR device"
msgstr "�����ʹ�� DVDR �豸, ��ѡ������"
-#: ../../standalone/drakbackup_.c:1880
+#: ../../standalone/drakbackup_.c:1954
msgid "Please check if you are using a DVDRAM device"
msgstr "�����ʹ�� DVDRAM �豸, ��ѡ������"
-#: ../../standalone/drakbackup_.c:1893
+#: ../../standalone/drakbackup_.c:1967
msgid ""
"Please enter your CD Writer device name\n"
" ex: 0,1,0"
@@ -10032,99 +10460,100 @@ msgstr ""
"���������Ŀ��̻��豸��\n"
" ��: 0,1,0"
-#: ../../standalone/drakbackup_.c:1926
-#, fuzzy
+#: ../../standalone/drakbackup_.c:2000
msgid "No CD device defined!"
-msgstr "�ɵ��豸�ļ�"
+msgstr "û�з��� CD �豸!"
-#: ../../standalone/drakbackup_.c:1974
+#: ../../standalone/drakbackup_.c:2048
msgid "Use tape to backup"
msgstr "ʹ�ôŴ�����"
-#: ../../standalone/drakbackup_.c:1977
+#: ../../standalone/drakbackup_.c:2051
msgid "Please enter the device name to use for backup"
msgstr "���������ڱ��ݵ��豸��"
-#: ../../standalone/drakbackup_.c:1983
+#: ../../standalone/drakbackup_.c:2057
msgid "Please check if you want to use the non-rewinding device."
msgstr "�����ʹ�ò��ؾ����豸, ��ѡ������."
-#: ../../standalone/drakbackup_.c:1989
+#: ../../standalone/drakbackup_.c:2063
msgid "Please check if you want to erase your tape before the backup."
msgstr "�����Ҫ�ڱ���ǰ����Ŵ�, ��ѡ������."
-#: ../../standalone/drakbackup_.c:1995
+#: ../../standalone/drakbackup_.c:2069
msgid "Please check if you want to eject your tape after the backup."
msgstr "�����Ҫ�ڱ��ݺ�, , ��ѡ������."
-#: ../../standalone/drakbackup_.c:2001 ../../standalone/drakbackup_.c:2074
-#: ../../standalone/drakbackup_.c:3025
+#: ../../standalone/drakbackup_.c:2075 ../../standalone/drakbackup_.c:2149
+#: ../../standalone/drakbackup_.c:3116
msgid ""
"Please enter the maximum size\n"
" allowed for Drakbackup"
msgstr "���������� Drakbackup ʹ�õ����ռ�"
-#: ../../standalone/drakbackup_.c:2066
+#: ../../standalone/drakbackup_.c:2140
msgid "Please enter the directory to save to:"
msgstr "������Ҫ�����ļ���Ŀ¼��:"
-#: ../../standalone/drakbackup_.c:2080 ../../standalone/drakbackup_.c:3031
+#: ../../standalone/drakbackup_.c:2155 ../../standalone/drakbackup_.c:3122
msgid "Use quota for backup files."
msgstr "ʹ���޶���ļ�."
-#: ../../standalone/drakbackup_.c:2146
+#: ../../standalone/drakbackup_.c:2221
msgid "Network"
msgstr "����"
-#: ../../standalone/drakbackup_.c:2151
+#: ../../standalone/drakbackup_.c:2226
msgid "CDROM / DVDROM"
msgstr "CDROM / DVDROM"
-#: ../../standalone/drakbackup_.c:2156
+#: ../../standalone/drakbackup_.c:2231
msgid "HardDrive / NFS"
msgstr "Ӳ�� / NFS"
-#: ../../standalone/drakbackup_.c:2161
+#: ../../standalone/drakbackup_.c:2236
msgid "Tape"
msgstr "�Ŵ�"
-#: ../../standalone/drakbackup_.c:2175 ../../standalone/drakbackup_.c:2179
-#: ../../standalone/drakbackup_.c:2183
+#: ../../standalone/drakbackup_.c:2250 ../../standalone/drakbackup_.c:2254
+#: ../../standalone/drakbackup_.c:2258
msgid "hourly"
msgstr "ÿСʱ"
-#: ../../standalone/drakbackup_.c:2176 ../../standalone/drakbackup_.c:2180
-#: ../../standalone/drakbackup_.c:2183
+#: ../../standalone/drakbackup_.c:2251 ../../standalone/drakbackup_.c:2255
+#: ../../standalone/drakbackup_.c:2258
msgid "daily"
msgstr "ÿ��"
-#: ../../standalone/drakbackup_.c:2177 ../../standalone/drakbackup_.c:2181
-#: ../../standalone/drakbackup_.c:2183
+#: ../../standalone/drakbackup_.c:2252 ../../standalone/drakbackup_.c:2256
+#: ../../standalone/drakbackup_.c:2258
msgid "weekly"
msgstr "ÿ��"
-#: ../../standalone/drakbackup_.c:2178 ../../standalone/drakbackup_.c:2182
-#: ../../standalone/drakbackup_.c:2183
+#: ../../standalone/drakbackup_.c:2253 ../../standalone/drakbackup_.c:2257
+#: ../../standalone/drakbackup_.c:2258
msgid "monthly"
msgstr "ÿ��"
-#: ../../standalone/drakbackup_.c:2196
+#: ../../standalone/drakbackup_.c:2271
msgid "Use daemon"
msgstr "ʹ���ػ�����"
-#: ../../standalone/drakbackup_.c:2201
+#: ../../standalone/drakbackup_.c:2276
msgid ""
"Please choose the time \n"
"interval between each backup"
msgstr "��ѡ����ϣ������ʱ����"
-#: ../../standalone/drakbackup_.c:2207
+#: ../../standalone/drakbackup_.c:2282
msgid ""
"Please choose the\n"
"media for backup."
-msgstr "��ѡ�񱸷ݽ���."
+msgstr ""
+"��ѡ��\n"
+"����ʹ�õĽ���."
-#: ../../standalone/drakbackup_.c:2214
+#: ../../standalone/drakbackup_.c:2289
msgid ""
"Please be sure that the cron daemon is included in your services. \n"
"\n"
@@ -10134,71 +10563,71 @@ msgstr ""
"\n"
"��ע���������е� '����' ���ʶ�Ҫ����Ӳ��."
-#: ../../standalone/drakbackup_.c:2251
-msgid "Send mail report after each backup to :"
+#: ../../standalone/drakbackup_.c:2326
+msgid "Send mail report after each backup to:"
msgstr "��ÿ�α��ݺ����ʼ������ :"
-#: ../../standalone/drakbackup_.c:2257
+#: ../../standalone/drakbackup_.c:2332
msgid "Delete Hard Drive tar files after backup to other media."
-msgstr ""
+msgstr "���ݵ���������֮��ɾ��Ӳ���ϵ� tar �ļ�."
-#: ../../standalone/drakbackup_.c:2296
+#: ../../standalone/drakbackup_.c:2371
msgid "What"
msgstr "����"
-#: ../../standalone/drakbackup_.c:2301
+#: ../../standalone/drakbackup_.c:2376
msgid "Where"
msgstr "�"
-#: ../../standalone/drakbackup_.c:2306
+#: ../../standalone/drakbackup_.c:2381
msgid "When"
msgstr "ʱ��"
-#: ../../standalone/drakbackup_.c:2311
+#: ../../standalone/drakbackup_.c:2386
msgid "More Options"
msgstr "����"
-#: ../../standalone/drakbackup_.c:2330 ../../standalone/drakbackup_.c:3873
+#: ../../standalone/drakbackup_.c:2405 ../../standalone/drakbackup_.c:4530
msgid "Drakbackup Configuration"
msgstr "DrakBackup ����"
-#: ../../standalone/drakbackup_.c:2348
+#: ../../standalone/drakbackup_.c:2423
msgid "Please choose where you want to backup"
msgstr "��ѡ����ϣ��������������"
-#: ../../standalone/drakbackup_.c:2350
+#: ../../standalone/drakbackup_.c:2425
msgid "on Hard Drive"
msgstr "��Ӳ����"
-#: ../../standalone/drakbackup_.c:2360
+#: ../../standalone/drakbackup_.c:2435
msgid "across Network"
msgstr "ͨ������"
-#: ../../standalone/drakbackup_.c:2370
+#: ../../standalone/drakbackup_.c:2445
msgid "on CDROM"
msgstr "��CDROM��"
-#: ../../standalone/drakbackup_.c:2378
+#: ../../standalone/drakbackup_.c:2453
msgid "on Tape Device"
msgstr "�ڴŴ�����"
-#: ../../standalone/drakbackup_.c:2421
+#: ../../standalone/drakbackup_.c:2496
msgid "Please choose what you want to backup"
msgstr "��ѡ����Ҫ���ݵ��ļ�"
-#: ../../standalone/drakbackup_.c:2422
+#: ../../standalone/drakbackup_.c:2497
msgid "Backup system"
msgstr "����ϵͳ"
-#: ../../standalone/drakbackup_.c:2423
+#: ../../standalone/drakbackup_.c:2498
msgid "Backup Users"
msgstr "�����û�"
-#: ../../standalone/drakbackup_.c:2426
+#: ../../standalone/drakbackup_.c:2501
msgid "Select user manually"
msgstr "�ֹ�ѡ���û�"
-#: ../../standalone/drakbackup_.c:2508
+#: ../../standalone/drakbackup_.c:2584
msgid ""
"\n"
"Backup Sources: \n"
@@ -10206,7 +10635,7 @@ msgstr ""
"\n"
"������Դ : \n"
-#: ../../standalone/drakbackup_.c:2509
+#: ../../standalone/drakbackup_.c:2585
msgid ""
"\n"
"- System Files:\n"
@@ -10214,7 +10643,7 @@ msgstr ""
"\n"
"- ϵͳ�ļ�:\n"
-#: ../../standalone/drakbackup_.c:2511
+#: ../../standalone/drakbackup_.c:2587
msgid ""
"\n"
"- User Files:\n"
@@ -10222,7 +10651,7 @@ msgstr ""
"\n"
"- �û��ļ�:\n"
-#: ../../standalone/drakbackup_.c:2513
+#: ../../standalone/drakbackup_.c:2589
msgid ""
"\n"
"- Other Files:\n"
@@ -10230,22 +10659,24 @@ msgstr ""
"\n"
"- �����ļ�:\n"
-#: ../../standalone/drakbackup_.c:2515
+#: ../../standalone/drakbackup_.c:2591
#, c-format
msgid ""
"\n"
-"- Save on Hard drive on path : %s\n"
+"- Save on Hard drive on path: %s\n"
msgstr ""
"\n"
-"- ������Ӳ��·�� : %s\n"
+"- ������Ӳ��·��: %s\n"
-#: ../../standalone/drakbackup_.c:2518
+#: ../../standalone/drakbackup_.c:2594
msgid ""
"\n"
"- Delete hard drive tar files after backup.\n"
msgstr ""
+"\n"
+"- ���ݺ�ɾ��Ӳ�̵� tar �ļ�.\n"
-#: ../../standalone/drakbackup_.c:2524
+#: ../../standalone/drakbackup_.c:2600
msgid ""
"\n"
"- Burn to CD"
@@ -10253,43 +10684,43 @@ msgstr ""
"\n"
"- �չ���"
-#: ../../standalone/drakbackup_.c:2525
+#: ../../standalone/drakbackup_.c:2601
msgid "RW"
msgstr "RW"
-#: ../../standalone/drakbackup_.c:2526
+#: ../../standalone/drakbackup_.c:2602
#, c-format
-msgid " on device : %s"
+msgid " on device: %s"
msgstr " ʹ���豸: %s"
-#: ../../standalone/drakbackup_.c:2527
+#: ../../standalone/drakbackup_.c:2603
msgid " (multi-session)"
-msgstr ""
+msgstr " (���)"
-#: ../../standalone/drakbackup_.c:2528
+#: ../../standalone/drakbackup_.c:2604
#, c-format
msgid ""
"\n"
-"- Save to Tape on device : %s"
+"- Save to Tape on device: %s"
msgstr ""
"\n"
-"- ���浽�Ŵ��豸 : %s"
+"- ���浽�Ŵ��豸: %s"
-#: ../../standalone/drakbackup_.c:2529
+#: ../../standalone/drakbackup_.c:2605
#, c-format
msgid "\t\tErase=%s"
msgstr "\t\tErase=%s"
-#: ../../standalone/drakbackup_.c:2532
+#: ../../standalone/drakbackup_.c:2608
#, c-format
msgid ""
"\n"
-"- Save via %s on host : %s\n"
+"- Save via %s on host: %s\n"
msgstr ""
"\n"
-"- ͨ�� %s ���浽���� : %s\n"
+"- ͨ�� %s ���浽����: %s\n"
-#: ../../standalone/drakbackup_.c:2533
+#: ../../standalone/drakbackup_.c:2609
#, c-format
msgid ""
"\t\t user name: %s\n"
@@ -10298,7 +10729,7 @@ msgstr ""
"\t\t �û���: %s\n"
"\t\t ·��: %s \n"
-#: ../../standalone/drakbackup_.c:2534
+#: ../../standalone/drakbackup_.c:2610
msgid ""
"\n"
"- Options:\n"
@@ -10306,60 +10737,60 @@ msgstr ""
"\n"
"- ѡ��:\n"
-#: ../../standalone/drakbackup_.c:2535
+#: ../../standalone/drakbackup_.c:2611
msgid "\tDo not include System Files\n"
msgstr "\t������ϵͳ�ļ�\n"
-#: ../../standalone/drakbackup_.c:2538
+#: ../../standalone/drakbackup_.c:2614
msgid "\tBackups use tar and bzip2\n"
msgstr "\tʹ�� tar �� bzip2 ����\n"
-#: ../../standalone/drakbackup_.c:2540
+#: ../../standalone/drakbackup_.c:2616
msgid "\tBackups use tar and gzip\n"
msgstr "\tʹ�� tar �� gzip ����\n"
-#: ../../standalone/drakbackup_.c:2543
+#: ../../standalone/drakbackup_.c:2619
#, c-format
msgid ""
"\n"
-"- Daemon (%s) include :\n"
+"- Daemon (%s) include:\n"
msgstr ""
"\n"
-"- Daemon (%s) include :\n"
+"- Daemon (%s) include:\n"
-#: ../../standalone/drakbackup_.c:2544
+#: ../../standalone/drakbackup_.c:2620
msgid "\t-Hard drive.\n"
msgstr "\t-Ӳ��.\n"
-#: ../../standalone/drakbackup_.c:2545
+#: ../../standalone/drakbackup_.c:2621
msgid "\t-CDROM.\n"
msgstr "\t-����.\n"
-#: ../../standalone/drakbackup_.c:2546
+#: ../../standalone/drakbackup_.c:2622
msgid "\t-Tape \n"
msgstr "\t-�Ŵ� \n"
-#: ../../standalone/drakbackup_.c:2547
+#: ../../standalone/drakbackup_.c:2623
msgid "\t-Network by FTP.\n"
msgstr "\t-����ͨ��FTP.\n"
-#: ../../standalone/drakbackup_.c:2548
+#: ../../standalone/drakbackup_.c:2624
msgid "\t-Network by SSH.\n"
msgstr "\t-���� ͨ��SSH\n"
-#: ../../standalone/drakbackup_.c:2549
+#: ../../standalone/drakbackup_.c:2625
msgid "\t-Network by rsync.\n"
msgstr "\t-���� ͨ�� rsync.\n"
-#: ../../standalone/drakbackup_.c:2550
+#: ../../standalone/drakbackup_.c:2626
msgid "\t-Network by webdav.\n"
msgstr "\t-���� ͨ��webdav.\n"
-#: ../../standalone/drakbackup_.c:2552
+#: ../../standalone/drakbackup_.c:2628
msgid "No configuration, please click Wizard or Advanced.\n"
msgstr "û������, ��ѡ��ʦ��߼�.\n"
-#: ../../standalone/drakbackup_.c:2558
+#: ../../standalone/drakbackup_.c:2634
msgid ""
"List of data to restore:\n"
"\n"
@@ -10367,7 +10798,7 @@ msgstr ""
"Ҫ�ָ����ݵ��嵥:\n"
"\n"
-#: ../../standalone/drakbackup_.c:2725
+#: ../../standalone/drakbackup_.c:2801
msgid ""
"List of data corrupted:\n"
"\n"
@@ -10375,147 +10806,262 @@ msgstr ""
"�ѻٻ����ݵ��嵥:\n"
"\n"
-#: ../../standalone/drakbackup_.c:2727
+#: ../../standalone/drakbackup_.c:2803
msgid "Please uncheck or remove it on next time."
msgstr "��ȡ��ѡ��ɾ����."
-#: ../../standalone/drakbackup_.c:2737
+#: ../../standalone/drakbackup_.c:2813
msgid "Backup files are corrupted"
msgstr "�����ļ�����"
-#: ../../standalone/drakbackup_.c:2758
-#, fuzzy
+#: ../../standalone/drakbackup_.c:2834
msgid " All of your selected data have been "
-msgstr "\t��ѡ���ȫ�������Ѿ�\t"
+msgstr " ��ѡ���ȫ�������Ѿ� "
-#: ../../standalone/drakbackup_.c:2759
+#: ../../standalone/drakbackup_.c:2835
#, c-format
msgid " Successfuly Restored on %s "
msgstr "\t�ɹ��Ļָ��� %s "
-#: ../../standalone/drakbackup_.c:2877
+#: ../../standalone/drakbackup_.c:2953
msgid " Restore Configuration "
msgstr " �ָ������� "
-#: ../../standalone/drakbackup_.c:2895
+#: ../../standalone/drakbackup_.c:2971
msgid "OK to restore the other files."
msgstr "OK ���ָ������ļ�"
-#: ../../standalone/drakbackup_.c:2912
+#: ../../standalone/drakbackup_.c:2988
msgid "User list to restore (only the most recent date per user is important)"
msgstr "�ɻָ����û��嵥 (ÿ���û��������������Ҫ��)"
-#: ../../standalone/drakbackup_.c:2975
+#: ../../standalone/drakbackup_.c:3066
msgid "Backup the system files before:"
msgstr "�ȱ���ϵͳ�ļ�:"
-#: ../../standalone/drakbackup_.c:2977
+#: ../../standalone/drakbackup_.c:3068
msgid "please choose the date to restore"
msgstr "��ѡ����Ҫ�ָ�������"
-#: ../../standalone/drakbackup_.c:3014
+#: ../../standalone/drakbackup_.c:3105
msgid "Use Hard Disk to backup"
msgstr "ʹ��Ӳ�̱����ļ�"
-#: ../../standalone/drakbackup_.c:3017
+#: ../../standalone/drakbackup_.c:3108
msgid "Please enter the directory to save:"
msgstr "������Ŀ¼��:"
-#: ../../standalone/drakbackup_.c:3060
+#: ../../standalone/drakbackup_.c:3151
msgid "FTP Connection"
msgstr "FTP ����"
-#: ../../standalone/drakbackup_.c:3067
+#: ../../standalone/drakbackup_.c:3158
msgid "Secure Connection"
msgstr "��������"
-#: ../../standalone/drakbackup_.c:3093
+#: ../../standalone/drakbackup_.c:3184
msgid "Restore from Hard Disk."
msgstr "��Ӳ�ָ̻�"
-#: ../../standalone/drakbackup_.c:3095
+#: ../../standalone/drakbackup_.c:3186
msgid "Please enter the directory where backups are stored"
msgstr "�����뱣�汸�ݵ�Ŀ¼"
-#: ../../standalone/drakbackup_.c:3157
+#: ../../standalone/drakbackup_.c:3254
msgid "Select another media to restore from"
msgstr "��ѡ����һ����"
-#: ../../standalone/drakbackup_.c:3159
+#: ../../standalone/drakbackup_.c:3256
msgid "Other Media"
msgstr "����"
-#: ../../standalone/drakbackup_.c:3164
+#: ../../standalone/drakbackup_.c:3261
msgid "Restore system"
msgstr "�ָ�ϵͳ"
-#: ../../standalone/drakbackup_.c:3165
+#: ../../standalone/drakbackup_.c:3262
msgid "Restore Users"
msgstr "�ָ��û��ļ�"
-#: ../../standalone/drakbackup_.c:3166
+#: ../../standalone/drakbackup_.c:3263
msgid "Restore Other"
msgstr "�ָ������ļ�"
-#: ../../standalone/drakbackup_.c:3168
+#: ../../standalone/drakbackup_.c:3265
msgid "select path to restore (instead of /)"
msgstr "ѡ��Ҫ�ָ�����·�� (/ ����)"
-#: ../../standalone/drakbackup_.c:3172
+#: ../../standalone/drakbackup_.c:3269
msgid "Do new backup before restore (only for incremental backups.)"
msgstr "�ָ�ǰ���µı��� (ֻ��������������.)"
-#: ../../standalone/drakbackup_.c:3174
+#: ../../standalone/drakbackup_.c:3271
msgid "Remove user directories before restore."
msgstr "�ָ�ǰɾ���û�Ŀ¼."
-#: ../../standalone/drakbackup_.c:3232
+#: ../../standalone/drakbackup_.c:3384
+msgid ""
+"Restore Selected\n"
+"Catalog Entry"
+msgstr ""
+"�ָ�ѡ�е�\n"
+"Ŀ¼��"
+
+#: ../../standalone/drakbackup_.c:3394
+msgid ""
+"Restore Selected\n"
+"Files"
+msgstr ""
+"�ָ�ѡ�е�\n"
+"�ļ�"
+
+#: ../../standalone/drakbackup_.c:3411
+msgid ""
+"Change\n"
+"Restore Path"
+msgstr ""
+"�޸�\n"
+"�ָ�·��"
+
+#: ../../standalone/drakbackup_.c:3477
+#, c-format
+msgid "Backup files not found at %s."
+msgstr "�� %s û�з��ֱ����ļ�."
+
+#: ../../standalone/drakbackup_.c:3490
+#, c-format
+msgid ""
+"Insert the CD with volume label %s\n"
+" in the CD drive under mount point /mnt/cdrom"
+msgstr ""
+"��Ѿ���Ϊ %s �Ĺ��̲���\n"
+"�������� /mnt/cdrom ����������"
+
+#: ../../standalone/drakbackup_.c:3490
+msgid "Restore From CD"
+msgstr "�ӹ��ָ̻�"
+
+#: ../../standalone/drakbackup_.c:3492
+#, c-format
+msgid "Not the correct CD label. Disk is labelled %s."
+msgstr "�����̱겻��. �����̵ľ����� %s."
+
+#: ../../standalone/drakbackup_.c:3502
+#, c-format
+msgid ""
+"Insert the tape with volume label %s\n"
+" in the tape drive device %s"
+msgstr ""
+"��Ѿ���Ϊ %s �ĴŴ�װ��\n"
+"�Ŵ��� %s"
+
+#: ../../standalone/drakbackup_.c:3502
+msgid "Restore From Tape"
+msgstr "�ӴŴ��ָ�"
+
+#: ../../standalone/drakbackup_.c:3504
+#, c-format
+msgid "Not the correct tape label. Tape is labelled %s."
+msgstr "�Ŵ���Dz���. ���̴Ŵ��� %s"
+
+#: ../../standalone/drakbackup_.c:3524
+msgid "Restore Via Network"
+msgstr "ͨ������ָ�"
+
+#: ../../standalone/drakbackup_.c:3524
+#, c-format
+msgid "Restore Via Network Protocol: %s"
+msgstr "�ָ�ʹ�õ�����Э��: %s"
+
+#: ../../standalone/drakbackup_.c:3525
+msgid "Host Name"
+msgstr "������"
+
+#: ../../standalone/drakbackup_.c:3526
+msgid "Host Path or Module"
+msgstr "����·����ģ��"
+
+#: ../../standalone/drakbackup_.c:3533
+msgid "Password required"
+msgstr "��Ҫ����"
+
+#: ../../standalone/drakbackup_.c:3539
+msgid "Username required"
+msgstr "��Ҫ�û���"
+
+#: ../../standalone/drakbackup_.c:3542
+msgid "Hostname required"
+msgstr "��Ҫ��������"
+
+#: ../../standalone/drakbackup_.c:3547
+msgid "Path or Module required"
+msgstr "Ҫ���ṩ·����ģ��"
+
+#: ../../standalone/drakbackup_.c:3560
+msgid "Files Restored..."
+msgstr "�ļ��ѻָ�..."
+
+#: ../../standalone/drakbackup_.c:3563
+msgid "Restore Failed..."
+msgstr "�ָ�ʧ��..."
+
+#: ../../standalone/drakbackup_.c:3801
msgid "Restore all backups"
msgstr "�ָ����б���"
-#: ../../standalone/drakbackup_.c:3241
+#: ../../standalone/drakbackup_.c:3810
msgid "Custom Restore"
msgstr "���ƻָ�"
-#: ../../standalone/drakbackup_.c:3287 ../../standalone/drakbackup_.c:3320
-#: ../../standalone/drakbackup_.c:3346 ../../standalone/drakbackup_.c:3373
-#: ../../standalone/drakbackup_.c:3400 ../../standalone/drakbackup_.c:3460
-#: ../../standalone/drakbackup_.c:3487 ../../standalone/drakbackup_.c:3513
+#: ../../standalone/drakbackup_.c:3856
+msgid "CD in place - continue."
+msgstr "���̾��� - ����."
+
+#: ../../standalone/drakbackup_.c:3862
+msgid "Browse to new restore repository."
+msgstr "����µĻָ��ֿ�."
+
+#: ../../standalone/drakbackup_.c:3865
+msgid "Restore From Catalog"
+msgstr "��Ŀ¼�ָ�"
+
+#: ../../standalone/drakbackup_.c:3893
+#, fuzzy
+msgid "Restore Progress"
+msgstr "�ָ��û��ļ�"
+
+#: ../../standalone/drakbackup_.c:3935 ../../standalone/drakbackup_.c:3968
+#: ../../standalone/drakbackup_.c:3994 ../../standalone/drakbackup_.c:4021
+#: ../../standalone/drakbackup_.c:4048 ../../standalone/drakbackup_.c:4108
+#: ../../standalone/drakbackup_.c:4135 ../../standalone/drakbackup_.c:4165
+#: ../../standalone/drakbackup_.c:4191
msgid "Previous"
msgstr "ǰһ��"
-#: ../../standalone/drakbackup_.c:3291 ../../standalone/drakbackup_.c:3377
+#: ../../standalone/drakbackup_.c:3939 ../../standalone/drakbackup_.c:4025
#: ../../standalone/logdrake_.c:223
msgid "Save"
msgstr "����"
-#: ../../standalone/drakbackup_.c:3350
+#: ../../standalone/drakbackup_.c:3998
msgid "Build Backup"
msgstr "���ڱ���"
-#: ../../standalone/drakbackup_.c:3404 ../../standalone/drakbackup_.c:3974
+#: ../../standalone/drakbackup_.c:4052 ../../standalone/drakbackup_.c:4632
msgid "Restore"
msgstr "�ָ�"
-#: ../../standalone/drakbackup_.c:3553
+#: ../../standalone/drakbackup_.c:4231
msgid ""
-"Please Build backup before to restore it...\n"
-" or verify that your path to save is correct."
-msgstr ""
-"�Ƚ�������Ȼ����ָܻ���...\n"
-" ���߼��������ı���·���Ƿ���ȷ."
-
-#: ../../standalone/drakbackup_.c:3574
-msgid ""
-"Error during sendmail\n"
-" your report mail was not sent\n"
+"Error during sendmail.\n"
+" Your report mail was not sent.\n"
" Please configure sendmail"
msgstr ""
"ʹ�� sendmail ����\n"
-" ���ı���û�з���\n"
+" ���ı����ʼ�û�з���.\n"
" ������ sendmail"
-#: ../../standalone/drakbackup_.c:3598
+#: ../../standalone/drakbackup_.c:4255
msgid ""
"The following packages need to be installed:\n"
" @list_of_rpm_to_install"
@@ -10523,7 +11069,7 @@ msgstr ""
"������������Ҫ����װ:\n"
" @list_of_rpm_to_install"
-#: ../../standalone/drakbackup_.c:3621
+#: ../../standalone/drakbackup_.c:4278
msgid ""
"Error during sending file via FTP.\n"
" Please correct your FTP configuration."
@@ -10531,19 +11077,19 @@ msgstr ""
"ͨ�� FTP �����ļ�����.\n"
" ��������� FTP ����."
-#: ../../standalone/drakbackup_.c:3644
+#: ../../standalone/drakbackup_.c:4301
msgid "Please select data to restore..."
msgstr "��ѡ��Ҫ�ָ�������..."
-#: ../../standalone/drakbackup_.c:3665
+#: ../../standalone/drakbackup_.c:4322
msgid "Please select media for backup..."
msgstr "��ѡ��ʹ�õ�����..."
-#: ../../standalone/drakbackup_.c:3687
+#: ../../standalone/drakbackup_.c:4344
msgid "Please select data to backup..."
msgstr "��ѡ���豸�ݵ�����..."
-#: ../../standalone/drakbackup_.c:3709
+#: ../../standalone/drakbackup_.c:4366
msgid ""
"No configuration file found \n"
"please click Wizard or Advanced."
@@ -10551,59 +11097,59 @@ msgstr ""
"û���ҵ������ļ�\n"
"�����򵼻�߼�."
-#: ../../standalone/drakbackup_.c:3730
+#: ../../standalone/drakbackup_.c:4387
msgid "Under Devel ... please wait."
msgstr "������...��ȴ��°汾."
-#: ../../standalone/drakbackup_.c:3811
+#: ../../standalone/drakbackup_.c:4468
msgid "Backup system files"
msgstr "����ϵͳ�ļ�"
-#: ../../standalone/drakbackup_.c:3813
+#: ../../standalone/drakbackup_.c:4470
msgid "Backup user files"
msgstr "�����û��ļ�"
-#: ../../standalone/drakbackup_.c:3815
+#: ../../standalone/drakbackup_.c:4472
msgid "Backup other files"
msgstr "���������ļ�"
-#: ../../standalone/drakbackup_.c:3817 ../../standalone/drakbackup_.c:3850
+#: ../../standalone/drakbackup_.c:4474 ../../standalone/drakbackup_.c:4507
msgid "Total Progress"
msgstr "�ܽ�չ"
-#: ../../standalone/drakbackup_.c:3841
+#: ../../standalone/drakbackup_.c:4498
msgid "files sending by FTP"
msgstr "����ͨ�� FTP �����ļ�"
-#: ../../standalone/drakbackup_.c:3845
+#: ../../standalone/drakbackup_.c:4502
msgid "Sending files..."
msgstr "���ڷ����ļ�..."
-#: ../../standalone/drakbackup_.c:3931
+#: ../../standalone/drakbackup_.c:4588
msgid "Backup Now from configuration file"
msgstr "���ڱ���,�������ļ�"
-#: ../../standalone/drakbackup_.c:3936
+#: ../../standalone/drakbackup_.c:4593
msgid "View Backup Configuration."
msgstr "�鿴��������"
-#: ../../standalone/drakbackup_.c:3956
+#: ../../standalone/drakbackup_.c:4614
msgid "Wizard Configuration"
msgstr "������"
-#: ../../standalone/drakbackup_.c:3961
+#: ../../standalone/drakbackup_.c:4619
msgid "Advanced Configuration"
msgstr "�߼�����"
-#: ../../standalone/drakbackup_.c:3966
+#: ../../standalone/drakbackup_.c:4624
msgid "Backup Now"
msgstr "���ڱ���"
-#: ../../standalone/drakbackup_.c:3996
+#: ../../standalone/drakbackup_.c:4658
msgid "Drakbackup"
msgstr "ħ������"
-#: ../../standalone/drakbackup_.c:4045
+#: ../../standalone/drakbackup_.c:4707
msgid ""
"options description:\n"
"\n"
@@ -10663,7 +11209,7 @@ msgstr ""
" \n"
"\n"
-#: ../../standalone/drakbackup_.c:4075
+#: ../../standalone/drakbackup_.c:4737
msgid ""
"\n"
" Some errors during sendmail are caused by \n"
@@ -10676,7 +11222,7 @@ msgstr ""
" ����Ҫ�� /etc/postfix/main.cf ������ myhostname �� mydomain\n"
"\n"
-#: ../../standalone/drakbackup_.c:4083
+#: ../../standalone/drakbackup_.c:4745
msgid ""
"options description:\n"
"\n"
@@ -10720,62 +11266,58 @@ msgstr ""
"\n"
" - ����ϵͳ�ļ�:\n"
" \n"
-"\tThis option allows you to backup your /etc directory,\n"
-"\twhich contains all configuration files. Please be\n"
-"\tcareful during the restore step to not overwrite:\n"
+"\t���ѡ���������������� /etc Ŀ¼,\n"
+"\t�����������е������ļ�. �ڻָ�������\n"
+"\tҪС��, ��Ҫ����:\n"
"\t\t/etc/passwd \n"
"\t\t/etc/group \n"
"\t\t/etc/fstab\n"
"\n"
" - �����û��ļ�: \n"
"\n"
-"\tThis option allows you select all users that you want \n"
-"\tto backup.\n"
-"\tTo preserve disk space, it is recommended that you \n"
-"\tdo not include web browser's cache.\n"
+"\t���ѡ��������������ѡ��������û� \n"
+"\tΪ�˽�ʡ���̿ռ�, ��������Ҫ���� \n"
+"\t����������Ļ����ļ�.\n"
"\n"
" - ���������ļ�: \n"
"\n"
-"\tThis option allows you to add more data to save.\n"
-"\tWith the other backup it's not possible at the \n"
-"\tmoment to select incremental backup.\t\t\n"
+"\t���ѡ�����������������ӵ������ļ�.\n"
+"\t�����ѡ�񱸷������ļ� \n"
+"\t�Ͳ���ѡ����������.\t\t\n"
" \n"
-" - Incremental Backups:\n"
-"\n"
-"\tThe incremental backup is the most powerful \n"
-"\toption for backup. This option allows you \n"
-"\tto backup all your data the first time, and \n"
-"\tonly the changed afterward.\n"
-"\tThen you will be able, during the restore\n"
-"\tstep, to restore your data from a specified\n"
-"\tdate.\n"
-"\tIf you have not selected this option all\n"
-"\told backups are deleted before each backup. \n"
-"\n"
-"\n"
+" - ��������:\n"
+"\t���������ǹ�����ǿ���ѡ��.\n"
+"\t������ʹ��������� \n"
+"\t��һ�α��������е�����,\n"
+"\t�Ժ�ֻ���ݸı�IJ���.\n"
+"\t�����ڻָ�ʱ��,\n"
+"\t�����԰����ݻָ���ָ��\n"
+"\t���ڵ�״̬.\n"
+"\t�����ѡ����������\n"
+"\tÿ�α���֮ǰ��ɾ���ɵı���.\n"
-#: ../../standalone/drakbackup_.c:4122
+#: ../../standalone/drakbackup_.c:4784
msgid ""
"restore description:\n"
" \n"
-"Only the most recent date will be used ,because with incremental \n"
-"backups it is necesarry to restore one by one each older backups.\n"
+"Only the most recent date will be used, because with incremental \n"
+"backups it is necessary to restore one by one each older backup.\n"
"\n"
-"So if you don't like to restore a user please unselect all his\n"
-"check box.\n"
+"So if you don't want to restore a user please unselect all their\n"
+"check boxes.\n"
"\n"
-"Otherwise, you are able to select only one of this\n"
+"Otherwise, you are able to select only one of these.\n"
"\n"
" - Incremental Backups:\n"
"\n"
"\tThe incremental backup is the most powerful \n"
-"\toption to use backup, this option allow you \n"
-"\tto backup all your data the first time, and \n"
-"\tonly the changed after.\n"
-"\tSo you will be able during the restore\n"
+"\toption to use. This option allows you to \n"
+"\tbackup all of your data the first time, and \n"
+"\tonly the changed data after.\n"
+"\tSo you will be able, during the restore\n"
"\tstep, to restore your data from a specified\n"
"\tdate.\n"
-"\tIf you have not selected this options all\n"
+"\tIf you have not selected this option all\n"
"\told backups are deleted before each backup. \n"
"\n"
"\n"
@@ -10783,17 +11325,17 @@ msgid ""
msgstr ""
"�ָ�����:\n"
" \n"
-"ֻ��ʹ����������� , ��Ϊ��������Ҫ�� \n"
+"ֻ��ʹ����������� , ��Ϊʹ����������Ҫ�� \n"
"һ������һ���ָ�����ı���.\n"
"\n"
-"�������Ҫ�ָ�ij���û�, �����\n"
+"�����Ҫ�ָ�ij���û�, �����\n"
"��������ѡ���.\n"
"\n"
-"����, ��ֻ��ѡ������֮һ\n"
+"����, ������ѡ������֮һ\n"
"\n"
" - ��������:\n"
"\n"
-"\t��ǿ��ı��ݹ���, \n"
+"\t���������ǹ�����ǿ���ѡ��.\n"
"\t������ʹ��������� \n"
"\t��һ�α��������е�����,\n"
"\t�Ժ�ֻ���ݸı�IJ���.\n"
@@ -10806,19 +11348,19 @@ msgstr ""
"\n"
"\n"
-#: ../../standalone/drakbackup_.c:4148 ../../standalone/drakbackup_.c:4225
+#: ../../standalone/drakbackup_.c:4810 ../../standalone/drakbackup_.c:4887
msgid ""
" Copyright (C) 2001 MandrakeSoft by DUPONT Sebastien <dupont_s\\@epita.fr>"
msgstr ""
" Copyright (C) 2001 MandrakeSoft by DUPONT Sebastien <dupont_s\\@epita.fr>"
-#: ../../standalone/drakbackup_.c:4150 ../../standalone/drakbackup_.c:4227
+#: ../../standalone/drakbackup_.c:4812 ../../standalone/drakbackup_.c:4889
msgid ""
" updates 2002 MandrakeSoft by Stew Benedict <sbenedict\\@mandrakesoft.com>"
msgstr ""
" updates 2002 MandrakeSoft by Stew Benedict <sbenedict\\@mandrakesoft.com>"
-#: ../../standalone/drakbackup_.c:4152 ../../standalone/drakbackup_.c:4229
+#: ../../standalone/drakbackup_.c:4814 ../../standalone/drakbackup_.c:4891
msgid ""
" This program is free software; you can redistribute it and/or modify\n"
" it under the terms of the GNU General Public License as published by\n"
@@ -10849,7 +11391,7 @@ msgstr ""
" ��ַ�� Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, "
"MA 02111-1307, USA."
-#: ../../standalone/drakbackup_.c:4166
+#: ../../standalone/drakbackup_.c:4828
msgid ""
"Description:\n"
"\n"
@@ -10924,7 +11466,7 @@ msgstr ""
" \n"
"\n"
-#: ../../standalone/drakbackup_.c:4204
+#: ../../standalone/drakbackup_.c:4866
msgid ""
"options description:\n"
"\n"
@@ -10942,7 +11484,7 @@ msgstr ""
"Ȼ���������������.\n"
"\n"
-#: ../../standalone/drakbackup_.c:4213
+#: ../../standalone/drakbackup_.c:4875
msgid ""
"\n"
"Restore Backup Problems:\n"
@@ -10963,7 +11505,7 @@ msgstr ""
"һ����Ҫ�ֹ��޸ı��������ļ�.\n"
".\n"
-#: ../../standalone/drakbackup_.c:4243
+#: ../../standalone/drakbackup_.c:4905
msgid ""
"Description:\n"
"\n"
@@ -11071,9 +11613,8 @@ msgid " --report - program should be one of mandrake tools\n"
msgstr " --report - ������ mandrake ��һ������\n"
#: ../../standalone/drakbug_.c:49
-#, fuzzy
msgid " --incident - program should be one of mandrake tools\n"
-msgstr " --report - ������ mandrake ��һ������\n"
+msgstr " --incident - ������һ�� mandrake �Ĺ���\n"
#: ../../standalone/drakbug_.c:64
msgid "Mandrake Bug Report Tool"
@@ -11087,9 +11628,9 @@ msgstr "����ʹ����"
msgid "Synchronization tool"
msgstr "ͬ������"
-#: ../../standalone/drakbug_.c:72 ../../standalone/drakbug_.c:85
-#: ../../standalone/drakbug_.c:150 ../../standalone/drakbug_.c:152
-#: ../../standalone/drakbug_.c:156
+#: ../../standalone/drakbug_.c:72 ../../standalone/drakbug_.c:86
+#: ../../standalone/drakbug_.c:151 ../../standalone/drakbug_.c:153
+#: ../../standalone/drakbug_.c:157
msgid "Standalone Tools"
msgstr "��������"
@@ -11133,23 +11674,23 @@ msgstr "Userdrakeħ���û�����"
msgid "Configuration Wizards"
msgstr "������"
-#: ../../standalone/drakbug_.c:96
+#: ../../standalone/drakbug_.c:97
msgid "Application:"
msgstr "Ӧ�ó���:"
-#: ../../standalone/drakbug_.c:97
+#: ../../standalone/drakbug_.c:98
msgid "Package: "
msgstr "������:"
-#: ../../standalone/drakbug_.c:98
+#: ../../standalone/drakbug_.c:99
msgid "Kernel:"
msgstr "�ں�:"
-#: ../../standalone/drakbug_.c:99
+#: ../../standalone/drakbug_.c:100
msgid "Release: "
msgstr "����: "
-#: ../../standalone/drakbug_.c:114
+#: ../../standalone/drakbug_.c:115
msgid ""
"\n"
"\n"
@@ -11168,19 +11709,19 @@ msgstr ""
"���͵�������.\n"
"\n"
-#: ../../standalone/drakbug_.c:135
+#: ../../standalone/drakbug_.c:136
msgid "Report"
msgstr "����"
-#: ../../standalone/drakbug_.c:165
+#: ../../standalone/drakbug_.c:166
msgid "Not installed"
msgstr "û�а�װ"
-#: ../../standalone/drakbug_.c:182
+#: ../../standalone/drakbug_.c:183
msgid "connecting to Bugzilla wizard ..."
msgstr "���� Bugzilla ���ϱ��澫�� ..."
-#: ../../standalone/drakbug_.c:189
+#: ../../standalone/drakbug_.c:190
msgid "No browser available! Please install one"
msgstr "û�п��õ������! �밲װһ��"
@@ -11622,7 +12163,7 @@ msgid "Font List"
msgstr "�����ֿ�"
#: ../../standalone/drakfont_.c:909
-msgid "Choose the applications that will support the fonts :"
+msgid "Choose the applications that will support the fonts:"
msgstr "��ѡ��ʹ���������Ӧ�ó��� :"
#: ../../standalone/drakfont_.c:918
@@ -11693,19 +12234,19 @@ msgstr "ɾ���ֿ�"
msgid "Post Uninstall"
msgstr "ɾ������趨"
-#: ../../standalone/drakgw_.c:42 ../../standalone/drakgw_.c:195
+#: ../../standalone/drakgw_.c:43 ../../standalone/drakgw_.c:188
msgid "Internet Connection Sharing"
msgstr "��������������"
-#: ../../standalone/drakgw_.c:121
+#: ../../standalone/drakgw_.c:119
msgid "Sorry, we support only 2.4 kernels."
msgstr "�Բ���, ����ֻ֧�� 2.4 �ں�"
-#: ../../standalone/drakgw_.c:133
+#: ../../standalone/drakgw_.c:130
msgid "Internet Connection Sharing currently enabled"
msgstr "���������ӹ��������Ѿ�����"
-#: ../../standalone/drakgw_.c:134
+#: ../../standalone/drakgw_.c:131
msgid ""
"The setup of Internet connection sharing has already been done.\n"
"It's currently enabled.\n"
@@ -11717,31 +12258,31 @@ msgstr ""
"\n"
"��Ҫ��ʲô?"
-#: ../../standalone/drakgw_.c:138
+#: ../../standalone/drakgw_.c:135
msgid "disable"
msgstr "��ֹ"
-#: ../../standalone/drakgw_.c:138 ../../standalone/drakgw_.c:163
+#: ../../standalone/drakgw_.c:135 ../../standalone/drakgw_.c:160
msgid "dismiss"
msgstr "�뿪"
-#: ../../standalone/drakgw_.c:138 ../../standalone/drakgw_.c:163
+#: ../../standalone/drakgw_.c:135 ../../standalone/drakgw_.c:160
msgid "reconfigure"
msgstr "��������"
-#: ../../standalone/drakgw_.c:141
+#: ../../standalone/drakgw_.c:138
msgid "Disabling servers..."
msgstr "ֹͣ����..."
-#: ../../standalone/drakgw_.c:149
+#: ../../standalone/drakgw_.c:146
msgid "Internet connection sharing is now disabled."
msgstr "���������ӹ������ڱ���ֹ��"
-#: ../../standalone/drakgw_.c:158
+#: ../../standalone/drakgw_.c:155
msgid "Internet Connection Sharing currently disabled"
msgstr "���������ӹ������ڱ���ֹ"
-#: ../../standalone/drakgw_.c:159
+#: ../../standalone/drakgw_.c:156
msgid ""
"The setup of Internet connection sharing has already been done.\n"
"It's currently disabled.\n"
@@ -11753,19 +12294,19 @@ msgstr ""
"\n"
"��Ҫ��ʲô?"
-#: ../../standalone/drakgw_.c:163
+#: ../../standalone/drakgw_.c:160
msgid "enable"
msgstr "����"
-#: ../../standalone/drakgw_.c:170
+#: ../../standalone/drakgw_.c:167
msgid "Enabling servers..."
msgstr "��������..."
-#: ../../standalone/drakgw_.c:175
+#: ../../standalone/drakgw_.c:172
msgid "Internet connection sharing is now enabled."
msgstr "���������ӹ��������Ѿ�����"
-#: ../../standalone/drakgw_.c:196
+#: ../../standalone/drakgw_.c:189
msgid ""
"You are about to configure your computer to share its Internet connection.\n"
"With that feature, other computers on your local network will be able to use "
@@ -11778,31 +12319,31 @@ msgstr ""
"\n"
"ע��: ����Ҫ�о�����(LAN)ʹ�õ�����."
-#: ../../standalone/drakgw_.c:222
+#: ../../standalone/drakgw_.c:215
#, c-format
msgid "Interface %s (using module %s)"
msgstr "���� %s (ʹ�� %s ģ��)"
-#: ../../standalone/drakgw_.c:223
+#: ../../standalone/drakgw_.c:216
#, c-format
msgid "Interface %s"
msgstr "���� %s"
-#: ../../standalone/drakgw_.c:231
+#: ../../standalone/drakgw_.c:224
msgid "No network adapter on your system!"
msgstr "��ϵͳ��û�����翨!"
-#: ../../standalone/drakgw_.c:232
+#: ../../standalone/drakgw_.c:225
msgid ""
"No ethernet network adapter has been detected on your system. Please run the "
"hardware configuration tool."
msgstr "����ϵͳ��û��������̫����. ������Ӳ�����ù���."
-#: ../../standalone/drakgw_.c:238
+#: ../../standalone/drakgw_.c:231
msgid "Network interface"
msgstr "����ӿڿ�"
-#: ../../standalone/drakgw_.c:239
+#: ../../standalone/drakgw_.c:232
#, c-format
msgid ""
"There is only one configured network adapter on your system:\n"
@@ -11817,17 +12358,17 @@ msgstr ""
"\n"
"����������������ľ�����."
-#: ../../standalone/drakgw_.c:248
+#: ../../standalone/drakgw_.c:241
msgid ""
"Please choose what network adapter will be connected to your Local Area "
"Network."
msgstr "��ѡ���ĸ��������������ľ�����."
-#: ../../standalone/drakgw_.c:266
+#: ../../standalone/drakgw_.c:259
msgid "Network interface already configured"
msgstr "�������������"
-#: ../../standalone/drakgw_.c:267
+#: ../../standalone/drakgw_.c:260
#, c-format
msgid ""
"Warning, the network adapter (%s) is already configured.\n"
@@ -11842,15 +12383,15 @@ msgstr ""
"\n"
"�����֪��������, Ҳ�����ֹ�����."
-#: ../../standalone/drakgw_.c:272
+#: ../../standalone/drakgw_.c:265
msgid "Automatic reconfiguration"
msgstr "�Զ���������"
-#: ../../standalone/drakgw_.c:273
+#: ../../standalone/drakgw_.c:266
msgid "Show current interface configuration"
msgstr "�޸ĵ�ǰ������������"
-#: ../../standalone/drakgw_.c:275
+#: ../../standalone/drakgw_.c:268
#, c-format
msgid ""
"Current configuration of `%s':\n"
@@ -11867,7 +12408,7 @@ msgstr ""
"IP ����: %s\n"
"����: %s"
-#: ../../standalone/drakgw_.c:287
+#: ../../standalone/drakgw_.c:280
msgid ""
"I can keep your current configuration and assume you already set up a DHCP "
"server; in that case please verify I correctly read the C-Class Network that "
@@ -11884,53 +12425,41 @@ msgstr ""
"����,�һ�������������, �������������� DHCP ����.\n"
"\n"
-#: ../../standalone/drakgw_.c:292
+#: ../../standalone/drakgw_.c:285
msgid "C-Class Local Network"
msgstr "C�౾������"
-#: ../../standalone/drakgw_.c:293
+#: ../../standalone/drakgw_.c:286
msgid "(This) DHCP Server IP"
msgstr "DHCP ������ IP"
-#: ../../standalone/drakgw_.c:294
+#: ../../standalone/drakgw_.c:287
msgid "Re-configure interface and DHCP server"
msgstr "���������������� DHCP "
-#: ../../standalone/drakgw_.c:301
+#: ../../standalone/drakgw_.c:294
msgid "The Local Network did not finish with `.0', bailing out."
msgstr "��������û����`.0'����, �Ѿ��޸�"
-#: ../../standalone/drakgw_.c:312
+#: ../../standalone/drakgw_.c:305
#, c-format
msgid "Potential LAN address conflict found in current config of %s!\n"
msgstr "�ڵ�ǰ�� %s �����з��ֿ��ܵ� LAN ��ַ��ͻ! \n"
-#: ../../standalone/drakgw_.c:320
-msgid "Firewalling configuration detected!"
-msgstr "���ַ���ǽ����!"
-
-#: ../../standalone/drakgw_.c:321
-msgid ""
-"Warning! An existing firewalling configuration has been detected. You may "
-"need some manual fix after installation."
-msgstr ""
-"����! ����ԭ�������������˷���ǽ����.\n"
-"����Ҫ�ڰ�װ֮���ֹ��޸�."
-
-#: ../../standalone/drakgw_.c:328
+#: ../../standalone/drakgw_.c:315
msgid "Configuring..."
msgstr "��������..."
-#: ../../standalone/drakgw_.c:329
+#: ../../standalone/drakgw_.c:316
msgid "Configuring scripts, installing software, starting servers..."
msgstr "�������ýű�, ��װ����, ����������� ..."
-#: ../../standalone/drakgw_.c:365
+#: ../../standalone/drakgw_.c:352
#, c-format
msgid "Problems installing package %s"
msgstr "��װ %s ��������������"
-#: ../../standalone/drakgw_.c:549
+#: ../../standalone/drakgw_.c:485
msgid ""
"Everything has been configured.\n"
"You may now share Internet connection with other computers on your Local "
@@ -11940,23 +12469,23 @@ msgstr ""
"�����ڿ��������Զ��������� (DHCP).�����ľ������������ĵ��Թ������Ļ���������"
"��."
-#: ../../standalone/drakgw_.c:566
+#: ../../standalone/drakgw_.c:504
msgid "The setup has already been done, but it's currently disabled."
msgstr "�����Ѿ����.����ǰ�Ѿ�����ֹ."
-#: ../../standalone/drakgw_.c:567
+#: ../../standalone/drakgw_.c:505
msgid "The setup has already been done, and it's currently enabled."
msgstr "�����Ѿ����.����ǰ�Ѿ�������."
-#: ../../standalone/drakgw_.c:568
+#: ../../standalone/drakgw_.c:506
msgid "No Internet Connection Sharing has ever been configured."
msgstr "���������ӹ���û������"
-#: ../../standalone/drakgw_.c:573
+#: ../../standalone/drakgw_.c:511
msgid "Internet connection sharing configuration"
msgstr "���������ӹ�������"
-#: ../../standalone/drakgw_.c:580
+#: ../../standalone/drakgw_.c:518
#, c-format
msgid ""
"Welcome to the Internet Connection Sharing utility!\n"
@@ -11971,8 +12500,152 @@ msgstr ""
"\n"
"���''����''�������þ���."
+#: ../../standalone/draksound_.c:46
+msgid "No Sound Card detected!"
+msgstr "û�з�������!"
+
+#: ../../standalone/draksound_.c:47
+msgid ""
+"No Sound Card has been detected on your machine. Please verify that a Linux-"
+"supported Sound Card is correctly plugged in.\n"
+"\n"
+"\n"
+"You can visit our hardware database at:\n"
+"\n"
+"\n"
+"http://www.linux-mandrake.com/en/hardware.php3"
+msgstr ""
+"�����Ļ�����û�м�⵽����. �������Ƿ���ȷ�İ�װ����������, ���Ƿ� Linux "
+"֧��.\n"
+"\n"
+"\n"
+"�����Է���Ӳ�����ݿ�:\n"
+"\n"
+"\n"
+"http://www.linux-mandrake.com/en/hardware.php3"
+
+#: ../../standalone/draksplash_.c:32
+msgid "package ImageMagick is required for correct working"
+msgstr "Ҫ����������Ҫ������ ImageMagick"
+
+#: ../../standalone/draksplash_.c:76
+msgid "first step creation"
+msgstr "��һ������"
+
+#: ../../standalone/draksplash_.c:77
+msgid "final resolution"
+msgstr "���շֱ���"
+
+#: ../../standalone/draksplash_.c:78 ../../standalone/draksplash_.c:170
+msgid "choose image file"
+msgstr "ѡ��ͼ���ļ�"
+
+#: ../../standalone/draksplash_.c:79
+msgid "Theme name"
+msgstr "��������"
+
+#: ../../standalone/draksplash_.c:81
+msgid "make bootsplash step 2"
+msgstr "����������Ļ�ڶ���"
+
+#: ../../standalone/draksplash_.c:82
+msgid "go to lilosplash configuration"
+msgstr "���� lilosplash ������"
+
+#: ../../standalone/draksplash_.c:83
+msgid "quit"
+msgstr "�˳�"
+
+#: ../../standalone/draksplash_.c:84
+msgid "save theme"
+msgstr "��������"
+
+#: ../../standalone/draksplash_.c:85
+msgid "browse"
+msgstr "���"
+
+#: ../../standalone/draksplash_.c:98 ../../standalone/draksplash_.c:159
+msgid "Configure bootsplash picture"
+msgstr "���ÿ�������ͼƬ"
+
+#: ../../standalone/draksplash_.c:99
+msgid "x coordinate of text box in number of character"
+msgstr "�ı����� X ����, ���ַ�������"
+
+#: ../../standalone/draksplash_.c:100
+msgid "y coordinate of text box in number of character"
+msgstr "�ı����� Y ����, ���ַ�������"
+
+#: ../../standalone/draksplash_.c:101
+msgid "text width"
+msgstr "�ı�����"
+
+#: ../../standalone/draksplash_.c:102
+msgid "text box height"
+msgstr "�ı����߶�"
+
+#: ../../standalone/draksplash_.c:103
+msgid "the progress bar x coordinate of its upper left corner"
+msgstr "��չ�������Ͻǵ� X ����"
+
+#: ../../standalone/draksplash_.c:104
+msgid "the progress bar y coordinate of its upper left corner"
+msgstr "��չ�������Ͻǵ� Y ����"
+
+#: ../../standalone/draksplash_.c:105
+msgid "the width of the progress bar"
+msgstr "��չ���Ŀ���"
+
+#: ../../standalone/draksplash_.c:106
+msgid "the heigth of the progress bar"
+msgstr "��չ���ĸ߶�"
+
+#: ../../standalone/draksplash_.c:107
+msgid "the color of the progress bar"
+msgstr "��չ������ɫ"
+
+#: ../../standalone/draksplash_.c:119
+msgid "go back"
+msgstr "����"
+
+#: ../../standalone/draksplash_.c:120
+msgid "preview"
+msgstr "Ԥ��"
+
+#: ../../standalone/draksplash_.c:121
+msgid "choose color"
+msgstr "ѡ����ɫ"
+
+#: ../../standalone/draksplash_.c:124
+msgid "Display logo on Console"
+msgstr "�ڿ���̨��ʾ LOGO"
+
+#: ../../standalone/draksplash_.c:125
+msgid "Make kernel message quiet by default"
+msgstr "ȱʡ�趨�ں���Ϣ����ʾ"
+
+#: ../../standalone/draksplash_.c:161 ../../standalone/draksplash_.c:330
+#, c-format
+msgid "This theme haven't yet any bootsplash in %s !"
+msgstr "�������� %s ���滹û���κο�������!"
+
+#: ../../standalone/draksplash_.c:213
+msgid "saving Bootsplash theme..."
+msgstr "���濪����������..."
+
+#: ../../standalone/draksplash_.c:436
+msgid "ProgressBar color selection"
+msgstr "��չ����ɫѡ��"
+
+#: ../../standalone/draksplash_.c:454
+msgid "You must choose an image file first!"
+msgstr "��������ѡ��һ��ͼ���ļ�!"
+
+#: ../../standalone/draksplash_.c:463
+msgid "Generating preview ..."
+msgstr "��������Ԥ�� ..."
+
#: ../../standalone/drakxtv_.c:49
-#, fuzzy
msgid ""
"XawTV isn't installed!\n"
"\n"
@@ -11989,13 +12662,13 @@ msgstr ""
"XawTV û�а�װ!\n"
"\n"
"\n"
-"������е��ӿ����� DrakX ��û�м�⵽�� ( bttv\n"
-"ģ�鲻�� \"/etc/modules\"��) Ҳû�а�װ xawtv, ������\n"
+"������е��ӿ����� DrakX ��û�м�⵽�� ( bttv �� saa7134 \n"
+"ģ�鶼���� \"/etc/modules\"��) Ҳû�а�װ xawtv, ������\n"
" \"lspcidrake -v -f\" ���ѽ�����͸� \"install\\@mandrakesoft.com\"\n"
"����д \"undetected TV card\".\n"
"\n"
"\n"
-"�ֹ���װ, ��Ϊ root �ӿ���̨���� \"urpmi xawtv\"."
+"��������Ϊ root �ӿ���̨���� \"urpmi xawtv\" ����װ��."
#: ../../standalone/drakxtv_.c:66
msgid "Canada (cable)"
@@ -12059,7 +12732,7 @@ msgstr "����͢"
#: ../../standalone/drakxtv_.c:72
msgid "Australian Optus cable TV"
-msgstr ""
+msgstr "Australian Optus cable TV"
#: ../../standalone/drakxtv_.c:107
msgid ""
@@ -12070,11 +12743,11 @@ msgstr ""
"���ĵ�����ʽ�͹���"
#: ../../standalone/drakxtv_.c:109
-msgid "TV norm :"
+msgid "TV norm:"
msgstr "������ʽ :"
#: ../../standalone/drakxtv_.c:110
-msgid "Area :"
+msgid "Area:"
msgstr "���� :"
#: ../../standalone/drakxtv_.c:114
@@ -12156,7 +12829,7 @@ msgstr "�޷���ʼ live upgrade !!!\n"
msgid "The change is done, but to be effective you must logout"
msgstr "�޸��Ѿ����, �����������˳���¼�޸IJŻ���Ч"
-#: ../../standalone/logdrake_.c:85 ../../standalone/logdrake_.c:517
+#: ../../standalone/logdrake_.c:85 ../../standalone/logdrake_.c:515
msgid "logdrake"
msgstr "logdrake"
@@ -12325,8 +12998,8 @@ msgstr "��������"
#: ../../standalone/logdrake_.c:431
msgid ""
-"You will receive an alert if one of the selected service is no more running"
-msgstr "���ѡ�еķ��������κ�һ��û�����������յ�����"
+"You will receive an alert if one of the selected services is no more running"
+msgstr "���ѡ�еķ��������κ�һ��ֹͣ���������յ�����"
#: ../../standalone/logdrake_.c:443
msgid "load setting"
@@ -12344,19 +13017,19 @@ msgstr "�����趨"
msgid "Please enter your email address below "
msgstr "�����������ʼ���ַ "
-#: ../../standalone/logdrake_.c:499
+#: ../../standalone/logdrake_.c:497
msgid "Save as.."
msgstr "����Ϊ.."
-#: ../../standalone/mousedrake_.c:43
+#: ../../standalone/mousedrake_.c:45
msgid "Please, choose the type of your mouse."
msgstr "��ѡ�������������һ������."
-#: ../../standalone/mousedrake_.c:57
+#: ../../standalone/mousedrake_.c:58
msgid "Emulate third button?"
msgstr "ģ������"
-#: ../../standalone/printerdrake_.c:48
+#: ../../standalone/printerdrake_.c:57
msgid "Reading printer data ..."
msgstr "��ȡ��ӡ������..."
@@ -12368,21 +13041,32 @@ msgstr "����̽���豸..."
msgid "Test ports"
msgstr "���Զ˿�"
-#: ../../standalone/scannerdrake_.c:52
+#: ../../standalone/scannerdrake_.c:53 ../../standalone/scannerdrake_.c:68
+#: ../../standalone/scannerdrake_.c:81
+#, c-format
+msgid "The %s is not supported by this version of Mandrake Linux."
+msgstr "����汾�� Mandrake Linux ��֧�� %s "
+
+#: ../../standalone/scannerdrake_.c:56
#, c-format
-msgid "%s found on %s, configure it ?"
-msgstr "���� %s ������ %s, �Ƿ����� ?"
+msgid "%s found on %s, configure it?"
+msgstr "���� %s ������ %s ��, �Ƿ�������?"
#: ../../standalone/scannerdrake_.c:59
+#, c-format
+msgid "%s is not in the scanner database, configure it manually?"
+msgstr "ɨ�������ݿ���û�� %s, Ҫ�ֹ���������?"
+
+#: ../../standalone/scannerdrake_.c:65
msgid "Select a scanner"
msgstr "ѡ��ɨ����"
-#: ../../standalone/scannerdrake_.c:79
+#: ../../standalone/scannerdrake_.c:93
#, c-format
msgid "This %s scanner is unsupported"
msgstr "ɨ���� %s ��ʱ��֧��"
-#: ../../standalone/scannerdrake_.c:93
+#: ../../standalone/scannerdrake_.c:107
#, c-format
msgid ""
"Scannerdrake was not able to detect your %s scanner.\n"
@@ -12391,11 +13075,11 @@ msgstr ""
"Scannerdrake û�ܼ�⵽���� %s ɨ����.\n"
"��ѡ������ɨ�������ӵ��豸."
-#: ../../standalone/scannerdrake_.c:95
+#: ../../standalone/scannerdrake_.c:109
msgid "choose device"
msgstr "ѡ���豸"
-#: ../../standalone/scannerdrake_.c:101
+#: ../../standalone/scannerdrake_.c:115
#, c-format
msgid ""
"This %s scanner must be configured by printerdrake.\n"
@@ -12405,7 +13089,7 @@ msgstr ""
"��� %s ɨ���DZ���ʹ�� printerdrake ������.\n"
"��������Mandrake �������ĵ�Ӳ�����ִ� printerdrake."
-#: ../../standalone/scannerdrake_.c:106
+#: ../../standalone/scannerdrake_.c:120
#, c-format
msgid ""
"Your %s scanner has been configured.\n"
@@ -12415,12 +13099,12 @@ msgstr ""
"���� %s ɨ�����Ѿ����ú�.\n"
"���������Դ�Ӧ�ó���˵��� ��ý��/ͼ�� ��ʹ�� ``XSane'' ��ɨ���ĵ�. "
-#: ../../standalone/service_harddrake_.c:57
+#: ../../standalone/service_harddrake_.c:39
#, c-format
msgid "Some devices in the \"%s\" hardware class were removed:\n"
msgstr "ɾ����һЩ \"%s\" �����豸:\n"
-#: ../../standalone/service_harddrake_.c:61
+#: ../../standalone/service_harddrake_.c:43
#, c-format
msgid ""
"\n"
@@ -12429,36 +13113,6 @@ msgstr ""
"\n"
"������һЩ %s �����豸:\n"
-#: ../../standalone/tinyfirewall_.c:30
-msgid "Firewalling Configuration"
-msgstr "���÷���ǽ"
-
-#: ../../standalone/tinyfirewall_.c:43
-msgid "Firewalling configuration"
-msgstr "���÷���ǽ"
-
-#: ../../standalone/tinyfirewall_.c:78
-msgid ""
-"Firewalling\n"
-"\n"
-"You already have set up a firewall.\n"
-"Click on Configure to change or remove the firewall"
-msgstr ""
-"����ǽ\n"
-"\n"
-"���Ѿ������˷���ǽ.\n"
-"��� ���� �޸Ļ�ɾ������ǽ"
-
-#: ../../standalone/tinyfirewall_.c:82
-msgid ""
-"Firewalling\n"
-"\n"
-"Click on Configure to set up a standard firewall"
-msgstr ""
-"����ǽ\n"
-"\n"
-"��� ���� ����һ��׼����ǽ"
-
#: ../../steps.pm_.c:14
msgid "Choose your language"
msgstr "ѡ������"
@@ -12531,208 +13185,7 @@ msgstr "��װϵͳ���°�"
msgid "Exit install"
msgstr "�˳���װ"
-#: ../../tinyfirewall.pm_.c:9
-msgid ""
-"tinyfirewall configurator\n"
-"\n"
-"This configures a personal firewall for this Mandrake Linux machine.\n"
-"For a powerful dedicated firewall solution, please look to the\n"
-"specialized MandrakeSecurity Firewall distribution."
-msgstr ""
-"΢�ͷ���ǽ����\n"
-"\n"
-"���� Mandrake ���˷���ǽ.\n"
-"���Ҫ����ǿ���ר�÷���ǽ, �뿼��ʹ��ר�ŵ�\n"
-"MandrakeSecurity ����ǽ���а�."
-
-#: ../../tinyfirewall.pm_.c:14
-msgid ""
-"We'll now ask you questions about which services you'd like to allow\n"
-"the Internet to connect to. Please think carefully about these\n"
-"questions, as your computer's security is important.\n"
-"\n"
-"Please, if you're not currently using one of these services, firewall\n"
-"it off. You can change this configuration anytime you like by\n"
-"re-running this application!"
-msgstr ""
-"���ѡ�񿪷ŵķ���, ����ǽ���رղ�ʹ�õķ���. ��ֻ���������иó�����ܸı���"
-"��!"
-
-#: ../../tinyfirewall.pm_.c:21
-msgid ""
-"Are you running a web server on this machine that you need the whole\n"
-"Internet to see? If you are running a webserver that only needs to be\n"
-"accessed by this machine, you can safely answer NO here.\n"
-"\n"
-msgstr ""
-"�����������û�ʹ������ Web ����?\n"
-"������� Web ������ֻ��Ҫ�ӱ�������, ��ѡ��\"��\".\n"
-"\n"
-
-#: ../../tinyfirewall.pm_.c:26
-msgid ""
-"Are you running a name server on this machine? If you didn't set one\n"
-"up to give away IP and zone information to the whole Internet, please\n"
-"answer no.\n"
-"\n"
-msgstr ""
-"���������������������������?\n"
-"�������Ҫ�������������ṩ IP ��ַ����Ϣ, ����ѡ��\"��\".\n"
-"\n"
-
-#: ../../tinyfirewall.pm_.c:31
-msgid ""
-"Do you want to allow incoming Secure Shell (ssh) connections? This\n"
-"is a telnet-replacement that you might use to login. If you're using\n"
-"telnet now, you should definitely switch to ssh. telnet is not\n"
-"encrypted -- so some attackers can steal your password if you use\n"
-"it. ssh is encrypted and doesn't allow for this eavesdropping."
-msgstr ""
-"����������ȫ�������ssh������?������������� telnet ����Զ�̵�¼. �������"
-"��\n"
-"��ʹ�� telnet, ������Ӧ�ø��� ssh. telnet û��\n"
-"���ܴ�ʩ -- �������ܹ�����������ȡ���Ŀ���.\n"
-"�� ssh ��ͨ���Ǽ��ܵ�, ���û������Σ��."
-
-#: ../../tinyfirewall.pm_.c:36
-msgid ""
-"Do you want to allow incoming telnet connections?\n"
-"This is horribly unsafe, as we explained in the previous screen. We\n"
-"strongly recommend answering No here and using ssh in place of\n"
-"telnet.\n"
-msgstr ""
-"���Ƿ����� telnet ����?\n"
-"��������ǰ����͹���, ����������Σ��. \n"
-"ǿ�ҽ�����������ѡ�� '��', ���� ssh \n"
-"���� telnet.\n"
-
-#: ../../tinyfirewall.pm_.c:41
-msgid ""
-"Are you running an FTP server here that you need accessible to the\n"
-"Internet? If you are, we strongly recommend that you only use it for\n"
-"Anonymous transfers. Any passwords sent by FTP can be stolen by some\n"
-"attackers, since FTP also uses no encryption for transferring passwords.\n"
-msgstr ""
-"���Ƿ���Ҫ�ӻ������Ϸ�������� ftp ����?\n"
-"�������, ����ǿ�ҽ�����ֻʹ�������� ftp ����.\n"
-"ͨ�� FTP ���͵Ŀ����п��ܱ���������ȡ,\n"
-"��Ϊ FTP ���Ϳ���ʱ��ʹ���κμ���.\n"
-
-#: ../../tinyfirewall.pm_.c:46
-msgid ""
-"Are you running a mail server here? If you're sending you \n"
-"messages through pine, mutt or any other text-based mail client,\n"
-"you probably are. Otherwise, you should firewall this off.\n"
-"\n"
-msgstr ""
-"Ҫ���� mail ��������? ������� pine, mutt ������������ email �ͻ���\n"
-"����email, ������Ҫ. ����, ���÷���ǽ�ص� email ����.\n"
-"\n"
-
-#: ../../tinyfirewall.pm_.c:51
-msgid ""
-"Are you running a POP or IMAP server here? This would\n"
-"be used to host non-web-based mail accounts for people via \n"
-"this machine.\n"
-"\n"
-msgstr ""
-"������POP��IMAP������? \n"
-"��Щ������������û�ͨ���û�����ȡ email.\n"
-"\n"
-
-#: ../../tinyfirewall.pm_.c:56
-msgid ""
-"You appear to be running a 2.2 kernel. If your network IP\n"
-"is automatically set by a computer in your home or office \n"
-"(dynamically assigned), we need to allow for this. Is\n"
-"this the case?\n"
-msgstr "������������ 2.2�ں�. �������綯̬���� IP���Բ���?\n"
-
-#: ../../tinyfirewall.pm_.c:61
-msgid ""
-"Is your computer getting time syncronized to another computer?\n"
-"Mostly, this is used by medium-large Unix/Linux organizations\n"
-"to synchronize time for logging and such. If you're not part\n"
-"of a larger office and haven't heard of this, you probably \n"
-"aren't."
-msgstr ""
-"���ļ�����Ƿ�����������ͬ��ʱ��?\n"
-"ͨ���������� Unix/Linux��֯��Ҫͬ���������ʱ��������־��.\n"
-"�����������������Ͳ���Ҫ."
-
-#: ../../tinyfirewall.pm_.c:66
-msgid ""
-"Configuration complete. May we write these changes to disk?\n"
-"\n"
-"\n"
-"\n"
-msgstr ""
-"�������. ���޸�д��Ӳ��?\n"
-"\n"
-"\n"
-"\n"
-
-#: ../../tinyfirewall.pm_.c:82
-#, c-format
-msgid "Can't open %s: %s\n"
-msgstr "�޷��� %s: %s\n"
-
-#: ../../tinyfirewall.pm_.c:84
-#, c-format
-msgid "Can't open %s for writing: %s\n"
-msgstr "�ڴ� %s д��ʱ��������: %s\n"
-
-#: ../../tinyfirewall.pm_.c:178
-msgid "No I don't need DHCP"
-msgstr "�� �Ҳ���Ҫ DHCP"
-
-#: ../../tinyfirewall.pm_.c:178
-msgid "Yes I need DHCP"
-msgstr "�� ����Ҫ DHCP"
-
-#: ../../tinyfirewall.pm_.c:179
-msgid "No I don't need NTP"
-msgstr "�� �Ҳ���Ҫ NTP"
-
-#: ../../tinyfirewall.pm_.c:179
-msgid "Yes I need NTP"
-msgstr "�� ����Ҫ NTP"
-
-#: ../../tinyfirewall.pm_.c:180 ../../tinyfirewall.pm_.c:184
-msgid "Don't Save"
-msgstr "������"
-
-#: ../../tinyfirewall.pm_.c:180 ../../tinyfirewall.pm_.c:184
-#: ../../tinyfirewall.pm_.c:204
-msgid "Save & Quit"
-msgstr "���沢�˳�"
-
-#: ../../tinyfirewall.pm_.c:195 ../../tinyfirewall.pm_.c:199
-msgid "Firewall Configuration Wizard"
-msgstr "����ǽ������"
-
-#: ../../tinyfirewall.pm_.c:197
-msgid "No (firewall this off from the internet)"
-msgstr "�� (����ͻ���������)"
-
-#: ../../tinyfirewall.pm_.c:198
-msgid "Yes (allow this through the firewall)"
-msgstr "�� (�������ͨ������ǽ)"
-
-#: ../../tinyfirewall.pm_.c:230
-msgid "Please Wait... Verifying installed packages"
-msgstr "��Ⱥ�... ������֤�Ѱ�װ������"
-
-#: ../../tinyfirewall.pm_.c:236
-#, c-format
-msgid ""
-"Failure installing the needed packages : %s and Bastille.\n"
-" Try to install them manually."
-msgstr ""
-"δ�ܰ�װ��Ҫ�������� : %s �� Bastille. \n"
-" �����ֹ���װ����."
-
-#: ../../ugtk.pm_.c:619
+#: ../../ugtk.pm_.c:594
msgid "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
msgstr "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
@@ -12863,6 +13316,10 @@ msgid "Graphical Environment"
msgstr "ͼ�λ���"
#: ../../share/compssUsers:999
+msgid "Development"
+msgstr "����ƽ̨"
+
+#: ../../share/compssUsers:999
msgid "Apache, Pro-ftpd"
msgstr "Apache�� Pro-ftpd"
@@ -12970,426 +13427,128 @@ msgstr "��ý�� - ��¼����"
msgid "Scientific Workstation"
msgstr "��ѧ���㹤��վ"
-#~ msgid "\n"
-#~ msgstr "\n"
-
-#~ msgid "$mode: $warning"
-#~ msgstr "$mode: $warning"
-
#~ msgid ""
+#~ "The first time you try the X configuration, you may not be very "
+#~ "satisfied\n"
+#~ "with its display (screen is too small, shifted left or right...). Hence,\n"
+#~ "even if X starts up correctly, DrakX then asks you if the configuration\n"
+#~ "suits you. It will also propose to change it by displaying a list of "
+#~ "valid\n"
+#~ "modes it could find, asking you to select one.\n"
#~ "\n"
-#~ "Drakbackup activities via $net_proto:\n"
-#~ "\n"
+#~ "As a last resort, if you still cannot get X to work, choose \"Change\n"
+#~ "graphics card\", select \"Unlisted card\", and when prompted on which\n"
+#~ "server, choose \"FBDev\". This is a failsafe option which works with any\n"
+#~ "modern graphics card. Then choose \"Test again\" to be sure."
#~ msgstr ""
+#~ "�Զ����Ľ��δ������������(��Ļ̫С, ƫ���ƫ��...), ����\n"
+#~ "DrakX �����������Ƿ����. ���������г����п��õ���ʾģʽ����ѡ��.\n"
#~ "\n"
-#~ "Drakbackup ʹ�� $net_proto:\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "This level is to be used with care. It makes your system more easy to "
-#~ "use,\n"
-#~ " but very sensitive: it must not be used for a machine "
-#~ "connected to others\n"
-#~ " or to the Internet. There is no password access."
-#~ msgstr ""
-#~ "��һ����Ӧ����ʹ��. ��������ϵͳʹ�ø���, Ȼ��Ҳ������:\n"
-#~ "������̨������Ҫ��������������, ���߽��뻥����, ���Բ�Ҫ�����������. û��"
-#~ "������."
-
-#~ msgid ""
-#~ "With this security level, the use of this system as a server becomes "
-#~ "possible.\n"
-#~ " The security is now high enough to use the system as a "
-#~ "server which can accept\n"
-#~ " connections from many clients. Note: if your machine is "
-#~ "only a client on the Internet, you should choose a lower level."
-#~ msgstr ""
-#~ "�Ƽ�������ʹ�������ȫ����.\n"
-#~ "ӵ���㹻�İ�ȫ��, ϵͳ������Ϊ���������������ڶ�ͻ�������.\n"
-#~ "ע��: ������Ļ����ڻ�������ֻ��Ϊ�ͻ�, �����ѡ��ϵ͵ļ���."
-
-#~ msgid "Basic Options"
-#~ msgstr "����ѡ��"
-
-#~ msgid "Security Checks"
-#~ msgstr "��ȫ���"
+#~ "���,��� DrakX ��Ȼ�޷���ȷ����, �����\n"
+#~ "\"�ı�ͼ�ο�\",ѡ��\"������\", ��ѡ��\"FBDev\", \n"
+#~ "������Ա�֤�������ִ�ͼ�ο��Ϲ���. ѡ��\"���²���\"��ȷ��."
-#~ msgid "WARNING: $warning"
-#~ msgstr "����: : $warning"
+#~ msgid "Thank you for choosing Mandrake Linux 8.2"
+#~ msgstr "��л��ѡ�� Mandrake Linux"
-#~ msgid "$descr"
-#~ msgstr "$descr"
-
-#~ msgid "Data list to include on CDROM."
-#~ msgstr "������Ҫ�������ļ�."
-
-#~ msgid "Please choose your CD space"
-#~ msgstr "��ѡ����ʹ�õ� CD �ռ��С."
-
-#~ msgid "Please enter the cd writer speed"
-#~ msgstr "��������̻��ٶ�."
-
-#~ msgid "Please check if you want to erase your CDRW before"
-#~ msgstr "����ȷ�����Ƿ�Ҫɾ�����Ŀ���д����"
-
-#~ msgid "Please enter your CD Writer device name (ex: 0,1,0)"
-#~ msgstr "���������Ŀ��̻����豸�� (��: 0,1,0)"
-
-#~ msgid "Please check if you want to include install boot on your CD."
-#~ msgstr "��ѡ�����Ƿ�Ҫ�ڹ����ϰ�����װ����"
-
-#~ msgid "Url should begin with 'ftp:'"
-#~ msgstr "����������Ӧ������ 'ftp:'��ͷ"
-
-#~ msgid ""
-#~ "\n"
-#~ "Welcome to the Printer Setup Wizard\n"
-#~ "\n"
-#~ "This wizard will help you to install your printer(s) connected to this "
-#~ "computer.\n"
-#~ "\n"
-#~ "Please plug in your printer(s) on this computer and turn it/them on. "
-#~ "Click on \"Next\" when you are ready, and on \"Cancel\" when you do not "
-#~ "want to set up your printer(s) now.\n"
-#~ "\n"
-#~ "Note that some computers can crash during the printer auto-detection, "
-#~ "turn off \"Auto-detect printers\" to do a printer installation without "
-#~ "auto-detection. Use the \"Expert Mode\" of printerdrake when you want to "
-#~ "set up printing on a remote printer if printerdrake does not list it "
-#~ "automatically."
-#~ msgstr ""
-#~ "\n"
-#~ "��ӡ�����þ��黶ӭ��\n"
-#~ "\n"
-#~ "��������������������ӵ�������ԵĴ�ӡ��.\n"
-#~ "\n"
-#~ "��Ѵ�ӡ�����ӵ��������, �������ĵ�Դ. ׼���ú��� \"��һ��\", �����"
-#~ "�����������ô�ӡ��,����\"ȡ��\".\n"
-#~ "\n"
-#~ "ע���Զ�����ӡ���п���ʹijЩ��������,��� \"�Զ�����ӡ��\"ǰ���ѡ��"
-#~ "����Բ��Զ�������װ��ӡ��. ʹ�� \"ר��\" ģʽ, ����������û�м�⵽��Զ"
-#~ "�̴�ӡ��."
+#~ msgid "Join the Free Software world"
+#~ msgstr "������������������"
#~ msgid ""
-#~ "\n"
-#~ "try to change some parameters"
+#~ "Get to know the Open Source community and become a member. Learn, teach, "
+#~ "and help others by joining the many discussion forums that you will find "
+#~ "in our \"Community\" webpages"
#~ msgstr ""
-#~ "\n"
-#~ "���Ըı�һЩ����"
-
-#~ msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
-#~ msgstr "8514 ����ģʽ, 1024x768 at 87 Hz ����ɨ�� (no 800x600)"
-
-#~ msgid "An error occurred, try to change some parameters"
-#~ msgstr "�������������Ÿ���һЩ������ֵ"
-
-#~ msgid "An error occurred:"
-#~ msgstr "���������"
-
-#~ msgid "Auto-Detection of Printers"
-#~ msgstr "�Զ�̽���ӡ��"
+#~ "���˽⿪��Դ��, ����Ϊ������һԱ. �����ǵ�\"����\"��ҳ��ʼ, �����ڶ������"
+#~ "����������һ��, ����ѧϰ, �������"
-#~ msgid "Change Graphics card"
-#~ msgstr "�ı���ʾ��"
+#~ msgid "Internet and Messaging"
+#~ msgstr "��������ͨ��"
-#~ msgid "Change Monitor"
-#~ msgstr "�ı���ʾ���趨"
-
-#~ msgid "Change Resolution"
-#~ msgstr "�ı�ֱ���"
-
-#~ msgid "Change Server options"
-#~ msgstr "�ı����������IJ���"
-
-#~ msgid "Checking device and configuring HPOJ..."
-#~ msgstr "����豸������ HPOJ..."
-
-#~ msgid "Choose options for server"
-#~ msgstr "��ѡ�� X �������IJ���"
-
-#~ msgid "Choose the tool you want to use"
-#~ msgstr "ѡ������Ҫ�Ĺ���"
-
-#~ msgid "Configure the way the system will alert you"
-#~ msgstr "����ϵͳ�����ķ�ʽ"
-
-#~ msgid "Control Center"
-#~ msgstr "��������"
+#~ msgid "Multimedia and Graphics"
+#~ msgstr "��ý���ͼ��"
#~ msgid ""
-#~ "Description of the fields:\n"
-#~ "\n"
-#~ "Bus: this is the physical bus on which the device is plugged (eg: PCI, "
-#~ "USB, ...)\n"
-#~ "\n"
-#~ "Bus identification: \n"
-#~ "- pci devices : this list the vendor, device, subvendor and subdevice PCI "
-#~ "ids\n"
-#~ "\n"
-#~ "Description: this field describe the device\n"
-#~ "\n"
-#~ "Location on the bus: \n"
-#~ "- pci devices: this gives the PCI slot, device and function of this card\n"
-#~ "- eide devices: the device is either a slave or a master device\n"
-#~ "- scsi devices: the scsi bus and the scsi device ids\n"
-#~ "\n"
-#~ "Media class: class of hardware device\n"
-#~ "\n"
-#~ "Module: the module of the GNU/Linux kernel that handle that device\n"
-#~ "\n"
-#~ "Vendor: the vendor name of the device\n"
+#~ "Mandrake Linux 8.2 lets you push your multimedia computer to its limits! "
+#~ "Use the latest software to play music and audio files, edit and organize "
+#~ "your images and photos, watch TV and videos, and much more"
#~ msgstr ""
-#~ "���ֶ�˵��:\n"
-#~ "\n"
-#~ "����: �豸���ڵ��������� (��: PCI, USB, ...)\n"
-#~ "\n"
-#~ "���߱�ʶ: \n"
-#~ "- pci �豸 : �г�����, �豸, �ӳ���, ���豸�� PCI ��ʶ\n"
-#~ "\n"
-#~ "����: �����豸��˵��\n"
-#~ "\n"
-#~ "�����ϵ�λ��: \n"
-#~ "- pci �豸: �г� PCI ���, �豸�Լ����Ĺ���\n"
-#~ "- eide �豸: ˵���豸�����豸���豸\n"
-#~ "- scsi �豸: scsi ���ߺ� scsi �豸���\n"
-#~ "\n"
-#~ "�������: Ӳ���豸�ķ���\n"
-#~ "\n"
-#~ "ģ��: GNU/Linux �ں��п��ƴ��豸��ģ��\n"
-#~ "\n"
-#~ "����: �豸�������ҵ�����\n"
-
-#~ msgid "Extended Super VGA, 800x600 at 60 Hz, 640x480 at 72 Hz"
-#~ msgstr "��չ Super VGA, 800x600 at 60 Hz, 640x480 at 72 Hz"
+#~ "Mandrake Linux �����Ķ�ý�����������! ʹ�����µ��������������ֺ���Ƶ��"
+#~ "��,�༭����֯����ͼ�����Ƭ, �����Ӻ�ӰƬ, ���и������������"
#~ msgid ""
-#~ "For this to work for a W2K PDC, you will probably need to have the admin "
-#~ "run: C:\\>net localgroup \"Pre-Windows 2000 Compatible Access\" everyone /"
-#~ "add and reboot the server"
+#~ "Mandrake Linux 8.2 is the ultimate development platform. Discover the "
+#~ "power of the GNU gcc compiler as well as the best Open Source development "
+#~ "environments"
#~ msgstr ""
-#~ "�� Windows2000 �����ط�����, ��������Ҫ�Թ���ԱȨ��������������:\n"
-#~ "C:\\>net localgroup \"Pre-Windows 2000 Compatible Access\" everyone /add��"
-#~ "�����𶯷�����"
-
-#~ msgid "Graphics card identification: %s\n"
-#~ msgstr "��ʾ��: %s\n"
-
-#~ msgid "Graphics card not configured yet"
-#~ msgstr "��δ�����ʾ���趨"
-
-#~ msgid "High Frequency SVGA, 1024x768 at 70 Hz"
-#~ msgstr "��Ƶ�� SVGA, 1024x768 at 70 Hz"
+#~ "Mandrake Linux �����յĿ���ƽ̨. ������ GNU gcc ��������ǿ�������������"
+#~ "�Ŀ���Դ�뿪������"
#~ msgid ""
-#~ "If you wish to install less than this size,\n"
-#~ "select the percentage of packages that you want to install.\n"
-#~ "\n"
-#~ "A low percentage will install only the most important packages;\n"
-#~ "a percentage of 100%% will install all selected packages."
-#~ msgstr ""
-#~ "�������ʹ�ø��ٵĿռ�����װ, \n"
-#~ "�������װ�Ѿ�ѡ�����������İٷֱ�?\n"
-#~ "\n"
-#~ "ѡ��ϵ͵İٷֱȾ�ֻ��װ����Ҫ������; ѡ�� 100 %% �Ͱ�װ��ѡ��\n"
-#~ "ȫ������."
-
-#~ msgid "Installing HPOJ package..."
-#~ msgstr "���ڰ�װ HPOJ ���� ..."
-
-#~ msgid "Installing SANE package..."
-#~ msgstr "���ڰ�װ SANE ����..."
-
-#~ msgid "Is this the correct setting?"
-#~ msgstr "�����趨��ȷ��?"
+#~ "The Mandrake Linux 8.2 Control Center is a one-stop location for fully "
+#~ "customizing and configuring your Mandrake system"
+#~ msgstr "Mandrake Linux ��������������һ���������� Mandrake ϵͳ�ķ�������."
#~ msgid ""
-#~ "Is your printer a multi-function device from HP (OfficeJet, PSC, LaserJet "
-#~ "1100/1200/1220/3200/3300 with scanner), an HP PhotoSmart P100 or 1315 or "
-#~ "an HP LaserJet 2200?"
+#~ "Mandrake Linux 8.2 provides 11 different graphical desktop environments "
+#~ "and window managers to choose from including GNOME 1.4, KDE 2.2.2, Window "
+#~ "Maker 0.8, and the rest"
#~ msgstr ""
-#~ "���Ĵ�ӡ���Dz��� HP���յĶ๦�ܴ�ӡ�豸 (OfficeJet, PSC, ����ɨ���ǵ�"
-#~ "LaserJet 1100/1200/1220/3200/3300), HP PhotoSmart P100 �� 1315 ���� HP "
-#~ "LaserJet 2200?"
-
-#~ msgid "Leaving in %d seconds"
-#~ msgstr "(�� %d ���Ӻ��뿪)"
-
-#~ msgid "Making printer port available for CUPS..."
-#~ msgstr "Ϊ CUPS ���ô�ӡ���˿�..."
+#~ "Mandrake Linux �ṩ�� 11 �ֲ�ͬ��ͼ�����滷���ʹ��ڹ�������, ����ѡ������"
+#~ "���� GNOME, KDE, Window Maker, �ȵ�"
-#~ msgid "Monitor not configured"
-#~ msgstr "��δ�����ʾ���趨"
-
-#~ msgid "Monitor that can do 1600x1200 at 70 Hz"
-#~ msgstr "������ʾ����ʹ�� 1600x1200 at 70 Hz"
-
-#~ msgid "Monitor that can do 1600x1200 at 76 Hz"
-#~ msgstr "������ʾ����ʹ�� 1600x1200 at 76 Hz"
-
-#~ msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
-#~ msgstr "��Ƶ��, ��ߴ� 1280x1024 at 60 Hz"
-
-#~ msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
-#~ msgstr "��Ƶ��, ��ߴ� 1280x1024 at 74 Hz"
-
-#~ msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
-#~ msgstr "��Ƶ��, ��ߴ� 1280x1024 at 76 Hz"
+#~ msgid "Server Software"
+#~ msgstr "����������"
#~ msgid ""
-#~ "Network printers can only be installed after the installation. Choose "
-#~ "\"Hardware\" and then \"Printer\" in the Mandrake Control Center."
+#~ "Mandrake Linux 8.2 provides the best Open Source games - arcade, action, "
+#~ "cards, sports, strategy, ..."
#~ msgstr ""
-#~ "ֻ��ϵͳ��װ֮����ܰ�װ�����ӡ��. �� Mandrake ��������ѡ��\"Ӳ��\" Ȼ��"
-#~ "ѡ�� \"��ӡ��\"."
-
-#~ msgid "Non-Interlaced SVGA, 1024x768 at 60 Hz, 800x600 at 72 Hz"
-#~ msgstr "����ɨ�� SVGA, 1024x768 at 60 Hz, 800x600 at 72 Hz"
-
-#~ msgid "PDC Server Name"
-#~ msgstr "�����ط�������"
-
-#~ msgid "Package List to Install"
-#~ msgstr "ѡ��Ҫ��װ��������"
+#~ "Mandrake Linux ��������õĿ���Դ����Ϸ -����, ����, ֽ��, ����, ..."
-#~ msgid "Percentage of packages to install"
-#~ msgstr "Ҫ��װ�������İٷֱ�"
+#~ msgid "MandrakeCampus"
+#~ msgstr "MandrakeУ԰"
#~ msgid ""
-#~ "Please check if you want to include\n"
-#~ " install boot on your CD."
+#~ "Would you like to learn Linux simply, quickly, and for free? MandrakeSoft "
+#~ "provides free Linux training, as well as a way to test your progress, at "
+#~ "MandrakeCampus -- our online training center"
#~ msgstr ""
-#~ "��ѡ������, �����ϣ��������������\n"
-#~ "�ù��̿�������."
-
-#~ msgid "Preparing X-Window configuration"
-#~ msgstr "����׼�� X-Window ���趨"
+#~ "������, ���, ��ʡǮ��ѧϰ Linxu? MandrakeSoft �ṩ��ѵ� Linux ��ѵ, ��"
+#~ "���������Լ������İ취, ���� MandrakeУ԰ -- ���ǵ�������ѵ����"
#~ msgid ""
-#~ "Printerdrake is able to auto-detect your locally connected parallel and "
-#~ "USB printers for you, but note that on some systems the auto-detection "
-#~ "CAN FREEZE YOUR SYSTEM AND THIS CAN LEAD TO CORRUPTED FILE SYSTEMS! So do "
-#~ "it ON YOUR OWN RISK!\n"
-#~ "\n"
-#~ "Do you really want to get your printers auto-detected?"
+#~ "Quality support from the Linux Community, and from MandrakeSoft, is just "
+#~ "around the corner. And if you're already a Linux veteran, become an "
+#~ "\"Expert\" and share your knowledge at our support website"
#~ msgstr ""
-#~ "�Զ��������������ϵͳ�ķ���,\n"
-#~ "�����Զ���Ⲣ�пں� USB �˿ڵĴ�ӡ��?"
-
-#~ msgid "Resolutions not chosen yet"
-#~ msgstr "��δѡȡҪʹ�õķֱ���"
-
-#~ msgid "Scanning on your HP multi-function device"
-#~ msgstr "�������� HP �๦���豸"
-
-#~ msgid "Select a graphics card"
-#~ msgstr "��ѡ��һ����ʾ��"
-
-#~ msgid "Set up printer manually"
-#~ msgstr "�ֹ����ô�ӡ��"
-
-#~ msgid "Setting security level"
-#~ msgstr "�趨��ȫ����"
-
-#~ msgid "Show all"
-#~ msgstr "��ʾȫ��"
+#~ "���� Linux ����������֧�ַ���, ������ߵ� Mandrakeר�� -- ���ǵ�����֧����"
+#~ "��.�������ͨ Linux, ���������ǵ�\"ר��\", ��������������ľ���."
-#~ msgid "Show information"
-#~ msgstr "��ʾ������Ϣ"
-
-#~ msgid "Standard VGA, 640x480 at 60 Hz"
-#~ msgstr "��׼ VGA ģʽ, 640x480 at 60 Hz"
-
-#~ msgid "Super VGA, 1024x768 at 87 Hz interlaced, 800x600 at 56 Hz"
-#~ msgstr "Super VGA, 1024x768 at 87 Hz ����ɨ��, 800x600 at 56 Hz"
-
-#~ msgid "Super VGA, 800x600 at 56 Hz"
-#~ msgstr "Super VGA, 800x600 at 56 Hz"
-
-#~ msgid "Tamil"
-#~ msgstr "̹�׶�"
-
-#~ msgid "Test again"
-#~ msgstr "�ٴβ����趨ֵ"
-
-#~ msgid ""
-#~ "The total size for the groups you have selected is approximately %d MB.\n"
-#~ msgstr "��ѡ��������װ����Ӳ�̿ռ�ԼΪ %d MB.\n"
+#~ msgid "MandrakeConsulting"
+#~ msgstr "Mandrake����"
#~ msgid ""
-#~ "To install network printers, click \"Cancel\", switch to the \"Expert Mode"
-#~ "\", and click \"Add a new printer\" again."
+#~ "For all of your IT projects, our consultants are ready to analyze your "
+#~ "requirements and offer a customized solution. Benefit from MandrakeSoft's "
+#~ "vast experience as a Linux producer to provide a true IT alternative for "
+#~ "your business organization"
#~ msgstr ""
-#~ "Ҫ��װ�����ӡ��, ��� \"ȡ��\", �任�� \"ר��ģʽ\", Ȼ���ٴε�� \"����"
-#~ "�´�ӡ��\"."
-
-#~ msgid "Use FTP with daemon"
-#~ msgstr "ʹ�� FTP"
+#~ "���ǵĹ��ʶ�����ʱ׼��������, ��������ʵ������ IT ��Ŀ.MandrakeSoft ��"
+#~ "Ϊ Linux �ṩ�������۵ijɹ�����, �ؽ�Ϊ������ҵ�ṩ���õ� IT �������"
-#~ msgid "Use Hard Drive with daemon"
-#~ msgstr "ʹ��Ӳ��"
-
-#~ msgid "Warning: testing this graphics card may freeze your computer"
-#~ msgstr "С��! ��ʾ���IJ��Կ��ܻ��������ĵ���"
-
-#~ msgid "What do you want to do?"
-#~ msgstr "��������ô�� ?"
-
-#~ msgid "Windows PDC"
-#~ msgstr "Windows �����ط�����"
-
-#~ msgid "XFree86 server: %s"
-#~ msgstr "XFree86 ������: %s"
+#~ msgid "MandrakeStore"
+#~ msgstr "Mandrake�̳�"
#~ msgid ""
-#~ "You have space on your disk for only %d%% of these packages.\n"
-#~ "\n"
-#~ "If you wish to install less than this,\n"
-#~ "select the percentage of packages that you want to install.\n"
-#~ "A low percentage will install only the most important packages;\n"
-#~ "a percentage of %d%% will install as many packages as possible."
-#~ msgstr ""
-#~ "���Ĵ��̿ռ�ֻ����װ������Щ�������� %d%%.\n"
-#~ "��������ٰ�װһЩ, \n"
-#~ "�������װ�Ѿ�ѡ�����������İٷ�֮��?\n"
-#~ "\n"
-#~ "ѡ��ϵ͵İٷֱȾ�ֻ��װ����Ҫ������; ѡ�� %d%% �Ͱ�װ��ѡ��\n"
-#~ "ȫ������."
-
-#~ msgid "You will be able to choose them more specifically in the next step."
-#~ msgstr "����һ�������������Ը���ϸ��ѡ��"
+#~ "A full range of Linux solutions, as well as special offers on products "
+#~ "and 'goodies', are available online at our e-store"
+#~ msgstr "ȫ�׵� Linux ��Ʒ�ͷ���, �����ع���Ʒ�������, �������ǵ������̳�"
#~ msgid ""
-#~ "Your HP multi-function device was configured automatically to be able to "
-#~ "scan. Now you can scan from the command line with \"ptal-hp %s scan ..."
-#~ "\". Scanning via a graphical interface or from the GIMP is not supported "
-#~ "yet for your device. More information you will find in the \"/usr/share/"
-#~ "doc/hpoj-0.8/ptal-hp-scan.html\" file on your system. If you have an HP "
-#~ "LaserJet 1100 or 1200 you can only scan when you have the scanner option "
-#~ "installed.\n"
-#~ "\n"
-#~ "Do not use \"scannerdrake\" for this device!"
-#~ msgstr ""
-#~ "���� HP �๦���豸�Ѿ����Զ����óɿ���ɨ��.�����ڿ����������� \"ptal-hp %"
-#~ "s scan ...\". �����豸Ŀǰ�޷���ͼ�ν������ GIMP �ڽ���ɨ��. Ҫ�˽������"
-#~ "Ϣ��鿴��ϵͳ�� \"/usr/share/doc/hpoj-0.8/ptal-hp-scan.html\" �ļ�. ���"
-#~ "���� HP LaserJet 1100 �� 1200 ֻ�а�װ��ɨ�������ʱ����ɨ��.\n"
-#~ "\n"
-#~ "��Ҫ������豸����\"scannerdrake\"!"
-
-#~ msgid "fsck failed with exit code %d or signal %d"
-#~ msgstr "fsck ʧ��, �˳��� %d �� �ź� %d"
-
-#~ msgid "no serial_usb found\n"
-#~ msgstr "�Ҳ��� serial_usb\n"
-
-#~ msgid "proftpd"
-#~ msgstr "proftpd"
-
-#~ msgid "sshd"
-#~ msgstr "sshd"
-
-#~ msgid "webmin"
-#~ msgstr "webmin"
+#~ "For more information on MandrakeSoft's Professional Services and "
+#~ "commercial offerings, please see the following web page:"
+#~ msgstr "Ҫ�����˽� MandrakeSoft ��רҵ����ͺ�������, �뵽������ҳ:"
-#~ msgid "xinetd"
-#~ msgstr "xinetd"
+#~ msgid "http://www.mandrakesoft.com/sales/contact"
+#~ msgstr "http://www.mandrakesoft.com/sales/contact"