summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPablo Saratxaga <pablo@mandriva.com>2002-12-11 16:30:29 +0000
committerPablo Saratxaga <pablo@mandriva.com>2002-12-11 16:30:29 +0000
commitb0c24131955e647b816ce7905ba37421d4a34494 (patch)
tree4cb4618f23be9cfaed70595e425f79b654349c29
parentbdf9e74bdce84e9c7e35fbaf3f856acf8c4ed30b (diff)
downloaddrakx-b0c24131955e647b816ce7905ba37421d4a34494.tar
drakx-b0c24131955e647b816ce7905ba37421d4a34494.tar.gz
drakx-b0c24131955e647b816ce7905ba37421d4a34494.tar.bz2
drakx-b0c24131955e647b816ce7905ba37421d4a34494.tar.xz
drakx-b0c24131955e647b816ce7905ba37421d4a34494.zip
updated Portuguese and Chinese files
-rw-r--r--perl-install/share/po/zh_CN.po6363
1 files changed, 3586 insertions, 2777 deletions
diff --git a/perl-install/share/po/zh_CN.po b/perl-install/share/po/zh_CN.po
index a32dfd19a..9dea7c64a 100644
--- a/perl-install/share/po/zh_CN.po
+++ b/perl-install/share/po/zh_CN.po
@@ -7,9 +7,9 @@
msgid ""
msgstr ""
"Project-Id-Version: DrakX 9.0\n"
-"POT-Creation-Date: 2002-09-20 11:43+0200\n"
-"PO-Revision-Date: 2002-09-23 15:00+0800\n"
-"Last-Translator: Danny Zeng <danny@zeng.com.cn>\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\n"
+"PO-Revision-Date: 2002-12-09 00:27+0800\n"
+"Last-Translator: Funda Wang <mandrake@en2china.com>\n"
"Language-Team: Mandrake Internationalization Team <cooker-i18n@linux-"
"mandrake.com>\n"
"MIME-Version: 1.0\n"
@@ -72,44 +72,44 @@ msgstr ""
"����ϵͳ֧�ֶ���ʾ����\n"
"�Ƿ��������?"
-#: ../../Xconfig/card.pm_.c:286
+#: ../../Xconfig/card.pm_.c:288
msgid "Select the memory size of your graphics card"
msgstr "��ѡ������ʾ�����ڴ�Ĵ�С"
-#: ../../Xconfig/card.pm_.c:347
+#: ../../Xconfig/card.pm_.c:349
msgid "XFree configuration"
msgstr "XFree ����"
-#: ../../Xconfig/card.pm_.c:349
+#: ../../Xconfig/card.pm_.c:351
msgid "Which configuration of XFree do you want to have?"
msgstr "��ϣ��ӵ���ĸ� XFree ����?"
-#: ../../Xconfig/card.pm_.c:381
+#: ../../Xconfig/card.pm_.c:383
msgid "Configure all heads independently"
msgstr "������������ͷ"
-#: ../../Xconfig/card.pm_.c:382
+#: ../../Xconfig/card.pm_.c:384
msgid "Use Xinerama extension"
msgstr "ʹ�� Xinerama ��չ"
-#: ../../Xconfig/card.pm_.c:387
+#: ../../Xconfig/card.pm_.c:389
#, c-format
msgid "Configure only card \"%s\"%s"
msgstr "ֻ���á�%s��%s��"
-#: ../../Xconfig/card.pm_.c:399 ../../Xconfig/card.pm_.c:400
+#: ../../Xconfig/card.pm_.c:401 ../../Xconfig/card.pm_.c:402
#: ../../Xconfig/various.pm_.c:23
#, c-format
msgid "XFree %s"
msgstr "XFree %s"
-#: ../../Xconfig/card.pm_.c:411 ../../Xconfig/card.pm_.c:437
+#: ../../Xconfig/card.pm_.c:413 ../../Xconfig/card.pm_.c:439
#: ../../Xconfig/various.pm_.c:23
#, c-format
msgid "XFree %s with 3D hardware acceleration"
msgstr "XFree %s ����Ӳ�� 3D ���ٵ�֧��"
-#: ../../Xconfig/card.pm_.c:414
+#: ../../Xconfig/card.pm_.c:416
#, c-format
msgid ""
"Your card can have 3D hardware acceleration support but only with XFree %s.\n"
@@ -118,17 +118,17 @@ msgstr ""
"ʹ�� XFree %s, ������ʾ�����Եõ� 3D Ӳ������֧�֡�\n"
"XFree %s ֧��������ʾ��, �����ṩ���õ� 2D ֧�֡�"
-#: ../../Xconfig/card.pm_.c:416 ../../Xconfig/card.pm_.c:439
+#: ../../Xconfig/card.pm_.c:418 ../../Xconfig/card.pm_.c:441
#, c-format
msgid "Your card can have 3D hardware acceleration support with XFree %s."
msgstr "ʹ�� XFree %s, ������ʾ�����Եõ� 3D Ӳ������֧�֡�"
-#: ../../Xconfig/card.pm_.c:424 ../../Xconfig/card.pm_.c:445
+#: ../../Xconfig/card.pm_.c:426 ../../Xconfig/card.pm_.c:447
#, c-format
msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
msgstr "XFree %s ��������׶ε�3DӲ������֧��"
-#: ../../Xconfig/card.pm_.c:427
+#: ../../Xconfig/card.pm_.c:429
#, c-format
msgid ""
"Your card can have 3D hardware acceleration support but only with XFree %s,\n"
@@ -139,7 +139,7 @@ msgstr ""
"ע����������׶ε�֧��, �����ܻ�ʹ���ĵ���ʧȥ��Ӧ��\n"
"XFree %s ֧��������ʾ��, �����ṩ���õ� 2D ֧�֡�"
-#: ../../Xconfig/card.pm_.c:430 ../../Xconfig/card.pm_.c:447
+#: ../../Xconfig/card.pm_.c:432 ../../Xconfig/card.pm_.c:449
#, c-format
msgid ""
"Your card can have 3D hardware acceleration support with XFree %s,\n"
@@ -148,12 +148,12 @@ msgstr ""
"ʹ�� XFree %s, ������ʾ�����Եõ� 3D Ӳ������֧�֡�\n"
"ע����������׶ε�֧��, �����ܻ�ʹ���ĵ���ʧȥ��Ӧ��"
-#: ../../Xconfig/card.pm_.c:453
+#: ../../Xconfig/card.pm_.c:455
msgid "Xpmac (installation display driver)"
msgstr "Xpmac (��װ�Կ�����)"
#: ../../Xconfig/main.pm_.c:76 ../../Xconfig/main.pm_.c:77
-#: ../../Xconfig/monitor.pm_.c:96 ../../any.pm_.c:978
+#: ../../Xconfig/monitor.pm_.c:96 ../../any.pm_.c:961
msgid "Custom"
msgstr "����"
@@ -165,7 +165,7 @@ msgstr "ͼ�ο�"
msgid "Monitor"
msgstr "��ʾ��"
-#: ../../Xconfig/main.pm_.c:108 ../../Xconfig/resolution_and_depth.pm_.c:209
+#: ../../Xconfig/main.pm_.c:108 ../../Xconfig/resolution_and_depth.pm_.c:210
msgid "Resolution"
msgstr "��Ļ�ֱ���"
@@ -174,27 +174,28 @@ msgid "Test"
msgstr "����"
#: ../../Xconfig/main.pm_.c:118 ../../diskdrake/dav.pm_.c:67
-#: ../../diskdrake/interactive.pm_.c:385 ../../diskdrake/removable.pm_.c:25
-#: ../../diskdrake/removable_gtk.pm_.c:16 ../../diskdrake/smbnfs_gtk.pm_.c:86
+#: ../../diskdrake/interactive.pm_.c:393 ../../diskdrake/removable.pm_.c:25
+#: ../../diskdrake/smbnfs_gtk.pm_.c:86
msgid "Options"
msgstr "ѡ��"
-#: ../../Xconfig/main.pm_.c:122 ../../Xconfig/resolution_and_depth.pm_.c:268
-#: ../../install_gtk.pm_.c:79 ../../install_steps_gtk.pm_.c:275
+#: ../../Xconfig/main.pm_.c:122 ../../Xconfig/resolution_and_depth.pm_.c:269
+#: ../../install_gtk.pm_.c:86 ../../install_steps_gtk.pm_.c:274
#: ../../interactive.pm_.c:127 ../../interactive.pm_.c:142
-#: ../../interactive.pm_.c:354 ../../interactive/http.pm_.c:104
-#: ../../interactive/newt.pm_.c:195 ../../interactive/newt.pm_.c:197
+#: ../../interactive.pm_.c:345 ../../interactive/http.pm_.c:104
+#: ../../interactive/newt.pm_.c:194 ../../interactive/newt.pm_.c:196
#: ../../interactive/stdio.pm_.c:39 ../../interactive/stdio.pm_.c:143
#: ../../interactive/stdio.pm_.c:144 ../../my_gtk.pm_.c:159
-#: ../../my_gtk.pm_.c:287 ../../my_gtk.pm_.c:310 ../../security/main.pm_.c:166
-#: ../../standalone/drakbackup_.c:3974 ../../standalone/drakbackup_.c:4069
-#: ../../standalone/drakbackup_.c:4088
+#: ../../my_gtk.pm_.c:287 ../../my_gtk.pm_.c:310 ../../security/main.pm_.c:181
+#: ../../standalone/drakbackup_.c:3920 ../../standalone/drakbackup_.c:4015
+#: ../../standalone/drakbackup_.c:4034 ../../ugtk2.pm_.c:435
+#: ../../ugtk2.pm_.c:926 ../../ugtk2.pm_.c:949
msgid "Ok"
msgstr "ȷ��"
#: ../../Xconfig/main.pm_.c:122 ../../diskdrake/dav.pm_.c:28
-#: ../../harddrake/ui.pm_.c:96 ../../printerdrake.pm_.c:3207
-#: ../../standalone/draksplash_.c:122 ../../standalone/logdrake_.c:225
+#: ../../printer/printerdrake.pm_.c:2970 ../../standalone/draksplash_.c:114
+#: ../../standalone/harddrake2_.c:152 ../../standalone/logdrake_.c:204
msgid "Quit"
msgstr "�˳�"
@@ -223,7 +224,8 @@ msgstr "���弴��"
msgid "Generic"
msgstr "ͨ��"
-#: ../../Xconfig/monitor.pm_.c:99 ../../harddrake/ui.pm_.c:37
+#: ../../Xconfig/monitor.pm_.c:99 ../../standalone/harddrake2_.c:67
+#: ../../standalone/harddrake2_.c:68
msgid "Vendor"
msgstr "����"
@@ -280,50 +282,52 @@ msgstr "1 ǧ 6 ����ɫ (24 λ)"
msgid "4 billion colors (32 bits)"
msgstr "40 ��ɫ (32 λ)"
-#: ../../Xconfig/resolution_and_depth.pm_.c:129
+#: ../../Xconfig/resolution_and_depth.pm_.c:130
msgid "Resolutions"
msgstr "�ֱ���"
-#: ../../Xconfig/resolution_and_depth.pm_.c:254
+#: ../../Xconfig/resolution_and_depth.pm_.c:255
msgid "Choose the resolution and the color depth"
msgstr "ѡ����Ļ�ֱ����Լ���ɫ���"
-#: ../../Xconfig/resolution_and_depth.pm_.c:255
+#: ../../Xconfig/resolution_and_depth.pm_.c:256
#, c-format
msgid "Graphics card: %s"
msgstr "��ʾ��: %s"
-#: ../../Xconfig/resolution_and_depth.pm_.c:268 ../../any.pm_.c:1019
-#: ../../bootlook.pm_.c:344 ../../diskdrake/smbnfs_gtk.pm_.c:87
-#: ../../install_steps_gtk.pm_.c:406 ../../install_steps_gtk.pm_.c:464
-#: ../../interactive.pm_.c:142 ../../interactive.pm_.c:354
-#: ../../interactive/http.pm_.c:105 ../../interactive/newt.pm_.c:195
+#: ../../Xconfig/resolution_and_depth.pm_.c:269 ../../any.pm_.c:1001
+#: ../../bootlook.pm_.c:336 ../../diskdrake/smbnfs_gtk.pm_.c:87
+#: ../../install_steps_gtk.pm_.c:405 ../../install_steps_gtk.pm_.c:463
+#: ../../interactive.pm_.c:142 ../../interactive.pm_.c:345
+#: ../../interactive/http.pm_.c:105 ../../interactive/newt.pm_.c:194
#: ../../interactive/stdio.pm_.c:39 ../../interactive/stdio.pm_.c:143
#: ../../my_gtk.pm_.c:158 ../../my_gtk.pm_.c:162 ../../my_gtk.pm_.c:287
-#: ../../network/netconnect.pm_.c:42 ../../printerdrake.pm_.c:2169
-#: ../../security/main.pm_.c:216 ../../standalone/drakautoinst_.c:203
-#: ../../standalone/drakbackup_.c:3928 ../../standalone/drakbackup_.c:3961
-#: ../../standalone/drakbackup_.c:3987 ../../standalone/drakbackup_.c:4014
-#: ../../standalone/drakbackup_.c:4041 ../../standalone/drakbackup_.c:4101
-#: ../../standalone/drakbackup_.c:4128 ../../standalone/drakbackup_.c:4158
-#: ../../standalone/drakbackup_.c:4184 ../../standalone/drakconnect_.c:115
-#: ../../standalone/drakconnect_.c:147 ../../standalone/drakconnect_.c:289
-#: ../../standalone/drakconnect_.c:537 ../../standalone/drakconnect_.c:679
-#: ../../standalone/drakfloppy_.c:235 ../../standalone/drakfont_.c:970
-#: ../../standalone/drakgw_.c:560 ../../standalone/logdrake_.c:225
-#: ../../ugtk.pm_.c:296
+#: ../../network/netconnect.pm_.c:39 ../../printer/printerdrake.pm_.c:2055
+#: ../../security/main.pm_.c:228 ../../standalone/drakautoinst_.c:198
+#: ../../standalone/drakbackup_.c:3874 ../../standalone/drakbackup_.c:3907
+#: ../../standalone/drakbackup_.c:3933 ../../standalone/drakbackup_.c:3960
+#: ../../standalone/drakbackup_.c:3987 ../../standalone/drakbackup_.c:4047
+#: ../../standalone/drakbackup_.c:4074 ../../standalone/drakbackup_.c:4104
+#: ../../standalone/drakbackup_.c:4130 ../../standalone/drakconnect_.c:112
+#: ../../standalone/drakconnect_.c:144 ../../standalone/drakconnect_.c:286
+#: ../../standalone/drakconnect_.c:534 ../../standalone/drakconnect_.c:677
+#: ../../standalone/drakfloppy_.c:207 ../../standalone/drakfont_.c:918
+#: ../../standalone/drakgw_.c:557 ../../standalone/logdrake_.c:204
+#: ../../standalone/net_monitor_.c:337 ../../ugtk.pm_.c:295
+#: ../../ugtk2.pm_.c:362 ../../ugtk2.pm_.c:434 ../../ugtk2.pm_.c:438
+#: ../../ugtk2.pm_.c:926
msgid "Cancel"
msgstr "ȡ��"
-#: ../../Xconfig/test.pm_.c:30
+#: ../../Xconfig/test.pm_.c:29
msgid "Test of the configuration"
msgstr "�����趨ֵ"
-#: ../../Xconfig/test.pm_.c:31
+#: ../../Xconfig/test.pm_.c:30
msgid "Do you want to test the configuration?"
msgstr "����Ҫ���������趨ֵ��?"
-#: ../../Xconfig/test.pm_.c:31
+#: ../../Xconfig/test.pm_.c:30
msgid "Warning: testing this graphic card may freeze your computer"
msgstr "����: �������ͼ�ο����ܻ��������ĵ���"
@@ -423,162 +427,162 @@ msgstr ""
msgid "What norm is your TV using?"
msgstr "���ĵ����ź���ʲô��ʽ?"
-#: ../../any.pm_.c:108 ../../any.pm_.c:133
+#: ../../any.pm_.c:107 ../../any.pm_.c:132
msgid "First sector of boot partition"
msgstr "���������ĵ�һ����"
-#: ../../any.pm_.c:108 ../../any.pm_.c:133 ../../any.pm_.c:210
+#: ../../any.pm_.c:107 ../../any.pm_.c:132 ../../any.pm_.c:209
msgid "First sector of drive (MBR)"
msgstr "Ӳ�̵��������� (MBR)"
-#: ../../any.pm_.c:112
+#: ../../any.pm_.c:111
msgid "SILO Installation"
msgstr "SILO ��װ"
-#: ../../any.pm_.c:113 ../../any.pm_.c:126
+#: ../../any.pm_.c:112 ../../any.pm_.c:125
msgid "Where do you want to install the bootloader?"
msgstr "��ϣ��������������װ������?"
-#: ../../any.pm_.c:125
+#: ../../any.pm_.c:124
msgid "LILO/grub Installation"
msgstr "LILO/grub ��װ"
-#: ../../any.pm_.c:137 ../../any.pm_.c:151
+#: ../../any.pm_.c:136 ../../any.pm_.c:150
msgid "SILO"
msgstr "SILO"
-#: ../../any.pm_.c:139
+#: ../../any.pm_.c:138
msgid "LILO with text menu"
msgstr "�ı��˵� LILO"
-#: ../../any.pm_.c:140 ../../any.pm_.c:151
+#: ../../any.pm_.c:139 ../../any.pm_.c:150
msgid "LILO with graphical menu"
msgstr "ͼ�β˵� LILO"
-#: ../../any.pm_.c:143
+#: ../../any.pm_.c:142
msgid "Grub"
msgstr "Grub"
-#: ../../any.pm_.c:147
+#: ../../any.pm_.c:146
msgid "Boot from DOS/Windows (loadlin)"
-msgstr "��DOS/Windows����"
+msgstr "��DOS/Windows����(loadlin)"
-#: ../../any.pm_.c:149 ../../any.pm_.c:151
+#: ../../any.pm_.c:148 ../../any.pm_.c:150
msgid "Yaboot"
msgstr "Yaboot"
-#: ../../any.pm_.c:159 ../../any.pm_.c:190
+#: ../../any.pm_.c:158 ../../any.pm_.c:189
msgid "Bootloader main options"
msgstr "���������������Ҫѡ��"
-#: ../../any.pm_.c:160 ../../any.pm_.c:191
+#: ../../any.pm_.c:159 ../../any.pm_.c:190
msgid "Bootloader to use"
msgstr "Ҫʹ�õ�������������"
-#: ../../any.pm_.c:162
+#: ../../any.pm_.c:161
msgid "Bootloader installation"
msgstr "������������װ"
-#: ../../any.pm_.c:164 ../../any.pm_.c:193
+#: ../../any.pm_.c:163 ../../any.pm_.c:192
msgid "Boot device"
msgstr "�����豸"
-#: ../../any.pm_.c:165
+#: ../../any.pm_.c:164
msgid "Compact"
msgstr "����"
-#: ../../any.pm_.c:165
+#: ../../any.pm_.c:164
msgid "compact"
msgstr "����"
-#: ../../any.pm_.c:166 ../../any.pm_.c:291
+#: ../../any.pm_.c:165 ../../any.pm_.c:289
msgid "Video mode"
msgstr "��ʾģʽ"
-#: ../../any.pm_.c:168
+#: ../../any.pm_.c:167
msgid "Delay before booting default image"
msgstr "����Ĭ��ӳ��ǰ���ӳ�"
-#: ../../any.pm_.c:170 ../../any.pm_.c:789
+#: ../../any.pm_.c:169 ../../any.pm_.c:772
#: ../../diskdrake/smbnfs_gtk.pm_.c:179
-#: ../../install_steps_interactive.pm_.c:1097 ../../network/modem.pm_.c:48
-#: ../../printerdrake.pm_.c:865 ../../printerdrake.pm_.c:980
-#: ../../standalone/drakbackup_.c:3530 ../../standalone/drakconnect_.c:624
-#: ../../standalone/drakconnect_.c:649
+#: ../../install_steps_interactive.pm_.c:1077 ../../network/modem.pm_.c:71
+#: ../../printer/printerdrake.pm_.c:803 ../../printer/printerdrake.pm_.c:916
+#: ../../standalone/drakbackup_.c:3478 ../../standalone/drakconnect_.c:622
+#: ../../standalone/drakconnect_.c:647
msgid "Password"
msgstr "����"
-#: ../../any.pm_.c:171 ../../any.pm_.c:790
-#: ../../install_steps_interactive.pm_.c:1098
+#: ../../any.pm_.c:170 ../../any.pm_.c:773
+#: ../../install_steps_interactive.pm_.c:1078
msgid "Password (again)"
msgstr "���� (��һ��)"
-#: ../../any.pm_.c:172
+#: ../../any.pm_.c:171
msgid "Restrict command line options"
msgstr "����������ѡ��"
-#: ../../any.pm_.c:172
+#: ../../any.pm_.c:171
msgid "restrict"
msgstr "����"
-#: ../../any.pm_.c:174
+#: ../../any.pm_.c:173
msgid "Clean /tmp at each boot"
msgstr "ÿ������ʱ��� /tmp"
-#: ../../any.pm_.c:175
+#: ../../any.pm_.c:174
#, c-format
msgid "Precise RAM size if needed (found %d MB)"
msgstr "��ȷ�Ĵ洢����С (�ҵ� %dMB)"
-#: ../../any.pm_.c:177
+#: ../../any.pm_.c:176
msgid "Enable multi profiles"
msgstr "���������"
-#: ../../any.pm_.c:181
+#: ../../any.pm_.c:180
msgid "Give the ram size in MB"
msgstr "����Ϊ��λ�����ڴ��С"
-#: ../../any.pm_.c:183
+#: ../../any.pm_.c:182
msgid ""
"Option ``Restrict command line options'' is of no use without a password"
msgstr "û�п����ʹ�á��޶�������ѡ�"
-#: ../../any.pm_.c:184 ../../any.pm_.c:765
-#: ../../diskdrake/interactive.pm_.c:1195
-#: ../../install_steps_interactive.pm_.c:1092
+#: ../../any.pm_.c:183 ../../any.pm_.c:748
+#: ../../diskdrake/interactive.pm_.c:1204
+#: ../../install_steps_interactive.pm_.c:1072
msgid "Please try again"
msgstr "������һ��"
-#: ../../any.pm_.c:184 ../../any.pm_.c:765
-#: ../../install_steps_interactive.pm_.c:1092
+#: ../../any.pm_.c:183 ../../any.pm_.c:748
+#: ../../install_steps_interactive.pm_.c:1072
msgid "The passwords do not match"
msgstr "���ο����"
-#: ../../any.pm_.c:192
+#: ../../any.pm_.c:191
msgid "Init Message"
msgstr "��ʼ��Ϣ"
-#: ../../any.pm_.c:194
+#: ../../any.pm_.c:193
msgid "Open Firmware Delay"
msgstr "�򿪹̼��ӳ�"
-#: ../../any.pm_.c:195
+#: ../../any.pm_.c:194
msgid "Kernel Boot Timeout"
msgstr "����������ʱ"
-#: ../../any.pm_.c:196
+#: ../../any.pm_.c:195
msgid "Enable CD Boot?"
msgstr "���� CD ����?"
-#: ../../any.pm_.c:197
+#: ../../any.pm_.c:196
msgid "Enable OF Boot?"
msgstr "���� OF ����?"
-#: ../../any.pm_.c:198
+#: ../../any.pm_.c:197
msgid "Default OS?"
msgstr "Ĭ�ϲ���ϵͳ?"
-#: ../../any.pm_.c:232
+#: ../../any.pm_.c:231
msgid ""
"You decided to install the bootloader on a partition.\n"
"This implies you already have a bootloader on the hard drive you boot (eg: "
@@ -592,7 +596,7 @@ msgstr ""
"\n"
"��Ҫ���ĸ�Ӳ������?"
-#: ../../any.pm_.c:248
+#: ../../any.pm_.c:247
msgid ""
"Here are the entries on your boot menu so far.\n"
"You can add some more or change the existing ones."
@@ -600,148 +604,150 @@ msgstr ""
"�����˵�������������Ŀ��\n"
"���������ӻ��Ǹ����Ѵ��ڵ���Ŀ��"
-#: ../../any.pm_.c:258 ../../standalone/drakbackup_.c:1560
-#: ../../standalone/drakbackup_.c:1673 ../../standalone/drakfont_.c:1011
-#: ../../standalone/drakfont_.c:1054
+#: ../../any.pm_.c:257 ../../standalone/drakbackup_.c:1531
+#: ../../standalone/drakbackup_.c:1644 ../../standalone/drakfont_.c:953
+#: ../../standalone/drakfont_.c:996
msgid "Add"
msgstr "����"
-#: ../../any.pm_.c:258 ../../any.pm_.c:777 ../../diskdrake/dav.pm_.c:68
-#: ../../diskdrake/hd_gtk.pm_.c:153 ../../diskdrake/removable.pm_.c:27
+#: ../../any.pm_.c:257 ../../any.pm_.c:760 ../../diskdrake/dav.pm_.c:68
+#: ../../diskdrake/hd_gtk.pm_.c:156 ../../diskdrake/removable.pm_.c:27
#: ../../diskdrake/smbnfs_gtk.pm_.c:88 ../../interactive/http.pm_.c:153
-#: ../../printerdrake.pm_.c:3207 ../../standalone/drakbackup_.c:2774
+#: ../../printer/printerdrake.pm_.c:2970 ../../standalone/drakbackup_.c:2726
msgid "Done"
msgstr "���"
-#: ../../any.pm_.c:258
+#: ../../any.pm_.c:257
msgid "Modify"
msgstr "�޸�"
-#: ../../any.pm_.c:266
+#: ../../any.pm_.c:265
msgid "Which type of entry do you want to add?"
msgstr "Ҫ���ӵ���Ŀ��ʲô����?"
-#: ../../any.pm_.c:267 ../../standalone/drakbackup_.c:1707
+#: ../../any.pm_.c:266 ../../standalone/drakbackup_.c:1674
msgid "Linux"
msgstr "Linux"
-#: ../../any.pm_.c:267
+#: ../../any.pm_.c:266
msgid "Other OS (SunOS...)"
msgstr "��������ϵͳ (SunOS...)"
-#: ../../any.pm_.c:268
+#: ../../any.pm_.c:267
msgid "Other OS (MacOS...)"
msgstr "��������ϵͳ (MacOS...)"
-#: ../../any.pm_.c:268
+#: ../../any.pm_.c:267
msgid "Other OS (windows...)"
msgstr "��������ϵͳ (windows...)"
-#: ../../any.pm_.c:287
+#: ../../any.pm_.c:285
msgid "Image"
msgstr "ӳ���ļ�"
-#: ../../any.pm_.c:288 ../../any.pm_.c:299
+#: ../../any.pm_.c:286 ../../any.pm_.c:297
msgid "Root"
msgstr "��Ŀ¼"
-#: ../../any.pm_.c:289 ../../any.pm_.c:317
+#: ../../any.pm_.c:287 ../../any.pm_.c:315
msgid "Append"
msgstr "����"
-#: ../../any.pm_.c:293
+#: ../../any.pm_.c:291
msgid "Initrd"
msgstr "Initrd"
-#: ../../any.pm_.c:294
+#: ../../any.pm_.c:292
msgid "Read-write"
msgstr "�ɶ�д"
-#: ../../any.pm_.c:301
+#: ../../any.pm_.c:299
msgid "Table"
msgstr "����"
-#: ../../any.pm_.c:302
+#: ../../any.pm_.c:300
msgid "Unsafe"
msgstr "����ȫ"
-#: ../../any.pm_.c:309 ../../any.pm_.c:314 ../../any.pm_.c:316
+#: ../../any.pm_.c:307 ../../any.pm_.c:312 ../../any.pm_.c:314
msgid "Label"
msgstr "��ǩ"
-#: ../../any.pm_.c:311 ../../any.pm_.c:321 ../../harddrake/v4l.pm_.c:200
+#: ../../any.pm_.c:309 ../../any.pm_.c:319 ../../harddrake/v4l.pm_.c:215
msgid "Default"
msgstr "Ĭ��"
-#: ../../any.pm_.c:318
+#: ../../any.pm_.c:316
msgid "Initrd-size"
msgstr "Initrd ��С"
-#: ../../any.pm_.c:320
+#: ../../any.pm_.c:318
msgid "NoVideo"
msgstr "����Ƶ"
-#: ../../any.pm_.c:328
+#: ../../any.pm_.c:326
msgid "Remove entry"
msgstr "ɾ����Ŀ"
-#: ../../any.pm_.c:331
+#: ../../any.pm_.c:329
msgid "Empty label not allowed"
msgstr "��ǩ����Ϊ��"
-#: ../../any.pm_.c:332
+#: ../../any.pm_.c:330
msgid "You must specify a kernel image"
msgstr "������ָ��һ���ں�ӳ��"
-#: ../../any.pm_.c:332
+#: ../../any.pm_.c:330
msgid "You must specify a root partition"
msgstr "������ָ����Ŀ¼���ڷ���"
-#: ../../any.pm_.c:333
+#: ../../any.pm_.c:331
msgid "This label is already used"
msgstr "��������Ѿ���ʹ��"
-#: ../../any.pm_.c:657
+#: ../../any.pm_.c:640
#, c-format
msgid "Found %s %s interfaces"
msgstr "�ҵ� %s %s �ӿ�"
-#: ../../any.pm_.c:658
+#: ../../any.pm_.c:641
msgid "Do you have another one?"
msgstr "������������?"
-#: ../../any.pm_.c:659
+#: ../../any.pm_.c:642
#, c-format
msgid "Do you have any %s interfaces?"
msgstr "���������� %s �ӿ���?"
-#: ../../any.pm_.c:661 ../../any.pm_.c:824 ../../interactive.pm_.c:132
-#: ../../my_gtk.pm_.c:286
+#: ../../any.pm_.c:644 ../../any.pm_.c:807 ../../interactive.pm_.c:132
+#: ../../my_gtk.pm_.c:286 ../../ugtk2.pm_.c:925
msgid "No"
msgstr "��"
-#: ../../any.pm_.c:661 ../../any.pm_.c:823 ../../interactive.pm_.c:132
-#: ../../my_gtk.pm_.c:286
+#: ../../any.pm_.c:644 ../../any.pm_.c:806 ../../interactive.pm_.c:132
+#: ../../my_gtk.pm_.c:286 ../../standalone/drakgw_.c:258
+#: ../../standalone/drakgw_.c:259 ../../standalone/drakgw_.c:267
+#: ../../standalone/drakgw_.c:277 ../../ugtk2.pm_.c:925
msgid "Yes"
msgstr "��"
-#: ../../any.pm_.c:662
+#: ../../any.pm_.c:645
msgid "See hardware info"
msgstr "�鿴Ӳ����Ϣ"
#. -PO: the first %s is the card type (scsi, network, sound,...)
#. -PO: the second is the vendor+model name
-#: ../../any.pm_.c:678
+#: ../../any.pm_.c:662
#, c-format
msgid "Installing driver for %s card %s"
msgstr "���ڰ�װ %s �� %s ����������"
-#: ../../any.pm_.c:679
+#: ../../any.pm_.c:663
#, c-format
msgid "(module %s)"
msgstr "(ģ�� %s)"
-#: ../../any.pm_.c:690
+#: ../../any.pm_.c:674
#, c-format
msgid ""
"You may now provide its options to module %s.\n"
@@ -750,7 +756,7 @@ msgstr ""
"�����ڿ����ṩģ�� %s �IJ�����\n"
"ע��Ҫ�����ڴ��ַ��ʹ�� 0x ǰ׺, �硰0x123��"
-#: ../../any.pm_.c:696
+#: ../../any.pm_.c:680
#, c-format
msgid ""
"You may now provide options to module %s.\n"
@@ -761,17 +767,17 @@ msgstr ""
"ѡ��ĸ�ʽ�ǡ�name=value name2=value2...��\n"
"����,��io=0x300 irq=7��"
-#: ../../any.pm_.c:698
+#: ../../any.pm_.c:682
msgid "Module options:"
msgstr "ģ�����:"
#. -PO: the %s is the driver type (scsi, network, sound,...)
-#: ../../any.pm_.c:710
+#: ../../any.pm_.c:694
#, c-format
msgid "Which %s driver should I try?"
msgstr "����ʹ���ĸ� %s ��������?"
-#: ../../any.pm_.c:719
+#: ../../any.pm_.c:703
#, c-format
msgid ""
"In some cases, the %s driver needs to have extra information to work\n"
@@ -787,15 +793,15 @@ msgstr ""
"ȷ����Ҫ����Ϣ��ż���ᷢ��������̽����ֹͣ��Ӧ, �����ⲻ����ʲô. \n"
"���������"
-#: ../../any.pm_.c:723
+#: ../../any.pm_.c:707
msgid "Autoprobe"
msgstr "�Զ�̽��"
-#: ../../any.pm_.c:723
+#: ../../any.pm_.c:707
msgid "Specify options"
msgstr "ָ��ѡ��"
-#: ../../any.pm_.c:735
+#: ../../any.pm_.c:719
#, c-format
msgid ""
"Loading module %s failed.\n"
@@ -804,61 +810,61 @@ msgstr ""
"ģ�� %s ����ʧ�ܡ�\n"
"��Ҫ���������IJ�����?"
-#: ../../any.pm_.c:751
+#: ../../any.pm_.c:734
msgid "access to X programs"
msgstr "����ʹ�� X Ӧ�ó���"
-#: ../../any.pm_.c:752
+#: ../../any.pm_.c:735
msgid "access to rpm tools"
msgstr "����ʹ�� rpm ����"
-#: ../../any.pm_.c:753
+#: ../../any.pm_.c:736
msgid "allow \"su\""
msgstr "����ʹ�á�su��ָ��"
-#: ../../any.pm_.c:754
+#: ../../any.pm_.c:737
msgid "access to administrative files"
msgstr "��������ϵͳ�����ļ�"
-#: ../../any.pm_.c:755
+#: ../../any.pm_.c:738
msgid "access to network tools"
msgstr "����ʹ�����繤��"
-#: ../../any.pm_.c:756
+#: ../../any.pm_.c:739
msgid "access to compilation tools"
msgstr "����ʹ�ñ��빤��"
-#: ../../any.pm_.c:761
+#: ../../any.pm_.c:744
#, c-format
msgid "(already added %s)"
msgstr "(�Ѿ������� %s)"
-#: ../../any.pm_.c:766
+#: ../../any.pm_.c:749
msgid "This password is too simple"
msgstr "����̫��"
-#: ../../any.pm_.c:767
+#: ../../any.pm_.c:750
msgid "Please give a user name"
msgstr "������û���"
-#: ../../any.pm_.c:768
+#: ../../any.pm_.c:751
msgid ""
"The user name must contain only lower cased letters, numbers, `-' and `_'"
msgstr "�û���ֻ����Сд��ĸ������,��-���͡�_��"
-#: ../../any.pm_.c:769
+#: ../../any.pm_.c:752
msgid "The user name is too long"
msgstr "���û���̫��"
-#: ../../any.pm_.c:770
+#: ../../any.pm_.c:753
msgid "This user name is already added"
msgstr "���û����Ѿ�����"
-#: ../../any.pm_.c:774
+#: ../../any.pm_.c:757
msgid "Add user"
msgstr "�������û�"
-#: ../../any.pm_.c:775
+#: ../../any.pm_.c:758
#, c-format
msgid ""
"Enter a user\n"
@@ -867,32 +873,32 @@ msgstr ""
"������һ���û���\n"
"%s"
-#: ../../any.pm_.c:776
+#: ../../any.pm_.c:759
msgid "Accept user"
msgstr "���ܸ��û�"
-#: ../../any.pm_.c:787
+#: ../../any.pm_.c:770
msgid "Real name"
msgstr "�û���ʵ����"
-#: ../../any.pm_.c:788 ../../printerdrake.pm_.c:864
-#: ../../printerdrake.pm_.c:979
+#: ../../any.pm_.c:771 ../../printer/printerdrake.pm_.c:802
+#: ../../printer/printerdrake.pm_.c:915
msgid "User name"
msgstr "�û���¼��"
-#: ../../any.pm_.c:791
+#: ../../any.pm_.c:774
msgid "Shell"
msgstr "Shell"
-#: ../../any.pm_.c:793
+#: ../../any.pm_.c:776
msgid "Icon"
msgstr "ͼ��"
-#: ../../any.pm_.c:820
+#: ../../any.pm_.c:803
msgid "Autologin"
msgstr "�Զ���¼"
-#: ../../any.pm_.c:821
+#: ../../any.pm_.c:804
msgid ""
"I can set up your computer to automatically log on one user.\n"
"Do you want to use this feature?"
@@ -900,19 +906,19 @@ msgstr ""
"�������������趨����ʱ�Զ���ij�û������ݵ���ϵͳ��\n"
"��ϣ��ʹ�����������?"
-#: ../../any.pm_.c:825
+#: ../../any.pm_.c:808
msgid "Choose the default user:"
msgstr "ѡ��Ĭ�ϵ��û�:"
-#: ../../any.pm_.c:826
+#: ../../any.pm_.c:809
msgid "Choose the window manager to run:"
msgstr "ѡ��Ҫ���еĴ��ڹ�������:"
-#: ../../any.pm_.c:841
+#: ../../any.pm_.c:824
msgid "Please choose a language to use."
msgstr "��ѡ��ϵͳĬ��ʹ�õ����ԡ�"
-#: ../../any.pm_.c:843
+#: ../../any.pm_.c:826
msgid ""
"Mandrake Linux can support multiple languages. Select\n"
"the languages you would like to install. They will be available\n"
@@ -921,35 +927,35 @@ msgstr ""
"Mandrake Linux ����֧�ֶ������ԡ���ѡ������Ҫ��װ�����ԡ�\n"
"��װ��ɲ���������ϵͳ�����ǾͿ���ʹ�á�"
-#: ../../any.pm_.c:857 ../../install_steps_interactive.pm_.c:690
-#: ../../standalone/drakxtv_.c:73
+#: ../../any.pm_.c:840 ../../install_steps_interactive.pm_.c:697
+#: ../../standalone/drakxtv_.c:70
msgid "All"
msgstr "ȫ��"
-#: ../../any.pm_.c:978
+#: ../../any.pm_.c:961
msgid "Allow all users"
msgstr "���������û�ʹ��"
-#: ../../any.pm_.c:978
+#: ../../any.pm_.c:961
msgid "No sharing"
msgstr "��ֹ����"
-#: ../../any.pm_.c:988 ../../install_any.pm_.c:1199 ../../standalone.pm_.c:66
+#: ../../any.pm_.c:971 ../../install_any.pm_.c:1207 ../../standalone.pm_.c:185
#, c-format
msgid "The package %s needs to be installed. Do you want to install it?"
msgstr "��Ҫ��װ������ %s����ͬ�ⰲװ��?"
-#: ../../any.pm_.c:991
+#: ../../any.pm_.c:973
msgid ""
"You can export using NFS or Samba. Please select which you'd like to use."
msgstr "������ͨ�� NFS �� Samba �������ļ�����ϣ��ʹ����һ��? "
-#: ../../any.pm_.c:999 ../../install_any.pm_.c:1204 ../../standalone.pm_.c:71
+#: ../../any.pm_.c:981 ../../install_any.pm_.c:1212 ../../standalone.pm_.c:190
#, c-format
msgid "Mandatory package %s is missing"
msgstr "�޷��ҵ������������ %s"
-#: ../../any.pm_.c:1005
+#: ../../any.pm_.c:987
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 "
@@ -961,11 +967,11 @@ msgstr ""
"������ѡ������, �û��������� KDE �� Gnome ���ļ��������е�����������˵���\n"
"�����ơ��������ղ�ͬ�û�ϸ�����á�\n"
-#: ../../any.pm_.c:1019
+#: ../../any.pm_.c:1001
msgid "Launch userdrake"
msgstr "���� Userdrake"
-#: ../../any.pm_.c:1021
+#: ../../any.pm_.c:1003
msgid ""
"The per-user sharing uses the group \"fileshare\". \n"
"You can use userdrake to add a user in this group."
@@ -973,31 +979,31 @@ msgstr ""
"���û��Ĺ���ʹ���顰fileshare����\n"
"������ʹ�� userdrake ����һ���û�������顣"
-#: ../../any.pm_.c:1072
+#: ../../any.pm_.c:1053 ../../security/level.pm_.c:7
msgid "Welcome To Crackers"
msgstr "��ӭ������"
-#: ../../any.pm_.c:1073
+#: ../../any.pm_.c:1054 ../../security/level.pm_.c:8
msgid "Poor"
msgstr "��"
-#: ../../any.pm_.c:1074 ../../mouse.pm_.c:31
+#: ../../any.pm_.c:1055 ../../mouse.pm_.c:31 ../../security/level.pm_.c:9
msgid "Standard"
msgstr "��׼"
-#: ../../any.pm_.c:1075
+#: ../../any.pm_.c:1056 ../../security/level.pm_.c:10
msgid "High"
msgstr "��"
-#: ../../any.pm_.c:1076
+#: ../../any.pm_.c:1057 ../../security/level.pm_.c:11
msgid "Higher"
msgstr "����"
-#: ../../any.pm_.c:1077
+#: ../../any.pm_.c:1058 ../../security/level.pm_.c:12
msgid "Paranoid"
msgstr "����"
-#: ../../any.pm_.c:1080
+#: ../../any.pm_.c:1061
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"
@@ -1007,13 +1013,13 @@ msgstr ""
"������̨������Ҫ�����������������߽��뻥����, ���Բ�Ҫ�����������\n"
"��������������Ŀ�����Ҳû�С�"
-#: ../../any.pm_.c:1083
+#: ../../any.pm_.c:1064
msgid ""
"Password are now enabled, but use as a networked computer is still not "
"recommended."
msgstr "�����˿����鹦�ܡ������Բ��������������ĵ��ԡ�"
-#: ../../any.pm_.c:1084
+#: ../../any.pm_.c:1065
msgid ""
"This is the standard security recommended for a computer that will be used "
"to connect to the Internet as a client."
@@ -1021,13 +1027,13 @@ msgstr ""
"��׼��ȫ����: \n"
"�Ƽ�����Ϊ�ͻ����ӻ������ĵ�����ʹ�á�"
-#: ../../any.pm_.c:1085
+#: ../../any.pm_.c:1066
msgid ""
"There are already some restrictions, and more automatic checks are run every "
"night."
msgstr "������ijЩ����, ÿ��ҹ���Զ�ִ�и����顣"
-#: ../../any.pm_.c:1086
+#: ../../any.pm_.c:1067
msgid ""
"With this security level, the use of this system as a server becomes "
"possible.\n"
@@ -1040,7 +1046,7 @@ msgstr ""
"ӵ���㹻�İ�ȫ��, ϵͳ������Ϊ���������������ڶ�ͻ������ӡ�ע��: ������Ļ�"
"�����ڻ��������ṩ����, ��ѡ��һ���ϵͼ���"
-#: ../../any.pm_.c:1089
+#: ../../any.pm_.c:1070
msgid ""
"This is similar to the previous level, but the system is entirely closed and "
"security features are at their maximum."
@@ -1048,32 +1054,32 @@ msgstr ""
"������ǰһ��ȫ����, ����ϵͳ������ȫ���״̬��\n"
"���а�ȫ���Դﵽ����޶ȡ�"
-#: ../../any.pm_.c:1095
+#: ../../any.pm_.c:1076
msgid "DrakSec Basic Options"
msgstr "DrakSec ����ѡ��"
-#: ../../any.pm_.c:1096
+#: ../../any.pm_.c:1077
msgid "Please choose the desired security level"
msgstr "��ѡ�������İ�ȫ����"
-#: ../../any.pm_.c:1099
+#: ../../any.pm_.c:1080
msgid "Security level"
msgstr "��ȫ����"
-#: ../../any.pm_.c:1101
+#: ../../any.pm_.c:1082
msgid "Use libsafe for servers"
msgstr "������ʹ�� libsafe"
-#: ../../any.pm_.c:1102
+#: ../../any.pm_.c:1083
msgid ""
"A library which defends against buffer overflow and format string attacks."
msgstr "��ֹ��������ʹ���ʽ�����Ŀ⡣"
-#: ../../any.pm_.c:1103
+#: ../../any.pm_.c:1084
msgid "Security Administrator (login or email)"
msgstr "��ȫ����Ա (��¼���� email)"
-#: ../../any.pm_.c:1192
+#: ../../any.pm_.c:1166
msgid ""
"Here you can choose the key or key combination that will \n"
"allow switching between the different keyboard layouts\n"
@@ -1084,7 +1090,7 @@ msgstr ""
"(����, Ӣ�ĺ�����)"
#. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#: ../../bootloader.pm_.c:429
+#: ../../bootloader.pm_.c:436
#, c-format
msgid ""
"Welcome to %s the operating system chooser!\n"
@@ -1101,114 +1107,109 @@ 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:989
+#: ../../bootloader.pm_.c:983
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:992
+#: ../../bootloader.pm_.c:986
#, 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:995
+#: ../../bootloader.pm_.c:989
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:998
+#: ../../bootloader.pm_.c:992
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:1001
+#: ../../bootloader.pm_.c:995
#, 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:1005
+#: ../../bootloader.pm_.c:999
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:1105
+#: ../../bootloader.pm_.c:1099
msgid "Desktop"
msgstr "Desktop"
#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../bootloader.pm_.c:1107
+#: ../../bootloader.pm_.c:1101
msgid "Start Menu"
msgstr "Start Menu"
-#: ../../bootloader.pm_.c:1126
+#: ../../bootloader.pm_.c:1120
#, c-format
msgid "You can't install the bootloader on a %s partition\n"
msgstr "%s �������ܰ�װ������������\n"
-#: ../../bootlook.pm_.c:46 ../../standalone/drakperm_.c:15
-#: ../../standalone/draksplash_.c:26
-msgid "no help implemented yet.\n"
-msgstr "��������δʵ�֡�\n"
-
-#: ../../bootlook.pm_.c:62
+#: ../../bootlook.pm_.c:53
msgid "Boot Style Configuration"
msgstr "������ʽ����"
-#: ../../bootlook.pm_.c:79 ../../harddrake/ui.pm_.c:62
-#: ../../harddrake/ui.pm_.c:63 ../../standalone/drakfloppy_.c:82
-#: ../../standalone/logdrake_.c:102
+#: ../../bootlook.pm_.c:70 ../../standalone/drakfloppy_.c:54
+#: ../../standalone/harddrake2_.c:81 ../../standalone/harddrake2_.c:82
+#: ../../standalone/logdrake_.c:74
msgid "/_File"
msgstr "/�ļ�(_F)"
-#: ../../bootlook.pm_.c:80 ../../standalone/drakfloppy_.c:83
-#: ../../standalone/logdrake_.c:108
+#: ../../bootlook.pm_.c:71 ../../standalone/drakfloppy_.c:55
+#: ../../standalone/logdrake_.c:80
msgid "/File/_Quit"
msgstr "/�ļ�/�˳�(_Q)"
-#: ../../bootlook.pm_.c:80 ../../harddrake/ui.pm_.c:63
-#: ../../standalone/drakfloppy_.c:83 ../../standalone/logdrake_.c:108
+#: ../../bootlook.pm_.c:71 ../../standalone/drakfloppy_.c:55
+#: ../../standalone/harddrake2_.c:82 ../../standalone/logdrake_.c:80
msgid "<control>Q"
msgstr "<control>Q"
-#: ../../bootlook.pm_.c:91
+#: ../../bootlook.pm_.c:82
msgid "NewStyle Categorizing Monitor"
msgstr "������ʾ��"
-#: ../../bootlook.pm_.c:92
+#: ../../bootlook.pm_.c:83
msgid "NewStyle Monitor"
msgstr "������ʾ��"
-#: ../../bootlook.pm_.c:93
+#: ../../bootlook.pm_.c:84
msgid "Traditional Monitor"
msgstr "��ͳ��ʾ��"
-#: ../../bootlook.pm_.c:94
+#: ../../bootlook.pm_.c:85
msgid "Traditional Gtk+ Monitor"
msgstr "��ͳGtk+��ʾ��"
-#: ../../bootlook.pm_.c:95
+#: ../../bootlook.pm_.c:86
msgid "Launch Aurora at boot time"
msgstr "����ʱ����Aurora"
-#: ../../bootlook.pm_.c:98
+#: ../../bootlook.pm_.c:89
msgid "Lilo/grub mode"
msgstr "Lilo/grubģʽ"
-#: ../../bootlook.pm_.c:98
+#: ../../bootlook.pm_.c:89
msgid "Yaboot mode"
msgstr "Yabootģʽ"
-#: ../../bootlook.pm_.c:146
+#: ../../bootlook.pm_.c:138
msgid "Install themes"
msgstr "��װ����"
-#: ../../bootlook.pm_.c:147
+#: ../../bootlook.pm_.c:139
msgid ""
"Display theme\n"
"under console"
@@ -1216,46 +1217,46 @@ msgstr ""
"����̨��\n"
"��ʾ����"
-#: ../../bootlook.pm_.c:148
+#: ../../bootlook.pm_.c:140
msgid "Create new theme"
msgstr "�����µ�����"
-#: ../../bootlook.pm_.c:192
+#: ../../bootlook.pm_.c:184
#, c-format
msgid "Backup %s to %s.old"
msgstr "�� %s ���ݵ� %s.old"
-#: ../../bootlook.pm_.c:195
+#: ../../bootlook.pm_.c:187
#, c-format
msgid "Copy %s to %s"
msgstr "�� %s ���Ƶ� %s"
-#: ../../bootlook.pm_.c:200 ../../bootlook.pm_.c:230 ../../bootlook.pm_.c:232
-#: ../../bootlook.pm_.c:242 ../../bootlook.pm_.c:251 ../../bootlook.pm_.c:258
-#: ../../diskdrake/dav.pm_.c:77 ../../diskdrake/hd_gtk.pm_.c:116
-#: ../../diskdrake/interactive.pm_.c:213 ../../diskdrake/interactive.pm_.c:344
-#: ../../diskdrake/interactive.pm_.c:359 ../../diskdrake/interactive.pm_.c:473
-#: ../../diskdrake/interactive.pm_.c:478 ../../diskdrake/smbnfs_gtk.pm_.c:45
+#: ../../bootlook.pm_.c:192 ../../bootlook.pm_.c:222 ../../bootlook.pm_.c:224
+#: ../../bootlook.pm_.c:234 ../../bootlook.pm_.c:243 ../../bootlook.pm_.c:250
+#: ../../diskdrake/dav.pm_.c:77 ../../diskdrake/hd_gtk.pm_.c:119
+#: ../../diskdrake/interactive.pm_.c:216 ../../diskdrake/interactive.pm_.c:352
+#: ../../diskdrake/interactive.pm_.c:367 ../../diskdrake/interactive.pm_.c:481
+#: ../../diskdrake/interactive.pm_.c:486 ../../diskdrake/smbnfs_gtk.pm_.c:45
#: ../../fsedit.pm_.c:239 ../../install_steps.pm_.c:75
#: ../../install_steps_interactive.pm_.c:67 ../../interactive/http.pm_.c:119
-#: ../../interactive/http.pm_.c:120 ../../standalone/draksplash_.c:34
+#: ../../interactive/http.pm_.c:120 ../../standalone/draksplash_.c:21
msgid "Error"
msgstr "����"
-#: ../../bootlook.pm_.c:200
+#: ../../bootlook.pm_.c:192
msgid "Lilo message not found"
msgstr "û���ҵ� LILO ��Ϣ"
-#: ../../bootlook.pm_.c:230
+#: ../../bootlook.pm_.c:222
msgid "Can't write /etc/sysconfig/bootsplash."
msgstr "�޷�д�� /etc/sysconfig/bootsplash��"
-#: ../../bootlook.pm_.c:230
+#: ../../bootlook.pm_.c:222
#, c-format
msgid "Write %s"
msgstr "� %s"
-#: ../../bootlook.pm_.c:232
+#: ../../bootlook.pm_.c:224
msgid ""
"Can't write /etc/sysconfig/bootsplash\n"
"File not found."
@@ -1263,17 +1264,17 @@ msgstr ""
"�޷�д�� /etc/sysconfig/bootsplash��\n"
"û���ҵ��ļ���"
-#: ../../bootlook.pm_.c:243
+#: ../../bootlook.pm_.c:235
#, c-format
msgid "Can't launch mkinitrd -f /boot/initrd-%s.img %s."
msgstr "�޷��� mkinitrd -f /boot/initrd-%s.img %s��"
-#: ../../bootlook.pm_.c:246
+#: ../../bootlook.pm_.c:238
#, c-format
msgid "Make initrd 'mkinitrd -f /boot/initrd-%s.img %s'."
msgstr "���� initrd 'mkinitrd -f /boot/initrd-%s.img %s'��"
-#: ../../bootlook.pm_.c:252
+#: ../../bootlook.pm_.c:244
msgid ""
"Can't relaunch LiLo!\n"
"Launch \"lilo\" as root in command line to complete LiLo theme installation."
@@ -1281,24 +1282,24 @@ msgstr ""
"�޷��������� LiLo!\n"
"�� root �������С�lilo������, ����� LiLo ���ⰲװ��"
-#: ../../bootlook.pm_.c:256
+#: ../../bootlook.pm_.c:248
msgid "Relaunch 'lilo'"
msgstr "����������lilo��"
-#: ../../bootlook.pm_.c:258 ../../standalone/draksplash_.c:165
-#: ../../standalone/draksplash_.c:329 ../../standalone/draksplash_.c:456
+#: ../../bootlook.pm_.c:250 ../../standalone/draksplash_.c:156
+#: ../../standalone/draksplash_.c:321 ../../standalone/draksplash_.c:449
msgid "Notice"
msgstr "ע��"
-#: ../../bootlook.pm_.c:259
+#: ../../bootlook.pm_.c:251
msgid "LiLo and Bootsplash themes installation successfull"
msgstr "LiLo �� Bootsplash ���ⰲװ�ɹ�"
-#: ../../bootlook.pm_.c:259
+#: ../../bootlook.pm_.c:251
msgid "Theme installation failed!"
msgstr "���ⰲװʧ��!"
-#: ../../bootlook.pm_.c:267
+#: ../../bootlook.pm_.c:259
#, c-format
msgid ""
"You are currently using %s as your boot manager.\n"
@@ -1307,21 +1308,21 @@ msgstr ""
"��Ŀǰʹ�� %s ��Ϊ���������������\n"
"��������á���ť���������򵼡�"
-#: ../../bootlook.pm_.c:269 ../../standalone/drakbackup_.c:2429
-#: ../../standalone/drakbackup_.c:2439 ../../standalone/drakbackup_.c:2449
-#: ../../standalone/drakbackup_.c:2457 ../../standalone/drakgw_.c:554
+#: ../../bootlook.pm_.c:261 ../../standalone/drakbackup_.c:2380
+#: ../../standalone/drakbackup_.c:2390 ../../standalone/drakbackup_.c:2400
+#: ../../standalone/drakbackup_.c:2408 ../../standalone/drakgw_.c:551
msgid "Configure"
msgstr "����"
-#: ../../bootlook.pm_.c:276
+#: ../../bootlook.pm_.c:268
msgid "Splash selection"
msgstr "ѡ����������"
-#: ../../bootlook.pm_.c:279
+#: ../../bootlook.pm_.c:271
msgid "Themes"
msgstr "����"
-#: ../../bootlook.pm_.c:281
+#: ../../bootlook.pm_.c:273
msgid ""
"\n"
"Select theme for\n"
@@ -1333,89 +1334,84 @@ msgstr ""
"ѡ������ lilo �� bootsplash ������,\n"
"�����Էֱ�ѡ��"
-#: ../../bootlook.pm_.c:284
+#: ../../bootlook.pm_.c:276
msgid "Lilo screen"
msgstr "Lilo ��Ļ"
-#: ../../bootlook.pm_.c:289
+#: ../../bootlook.pm_.c:281
msgid "Bootsplash"
msgstr "Bootsplash ��������"
-#: ../../bootlook.pm_.c:324
+#: ../../bootlook.pm_.c:316
msgid "System mode"
msgstr "ϵͳģʽ"
-#: ../../bootlook.pm_.c:326
+#: ../../bootlook.pm_.c:318
msgid "Launch the graphical environment when your system starts"
msgstr "ϵͳ����ʱװ��ͼ�λ���"
-#: ../../bootlook.pm_.c:331
+#: ../../bootlook.pm_.c:323
msgid "No, I don't want autologin"
msgstr "��, ��Ҫ�Զ�¼��"
-#: ../../bootlook.pm_.c:333
+#: ../../bootlook.pm_.c:325
msgid "Yes, I want autologin with this (user, desktop)"
msgstr "��, ��(�û�,����)¼��"
-#: ../../bootlook.pm_.c:343 ../../network/netconnect.pm_.c:97
-#: ../../standalone/drakTermServ_.c:173 ../../standalone/drakTermServ_.c:300
-#: ../../standalone/drakTermServ_.c:405 ../../standalone/drakbackup_.c:4193
-#: ../../standalone/drakbackup_.c:4956 ../../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/drakfont_.c:612 ../../standalone/drakfont_.c:799
-#: ../../standalone/drakfont_.c:876 ../../standalone/drakfont_.c:963
-#: ../../ugtk.pm_.c:289
+#: ../../bootlook.pm_.c:335 ../../network/netconnect.pm_.c:96
+#: ../../standalone/drakTermServ_.c:222 ../../standalone/drakTermServ_.c:355
+#: ../../standalone/drakbackup_.c:4139 ../../standalone/drakbackup_.c:4797
+#: ../../standalone/drakconnect_.c:105 ../../standalone/drakconnect_.c:137
+#: ../../standalone/drakconnect_.c:293 ../../standalone/drakconnect_.c:432
+#: ../../standalone/drakconnect_.c:518 ../../standalone/drakconnect_.c:561
+#: ../../standalone/drakconnect_.c:665 ../../standalone/drakfont_.c:604
+#: ../../standalone/drakfont_.c:783 ../../standalone/drakfont_.c:911
+#: ../../standalone/net_monitor_.c:336 ../../ugtk.pm_.c:288
+#: ../../ugtk2.pm_.c:355
msgid "OK"
msgstr "ȷ��"
-#: ../../bootlook.pm_.c:403
-#, c-format
-msgid "can not open /etc/inittab for reading: %s"
-msgstr "�޷��� /etc/inittab ��: %s"
-
-#: ../../common.pm_.c:99
+#: ../../common.pm_.c:107
msgid "GB"
msgstr "GB"
-#: ../../common.pm_.c:99
+#: ../../common.pm_.c:107
msgid "KB"
msgstr "KB"
-#: ../../common.pm_.c:99
+#: ../../common.pm_.c:107
msgid "MB"
msgstr "MB"
-#: ../../common.pm_.c:107
+#: ../../common.pm_.c:115
msgid "TB"
msgstr "TB"
-#: ../../common.pm_.c:115
+#: ../../common.pm_.c:123
#, c-format
msgid "%d minutes"
msgstr "%d ����"
-#: ../../common.pm_.c:117
+#: ../../common.pm_.c:125
msgid "1 minute"
msgstr "1 ����"
-#: ../../common.pm_.c:119
+#: ../../common.pm_.c:127
#, c-format
msgid "%d seconds"
msgstr " %d ����"
-#: ../../common.pm_.c:164
+#: ../../common.pm_.c:172
msgid "Can't make screenshots before partitioning"
msgstr "�޷��ڷ������֮ǰ������Ļ��׽"
-#: ../../common.pm_.c:171
+#: ../../common.pm_.c:179
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "�������ڰ�װ�� %s ֮����ʹ����Ļ��׽����"
-#: ../../crypto.pm_.c:14 ../../crypto.pm_.c:28 ../../network/tools.pm_.c:104
-#: ../../network/tools.pm_.c:113
+#: ../../crypto.pm_.c:14 ../../crypto.pm_.c:28 ../../network/tools.pm_.c:118
+#: ../../network/tools.pm_.c:127
msgid "France"
msgstr "����"
@@ -1423,8 +1419,8 @@ msgstr "����"
msgid "Costa Rica"
msgstr "��˹�����"
-#: ../../crypto.pm_.c:16 ../../crypto.pm_.c:29 ../../network/tools.pm_.c:104
-#: ../../network/tools.pm_.c:116
+#: ../../crypto.pm_.c:16 ../../crypto.pm_.c:29 ../../network/tools.pm_.c:118
+#: ../../network/tools.pm_.c:130
msgid "Belgium"
msgstr "����ʱ"
@@ -1448,13 +1444,13 @@ msgstr "Ų��"
msgid "Sweden"
msgstr "���"
-#: ../../crypto.pm_.c:22 ../../crypto.pm_.c:36 ../../network/tools.pm_.c:104
-#: ../../network/tools.pm_.c:114
+#: ../../crypto.pm_.c:22 ../../crypto.pm_.c:36 ../../network/tools.pm_.c:118
+#: ../../network/tools.pm_.c:128
msgid "Netherlands"
msgstr "����"
-#: ../../crypto.pm_.c:23 ../../crypto.pm_.c:37 ../../network/tools.pm_.c:104
-#: ../../network/tools.pm_.c:115 ../../standalone/drakxtv_.c:68
+#: ../../crypto.pm_.c:23 ../../crypto.pm_.c:37 ../../network/tools.pm_.c:118
+#: ../../network/tools.pm_.c:129 ../../standalone/drakxtv_.c:65
msgid "Italy"
msgstr "�����"
@@ -1462,8 +1458,8 @@ msgstr "�����"
msgid "Austria"
msgstr "�µ���"
-#: ../../crypto.pm_.c:35 ../../crypto.pm_.c:61 ../../network/tools.pm_.c:104
-#: ../../network/tools.pm_.c:117
+#: ../../crypto.pm_.c:35 ../../crypto.pm_.c:61 ../../network/tools.pm_.c:118
+#: ../../network/tools.pm_.c:131
msgid "United States"
msgstr "����"
@@ -1482,12 +1478,12 @@ msgstr ""
msgid "New"
msgstr "�½�"
-#: ../../diskdrake/dav.pm_.c:63 ../../diskdrake/interactive.pm_.c:392
+#: ../../diskdrake/dav.pm_.c:63 ../../diskdrake/interactive.pm_.c:400
#: ../../diskdrake/smbnfs_gtk.pm_.c:81
msgid "Unmount"
msgstr "�"
-#: ../../diskdrake/dav.pm_.c:64 ../../diskdrake/interactive.pm_.c:389
+#: ../../diskdrake/dav.pm_.c:64 ../../diskdrake/interactive.pm_.c:397
#: ../../diskdrake/smbnfs_gtk.pm_.c:82
msgid "Mount"
msgstr "װ��"
@@ -1496,10 +1492,9 @@ msgstr "װ��"
msgid "Server"
msgstr "������"
-#: ../../diskdrake/dav.pm_.c:66 ../../diskdrake/interactive.pm_.c:383
-#: ../../diskdrake/interactive.pm_.c:572 ../../diskdrake/interactive.pm_.c:599
-#: ../../diskdrake/removable.pm_.c:24 ../../diskdrake/removable_gtk.pm_.c:15
-#: ../../diskdrake/smbnfs_gtk.pm_.c:85
+#: ../../diskdrake/dav.pm_.c:66 ../../diskdrake/interactive.pm_.c:391
+#: ../../diskdrake/interactive.pm_.c:580 ../../diskdrake/interactive.pm_.c:607
+#: ../../diskdrake/removable.pm_.c:24 ../../diskdrake/smbnfs_gtk.pm_.c:85
msgid "Mount point"
msgstr "װ�ص�"
@@ -1515,28 +1510,28 @@ msgstr "Url Ӧ������ http:// �� https:// ��ͷ"
msgid "Server: "
msgstr "������:"
-#: ../../diskdrake/dav.pm_.c:110 ../../diskdrake/interactive.pm_.c:444
-#: ../../diskdrake/interactive.pm_.c:1093
-#: ../../diskdrake/interactive.pm_.c:1168
+#: ../../diskdrake/dav.pm_.c:110 ../../diskdrake/interactive.pm_.c:452
+#: ../../diskdrake/interactive.pm_.c:1102
+#: ../../diskdrake/interactive.pm_.c:1177
msgid "Mount point: "
msgstr "װ�ص�:"
-#: ../../diskdrake/dav.pm_.c:111 ../../diskdrake/interactive.pm_.c:1174
+#: ../../diskdrake/dav.pm_.c:111 ../../diskdrake/interactive.pm_.c:1183
#, c-format
msgid "Options: %s"
msgstr "ѡ��: %s"
-#: ../../diskdrake/hd_gtk.pm_.c:94
+#: ../../diskdrake/hd_gtk.pm_.c:97
msgid "Please make a backup of your data first"
msgstr "���ȱ�����������"
-#: ../../diskdrake/hd_gtk.pm_.c:94 ../../diskdrake/interactive.pm_.c:938
-#: ../../diskdrake/interactive.pm_.c:947
-#: ../../diskdrake/interactive.pm_.c:1013
+#: ../../diskdrake/hd_gtk.pm_.c:97 ../../diskdrake/interactive.pm_.c:946
+#: ../../diskdrake/interactive.pm_.c:956
+#: ../../diskdrake/interactive.pm_.c:1022
msgid "Read carefully!"
msgstr "����ϸ�Ķ�!"
-#: ../../diskdrake/hd_gtk.pm_.c:97
+#: ../../diskdrake/hd_gtk.pm_.c:100
msgid ""
"If you plan to use aboot, be carefull to leave a free space (2048 sectors is "
"enough)\n"
@@ -1545,15 +1540,15 @@ msgstr ""
"������ƻ����� aboot, ��ע���ڴ��̵Ŀ�ͷλ������һ�����ɿռ�\n"
"( 2048 �������㹻��)"
-#: ../../diskdrake/hd_gtk.pm_.c:151
+#: ../../diskdrake/hd_gtk.pm_.c:154
msgid "Wizard"
msgstr "��"
-#: ../../diskdrake/hd_gtk.pm_.c:184 ../../diskdrake/removable_gtk.pm_.c:24
+#: ../../diskdrake/hd_gtk.pm_.c:187
msgid "Choose action"
msgstr "ѡ�����"
-#: ../../diskdrake/hd_gtk.pm_.c:188
+#: ../../diskdrake/hd_gtk.pm_.c:191
msgid ""
"You have one big FAT partition\n"
"(generally used by MicroSoft Dos/Windows).\n"
@@ -1565,182 +1560,182 @@ msgstr ""
"��������������������Ĵ�С\n"
"(������, Ȼ�� ���ı��С��)"
-#: ../../diskdrake/hd_gtk.pm_.c:191
+#: ../../diskdrake/hd_gtk.pm_.c:194
msgid "Please click on a partition"
msgstr "��ѡ��һ������"
-#: ../../diskdrake/hd_gtk.pm_.c:205 ../../diskdrake/smbnfs_gtk.pm_.c:69
-#: ../../install_steps_gtk.pm_.c:465
+#: ../../diskdrake/hd_gtk.pm_.c:208 ../../diskdrake/smbnfs_gtk.pm_.c:69
+#: ../../install_steps_gtk.pm_.c:464
msgid "Details"
msgstr "��ϸ���"
-#: ../../diskdrake/hd_gtk.pm_.c:252
+#: ../../diskdrake/hd_gtk.pm_.c:254
msgid "No hard drives found"
msgstr "û�з���Ӳ��"
-#: ../../diskdrake/hd_gtk.pm_.c:323
+#: ../../diskdrake/hd_gtk.pm_.c:325
msgid "Ext2"
msgstr "Ext2"
-#: ../../diskdrake/hd_gtk.pm_.c:323
+#: ../../diskdrake/hd_gtk.pm_.c:325
msgid "FAT"
msgstr "FAT"
-#: ../../diskdrake/hd_gtk.pm_.c:323
+#: ../../diskdrake/hd_gtk.pm_.c:325
msgid "HFS"
msgstr "HFS"
-#: ../../diskdrake/hd_gtk.pm_.c:323
+#: ../../diskdrake/hd_gtk.pm_.c:325
msgid "Journalised FS"
msgstr "Journalised FS"
-#: ../../diskdrake/hd_gtk.pm_.c:323
+#: ../../diskdrake/hd_gtk.pm_.c:325
msgid "SunOS"
msgstr "SunOS"
-#: ../../diskdrake/hd_gtk.pm_.c:323
+#: ../../diskdrake/hd_gtk.pm_.c:325
msgid "Swap"
msgstr "Swap"
-#: ../../diskdrake/hd_gtk.pm_.c:324 ../../diskdrake/interactive.pm_.c:1109
+#: ../../diskdrake/hd_gtk.pm_.c:326 ../../diskdrake/interactive.pm_.c:1118
msgid "Empty"
msgstr "��"
-#: ../../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:1756
+#: ../../diskdrake/hd_gtk.pm_.c:326 ../../install_steps_gtk.pm_.c:324
+#: ../../install_steps_gtk.pm_.c:382 ../../mouse.pm_.c:165
+#: ../../services.pm_.c:162 ../../standalone/drakbackup_.c:1719
msgid "Other"
msgstr "����"
-#: ../../diskdrake/hd_gtk.pm_.c:328
+#: ../../diskdrake/hd_gtk.pm_.c:330
msgid "Filesystem types:"
msgstr "�ļ�ϵͳ����:"
-#: ../../diskdrake/hd_gtk.pm_.c:345 ../../diskdrake/interactive.pm_.c:406
+#: ../../diskdrake/hd_gtk.pm_.c:347 ../../diskdrake/interactive.pm_.c:414
msgid "Create"
msgstr "�½�"
-#: ../../diskdrake/hd_gtk.pm_.c:345 ../../diskdrake/interactive.pm_.c:384
-#: ../../diskdrake/interactive.pm_.c:535 ../../diskdrake/removable.pm_.c:26
-#: ../../diskdrake/removable.pm_.c:49 ../../diskdrake/removable_gtk.pm_.c:17
+#: ../../diskdrake/hd_gtk.pm_.c:347 ../../diskdrake/interactive.pm_.c:392
+#: ../../diskdrake/interactive.pm_.c:543 ../../diskdrake/removable.pm_.c:26
+#: ../../diskdrake/removable.pm_.c:49 ../../standalone/harddrake2_.c:66
msgid "Type"
msgstr "����"
-#: ../../diskdrake/hd_gtk.pm_.c:345 ../../diskdrake/hd_gtk.pm_.c:347
+#: ../../diskdrake/hd_gtk.pm_.c:347 ../../diskdrake/hd_gtk.pm_.c:349
#, c-format
msgid "Use ``%s'' instead"
msgstr "�á�%s������"
-#: ../../diskdrake/hd_gtk.pm_.c:347 ../../diskdrake/interactive.pm_.c:393
+#: ../../diskdrake/hd_gtk.pm_.c:349 ../../diskdrake/interactive.pm_.c:401
msgid "Delete"
msgstr "ɾ��"
-#: ../../diskdrake/hd_gtk.pm_.c:351
+#: ../../diskdrake/hd_gtk.pm_.c:353
msgid "Use ``Unmount'' first"
msgstr "���ȡ�Unmount��"
-#: ../../diskdrake/hd_gtk.pm_.c:352 ../../diskdrake/interactive.pm_.c:522
+#: ../../diskdrake/hd_gtk.pm_.c:354 ../../diskdrake/interactive.pm_.c:530
#, c-format
msgid ""
"After changing type of partition %s, all data on this partition will be lost"
msgstr "�ڸı������ %s ������֮��, ����������ϵ��������Ͻ�Ҫ�����"
-#: ../../diskdrake/interactive.pm_.c:174
+#: ../../diskdrake/interactive.pm_.c:177
msgid "Choose a partition"
msgstr "ѡ�����"
-#: ../../diskdrake/interactive.pm_.c:174
+#: ../../diskdrake/interactive.pm_.c:177
msgid "Choose another partition"
msgstr "ѡ����������"
-#: ../../diskdrake/interactive.pm_.c:199
+#: ../../diskdrake/interactive.pm_.c:202
msgid "Exit"
msgstr "�˳�"
-#: ../../diskdrake/interactive.pm_.c:225
+#: ../../diskdrake/interactive.pm_.c:228
msgid "Toggle to expert mode"
msgstr "����ר��ģʽ"
-#: ../../diskdrake/interactive.pm_.c:225
+#: ../../diskdrake/interactive.pm_.c:228
msgid "Toggle to normal mode"
msgstr "��������ģʽ"
-#: ../../diskdrake/interactive.pm_.c:225
+#: ../../diskdrake/interactive.pm_.c:228
msgid "Undo"
msgstr "����"
-#: ../../diskdrake/interactive.pm_.c:244
+#: ../../diskdrake/interactive.pm_.c:247
msgid "Continue anyway?"
msgstr "ð�ռ���ִ��?"
-#: ../../diskdrake/interactive.pm_.c:249
+#: ../../diskdrake/interactive.pm_.c:252
msgid "Quit without saving"
msgstr "������ı���˳�"
-#: ../../diskdrake/interactive.pm_.c:249
+#: ../../diskdrake/interactive.pm_.c:252
msgid "Quit without writing the partition table?"
msgstr "��д����������˳�?"
-#: ../../diskdrake/interactive.pm_.c:254
+#: ../../diskdrake/interactive.pm_.c:257
msgid "Do you want to save /etc/fstab modifications"
msgstr "����Ҫ���� /etc/fstab �޸���?"
-#: ../../diskdrake/interactive.pm_.c:267
-msgid "Auto allocate"
-msgstr "�Զ�����"
-
-#: ../../diskdrake/interactive.pm_.c:267
+#: ../../diskdrake/interactive.pm_.c:271
msgid "Clear all"
msgstr "ȫ�����"
-#: ../../diskdrake/interactive.pm_.c:267
-#: ../../install_steps_interactive.pm_.c:214
+#: ../../diskdrake/interactive.pm_.c:272
+msgid "Auto allocate"
+msgstr "�Զ�����"
+
+#: ../../diskdrake/interactive.pm_.c:273
+#: ../../install_steps_interactive.pm_.c:220
msgid "More"
msgstr "����"
-#: ../../diskdrake/interactive.pm_.c:271
+#: ../../diskdrake/interactive.pm_.c:278
msgid "Hard drive information"
msgstr "Ӳ����Ϣ"
-#: ../../diskdrake/interactive.pm_.c:302
+#: ../../diskdrake/interactive.pm_.c:310
msgid "All primary partitions are used"
msgstr "������Ŀ�Ѿ�����"
-#: ../../diskdrake/interactive.pm_.c:303
+#: ../../diskdrake/interactive.pm_.c:311
msgid "I can't add any more partition"
msgstr "���޷��������κη�����"
-#: ../../diskdrake/interactive.pm_.c:304
+#: ../../diskdrake/interactive.pm_.c:312
msgid ""
"To have more partitions, please delete one to be able to create an extended "
"partition"
msgstr "�����Ҫ����ķ���, ��ɾ��һ���������Դ�����չ����"
-#: ../../diskdrake/interactive.pm_.c:314
+#: ../../diskdrake/interactive.pm_.c:322
msgid "Save partition table"
msgstr "���������"
-#: ../../diskdrake/interactive.pm_.c:315
+#: ../../diskdrake/interactive.pm_.c:323
msgid "Restore partition table"
msgstr "���ڳ��Իָ�������"
-#: ../../diskdrake/interactive.pm_.c:316
+#: ../../diskdrake/interactive.pm_.c:324
msgid "Rescue partition table"
msgstr "���ڳ����޸�������"
-#: ../../diskdrake/interactive.pm_.c:318
+#: ../../diskdrake/interactive.pm_.c:326
msgid "Reload partition table"
msgstr "���¶�ȡ������"
-#: ../../diskdrake/interactive.pm_.c:323
+#: ../../diskdrake/interactive.pm_.c:331
msgid "Removable media automounting"
msgstr "�Զ�װ�ؿ��ƶ�����"
-#: ../../diskdrake/interactive.pm_.c:332 ../../diskdrake/interactive.pm_.c:352
+#: ../../diskdrake/interactive.pm_.c:340 ../../diskdrake/interactive.pm_.c:360
msgid "Select file"
msgstr "ѡ���ļ�"
-#: ../../diskdrake/interactive.pm_.c:339
+#: ../../diskdrake/interactive.pm_.c:347
msgid ""
"The backup partition table has not the same size\n"
"Still continue?"
@@ -1748,11 +1743,12 @@ msgstr ""
"���ݷ������Ĵ�С��ԭ���IJ�ͬ\n"
"������?"
-#: ../../diskdrake/interactive.pm_.c:353 ../../harddrake/sound.pm_.c:200
+#: ../../diskdrake/interactive.pm_.c:361 ../../harddrake/sound.pm_.c:202
+#: ../../network/modem.pm_.c:95
msgid "Warning"
msgstr "����"
-#: ../../diskdrake/interactive.pm_.c:354
+#: ../../diskdrake/interactive.pm_.c:362
msgid ""
"Insert a floppy in drive\n"
"All data on this floppy will be lost"
@@ -1760,71 +1756,71 @@ msgstr ""
"�����������в���һ������\n"
"�������������е����ݽ�Ҫ�����"
-#: ../../diskdrake/interactive.pm_.c:365
+#: ../../diskdrake/interactive.pm_.c:373
msgid "Trying to rescue partition table"
msgstr "���ڳ��Իָ�������"
-#: ../../diskdrake/interactive.pm_.c:371
+#: ../../diskdrake/interactive.pm_.c:379
msgid "Detailed information"
msgstr "��ϸ��Ϣ"
-#: ../../diskdrake/interactive.pm_.c:386 ../../diskdrake/interactive.pm_.c:666
+#: ../../diskdrake/interactive.pm_.c:394 ../../diskdrake/interactive.pm_.c:674
msgid "Resize"
msgstr "�ı��С"
-#: ../../diskdrake/interactive.pm_.c:387 ../../diskdrake/interactive.pm_.c:719
+#: ../../diskdrake/interactive.pm_.c:395 ../../diskdrake/interactive.pm_.c:727
msgid "Move"
msgstr "�ƶ�"
-#: ../../diskdrake/interactive.pm_.c:388
+#: ../../diskdrake/interactive.pm_.c:396
msgid "Format"
msgstr "��ʽ��"
-#: ../../diskdrake/interactive.pm_.c:390
+#: ../../diskdrake/interactive.pm_.c:398
msgid "Add to RAID"
msgstr "���� RAID"
-#: ../../diskdrake/interactive.pm_.c:391
+#: ../../diskdrake/interactive.pm_.c:399
msgid "Add to LVM"
msgstr "���� LVM"
-#: ../../diskdrake/interactive.pm_.c:394
+#: ../../diskdrake/interactive.pm_.c:402
msgid "Remove from RAID"
msgstr "�� RAID ���Ƴ�"
-#: ../../diskdrake/interactive.pm_.c:395
+#: ../../diskdrake/interactive.pm_.c:403
msgid "Remove from LVM"
msgstr "�� LVM ���Ƴ�"
-#: ../../diskdrake/interactive.pm_.c:396
+#: ../../diskdrake/interactive.pm_.c:404
msgid "Modify RAID"
msgstr "�޸� RAID"
-#: ../../diskdrake/interactive.pm_.c:397
+#: ../../diskdrake/interactive.pm_.c:405
msgid "Use for loopback"
msgstr "���ڻػ�"
-#: ../../diskdrake/interactive.pm_.c:437
+#: ../../diskdrake/interactive.pm_.c:445
msgid "Create a new partition"
msgstr "����һ���·���"
-#: ../../diskdrake/interactive.pm_.c:440
+#: ../../diskdrake/interactive.pm_.c:448
msgid "Start sector: "
msgstr "��ʼ����: "
-#: ../../diskdrake/interactive.pm_.c:442 ../../diskdrake/interactive.pm_.c:819
+#: ../../diskdrake/interactive.pm_.c:450 ../../diskdrake/interactive.pm_.c:827
msgid "Size in MB: "
msgstr "��С(MB): "
-#: ../../diskdrake/interactive.pm_.c:443 ../../diskdrake/interactive.pm_.c:820
+#: ../../diskdrake/interactive.pm_.c:451 ../../diskdrake/interactive.pm_.c:828
msgid "Filesystem type: "
msgstr "�ļ�ϵͳ����: "
-#: ../../diskdrake/interactive.pm_.c:448
+#: ../../diskdrake/interactive.pm_.c:456
msgid "Preference: "
msgstr "��ѡ��: "
-#: ../../diskdrake/interactive.pm_.c:473
+#: ../../diskdrake/interactive.pm_.c:481
msgid ""
"You can't create a new partition\n"
"(since you reached the maximal number of primary partitions).\n"
@@ -1834,33 +1830,33 @@ msgstr ""
"(������������������������)��\n"
"����ɾ��һ��������, Ȼ�󴴽�һ����չ������"
-#: ../../diskdrake/interactive.pm_.c:503
+#: ../../diskdrake/interactive.pm_.c:511
msgid "Remove the loopback file?"
msgstr "ɾ���ػ�(loopback)�ļ�?"
-#: ../../diskdrake/interactive.pm_.c:533
+#: ../../diskdrake/interactive.pm_.c:541
msgid "Change partition type"
msgstr "�ı��������"
-#: ../../diskdrake/interactive.pm_.c:534 ../../diskdrake/removable.pm_.c:48
+#: ../../diskdrake/interactive.pm_.c:542 ../../diskdrake/removable.pm_.c:48
msgid "Which filesystem do you want?"
msgstr "��ϣ��ʹ�������ļ�ϵͳ?"
-#: ../../diskdrake/interactive.pm_.c:540
+#: ../../diskdrake/interactive.pm_.c:548
msgid "Switching from ext2 to ext3"
msgstr "��ext2������ext3"
-#: ../../diskdrake/interactive.pm_.c:570
+#: ../../diskdrake/interactive.pm_.c:578
#, c-format
msgid "Where do you want to mount loopback file %s?"
msgstr "����ѻػ�(loopback)�ļ� %s װ�ص�����?"
-#: ../../diskdrake/interactive.pm_.c:571
+#: ../../diskdrake/interactive.pm_.c:579
#, c-format
msgid "Where do you want to mount device %s?"
msgstr "������豸 %s װ�ص�����?"
-#: ../../diskdrake/interactive.pm_.c:577
+#: ../../diskdrake/interactive.pm_.c:585
msgid ""
"Can't unset mount point as this partition is used for loop back.\n"
"Remove the loopback first"
@@ -1868,135 +1864,135 @@ msgstr ""
"�޷�ȡ���趨��װ�ص�, ������������ڻػ���\n"
"����ɾ���ػ�"
-#: ../../diskdrake/interactive.pm_.c:598
+#: ../../diskdrake/interactive.pm_.c:606
#, c-format
msgid "Where do you want to mount %s?"
msgstr "����� %s װ�ص�����?"
-#: ../../diskdrake/interactive.pm_.c:622
+#: ../../diskdrake/interactive.pm_.c:630
msgid "Computing FAT filesystem bounds"
msgstr "���� FAT �ļ�ϵͳ�ı߽�"
-#: ../../diskdrake/interactive.pm_.c:622 ../../diskdrake/interactive.pm_.c:681
-#: ../../install_interactive.pm_.c:133
+#: ../../diskdrake/interactive.pm_.c:630 ../../diskdrake/interactive.pm_.c:689
+#: ../../install_interactive.pm_.c:131
msgid "Resizing"
msgstr "���ڸı��С"
-#: ../../diskdrake/interactive.pm_.c:654
+#: ../../diskdrake/interactive.pm_.c:662
msgid "This partition is not resizeable"
msgstr "���ܸı���������Ĵ�С"
-#: ../../diskdrake/interactive.pm_.c:659
+#: ../../diskdrake/interactive.pm_.c:667
msgid "All data on this partition should be backed-up"
msgstr "Ӧ���ȱ�������������ϵ���������"
-#: ../../diskdrake/interactive.pm_.c:661
+#: ../../diskdrake/interactive.pm_.c:669
#, c-format
msgid "After resizing partition %s, all data on this partition will be lost"
msgstr "�ı���� %s �Ĵ�С֮��, ������������е��������Ͻ������"
-#: ../../diskdrake/interactive.pm_.c:666
+#: ../../diskdrake/interactive.pm_.c:674
msgid "Choose the new size"
msgstr "ѡ���µĴ�С"
-#: ../../diskdrake/interactive.pm_.c:667
+#: ../../diskdrake/interactive.pm_.c:675
msgid "New size in MB: "
msgstr "�´�С (MB): "
-#: ../../diskdrake/interactive.pm_.c:720
+#: ../../diskdrake/interactive.pm_.c:728
msgid "Which disk do you want to move it to?"
msgstr "�����ƶ����ĸ���?"
-#: ../../diskdrake/interactive.pm_.c:721
+#: ../../diskdrake/interactive.pm_.c:729
msgid "Sector"
msgstr "����"
-#: ../../diskdrake/interactive.pm_.c:722
+#: ../../diskdrake/interactive.pm_.c:730
msgid "Which sector do you want to move it to?"
msgstr "�����ƶ����ĸ�����?"
-#: ../../diskdrake/interactive.pm_.c:725
+#: ../../diskdrake/interactive.pm_.c:733
msgid "Moving"
msgstr "�ƶ���"
-#: ../../diskdrake/interactive.pm_.c:725
+#: ../../diskdrake/interactive.pm_.c:733
msgid "Moving partition..."
msgstr "�����ƶ�����..."
-#: ../../diskdrake/interactive.pm_.c:742
+#: ../../diskdrake/interactive.pm_.c:750
msgid "Choose an existing RAID to add to"
msgstr "ѡ�����һ���Ѵ��ڵ� RAID"
-#: ../../diskdrake/interactive.pm_.c:743 ../../diskdrake/interactive.pm_.c:760
+#: ../../diskdrake/interactive.pm_.c:751 ../../diskdrake/interactive.pm_.c:768
msgid "new"
msgstr "�½�"
-#: ../../diskdrake/interactive.pm_.c:758
+#: ../../diskdrake/interactive.pm_.c:766
msgid "Choose an existing LVM to add to"
msgstr "ѡ�����һ���Ѵ��ڵ� LVM"
-#: ../../diskdrake/interactive.pm_.c:763
+#: ../../diskdrake/interactive.pm_.c:771
msgid "LVM name?"
msgstr "LVM ����?"
-#: ../../diskdrake/interactive.pm_.c:804
+#: ../../diskdrake/interactive.pm_.c:812
msgid "This partition can't be used for loopback"
msgstr "����������ܱ����ڻػ�"
-#: ../../diskdrake/interactive.pm_.c:817
+#: ../../diskdrake/interactive.pm_.c:825
msgid "Loopback"
msgstr "�ػ�"
-#: ../../diskdrake/interactive.pm_.c:818
+#: ../../diskdrake/interactive.pm_.c:826
msgid "Loopback file name: "
msgstr "�ػ��ļ���: "
-#: ../../diskdrake/interactive.pm_.c:823
+#: ../../diskdrake/interactive.pm_.c:831
msgid "Give a file name"
msgstr "�ļ���"
-#: ../../diskdrake/interactive.pm_.c:826
+#: ../../diskdrake/interactive.pm_.c:834
msgid "File already used by another loopback, choose another one"
msgstr "�ļ��Ѿ�����һ���ػ�ʹ��, ��ѡ������"
-#: ../../diskdrake/interactive.pm_.c:827
+#: ../../diskdrake/interactive.pm_.c:835
msgid "File already exists. Use it?"
msgstr "�ļ��Ѿ����ڡ�ʹ�����е��ļ�?"
-#: ../../diskdrake/interactive.pm_.c:850
+#: ../../diskdrake/interactive.pm_.c:858
msgid "Mount options"
msgstr "װ��ѡ��"
-#: ../../diskdrake/interactive.pm_.c:857
+#: ../../diskdrake/interactive.pm_.c:865
msgid "Various"
msgstr "����"
-#: ../../diskdrake/interactive.pm_.c:921 ../../standalone/drakfloppy_.c:104
+#: ../../diskdrake/interactive.pm_.c:929 ../../standalone/drakfloppy_.c:76
msgid "device"
msgstr "�豸"
-#: ../../diskdrake/interactive.pm_.c:922
+#: ../../diskdrake/interactive.pm_.c:930
msgid "level"
msgstr "����"
-#: ../../diskdrake/interactive.pm_.c:923
+#: ../../diskdrake/interactive.pm_.c:931
msgid "chunk size"
msgstr "����С"
-#: ../../diskdrake/interactive.pm_.c:938
+#: ../../diskdrake/interactive.pm_.c:947
msgid "Be careful: this operation is dangerous."
msgstr "С��: ���������Σ�ա�"
-#: ../../diskdrake/interactive.pm_.c:953
+#: ../../diskdrake/interactive.pm_.c:962
msgid "What type of partitioning?"
msgstr "��������������?"
-#: ../../diskdrake/interactive.pm_.c:969
+#: ../../diskdrake/interactive.pm_.c:978
#, c-format
msgid "The package %s is needed. Install it?"
msgstr "��Ҫ��װ������ %s����ͬ�ⰲװ��?"
-#: ../../diskdrake/interactive.pm_.c:983
+#: ../../diskdrake/interactive.pm_.c:992
msgid ""
"Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
"1024).\n"
@@ -2007,7 +2003,7 @@ msgstr ""
"�����ʹ�� LILO, ��û����������; ��������ʹ�� LILO, \n"
"����Ҫ���� /boot ����"
-#: ../../diskdrake/interactive.pm_.c:987
+#: ../../diskdrake/interactive.pm_.c:996
msgid ""
"The partition you've selected to add as root (/) is physically located "
"beyond\n"
@@ -2018,7 +2014,7 @@ msgstr ""
"������û�д��� /boot ����/\n"
"������ƻ�ʹ�� LILO ������������, �����ʵ�λ�ü��� /boot ������"
-#: ../../diskdrake/interactive.pm_.c:993
+#: ../../diskdrake/interactive.pm_.c:1002
msgid ""
"You've selected a software RAID partition as root (/).\n"
"No bootloader is able to handle this without a /boot partition.\n"
@@ -2028,44 +2024,44 @@ msgstr ""
"���û�� /boot ����, �������������޷��������������\n"
"����, ������һ�� /boot ������"
-#: ../../diskdrake/interactive.pm_.c:1013
+#: ../../diskdrake/interactive.pm_.c:1022
#, c-format
msgid "Partition table of drive %s is going to be written to disk!"
msgstr "������ %s �ķ���������д�������!"
-#: ../../diskdrake/interactive.pm_.c:1017
+#: ../../diskdrake/interactive.pm_.c:1026
msgid "You'll need to reboot before the modification can take place"
msgstr "���������¿���ʹ�����ĸ�����Ч"
-#: ../../diskdrake/interactive.pm_.c:1028
+#: ../../diskdrake/interactive.pm_.c:1037
#, c-format
msgid "After formatting partition %s, all data on this partition will be lost"
msgstr "��ʽ������ %s ֮��, ����������ϵ��������Ͻ�Ҫ�����"
-#: ../../diskdrake/interactive.pm_.c:1030
+#: ../../diskdrake/interactive.pm_.c:1039
msgid "Formatting"
msgstr "���ڸ�ʽ��"
-#: ../../diskdrake/interactive.pm_.c:1031
+#: ../../diskdrake/interactive.pm_.c:1040
#, c-format
msgid "Formatting loopback file %s"
msgstr "���ڸ�ʽ���ػ�(loopback)�ļ� %s"
-#: ../../diskdrake/interactive.pm_.c:1032
-#: ../../install_steps_interactive.pm_.c:459
+#: ../../diskdrake/interactive.pm_.c:1041
+#: ../../install_steps_interactive.pm_.c:466
#, c-format
msgid "Formatting partition %s"
msgstr "���ڸ�ʽ������ %s"
-#: ../../diskdrake/interactive.pm_.c:1043
+#: ../../diskdrake/interactive.pm_.c:1052
msgid "Hide files"
msgstr "�����ļ�"
-#: ../../diskdrake/interactive.pm_.c:1043
+#: ../../diskdrake/interactive.pm_.c:1052
msgid "Move files to the new partition"
msgstr "�ƶ��ļ����·���"
-#: ../../diskdrake/interactive.pm_.c:1044
+#: ../../diskdrake/interactive.pm_.c:1053
#, c-format
msgid ""
"Directory %s already contains data\n"
@@ -2074,83 +2070,83 @@ msgstr ""
"Ŀ¼ %s �Ѿ���������\n"
"(%s)"
-#: ../../diskdrake/interactive.pm_.c:1055
+#: ../../diskdrake/interactive.pm_.c:1064
msgid "Moving files to the new partition"
msgstr "�����ƶ��ļ����·���"
-#: ../../diskdrake/interactive.pm_.c:1059
+#: ../../diskdrake/interactive.pm_.c:1068
#, c-format
msgid "Copying %s"
msgstr "���ڸ��� %s"
-#: ../../diskdrake/interactive.pm_.c:1063
+#: ../../diskdrake/interactive.pm_.c:1072
#, c-format
msgid "Removing %s"
msgstr "����ɾ�� %s"
-#: ../../diskdrake/interactive.pm_.c:1073
+#: ../../diskdrake/interactive.pm_.c:1082
#, c-format
msgid "partition %s is now known as %s"
msgstr "���� %s ���ڳ�Ϊ %s"
-#: ../../diskdrake/interactive.pm_.c:1094
-#: ../../diskdrake/interactive.pm_.c:1153
+#: ../../diskdrake/interactive.pm_.c:1103
+#: ../../diskdrake/interactive.pm_.c:1162
msgid "Device: "
msgstr "�豸: "
-#: ../../diskdrake/interactive.pm_.c:1095
+#: ../../diskdrake/interactive.pm_.c:1104
#, c-format
msgid "DOS drive letter: %s (just a guess)\n"
msgstr "DOS �µ��̷�: %s ( ֻ�Dz²� )\n"
-#: ../../diskdrake/interactive.pm_.c:1099
-#: ../../diskdrake/interactive.pm_.c:1107
-#: ../../diskdrake/interactive.pm_.c:1172
+#: ../../diskdrake/interactive.pm_.c:1108
+#: ../../diskdrake/interactive.pm_.c:1116
+#: ../../diskdrake/interactive.pm_.c:1181
msgid "Type: "
msgstr "����: "
-#: ../../diskdrake/interactive.pm_.c:1103
+#: ../../diskdrake/interactive.pm_.c:1112
msgid "Name: "
msgstr "����: "
-#: ../../diskdrake/interactive.pm_.c:1111
+#: ../../diskdrake/interactive.pm_.c:1120
#, c-format
msgid "Start: sector %s\n"
msgstr "��ʼ: �� %s ����\n"
-#: ../../diskdrake/interactive.pm_.c:1112
+#: ../../diskdrake/interactive.pm_.c:1121
#, c-format
msgid "Size: %s"
msgstr "��С: %s"
-#: ../../diskdrake/interactive.pm_.c:1114
+#: ../../diskdrake/interactive.pm_.c:1123
#, c-format
msgid ", %s sectors"
msgstr ", %s ����"
-#: ../../diskdrake/interactive.pm_.c:1116
+#: ../../diskdrake/interactive.pm_.c:1125
#, c-format
msgid "Cylinder %d to %d\n"
msgstr "���� %d �� %d\n"
-#: ../../diskdrake/interactive.pm_.c:1117
+#: ../../diskdrake/interactive.pm_.c:1126
msgid "Formatted\n"
msgstr "�Ѹ�ʽ��\n"
-#: ../../diskdrake/interactive.pm_.c:1118
+#: ../../diskdrake/interactive.pm_.c:1127
msgid "Not formatted\n"
msgstr "δ��ʽ��\n"
-#: ../../diskdrake/interactive.pm_.c:1119
+#: ../../diskdrake/interactive.pm_.c:1128
msgid "Mounted\n"
msgstr "��װ��\n"
-#: ../../diskdrake/interactive.pm_.c:1120
+#: ../../diskdrake/interactive.pm_.c:1129
#, c-format
msgid "RAID md%s\n"
msgstr "RAID md%s\n"
-#: ../../diskdrake/interactive.pm_.c:1122
+#: ../../diskdrake/interactive.pm_.c:1131
#, c-format
msgid ""
"Loopback file(s):\n"
@@ -2159,7 +2155,7 @@ msgstr ""
"�ػ��ļ�:\n"
" %s\n"
-#: ../../diskdrake/interactive.pm_.c:1123
+#: ../../diskdrake/interactive.pm_.c:1132
msgid ""
"Partition booted by default\n"
" (for MS-DOS boot, not for lilo)\n"
@@ -2167,27 +2163,27 @@ msgstr ""
"Ԥ�����������\n"
" (�� MS-DOS �����õ�, �� lilo �޹�)\n"
-#: ../../diskdrake/interactive.pm_.c:1125
+#: ../../diskdrake/interactive.pm_.c:1134
#, c-format
msgid "Level %s\n"
msgstr "���� %s\n"
-#: ../../diskdrake/interactive.pm_.c:1126
+#: ../../diskdrake/interactive.pm_.c:1135
#, c-format
msgid "Chunk size %s\n"
msgstr "����С %s\n"
-#: ../../diskdrake/interactive.pm_.c:1127
+#: ../../diskdrake/interactive.pm_.c:1136
#, c-format
msgid "RAID-disks %s\n"
msgstr "RAID ���� %s\n"
-#: ../../diskdrake/interactive.pm_.c:1129
+#: ../../diskdrake/interactive.pm_.c:1138
#, c-format
msgid "Loopback file name: %s"
msgstr "�ػ��ļ�����: %s"
-#: ../../diskdrake/interactive.pm_.c:1132
+#: ../../diskdrake/interactive.pm_.c:1141
msgid ""
"\n"
"Chances are, this partition is\n"
@@ -2198,7 +2194,7 @@ msgstr ""
"���������������������,\n"
"�벻Ҫ���ġ�\n"
-#: ../../diskdrake/interactive.pm_.c:1135
+#: ../../diskdrake/interactive.pm_.c:1144
msgid ""
"\n"
"This special Bootstrap\n"
@@ -2209,61 +2205,61 @@ msgstr ""
"�� Bootstrap �����ر�\n"
"�DZ�����˫������ϵͳ��\n"
-#: ../../diskdrake/interactive.pm_.c:1154
+#: ../../diskdrake/interactive.pm_.c:1163
msgid "Read-only"
msgstr "ֻ��"
-#: ../../diskdrake/interactive.pm_.c:1155
+#: ../../diskdrake/interactive.pm_.c:1164
#, c-format
msgid "Size: %s\n"
msgstr "��С: %s\n"
-#: ../../diskdrake/interactive.pm_.c:1156
+#: ../../diskdrake/interactive.pm_.c:1165
#, c-format
msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
msgstr "Ӳ�̲���: %s ����, %s ��ͷ, %s ����\n"
-#: ../../diskdrake/interactive.pm_.c:1157
+#: ../../diskdrake/interactive.pm_.c:1166
msgid "Info: "
msgstr "��Ϣ: "
-#: ../../diskdrake/interactive.pm_.c:1158
+#: ../../diskdrake/interactive.pm_.c:1167
#, c-format
msgid "LVM-disks %s\n"
msgstr "LVM ���� %s\n"
-#: ../../diskdrake/interactive.pm_.c:1159
+#: ../../diskdrake/interactive.pm_.c:1168
#, c-format
msgid "Partition table type: %s\n"
msgstr "����������: %s\n"
-#: ../../diskdrake/interactive.pm_.c:1160
+#: ../../diskdrake/interactive.pm_.c:1169
#, c-format
msgid "on channel %d id %d\n"
msgstr "ͨ�� %d id %d\n"
-#: ../../diskdrake/interactive.pm_.c:1190
+#: ../../diskdrake/interactive.pm_.c:1199
msgid "Filesystem encryption key"
msgstr "�ļ�ϵͳ������Կ"
-#: ../../diskdrake/interactive.pm_.c:1191
+#: ../../diskdrake/interactive.pm_.c:1200
msgid "Choose your filesystem encryption key"
msgstr "��ѡ����ļ�ϵͳ�ļ�����Կ"
-#: ../../diskdrake/interactive.pm_.c:1194
+#: ../../diskdrake/interactive.pm_.c:1203
#, c-format
msgid "This encryption key is too simple (must be at least %d characters long)"
msgstr "���������Կ̫���� (����Ҫ�� %d ���ַ�)"
-#: ../../diskdrake/interactive.pm_.c:1195
+#: ../../diskdrake/interactive.pm_.c:1204
msgid "The encryption keys do not match"
msgstr "���μ�����Կ����"
-#: ../../diskdrake/interactive.pm_.c:1198
+#: ../../diskdrake/interactive.pm_.c:1207
msgid "Encryption key"
msgstr "������Կ"
-#: ../../diskdrake/interactive.pm_.c:1199
+#: ../../diskdrake/interactive.pm_.c:1208
msgid "Encryption key (again)"
msgstr "������Կ (��һ��)"
@@ -2271,10 +2267,6 @@ msgstr "������Կ (��һ��)"
msgid "Change type"
msgstr "�ı�����"
-#: ../../diskdrake/removable_gtk.pm_.c:28
-msgid "Please click on a medium"
-msgstr "��ѡ�����"
-
#: ../../diskdrake/smbnfs_gtk.pm_.c:162
#, c-format
msgid "Can't login using username %s (bad password?)"
@@ -2297,7 +2289,7 @@ msgid ""
"Please enter your username, password and domain name to access this host."
msgstr "Ҫ���ʴ�����, �����������û���, ���������"
-#: ../../diskdrake/smbnfs_gtk.pm_.c:178 ../../standalone/drakbackup_.c:3529
+#: ../../diskdrake/smbnfs_gtk.pm_.c:178 ../../standalone/drakbackup_.c:3477
msgid "Username"
msgstr "�û���"
@@ -2309,23 +2301,23 @@ msgstr "��"
msgid "Search servers"
msgstr "����������"
-#: ../../fs.pm_.c:545 ../../fs.pm_.c:555 ../../fs.pm_.c:559 ../../fs.pm_.c:563
-#: ../../fs.pm_.c:567 ../../fs.pm_.c:571
+#: ../../fs.pm_.c:547 ../../fs.pm_.c:557 ../../fs.pm_.c:561 ../../fs.pm_.c:565
+#: ../../fs.pm_.c:569 ../../fs.pm_.c:573
#, c-format
msgid "%s formatting of %s failed"
msgstr "%s, ��ʽ�� %s ʧ��"
-#: ../../fs.pm_.c:608
+#: ../../fs.pm_.c:610
#, c-format
msgid "I don't know how to format %s in type %s"
msgstr "��֪����θ�ʽ�� %s �� %s ����"
-#: ../../fs.pm_.c:682 ../../fs.pm_.c:725
+#: ../../fs.pm_.c:684 ../../fs.pm_.c:727
#, c-format
msgid "mounting partition %s in directory %s failed"
msgstr "������ %s ������Ŀ¼ %s ʧ��"
-#: ../../fs.pm_.c:740 ../../partition_table.pm_.c:598
+#: ../../fs.pm_.c:742 ../../partition_table.pm_.c:599
#, c-format
msgid "error unmounting %s: %s"
msgstr "ж�� %s ʧ��: %s"
@@ -2409,22 +2401,26 @@ msgstr "�����"
msgid "Error opening %s for writing: %s"
msgstr "�ڴ� %s д��ʱ��������: %s"
-#: ../../harddrake/sound.pm_.c:168
+#: ../../harddrake/data.pm_.c:71
+msgid "cpu /* "
+msgstr "CPU /*"
+
+#: ../../harddrake/sound.pm_.c:170
msgid "No alternative driver"
msgstr "û���������������"
-#: ../../harddrake/sound.pm_.c:169
+#: ../../harddrake/sound.pm_.c:171
#, c-format
msgid ""
"There's no known OSS/ALSA alternative driver for your sound card (%s) which "
"currently uses \"%s\""
msgstr "û����֪�� OSS/ALSA �������������������������� (%s) ��, ����ʹ�á�%s��"
-#: ../../harddrake/sound.pm_.c:171
+#: ../../harddrake/sound.pm_.c:173
msgid "Sound configuration"
msgstr "��������"
-#: ../../harddrake/sound.pm_.c:172
+#: ../../harddrake/sound.pm_.c:174
#, c-format
msgid ""
"Here you can select an alternative driver (either OSS or ALSA) for your "
@@ -2433,7 +2429,7 @@ msgstr ""
"���������������ÿ��������������� (%s) �ϵ������������ (����ѡ��OSS �� "
"ALSA)��"
-#: ../../harddrake/sound.pm_.c:174
+#: ../../harddrake/sound.pm_.c:176
#, c-format
msgid ""
"\n"
@@ -2445,25 +2441,25 @@ msgstr ""
"\n"
"����������������ʹ��%s��%s����������(��Ĭ����������Ϊ��%s��)"
-#: ../../harddrake/sound.pm_.c:176
+#: ../../harddrake/sound.pm_.c:178
msgid "Driver:"
msgstr "��������:"
-#: ../../harddrake/sound.pm_.c:181 ../../standalone/drakTermServ_.c:246
-#: ../../standalone/drakbackup_.c:3932 ../../standalone/drakbackup_.c:3965
-#: ../../standalone/drakbackup_.c:3991 ../../standalone/drakbackup_.c:4018
-#: ../../standalone/drakbackup_.c:4045 ../../standalone/drakbackup_.c:4084
-#: ../../standalone/drakbackup_.c:4105 ../../standalone/drakbackup_.c:4132
-#: ../../standalone/drakbackup_.c:4162 ../../standalone/drakbackup_.c:4188
-#: ../../standalone/drakbackup_.c:4213 ../../standalone/drakfont_.c:700
+#: ../../harddrake/sound.pm_.c:183 ../../standalone/drakTermServ_.c:303
+#: ../../standalone/drakbackup_.c:3878 ../../standalone/drakbackup_.c:3911
+#: ../../standalone/drakbackup_.c:3937 ../../standalone/drakbackup_.c:3964
+#: ../../standalone/drakbackup_.c:3991 ../../standalone/drakbackup_.c:4030
+#: ../../standalone/drakbackup_.c:4051 ../../standalone/drakbackup_.c:4078
+#: ../../standalone/drakbackup_.c:4108 ../../standalone/drakbackup_.c:4134
+#: ../../standalone/drakbackup_.c:4157 ../../standalone/drakfont_.c:690
msgid "Help"
msgstr "����"
-#: ../../harddrake/sound.pm_.c:183
+#: ../../harddrake/sound.pm_.c:185
msgid "Switching between ALSA and OSS help"
msgstr "�� ALSA �� OSS �������л�"
-#: ../../harddrake/sound.pm_.c:184
+#: ../../harddrake/sound.pm_.c:186
msgid ""
"OSS (Open Sound System) was the first sound API. It's an OS independant "
"sound API (it's available on most unices systems) but it's a very basic and "
@@ -2493,7 +2489,7 @@ msgstr ""
"- ��ɵ� OSS ���ݵ� API\n"
"- �µ� ALSA API ����������ǿ����, ������Ҫʹ�� ALSA �⡣\n"
-#: ../../harddrake/sound.pm_.c:200
+#: ../../harddrake/sound.pm_.c:202
#, c-format
msgid ""
"The old \"%s\" driver is blacklisted.\n"
@@ -2508,29 +2504,30 @@ msgstr ""
"\n"
"�µġ�%s����������������´�����ʱʹ�á�"
-#: ../../harddrake/sound.pm_.c:203 ../../standalone/drakconnect_.c:301
+#: ../../harddrake/sound.pm_.c:205 ../../standalone/drakconnect_.c:298
msgid "Please Wait... Applying the configuration"
msgstr "��ȴ�...Ӧ������"
-#: ../../harddrake/sound.pm_.c:203 ../../harddrake/ui.pm_.c:111
-#: ../../interactive.pm_.c:391
+#: ../../harddrake/sound.pm_.c:205 ../../interactive.pm_.c:382
+#: ../../standalone/drakxtv_.c:108 ../../standalone/harddrake2_.c:113
+#: ../../standalone/service_harddrake_.c:64
msgid "Please wait"
msgstr "���Ժ�"
-#: ../../harddrake/sound.pm_.c:208
+#: ../../harddrake/sound.pm_.c:210
msgid "No known driver"
msgstr "û����֪��������"
-#: ../../harddrake/sound.pm_.c:209
+#: ../../harddrake/sound.pm_.c:211
#, c-format
msgid "There's no known driver for your sound card (%s)"
msgstr "û����֪������������������������� (%s) ��"
-#: ../../harddrake/sound.pm_.c:212
+#: ../../harddrake/sound.pm_.c:214
msgid "Unkown driver"
msgstr "δ֪����������"
-#: ../../harddrake/sound.pm_.c:213
+#: ../../harddrake/sound.pm_.c:215
#, c-format
msgid ""
"The \"%s\" driver for your sound card is unlisted\n"
@@ -2545,214 +2542,11 @@ msgstr ""
"<install at mandrakesoft dot com>\n"
"����д: unlisted sound driver ��%s��"
-#: ../../harddrake/ui.pm_.c:16
-msgid "Model"
-msgstr "�ͺ�"
-
-#: ../../harddrake/ui.pm_.c:16
-msgid "hard disk model"
-msgstr "Ӳ���ͺ�"
-
-#: ../../harddrake/ui.pm_.c:17
-msgid "Channel"
-msgstr "ͨ��"
-
-#: ../../harddrake/ui.pm_.c:17
-msgid "EIDE/SCSI channel"
-msgstr "EIDE/SCSI ͨ��"
-
-#: ../../harddrake/ui.pm_.c:19
-msgid "Bus"
-msgstr "����"
-
-#: ../../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:21
-msgid "Module"
-msgstr "ģ��"
-
-#: ../../harddrake/ui.pm_.c:21
-msgid "the module of the GNU/Linux kernel that handle that device"
-msgstr "�������豸�� GNU/Linux �ں�ģ��"
-
-#: ../../harddrake/ui.pm_.c:22
-msgid "Media class"
-msgstr "���ʷ���"
-
-#: ../../harddrake/ui.pm_.c:22
-msgid "class of hardware device"
-msgstr "Ӳ���豸�ķ���"
-
-#: ../../harddrake/ui.pm_.c:23 ../../printerdrake.pm_.c:1562
-msgid "Description"
-msgstr "����"
-
-#: ../../harddrake/ui.pm_.c:23
-msgid "this field describe the device"
-msgstr "�豸������"
-
-#: ../../harddrake/ui.pm_.c:25
-msgid "Bus identification"
-msgstr "���߱�ʶ"
-
-#: ../../harddrake/ui.pm_.c:26
-msgid ""
-"- 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:28
-msgid "Location on the bus"
-msgstr "�������ϵ�λ��"
-
-#: ../../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"
-"- scsi devices: the scsi bus and the scsi device ids"
-msgstr ""
-"- pci �豸: �г� PCI ���, �豸�͹���\n"
-"- eide �豸: ���豸����豸\n"
-"- scsi �豸: �г� scsi ���ߺ� scsi �豸��"
-
-#: ../../harddrake/ui.pm_.c:32
-msgid "Old device file"
-msgstr "�ɵ��豸�ļ�"
-
-#: ../../harddrake/ui.pm_.c:33
-msgid "old static device name used in dev package"
-msgstr "dev ��������ʹ�õľɵľ�̬�豸��"
-
-#: ../../harddrake/ui.pm_.c:34
-msgid "New devfs device"
-msgstr "�µ� devfs �豸"
-
-#: ../../harddrake/ui.pm_.c:35
-msgid "new dinamic device name generated by incore kernel devfs"
-msgstr "�ں��Դ��� devfs ��ʹ�õ��µĶ�̬�豸��"
-
-#: ../../harddrake/ui.pm_.c:36
-msgid "Number of buttons"
-msgstr "������Ŀ"
-
-#: ../../harddrake/ui.pm_.c:37
-msgid "the vendor name of the device"
-msgstr "�豸�ij�������"
-
-#: ../../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:64 ../../harddrake/ui.pm_.c:65
-#: ../../harddrake/ui.pm_.c:71 ../../harddrake/ui.pm_.c:73
-#: ../../standalone/logdrake_.c:111
-msgid "/_Help"
-msgstr "/����(_H)"
-
-#: ../../harddrake/ui.pm_.c:65
-msgid "/_Help..."
-msgstr "/����(_H)..."
-
-#: ../../harddrake/ui.pm_.c:66
-msgid "Harddrake help"
-msgstr "Harddrake ����"
-
-#: ../../harddrake/ui.pm_.c:67
-msgid ""
-"Description of the fields:\n"
-"\n"
-msgstr ""
-"�����ֶε�����:\n"
-"\n"
-
-#: ../../harddrake/ui.pm_.c:71
-msgid "/_Report Bug"
-msgstr "/���ϱ���(_R)"
-
-#: ../../harddrake/ui.pm_.c:73
-msgid "/_About..."
-msgstr "/����(_A)..."
-
-#: ../../harddrake/ui.pm_.c:74
-msgid "About Harddrake"
-msgstr "���� Harddrake"
-
-#: ../../harddrake/ui.pm_.c:75
-msgid ""
-"This is HardDrake, a Mandrake hardware configuration tool.\n"
-"Version:"
-msgstr ""
-"���� Harddrake, Mandrake ��Ӳ�����ù��ߡ�\n"
-"�汾:"
-
-#: ../../harddrake/ui.pm_.c:76
-msgid "Author:"
-msgstr "����:"
-
-#: ../../harddrake/ui.pm_.c:86
-msgid "Harddrake2 version "
-msgstr "Harddrake2 �汾 "
-
-#: ../../harddrake/ui.pm_.c:101
-msgid "Detected hardware"
-msgstr "��⵽��Ӳ��"
-
-#: ../../harddrake/ui.pm_.c:103
-msgid "Information"
-msgstr "��Ϣ"
-
-#: ../../harddrake/ui.pm_.c:106
-msgid "Configure module"
-msgstr "����ģ��"
-
-#: ../../harddrake/ui.pm_.c:107
-msgid "Run config tool"
-msgstr "�������ù���"
-
-#: ../../harddrake/ui.pm_.c:111
-msgid "Detection in progress"
-msgstr "��������"
-
-#: ../../harddrake/ui.pm_.c:148
-msgid "You can configure each parameter of the module here."
-msgstr "����������ģ��ĸ���������"
-
-#: ../../harddrake/ui.pm_.c:166
-#, c-format
-msgid "Running \"%s\" ..."
-msgstr "��������%s��..."
-
-#: ../../harddrake/ui.pm_.c:180
-#, c-format
-msgid "Probing %s class\n"
-msgstr "̽�� %s ��\n"
-
-#: ../../harddrake/ui.pm_.c:201
-msgid "primary"
-msgstr "��"
-
-#: ../../harddrake/ui.pm_.c:201
-msgid "secondary"
-msgstr "��"
-
#: ../../harddrake/v4l.pm_.c:14 ../../harddrake/v4l.pm_.c:64
msgid "Auto-detect"
msgstr "�Զ����"
-#: ../../harddrake/v4l.pm_.c:65 ../../harddrake/v4l.pm_.c:185
+#: ../../harddrake/v4l.pm_.c:65 ../../harddrake/v4l.pm_.c:198
msgid "Unknown|Generic"
msgstr "δ֪|��ͨ"
@@ -2764,7 +2558,7 @@ msgstr "δ֪|CPH05X (bt878)[�ܶ೧��] "
msgid "Unknown|CPH06X (bt878) [many vendors]"
msgstr "δ֪|CPH06X (bt878)[�ܶ೧��]"
-#: ../../harddrake/v4l.pm_.c:209
+#: ../../harddrake/v4l.pm_.c:224
msgid ""
"For most modern TV cards, the bttv module of the GNU/Linux kernel just auto-"
"detect the rights parameters.\n"
@@ -2775,31 +2569,31 @@ msgstr ""
"����Զ���ⲻ�ʺ����Ŀ�, ������������ǿ���趨��ȷ�ĵ�Э�����������͡�ֻ�б�"
"Ҫʱ�����õ��ӿ�����"
-#: ../../harddrake/v4l.pm_.c:212
+#: ../../harddrake/v4l.pm_.c:227
msgid "Card model:"
msgstr "�����ͺ�:"
-#: ../../harddrake/v4l.pm_.c:213
+#: ../../harddrake/v4l.pm_.c:228
msgid "Tuner type:"
-msgstr "��������:"
+msgstr "�������:"
-#: ../../harddrake/v4l.pm_.c:214
+#: ../../harddrake/v4l.pm_.c:229
msgid "Number of capture buffers:"
msgstr "���񻺳�������:"
-#: ../../harddrake/v4l.pm_.c:214
+#: ../../harddrake/v4l.pm_.c:229
msgid "number of capture buffers for mmap'ed capture"
msgstr "����mmap����Ļ���������:"
-#: ../../harddrake/v4l.pm_.c:216
+#: ../../harddrake/v4l.pm_.c:231
msgid "PLL setting:"
msgstr "PLL ����:"
-#: ../../harddrake/v4l.pm_.c:217
+#: ../../harddrake/v4l.pm_.c:232
msgid "Radio support:"
msgstr "���ߵ�֧��:"
-#: ../../harddrake/v4l.pm_.c:217
+#: ../../harddrake/v4l.pm_.c:232
msgid "enable radio support"
msgstr "ʹ�����ߵ�֧��:"
@@ -2840,29 +2634,29 @@ msgid ""
"If you are not interested in this feature, click \"No\"."
msgstr ""
"GNU/Linux ��һ�����û�ϵͳ, ���ÿ���û��������Լ���ϲ������, �Լ����ļ�, ��"
-"��.\n"
-"���Ķ� ���û��ֲᡱ�˽����. �� ��root�� ��ϵͳ����Ա��ͬ, ����Ҫ���ӵ���ͨ�û�\n"
-"���������Լ����ļ�������, ��Ȩ�޸��κζ���. ���������ٸ��Լ�����һ����ͨ��"
-"��. \n"
-"�ճ�ʹ����,��Ӧ���������Ǹ��ʻ���¼ϵͳ. ��Ȼÿ���� ��root�� ��¼Ҳ����,\n"
-"���������dz�Σ��! ֻҪ��һ��΢С�Ĵ���, ���Ϳ�����ϵͳ��Ҳ�޷�����.\n"
-"����Ϊ��ͨ�û�, ��ʱ���������صĴ���, �����ʧȥһЩ����, ����������ϵͳ.\n"
-"\n"
-"����, ������������ʵ����(Ӣ�Ļ�ƴ��). ��Ȼ, ��������ʲô������. DrakX ��ȡ��"
+"�ȡ�\n"
+"���Ķ����û��ֲᡱ�˽���ࡣ�� ��root�� ��ϵͳ����Ա��ͬ, ����Ҫ���ӵ���ͨ�û�\n"
+"���������Լ����ļ�������, ��Ȩ�޸��κζ��������������ٸ��Լ�����һ����ͨ��"
+"����\n"
+"�ճ�ʹ����, ��Ӧ���������Ǹ��ʻ���¼ϵͳ����Ȼÿ���ԡ�root����¼Ҳ����,\n"
+"���������dz�Σ��! ֻҪ��һ��΢С�Ĵ���, ���Ϳ�����ϵͳ��Ҳ�޷�������\n"
+"����Ϊ��ͨ�û�, ��ʱ���������صĴ���, �����ʧȥһЩ����, ����������ϵͳ��\n"
+"\n"
+"����, ������������ʵ����(Ӣ�Ļ�ƴ��)����Ȼ, ��������ʲô�����ԡ�DrakX ��ȡ��"
"����ĵ�һ������\n"
-"�ŵ� ���û����� ��Ŀ��. �⽫������û��Ժ��¼ϵͳ��ʹ�õ�����. ��Ҳ�����޸�"
-"��.\n"
-"֮��, ��Ҫ����һ������. ����Ȩ(��ͨ)�û��Ŀ���� ��root���Ŀ���������ϵͳ��ȫ"
+"�ŵ� ���û�������Ŀ��⽫������û��Ժ��¼ϵͳ��ʹ�õ����֡���Ҳ�����޸�"
+"����\n"
+"֮��, ��Ҫ����һ���������Ȩ(��ͨ)�û��Ŀ����root���Ŀ���������ϵͳ��ȫ"
"������Ҫ,\n"
-"Ȼ��û�����ɺ�����; ���Ͼ�ϣ�������Լ����ļ�.\n"
+"Ȼ��û�����ɺ�����; ���Ͼ�ϣ�������Լ����ļ���\n"
"\n"
-"��� �������û���֮��, �����Լ������Ӹ�����û�. ����, ������ÿ������, ���ĸ�"
+"����������û���֮��, �����Լ������Ӹ�����û�������, ������ÿ������, ���ĸ�"
"ĸ, �ֵܽ���\n"
-"�ֱ���һ���ʻ�. \n"
-"ȫ����֮��, ��� ����ɡ�.\n"
+"�ֱ���һ���ʻ���\n"
+"ȫ����֮��, �������ɡ���\n"
"\n"
-"��� ���߼��� ��ť�������޸��û��� ��shell-������ͳ���\n"
-"(ȱʡ������ bash )."
+"������߼�����ť�������޸��û��ġ�shell-������ͳ���\n"
+"(ȱʡ������ bash )��"
#: ../../help.pm_.c:48
msgid ""
@@ -2981,22 +2775,22 @@ msgid ""
"groups to avoid installing any new package. This is useful to repair or\n"
"update an existing system."
msgstr ""
-"������ָ����װ�����ʱ����. Mandrake Linux ��������ǧӦ�ó���, ����Ȼ���ؼ�ס"
-"ÿһ��.\n"
+"������ָ����װ�����ʱ���ˡ�Mandrake Linux ��������ǧӦ�ó���, ����Ȼ���ؼ�ס"
+"ÿһ����\n"
"\n"
"���������ʹ�� CD-ROM ���б�׼��װ, �����Ȼᱻ�ʵ�\n"
-"��ӵ����Щ���� ( ֻ��ר��ģʽ�� ). �������Ź��̾�ѡ�����ı���ǰ�ߵķ���.\n"
-"���֮��� ��ȷ���� .\n"
+"��ӵ����Щ���� ( ֻ��ר��ģʽ�� )���������Ź��̾�ѡ�����ı���ǰ�ߵķ��顣\n"
+"���֮��㡰ȷ������\n"
"\n"
"�����ղ�ͬ��;�ֳɺܶ���, ��Щ���ֳַ�����:\n"
"\n"
-"* ������վ��: ��װ���ڹ���վ�ĸ��ֳ�����.\n"
+"* ������վ��: ��װ���ڹ���վ�ĸ��ֳ����顣\n"
"\n"
-"* ��������: ��װ�������������ĸ��ֳ�����.\n"
+"* ��������: ��װ�������������ĸ��ֳ����顣\n"
"\n"
-"* ����������: ������Ļ�������Ϊ������, ��ѡ��Ҫ��װ�ĸ��ַ���������.\n"
+"* ����������: ������Ļ�������Ϊ������, ��ѡ��Ҫ��װ�ĸ��ַ�����������\n"
"\n"
-"* ��ͼ�λ�����: �������Ҫʹ��ͼ�λ���, һ��Ҫ����һ����ѡ������һ��.\n"
+"* ��ͼ�λ�����: �������Ҫʹ��ͼ�λ���, һ��Ҫ����һ����ѡ������һ�顣\n"
"\n"
"���ָ��ָ���������ʱ, ����ʾ�и������ļ�˵������, \n"
"�������������װģʽ��ѡ��Ҫ���е���, (����������ģʽ), һ���Ի���\n"
@@ -3008,13 +2802,13 @@ msgstr ""
"�ʺ������÷�����;\n"
"\n"
" * �������С��װ��: ����һ���ɹ����� Linux ϵͳ���������С��װ,\n"
-"ֻռ�� 65Mb.\n"
+"ֻռ�� 65Mb��\n"
"\n"
-"ѡ�� ��������ѡ�������� , �������Ϥ���е�������, ����ϣ����ȫ����\n"
-"Ҫ��װ��Щ����.\n"
+"ѡ�С�������ѡ��������, �������Ϥ���е�������, ����ϣ����ȫ����\n"
+"Ҫ��װ��Щ������\n"
"\n"
-"������п�ʼ��װ��ѡ���� ��������ģʽ, �����Բ�ѡ�����е���, �������Ա��ⰲװ\n"
-"�κ��µ�������. ���޸�����������ϵͳʱ����������а���."
+"������п�ʼ��װ��ѡ���ˡ�������ģʽ, �����Բ�ѡ�����е���, �������Ա��ⰲװ\n"
+"�κ��µ������������޸�����������ϵͳʱ����������а�����"
#: ../../help.pm_.c:135
msgid ""
@@ -3053,31 +2847,31 @@ msgid ""
"another installation. See the second tip of the previous step on how to\n"
"create such a floppy disk."
msgstr ""
-"���, ��������һ��������������������ͼ, �������С�����. \n"
-"������ѡ��װ�򲻰�װ������. �������ǰһ��ѡ����ָ��������������, ��������"
-"����ѡ������.\n"
+"���, ��������һ��������������������ͼ, �������С����ࡣ\n"
+"������ѡ��װ�򲻰�װ�����顣�������ǰһ��ѡ����ָ��������������, ��������"
+"����ѡ��������\n"
"\n"
-"��������ͼ��ѡ��һ��������ʱ, �ұ߻��������˵��. \n"
-"ѡ����Ҫ��װ����������, ���� ����װ�� ��ť.\n"
-"��ͬ��Ӳ�����úͲ�ͬ��������ѡ��, ��Ҫ��ͬ��ʱ������ɰ�װ.\n"
-"��Ļ�ϻ���ʾ��ɰ�װ���ƻ���Ҫ����ʱ��. \n"
-"�����������ж��Ƿ�Ӧ����ȥ����һ���ò�.\n"
+"��������ͼ��ѡ��һ��������ʱ, �ұ߻��������˵����\n"
+"ѡ����Ҫ��װ����������, ��������װ����ť��\n"
+"��ͬ��Ӳ�����úͲ�ͬ��������ѡ��, ��Ҫ��ͬ��ʱ������ɰ�װ��\n"
+"��Ļ�ϻ���ʾ��ɰ�װ���ƻ���Ҫ����ʱ�䡣\n"
+"�����������ж��Ƿ�Ӧ����ȥ����һ���ò衣\n"
"\n"
"!! �����ѡ����һ��������������, ����������Ļ�����Ϊ������ij����, \n"
-"���ᱻҪ��ȷ�����Ƿ����ϣ����װ�Ǹ�������. �� Mandrake Linux ��, һ����\n"
-"�ͻ��Զ��������а�װ�ķ�����. ������Щ���������ǰ�ȫ��, �����ڷ���ʱû����֪"
+"���ᱻҪ��ȷ�����Ƿ����ϣ����װ�Ǹ����������� Mandrake Linux ��, һ����\n"
+"�ͻ��Զ��������а�װ�ķ�������������Щ���������ǰ�ȫ��, �����ڷ���ʱû����֪"
"������\n"
-"�����п���������汾�� Mandrake Linux ���֮�����µİ�ȫ©��. \n"
-"�������̫����йصķ�������������ʲô����, ����ΪʲôҪ��װ��, ���� ���񡱡�"
-"������ ���ǡ� �г��ķ���������������װ, ����ȱʡ��������Щ���� ����\n"
+"�����п���������汾�� Mandrake Linux ���֮�����µİ�ȫ©����\n"
+"�������̫����йصķ�������������ʲô����, ����ΪʲôҪ��װ��, �������񡱡�"
+"���������ǡ��г��ķ���������������װ, ����ȱʡ��������Щ���� ����\n"
"\n"
-" ���Զ������ԡ� ѡ���ڰ�װ�����Զ�ѡ����Ҫ��������ʱ�����������.\n"
-"����װ����ȷ������ҪΪ������һ����������������Ҫ��, ���밲װ�����\n"
-"������ʱ, ���ͻ��Զ�ѡ��.\n"
+" ���Զ������ԡ�ѡ���ڰ�װ�����Զ�ѡ����Ҫ��������ʱ����������档\n"
+"����װ����ȷ������ҪΪ������һ����������������Ҫ��, ���밲װ�����\n"
+"������ʱ, ���ͻ��Զ�ѡ�С�\n"
"\n"
-"������ʹ����ǰ�İ�װʱ������������ѱ�. ����±ߵ��Ǹ�����ͼ��\n"
-"�ͻ�Ҫ���������ϴΰ�װ����ʱ������һ������. \n"
-"Ҫ�˽������������������, �뿴���һ������ʾ."
+"������ʹ����ǰ�İ�װʱ������������б�������±ߵ��Ǹ�����ͼ��\n"
+"�ͻ�Ҫ���������ϴΰ�װ����ʱ������һ�����̡�\n"
+"Ҫ�˽������������������, �뿴���һ������ʾ��"
#: ../../help.pm_.c:171
msgid ""
@@ -3102,23 +2896,23 @@ msgid ""
"If you wish to configure the network later after installation, or if you\n"
"are finished configuring your network connection, click \"Cancel\"."
msgstr ""
-"����������������������/����������. �����ϣ��\n"
+"����������������������/���������ӡ������ϣ��\n"
"�����ĵ������ӵ����������߱�������, ����\n"
-"��ȷ����. �⽫�����Զ���������豸�͵��ƽ����. ���\n"
-"���ʧ��, ����� ��ʹ���Զ���⡱ ѡ�������һ��. ��\n"
+"��ȷ�������⽫�����Զ���������豸�͵��ƽ���������\n"
+"���ʧ��, �������ʹ���Զ���⡱ѡ�������һ�Ρ���\n"
"Ҳ���Բ���������, �����Ժ�����; �������,\n"
-"ֻҪ�� ��ȡ���� ��ť.\n"
+"ֻҪ����ȡ������ť��\n"
"\n"
"֧�ֵ����ӷ�ʽ��: ��ͳ���ƽ����, ISDN ���ƽ����, ADSL ����,\n"
-"���ߵ��ӵ��ƽ����, ����Ǽ򵥵� LAN ���� (��̫��).\n"
+"���ߵ��ӵ��ƽ����, ����Ǽ򵥵� LAN ���� (��̫��)��\n"
"\n"
-"���Dz���������ϸ����ÿ�����ӷ�ʽ. ֻҪ��֤��\n"
+"���Dz���������ϸ����ÿ�����ӷ�ʽ��ֻҪ��֤��\n"
"�����Ļ����������̻����������Ա����\n"
-"�õ����б�Ҫ�IJ���.\n"
+"�õ����б�Ҫ�IJ�����\n"
"\n"
-"���Բο� ``�û��ֲ�'' �йػ��������ӵ��½�\n"
+"���Բο����û��ֲᡱ�йػ��������ӵ��½�\n"
"�˽����õ�ϸ��, Ҳ���Եȵ�����ϵͳ��װ����֮��\n"
-"ʹ���ֲ����ᵽ�ij����������."
+"ʹ���ֲ����ᵽ�ij���������á�"
#: ../../help.pm_.c:193
msgid ""
@@ -3138,10 +2932,10 @@ msgid ""
"enabled on a server. In general, select only the services you really need.\n"
"!!"
msgstr ""
-"����������ѡ���ڿ���ʱ������Щ����.\n"
+"����������ѡ���ڿ���ʱ������Щ����\n"
"\n"
-"�����г��˵�ǰ��װ�п��õ����з���. ����ϸ���, \n"
-"ȥ����Щ������ʱ������Ҫ�ķ���.\n"
+"�����г��˵�ǰ��װ�п��õ����з�������ϸ���, \n"
+"ȥ����Щ������ʱ������Ҫ�ķ���\n"
"\n"
"�ƶ�������굽ѡ������ᵯ��������ʾ, ����������������.\n"
"����, �������ȷ��ijһ�����񵽵��Ƿ���Ҫ,\n"
@@ -4073,7 +3867,7 @@ msgstr ""
"\n"
"�����ܲ�ϣ����ÿ����ʹ�������г�����������ϵͳ�� ��ֻҪ���йص���Ŀɾ���ͺ�"
"�ˡ�\n"
-"��������Ҫ��׼����Щ��������ϵͳ�Ŀ�������, ��������Ҫ��ʱ���������ǡ�"
+"��������Ҫ��׼����Щ��������ϵͳ��������, ��������Ҫ��ʱ���������ǡ�"
#: ../../help.pm_.c:732
msgid ""
@@ -4347,16 +4141,16 @@ msgid ""
"presented there is similar to the one used at installation time;\n"
"\n"
" * \"Sound card\": if a sound card is detected on your system, it will be\n"
-"displayed here. No modification possible at installation time;\n"
+"displayed here.\n"
"\n"
" * \"TV card\": if a TV card is detected on your system, it will be\n"
-"displayed here. No modification possible at installation time;\n"
+"displayed here.\n"
"\n"
" * \"ISDN card\": if an ISDN card is detected on your system, it will be\n"
"displayed here. You can click on the button to change the parameters\n"
"associated to it."
msgstr ""
-"�����г����й����ĵ��Եĸ�����Ϣ�� ��������װ��\n"
+"�����г����й����ĵ��Եĸ�����Ϣ����������װ��\n"
"��Ӳ����ͬ, �����ܿ���������Ŀ:\n"
"\n"
" * ����ꡱ: �鿴���ڵ��������, \n"
@@ -4366,12 +4160,12 @@ msgstr ""
"��Ҫ�Ļ�����޸İ�ť;\n"
"\n"
" * ��ʱ����: DrakX, ��ͨ����ѡ�������\n"
-"�²������ڵ�ʱ���� ������Ҳ����ʹ������\n"
+"�²������ڵ�ʱ����������Ҳ����ʹ������\n"
"ȴ�����й�, ��ô����Ҫ�����ʱ�����İ�ť\n"
"����ȷ����������ϵͳʱ��;\n"
"�Է�����������ʱ��;\n"
"\n"
-" * ����ӡ����: ��� ��û�д�ӡ���� ��ť\n"
+" * ����ӡ����: �����û�д�ӡ������ť\n"
"��������ӡ�����þ���;\n"
"\n"
" * ��������: �����������ϵͳ������, \n"
@@ -4403,11 +4197,11 @@ msgid ""
"Click on \"Cancel\" to stop this operation without losing any data and\n"
"partitions present on this hard drive."
msgstr ""
-"��� ��ȷ����ɾ����Ӳ���������ݼ�������\n"
-"ע�⣬��� ��ȷ�����������޷��ָ����ݼ�����(����Windows����)��\n"
+"�����ȷ����ɾ����Ӳ���������ݼ�������\n"
+"ע�⣬�����ȷ�����������޷��ָ����ݼ�����(����Windows����)��\n"
"\n"
"\n"
-"��� ��ȡ����ȡ�����������ݼ��������ᶪʧ��"
+"�����ȡ����ȡ�����������ݼ��������ᶪʧ��"
#: ../../install2.pm_.c:111
#, c-format
@@ -4417,7 +4211,7 @@ msgid ""
"Installation medium (please create a newer boot floppy)"
msgstr ""
"�޷���ȡ�������ں����׵��ں�ģ�� (ȱ���ļ� %s ), ͨ������Ϊ���������밲װ����"
-"������(�������µĿ�������)"
+"������(�������µ�������)"
#: ../../install2.pm_.c:167
#, c-format
@@ -4464,27 +4258,27 @@ msgstr ""
msgid "Can't use broadcast with no NIS domain"
msgstr "û��NIS��, �޷�ʹ�ù㲥"
-#: ../../install_any.pm_.c:870
+#: ../../install_any.pm_.c:879
#, c-format
msgid "Insert a FAT formatted floppy in drive %s"
msgstr "�����һ��DOS���̵������� %s"
-#: ../../install_any.pm_.c:874
+#: ../../install_any.pm_.c:883
msgid "This floppy is not FAT formatted"
msgstr "����DOS��ʽ������"
-#: ../../install_any.pm_.c:886
+#: ../../install_any.pm_.c:895
msgid ""
"To use this saved packages selection, boot installation with ``linux "
"defcfg=floppy''"
msgstr "ʹ�ñ����������ѡ��, ��''linux defcfg=floppy''����"
-#: ../../install_any.pm_.c:909 ../../partition_table.pm_.c:767
+#: ../../install_any.pm_.c:918 ../../partition_table.pm_.c:767
#, c-format
msgid "Error reading file %s"
msgstr "��ȡ�ļ� %s ���� "
-#: ../../install_any.pm_.c:1031
+#: ../../install_any.pm_.c:1040
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"
@@ -4492,7 +4286,7 @@ msgstr ""
"��������! �½��ļ�ϵͳʱ�Ҳ������õ��豸��\n"
"��������Ӳ����ȷ�������ԭ��!"
-#: ../../install_interactive.pm_.c:23
+#: ../../install_interactive.pm_.c:21
#, c-format
msgid ""
"Some hardware on your computer needs ``proprietary'' drivers to work.\n"
@@ -4501,7 +4295,7 @@ msgstr ""
"��ϵͳ�еIJ���Ӳ����Ҫ��ר�С�������������ܹ�����\n"
"�й����ǵ����, �����鿴: %s"
-#: ../../install_interactive.pm_.c:58
+#: ../../install_interactive.pm_.c:56
msgid ""
"You must have a root partition.\n"
"For this, create a partition (or click on an existing one).\n"
@@ -4511,11 +4305,11 @@ msgstr ""
"���ȴ���һ�� Linux ���� (����ͼ�е�����е�һ��)��\n"
"Ȼ�����б���ѡ��װ�ص㡱, ��Ϊ��/����"
-#: ../../install_interactive.pm_.c:63
+#: ../../install_interactive.pm_.c:61
msgid "You must have a swap partition"
msgstr "��������һ����������"
-#: ../../install_interactive.pm_.c:64
+#: ../../install_interactive.pm_.c:62
msgid ""
"You don't have a swap partition.\n"
"\n"
@@ -4525,59 +4319,59 @@ msgstr ""
"\n"
"Ҫ������?"
-#: ../../install_interactive.pm_.c:67 ../../install_steps.pm_.c:169
+#: ../../install_interactive.pm_.c:65 ../../install_steps.pm_.c:169
msgid "You must have a FAT partition mounted in /boot/efi"
msgstr "��������һ��FAT�������� /boot/efi"
-#: ../../install_interactive.pm_.c:92
+#: ../../install_interactive.pm_.c:90
msgid "Use free space"
msgstr "ʹ�ÿ��пռ�"
-#: ../../install_interactive.pm_.c:94
+#: ../../install_interactive.pm_.c:92
msgid "Not enough free space to allocate new partitions"
msgstr "û���㹻���пռ������·���"
-#: ../../install_interactive.pm_.c:102
+#: ../../install_interactive.pm_.c:100
msgid "Use existing partitions"
msgstr "ʹ���ִ�ķ���"
-#: ../../install_interactive.pm_.c:104
+#: ../../install_interactive.pm_.c:102
msgid "There is no existing partition to use"
msgstr "�ִ�ķ����޷�ʹ��"
-#: ../../install_interactive.pm_.c:111
+#: ../../install_interactive.pm_.c:109
msgid "Use the Windows partition for loopback"
msgstr "���� Windows ���������"
-#: ../../install_interactive.pm_.c:114
+#: ../../install_interactive.pm_.c:112
msgid "Which partition do you want to use for Linux4Win?"
msgstr "������Ҫ����һ��������� Linux4Win?"
-#: ../../install_interactive.pm_.c:116
+#: ../../install_interactive.pm_.c:114
msgid "Choose the sizes"
msgstr "ѡ���С"
-#: ../../install_interactive.pm_.c:117
+#: ../../install_interactive.pm_.c:115
msgid "Root partition size in MB: "
msgstr "��������С(MB): "
-#: ../../install_interactive.pm_.c:118
+#: ../../install_interactive.pm_.c:116
msgid "Swap partition size in MB: "
msgstr "����������С (MB): "
-#: ../../install_interactive.pm_.c:128
+#: ../../install_interactive.pm_.c:126
msgid "Use the free space on the Windows partition"
msgstr "ʹ���� Windows �����ϵĿ��пռ�"
-#: ../../install_interactive.pm_.c:131
+#: ../../install_interactive.pm_.c:129
msgid "Which partition do you want to resize?"
msgstr "����Ҫ�ı��ĸ������Ĵ�С?"
-#: ../../install_interactive.pm_.c:133
+#: ../../install_interactive.pm_.c:131
msgid "Resizing Windows partition"
msgstr "���� Windows �ļ�ϵͳ�ı߽�"
-#: ../../install_interactive.pm_.c:136
+#: ../../install_interactive.pm_.c:134
#, c-format
msgid ""
"The FAT resizer is unable to handle your partition, \n"
@@ -4586,7 +4380,7 @@ msgstr ""
"�ı� FAT ������С�ij����޷������������, \n"
"���������´���: %s"
-#: ../../install_interactive.pm_.c:139
+#: ../../install_interactive.pm_.c:137
msgid ""
"Your Windows partition is too fragmented. Please reboot your computer under "
"Windows, run the ``defrag'' utility, then restart the Mandrake Linux "
@@ -4595,7 +4389,7 @@ msgstr ""
"���� Windows ������̫����Ƭ, ����������, ���� Windows, ���С�defrag��Ȼ�����¿�"
"ʼ��װ Mandrake Linux"
-#: ../../install_interactive.pm_.c:140
+#: ../../install_interactive.pm_.c:138
msgid ""
"WARNING!\n"
"\n"
@@ -4613,52 +4407,52 @@ msgstr ""
"׼��, Ȼ�����¿�ʼ��װ��\n"
"һ�о�����, �밴��ȷ������"
-#: ../../install_interactive.pm_.c:150
+#: ../../install_interactive.pm_.c:148
msgid "Which size do you want to keep for Windows on"
msgstr "�����������ٿռ�� Windows?"
-#: ../../install_interactive.pm_.c:151
+#: ../../install_interactive.pm_.c:149
#, c-format
msgid "partition %s"
msgstr "���� %s"
-#: ../../install_interactive.pm_.c:158
+#: ../../install_interactive.pm_.c:156
#, c-format
msgid "FAT resizing failed: %s"
msgstr "�Զ�������Сʧ��: %s"
-#: ../../install_interactive.pm_.c:173
+#: ../../install_interactive.pm_.c:171
msgid ""
"There is no FAT partition to resize or to use as loopback (or not enough "
"space left)"
msgstr "û�п��Ե�����С���������ػ��� FAT ���� (����û���㹻ʣ��ռ�)"
-#: ../../install_interactive.pm_.c:179
+#: ../../install_interactive.pm_.c:177
msgid "Erase entire disk"
msgstr "�����������"
-#: ../../install_interactive.pm_.c:179
+#: ../../install_interactive.pm_.c:177
msgid "Remove Windows(TM)"
msgstr "ɾ�� Windows(TM)"
-#: ../../install_interactive.pm_.c:182
+#: ../../install_interactive.pm_.c:180
msgid "You have more than one hard drive, which one do you install linux on?"
msgstr "���в�ֻһ��Ӳ��, ��Ҫ���ĸ����氲װ Linux?"
-#: ../../install_interactive.pm_.c:185
+#: ../../install_interactive.pm_.c:183
#, c-format
msgid "ALL existing partitions and their data will be lost on drive %s"
msgstr "���� %s ���ִ�����з����������Ͻ������"
-#: ../../install_interactive.pm_.c:193
+#: ../../install_interactive.pm_.c:191
msgid "Custom disk partitioning"
msgstr "���Ʒ���"
-#: ../../install_interactive.pm_.c:197
+#: ../../install_interactive.pm_.c:195
msgid "Use fdisk"
msgstr "ʹ�� fdisk"
-#: ../../install_interactive.pm_.c:200
+#: ../../install_interactive.pm_.c:198
#, c-format
msgid ""
"You can now partition %s.\n"
@@ -4667,28 +4461,28 @@ msgstr ""
"�����ڿ����� %s ��������\n"
"����֮��, ��Ҫ������ `w' ����������޸�"
-#: ../../install_interactive.pm_.c:229
+#: ../../install_interactive.pm_.c:227
msgid "You don't have enough free space on your Windows partition"
msgstr "�� Windows ������û���㹻�Ŀ��пռ�"
-#: ../../install_interactive.pm_.c:245
+#: ../../install_interactive.pm_.c:243
msgid "I can't find any room for installing"
msgstr "���޷��ҵ���װ��Ҫ�Ŀռ�"
-#: ../../install_interactive.pm_.c:248
+#: ../../install_interactive.pm_.c:246
msgid "The DrakX Partitioning wizard found the following solutions:"
msgstr "DrakX �������ҵ����н���취:"
-#: ../../install_interactive.pm_.c:252
+#: ../../install_interactive.pm_.c:250
#, c-format
msgid "Partitioning failed: %s"
msgstr "����ʧ��: %s"
-#: ../../install_interactive.pm_.c:262
+#: ../../install_interactive.pm_.c:260
msgid "Bringing up the network"
msgstr "������������"
-#: ../../install_interactive.pm_.c:267
+#: ../../install_interactive.pm_.c:265
msgid "Bringing down the network"
msgstr "���ڽ������繦��"
@@ -4716,12 +4510,12 @@ msgstr ""
"����һ̨��װ�õĵ����ϼ�����, ������\n"
"��rpm -qpl Mandrake/RPMS/*.rpm��\n"
-#: ../../install_steps.pm_.c:452
+#: ../../install_steps.pm_.c:450
#, c-format
msgid "Welcome to %s"
msgstr "��ӭ���� %s"
-#: ../../install_steps.pm_.c:542 ../../install_steps.pm_.c:781
+#: ../../install_steps.pm_.c:543 ../../install_steps.pm_.c:769
msgid "No floppy drive available"
msgstr "û�п��õ�����������"
@@ -4731,7 +4525,7 @@ msgstr "û�п��õ�����������"
msgid "Entering step `%s'\n"
msgstr "���벽�衰%s��\n"
-#: ../../install_steps_gtk.pm_.c:150
+#: ../../install_steps_gtk.pm_.c:146
msgid ""
"Your system is low on resources. You may have some problem installing\n"
"Mandrake Linux. If that occurs, you can try a text install instead. For "
@@ -4742,77 +4536,77 @@ msgstr ""
"�������, �����Գ����ı�ģʽ�İ�װ��\n"
"�ڴӹ��������󰴡�F1����, Ȼ������ 'text'��"
-#: ../../install_steps_gtk.pm_.c:161 ../../install_steps_interactive.pm_.c:231
+#: ../../install_steps_gtk.pm_.c:157 ../../install_steps_interactive.pm_.c:237
msgid "Install Class"
msgstr "��װ���"
-#: ../../install_steps_gtk.pm_.c:164
+#: ../../install_steps_gtk.pm_.c:160
msgid "Please choose one of the following classes of installation:"
msgstr "������а�װ�����ѡ��һ��:"
-#: ../../install_steps_gtk.pm_.c:237 ../../install_steps_interactive.pm_.c:676
+#: ../../install_steps_gtk.pm_.c:236 ../../install_steps_interactive.pm_.c:683
msgid "Package Group Selection"
msgstr "������ѡ��"
-#: ../../install_steps_gtk.pm_.c:270 ../../install_steps_interactive.pm_.c:691
+#: ../../install_steps_gtk.pm_.c:269 ../../install_steps_interactive.pm_.c:698
msgid "Individual package selection"
msgstr "ѡ�񵥸�������"
-#: ../../install_steps_gtk.pm_.c:293 ../../install_steps_interactive.pm_.c:614
+#: ../../install_steps_gtk.pm_.c:292 ../../install_steps_interactive.pm_.c:621
#, c-format
msgid "Total size: %d / %d MB"
msgstr "�ܹ���С: %d / %d MB"
-#: ../../install_steps_gtk.pm_.c:335
+#: ../../install_steps_gtk.pm_.c:334
msgid "Bad package"
msgstr "���������"
-#: ../../install_steps_gtk.pm_.c:336
+#: ../../install_steps_gtk.pm_.c:335
#, c-format
msgid "Name: %s\n"
msgstr "����: %s\n"
-#: ../../install_steps_gtk.pm_.c:337
+#: ../../install_steps_gtk.pm_.c:336
#, c-format
msgid "Version: %s\n"
msgstr "�汾: %s\n"
-#: ../../install_steps_gtk.pm_.c:338
+#: ../../install_steps_gtk.pm_.c:337
#, c-format
msgid "Size: %d KB\n"
msgstr "��С: %d KB\n"
-#: ../../install_steps_gtk.pm_.c:339
+#: ../../install_steps_gtk.pm_.c:338
#, c-format
msgid "Importance: %s\n"
msgstr "��Ҫ��: %s\n"
-#: ../../install_steps_gtk.pm_.c:361
+#: ../../install_steps_gtk.pm_.c:360
msgid ""
"You can't select this package as there is not enough space left to install it"
msgstr "��������ѡ������������� û���㹻�ռ䰲װ����"
-#: ../../install_steps_gtk.pm_.c:366
+#: ../../install_steps_gtk.pm_.c:365
msgid "The following packages are going to be installed"
msgstr "������������Ҫ����װ"
-#: ../../install_steps_gtk.pm_.c:367
+#: ../../install_steps_gtk.pm_.c:366
msgid "The following packages are going to be removed"
msgstr "������������Ҫ��ж��"
-#: ../../install_steps_gtk.pm_.c:379
+#: ../../install_steps_gtk.pm_.c:378
msgid "You can't select/unselect this package"
msgstr "�����ܸı������������ѡ��"
-#: ../../install_steps_gtk.pm_.c:391
+#: ../../install_steps_gtk.pm_.c:390
msgid "This is a mandatory package, it can't be unselected"
msgstr "����������DZ����, ����ȡ��ѡ��"
-#: ../../install_steps_gtk.pm_.c:393
+#: ../../install_steps_gtk.pm_.c:392
msgid "You can't unselect this package. It is already installed"
msgstr "��������ȡ��ѡ������������� ���Ѿ���װ����"
-#: ../../install_steps_gtk.pm_.c:396
+#: ../../install_steps_gtk.pm_.c:395
msgid ""
"This package must be upgraded.\n"
"Are you sure you want to deselect it?"
@@ -4820,74 +4614,74 @@ msgstr ""
"����������������������\n"
"�����Ҫɾ������?"
-#: ../../install_steps_gtk.pm_.c:399
+#: ../../install_steps_gtk.pm_.c:398
msgid "You can't unselect this package. It must be upgraded"
msgstr "�����ܲ�ѡ�����������������������"
-#: ../../install_steps_gtk.pm_.c:404
+#: ../../install_steps_gtk.pm_.c:403
msgid "Show automatically selected packages"
msgstr "��ʾ�Զ�ѡ�е�������"
-#: ../../install_steps_gtk.pm_.c:405 ../../install_steps_interactive.pm_.c:255
-#: ../../install_steps_interactive.pm_.c:259
-#: ../../standalone/drakbackup_.c:4259
+#: ../../install_steps_gtk.pm_.c:404 ../../install_steps_interactive.pm_.c:261
+#: ../../install_steps_interactive.pm_.c:265
+#: ../../standalone/drakbackup_.c:4211
msgid "Install"
msgstr "��װ"
-#: ../../install_steps_gtk.pm_.c:408
+#: ../../install_steps_gtk.pm_.c:407
msgid "Load/Save on floppy"
msgstr "��������/����"
-#: ../../install_steps_gtk.pm_.c:409
+#: ../../install_steps_gtk.pm_.c:408
msgid "Updating package selection"
msgstr "����������ѡ��"
-#: ../../install_steps_gtk.pm_.c:414
+#: ../../install_steps_gtk.pm_.c:413
msgid "Minimal install"
msgstr "��С��װ"
-#: ../../install_steps_gtk.pm_.c:429 ../../install_steps_interactive.pm_.c:522
+#: ../../install_steps_gtk.pm_.c:428 ../../install_steps_interactive.pm_.c:529
msgid "Choose the packages you want to install"
msgstr "ѡ����Ҫ��װ��������"
-#: ../../install_steps_gtk.pm_.c:445 ../../install_steps_interactive.pm_.c:760
+#: ../../install_steps_gtk.pm_.c:444 ../../install_steps_interactive.pm_.c:767
msgid "Installing"
msgstr "���ڰ�װ"
-#: ../../install_steps_gtk.pm_.c:451
+#: ../../install_steps_gtk.pm_.c:450
msgid "Estimating"
msgstr "���ڹ���"
-#: ../../install_steps_gtk.pm_.c:458
+#: ../../install_steps_gtk.pm_.c:457
msgid "Time remaining "
msgstr "ʣ��ʱ��"
-#: ../../install_steps_gtk.pm_.c:470
+#: ../../install_steps_gtk.pm_.c:469
msgid "Please wait, preparing installation..."
msgstr "���Ժ�, ����׼����װ..."
-#: ../../install_steps_gtk.pm_.c:554
+#: ../../install_steps_gtk.pm_.c:551
#, c-format
msgid "%d packages"
msgstr "%d ��������"
-#: ../../install_steps_gtk.pm_.c:559
+#: ../../install_steps_gtk.pm_.c:556
#, c-format
msgid "Installing package %s"
msgstr "���ڰ�װ�� %s"
-#: ../../install_steps_gtk.pm_.c:596 ../../install_steps_interactive.pm_.c:189
-#: ../../install_steps_interactive.pm_.c:784
-#: ../../standalone/drakautoinst_.c:202
+#: ../../install_steps_gtk.pm_.c:593 ../../install_steps_interactive.pm_.c:195
+#: ../../install_steps_interactive.pm_.c:791
+#: ../../standalone/drakautoinst_.c:197
msgid "Accept"
msgstr "����"
-#: ../../install_steps_gtk.pm_.c:596 ../../install_steps_interactive.pm_.c:189
-#: ../../install_steps_interactive.pm_.c:784
+#: ../../install_steps_gtk.pm_.c:593 ../../install_steps_interactive.pm_.c:195
+#: ../../install_steps_interactive.pm_.c:791
msgid "Refuse"
msgstr "�ܾ�"
-#: ../../install_steps_gtk.pm_.c:597 ../../install_steps_interactive.pm_.c:785
+#: ../../install_steps_gtk.pm_.c:594 ../../install_steps_interactive.pm_.c:792
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -4901,17 +4695,17 @@ msgstr ""
"�����������в�����С�%s���Ĺ���, Ȼ������ȷ������\n"
"�����û�����Ź���, ������ȡ����, ������װ��������ϵ�������"
-#: ../../install_steps_gtk.pm_.c:611 ../../install_steps_gtk.pm_.c:615
-#: ../../install_steps_interactive.pm_.c:797
-#: ../../install_steps_interactive.pm_.c:801
+#: ../../install_steps_gtk.pm_.c:608 ../../install_steps_gtk.pm_.c:612
+#: ../../install_steps_interactive.pm_.c:804
+#: ../../install_steps_interactive.pm_.c:808
msgid "Go on anyway?"
msgstr "���Ҫ����?"
-#: ../../install_steps_gtk.pm_.c:611 ../../install_steps_interactive.pm_.c:797
+#: ../../install_steps_gtk.pm_.c:608 ../../install_steps_interactive.pm_.c:804
msgid "There was an error ordering packages:"
msgstr "����������ʱ����"
-#: ../../install_steps_gtk.pm_.c:615 ../../install_steps_interactive.pm_.c:801
+#: ../../install_steps_gtk.pm_.c:612 ../../install_steps_interactive.pm_.c:808
msgid "There was an error installing packages:"
msgstr "��װ������ʱ����:"
@@ -5179,108 +4973,108 @@ msgstr ""
"\n"
"�������ķ����Ϊ���������⣬������Ϊ������;������Э��Ӣ���ı�Ϊ׼��\n"
-#: ../../install_steps_interactive.pm_.c:191
+#: ../../install_steps_interactive.pm_.c:197
msgid "Are you sure you refuse the licence?"
msgstr "����ľܾ��������Э����?"
-#: ../../install_steps_interactive.pm_.c:211
-#: ../../install_steps_interactive.pm_.c:1021
-#: ../../standalone/keyboarddrake_.c:31
+#: ../../install_steps_interactive.pm_.c:217
+#: ../../install_steps_interactive.pm_.c:995
+#: ../../standalone/keyboarddrake_.c:25
msgid "Keyboard"
msgstr "����"
-#: ../../install_steps_interactive.pm_.c:212
+#: ../../install_steps_interactive.pm_.c:218
msgid "Please choose your keyboard layout."
msgstr "��ѡ����ʹ�õļ��̲��֡�"
-#: ../../install_steps_interactive.pm_.c:213
+#: ../../install_steps_interactive.pm_.c:219
msgid "Here is the full list of keyboards available"
msgstr "�����嵥"
-#: ../../install_steps_interactive.pm_.c:231
+#: ../../install_steps_interactive.pm_.c:237
msgid "Which installation class do you want?"
msgstr "����Ҫ��ʲô���İ�װ?"
-#: ../../install_steps_interactive.pm_.c:235
+#: ../../install_steps_interactive.pm_.c:241
msgid "Install/Update"
msgstr "��װ/����"
-#: ../../install_steps_interactive.pm_.c:235
+#: ../../install_steps_interactive.pm_.c:241
msgid "Is this an install or an update?"
msgstr "Ҫ��װ��ϵͳ��������ԭ��ϵͳ?"
-#: ../../install_steps_interactive.pm_.c:244
+#: ../../install_steps_interactive.pm_.c:250
msgid "Recommended"
msgstr "�Ƽ�"
-#: ../../install_steps_interactive.pm_.c:247
-#: ../../install_steps_interactive.pm_.c:250
+#: ../../install_steps_interactive.pm_.c:253
+#: ../../install_steps_interactive.pm_.c:256
msgid "Expert"
msgstr "ר��"
-#: ../../install_steps_interactive.pm_.c:255
-#: ../../install_steps_interactive.pm_.c:259
+#: ../../install_steps_interactive.pm_.c:261
+#: ../../install_steps_interactive.pm_.c:265
msgid "Upgrade"
msgstr "����"
-#: ../../install_steps_interactive.pm_.c:255
-#: ../../install_steps_interactive.pm_.c:259
+#: ../../install_steps_interactive.pm_.c:261
+#: ../../install_steps_interactive.pm_.c:265
msgid "Upgrade packages only"
msgstr "ֻ����������"
-#: ../../install_steps_interactive.pm_.c:275
+#: ../../install_steps_interactive.pm_.c:282
msgid "Please choose the type of your mouse."
msgstr "��ѡ������������͡�"
-#: ../../install_steps_interactive.pm_.c:281 ../../standalone/mousedrake_.c:60
+#: ../../install_steps_interactive.pm_.c:288 ../../standalone/mousedrake_.c:52
msgid "Mouse Port"
msgstr "���˿�"
-#: ../../install_steps_interactive.pm_.c:282 ../../standalone/mousedrake_.c:61
+#: ../../install_steps_interactive.pm_.c:289 ../../standalone/mousedrake_.c:53
msgid "Please choose on which serial port your mouse is connected to."
msgstr "��ѡ��������������ӵ��Ǹ����пڡ�"
-#: ../../install_steps_interactive.pm_.c:290
+#: ../../install_steps_interactive.pm_.c:297
msgid "Buttons emulation"
msgstr "����ģ��"
-#: ../../install_steps_interactive.pm_.c:292
+#: ../../install_steps_interactive.pm_.c:299
msgid "Button 2 Emulation"
msgstr "2��ģ��"
-#: ../../install_steps_interactive.pm_.c:293
+#: ../../install_steps_interactive.pm_.c:300
msgid "Button 3 Emulation"
msgstr "3��ģ��"
-#: ../../install_steps_interactive.pm_.c:314
+#: ../../install_steps_interactive.pm_.c:321
msgid "Configuring PCMCIA cards..."
msgstr "���� PCMCIA ��"
-#: ../../install_steps_interactive.pm_.c:314
+#: ../../install_steps_interactive.pm_.c:321
msgid "PCMCIA"
msgstr "PCMCIA"
-#: ../../install_steps_interactive.pm_.c:321
+#: ../../install_steps_interactive.pm_.c:328
msgid "Configuring IDE"
msgstr "�������� IDE"
-#: ../../install_steps_interactive.pm_.c:321
+#: ../../install_steps_interactive.pm_.c:328
msgid "IDE"
msgstr "IDE"
-#: ../../install_steps_interactive.pm_.c:338
+#: ../../install_steps_interactive.pm_.c:345
msgid "No partition available"
msgstr "û�п��õ�Ӳ�̷���"
-#: ../../install_steps_interactive.pm_.c:341
+#: ../../install_steps_interactive.pm_.c:348
msgid "Scanning partitions to find mount points"
msgstr "����ɨ�����������Ѱ��װ�ص�"
-#: ../../install_steps_interactive.pm_.c:349
+#: ../../install_steps_interactive.pm_.c:356
msgid "Choose the mount points"
msgstr "ѡ��װ�ص�"
-#: ../../install_steps_interactive.pm_.c:379
+#: ../../install_steps_interactive.pm_.c:386
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"
@@ -5288,74 +5082,74 @@ msgstr ""
"�޷��������������ռ�(1MB)! ��װ������, ����������ϵͳ, ������DiskDrake������"
"������"
-#: ../../install_steps_interactive.pm_.c:388
+#: ../../install_steps_interactive.pm_.c:395
msgid "No root partition found to perform an upgrade"
msgstr "û���ҵ����Խ��������ĸ�����"
-#: ../../install_steps_interactive.pm_.c:389
+#: ../../install_steps_interactive.pm_.c:396
msgid "Root Partition"
msgstr "������"
-#: ../../install_steps_interactive.pm_.c:390
+#: ../../install_steps_interactive.pm_.c:397
msgid "What is the root partition (/) of your system?"
msgstr "���ĸ�����(/)����һ��?"
-#: ../../install_steps_interactive.pm_.c:404
+#: ../../install_steps_interactive.pm_.c:411
msgid "You need to reboot for the partition table modifications to take place"
msgstr "������Ҫ��������ʹ�ı���Ч"
-#: ../../install_steps_interactive.pm_.c:428
+#: ../../install_steps_interactive.pm_.c:435
msgid "Choose the partitions you want to format"
msgstr "��ѡ����Ҫ��ʽ���ķ���"
-#: ../../install_steps_interactive.pm_.c:429
+#: ../../install_steps_interactive.pm_.c:436
msgid "Check bad blocks?"
msgstr "�Ƿ��黵�ſ�?"
-#: ../../install_steps_interactive.pm_.c:456
+#: ../../install_steps_interactive.pm_.c:463
msgid "Formatting partitions"
msgstr "���ڸ�ʽ����������"
-#: ../../install_steps_interactive.pm_.c:458
+#: ../../install_steps_interactive.pm_.c:465
#, c-format
msgid "Creating and formatting file %s"
msgstr "���ڴ����͸�ʽ���ļ� %s"
-#: ../../install_steps_interactive.pm_.c:463
+#: ../../install_steps_interactive.pm_.c:470
#, 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:465
+#: ../../install_steps_interactive.pm_.c:472
msgid "Not enough swap space to fulfill installation, please add some"
msgstr "�����ռ�̫��, �޷���ɰ�װ, �����󽻻�������"
-#: ../../install_steps_interactive.pm_.c:472
+#: ../../install_steps_interactive.pm_.c:479
msgid "Looking for available packages and rebuilding rpm database..."
msgstr "����Ѱ�ҿɰ�װ�ij����ؽ� rpm ���ݿ�..."
-#: ../../install_steps_interactive.pm_.c:473
+#: ../../install_steps_interactive.pm_.c:480
msgid "Looking for available packages..."
msgstr "����Ѱ�ҿɰ�װ�ij���..."
-#: ../../install_steps_interactive.pm_.c:476
+#: ../../install_steps_interactive.pm_.c:483
msgid "Looking at packages already installed..."
msgstr "���ڲ����Ѿ���װ����������..."
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:487
msgid "Finding packages to upgrade..."
msgstr "����Ѱ�ҿ������ij���..."
-#: ../../install_steps_interactive.pm_.c:498
+#: ../../install_steps_interactive.pm_.c:505
#, 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:534
+#: ../../install_steps_interactive.pm_.c:541
msgid ""
"Please choose load or save package selection on floppy.\n"
"The format is the same as auto_install generated floppies."
@@ -5363,53 +5157,53 @@ msgstr ""
"��ѡ������������򱣴�������ѡ����Ϣ��\n"
"��ʽ���Զ���װ���ɵ�����һ����"
-#: ../../install_steps_interactive.pm_.c:536
+#: ../../install_steps_interactive.pm_.c:543
msgid "Load from floppy"
msgstr "����������"
-#: ../../install_steps_interactive.pm_.c:536
+#: ../../install_steps_interactive.pm_.c:543
msgid "Save on floppy"
msgstr "����������"
-#: ../../install_steps_interactive.pm_.c:540
+#: ../../install_steps_interactive.pm_.c:547
msgid "Loading from floppy"
msgstr "������������"
-#: ../../install_steps_interactive.pm_.c:540
+#: ../../install_steps_interactive.pm_.c:547
msgid "Package selection"
msgstr "������ѡ��"
-#: ../../install_steps_interactive.pm_.c:545
+#: ../../install_steps_interactive.pm_.c:552
msgid "Insert a floppy containing package selection"
msgstr "�����������ѡ������"
-#: ../../install_steps_interactive.pm_.c:627
+#: ../../install_steps_interactive.pm_.c:634
msgid "Selected size is larger than available space"
msgstr "��ѡ��ij������ÿռ�"
-#: ../../install_steps_interactive.pm_.c:642
+#: ../../install_steps_interactive.pm_.c:649
msgid "Type of install"
msgstr "��װ����"
-#: ../../install_steps_interactive.pm_.c:643
+#: ../../install_steps_interactive.pm_.c:650
msgid ""
"You haven't selected any group of packages.\n"
"Please choose the minimal installation you want:"
msgstr "��û��ѡ���κε����, ��ѡ����С��װ:"
-#: ../../install_steps_interactive.pm_.c:646
+#: ../../install_steps_interactive.pm_.c:653
msgid "With X"
msgstr "��װ X Window ϵͳ"
-#: ../../install_steps_interactive.pm_.c:648
+#: ../../install_steps_interactive.pm_.c:655
msgid "With basic documentation (recommended!)"
msgstr "��װ�����ĵ� (����)"
-#: ../../install_steps_interactive.pm_.c:649
+#: ../../install_steps_interactive.pm_.c:656
msgid "Truly minimal install (especially no urpmi)"
msgstr "������С��װ (ע��û�� urpmi ����������)"
-#: ../../install_steps_interactive.pm_.c:734
+#: ../../install_steps_interactive.pm_.c:741
msgid ""
"If you have all the CDs in the list below, click Ok.\n"
"If you have none of those CDs, click Cancel.\n"
@@ -5419,16 +5213,16 @@ msgstr ""
"�����û���κ�һ��, ��� ȡ����\n"
"�����ȱ������һ��, �������ѡ�б��, Ȼ���� ȷ�ϡ�"
-#: ../../install_steps_interactive.pm_.c:739
+#: ../../install_steps_interactive.pm_.c:746
#, c-format
msgid "Cd-Rom labeled \"%s\""
msgstr "��� %s ����"
-#: ../../install_steps_interactive.pm_.c:760
+#: ../../install_steps_interactive.pm_.c:767
msgid "Preparing installation"
msgstr "����׼����װ"
-#: ../../install_steps_interactive.pm_.c:769
+#: ../../install_steps_interactive.pm_.c:776
#, c-format
msgid ""
"Installing package %s\n"
@@ -5437,84 +5231,21 @@ msgstr ""
"���ڰ�װ������ %s \n"
"%d%%"
-#: ../../install_steps_interactive.pm_.c:815
+#: ../../install_steps_interactive.pm_.c:822
msgid "Post-install configuration"
msgstr "��װ�������"
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../install_steps_interactive.pm_.c:828
#, c-format
msgid "Please insert the Boot floppy used in drive %s"
msgstr "�����һ���������̵������� %s"
-#: ../../install_steps_interactive.pm_.c:827
+#: ../../install_steps_interactive.pm_.c:834
#, c-format
msgid "Please insert the Update Modules floppy in drive %s"
msgstr "���������� %s �в���һ�Ÿ���ģ������"
-#: ../../install_steps_interactive.pm_.c:847
-msgid ""
-"You now have the opportunity to download encryption software.\n"
-"\n"
-"WARNING:\n"
-"\n"
-"Due to different general requirements applicable to these software and "
-"imposed\n"
-"by various jurisdictions, customer and/or end user of theses software "
-"should\n"
-"ensure that the laws of his/their jurisdiction allow him/them to download, "
-"stock\n"
-"and/or use these software.\n"
-"\n"
-"In addition customer and/or end user shall particularly be aware to not "
-"infringe\n"
-"the laws of his/their jurisdiction. Should customer and/or end user not\n"
-"respect the provision of these applicable laws, he/they will incure serious\n"
-"sanctions.\n"
-"\n"
-"In no event shall Mandrakesoft nor its manufacturers and/or suppliers be "
-"liable\n"
-"for special, indirect or incidental damages whatsoever (including, but not\n"
-"limited to loss of profits, business interruption, loss of commercial data "
-"and\n"
-"other pecuniary losses, and eventual liabilities and indemnification to be "
-"paid\n"
-"pursuant to a court decision) arising out of use, possession, or the sole\n"
-"downloading of these software, to which customer and/or end user could\n"
-"eventually have access after having sign up the present agreement.\n"
-"\n"
-"\n"
-"For any queries relating to these agreement, please contact \n"
-"Mandrakesoft, Inc.\n"
-"2400 N. Lincoln Avenue Suite 243\n"
-"Altadena California 91001\n"
-"USA"
-msgstr ""
-"������Ҫ�����Ƿ��������ڼ��ܵ���������\n"
-"\n"
-"����!\n"
-"\n"
-"�ڲ�ͬ�ķ����ƶ���, ��������Щ������һ��Ҫ���ǿ�ƽ����кܴ�ͬ��\n"
-"�ͻ���/�������û�����������˽����ڹ��ҵķ����Ƿ������Լ�����, ����, ��/��\n"
-"ʹ����Щ������\n"
-"\n"
-"����, �ͻ���/�������û��������, ����Υ�����ڹ��ҵķ��ɡ�Υ���й����÷��ɽ�"
-"��\n"
-"�ĺ��, �������ܵ������ijͷ���\n"
-"\n"
-"�ͻ���/�������û���ͬ��ǩ������Э��֮��, ���ۺ������, Mandrakesoft, �Լ���\n"
-"�����̺;�����, ���е��κ�����, ��ʹ�ͻ���/�������û�������, ӵ�к�/��ʹ��\n"
-"��Щ�����������κ��ض���, ��ӵĻ򸽴����� (����, ���������������ʧ, ��"
-"��\n"
-"���ж�, �ؼ����ݵĶ�ʧ������������ʧ, �Ϳ����ɷ�Ժ�о�������ծ����⳥)��\n"
-"\n"
-"\n"
-"��������Э����κ�����, ����ϵ\n"
-"Mandrakesoft, Inc.\n"
-"2400 N. Lincoln Avenue Suite 243\n"
-"Altadena California 91001\n"
-"USA"
-
-#: ../../install_steps_interactive.pm_.c:886
+#: ../../install_steps_interactive.pm_.c:861
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
"have been released after the distribution was released. They may\n"
@@ -5532,154 +5263,154 @@ msgstr ""
"\n"
"���Ƿ�Ҫ��װ������?"
-#: ../../install_steps_interactive.pm_.c:901
+#: ../../install_steps_interactive.pm_.c:876
msgid ""
"Contacting Mandrake Linux web site to get the list of available mirrors..."
msgstr "�������� Mandrake Linux ��վ�Ի�þ�����վ�б�..."
-#: ../../install_steps_interactive.pm_.c:906
+#: ../../install_steps_interactive.pm_.c:881
msgid "Choose a mirror from which to get the packages"
msgstr "ѡ��һ��������վ��ȡ�ó���"
-#: ../../install_steps_interactive.pm_.c:915
+#: ../../install_steps_interactive.pm_.c:890
msgid "Contacting the mirror to get the list of available packages..."
msgstr "�������Ӿ�����վ��ȡ�ÿɹ���װ������б�..."
-#: ../../install_steps_interactive.pm_.c:943
+#: ../../install_steps_interactive.pm_.c:918
msgid "Which is your timezone?"
msgstr "�����ڵ�ʱ��?"
-#: ../../install_steps_interactive.pm_.c:948
+#: ../../install_steps_interactive.pm_.c:923
msgid "Hardware clock set to GMT"
msgstr "����ϵͳʱ���趨Ϊ GMT"
-#: ../../install_steps_interactive.pm_.c:949
+#: ../../install_steps_interactive.pm_.c:924
msgid "Automatic time synchronization (using NTP)"
msgstr "�Զ�ʱ��ͬ��(ʹ��NTP)"
-#: ../../install_steps_interactive.pm_.c:956
+#: ../../install_steps_interactive.pm_.c:931
msgid "NTP Server"
msgstr "NTP ������"
-#: ../../install_steps_interactive.pm_.c:990
-#: ../../install_steps_interactive.pm_.c:998
+#: ../../install_steps_interactive.pm_.c:965
+#: ../../install_steps_interactive.pm_.c:972
msgid "Remote CUPS server"
msgstr "Զ�� CUPS ������"
-#: ../../install_steps_interactive.pm_.c:991
+#: ../../install_steps_interactive.pm_.c:966
msgid "No printer"
msgstr "û�д�ӡ��"
-#: ../../install_steps_interactive.pm_.c:1008
+#: ../../install_steps_interactive.pm_.c:982
msgid "Do you have an ISA sound card?"
msgstr "���� ISA ������?"
-#: ../../install_steps_interactive.pm_.c:1010
+#: ../../install_steps_interactive.pm_.c:984
msgid "Run \"sndconfig\" after installation to configure your sound card"
msgstr "��װ֮�����С�sndconfig����������������"
-#: ../../install_steps_interactive.pm_.c:1012
+#: ../../install_steps_interactive.pm_.c:986
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr "û���ҵ�����. ���ڰ�װ֮���ԡ�harddrake����"
-#: ../../install_steps_interactive.pm_.c:1017 ../../steps.pm_.c:27
+#: ../../install_steps_interactive.pm_.c:991 ../../steps.pm_.c:27
msgid "Summary"
msgstr "��Ҫ"
-#: ../../install_steps_interactive.pm_.c:1020
+#: ../../install_steps_interactive.pm_.c:994
msgid "Mouse"
msgstr "���"
-#: ../../install_steps_interactive.pm_.c:1022
+#: ../../install_steps_interactive.pm_.c:996
msgid "Timezone"
msgstr "ʱ��"
-#: ../../install_steps_interactive.pm_.c:1023 ../../printerdrake.pm_.c:2989
-#: ../../printerdrake.pm_.c:3078
+#: ../../install_steps_interactive.pm_.c:997
+#: ../../printer/printerdrake.pm_.c:2759 ../../printer/printerdrake.pm_.c:2844
msgid "Printer"
msgstr "��ӡ��"
-#: ../../install_steps_interactive.pm_.c:1025
+#: ../../install_steps_interactive.pm_.c:999
msgid "ISDN card"
msgstr "���� ISDN ��"
-#: ../../install_steps_interactive.pm_.c:1028
-#: ../../install_steps_interactive.pm_.c:1030
+#: ../../install_steps_interactive.pm_.c:1003
+#: ../../install_steps_interactive.pm_.c:1009
msgid "Sound card"
msgstr "����"
-#: ../../install_steps_interactive.pm_.c:1033
+#: ../../install_steps_interactive.pm_.c:1012
msgid "TV card"
msgstr "TV ��"
-#: ../../install_steps_interactive.pm_.c:1075
-#: ../../install_steps_interactive.pm_.c:1100
-#: ../../install_steps_interactive.pm_.c:1104
+#: ../../install_steps_interactive.pm_.c:1055
+#: ../../install_steps_interactive.pm_.c:1080
+#: ../../install_steps_interactive.pm_.c:1084
msgid "LDAP"
msgstr "LDAP"
-#: ../../install_steps_interactive.pm_.c:1076
-#: ../../install_steps_interactive.pm_.c:1100
-#: ../../install_steps_interactive.pm_.c:1113
+#: ../../install_steps_interactive.pm_.c:1056
+#: ../../install_steps_interactive.pm_.c:1080
+#: ../../install_steps_interactive.pm_.c:1093
msgid "NIS"
msgstr "NIS"
-#: ../../install_steps_interactive.pm_.c:1077
-#: ../../install_steps_interactive.pm_.c:1100
-#: ../../install_steps_interactive.pm_.c:1121
-#: ../../install_steps_interactive.pm_.c:1127
+#: ../../install_steps_interactive.pm_.c:1057
+#: ../../install_steps_interactive.pm_.c:1080
+#: ../../install_steps_interactive.pm_.c:1101
+#: ../../install_steps_interactive.pm_.c:1107
msgid "Windows Domain"
msgstr "Windows ��"
-#: ../../install_steps_interactive.pm_.c:1078
-#: ../../install_steps_interactive.pm_.c:1100
+#: ../../install_steps_interactive.pm_.c:1058
+#: ../../install_steps_interactive.pm_.c:1080
msgid "Local files"
msgstr "�����ļ�"
-#: ../../install_steps_interactive.pm_.c:1087
-#: ../../install_steps_interactive.pm_.c:1088 ../../steps.pm_.c:24
+#: ../../install_steps_interactive.pm_.c:1067
+#: ../../install_steps_interactive.pm_.c:1068 ../../steps.pm_.c:24
msgid "Set root password"
msgstr "�����û�����"
-#: ../../install_steps_interactive.pm_.c:1089
+#: ../../install_steps_interactive.pm_.c:1069
msgid "No password"
msgstr "û�п���"
-#: ../../install_steps_interactive.pm_.c:1094
+#: ../../install_steps_interactive.pm_.c:1074
#, c-format
msgid "This password is too short (it must be at least %d characters long)"
msgstr "�������̫���� (����Ҫ�� %d ���ַ�)"
-#: ../../install_steps_interactive.pm_.c:1100 ../../network/modem.pm_.c:49
-#: ../../standalone/drakconnect_.c:625 ../../standalone/logdrake_.c:173
+#: ../../install_steps_interactive.pm_.c:1080 ../../network/modem.pm_.c:72
+#: ../../standalone/drakconnect_.c:623 ../../standalone/logdrake_.c:144
msgid "Authentication"
msgstr "��֤"
-#: ../../install_steps_interactive.pm_.c:1108
+#: ../../install_steps_interactive.pm_.c:1088
msgid "Authentication LDAP"
msgstr "LDAP ��֤"
-#: ../../install_steps_interactive.pm_.c:1109
+#: ../../install_steps_interactive.pm_.c:1089
msgid "LDAP Base dn"
msgstr "LDAP ����Ŀ¼�� dn"
-#: ../../install_steps_interactive.pm_.c:1110
+#: ../../install_steps_interactive.pm_.c:1090
msgid "LDAP Server"
msgstr "LDAP ������"
-#: ../../install_steps_interactive.pm_.c:1116
+#: ../../install_steps_interactive.pm_.c:1096
msgid "Authentication NIS"
msgstr "NIS ��֤"
-#: ../../install_steps_interactive.pm_.c:1117
+#: ../../install_steps_interactive.pm_.c:1097
msgid "NIS Domain"
msgstr "NIS ����"
-#: ../../install_steps_interactive.pm_.c:1118
+#: ../../install_steps_interactive.pm_.c:1098
msgid "NIS Server"
msgstr "NIS ������"
-#: ../../install_steps_interactive.pm_.c:1124
+#: ../../install_steps_interactive.pm_.c:1104
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 /"
@@ -5703,19 +5434,19 @@ msgstr ""
"���� -U �û�%����������� Windows(tm) ����, �͹���Ա���û���/���\n"
"���wbinfo -t�������������֤�����Ƿ���á�"
-#: ../../install_steps_interactive.pm_.c:1126
+#: ../../install_steps_interactive.pm_.c:1106
msgid "Authentication Windows Domain"
msgstr "Windows ����֤"
-#: ../../install_steps_interactive.pm_.c:1128
+#: ../../install_steps_interactive.pm_.c:1108
msgid "Domain Admin User Name"
msgstr "�����Ա�û���"
-#: ../../install_steps_interactive.pm_.c:1129
+#: ../../install_steps_interactive.pm_.c:1109
msgid "Domain Admin Password"
msgstr "�����Ա����"
-#: ../../install_steps_interactive.pm_.c:1164
+#: ../../install_steps_interactive.pm_.c:1144
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 "
@@ -5732,27 +5463,27 @@ msgid ""
"first\n"
"drive and press \"Ok\"."
msgstr ""
-"���ƵĿ������������ܲ�����������������������ֱ���������� Linux ϵͳ��\n"
+"���Ƶ������������ܲ�����������������������ֱ���������� Linux ϵͳ��\n"
"��������밲װ SILO, ������������ϵͳ�� SILO ɾ����, ����\n"
" SILO ������Ӳ���ϲ��ܹ���, ��ô��ͺ����ô��ˡ�\n"
-"�������̻����Ժ� Mandrake �޸������ʹ��, �����������ɵĻָ����ع��ϵ�ϵ"
-"ͳ��\n"
-"���ھ͸�����ϵͳ��һ�ſ�������, ����? \n"
+"�����̻����Ժ� Mandrake �޸������ʹ��, �����������ɵĻָ����ع��ϵ�ϵͳ��\n"
+"���ھ͸�����ϵͳ��һ��������, ����? \n"
"�ڵ�һ���������������һƬ����, Ȼ�󰴡�ȷ����"
-#: ../../install_steps_interactive.pm_.c:1180
+#: ../../install_steps_interactive.pm_.c:1160
msgid "First floppy drive"
msgstr "��һ������������"
-#: ../../install_steps_interactive.pm_.c:1181
+#: ../../install_steps_interactive.pm_.c:1161
msgid "Second floppy drive"
msgstr "�ڶ�������������"
-#: ../../install_steps_interactive.pm_.c:1182 ../../printerdrake.pm_.c:2515
+#: ../../install_steps_interactive.pm_.c:1162
+#: ../../printer/printerdrake.pm_.c:2397
msgid "Skip"
msgstr "�Թ�"
-#: ../../install_steps_interactive.pm_.c:1187
+#: ../../install_steps_interactive.pm_.c:1167
#, c-format
msgid ""
"A custom bootdisk provides a way of booting into your Linux system without\n"
@@ -5767,15 +5498,14 @@ msgid ""
"failures. Would you like to create a bootdisk for your system?\n"
"%s"
msgstr ""
-"���ƵĿ������������ܲ�����������������������ֱ���������� Linux ϵͳ��\n"
+"���Ƶ������������ܲ�����������������������ֱ���������� Linux ϵͳ��\n"
"��������밲װ LILO (�� grub), ������������ϵͳ�� LILO ɾ����, ����\n"
" LILO ������Ӳ���ϲ��ܹ���, ��ô��ͺ����ô��ˡ�\n"
-"�������̻����Ժ� Mandrake �޸������ʹ��, �����������ɵĻָ����ع��ϵ�ϵ"
-"ͳ��\n"
-"���ھ͸�����ϵͳ��һ�ſ�������, ����?\n"
+"�����̻����Ժ� Mandrake �޸������ʹ��, �����������ɵĻָ����ع��ϵ�ϵͳ��\n"
+"���ھ͸�����ϵͳ��һ��������, ����?\n"
"%s"
-#: ../../install_steps_interactive.pm_.c:1193
+#: ../../install_steps_interactive.pm_.c:1173
msgid ""
"\n"
"\n"
@@ -5789,28 +5519,28 @@ msgstr ""
"�ܿ����޷���һ�� 1.44 Mb �����ϴ���������,\n"
"��Ϊ XFS ��Ҫһ���ܴ����������)��"
-#: ../../install_steps_interactive.pm_.c:1201
+#: ../../install_steps_interactive.pm_.c:1181
msgid "Sorry, no floppy drive available"
msgstr "��Ǹ, û�п��õ�����������"
-#: ../../install_steps_interactive.pm_.c:1205
+#: ../../install_steps_interactive.pm_.c:1185
msgid "Choose the floppy drive you want to use to make the bootdisk"
-msgstr "ѡ����Ҫ�����������̵�����������"
+msgstr "ѡ����Ҫ���������̵�����������"
-#: ../../install_steps_interactive.pm_.c:1209
+#: ../../install_steps_interactive.pm_.c:1189
#, c-format
msgid "Insert a floppy in %s"
msgstr "�����һ�����̵������� %s"
-#: ../../install_steps_interactive.pm_.c:1212
+#: ../../install_steps_interactive.pm_.c:1192
msgid "Creating bootdisk..."
msgstr "����������������"
-#: ../../install_steps_interactive.pm_.c:1219
+#: ../../install_steps_interactive.pm_.c:1199
msgid "Preparing bootloader..."
msgstr "׼��������������"
-#: ../../install_steps_interactive.pm_.c:1230
+#: ../../install_steps_interactive.pm_.c:1210
msgid ""
"You appear to have an OldWorld or Unknown\n"
" machine, the yaboot bootloader will not work for you.\n"
@@ -5821,11 +5551,11 @@ msgstr ""
"yaboot�޷�����������\n"
"Ҫ������װ, ����ʹ��BootX����"
-#: ../../install_steps_interactive.pm_.c:1236
+#: ../../install_steps_interactive.pm_.c:1216
msgid "Do you want to use aboot?"
msgstr "��Ҫʹ�� aboot ��?"
-#: ../../install_steps_interactive.pm_.c:1239
+#: ../../install_steps_interactive.pm_.c:1219
msgid ""
"Error installing aboot, \n"
"try to force installation even if that destroys the first partition?"
@@ -5833,15 +5563,15 @@ msgstr ""
"��װ aboot ʱ����, \n"
"ǿ�Ȱ�װ��ٻ���һ������, Ҫ������?"
-#: ../../install_steps_interactive.pm_.c:1246
+#: ../../install_steps_interactive.pm_.c:1226
msgid "Installing bootloader"
msgstr "��װ��������"
-#: ../../install_steps_interactive.pm_.c:1252
+#: ../../install_steps_interactive.pm_.c:1232
msgid "Installation of bootloader failed. The following error occured:"
msgstr "��װϵͳ��������ʧ��, �������д���:"
-#: ../../install_steps_interactive.pm_.c:1260
+#: ../../install_steps_interactive.pm_.c:1240
#, c-format
msgid ""
"You may need to change your Open Firmware boot-device to\n"
@@ -5857,17 +5587,17 @@ msgstr ""
" Ȼ������: shut-down\n"
"�������´ο���ʱ��������������ʾ��"
-#: ../../install_steps_interactive.pm_.c:1294
-#: ../../standalone/drakautoinst_.c:79
+#: ../../install_steps_interactive.pm_.c:1274
+#: ../../standalone/drakautoinst_.c:76
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "���������� %s �в���һ�ſհ�����"
-#: ../../install_steps_interactive.pm_.c:1298
+#: ../../install_steps_interactive.pm_.c:1278
msgid "Creating auto install floppy..."
msgstr "���ڴ����Զ���װ����..."
-#: ../../install_steps_interactive.pm_.c:1309
+#: ../../install_steps_interactive.pm_.c:1289
msgid ""
"Some steps are not completed.\n"
"\n"
@@ -5877,7 +5607,7 @@ msgstr ""
"\n"
"��ȷ��Ҫ�����˳���?"
-#: ../../install_steps_interactive.pm_.c:1320
+#: ../../install_steps_interactive.pm_.c:1300
#, c-format
msgid ""
"Congratulations, installation is complete.\n"
@@ -5908,15 +5638,15 @@ msgstr ""
"\n"
"���������������ϵͳ, ��鿴 Mandrake Linux �û��ֲᡣ"
-#: ../../install_steps_interactive.pm_.c:1333
+#: ../../install_steps_interactive.pm_.c:1313
msgid "http://www.mandrakelinux.com/en/90errata.php3"
msgstr "http://www.mandrakelinux.com/en/90errata.php3"
-#: ../../install_steps_interactive.pm_.c:1338
+#: ../../install_steps_interactive.pm_.c:1318
msgid "Generate auto install floppy"
msgstr "���ڴ����Զ���װ����"
-#: ../../install_steps_interactive.pm_.c:1340
+#: ../../install_steps_interactive.pm_.c:1320
msgid ""
"The auto install can be fully automated if wanted,\n"
"in that case it will take over the hard drive!!\n"
@@ -5925,25 +5655,25 @@ msgid ""
"You may prefer to replay the installation.\n"
msgstr "�Զ���װ��ȫ�Զ�����Ӳ�̰�װ, ������Ը�����ְ�װ��\n"
-#: ../../install_steps_interactive.pm_.c:1345
+#: ../../install_steps_interactive.pm_.c:1325
msgid "Automated"
msgstr "�Զ�"
-#: ../../install_steps_interactive.pm_.c:1345
+#: ../../install_steps_interactive.pm_.c:1325
msgid "Replay"
msgstr "����"
-#: ../../install_steps_interactive.pm_.c:1348
+#: ../../install_steps_interactive.pm_.c:1328
msgid "Save packages selection"
msgstr "����������ѡ��"
-#: ../../install_steps_newt.pm_.c:22
+#: ../../install_steps_newt.pm_.c:20
#, c-format
msgid "Mandrake Linux Installation %s"
msgstr "Mandrake Linux ��װ %s"
#. -PO This string must fit in a 80-char wide text screen
-#: ../../install_steps_newt.pm_.c:35
+#: ../../install_steps_newt.pm_.c:33
msgid ""
" <Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen "
msgstr " <Tab>/<Alt-Tab> ����Ŀ���ƶ� | <Space> ѡ�� | <F12> �¸����� "
@@ -5960,22 +5690,22 @@ msgstr "ȱ�� consolehelper"
msgid "Choose a file"
msgstr "ѡ���ļ�"
-#: ../../interactive.pm_.c:320
+#: ../../interactive.pm_.c:318
msgid "Advanced"
msgstr "�߼�"
-#: ../../interactive.pm_.c:321 ../../security/main.pm_.c:103
+#: ../../interactive.pm_.c:319 ../../security/main.pm_.c:117
msgid "Basic"
msgstr "����"
-#: ../../interactive/newt.pm_.c:195 ../../my_gtk.pm_.c:158
-#: ../../printerdrake.pm_.c:2169
+#: ../../interactive/newt.pm_.c:194 ../../my_gtk.pm_.c:158
+#: ../../printer/printerdrake.pm_.c:2055 ../../ugtk2.pm_.c:434
msgid "<- Previous"
msgstr "<- ��һ��"
-#: ../../interactive/newt.pm_.c:195 ../../interactive/newt.pm_.c:197
-#: ../../standalone/drakbackup_.c:4114 ../../standalone/drakbackup_.c:4141
-#: ../../standalone/drakbackup_.c:4171 ../../standalone/drakbackup_.c:4197
+#: ../../interactive/newt.pm_.c:194 ../../interactive/newt.pm_.c:196
+#: ../../standalone/drakbackup_.c:4060 ../../standalone/drakbackup_.c:4087
+#: ../../standalone/drakbackup_.c:4117 ../../standalone/drakbackup_.c:4143
msgid "Next"
msgstr "��һ��"
@@ -6048,371 +5778,375 @@ msgstr ""
msgid "Re-submit"
msgstr "�����ύ"
-#: ../../keyboard.pm_.c:152 ../../keyboard.pm_.c:187
+#: ../../keyboard.pm_.c:153 ../../keyboard.pm_.c:188
msgid "Czech (QWERTZ)"
msgstr "�ݿ� (QWERTZ)"
-#: ../../keyboard.pm_.c:153 ../../keyboard.pm_.c:189
+#: ../../keyboard.pm_.c:154 ../../keyboard.pm_.c:190
msgid "German"
msgstr "�¹�"
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:155
msgid "Dvorak"
msgstr "Dvorak"
-#: ../../keyboard.pm_.c:155 ../../keyboard.pm_.c:197
+#: ../../keyboard.pm_.c:156 ../../keyboard.pm_.c:198
msgid "Spanish"
msgstr "������"
-#: ../../keyboard.pm_.c:156 ../../keyboard.pm_.c:198
+#: ../../keyboard.pm_.c:157 ../../keyboard.pm_.c:199
msgid "Finnish"
msgstr "����"
-#: ../../keyboard.pm_.c:157 ../../keyboard.pm_.c:199
+#: ../../keyboard.pm_.c:158 ../../keyboard.pm_.c:200
msgid "French"
msgstr "����"
-#: ../../keyboard.pm_.c:158 ../../keyboard.pm_.c:231
+#: ../../keyboard.pm_.c:159 ../../keyboard.pm_.c:233
msgid "Norwegian"
msgstr "Ų��"
-#: ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:160
msgid "Polish"
msgstr "����"
-#: ../../keyboard.pm_.c:160 ../../keyboard.pm_.c:239
+#: ../../keyboard.pm_.c:161 ../../keyboard.pm_.c:241
msgid "Russian"
msgstr "����"
-#: ../../keyboard.pm_.c:162 ../../keyboard.pm_.c:241
+#: ../../keyboard.pm_.c:163 ../../keyboard.pm_.c:243
msgid "Swedish"
msgstr "�����"
-#: ../../keyboard.pm_.c:163 ../../keyboard.pm_.c:257
+#: ../../keyboard.pm_.c:164 ../../keyboard.pm_.c:259
msgid "UK keyboard"
msgstr "Ӣ��"
-#: ../../keyboard.pm_.c:164 ../../keyboard.pm_.c:258
+#: ../../keyboard.pm_.c:165 ../../keyboard.pm_.c:260
msgid "US keyboard"
msgstr "��������"
-#: ../../keyboard.pm_.c:166
+#: ../../keyboard.pm_.c:167
msgid "Albanian"
msgstr "����������"
-#: ../../keyboard.pm_.c:167
+#: ../../keyboard.pm_.c:168
msgid "Armenian (old)"
msgstr "���� (��ʽ)"
-#: ../../keyboard.pm_.c:168
+#: ../../keyboard.pm_.c:169
msgid "Armenian (typewriter)"
msgstr "���� (����)"
-#: ../../keyboard.pm_.c:169
+#: ../../keyboard.pm_.c:170
msgid "Armenian (phonetic)"
msgstr "���� (����)"
-#: ../../keyboard.pm_.c:174
+#: ../../keyboard.pm_.c:175
msgid "Azerbaidjani (latin)"
msgstr "Azerbaidjani (latin)"
-#: ../../keyboard.pm_.c:176
+#: ../../keyboard.pm_.c:177
msgid "Belgian"
msgstr "����ʱ"
-#: ../../keyboard.pm_.c:177
+#: ../../keyboard.pm_.c:178
msgid "Bengali"
msgstr "�ϼ���"
-#: ../../keyboard.pm_.c:178
+#: ../../keyboard.pm_.c:179
msgid "Bulgarian (phonetic)"
msgstr "�������� (����)"
-#: ../../keyboard.pm_.c:179
+#: ../../keyboard.pm_.c:180
msgid "Bulgarian (BDS)"
msgstr "�������� (BDS)"
-#: ../../keyboard.pm_.c:180
+#: ../../keyboard.pm_.c:181
msgid "Brazilian (ABNT-2)"
msgstr "���� (ABNT-2)"
-#: ../../keyboard.pm_.c:183
+#: ../../keyboard.pm_.c:184
msgid "Bosnian"
msgstr "��˹����"
-#: ../../keyboard.pm_.c:184
+#: ../../keyboard.pm_.c:185
msgid "Belarusian"
msgstr "�׶���˹"
-#: ../../keyboard.pm_.c:185
+#: ../../keyboard.pm_.c:186
msgid "Swiss (German layout)"
msgstr "��ʿ (���ﲼ��)"
-#: ../../keyboard.pm_.c:186
+#: ../../keyboard.pm_.c:187
msgid "Swiss (French layout)"
msgstr "��ʿ (���ﲼ��)"
-#: ../../keyboard.pm_.c:188
+#: ../../keyboard.pm_.c:189
msgid "Czech (QWERTY)"
msgstr "�ݿ� (QWERTY)"
-#: ../../keyboard.pm_.c:190
+#: ../../keyboard.pm_.c:191
msgid "German (no dead keys)"
msgstr "�¹� (û��dead keys)"
-#: ../../keyboard.pm_.c:191
+#: ../../keyboard.pm_.c:192
msgid "Devanagari"
msgstr "����"
-#: ../../keyboard.pm_.c:192
+#: ../../keyboard.pm_.c:193
msgid "Danish"
msgstr "����"
-#: ../../keyboard.pm_.c:193
+#: ../../keyboard.pm_.c:194
msgid "Dvorak (US)"
-msgstr "Dvorak (US)"
+msgstr "Dvorak (����)"
-#: ../../keyboard.pm_.c:194
+#: ../../keyboard.pm_.c:195
msgid "Dvorak (Norwegian)"
-msgstr "Dvorak (Norwegian)"
+msgstr "Dvorak (Ų��)"
-#: ../../keyboard.pm_.c:195
+#: ../../keyboard.pm_.c:196
msgid "Dvorak (Swedish)"
-msgstr "Dvorak (Swedish)"
+msgstr "Dvorak (���)"
-#: ../../keyboard.pm_.c:196
+#: ../../keyboard.pm_.c:197
msgid "Estonian"
-msgstr "��˹������"
+msgstr "��ɳ����"
-#: ../../keyboard.pm_.c:200
+#: ../../keyboard.pm_.c:201
msgid "Georgian (\"Russian\" layout)"
-msgstr "��³����(\"����\"����)"
+msgstr "��³����(���������)"
-#: ../../keyboard.pm_.c:201
+#: ../../keyboard.pm_.c:202
msgid "Georgian (\"Latin\" layout)"
-msgstr "��³����(\"����\" ����)"
+msgstr "��³����(������������)"
-#: ../../keyboard.pm_.c:202
+#: ../../keyboard.pm_.c:203
msgid "Greek"
msgstr "ϣ��"
-#: ../../keyboard.pm_.c:203
+#: ../../keyboard.pm_.c:204
msgid "Gujarati"
msgstr "Gujarati"
-#: ../../keyboard.pm_.c:204
+#: ../../keyboard.pm_.c:205
msgid "Gurmukhi"
-msgstr "Gurmukhi"
+msgstr "������"
-#: ../../keyboard.pm_.c:205
+#: ../../keyboard.pm_.c:206
msgid "Hungarian"
msgstr "������"
-#: ../../keyboard.pm_.c:206
+#: ../../keyboard.pm_.c:207
msgid "Croatian"
msgstr "���޵���"
-#: ../../keyboard.pm_.c:207
+#: ../../keyboard.pm_.c:208
msgid "Israeli"
msgstr "��ɫ��"
-#: ../../keyboard.pm_.c:208
+#: ../../keyboard.pm_.c:209
msgid "Israeli (Phonetic)"
msgstr "��ɫ�� (����)"
-#: ../../keyboard.pm_.c:209
+#: ../../keyboard.pm_.c:210
msgid "Iranian"
msgstr "����"
-#: ../../keyboard.pm_.c:210
+#: ../../keyboard.pm_.c:211
msgid "Icelandic"
msgstr "����"
-#: ../../keyboard.pm_.c:211
+#: ../../keyboard.pm_.c:212
msgid "Italian"
msgstr "�����"
-#: ../../keyboard.pm_.c:212
+#: ../../keyboard.pm_.c:213
msgid "Inuktitut"
-msgstr "Inuktitut"
+msgstr "��Ŧ��"
-#: ../../keyboard.pm_.c:213
+#: ../../keyboard.pm_.c:214
msgid "Japanese 106 keys"
msgstr "����106����"
-#: ../../keyboard.pm_.c:216
+#: ../../keyboard.pm_.c:217
msgid "Korean keyboard"
msgstr "��������"
-#: ../../keyboard.pm_.c:217
+#: ../../keyboard.pm_.c:218
msgid "Latin American"
msgstr "��������"
-#: ../../keyboard.pm_.c:218
+#: ../../keyboard.pm_.c:219
msgid "Laotian"
msgstr "����"
-#: ../../keyboard.pm_.c:219
+#: ../../keyboard.pm_.c:220
msgid "Lithuanian AZERTY (old)"
msgstr "������ AZERTY (��ʽ)"
-#: ../../keyboard.pm_.c:221
+#: ../../keyboard.pm_.c:222
msgid "Lithuanian AZERTY (new)"
msgstr "������ AZERTY (��ʽ)"
-#: ../../keyboard.pm_.c:222
+#: ../../keyboard.pm_.c:223
msgid "Lithuanian \"number row\" QWERTY"
msgstr "������˳�š�QWERTY"
-#: ../../keyboard.pm_.c:223
+#: ../../keyboard.pm_.c:224
msgid "Lithuanian \"phonetic\" QWERTY"
msgstr "������ͬ����QWERTY"
-#: ../../keyboard.pm_.c:224
+#: ../../keyboard.pm_.c:225
msgid "Latvian"
msgstr "������"
-#: ../../keyboard.pm_.c:225
+#: ../../keyboard.pm_.c:226
+msgid "Malayalam"
+msgstr "����ά"
+
+#: ../../keyboard.pm_.c:227
msgid "Macedonian"
msgstr "�����"
-#: ../../keyboard.pm_.c:226
+#: ../../keyboard.pm_.c:228
msgid "Myanmar (Burmese)"
-msgstr "��� (Burmese)"
+msgstr "���"
-#: ../../keyboard.pm_.c:227
+#: ../../keyboard.pm_.c:229
msgid "Mongolian (cyrillic)"
-msgstr "�ɹ� (cyrillic)"
+msgstr "�ɹ�(�����)"
-#: ../../keyboard.pm_.c:228
+#: ../../keyboard.pm_.c:230
msgid "Maltese (UK)"
-msgstr "Maltese (UK)"
+msgstr "������(Ӣ��)"
-#: ../../keyboard.pm_.c:229
+#: ../../keyboard.pm_.c:231
msgid "Maltese (US)"
-msgstr "Maltese (US)"
+msgstr "������(����)"
-#: ../../keyboard.pm_.c:230
+#: ../../keyboard.pm_.c:232
msgid "Dutch"
msgstr "����"
-#: ../../keyboard.pm_.c:232
+#: ../../keyboard.pm_.c:234
msgid "Polish (qwerty layout)"
msgstr "���� (QWERTY ����)"
-#: ../../keyboard.pm_.c:233
+#: ../../keyboard.pm_.c:235
msgid "Polish (qwertz layout)"
msgstr "���� (QWERTZ ����)"
-#: ../../keyboard.pm_.c:234
+#: ../../keyboard.pm_.c:236
msgid "Portuguese"
msgstr "��������"
-#: ../../keyboard.pm_.c:235
+#: ../../keyboard.pm_.c:237
msgid "Canadian (Quebec)"
msgstr "���ô� (������)"
-#: ../../keyboard.pm_.c:237
+#: ../../keyboard.pm_.c:239
msgid "Romanian (qwertz)"
msgstr "�������� (QWERTZ ����)"
-#: ../../keyboard.pm_.c:238
+#: ../../keyboard.pm_.c:240
msgid "Romanian (qwerty)"
msgstr "�������� (QWERTY ����)"
-#: ../../keyboard.pm_.c:240
+#: ../../keyboard.pm_.c:242
msgid "Russian (Yawerty)"
msgstr "���� (YAWERTY ����)"
-#: ../../keyboard.pm_.c:242
+#: ../../keyboard.pm_.c:244
msgid "Slovenian"
msgstr "˹��������"
-#: ../../keyboard.pm_.c:243
+#: ../../keyboard.pm_.c:245
msgid "Slovakian (QWERTZ)"
msgstr "˹�工�� (QWERTZ ����)"
-#: ../../keyboard.pm_.c:244
+#: ../../keyboard.pm_.c:246
msgid "Slovakian (QWERTY)"
msgstr "˹�工�� (QWERTY ����)"
-#: ../../keyboard.pm_.c:246
+#: ../../keyboard.pm_.c:248
msgid "Serbian (cyrillic)"
msgstr "������ (cyrillic)"
-#: ../../keyboard.pm_.c:248
+#: ../../keyboard.pm_.c:250
msgid "Tamil (Unicode)"
msgstr "̩�׶� (Unicode)"
-#: ../../keyboard.pm_.c:249
+#: ../../keyboard.pm_.c:251
msgid "Tamil (TSCII)"
msgstr "̩�׶� (TSCII)"
-#: ../../keyboard.pm_.c:250
+#: ../../keyboard.pm_.c:252
msgid "Thai keyboard"
msgstr "̩�������"
-#: ../../keyboard.pm_.c:252
+#: ../../keyboard.pm_.c:254
msgid "Tajik keyboard"
msgstr "�����˼���"
-#: ../../keyboard.pm_.c:253
+#: ../../keyboard.pm_.c:255
msgid "Turkish (traditional \"F\" model)"
msgstr "������ (��ͳ��F��ʽ)"
-#: ../../keyboard.pm_.c:254
+#: ../../keyboard.pm_.c:256
msgid "Turkish (modern \"Q\" model)"
msgstr "������ (�ִ���Q��ʽ)"
-#: ../../keyboard.pm_.c:256
+#: ../../keyboard.pm_.c:258
msgid "Ukrainian"
msgstr "�ڿ���"
-#: ../../keyboard.pm_.c:259
+#: ../../keyboard.pm_.c:261
msgid "US keyboard (international)"
msgstr "��ʽ���� (����)"
-#: ../../keyboard.pm_.c:260
+#: ../../keyboard.pm_.c:262
msgid "Vietnamese \"numeric row\" QWERTY"
msgstr "Խ�ϼ��̡�˳�š�QWERTY"
-#: ../../keyboard.pm_.c:261
+#: ../../keyboard.pm_.c:263
msgid "Yugoslavian (latin)"
msgstr "��˹���� (����)"
-#: ../../keyboard.pm_.c:268
+#: ../../keyboard.pm_.c:270
msgid "Right Alt key"
msgstr "�ұߵ� ALT ��"
-#: ../../keyboard.pm_.c:269
+#: ../../keyboard.pm_.c:271
msgid "Both Shift keys simultaneously"
msgstr "ͬʱ������ Shift ��"
-#: ../../keyboard.pm_.c:270
+#: ../../keyboard.pm_.c:272
msgid "Control and Shift keys simultaneously"
msgstr "ͬʱ�� Ctrl �� Shift ��"
-#: ../../keyboard.pm_.c:271
+#: ../../keyboard.pm_.c:273
msgid "CapsLock key"
msgstr "CapsLock ��"
-#: ../../keyboard.pm_.c:272
+#: ../../keyboard.pm_.c:274
msgid "Ctrl and Alt keys simultaneously"
msgstr "ͬʱ�� Ctrl �� Alt ��"
-#: ../../keyboard.pm_.c:273
+#: ../../keyboard.pm_.c:275
msgid "Alt and Shift keys simultaneously"
msgstr "ͬʱ�� Alt �� Shift ��"
-#: ../../keyboard.pm_.c:274
+#: ../../keyboard.pm_.c:276
msgid "\"Menu\" key"
msgstr "���˵�����"
-#: ../../keyboard.pm_.c:275
+#: ../../keyboard.pm_.c:277
msgid "Left \"Windows\" key"
msgstr "�󡰴��ڡ���"
-#: ../../keyboard.pm_.c:276
+#: ../../keyboard.pm_.c:278
msgid "Right \"Windows\" key"
msgstr "�ҡ����ڡ���"
@@ -6425,33 +6159,41 @@ msgstr "ѭ��װ�� %s\n"
msgid "Remove the logical volumes first\n"
msgstr "�Ȳ�ж�߼���\n"
-#: ../../modparm.pm_.c:50
+#: ../../modules.pm_.c:290
+msgid ""
+"PCMCIA support no longer exists for 2.2 kernels. Please use a 2.4 kernel."
+msgstr "2.2 ���ں˲�֧�� PCMCIA �豸, ��ʹ�� 2.4 ���ںˡ�"
+
+#: ../../modules/interactive.pm_.c:16
+msgid "You can configure each parameter of the module here."
+msgstr "����������ģ��ĸ���������"
+
+#: ../../modules/parameters.pm_.c:18
+msgid "modinfo is not available"
+msgstr "û�п��õ� modinfo"
+
+#: ../../modules/parameters.pm_.c:50
msgid "a number"
msgstr "һ������"
-#: ../../modparm.pm_.c:52
+#: ../../modules/parameters.pm_.c:52
#, c-format
msgid "%d comma separated numbers"
msgstr "%d ���ŷָ�������"
-#: ../../modparm.pm_.c:52
+#: ../../modules/parameters.pm_.c:52
#, c-format
msgid "%d comma separated strings"
msgstr "%d ���ŷָ��Ĵ���"
-#: ../../modparm.pm_.c:54
+#: ../../modules/parameters.pm_.c:54
msgid "comma separated numbers"
msgstr "���ŷָ�������"
-#: ../../modparm.pm_.c:54
+#: ../../modules/parameters.pm_.c:54
msgid "comma separated strings"
msgstr "���ŷ����Ĵ���"
-#: ../../modules.pm_.c:293
-msgid ""
-"PCMCIA support no longer exists for 2.2 kernels. Please use a 2.4 kernel."
-msgstr "2.2 ���ں˲�֧�� PCMCIA �豸, ��ʹ�� 2.4 ���ںˡ�"
-
#: ../../mouse.pm_.c:25
msgid "Sun - Mouse"
msgstr "Sun - ���"
@@ -6556,55 +6298,76 @@ msgstr "û��"
msgid "No mouse"
msgstr "û�����"
-#: ../../mouse.pm_.c:486
+#: ../../mouse.pm_.c:490
msgid "Please test the mouse"
msgstr "�����������ꡣ"
-#: ../../mouse.pm_.c:487
+#: ../../mouse.pm_.c:491
msgid "To activate the mouse,"
msgstr "Ҫ�������,"
-#: ../../mouse.pm_.c:488
+#: ../../mouse.pm_.c:492
msgid "MOVE YOUR WHEEL!"
msgstr "ת������!"
-#: ../../my_gtk.pm_.c:64
+#: ../../my_gtk.pm_.c:65
msgid "-adobe-utopia-regular-r-*-*-25-*-*-*-p-*-iso8859-*,*-r-*"
msgstr "-adobe-utopia-regular-r-*-*-25-*-*-*-p-*-iso8859-*,*-r-*"
-#: ../../my_gtk.pm_.c:159
+#: ../../my_gtk.pm_.c:159 ../../ugtk2.pm_.c:435
msgid "Finish"
msgstr "���"
-#: ../../my_gtk.pm_.c:159 ../../printerdrake.pm_.c:2171
+#: ../../my_gtk.pm_.c:159 ../../printer/printerdrake.pm_.c:2057
+#: ../../ugtk2.pm_.c:435
msgid "Next ->"
msgstr "��һ�� ->"
-#: ../../my_gtk.pm_.c:287
+#: ../../my_gtk.pm_.c:287 ../../ugtk2.pm_.c:926
msgid "Is this correct?"
msgstr "������ȷ��?"
-#: ../../my_gtk.pm_.c:359 ../../services.pm_.c:222
+#: ../../my_gtk.pm_.c:359 ../../services.pm_.c:227 ../../ugtk2.pm_.c:1011
msgid "Info"
msgstr "��Ϣ"
-#: ../../my_gtk.pm_.c:380
+#: ../../my_gtk.pm_.c:380 ../../ugtk2.pm_.c:1036
msgid "Expand Tree"
msgstr "չ��������"
-#: ../../my_gtk.pm_.c:381
+#: ../../my_gtk.pm_.c:381 ../../ugtk2.pm_.c:1037
msgid "Collapse Tree"
msgstr "����������"
-#: ../../my_gtk.pm_.c:382
+#: ../../my_gtk.pm_.c:382 ../../ugtk2.pm_.c:1038
msgid "Toggle between flat and group sorted"
msgstr "�л�ƽ�̻��������"
-#: ../../network/adsl.pm_.c:23 ../../network/ethernet.pm_.c:36
+#: ../../network/adsl.pm_.c:23
+msgid "use pppoe"
+msgstr "ʹ�� pppoe"
+
+#: ../../network/adsl.pm_.c:24
+msgid "use pptp"
+msgstr "ʹ�� pptp"
+
+#: ../../network/adsl.pm_.c:25
+msgid "use dhcp"
+msgstr "ʹ�� dhcp"
+
+#: ../../network/adsl.pm_.c:26
+msgid "Alcatel speedtouch usb"
+msgstr "�������� Speedtouch usb"
+
+#: ../../network/adsl.pm_.c:27
+msgid "Sagem (using pppoe) usb"
+msgstr "Sagem (ʹ�� pppoe) USB"
+
+#: ../../network/adsl.pm_.c:29 ../../network/ethernet.pm_.c:36
msgid "Connect to the Internet"
msgstr "���ӵ�������"
-#: ../../network/adsl.pm_.c:24
+#: ../../network/adsl.pm_.c:30
msgid ""
"The most common way to connect with adsl is pppoe.\n"
"Some connections use pptp, a few ones use dhcp.\n"
@@ -6614,21 +6377,17 @@ msgstr ""
"����, ȷʵ��һЩ������ֻ�� dhcp��\n"
"�����û�а��վ�ѡ��pppoe��"
-#: ../../network/adsl.pm_.c:26
-msgid "Alcatel speedtouch usb"
-msgstr "Alcatel speedtouch usb"
-
-#: ../../network/adsl.pm_.c:26
-msgid "use dhcp"
-msgstr "ʹ�� dhcp"
-
-#: ../../network/adsl.pm_.c:26
-msgid "use pppoe"
-msgstr "ʹ�� pppoe"
-
-#: ../../network/adsl.pm_.c:26
-msgid "use pptp"
-msgstr "ʹ�� pptp"
+#: ../../network/adsl.pm_.c:166
+msgid ""
+"You need the alcatel microcode.\n"
+"Download it at\n"
+"http://www.speedtouchdsl.com/dvrreg_lx.htm\n"
+"and copy the mgmt.o in /usr/share/speedtouch"
+msgstr ""
+"����Ҫ��������΢�롣\n"
+"���\n"
+"http://www.speedtouchdsl.com/dvrreg_lx.htm\n"
+"���ز��� mgmt.o ���Ƶ� /usr/share/speedtouch"
#: ../../network/drakfirewall.pm_.c:12
msgid "Web Server"
@@ -6711,10 +6470,10 @@ msgstr "�����˿�"
#: ../../network/ethernet.pm_.c:37
msgid ""
"Which dhcp client do you want to use?\n"
-"Default is dhcpcd"
+"Default is dhcp-client"
msgstr ""
"����Ҫʹ������ DHCP �ͻ�����?\n"
-"Ĭ�ϵ��� dhcpcd"
+"Ĭ�ϵ��� dhcp-client"
#: ../../network/ethernet.pm_.c:88
msgid ""
@@ -6724,7 +6483,7 @@ msgstr ""
"û��������ϵͳ�﷢����̫������\n"
"�޷���������������͡�"
-#: ../../network/ethernet.pm_.c:92 ../../standalone/drakgw_.c:238
+#: ../../network/ethernet.pm_.c:92 ../../standalone/drakgw_.c:234
msgid "Choose the network interface"
msgstr "ѡ������ӿ�"
@@ -6733,15 +6492,15 @@ msgid ""
"Please choose which network adapter you want to use to connect to Internet"
msgstr "��ѡ�����ĸ��������ӻ�������"
-#: ../../network/ethernet.pm_.c:178
+#: ../../network/ethernet.pm_.c:176
msgid "no network card found"
msgstr "�Ҳ�������"
-#: ../../network/ethernet.pm_.c:202 ../../network/network.pm_.c:362
+#: ../../network/ethernet.pm_.c:200 ../../network/network.pm_.c:349
msgid "Configuring network"
msgstr "������������"
-#: ../../network/ethernet.pm_.c:203
+#: ../../network/ethernet.pm_.c:201
msgid ""
"Please enter your host name if you know it.\n"
"Some DHCP servers require the hostname to work.\n"
@@ -6753,15 +6512,15 @@ msgstr ""
"�����������Ʊ����Ǹ���ȫ�޶���������, \n"
"���硰mybox.mylab.myco.com��"
-#: ../../network/ethernet.pm_.c:207 ../../network/network.pm_.c:367
+#: ../../network/ethernet.pm_.c:205 ../../network/network.pm_.c:354
msgid "Host name"
msgstr "������"
#: ../../network/isdn.pm_.c:21 ../../network/isdn.pm_.c:44
-#: ../../network/netconnect.pm_.c:90 ../../network/netconnect.pm_.c:104
-#: ../../network/netconnect.pm_.c:159 ../../network/netconnect.pm_.c:174
-#: ../../network/netconnect.pm_.c:201 ../../network/netconnect.pm_.c:224
-#: ../../network/netconnect.pm_.c:232
+#: ../../network/netconnect.pm_.c:89 ../../network/netconnect.pm_.c:103
+#: ../../network/netconnect.pm_.c:156 ../../network/netconnect.pm_.c:171
+#: ../../network/netconnect.pm_.c:222 ../../network/netconnect.pm_.c:245
+#: ../../network/netconnect.pm_.c:253
msgid "Network Configuration Wizard"
msgstr "����������"
@@ -6803,13 +6562,13 @@ msgstr "������(isdn-light)"
msgid "Old configuration (isdn4net)"
msgstr "������(isdn4net)"
-#: ../../network/isdn.pm_.c:170 ../../network/isdn.pm_.c:188
-#: ../../network/isdn.pm_.c:200 ../../network/isdn.pm_.c:206
-#: ../../network/isdn.pm_.c:213 ../../network/isdn.pm_.c:223
+#: ../../network/isdn.pm_.c:166 ../../network/isdn.pm_.c:184
+#: ../../network/isdn.pm_.c:196 ../../network/isdn.pm_.c:202
+#: ../../network/isdn.pm_.c:209 ../../network/isdn.pm_.c:219
msgid "ISDN Configuration"
msgstr "ISDN ����"
-#: ../../network/isdn.pm_.c:170
+#: ../../network/isdn.pm_.c:166
msgid ""
"Select your provider.\n"
"If it isn't listed, choose Unlisted."
@@ -6817,19 +6576,19 @@ msgstr ""
"��ѡ�����ṩ�̡�\n"
"����������б���, ѡ��δ�г���"
-#: ../../network/isdn.pm_.c:183
+#: ../../network/isdn.pm_.c:179
msgid "Europe protocol"
msgstr "ŷ��Э��"
-#: ../../network/isdn.pm_.c:183
+#: ../../network/isdn.pm_.c:179
msgid "Europe protocol (EDSS1)"
msgstr "ŷ��Э��(EDSS1)"
-#: ../../network/isdn.pm_.c:185
+#: ../../network/isdn.pm_.c:181
msgid "Protocol for the rest of the world"
msgstr "����������"
-#: ../../network/isdn.pm_.c:185
+#: ../../network/isdn.pm_.c:181
msgid ""
"Protocol for the rest of the world\n"
"No D-Channel (leased lines)"
@@ -6837,32 +6596,32 @@ msgstr ""
"�������� \n"
" û�� D-�ŵ�(ר��)"
-#: ../../network/isdn.pm_.c:189
+#: ../../network/isdn.pm_.c:185
msgid "Which protocol do you want to use?"
msgstr "����ʹ������Э��?"
-#: ../../network/isdn.pm_.c:200
+#: ../../network/isdn.pm_.c:196
#, c-format
msgid "Found \"%s\" interface do you want to use it ?"
msgstr "�ҵ��ˡ�%s���ӿ�, ����Ҫʹ����?"
-#: ../../network/isdn.pm_.c:207
+#: ../../network/isdn.pm_.c:203
msgid "What kind of card do you have?"
msgstr "���������俨������?"
-#: ../../network/isdn.pm_.c:208
+#: ../../network/isdn.pm_.c:204
msgid "I don't know"
msgstr "�Ҳ�֪��"
-#: ../../network/isdn.pm_.c:208
+#: ../../network/isdn.pm_.c:204
msgid "ISA / PCMCIA"
msgstr "ISA / PCMCIA"
-#: ../../network/isdn.pm_.c:208
+#: ../../network/isdn.pm_.c:204
msgid "PCI"
msgstr "PCI"
-#: ../../network/isdn.pm_.c:214
+#: ../../network/isdn.pm_.c:210
msgid ""
"\n"
"If you have an ISA card, the values on the next screen should be right.\n"
@@ -6875,19 +6634,19 @@ msgstr ""
"\n"
"������Ŀ� �� PCMCIA ��, ������֪������ irq �� io��\n"
-#: ../../network/isdn.pm_.c:218
+#: ../../network/isdn.pm_.c:214
msgid "Abort"
msgstr "��ֹ"
-#: ../../network/isdn.pm_.c:218
+#: ../../network/isdn.pm_.c:214
msgid "Continue"
msgstr "����"
-#: ../../network/isdn.pm_.c:224
+#: ../../network/isdn.pm_.c:220
msgid "Which is your ISDN card?"
msgstr "���� ISDN �����ĸ�?"
-#: ../../network/isdn.pm_.c:243
+#: ../../network/isdn.pm_.c:239
msgid ""
"I have detected an ISDN PCI card, but I don't know its type. Please select a "
"PCI card on the next screen."
@@ -6895,58 +6654,84 @@ msgstr ""
"��̽�⵽һ�� ISDN PCI ��, �����޷�ʶ�������ͺš�������һ��Ļ��\n"
"ѡ������ PCI ����"
-#: ../../network/isdn.pm_.c:252
+#: ../../network/isdn.pm_.c:248
msgid "No ISDN PCI card found. Please select one on the next screen."
msgstr "û��̽�⵽ ISDN PCI ����������һ��Ļ����ѡһ�֡�"
-#: ../../network/modem.pm_.c:39
+#: ../../network/modem.pm_.c:57
msgid "Please choose which serial port your modem is connected to."
msgstr "��ѡ�����ĵ��ƽ���������ӵ��ĸ����ж˿ڡ�"
-#: ../../network/modem.pm_.c:44
+#: ../../network/modem.pm_.c:67
msgid "Dialup options"
msgstr "����ѡ��"
-#: ../../network/modem.pm_.c:45 ../../standalone/drakconnect_.c:621
+#: ../../network/modem.pm_.c:68 ../../standalone/drakconnect_.c:619
msgid "Connection name"
msgstr "��������"
-#: ../../network/modem.pm_.c:46 ../../standalone/drakconnect_.c:622
+#: ../../network/modem.pm_.c:69 ../../standalone/drakconnect_.c:620
msgid "Phone number"
msgstr "�绰����"
-#: ../../network/modem.pm_.c:47 ../../standalone/drakconnect_.c:623
+#: ../../network/modem.pm_.c:70 ../../standalone/drakconnect_.c:621
msgid "Login ID"
msgstr "��¼�ʺ�"
-#: ../../network/modem.pm_.c:49 ../../standalone/drakconnect_.c:625
+#: ../../network/modem.pm_.c:72 ../../standalone/drakconnect_.c:623
msgid "CHAP"
msgstr "CHAP"
-#: ../../network/modem.pm_.c:49 ../../standalone/drakconnect_.c:625
+#: ../../network/modem.pm_.c:72 ../../standalone/drakconnect_.c:623
msgid "PAP"
msgstr "PAP"
-#: ../../network/modem.pm_.c:49 ../../standalone/drakconnect_.c:625
+#: ../../network/modem.pm_.c:72 ../../standalone/drakconnect_.c:623
msgid "Script-based"
msgstr "���ڽű���¼"
-#: ../../network/modem.pm_.c:49 ../../standalone/drakconnect_.c:625
+#: ../../network/modem.pm_.c:72 ../../standalone/drakconnect_.c:623
msgid "Terminal-based"
msgstr "�ն˷�ʽ��¼"
-#: ../../network/modem.pm_.c:50 ../../standalone/drakconnect_.c:626
+#: ../../network/modem.pm_.c:73 ../../standalone/drakconnect_.c:624
msgid "Domain name"
msgstr "��������"
-#: ../../network/modem.pm_.c:51 ../../standalone/drakconnect_.c:627
+#: ../../network/modem.pm_.c:74 ../../standalone/drakconnect_.c:625
msgid "First DNS Server (optional)"
msgstr "��ѡ DNS ������"
-#: ../../network/modem.pm_.c:52 ../../standalone/drakconnect_.c:628
+#: ../../network/modem.pm_.c:75 ../../standalone/drakconnect_.c:626
msgid "Second DNS Server (optional)"
msgstr "�ڶ��� ��ѡDNS ������"
+#: ../../network/modem.pm_.c:95
+msgid ""
+"Your modem isn't supported by the system.\n"
+"Take a look at http://www.linmodems.org"
+msgstr ""
+"���ĵ��ƽ��������ϵͳ֧�֡�\n"
+"�뿴�� http://www.linmodems.org"
+
+#: ../../network/modem.pm_.c:97
+#, c-format
+msgid ""
+"\"%s\" based winmodem detected, do you want to install needed software ?"
+msgstr "��⵽�˻��ڡ�%s������è�����Ƿ���Ҫ��װ�����������"
+
+#: ../../network/modem.pm_.c:97
+msgid "Do nothing"
+msgstr "ʲôҲ����"
+
+#: ../../network/modem.pm_.c:97
+msgid "Install rpm"
+msgstr "��װ rpm"
+
+#: ../../network/modem.pm_.c:97
+msgid "Title"
+msgstr "����"
+
#: ../../network/netconnect.pm_.c:29
msgid ""
"\n"
@@ -6977,30 +6762,30 @@ msgstr ""
#: ../../network/netconnect.pm_.c:32
msgid "You are not currently connected to Internet."
-msgstr "������û�����ӵ���������"
+msgstr "������û�����ӵ� Internet��"
#: ../../network/netconnect.pm_.c:36
msgid "Connect"
msgstr "����"
-#: ../../network/netconnect.pm_.c:38
+#: ../../network/netconnect.pm_.c:37
msgid "Disconnect"
msgstr "�Ͽ�����"
-#: ../../network/netconnect.pm_.c:40
+#: ../../network/netconnect.pm_.c:38
msgid "Configure the connection"
msgstr "��������"
-#: ../../network/netconnect.pm_.c:45
+#: ../../network/netconnect.pm_.c:41
msgid "Internet connection & configuration"
-msgstr "���������Ӻ�����"
+msgstr "Internet ���Ӻ�����"
-#: ../../network/netconnect.pm_.c:95
+#: ../../network/netconnect.pm_.c:94
#, c-format
msgid "We are now going to configure the %s connection."
msgstr "��������%s�������ӡ�"
-#: ../../network/netconnect.pm_.c:104
+#: ../../network/netconnect.pm_.c:103
#, c-format
msgid ""
"\n"
@@ -7019,12 +6804,12 @@ msgstr ""
"\n"
"��ȷ��������"
-#: ../../network/netconnect.pm_.c:133 ../../network/netconnect.pm_.c:251
-#: ../../network/netconnect.pm_.c:271 ../../network/tools.pm_.c:63
+#: ../../network/netconnect.pm_.c:132 ../../network/netconnect.pm_.c:272
+#: ../../network/netconnect.pm_.c:292 ../../network/tools.pm_.c:77
msgid "Network Configuration"
msgstr "��������"
-#: ../../network/netconnect.pm_.c:134
+#: ../../network/netconnect.pm_.c:133
msgid ""
"Because you are doing a network installation, your network is already "
"configured.\n"
@@ -7034,7 +6819,7 @@ msgstr ""
"�����ڰ�װ����,���������Ѿ����úá�\n"
"��� ȷ�� ��������, �� ȡ�� �����������硣\n"
-#: ../../network/netconnect.pm_.c:160
+#: ../../network/netconnect.pm_.c:157
msgid ""
"Welcome to The Network Configuration Wizard.\n"
"\n"
@@ -7046,72 +6831,75 @@ msgstr ""
"����Internet/�������ӡ�\n"
"����������Զ����, ��Ҫѡ���ѡ�\n"
-#: ../../network/netconnect.pm_.c:166
+#: ../../network/netconnect.pm_.c:163
msgid "Choose the profile to configure"
msgstr "ѡ��Ҫ���õ������ļ�"
-#: ../../network/netconnect.pm_.c:167
+#: ../../network/netconnect.pm_.c:164
msgid "Use auto detection"
msgstr "ʹ���Զ����"
-#: ../../network/netconnect.pm_.c:168 ../../printerdrake.pm_.c:3203
-#: ../../standalone/drakconnect_.c:274 ../../standalone/drakconnect_.c:277
-#: ../../standalone/drakfloppy_.c:146
+#: ../../network/netconnect.pm_.c:165 ../../printer/printerdrake.pm_.c:2966
+#: ../../standalone/drakconnect_.c:271 ../../standalone/drakconnect_.c:274
+#: ../../standalone/drakfloppy_.c:118
msgid "Expert Mode"
msgstr "ר��ģʽ"
-#: ../../network/netconnect.pm_.c:174 ../../printerdrake.pm_.c:399
+#: ../../network/netconnect.pm_.c:171 ../../printer/printerdrake.pm_.c:364
msgid "Detecting devices..."
msgstr "���ڼ���豸..."
-#: ../../network/netconnect.pm_.c:185 ../../network/netconnect.pm_.c:194
+#: ../../network/netconnect.pm_.c:214
msgid "Normal modem connection"
msgstr "������ͨ���ƽ��������"
-#: ../../network/netconnect.pm_.c:185 ../../network/netconnect.pm_.c:194
+#: ../../network/netconnect.pm_.c:214
#, c-format
msgid "detected on port %s"
msgstr "��⴮�� %s"
-#: ../../network/netconnect.pm_.c:186 ../../network/netconnect.pm_.c:195
+#: ../../network/netconnect.pm_.c:215
+msgid "Winmodem connection"
+msgstr "Winmodem ����"
+
+#: ../../network/netconnect.pm_.c:215 ../../network/netconnect.pm_.c:217
+msgid "detected"
+msgstr "��⵽"
+
+#: ../../network/netconnect.pm_.c:216
msgid "ISDN connection"
msgstr "���� ISDN ����"
-#: ../../network/netconnect.pm_.c:186 ../../network/netconnect.pm_.c:195
+#: ../../network/netconnect.pm_.c:216
#, c-format
msgid "detected %s"
msgstr "��⵽ %s"
-#: ../../network/netconnect.pm_.c:187 ../../network/netconnect.pm_.c:196
+#: ../../network/netconnect.pm_.c:217
msgid "ADSL connection"
msgstr "ADSL ����"
-#: ../../network/netconnect.pm_.c:187 ../../network/netconnect.pm_.c:196
-#, c-format
-msgid "detected on interface %s"
-msgstr "����ӿڿ� %s"
-
-#: ../../network/netconnect.pm_.c:188 ../../network/netconnect.pm_.c:197
+#: ../../network/netconnect.pm_.c:218
msgid "Cable connection"
msgstr "�������ߵ�������"
-#: ../../network/netconnect.pm_.c:188 ../../network/netconnect.pm_.c:197
+#: ../../network/netconnect.pm_.c:218
msgid "cable connection detected"
msgstr "��⵽���ߵ�������"
-#: ../../network/netconnect.pm_.c:189 ../../network/netconnect.pm_.c:198
+#: ../../network/netconnect.pm_.c:219
msgid "LAN connection"
msgstr "���þ���������"
-#: ../../network/netconnect.pm_.c:189 ../../network/netconnect.pm_.c:198
+#: ../../network/netconnect.pm_.c:219
msgid "ethernet card(s) detected"
msgstr "��⵽����"
-#: ../../network/netconnect.pm_.c:201
+#: ../../network/netconnect.pm_.c:222
msgid "Choose the connection you want to configure"
msgstr "ѡ������Ҫ���õ�����"
-#: ../../network/netconnect.pm_.c:225
+#: ../../network/netconnect.pm_.c:246
msgid ""
"You have configured multiple ways to connect to the Internet.\n"
"Choose the one you want to use.\n"
@@ -7121,23 +6909,23 @@ msgstr ""
"ѡ����Ҫʹ�õ�һ�֡�\n"
"\n"
-#: ../../network/netconnect.pm_.c:226
+#: ../../network/netconnect.pm_.c:247
msgid "Internet connection"
msgstr "Internet ����"
-#: ../../network/netconnect.pm_.c:232
+#: ../../network/netconnect.pm_.c:253
msgid "Do you want to start the connection at boot?"
msgstr "���Ƿ�ϣ��һ��������������?"
-#: ../../network/netconnect.pm_.c:246
+#: ../../network/netconnect.pm_.c:267
msgid "Network configuration"
msgstr "��������"
-#: ../../network/netconnect.pm_.c:247
+#: ../../network/netconnect.pm_.c:268
msgid "The network needs to be restarted"
msgstr "������Ҫ��������"
-#: ../../network/netconnect.pm_.c:251
+#: ../../network/netconnect.pm_.c:272
#, c-format
msgid ""
"A problem occured while restarting the network: \n"
@@ -7148,20 +6936,20 @@ msgstr ""
"\n"
"%s"
-#: ../../network/netconnect.pm_.c:261
+#: ../../network/netconnect.pm_.c:282
msgid ""
"Congratulations, the network and Internet configuration is finished.\n"
"The configuration will now be applied to your system.\n"
"\n"
msgstr "ף��,�����Internet������ɡ�\n"
-#: ../../network/netconnect.pm_.c:265
+#: ../../network/netconnect.pm_.c:286
msgid ""
"After this is done, we recommend that you restart your X environment to "
"avoid any hostname-related problems."
msgstr "���������� X �����Ա����κ����������йص����⡣"
-#: ../../network/netconnect.pm_.c:266
+#: ../../network/netconnect.pm_.c:287
msgid ""
"Problems occured during configuration.\n"
"Test your connection via net_monitor or mcc. If your connection doesn't "
@@ -7170,7 +6958,7 @@ msgstr ""
"���ù����г��ִ���\n"
"�����������������������IJ�����������. �����������, �����������á�"
-#: ../../network/network.pm_.c:291
+#: ../../network/network.pm_.c:278
msgid ""
"WARNING: this device has been previously configured to connect to the "
"Internet.\n"
@@ -7181,7 +6969,7 @@ msgstr ""
"Ҫ�������е�����ֻҪѡ�� ȷ����\n"
"�޸����µ���Ŀ������ԭ�е��趨��"
-#: ../../network/network.pm_.c:296
+#: ../../network/network.pm_.c:283
msgid ""
"Please enter the IP configuration for this machine.\n"
"Each item should be entered as an IP address in dotted-decimal\n"
@@ -7191,43 +6979,56 @@ msgstr ""
"������ĿҪ�������Ծ��ָ�ʮ���Ƹ�ʽ��ʾ�� IP ��ַ��\n"
" (���� 192.168.1.1) "
-#: ../../network/network.pm_.c:306 ../../network/network.pm_.c:307
+#: ../../network/network.pm_.c:293 ../../network/network.pm_.c:294
#, c-format
msgid "Configuring network device %s"
msgstr "�������������豸 %s"
-#: ../../network/network.pm_.c:307
+#: ../../network/network.pm_.c:294
#, c-format
msgid " (driver %s)"
msgstr "(���� %s)"
-#: ../../network/network.pm_.c:309 ../../standalone/drakconnect_.c:231
-#: ../../standalone/drakconnect_.c:467
+#: ../../network/network.pm_.c:296 ../../standalone/drakconnect_.c:228
+#: ../../standalone/drakconnect_.c:464
msgid "IP address"
msgstr "IP ��ַ"
-#: ../../network/network.pm_.c:310 ../../standalone/drakconnect_.c:468
-#: ../../standalone/drakgw_.c:295
+#: ../../network/network.pm_.c:297 ../../standalone/drakconnect_.c:465
+#: ../../standalone/drakgw_.c:291
msgid "Netmask"
msgstr "��������"
-#: ../../network/network.pm_.c:311
+#: ../../network/network.pm_.c:298
msgid "(bootp/dhcp)"
msgstr "(bootp/dhcp)"
-#: ../../network/network.pm_.c:311
+#: ../../network/network.pm_.c:298
msgid "Automatic IP"
msgstr "�Զ� IP"
-#: ../../network/network.pm_.c:312
+#: ../../network/network.pm_.c:299
msgid "Start at boot"
msgstr "����ʱ����"
-#: ../../network/network.pm_.c:333 ../../printerdrake.pm_.c:875
+#: ../../network/network.pm_.c:320 ../../printer/printerdrake.pm_.c:812
msgid "IP address should be in format 1.2.3.4"
msgstr "IP ��ַ�ĸ�ʽӦ���� 1.2.3.4"
-#: ../../network/network.pm_.c:363
+#: ../../network/network.pm_.c:326
+msgid ""
+"Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
+"frequency), or add enough '0'."
+msgstr ""
+"Ƶ��Ӧ���к�׺ k��M �� G(�硰2.46G������ 2.46 GHz Ƶ��)�����ߺ���㹻���㡣"
+
+#: ../../network/network.pm_.c:330
+msgid ""
+"Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
+"enough '0'."
+msgstr "�ٶ�Ӧ���к�׺ k��M �� G(�硰11M������ 11M)�����ߺ���㹻���㡣"
+
+#: ../../network/network.pm_.c:350
msgid ""
"Please enter your host name.\n"
"Your host name should be a fully-qualified host name,\n"
@@ -7238,56 +7039,56 @@ msgstr ""
"�����������Ʊ����Ǹ���ȫ�޶�������, ���硰mybox.mylab.myco.com��\n"
"����������صĻ�, Ҳ�������� IP ��ַ"
-#: ../../network/network.pm_.c:368
+#: ../../network/network.pm_.c:355
msgid "DNS server"
msgstr "DNS ������"
-#: ../../network/network.pm_.c:369
+#: ../../network/network.pm_.c:356
#, c-format
msgid "Gateway (e.g. %s)"
msgstr "���� (�� %s )"
-#: ../../network/network.pm_.c:371
+#: ../../network/network.pm_.c:358
msgid "Gateway device"
msgstr "�����豸"
-#: ../../network/network.pm_.c:376
+#: ../../network/network.pm_.c:363
msgid "DNS server address should be in format 1.2.3.4"
msgstr "DNS �������ĸ�ʽӦ���� 1.2.3.4"
-#: ../../network/network.pm_.c:380
+#: ../../network/network.pm_.c:367
msgid "Gateway address should be in format 1.2.3.4"
msgstr "���ص�ַ�ĸ�ʽӦ���� 1.2.3.4"
-#: ../../network/network.pm_.c:394
+#: ../../network/network.pm_.c:381
msgid "Proxies configuration"
msgstr "��������������"
-#: ../../network/network.pm_.c:395
+#: ../../network/network.pm_.c:382
msgid "HTTP proxy"
msgstr "HTTP ����������"
-#: ../../network/network.pm_.c:396
+#: ../../network/network.pm_.c:383
msgid "FTP proxy"
msgstr "FTP ����������"
-#: ../../network/network.pm_.c:397
+#: ../../network/network.pm_.c:384
msgid "Track network card id (useful for laptops)"
msgstr "��¼������־"
-#: ../../network/network.pm_.c:400
+#: ../../network/network.pm_.c:387
msgid "Proxy should be http://..."
msgstr "����������Ӧ������ http://..."
-#: ../../network/network.pm_.c:401 ../../proxy.pm_.c:65
+#: ../../network/network.pm_.c:388
msgid "Url should begin with 'ftp:' or 'http:'"
msgstr "Url Ӧ�����ԡ�ftp:����http:����ͷ"
-#: ../../network/shorewall.pm_.c:25
+#: ../../network/shorewall.pm_.c:26
msgid "Firewalling configuration detected!"
msgstr "���ַ���ǽ����!"
-#: ../../network/shorewall.pm_.c:26
+#: ../../network/shorewall.pm_.c:27
msgid ""
"Warning! An existing firewalling configuration has been detected. You may "
"need some manual fix after installation."
@@ -7295,27 +7096,27 @@ msgstr ""
"����! ����ԭ�������������˷���ǽ���ܡ�\n"
"����Ҫ�ڰ�װ֮���ֹ��޸ġ�"
-#: ../../network/tools.pm_.c:41
+#: ../../network/tools.pm_.c:57
msgid "Internet configuration"
msgstr "�������趨"
-#: ../../network/tools.pm_.c:42
+#: ../../network/tools.pm_.c:58
msgid "Do you want to try to connect to the Internet now?"
msgstr "����Ҫ�������ӵ���������?"
-#: ../../network/tools.pm_.c:46 ../../standalone/drakconnect_.c:196
+#: ../../network/tools.pm_.c:61 ../../standalone/drakconnect_.c:193
msgid "Testing your connection..."
msgstr "���ڲ�������..."
-#: ../../network/tools.pm_.c:56
+#: ../../network/tools.pm_.c:70
msgid "The system is now connected to Internet."
msgstr "�����������ӵ�������"
-#: ../../network/tools.pm_.c:57
+#: ../../network/tools.pm_.c:71
msgid "For security reason, it will be disconnected now."
-msgstr "Ϊ�˰�ȫ, �����ڶϿ����ӡ�"
+msgstr "Ϊ�˰�ȫ, �����ڶϿ����ӡ�"
-#: ../../network/tools.pm_.c:58
+#: ../../network/tools.pm_.c:72
msgid ""
"The system doesn't seem to be connected to internet.\n"
"Try to reconfigure your connection."
@@ -7323,92 +7124,92 @@ msgstr ""
"ϵͳû�����ӵ���������\n"
"�����³��������������ӡ�"
-#: ../../network/tools.pm_.c:82
+#: ../../network/tools.pm_.c:96
msgid "Connection Configuration"
msgstr "��������"
-#: ../../network/tools.pm_.c:83
+#: ../../network/tools.pm_.c:97
msgid "Please fill or check the field below"
msgstr "����д��ѡ��������Ŀ"
-#: ../../network/tools.pm_.c:85 ../../standalone/drakconnect_.c:607
+#: ../../network/tools.pm_.c:99 ../../standalone/drakconnect_.c:605
msgid "Card IRQ"
msgstr "������ IRQ�ж�"
-#: ../../network/tools.pm_.c:86 ../../standalone/drakconnect_.c:608
+#: ../../network/tools.pm_.c:100 ../../standalone/drakconnect_.c:606
msgid "Card mem (DMA)"
msgstr "�����ڴ�(DMA)"
-#: ../../network/tools.pm_.c:87 ../../standalone/drakconnect_.c:609
+#: ../../network/tools.pm_.c:101 ../../standalone/drakconnect_.c:607
msgid "Card IO"
msgstr "���� IO"
-#: ../../network/tools.pm_.c:88 ../../standalone/drakconnect_.c:610
+#: ../../network/tools.pm_.c:102 ../../standalone/drakconnect_.c:608
msgid "Card IO_0"
msgstr "���� IO_0"
-#: ../../network/tools.pm_.c:89 ../../standalone/drakconnect_.c:611
+#: ../../network/tools.pm_.c:103 ../../standalone/drakconnect_.c:609
msgid "Card IO_1"
msgstr "���� IO_1"
-#: ../../network/tools.pm_.c:90 ../../standalone/drakconnect_.c:612
+#: ../../network/tools.pm_.c:104 ../../standalone/drakconnect_.c:610
msgid "Your personal phone number"
msgstr "���Լ��ĵ绰����"
-#: ../../network/tools.pm_.c:91 ../../standalone/drakconnect_.c:613
+#: ../../network/tools.pm_.c:105 ../../standalone/drakconnect_.c:611
msgid "Provider name (ex provider.net)"
msgstr "���������� (�� provider.net)"
-#: ../../network/tools.pm_.c:92 ../../standalone/drakconnect_.c:614
+#: ../../network/tools.pm_.c:106 ../../standalone/drakconnect_.c:612
msgid "Provider phone number"
msgstr "�����̵绰����"
-#: ../../network/tools.pm_.c:93 ../../standalone/drakconnect_.c:615
+#: ../../network/tools.pm_.c:107 ../../standalone/drakconnect_.c:613
msgid "Provider dns 1 (optional)"
msgstr "������ dns 1"
-#: ../../network/tools.pm_.c:94 ../../standalone/drakconnect_.c:616
+#: ../../network/tools.pm_.c:108 ../../standalone/drakconnect_.c:614
msgid "Provider dns 2 (optional)"
msgstr "������ dns 2"
-#: ../../network/tools.pm_.c:95
+#: ../../network/tools.pm_.c:109
msgid "Choose your country"
msgstr "ѡ�����"
-#: ../../network/tools.pm_.c:96 ../../standalone/drakconnect_.c:619
+#: ../../network/tools.pm_.c:110 ../../standalone/drakconnect_.c:617
msgid "Dialing mode"
msgstr "����ģʽ"
-#: ../../network/tools.pm_.c:97 ../../standalone/drakconnect_.c:631
+#: ../../network/tools.pm_.c:111 ../../standalone/drakconnect_.c:629
msgid "Connection speed"
msgstr "��������"
-#: ../../network/tools.pm_.c:98 ../../standalone/drakconnect_.c:632
+#: ../../network/tools.pm_.c:112 ../../standalone/drakconnect_.c:630
msgid "Connection timeout (in sec)"
msgstr "���ӳ�ʱ(��)"
-#: ../../network/tools.pm_.c:99 ../../standalone/drakconnect_.c:617
+#: ../../network/tools.pm_.c:113 ../../standalone/drakconnect_.c:615
msgid "Account Login (user name)"
msgstr "�ʻ�����"
-#: ../../network/tools.pm_.c:100 ../../standalone/drakconnect_.c:618
-#: ../../standalone/drakconnect_.c:649
+#: ../../network/tools.pm_.c:114 ../../standalone/drakconnect_.c:616
+#: ../../standalone/drakconnect_.c:647
msgid "Account Password"
msgstr "�ʻ�����"
-#: ../../network/tools.pm_.c:104 ../../network/tools.pm_.c:118
+#: ../../network/tools.pm_.c:118 ../../network/tools.pm_.c:132
msgid "United Kingdom"
msgstr "Ӣ��"
-#: ../../partition_table.pm_.c:602
+#: ../../partition_table.pm_.c:603
msgid "mount failed: "
msgstr "װ��ʧ��: "
-#: ../../partition_table.pm_.c:666
+#: ../../partition_table.pm_.c:667
msgid "Extended partition not supported on this platform"
msgstr "���ƽ̨�ϲ�֧����չ����"
-#: ../../partition_table.pm_.c:684
+#: ../../partition_table.pm_.c:685
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 "
@@ -7426,12 +7227,12 @@ msgstr "���ļ� %s �ָ�ʧ��: %s"
msgid "Bad backup file"
msgstr "����ı����ļ�"
-#: ../../partition_table.pm_.c:798
+#: ../../partition_table.pm_.c:796
#, c-format
msgid "Error writing to file %s"
msgstr "д���ļ� %s ʧ��"
-#: ../../partition_table/raw.pm_.c:189
+#: ../../partition_table/raw.pm_.c:192
msgid ""
"Something bad is happening on your drive. \n"
"A test to check the integrity of data has failed. \n"
@@ -7461,182 +7262,183 @@ msgstr "����"
msgid "maybe"
msgstr "��������"
-#: ../../printer.pm_.c:26
-msgid "CUPS - Common Unix Printing System"
-msgstr "CUPS - ��ͨUnix��ӡϵͳ"
+#: ../../printer/data.pm_.c:18
+msgid "PDQ - Print, Don't Queue"
+msgstr "PDQ - ��ӡ, ���Ŷ�"
-#: ../../printer.pm_.c:27
-msgid "LPRng - LPR New Generation"
-msgstr "LPRng - ��һ��LPR"
+#: ../../printer/data.pm_.c:19
+msgid "PDQ"
+msgstr "PDQ"
-#: ../../printer.pm_.c:28
+#: ../../printer/data.pm_.c:30
msgid "LPD - Line Printer Daemon"
msgstr "LPD - ��ʽ��ӡ��"
-#: ../../printer.pm_.c:29
-msgid "PDQ - Print, Don't Queue"
-msgstr "PDQ - ��ӡ, ���Ŷ�"
+#: ../../printer/data.pm_.c:31
+msgid "LPD"
+msgstr "LPD"
-#: ../../printer.pm_.c:34 ../../printer.pm_.c:1181
-msgid "CUPS"
-msgstr "CUPS"
+#: ../../printer/data.pm_.c:51
+msgid "LPRng - LPR New Generation"
+msgstr "LPRng - ��һ��LPR"
-#: ../../printer.pm_.c:35
+#: ../../printer/data.pm_.c:52
msgid "LPRng"
msgstr "LPRng"
-#: ../../printer.pm_.c:36
-msgid "LPD"
-msgstr "LPD"
+#: ../../printer/data.pm_.c:75
+msgid "CUPS - Common Unix Printing System"
+msgstr "CUPS - ��ͨUnix��ӡϵͳ"
-#: ../../printer.pm_.c:37
-msgid "PDQ"
-msgstr "PDQ"
+#: ../../printer/data.pm_.c:76 ../../printer/main.pm_.c:677
+msgid "CUPS"
+msgstr "CUPS"
-#: ../../printer.pm_.c:49
+#: ../../printer/detect.pm_.c:80 ../../printer/detect.pm_.c:213
+#: ../../printer/detect.pm_.c:250
+msgid "Unknown Model"
+msgstr "δ֪�ͺ�"
+
+#: ../../printer/main.pm_.c:26
msgid "Local printer"
msgstr "������ӡ��"
-#: ../../printer.pm_.c:50
+#: ../../printer/main.pm_.c:27
msgid "Remote printer"
msgstr "Զ�̴�ӡ��"
-#: ../../printer.pm_.c:51
+#: ../../printer/main.pm_.c:28
msgid "Printer on remote CUPS server"
msgstr "Զ�� CUPS �������Ĵ�ӡ��"
-#: ../../printer.pm_.c:52 ../../printerdrake.pm_.c:898
+#: ../../printer/main.pm_.c:29 ../../printer/printerdrake.pm_.c:835
msgid "Printer on remote lpd server"
msgstr "Զ�� lpd �������Ĵ�ӡ��"
-#: ../../printer.pm_.c:53
+#: ../../printer/main.pm_.c:30
msgid "Network printer (TCP/Socket)"
msgstr "�����ӡ�� (TCP/Socket)"
-#: ../../printer.pm_.c:54
+#: ../../printer/main.pm_.c:31
msgid "Printer on SMB/Windows 95/98/NT server"
msgstr "SMB/Windows 95/98/NT �������ϵĴ�ӡ��"
-#: ../../printer.pm_.c:55
+#: ../../printer/main.pm_.c:32
msgid "Printer on NetWare server"
msgstr "NetWare �������ϵĴ�ӡ��"
-#: ../../printer.pm_.c:56 ../../printerdrake.pm_.c:902
+#: ../../printer/main.pm_.c:33 ../../printer/printerdrake.pm_.c:839
msgid "Enter a printer device URI"
msgstr "��ӡ���豸URI"
-#: ../../printer.pm_.c:57
+#: ../../printer/main.pm_.c:34
msgid "Pipe job into a command"
msgstr "��ҵpipe��������"
-#: ../../printer.pm_.c:346 ../../printer.pm_.c:388 ../../printer.pm_.c:570
-msgid "Unknown Model"
-msgstr "δ֪�ͺ�"
-
-#: ../../printer.pm_.c:791 ../../printer.pm_.c:982 ../../printer.pm_.c:1374
-#: ../../printerdrake.pm_.c:2305 ../../printerdrake.pm_.c:3471
+#: ../../printer/main.pm_.c:290 ../../printer/main.pm_.c:478
+#: ../../printer/main.pm_.c:794 ../../printer/printerdrake.pm_.c:3228
msgid "Unknown model"
msgstr "δ֪ģʽ"
-#: ../../printer.pm_.c:819
+#: ../../printer/main.pm_.c:317
msgid "Local Printers"
msgstr "������ӡ��"
-#: ../../printer.pm_.c:821 ../../printer.pm_.c:1182
+#: ../../printer/main.pm_.c:319 ../../printer/main.pm_.c:678
msgid "Remote Printers"
msgstr "Զ�̴�ӡ��"
-#: ../../printer.pm_.c:828 ../../printerdrake.pm_.c:417
+#: ../../printer/main.pm_.c:326 ../../printer/printerdrake.pm_.c:381
#, c-format
msgid " on parallel port \\/*%s"
msgstr " ���п� \\/*%s"
-#: ../../printer.pm_.c:831 ../../printerdrake.pm_.c:419
+#: ../../printer/main.pm_.c:329 ../../printer/printerdrake.pm_.c:383
#, c-format
msgid ", USB printer \\/*%s"
msgstr ", USB ��ӡ�� \\/*%s"
-#: ../../printer.pm_.c:836
+#: ../../printer/main.pm_.c:334
#, c-format
msgid ", multi-function device on parallel port \\/*%s"
msgstr ", ���ж˿��ϵĶ๦���豸 \\/*%s"
-#: ../../printer.pm_.c:839
+#: ../../printer/main.pm_.c:337
msgid ", multi-function device on USB"
msgstr ", USB �˿��ϵĶ๦���豸"
-#: ../../printer.pm_.c:841
+#: ../../printer/main.pm_.c:339
msgid ", multi-function device on HP JetDirect"
msgstr ", HP JetDirect ��ӡ�������ϵĶ๦���豸"
-#: ../../printer.pm_.c:843
+#: ../../printer/main.pm_.c:341
msgid ", multi-function device"
msgstr ", �๦���豸"
-#: ../../printer.pm_.c:846
+#: ../../printer/main.pm_.c:344
#, c-format
msgid ", printing to %s"
msgstr ", ��ӡ�� %s"
-#: ../../printer.pm_.c:848
+#: ../../printer/main.pm_.c:346
#, c-format
msgid " on LPD server \"%s\", printer \"%s\""
msgstr "LPD ��������%s���ϵĴ�ӡ����%s��"
-#: ../../printer.pm_.c:850
+#: ../../printer/main.pm_.c:348
#, c-format
msgid ", TCP/IP host \"%s\", port %s"
msgstr ", TCP/IP ������%s��, �˿� %s"
-#: ../../printer.pm_.c:854
+#: ../../printer/main.pm_.c:352
#, c-format
msgid " on SMB/Windows server \"%s\", share \"%s\""
msgstr "SMB/Windows ��������%s���ϵĹ�����%s��"
-#: ../../printer.pm_.c:858
+#: ../../printer/main.pm_.c:356
#, c-format
msgid " on Novell server \"%s\", printer \"%s\""
msgstr "Novell ��ӡ��������%s���ϵĴ�ӡ����%s��"
-#: ../../printer.pm_.c:860
+#: ../../printer/main.pm_.c:358
#, c-format
msgid ", using command %s"
msgstr ", ʹ������ %s"
-#: ../../printer.pm_.c:979 ../../printerdrake.pm_.c:1701
+#: ../../printer/main.pm_.c:475 ../../printer/printerdrake.pm_.c:1603
msgid "Raw printer (No driver)"
msgstr "ֱ�Ӵ�ӡ��� (��ʹ����������)"
-#: ../../printer.pm_.c:1151
+#: ../../printer/main.pm_.c:647
#, c-format
msgid "(on %s)"
msgstr "(�� %s)"
-#: ../../printer.pm_.c:1153
+#: ../../printer/main.pm_.c:649
msgid "(on this machine)"
msgstr "(�����������)"
-#: ../../printer.pm_.c:1178
+#: ../../printer/main.pm_.c:674
#, c-format
msgid "On CUPS server \"%s\""
msgstr "�� CUPS ������ ��%s��"
-#: ../../printer.pm_.c:1184 ../../printerdrake.pm_.c:3123
-#: ../../printerdrake.pm_.c:3134 ../../printerdrake.pm_.c:3360
-#: ../../printerdrake.pm_.c:3412 ../../printerdrake.pm_.c:3438
-#: ../../printerdrake.pm_.c:3613 ../../printerdrake.pm_.c:3615
+#: ../../printer/main.pm_.c:680 ../../printer/printerdrake.pm_.c:2888
+#: ../../printer/printerdrake.pm_.c:2899 ../../printer/printerdrake.pm_.c:3120
+#: ../../printer/printerdrake.pm_.c:3171 ../../printer/printerdrake.pm_.c:3197
+#: ../../printer/printerdrake.pm_.c:3352 ../../printer/printerdrake.pm_.c:3354
msgid " (Default)"
msgstr " (Ĭ��)"
-#: ../../printerdrake.pm_.c:25
+#: ../../printer/printerdrake.pm_.c:27
msgid "Select Printer Connection"
msgstr "ѡ���ӡ������"
-#: ../../printerdrake.pm_.c:26
+#: ../../printer/printerdrake.pm_.c:28
msgid "How is the printer connected?"
msgstr "��ӡ����������ӵ�?"
-#: ../../printerdrake.pm_.c:28
+#: ../../printer/printerdrake.pm_.c:30
msgid ""
"\n"
"Printers on remote CUPS servers you do not have to configure here; these "
@@ -7645,19 +7447,19 @@ msgstr ""
"\n"
"������Ҫ����Զ�̵� CUPS ������;���ǻᱻ�Զ�̽�⵽��"
-#: ../../printerdrake.pm_.c:36
+#: ../../printer/printerdrake.pm_.c:38
msgid "Printer auto-detection (Local, TCP/Socket, and SMB printers)"
msgstr "��ӡ���Զ���� (����, TCP/Socket �� SMB ��ӡ��)"
-#: ../../printerdrake.pm_.c:84 ../../printerdrake.pm_.c:3187
+#: ../../printer/printerdrake.pm_.c:81 ../../printer/printerdrake.pm_.c:2950
msgid "CUPS configuration"
msgstr "CUPS ��ӡ����"
-#: ../../printerdrake.pm_.c:85 ../../printerdrake.pm_.c:3188
+#: ../../printer/printerdrake.pm_.c:82 ../../printer/printerdrake.pm_.c:2951
msgid "Specify CUPS server"
msgstr "ָ�� CUPS ��ӡ������"
-#: ../../printerdrake.pm_.c:86
+#: ../../printer/printerdrake.pm_.c:83
msgid ""
"To get access to printers on remote CUPS servers in your local network you "
"do not have to configure anything; the CUPS servers inform your machine "
@@ -7674,7 +7476,7 @@ msgstr ""
"��, �Ա�ӷ�������ȡ��ӡ����Ϣ,\n"
"����, ������Щ�ֶο��š�"
-#: ../../printerdrake.pm_.c:87
+#: ../../printer/printerdrake.pm_.c:84
msgid ""
"\n"
"Normally, CUPS is automatically configured according to your network "
@@ -7688,53 +7490,53 @@ msgstr ""
"�ر� ���Զ�CUPS���á�, �ֹ����� /etc/cups/cupsd.conf, ����Ҫ������������CUPS"
"����(����: ��service cups restart��)��"
-#: ../../printerdrake.pm_.c:91
+#: ../../printer/printerdrake.pm_.c:88
msgid "The IP address should look like 192.168.1.20"
msgstr "IP ��ַ�ĸ�ʽӦ������ 1.2.3.4"
-#: ../../printerdrake.pm_.c:95 ../../printerdrake.pm_.c:1109
+#: ../../printer/printerdrake.pm_.c:92 ../../printer/printerdrake.pm_.c:1041
msgid "The port number should be an integer!"
msgstr "�˿���Ϊ����!"
-#: ../../printerdrake.pm_.c:102
+#: ../../printer/printerdrake.pm_.c:99
msgid "CUPS server IP"
msgstr "CUPS ������ IP"
-#: ../../printerdrake.pm_.c:103 ../../printerdrake.pm_.c:1129
+#: ../../printer/printerdrake.pm_.c:100 ../../printer/printerdrake.pm_.c:1061
+#: ../../standalone/harddrake2_.c:63
msgid "Port"
msgstr "�˿�"
-#: ../../printerdrake.pm_.c:105
+#: ../../printer/printerdrake.pm_.c:102
msgid "Automatic CUPS configuration"
msgstr "CUPS�Զ�����"
-#: ../../printerdrake.pm_.c:177 ../../printerdrake.pm_.c:247
-#: ../../printerdrake.pm_.c:1574 ../../printerdrake.pm_.c:1578
-#: ../../printerdrake.pm_.c:1696 ../../printerdrake.pm_.c:2248
-#: ../../printerdrake.pm_.c:2401 ../../printerdrake.pm_.c:2460
-#: ../../printerdrake.pm_.c:2533 ../../printerdrake.pm_.c:2554
-#: ../../printerdrake.pm_.c:2747 ../../printerdrake.pm_.c:2792
-#: ../../printerdrake.pm_.c:2797 ../../printerdrake.pm_.c:2831
-#: ../../printerdrake.pm_.c:2836 ../../printerdrake.pm_.c:2873
-#: ../../printerdrake.pm_.c:2926 ../../printerdrake.pm_.c:2946
-#: ../../printerdrake.pm_.c:2960 ../../printerdrake.pm_.c:2994
-#: ../../printerdrake.pm_.c:3040 ../../printerdrake.pm_.c:3058
-#: ../../printerdrake.pm_.c:3147 ../../printerdrake.pm_.c:3226
-#: ../../printerdrake.pm_.c:3528 ../../printerdrake.pm_.c:3583
-#: ../../printerdrake.pm_.c:3636 ../../standalone/printerdrake_.c:57
-msgid "Printerdrake"
-msgstr "Printerdrake"
-
-#: ../../printerdrake.pm_.c:178
+#: ../../printer/printerdrake.pm_.c:159
msgid "Checking your system..."
msgstr "���ڼ������ϵͳ ..."
-#: ../../printerdrake.pm_.c:186
+#: ../../printer/printerdrake.pm_.c:159 ../../printer/printerdrake.pm_.c:226
+#: ../../printer/printerdrake.pm_.c:1477 ../../printer/printerdrake.pm_.c:1481
+#: ../../printer/printerdrake.pm_.c:1598 ../../printer/printerdrake.pm_.c:2133
+#: ../../printer/printerdrake.pm_.c:2284 ../../printer/printerdrake.pm_.c:2343
+#: ../../printer/printerdrake.pm_.c:2415 ../../printer/printerdrake.pm_.c:2436
+#: ../../printer/printerdrake.pm_.c:2625 ../../printer/printerdrake.pm_.c:2630
+#: ../../printer/printerdrake.pm_.c:2636 ../../printer/printerdrake.pm_.c:2701
+#: ../../printer/printerdrake.pm_.c:2720 ../../printer/printerdrake.pm_.c:2731
+#: ../../printer/printerdrake.pm_.c:2764 ../../printer/printerdrake.pm_.c:2809
+#: ../../printer/printerdrake.pm_.c:2825 ../../printer/printerdrake.pm_.c:2911
+#: ../../printer/printerdrake.pm_.c:2989 ../../printer/printerdrake.pm_.c:3281
+#: ../../printer/printerdrake.pm_.c:3328 ../../printer/printerdrake.pm_.c:3369
+#: ../../standalone/printerdrake_.c:47
+msgid "Printerdrake"
+msgstr "Printerdrake"
+
+#: ../../printer/printerdrake.pm_.c:167
msgid ""
"There are no printers found which are directly connected to your machine"
msgstr "û�з��ִ�ӡ��ֱ�����������Ļ�����"
-#: ../../printerdrake.pm_.c:198
+#: ../../printer/printerdrake.pm_.c:179
msgid ""
"The following printers\n"
"\n"
@@ -7742,7 +7544,7 @@ msgstr ""
"���д�ӡ��\n"
"\n"
-#: ../../printerdrake.pm_.c:199
+#: ../../printer/printerdrake.pm_.c:180
msgid ""
"The following printer\n"
"\n"
@@ -7750,7 +7552,7 @@ msgstr ""
"���д�ӡ��\n"
"\n"
-#: ../../printerdrake.pm_.c:201
+#: ../../printer/printerdrake.pm_.c:182
msgid ""
"\n"
"and one unknown printer are "
@@ -7758,7 +7560,7 @@ msgstr ""
"\n"
"�Լ�һ��δ֪�Ĵ�ӡ�� "
-#: ../../printerdrake.pm_.c:203
+#: ../../printer/printerdrake.pm_.c:184
#, c-format
msgid ""
"\n"
@@ -7767,7 +7569,7 @@ msgstr ""
"\n"
"�� %d ��δ֪�Ĵ�ӡ�� "
-#: ../../printerdrake.pm_.c:207
+#: ../../printer/printerdrake.pm_.c:187
msgid ""
"\n"
"are "
@@ -7775,7 +7577,7 @@ msgstr ""
"\n"
" "
-#: ../../printerdrake.pm_.c:208
+#: ../../printer/printerdrake.pm_.c:187
msgid ""
"\n"
"is "
@@ -7783,11 +7585,11 @@ msgstr ""
"\n"
" "
-#: ../../printerdrake.pm_.c:210
+#: ../../printer/printerdrake.pm_.c:189
msgid "directly connected to your system"
msgstr "ֱ������������ϵͳ"
-#: ../../printerdrake.pm_.c:213
+#: ../../printer/printerdrake.pm_.c:192
msgid ""
"\n"
"There is one unknown printer directly connected to your system"
@@ -7795,7 +7597,7 @@ msgstr ""
"\n"
"��һ��δ֪�Ĵ�ӡ��ֱ������������ϵͳ"
-#: ../../printerdrake.pm_.c:215
+#: ../../printer/printerdrake.pm_.c:194
#, c-format
msgid ""
"\n"
@@ -7804,29 +7606,29 @@ msgstr ""
"\n"
"�� %d ��δ֪�Ĵ�ӡ��ֱ������������ϵͳ"
-#: ../../printerdrake.pm_.c:221
+#: ../../printer/printerdrake.pm_.c:200
msgid " (Make sure that all your printers are connected and turned on).\n"
msgstr " (��ȷ�����Ĵ�ӡ���Ѿ����Ӻò��ҽ�ͨ�˵�Դ)��\n"
-#: ../../printerdrake.pm_.c:235
+#: ../../printer/printerdrake.pm_.c:214
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
+#: ../../printer/printerdrake.pm_.c:215
msgid "Do you want to enable printing on printers in the local network?\n"
msgstr "����ʹ�ñ�������Ĵ�ӡ������ӡ��?\n"
-#: ../../printerdrake.pm_.c:238
+#: ../../printer/printerdrake.pm_.c:217
msgid "Do you want to enable printing on the printers mentioned above?\n"
msgstr "���Ƿ�ϣ���������Ĵ�ӡ���Ͻ��д�ӡ?\n"
-#: ../../printerdrake.pm_.c:239
+#: ../../printer/printerdrake.pm_.c:218
msgid "Are you sure that you want to set up printing on this machine?\n"
msgstr "��ȷ��Ҫ����̨���������ô�ӡ��?\n"
-#: ../../printerdrake.pm_.c:240
+#: ../../printer/printerdrake.pm_.c:219
#, c-format
msgid ""
"NOTE: Depending on the printer model and the printing system up to %d MB of "
@@ -7835,13 +7637,13 @@ msgstr ""
"ע��: ���ݲ�ͬ�Ĵ�ӡ���ͺźʹ�ӡϵͳ, ��Ҫ��װ���ӵ�����, ������Ҫ %d MB ��"
"�䡣"
-#: ../../printerdrake.pm_.c:279 ../../printerdrake.pm_.c:291
-#: ../../printerdrake.pm_.c:361 ../../printerdrake.pm_.c:3169
-#: ../../printerdrake.pm_.c:3299
+#: ../../printer/printerdrake.pm_.c:258 ../../printer/printerdrake.pm_.c:270
+#: ../../printer/printerdrake.pm_.c:328 ../../printer/printerdrake.pm_.c:2933
+#: ../../printer/printerdrake.pm_.c:3060
msgid "Add a new printer"
msgstr "���Ӵ�ӡ��"
-#: ../../printerdrake.pm_.c:280
+#: ../../printer/printerdrake.pm_.c:259
msgid ""
"\n"
"Welcome to the Printer Setup Wizard\n"
@@ -7861,7 +7663,7 @@ msgstr ""
"����ѯ�����б�Ҫ����Ϣ���д�ӡ������, ���������������п��õĴ�ӡ����������, "
"��������ѡ��ʹ�ӡ���������͡�"
-#: ../../printerdrake.pm_.c:293
+#: ../../printer/printerdrake.pm_.c:272
msgid ""
"\n"
"Welcome to the Printer Setup Wizard\n"
@@ -7896,7 +7698,7 @@ msgstr ""
"\n"
"׼���þ͵������һ����, ����������������ô�ӡ��, �����ȡ������"
-#: ../../printerdrake.pm_.c:302 ../../printerdrake.pm_.c:319
+#: ../../printer/printerdrake.pm_.c:281 ../../printer/printerdrake.pm_.c:298
msgid ""
"\n"
"Welcome to the Printer Setup Wizard\n"
@@ -7920,7 +7722,7 @@ msgstr ""
"\n"
"׼���þ͵������һ����, ����������������ô�ӡ��, �����ȡ������"
-#: ../../printerdrake.pm_.c:310
+#: ../../printer/printerdrake.pm_.c:289
msgid ""
"\n"
"Welcome to the Printer Setup Wizard\n"
@@ -7952,19 +7754,19 @@ msgstr ""
"\n"
"׼���þ͵������һ����, ����������������ô�ӡ��, �����ȡ������"
-#: ../../printerdrake.pm_.c:328
+#: ../../printer/printerdrake.pm_.c:307
msgid "Auto-detect printers connected to this machine"
msgstr "�Զ�̽����̨�������ӵĴ�ӡ��"
-#: ../../printerdrake.pm_.c:331
+#: ../../printer/printerdrake.pm_.c:310
msgid "Auto-detect printers connected directly to the local network"
msgstr "�Զ�̽��ֱ�����ӵ���������Ĵ�ӡ��"
-#: ../../printerdrake.pm_.c:334
+#: ../../printer/printerdrake.pm_.c:313
msgid "Auto-detect printers connected to machines running Microsoft Windows"
msgstr "�Զ�̽������ Microsoft Windows �Ļ������ӵĴ�ӡ��"
-#: ../../printerdrake.pm_.c:362
+#: ../../printer/printerdrake.pm_.c:329
msgid ""
"\n"
"Congratulations, your printer is now installed and configured!\n"
@@ -7985,53 +7787,53 @@ msgstr ""
"����Ժ�Ҫ����, ɾ����ӡ��, �ı��ӡ������, ������Ҫ�޸�Ĭ�ϴ�ӡ���� (��ֽ"
"��, �������, ...), �� Mandrake �������ĵ� ��Ӳ��������ѡ�񡰴�ӡ������"
-#: ../../printerdrake.pm_.c:399 ../../printerdrake.pm_.c:590
-#: ../../printerdrake.pm_.c:805 ../../printerdrake.pm_.c:1045
+#: ../../printer/printerdrake.pm_.c:364 ../../printer/printerdrake.pm_.c:538
+#: ../../printer/printerdrake.pm_.c:742 ../../printer/printerdrake.pm_.c:978
msgid "Printer auto-detection"
msgstr "��ӡ���Զ����"
-#: ../../printerdrake.pm_.c:421
+#: ../../printer/printerdrake.pm_.c:385
#, c-format
msgid ", network printer \"%s\", port %s"
msgstr ", �����ӡ�� ��%s��, �˿� %s"
-#: ../../printerdrake.pm_.c:423
+#: ../../printer/printerdrake.pm_.c:387
#, c-format
msgid ", printer \"%s\" on SMB/Windows server \"%s\""
msgstr ", ��ӡ�� ��%s�� �� SMB/Windows ������ ��%s�� ��"
-#: ../../printerdrake.pm_.c:429
+#: ../../printer/printerdrake.pm_.c:391
#, c-format
msgid "Detected %s"
msgstr "��⵽ %s"
-#: ../../printerdrake.pm_.c:433 ../../printerdrake.pm_.c:464
-#: ../../printerdrake.pm_.c:483
+#: ../../printer/printerdrake.pm_.c:395 ../../printer/printerdrake.pm_.c:423
+#: ../../printer/printerdrake.pm_.c:440
#, c-format
msgid "Printer on parallel port \\/*%s"
msgstr "���ж˿ڴ�ӡ�� \\/*%s"
-#: ../../printerdrake.pm_.c:435 ../../printerdrake.pm_.c:466
-#: ../../printerdrake.pm_.c:488
+#: ../../printer/printerdrake.pm_.c:397 ../../printer/printerdrake.pm_.c:425
+#: ../../printer/printerdrake.pm_.c:443
#, c-format
msgid "USB printer \\/*%s"
msgstr "USB ��ӡ�� \\/*%s"
-#: ../../printerdrake.pm_.c:437
+#: ../../printer/printerdrake.pm_.c:399
#, c-format
msgid "Network printer \"%s\", port %s"
msgstr "�����ӡ�� ��%s��, �˿� %s"
-#: ../../printerdrake.pm_.c:439
+#: ../../printer/printerdrake.pm_.c:401
#, c-format
msgid "Printer \"%s\" on SMB/Windows server \"%s\""
msgstr "��ӡ�� ��%s�� �� SMB/Windows ��������ӡ�� ��%s�� ��"
-#: ../../printerdrake.pm_.c:575 ../../printerdrake.pm_.c:600
+#: ../../printer/printerdrake.pm_.c:525 ../../printer/printerdrake.pm_.c:547
msgid "Local Printer"
msgstr "������ӡ��"
-#: ../../printerdrake.pm_.c:576
+#: ../../printer/printerdrake.pm_.c:526
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, ..., "
@@ -8042,19 +7844,19 @@ msgstr ""
"lp0, /dev/lp1, ..., �൱�� LPT1:, LPT2:, ..., ��һ�� USB ��ӡ��: /dev/usb/"
"lp0, �ڶ��� USB ��ӡ��: /dev/usb/lp1, ...)��"
-#: ../../printerdrake.pm_.c:580
+#: ../../printer/printerdrake.pm_.c:530
msgid "You must enter a device or file name!"
msgstr "����Ҫ�����ӡ���豸����һ�ļ���!"
-#: ../../printerdrake.pm_.c:591
+#: ../../printer/printerdrake.pm_.c:539
msgid "No printer found!"
msgstr "û�з��ִ�ӡ��!"
-#: ../../printerdrake.pm_.c:601
+#: ../../printer/printerdrake.pm_.c:548
msgid "Available printers"
msgstr "���ô�ӡ��"
-#: ../../printerdrake.pm_.c:605
+#: ../../printer/printerdrake.pm_.c:552
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"
@@ -8062,7 +7864,7 @@ msgstr ""
"�Զ���ⷢ�������д�ӡ��, �����Ҫʹ�õĴ�ӡ������������������������һ���豸"
"�����ļ���"
-#: ../../printerdrake.pm_.c:606
+#: ../../printer/printerdrake.pm_.c:553
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"
@@ -8070,7 +7872,7 @@ msgstr ""
"�Զ���ⷢ�������д�ӡ��, ��ѡ����Ҫʹ�õĴ�ӡ��, ����������������һ���豸��"
"���ļ���"
-#: ../../printerdrake.pm_.c:608
+#: ../../printer/printerdrake.pm_.c:555
msgid ""
"The following printer was auto-detected. The configuration of the printer "
"will work fully automatically. If your printer was not correctly detected or "
@@ -8080,7 +7882,7 @@ msgstr ""
"�Զ���ⷢ�������д�ӡ��, ��ӡ�������� ����ȫ�Զ�����. ������Ĵ�ӡ��û�б���"
"ȷ��� �������붨�ƴ�ӡ������, ѡ�� ���ֹ� ���á�."
-#: ../../printerdrake.pm_.c:609
+#: ../../printer/printerdrake.pm_.c:556
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 "
@@ -8090,17 +7892,17 @@ msgstr ""
"�����г������м�⵽�Ĵ�ӡ��. ��ѡ����ϣ�����õĴ�ӡ��. ������Ĵ�ӡ��û�б�"
"��ȷ��� �������붨�ƴ�ӡ������, ѡ�� ���ֹ� ���á���"
-#: ../../printerdrake.pm_.c:611
+#: ../../printer/printerdrake.pm_.c:558
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:612
+#: ../../printer/printerdrake.pm_.c:559
msgid "Please choose the port where your printer is connected to."
msgstr "�������Ĵ�ӡ�������ӵ��Ǹ��˿�?"
-#: ../../printerdrake.pm_.c:614
+#: ../../printer/printerdrake.pm_.c:561
msgid ""
" (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., "
"1st USB printer: /dev/usb/lp0, 2nd USB printer: /dev/usb/lp1, ...)."
@@ -8108,19 +7910,19 @@ msgstr ""
" (���п�: /dev/lp0, /dev/lp1, ..., �൱�� LPT1:, LPT2:, ..., ��һ�� USB �豸"
"��: /dev/usb/lp0, �ڶ��� USB �豸��: /dev/usb/lp1, ...)."
-#: ../../printerdrake.pm_.c:619
+#: ../../printer/printerdrake.pm_.c:565
msgid "You must choose/enter a printer/device!"
msgstr "����Ҫ����һ̨��ӡ���豸"
-#: ../../printerdrake.pm_.c:639
+#: ../../printer/printerdrake.pm_.c:584
msgid "Manual configuration"
msgstr "�ֹ�����"
-#: ../../printerdrake.pm_.c:693
+#: ../../printer/printerdrake.pm_.c:633
msgid "Remote lpd Printer Options"
msgstr "Զ�� lpd ��ӡ��ѡ��"
-#: ../../printerdrake.pm_.c:694
+#: ../../printer/printerdrake.pm_.c:634
msgid ""
"To use a remote lpd printer, you need to supply the hostname of the printer "
"server and the printer name on that server."
@@ -8128,46 +7930,46 @@ msgstr ""
"Ҫʹ��һ��Զ�̵� lpd ��ӡ����, ����Ҫָ����ӡ��������\n"
"�������ʹ�ӡ����Ҫ�����Ĵ�ӡ���е�����."
-#: ../../printerdrake.pm_.c:695
+#: ../../printer/printerdrake.pm_.c:635
msgid "Remote host name"
msgstr "Զ��������"
-#: ../../printerdrake.pm_.c:696
+#: ../../printer/printerdrake.pm_.c:636
msgid "Remote printer name"
msgstr "Զ�̴�ӡ����"
-#: ../../printerdrake.pm_.c:699
+#: ../../printer/printerdrake.pm_.c:639
msgid "Remote host name missing!"
msgstr "δ�ҵ�Զ������!"
-#: ../../printerdrake.pm_.c:703
+#: ../../printer/printerdrake.pm_.c:643
msgid "Remote printer name missing!"
msgstr "û���ҵ�Զ�̴�ӡ��!"
-#: ../../printerdrake.pm_.c:727 ../../printerdrake.pm_.c:1244
+#: ../../printer/printerdrake.pm_.c:665 ../../printer/printerdrake.pm_.c:1170
#, c-format
msgid "Detected model: %s %s"
msgstr "��⵽�ͺ�: %s %s"
-#: ../../printerdrake.pm_.c:805 ../../printerdrake.pm_.c:1045
+#: ../../printer/printerdrake.pm_.c:742 ../../printer/printerdrake.pm_.c:978
msgid "Scanning network..."
msgstr "����ɨ������..."
-#: ../../printerdrake.pm_.c:814 ../../printerdrake.pm_.c:835
+#: ../../printer/printerdrake.pm_.c:751 ../../printer/printerdrake.pm_.c:772
#, c-format
msgid ", printer \"%s\" on server \"%s\""
msgstr ", ��ӡ�� ��%s���ڷ����� ��%s����"
-#: ../../printerdrake.pm_.c:817 ../../printerdrake.pm_.c:838
+#: ../../printer/printerdrake.pm_.c:754 ../../printer/printerdrake.pm_.c:775
#, c-format
msgid "Printer \"%s\" on server \"%s\""
msgstr "��ӡ�� ��%s���ڷ����� ��%s����"
-#: ../../printerdrake.pm_.c:858
+#: ../../printer/printerdrake.pm_.c:795
msgid "SMB (Windows 9x/NT) Printer Options"
msgstr "SMB (Windows 9x/NT) ��ӡ��ѡ��"
-#: ../../printerdrake.pm_.c:859
+#: ../../printer/printerdrake.pm_.c:796
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 "
@@ -8179,7 +7981,7 @@ msgstr ""
"�ھ��￴����������, ���������� TCP/IP ��������ͬ,), ���ܻ���Ҫ���� IP ��ַ,\n"
"�Լ���Ȩ���ʴ�ӡ�����û���, ������Ϳ���, ��Ȼ���д�ӡ���Ĺ�������"
-#: ../../printerdrake.pm_.c:860
+#: ../../printer/printerdrake.pm_.c:797
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."
@@ -8187,39 +7989,39 @@ msgstr ""
"����Զ���ⷢ������Ҫ�Ĵ�ӡ��, ֻҪ���б���ѡ����, Ȼ�������û���, ����, ��"
"��������Ҫ������������"
-#: ../../printerdrake.pm_.c:861
+#: ../../printer/printerdrake.pm_.c:799
msgid "SMB server host"
msgstr "SMB ����������"
-#: ../../printerdrake.pm_.c:862
+#: ../../printer/printerdrake.pm_.c:800
msgid "SMB server IP"
msgstr "SMB ������ IP"
-#: ../../printerdrake.pm_.c:863
+#: ../../printer/printerdrake.pm_.c:801
msgid "Share name"
msgstr "������"
-#: ../../printerdrake.pm_.c:866
+#: ../../printer/printerdrake.pm_.c:804
msgid "Workgroup"
msgstr "������"
-#: ../../printerdrake.pm_.c:868
+#: ../../printer/printerdrake.pm_.c:806
msgid "Auto-detected"
msgstr "�Զ���⵽"
-#: ../../printerdrake.pm_.c:879
+#: ../../printer/printerdrake.pm_.c:816
msgid "Either the server name or the server's IP must be given!"
msgstr "��������������������IP!"
-#: ../../printerdrake.pm_.c:883
+#: ../../printer/printerdrake.pm_.c:820
msgid "Samba share name missing!"
msgstr "ȱ�� Samba ������!"
-#: ../../printerdrake.pm_.c:889
+#: ../../printer/printerdrake.pm_.c:826
msgid "SECURITY WARNING!"
msgstr "��ȫ����!"
-#: ../../printerdrake.pm_.c:890
+#: ../../printer/printerdrake.pm_.c:827
#, c-format
msgid ""
"You are about to set up printing to a Windows account with password. Due to "
@@ -8256,7 +8058,7 @@ msgstr ""
"�򵼰��ա�%s�����ӷ�ʽ ���ô�ӡ����\n"
"\n"
-#: ../../printerdrake.pm_.c:900
+#: ../../printer/printerdrake.pm_.c:837
#, c-format
msgid ""
"Set up your Windows server to make the printer available under the IPP "
@@ -8268,7 +8070,7 @@ msgstr ""
"���鰴�ա�%s�����ӷ�ʽ���ô�ӡ����\n"
"\n"
-#: ../../printerdrake.pm_.c:903
+#: ../../printer/printerdrake.pm_.c:840
msgid ""
"Connect your printer to a Linux server and let your Windows machine(s) "
"connect to it as a client.\n"
@@ -8279,11 +8081,11 @@ msgstr ""
"\n"
"�����Ҫ�����������ô�ӡ����?"
-#: ../../printerdrake.pm_.c:975
+#: ../../printer/printerdrake.pm_.c:911
msgid "NetWare Printer Options"
msgstr "NetWare ��ӡ��ѡ��"
-#: ../../printerdrake.pm_.c:976
+#: ../../printer/printerdrake.pm_.c:912
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 "
@@ -8294,37 +8096,37 @@ msgstr ""
"���������� TCP/IP ��������ͬ), �Լ���Ȩ���ʴ�ӡ�����û����Ϳ���, \n"
"��Ȼ���д�ӡ���Ĵ�ӡ��������"
-#: ../../printerdrake.pm_.c:977
+#: ../../printer/printerdrake.pm_.c:913
msgid "Printer Server"
msgstr "��ӡ��������"
-#: ../../printerdrake.pm_.c:978
+#: ../../printer/printerdrake.pm_.c:914
msgid "Print Queue Name"
msgstr "��ӡ������"
-#: ../../printerdrake.pm_.c:983
+#: ../../printer/printerdrake.pm_.c:919
msgid "NCP server name missing!"
msgstr "NCP ������δ�ҵ�"
-#: ../../printerdrake.pm_.c:987
+#: ../../printer/printerdrake.pm_.c:923
msgid "NCP queue name missing!"
msgstr "NCP ������δ�ҵ�"
-#: ../../printerdrake.pm_.c:1054 ../../printerdrake.pm_.c:1074
+#: ../../printer/printerdrake.pm_.c:987 ../../printer/printerdrake.pm_.c:1007
#, c-format
msgid ", host \"%s\", port %s"
msgstr ", ������%s��, �˿� %s"
-#: ../../printerdrake.pm_.c:1057 ../../printerdrake.pm_.c:1077
+#: ../../printer/printerdrake.pm_.c:990 ../../printer/printerdrake.pm_.c:1010
#, c-format
msgid "Host \"%s\", port %s"
msgstr "������%s��, �˿� %s"
-#: ../../printerdrake.pm_.c:1097
+#: ../../printer/printerdrake.pm_.c:1030
msgid "TCP/Socket Printer Options"
msgstr "TCP/Socket ��ӡ��ѡ��"
-#: ../../printerdrake.pm_.c:1099
+#: ../../printer/printerdrake.pm_.c:1032
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."
@@ -8332,7 +8134,7 @@ msgstr ""
"���Զ���⵽�Ĵ�ӡ���б���ѡ��һ��, �����������ֶ��������������� IP, �Լ���ѡ"
"�Ķ˿ں� (Ĭ���� 9100)��"
-#: ../../printerdrake.pm_.c:1100
+#: ../../printer/printerdrake.pm_.c:1033
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 "
@@ -8343,19 +8145,19 @@ msgstr ""
"(Ĭ���� 9100). HP JetDirect ��ӡ������ͨ���ö˿�9100, ����������������������"
"�˿ڡ����������Ӳ���ֲᡣ"
-#: ../../printerdrake.pm_.c:1105
+#: ../../printer/printerdrake.pm_.c:1037
msgid "Printer host name or IP missing!"
msgstr "ȱ�ٴ�ӡ���������� IP ��ַ!"
-#: ../../printerdrake.pm_.c:1127
+#: ../../printer/printerdrake.pm_.c:1059
msgid "Printer host name or IP"
msgstr "��ӡ���������� IP ��ַ"
-#: ../../printerdrake.pm_.c:1177 ../../printerdrake.pm_.c:1179
+#: ../../printer/printerdrake.pm_.c:1107 ../../printer/printerdrake.pm_.c:1109
msgid "Printer Device URI"
msgstr "��ӡ���豸 URI"
-#: ../../printerdrake.pm_.c:1178
+#: ../../printer/printerdrake.pm_.c:1108
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 "
@@ -8364,11 +8166,11 @@ msgstr ""
"������ֱ��ʹ�� URI ���ʴ�ӡ����URI �������CUPS �� Foomatic �涨����ע�ⲻ��"
"���еĴ�ӡ���� (spooler) ��֧�� URI��"
-#: ../../printerdrake.pm_.c:1193
+#: ../../printer/printerdrake.pm_.c:1123
msgid "A valid URI must be entered!"
msgstr "����������URI!"
-#: ../../printerdrake.pm_.c:1560
+#: ../../printer/printerdrake.pm_.c:1463
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."
@@ -8376,27 +8178,31 @@ msgstr ""
"ÿ̨��ӡ����Ҫһ������(�硰printer��)��\n"
"��ӡ��������λ���ǿ�ѡ�"
-#: ../../printerdrake.pm_.c:1561
+#: ../../printer/printerdrake.pm_.c:1464
msgid "Name of printer"
msgstr "��ӡ������"
-#: ../../printerdrake.pm_.c:1563
+#: ../../printer/printerdrake.pm_.c:1465 ../../standalone/harddrake2_.c:38
+msgid "Description"
+msgstr "����"
+
+#: ../../printer/printerdrake.pm_.c:1466
msgid "Location"
msgstr "�"
-#: ../../printerdrake.pm_.c:1575 ../../printerdrake.pm_.c:1697
+#: ../../printer/printerdrake.pm_.c:1478 ../../printer/printerdrake.pm_.c:1599
msgid "Reading printer database..."
msgstr "��ȡ��ӡ�����ݿ�..."
-#: ../../printerdrake.pm_.c:1579
+#: ../../printer/printerdrake.pm_.c:1482
msgid "Preparing printer database..."
msgstr "׼����ӡ������..."
-#: ../../printerdrake.pm_.c:1676
+#: ../../printer/printerdrake.pm_.c:1578
msgid "Your printer model"
msgstr "���Ĵ�ӡ���ͺ�"
-#: ../../printerdrake.pm_.c:1677
+#: ../../printer/printerdrake.pm_.c:1579
#, c-format
msgid ""
"Printerdrake has compared the model name resulting from the printer auto-"
@@ -8419,24 +8225,24 @@ msgstr ""
"\n"
"%s"
-#: ../../printerdrake.pm_.c:1682 ../../printerdrake.pm_.c:1685
+#: ../../printer/printerdrake.pm_.c:1584 ../../printer/printerdrake.pm_.c:1587
msgid "The model is correct"
msgstr "�ͺ���ȷ"
-#: ../../printerdrake.pm_.c:1683 ../../printerdrake.pm_.c:1684
-#: ../../printerdrake.pm_.c:1687
+#: ../../printer/printerdrake.pm_.c:1585 ../../printer/printerdrake.pm_.c:1586
+#: ../../printer/printerdrake.pm_.c:1589
msgid "Select model manually"
msgstr "�ֹ�ѡ���ͺ�"
-#: ../../printerdrake.pm_.c:1704
+#: ../../printer/printerdrake.pm_.c:1606
msgid "Printer model selection"
msgstr "��ӡ���ͺ�ѡ��"
-#: ../../printerdrake.pm_.c:1705
+#: ../../printer/printerdrake.pm_.c:1607
msgid "Which printer model do you have?"
msgstr "��������ӡ�����ͺ�?"
-#: ../../printerdrake.pm_.c:1706
+#: ../../printer/printerdrake.pm_.c:1608
msgid ""
"\n"
"\n"
@@ -8449,17 +8255,17 @@ msgstr ""
"����Զ����ѡ����ͺ��Ƿ���ȷ. �ù��ָ������ȷ���ͺŻ�δ֪��ӡ����, Ȼ���"
"�б���ѡ����ȷ���ͺš�"
-#: ../../printerdrake.pm_.c:1709
+#: ../../printer/printerdrake.pm_.c:1611
msgid ""
"If your printer is not listed, choose a compatible (see printer manual) or a "
"similar one."
msgstr "Ȼ�����Ĵ�ӡ�������б���, ѡ����ݵ�(�ο���ӡ���ֲ�) �����Ƶ��ͺš�"
-#: ../../printerdrake.pm_.c:1786
+#: ../../printer/printerdrake.pm_.c:1697
msgid "OKI winprinter configuration"
msgstr "OKI winprinter ��ӡ������"
-#: ../../printerdrake.pm_.c:1787
+#: ../../printer/printerdrake.pm_.c:1698
msgid ""
"You are configuring an OKI laser winprinter. These printers\n"
"use a very special communication protocol and therefore they work only when "
@@ -8470,11 +8276,11 @@ msgid ""
msgstr ""
"����������OKI win��ӡ��, ����ʹ���ر��ͨѶЭ��, ֻ�����ڵ�һ����ӡ�ڡ�"
-#: ../../printerdrake.pm_.c:1830 ../../printerdrake.pm_.c:1857
+#: ../../printer/printerdrake.pm_.c:1718 ../../printer/printerdrake.pm_.c:1745
msgid "Lexmark inkjet configuration"
msgstr "����(Lexmark)��ī��ӡ���趨"
-#: ../../printerdrake.pm_.c:1831
+#: ../../printer/printerdrake.pm_.c:1719
msgid ""
"The inkjet printer drivers provided by Lexmark only support local printers, "
"no printers on remote machines or print server boxes. Please connect your "
@@ -8484,7 +8290,7 @@ msgstr ""
"�����ṩ����ī��ӡ�������������֧�ֱ��ش�ӡ��, ����Զ���������ӡ������ϵ�"
"��ӡ������Ѵ�ӡ�����ӵ����ı����˿�, �����������˴�ӡ���ĵ����Ͻ������á�"
-#: ../../printerdrake.pm_.c:1858
+#: ../../printer/printerdrake.pm_.c:1746
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."
@@ -8501,11 +8307,11 @@ msgstr ""
"�ù���, �Ͳ���ʹ��ͼ�ν���İ�װ����������Э��֮��ֱ�Ӱ�ȡ������ "
"��lexmarkmaintain�������ӡ��ͷ�������ҳ, Ȼ����������������ͷ���롣"
-#: ../../printerdrake.pm_.c:1861
+#: ../../printer/printerdrake.pm_.c:1749
msgid "GDI Laser Printer using the Zenographics ZJ-Stream Format"
msgstr "ʹ�� Zenographics ZJ-Stream ��ʽ��GDI �����ӡ��"
-#: ../../printerdrake.pm_.c:1862
+#: ../../printer/printerdrake.pm_.c:1750
msgid ""
"Your printer belongs to the group of GDI laser printers (winprinters) sold "
"by different manufacturers which uses the Zenographics ZJ-stream raster "
@@ -8542,7 +8348,7 @@ msgstr ""
"�κ���ͨ�û�������ʹ�õ�һ������, �ڶ������������ root ִ��.�����̼�֮������"
"����������ӡ�ˡ�\n"
-#: ../../printerdrake.pm_.c:2085
+#: ../../printer/printerdrake.pm_.c:1972
msgid ""
"Printer default settings\n"
"\n"
@@ -8556,22 +8362,22 @@ msgstr ""
"��Ӧ��ȷ��ҳ���С��īˮ����/��ӡģʽ(������)�ͼ����ӡ����Ӳ������(�ڴ�,˫��"
"Ԫ, ��ֽ��)������ȷ��ע�ⳬ������/�ֱ��ʴ�ӡ���ܻ��ú�����"
-#: ../../printerdrake.pm_.c:2094
+#: ../../printer/printerdrake.pm_.c:1981
#, c-format
msgid "Option %s must be an integer number!"
msgstr "ѡ�� %s ����������!"
-#: ../../printerdrake.pm_.c:2098
+#: ../../printer/printerdrake.pm_.c:1985
#, c-format
msgid "Option %s must be a number!"
msgstr "ѡ�� %s ����������!"
-#: ../../printerdrake.pm_.c:2103
+#: ../../printer/printerdrake.pm_.c:1989
#, c-format
msgid "Option %s out of range!"
msgstr "ѡ�� %s ������Χ!"
-#: ../../printerdrake.pm_.c:2142
+#: ../../printer/printerdrake.pm_.c:2028
#, c-format
msgid ""
"Do you want to set this printer (\"%s\")\n"
@@ -8580,11 +8386,11 @@ msgstr ""
"��ϣ�����������ӡ��(��%s��)\n"
"��ΪĬ�ϴ�ӡ����?"
-#: ../../printerdrake.pm_.c:2165
+#: ../../printer/printerdrake.pm_.c:2051
msgid "Test pages"
msgstr "����ҳ"
-#: ../../printerdrake.pm_.c:2166
+#: ../../printer/printerdrake.pm_.c:2052
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 "
@@ -8595,39 +8401,39 @@ msgstr ""
"ע��: ��ijЩ��ӡ���ϴ�ӡ��Ƭ����Ҫ���൱����ʱ�䡣\n"
"һ����ѡ���׼����ҳ��"
-#: ../../printerdrake.pm_.c:2170
+#: ../../printer/printerdrake.pm_.c:2056
msgid "No test pages"
msgstr "û�в���ҳ"
-#: ../../printerdrake.pm_.c:2171
+#: ../../printer/printerdrake.pm_.c:2057
msgid "Print"
msgstr "��ӡ"
-#: ../../printerdrake.pm_.c:2228
+#: ../../printer/printerdrake.pm_.c:2114
msgid "Standard test page"
msgstr "��׼����ҳ"
-#: ../../printerdrake.pm_.c:2231
+#: ../../printer/printerdrake.pm_.c:2117
msgid "Alternative test page (Letter)"
msgstr "�ɻ�����ҳ(��ֽ)"
-#: ../../printerdrake.pm_.c:2234
+#: ../../printer/printerdrake.pm_.c:2120
msgid "Alternative test page (A4)"
msgstr "�滻����ҳ (A4)"
-#: ../../printerdrake.pm_.c:2236
+#: ../../printer/printerdrake.pm_.c:2122
msgid "Photo test page"
msgstr "��Ƭ����ҳ"
-#: ../../printerdrake.pm_.c:2240
+#: ../../printer/printerdrake.pm_.c:2126
msgid "Do not print any test page"
msgstr "����ӡ�κβ���ҳ"
-#: ../../printerdrake.pm_.c:2249 ../../printerdrake.pm_.c:2402
+#: ../../printer/printerdrake.pm_.c:2134 ../../printer/printerdrake.pm_.c:2285
msgid "Printing test page(s)..."
msgstr "���ڴ�ӡ����ҳ..."
-#: ../../printerdrake.pm_.c:2274
+#: ../../printer/printerdrake.pm_.c:2159
#, c-format
msgid ""
"Test page(s) have been sent to the printer.\n"
@@ -8641,21 +8447,21 @@ msgstr ""
"%s\n"
"\n"
-#: ../../printerdrake.pm_.c:2278
+#: ../../printer/printerdrake.pm_.c:2163
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:2285
+#: ../../printer/printerdrake.pm_.c:2170
msgid "Did it work properly?"
msgstr "��������?"
-#: ../../printerdrake.pm_.c:2307 ../../printerdrake.pm_.c:3473
+#: ../../printer/printerdrake.pm_.c:2190 ../../printer/printerdrake.pm_.c:3229
msgid "Raw printer"
msgstr "���ӡ��"
-#: ../../printerdrake.pm_.c:2333
+#: ../../printer/printerdrake.pm_.c:2216
#, c-format
msgid ""
"To print a file from the command line (terminal window) you can either use "
@@ -8666,7 +8472,7 @@ msgstr ""
"Ҫ�������д�ӡ�ļ���ʹ�����%s <�ļ�>����ͼ�δ�ӡ����:��xpp <�ļ�>���� "
"��kprinter <�ļ�>����ͼ�ι��������Ƚ����׵�ѡ���ӡ�����޸Ĵ�ӡѡ�\n"
-#: ../../printerdrake.pm_.c:2335
+#: ../../printer/printerdrake.pm_.c:2218
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 "
@@ -8675,8 +8481,8 @@ msgstr ""
"������������������Ӧ�õĴ�ӡ�Ի���ġ���ӡ�����,��ΪӦ�ó�����ṩҪ��ӡ����"
"��, �������ﲻ��д�ļ�����\n"
-#: ../../printerdrake.pm_.c:2338 ../../printerdrake.pm_.c:2355
-#: ../../printerdrake.pm_.c:2365
+#: ../../printer/printerdrake.pm_.c:2221 ../../printer/printerdrake.pm_.c:2238
+#: ../../printer/printerdrake.pm_.c:2248
#, c-format
msgid ""
"\n"
@@ -8687,7 +8493,7 @@ msgstr ""
"\n"
"��%s������Ҳ�������޸Ĵ�ӡ��ҵ��ѡ��, ����:��%s <file>����"
-#: ../../printerdrake.pm_.c:2341 ../../printerdrake.pm_.c:2381
+#: ../../printer/printerdrake.pm_.c:2224 ../../printer/printerdrake.pm_.c:2264
#, c-format
msgid ""
"To know about the options available for the current printer read either the "
@@ -8698,7 +8504,7 @@ msgstr ""
"s\n"
"\n"
-#: ../../printerdrake.pm_.c:2345
+#: ../../printer/printerdrake.pm_.c:2228
msgid ""
"Here is a list of the available printing options for the current printer:\n"
"\n"
@@ -8706,15 +8512,15 @@ msgstr ""
"�����ǿ����ڵ�ǰ��ӡ����һЩ��ӡѡ��: \n"
"\n"
-#: ../../printerdrake.pm_.c:2350 ../../printerdrake.pm_.c:2360
+#: ../../printer/printerdrake.pm_.c:2233 ../../printer/printerdrake.pm_.c:2243
#, 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:2352 ../../printerdrake.pm_.c:2362
-#: ../../printerdrake.pm_.c:2372
+#: ../../printer/printerdrake.pm_.c:2235 ../../printer/printerdrake.pm_.c:2245
+#: ../../printer/printerdrake.pm_.c:2255
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 "
@@ -8723,20 +8529,20 @@ msgstr ""
"������������������Ӧ�õĴ�ӡ�Ի���ġ���ӡ�������Ǵ˴������ṩ�ļ���, ��"
"ΪҪ��ӡ���ļ���Ӧ�ó����ṩ��\n"
-#: ../../printerdrake.pm_.c:2357 ../../printerdrake.pm_.c:2367
+#: ../../printer/printerdrake.pm_.c:2240 ../../printer/printerdrake.pm_.c:2250
msgid ""
"To get a list of the options available for the current printer click on the "
"\"Print option list\" button."
msgstr "�������ӡѡ���ť�����оٵ�ǰ��ӡ���Ŀ���ѡ�"
-#: ../../printerdrake.pm_.c:2370
+#: ../../printer/printerdrake.pm_.c:2253
#, 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:2374
+#: ../../printer/printerdrake.pm_.c:2257
msgid ""
"You can also use the graphical interface \"xpdq\" for setting options and "
"handling printing jobs.\n"
@@ -8748,7 +8554,7 @@ msgstr ""
"��������ͼ�νӿڡ�xpdq�����ô�ӡѡ��ʹ�����ӡ��ҵ��\n"
"�����ʹ��KDE, �������С�ֹͣ��ӡ��!����ť����ȡ����ӡ��ҵ��\n"
-#: ../../printerdrake.pm_.c:2378
+#: ../../printer/printerdrake.pm_.c:2261
#, c-format
msgid ""
"\n"
@@ -8759,40 +8565,40 @@ msgstr ""
"\n"
"��%s���͡�%s�����������޸Ĵ�ӡ��ҵ��ѡ��, ����:��%s <file>����\n"
-#: ../../printerdrake.pm_.c:2388
+#: ../../printer/printerdrake.pm_.c:2271
#, c-format
msgid "Printing/Scanning/Photo Cards on \"%s\""
msgstr "�ڡ�%s����ӡ���ϵĴ�ӡ/ɨ��/��Ƭ��"
-#: ../../printerdrake.pm_.c:2389
+#: ../../printer/printerdrake.pm_.c:2272
#, c-format
msgid "Printing/Scanning on \"%s\""
msgstr "�ڡ�%s����ӡ���ϵĴ�ӡ/ɨ��"
-#: ../../printerdrake.pm_.c:2391
+#: ../../printer/printerdrake.pm_.c:2274
#, c-format
msgid "Printing/Photo Card Access on \"%s\""
msgstr "��%s����ӡ���ϵĴ�ӡ/��Ƭ������"
-#: ../../printerdrake.pm_.c:2392
+#: ../../printer/printerdrake.pm_.c:2275
#, c-format
msgid "Printing on the printer \"%s\""
msgstr "���ڡ�%s����ӡ���ϴ�ӡ"
-#: ../../printerdrake.pm_.c:2395 ../../printerdrake.pm_.c:2398
-#: ../../printerdrake.pm_.c:2399 ../../printerdrake.pm_.c:2400
-#: ../../printerdrake.pm_.c:3457 ../../standalone/drakTermServ_.c:248
-#: ../../standalone/drakbackup_.c:1562 ../../standalone/drakbackup_.c:4210
-#: ../../standalone/drakbug_.c:130 ../../standalone/drakfont_.c:705
-#: ../../standalone/drakfont_.c:1014
+#: ../../printer/printerdrake.pm_.c:2278 ../../printer/printerdrake.pm_.c:2281
+#: ../../printer/printerdrake.pm_.c:2282 ../../printer/printerdrake.pm_.c:2283
+#: ../../printer/printerdrake.pm_.c:3216 ../../standalone/drakTermServ_.c:307
+#: ../../standalone/drakbackup_.c:1533 ../../standalone/drakbackup_.c:4156
+#: ../../standalone/drakbug_.c:108 ../../standalone/drakfont_.c:695
+#: ../../standalone/drakfont_.c:956 ../../standalone/net_monitor_.c:118
msgid "Close"
msgstr "�ر�"
-#: ../../printerdrake.pm_.c:2398
+#: ../../printer/printerdrake.pm_.c:2281
msgid "Print option list"
msgstr "��ӡ��ѡ���б�"
-#: ../../printerdrake.pm_.c:2418
+#: ../../printer/printerdrake.pm_.c:2301
#, c-format
msgid ""
"Your multi-function device was configured automatically to be able to scan. "
@@ -8812,7 +8618,7 @@ msgstr ""
"\n"
"��Ҫ������豸ʹ�á�scannerdrakeɨ�������ù��ߡ�!"
-#: ../../printerdrake.pm_.c:2439
+#: ../../printer/printerdrake.pm_.c:2322
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 "
@@ -8830,17 +8636,17 @@ msgstr ""
"�̷���p:���з��ֿ��ϵ��ļ�ϵͳ, ������ж���һ��֧����Ƭ���� HP ��ӡ�����Բ鿴"
"�������̷����ڡ�MtoolsFM���� ���������ļ��б������Ͻ��л��̷���"
-#: ../../printerdrake.pm_.c:2461 ../../printerdrake.pm_.c:2927
-#: ../../printerdrake.pm_.c:3227
+#: ../../printer/printerdrake.pm_.c:2344 ../../printer/printerdrake.pm_.c:2702
+#: ../../printer/printerdrake.pm_.c:2990
msgid "Reading printer data..."
msgstr "��ȡ��ӡ������..."
-#: ../../printerdrake.pm_.c:2481 ../../printerdrake.pm_.c:2509
-#: ../../printerdrake.pm_.c:2544
+#: ../../printer/printerdrake.pm_.c:2364 ../../printer/printerdrake.pm_.c:2391
+#: ../../printer/printerdrake.pm_.c:2426
msgid "Transfer printer configuration"
msgstr "Ǩ�ƴ�ӡ������"
-#: ../../printerdrake.pm_.c:2482
+#: ../../printer/printerdrake.pm_.c:2365
#, c-format
msgid ""
"You can copy the printer configuration which you have done for the spooler %"
@@ -8853,30 +8659,30 @@ msgstr ""
"�����������ݽ�������, ���Ǵ�ӡ��ҵ����Ǩ�ơ�\n"
"��������ԭ��, ijЩ��ӡ�����޷�Ǩ��:\n"
-#: ../../printerdrake.pm_.c:2485
+#: ../../printer/printerdrake.pm_.c:2368
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:2487
+#: ../../printer/printerdrake.pm_.c:2370
msgid ""
"PDQ only supports local printers, remote LPD printers, and Socket/TCP "
"printers.\n"
msgstr "PDQֻ֧�ֱ��ش�ӡ��, Զ��LPD��ӡ��, �� Socket/TCP ��ӡ����\n"
-#: ../../printerdrake.pm_.c:2489
+#: ../../printer/printerdrake.pm_.c:2372
msgid "LPD and LPRng do not support IPP printers.\n"
msgstr "LPD �� LPRng��֧��IPP��ӡ����\n"
-#: ../../printerdrake.pm_.c:2491
+#: ../../printer/printerdrake.pm_.c:2374
msgid ""
"In addition, queues not created with this program or \"foomatic-configure\" "
"cannot be transferred."
msgstr ""
"����, ������в��������������ߡ�foomatic-configure��������, ���޷�Ǩ�ơ�"
-#: ../../printerdrake.pm_.c:2492
+#: ../../printer/printerdrake.pm_.c:2375
msgid ""
"\n"
"Also printers configured with the PPD files provided by their manufacturers "
@@ -8886,7 +8692,7 @@ msgstr ""
"����, �����ӡ����Ҫʹ�ó����ṩ�� PPD�ļ�����, ���ӡ���������õ� CUPS ����"
"����, �����޷�Ǩ�ơ�"
-#: ../../printerdrake.pm_.c:2493
+#: ../../printer/printerdrake.pm_.c:2376
msgid ""
"\n"
"Mark the printers which you want to transfer and click \n"
@@ -8895,15 +8701,15 @@ msgstr ""
"\n"
"�����ҪǨ�ƵĴ�ӡ���������Ǩ�ơ���"
-#: ../../printerdrake.pm_.c:2496
+#: ../../printer/printerdrake.pm_.c:2379
msgid "Do not transfer printers"
msgstr "��Ǩ�ƴ�ӡ��"
-#: ../../printerdrake.pm_.c:2497 ../../printerdrake.pm_.c:2514
+#: ../../printer/printerdrake.pm_.c:2380 ../../printer/printerdrake.pm_.c:2396
msgid "Transfer"
msgstr "Ǩ��"
-#: ../../printerdrake.pm_.c:2510
+#: ../../printer/printerdrake.pm_.c:2392
#, c-format
msgid ""
"A printer named \"%s\" already exists under %s. \n"
@@ -8914,11 +8720,11 @@ msgstr ""
"�����Ǩ�ơ��������á�\n"
"��Ҳ����ѡ���µ����ƻ��Թ��ô�ӡ����"
-#: ../../printerdrake.pm_.c:2518
+#: ../../printer/printerdrake.pm_.c:2400
msgid "Name of printer should contain only letters, numbers and the underscore"
msgstr "��ӡ�����ƿ��԰�����ĸ, ���� �� �»���"
-#: ../../printerdrake.pm_.c:2523
+#: ../../printer/printerdrake.pm_.c:2405
#, c-format
msgid ""
"The printer \"%s\" already exists,\n"
@@ -8927,16 +8733,16 @@ msgstr ""
"��ӡ����%s���Ѿ�����,\n"
"��ĸ�������?"
-#: ../../printerdrake.pm_.c:2531
+#: ../../printer/printerdrake.pm_.c:2413
msgid "New printer name"
msgstr "�´�ӡ������"
-#: ../../printerdrake.pm_.c:2534
+#: ../../printer/printerdrake.pm_.c:2416
#, c-format
msgid "Transferring %s..."
msgstr "Ǩ�� %s ..."
-#: ../../printerdrake.pm_.c:2545
+#: ../../printer/printerdrake.pm_.c:2427
#, c-format
msgid ""
"You have transferred your former default printer (\"%s\"), Should it be also "
@@ -8945,29 +8751,29 @@ msgstr ""
"���Ѿ�Ǩ����ǰϵͳ�е�Ĭ�ϴ�ӡ��(��%s��),\n"
"�Ƿ�����Ϊ�´�ӡϵͳ��Ĭ�ϴ�ӡ�� %s?"
-#: ../../printerdrake.pm_.c:2555
+#: ../../printer/printerdrake.pm_.c:2437
msgid "Refreshing printer data..."
msgstr "ˢ�´�ӡ������..."
-#: ../../printerdrake.pm_.c:2563 ../../printerdrake.pm_.c:2638
-#: ../../printerdrake.pm_.c:2650
+#: ../../printer/printerdrake.pm_.c:2445 ../../printer/printerdrake.pm_.c:2516
+#: ../../printer/printerdrake.pm_.c:2528
msgid "Configuration of a remote printer"
msgstr "����Զ�̴�ӡ��"
-#: ../../printerdrake.pm_.c:2564
+#: ../../printer/printerdrake.pm_.c:2446
msgid "Starting network..."
msgstr "������������..."
-#: ../../printerdrake.pm_.c:2599 ../../printerdrake.pm_.c:2603
-#: ../../printerdrake.pm_.c:2605
+#: ../../printer/printerdrake.pm_.c:2479 ../../printer/printerdrake.pm_.c:2483
+#: ../../printer/printerdrake.pm_.c:2485
msgid "Configure the network now"
msgstr "������������"
-#: ../../printerdrake.pm_.c:2600
+#: ../../printer/printerdrake.pm_.c:2480
msgid "Network functionality not configured"
msgstr "������������"
-#: ../../printerdrake.pm_.c:2601
+#: ../../printer/printerdrake.pm_.c:2481
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 "
@@ -8977,11 +8783,11 @@ msgstr ""
"��������Զ�̴�ӡ��������Զ�̴�ӡ��Ҫ�������,\n"
"������û���������硣������?"
-#: ../../printerdrake.pm_.c:2604
+#: ../../printer/printerdrake.pm_.c:2484
msgid "Go on without configuring the network"
msgstr "�����������ü���"
-#: ../../printerdrake.pm_.c:2640
+#: ../../printer/printerdrake.pm_.c:2518
msgid ""
"The network configuration done during the installation cannot be started "
"now. Please check whether the network gets accessable after booting your "
@@ -8994,7 +8800,7 @@ msgstr ""
"��������������� Mandrake ���������޸�,�ڡ��������������/�����ӡ�, Ȼ���á�Ӳ"
"����/����ӡ�������ô�ӡ��"
-#: ../../printerdrake.pm_.c:2641
+#: ../../printer/printerdrake.pm_.c:2519
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 "
@@ -9003,24 +8809,24 @@ msgstr ""
"������ʳ��ִ���\n"
"����Ӳ�������á�Ȼ��������Զ�̴�ӡ��"
-#: ../../printerdrake.pm_.c:2651
+#: ../../printer/printerdrake.pm_.c:2529
msgid "Restarting printing system..."
msgstr "����������ӡ��ϵͳ ..."
-#: ../../printerdrake.pm_.c:2689
+#: ../../printer/printerdrake.pm_.c:2568
msgid "high"
msgstr "��"
-#: ../../printerdrake.pm_.c:2689
+#: ../../printer/printerdrake.pm_.c:2568
msgid "paranoid"
msgstr "�ϸ�"
-#: ../../printerdrake.pm_.c:2690
+#: ../../printer/printerdrake.pm_.c:2569
#, c-format
msgid "Installing a printing system in the %s security level"
msgstr "�� %s ��ȫ�����ϰ�װ��ӡϵͳ"
-#: ../../printerdrake.pm_.c:2691
+#: ../../printer/printerdrake.pm_.c:2570
#, c-format
msgid ""
"You are about to install the printing system %s on a system running in the %"
@@ -9042,11 +8848,11 @@ msgstr ""
"\n"
"��Ҫ���ô�ӡ��?"
-#: ../../printerdrake.pm_.c:2723
+#: ../../printer/printerdrake.pm_.c:2604
msgid "Starting the printing system at boot time"
msgstr "����ʱ������ӡϵͳ"
-#: ../../printerdrake.pm_.c:2724
+#: ../../printer/printerdrake.pm_.c:2605
#, c-format
msgid ""
"The printing system (%s) will not be started automatically when the machine "
@@ -9063,59 +8869,59 @@ msgstr ""
"\n"
"��ϣ���ô�ӡϵͳ�Զ�������?"
-#: ../../printerdrake.pm_.c:2748 ../../printerdrake.pm_.c:2793
-#: ../../printerdrake.pm_.c:2832 ../../printerdrake.pm_.c:2874
-#: ../../printerdrake.pm_.c:2995
+#: ../../printer/printerdrake.pm_.c:2625 ../../printer/printerdrake.pm_.c:2765
msgid "Checking installed software..."
msgstr "����Ѿ���װ������..."
-#: ../../printerdrake.pm_.c:2798
-msgid "Removing LPRng..."
-msgstr "ɾ�� LPRng..."
+#: ../../printer/printerdrake.pm_.c:2630
+#, c-format
+msgid "Removing %s ..."
+msgstr "����ɾ�� %s..."
-#: ../../printerdrake.pm_.c:2837
-msgid "Removing LPD..."
-msgstr "ɾ�� LPD ..."
+#: ../../printer/printerdrake.pm_.c:2636
+#, c-format
+msgid "Installing %s ..."
+msgstr "���ڰ�װ %s..."
-#: ../../printerdrake.pm_.c:2910
+#: ../../printer/printerdrake.pm_.c:2685
msgid "Select Printer Spooler"
msgstr "ѡ���ӡ��"
-#: ../../printerdrake.pm_.c:2911
+#: ../../printer/printerdrake.pm_.c:2686
msgid "Which printing system (spooler) do you want to use?"
msgstr "����Ҫʹ�����ִ�ӡϵͳ?"
-#: ../../printerdrake.pm_.c:2947
+#: ../../printer/printerdrake.pm_.c:2720
#, c-format
msgid "Configuring printer \"%s\"..."
-msgstr "�����趨��ӡ����%s��..."
+msgstr "�������ô�ӡ����%s��..."
-#: ../../printerdrake.pm_.c:2961
+#: ../../printer/printerdrake.pm_.c:2731
msgid "Installing Foomatic..."
msgstr "���ڰ�װ Foomatic ����..."
-#: ../../printerdrake.pm_.c:3031 ../../printerdrake.pm_.c:3072
-#: ../../printerdrake.pm_.c:3474 ../../printerdrake.pm_.c:3547
+#: ../../printer/printerdrake.pm_.c:2800 ../../printer/printerdrake.pm_.c:2838
+#: ../../printer/printerdrake.pm_.c:3230 ../../printer/printerdrake.pm_.c:3300
msgid "Printer options"
msgstr "��ӡ��ѡ��"
-#: ../../printerdrake.pm_.c:3041
+#: ../../printer/printerdrake.pm_.c:2810
msgid "Preparing Printerdrake..."
msgstr "׼�� Printerdrake..."
-#: ../../printerdrake.pm_.c:3059 ../../printerdrake.pm_.c:3637
+#: ../../printer/printerdrake.pm_.c:2825 ../../printer/printerdrake.pm_.c:3369
msgid "Configuring applications..."
msgstr "����Ӧ�ó��� ..."
-#: ../../printerdrake.pm_.c:3079
+#: ../../printer/printerdrake.pm_.c:2845
msgid "Would you like to configure printing?"
msgstr "����Ҫ���ô�ӡ����?"
-#: ../../printerdrake.pm_.c:3091
+#: ../../printer/printerdrake.pm_.c:2857
msgid "Printing system: "
msgstr "��ӡϵͳ:"
-#: ../../printerdrake.pm_.c:3151
+#: ../../printer/printerdrake.pm_.c:2915
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; "
@@ -9127,7 +8933,7 @@ msgstr ""
"������ Star Office/OpenOffice.org/GIMP ����Զ�� CUPS �������Ĵ�ӡ���ϴ�ӡ��"
"����"
-#: ../../printerdrake.pm_.c:3152
+#: ../../printer/printerdrake.pm_.c:2916
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 "
@@ -9137,28 +8943,28 @@ msgstr ""
"���ȥ�޸Ļ��ȡ��Ϣ,\n"
"��������Ӵ�ӡ���������µĴ�ӡ����"
-#: ../../printerdrake.pm_.c:3179
+#: ../../printer/printerdrake.pm_.c:2942
msgid "Refresh printer list (to display all available remote CUPS printers)"
msgstr "�����б� (��ʾԶ�� CUPS ��ӡ������)"
-#: ../../printerdrake.pm_.c:3197
+#: ../../printer/printerdrake.pm_.c:2960
msgid "Change the printing system"
msgstr "�޸Ĵ�ӡϵͳ"
-#: ../../printerdrake.pm_.c:3202 ../../standalone/drakconnect_.c:277
+#: ../../printer/printerdrake.pm_.c:2965 ../../standalone/drakconnect_.c:274
msgid "Normal Mode"
msgstr "��ͨģʽ"
-#: ../../printerdrake.pm_.c:3367 ../../printerdrake.pm_.c:3417
-#: ../../printerdrake.pm_.c:3630
+#: ../../printer/printerdrake.pm_.c:3127 ../../printer/printerdrake.pm_.c:3176
+#: ../../printer/printerdrake.pm_.c:3363
msgid "Do you want to configure another printer?"
msgstr "����Ҫ����������ӡ����?"
-#: ../../printerdrake.pm_.c:3452
+#: ../../printer/printerdrake.pm_.c:3211
msgid "Modify printer configuration"
msgstr "�޸Ĵ�ӡ������"
-#: ../../printerdrake.pm_.c:3454
+#: ../../printer/printerdrake.pm_.c:3213
#, c-format
msgid ""
"Printer %s\n"
@@ -9167,185 +8973,111 @@ msgstr ""
"��ӡ�� %s\n"
"Ҫ�޸���?"
-#: ../../printerdrake.pm_.c:3458
+#: ../../printer/printerdrake.pm_.c:3217
msgid "Do it!"
msgstr "ִ��!"
-#: ../../printerdrake.pm_.c:3463 ../../printerdrake.pm_.c:3518
+#: ../../printer/printerdrake.pm_.c:3222 ../../printer/printerdrake.pm_.c:3271
msgid "Printer connection type"
msgstr "��ӡ����������"
-#: ../../printerdrake.pm_.c:3464 ../../printerdrake.pm_.c:3522
+#: ../../printer/printerdrake.pm_.c:3223 ../../printer/printerdrake.pm_.c:3275
msgid "Printer name, description, location"
msgstr "��ӡ������, ����, λ��"
-#: ../../printerdrake.pm_.c:3466 ../../printerdrake.pm_.c:3540
+#: ../../printer/printerdrake.pm_.c:3225 ../../printer/printerdrake.pm_.c:3293
msgid "Printer manufacturer, model, driver"
msgstr "��ӡ������, �ͺ�, ����"
-#: ../../printerdrake.pm_.c:3467 ../../printerdrake.pm_.c:3541
+#: ../../printer/printerdrake.pm_.c:3226 ../../printer/printerdrake.pm_.c:3294
msgid "Printer manufacturer, model"
msgstr "��ӡ������, �ͺ�"
-#: ../../printerdrake.pm_.c:3476 ../../printerdrake.pm_.c:3551
+#: ../../printer/printerdrake.pm_.c:3232 ../../printer/printerdrake.pm_.c:3304
msgid "Set this printer as the default"
msgstr "���øô�ӡ��ΪĬ��"
-#: ../../printerdrake.pm_.c:3478 ../../printerdrake.pm_.c:3556
+#: ../../printer/printerdrake.pm_.c:3234 ../../printer/printerdrake.pm_.c:3309
msgid "Add this printer to Star Office/OpenOffice.org/GIMP"
msgstr "�������ӡ�����ӵ�Star Office/OpenOffice.org/GIMP"
-#: ../../printerdrake.pm_.c:3479 ../../printerdrake.pm_.c:3565
+#: ../../printer/printerdrake.pm_.c:3235 ../../printer/printerdrake.pm_.c:3314
msgid "Remove this printer from Star Office/OpenOffice.org/GIMP"
msgstr "��Star Office/OpenOffice.org/GIMPɾ�������ӡ��"
-#: ../../printerdrake.pm_.c:3480 ../../printerdrake.pm_.c:3574
+#: ../../printer/printerdrake.pm_.c:3236 ../../printer/printerdrake.pm_.c:3319
msgid "Print test pages"
msgstr "��ӡ����ҳ"
-#: ../../printerdrake.pm_.c:3481 ../../printerdrake.pm_.c:3576
+#: ../../printer/printerdrake.pm_.c:3237 ../../printer/printerdrake.pm_.c:3321
msgid "Know how to use this printer"
msgstr "֪������ʹ�ô˴�ӡ��"
-#: ../../printerdrake.pm_.c:3483 ../../printerdrake.pm_.c:3578
+#: ../../printer/printerdrake.pm_.c:3238 ../../printer/printerdrake.pm_.c:3323
msgid "Remove printer"
msgstr "ɾ����ӡ��"
-#: ../../printerdrake.pm_.c:3529
+#: ../../printer/printerdrake.pm_.c:3282
#, c-format
msgid "Removing old printer \"%s\"..."
msgstr "ɾ���ɴ�ӡ����%s��..."
-#: ../../printerdrake.pm_.c:3554
+#: ../../printer/printerdrake.pm_.c:3307
msgid "Default printer"
msgstr "Ĭ�ϴ�ӡ��"
-#: ../../printerdrake.pm_.c:3555
+#: ../../printer/printerdrake.pm_.c:3308
#, c-format
msgid "The printer \"%s\" is set as the default printer now."
msgstr "��ӡ����%s����Ϊȴʡ��ӡ����"
-#: ../../printerdrake.pm_.c:3559 ../../printerdrake.pm_.c:3562
+#: ../../printer/printerdrake.pm_.c:3310
msgid "Adding printer to Star Office/OpenOffice.org/GIMP"
msgstr "���Ӵ�ӡ����Star Office/OpenOffice.org/GIMP"
-#: ../../printerdrake.pm_.c:3560
+#: ../../printer/printerdrake.pm_.c:3312
#, c-format
msgid ""
"The printer \"%s\" was successfully added to Star Office/OpenOffice.org/GIMP."
msgstr "��ӡ����%s���ɹ����ӵ�Star Office/OpenOffice.org/GIMP"
-#: ../../printerdrake.pm_.c:3563
+#: ../../printer/printerdrake.pm_.c:3313
#, c-format
msgid "Failed to add the printer \"%s\" to Star Office/OpenOffice.org/GIMP."
msgstr "δ�����Ӵ�ӡ����%s����Star Office/OpenOffice.org/GIMP"
-#: ../../printerdrake.pm_.c:3568 ../../printerdrake.pm_.c:3571
+#: ../../printer/printerdrake.pm_.c:3315
msgid "Removing printer from Star Office/OpenOffice.org/GIMP"
msgstr "�� Star Office/OpenOffice.org/GIMP ɾ����ӡ��"
-#: ../../printerdrake.pm_.c:3569
+#: ../../printer/printerdrake.pm_.c:3317
#, c-format
msgid ""
"The printer \"%s\" was successfully removed from Star Office/OpenOffice.org/"
"GIMP."
msgstr "�ɹ��Ĵ� Star Office/OpenOffice.org/GIMP ɾ����ӡ����%s����"
-#: ../../printerdrake.pm_.c:3572
+#: ../../printer/printerdrake.pm_.c:3318
#, c-format
msgid ""
"Failed to remove the printer \"%s\" from Star Office/OpenOffice.org/GIMP."
msgstr "δ�ܴ� Star Office/OpenOffice.org/GIMP ɾ����ӡ����%s����"
-#: ../../printerdrake.pm_.c:3580
+#: ../../printer/printerdrake.pm_.c:3325
#, c-format
msgid "Do you really want to remove the printer \"%s\"?"
msgstr "���Ҫɾ����ӡ����%s��?"
-#: ../../printerdrake.pm_.c:3584
+#: ../../printer/printerdrake.pm_.c:3329
#, c-format
msgid "Removing printer \"%s\"..."
msgstr "����ɾ����ӡ����%s��..."
-#: ../../proxy.pm_.c:29 ../../proxy.pm_.c:37 ../../proxy.pm_.c:58
-#: ../../proxy.pm_.c:78
-msgid "Proxy configuration"
-msgstr "��������������"
-
-#: ../../proxy.pm_.c:30
-msgid ""
-"Welcome to the proxy configuration utility.\n"
-"\n"
-"Here, you'll be able to set up your http and ftp proxies\n"
-"with or without login and password\n"
-msgstr ""
-"��ӭʹ�ô������ù��ߡ�\n"
-"\n"
-"������������Ҫ�û����Ϳ����Լ�\n"
-"����Ҫ�û����Ϳ����http��ftp����\n"
-
-#: ../../proxy.pm_.c:38
-msgid ""
-"Please fill in the http proxy informations\n"
-"Leave it blank if you don't want an http proxy"
-msgstr ""
-"������ HTTP ������Ϣ\n"
-"�����û�� http ����������"
-
-#: ../../proxy.pm_.c:39 ../../proxy.pm_.c:60
-msgid "URL"
-msgstr "URL"
-
-#: ../../proxy.pm_.c:40 ../../proxy.pm_.c:61
-msgid "port"
-msgstr "�˿�"
-
-#: ../../proxy.pm_.c:44
-msgid "Url should begin with 'http:'"
-msgstr "����������Ӧ�����ԡ�http:����ͷ"
-
-#: ../../proxy.pm_.c:48 ../../proxy.pm_.c:69
-msgid "The port part should be numeric"
-msgstr "�˿���Ϊ����"
-
-#: ../../proxy.pm_.c:59
-msgid ""
-"Please fill in the ftp proxy informations\n"
-"Leave it blank if you don't want an ftp proxy"
-msgstr "���� FTP ������Ϣ"
-
-#: ../../proxy.pm_.c:79
-msgid ""
-"Please enter proxy login and password, if any.\n"
-"Leave it blank if you don't want login/passwd"
-msgstr "����ʹ�øô������������û���������"
-
-#: ../../proxy.pm_.c:80
-msgid "login"
-msgstr "�û���"
-
-#: ../../proxy.pm_.c:82
-msgid "password"
-msgstr "����"
-
-#: ../../proxy.pm_.c:84
-msgid "re-type password"
-msgstr "�������"
-
-#: ../../proxy.pm_.c:88
-msgid "The passwords don't match. Try again!"
-msgstr "���ο����������!"
-
#: ../../raid.pm_.c:35
#, c-format
msgid "Can't add a partition to _formatted_ RAID md%d"
msgstr "�޷�����һ���������Ѿ���ʽ����Ӳ������ md%d"
-#: ../../raid.pm_.c:108
-#, c-format
-msgid "Can't write file %s"
-msgstr "�޷�д�� %s �ļ�"
-
#: ../../raid.pm_.c:137
msgid "mkraid failed"
msgstr "mkraid ʧ��"
@@ -9359,7 +9091,7 @@ msgstr "mkraid ʧ�� (����ȱ�� raidtools?)"
msgid "Not enough partitions for RAID level %d\n"
msgstr "û���㹻�ķ������� %d ����Ӳ������\n"
-#: ../../security/main.pm_.c:35
+#: ../../security/main.pm_.c:36
msgid ""
"Standard: This is the standard security recommended for a computer that will "
"be used to connect\n"
@@ -9397,63 +9129,59 @@ msgstr ""
" �������ȫ���桱ѡ������, ��ȫ���潫���͸����û�(�û���\n"
" ������ʼ�)"
-#: ../../security/main.pm_.c:65
+#: ../../security/main.pm_.c:66
msgid "Security Level:"
msgstr "��ȫ����:"
-#: ../../security/main.pm_.c:99
+#: ../../security/main.pm_.c:77
+#, c-format
+msgid " (default value: %s)"
+msgstr " (Ĭ��ֵ: %s)"
+
+#: ../../security/main.pm_.c:113
msgid "Security Alerts:"
msgstr "��ȫ����:"
-#: ../../security/main.pm_.c:101
+#: ../../security/main.pm_.c:115
msgid "Security Administrator:"
msgstr "��ȫ����Ա:"
-#: ../../security/main.pm_.c:114
+#: ../../security/main.pm_.c:128
msgid "Network Options"
msgstr "����ѡ��"
-#: ../../security/main.pm_.c:114
+#: ../../security/main.pm_.c:128
msgid "System Options"
msgstr "ϵͳѡ��"
-#: ../../security/main.pm_.c:119 ../../security/main.pm_.c:148
+#: ../../security/main.pm_.c:133 ../../security/main.pm_.c:164
msgid ""
"The following options can be set to customize your\n"
"system security. If you need explanations, click on Help.\n"
msgstr ""
"������������ѡ�����Զ�������ϵͳ��ȫ�����������Ҫ���͵Ļ�, �뵥��������\n"
-#: ../../security/main.pm_.c:137
-#, c-format
-msgid " (default: %s)"
-msgstr " (Ĭ��: %s)"
-
-#: ../../security/main.pm_.c:161
-msgid "Periodic Checks 2"
-msgstr "���ڼ�� 2"
-
-#: ../../security/main.pm_.c:162
+#: ../../security/main.pm_.c:177
msgid "Periodic Checks"
msgstr "���ڼ��"
-#: ../../security/main.pm_.c:176
+#: ../../security/main.pm_.c:191
msgid "Please wait, setting security level..."
msgstr "���Ժ�, �������ð�ȫ����"
-#: ../../security/main.pm_.c:182
+#: ../../security/main.pm_.c:197
msgid "Please wait, setting security options..."
msgstr "���Ժ�, �������ð�ȫѡ��..."
-#: ../../services.pm_.c:14
+#: ../../services.pm_.c:19
msgid "Launch the ALSA (Advanced Linux Sound Architecture) sound system"
msgstr "����ALSA����ϵͳ"
-#: ../../services.pm_.c:15
+#: ../../services.pm_.c:20
msgid "Anacron a periodic command scheduler."
msgstr "Anacron һ������ڵ��ȳ���."
-#: ../../services.pm_.c:16
+#: ../../services.pm_.c:21
msgid ""
"apmd is used for monitoring batery status and logging it via syslog.\n"
"It can also be used for shutting down the machine when the battery is low."
@@ -9461,7 +9189,7 @@ msgstr ""
"apmd ���ӵ��״̬, ��ͨ�� syslog ����¼��\n"
"�����������ڵ�ز���ʱ�رջ�����"
-#: ../../services.pm_.c:18
+#: ../../services.pm_.c:23
msgid ""
"Runs commands scheduled by the at command at the time specified when\n"
"at was run, and runs batch commands when the load average is low enough."
@@ -9469,7 +9197,7 @@ msgstr ""
"ʹ�� at ���������ָ��ʱ�������������\n"
"��������ƽ�������㹻�͵�ʱ���������������"
-#: ../../services.pm_.c:20
+#: ../../services.pm_.c:25
msgid ""
"cron is a standard UNIX program that runs user-specified programs\n"
"at periodic scheduled times. vixie cron adds a number of features to the "
@@ -9480,7 +9208,7 @@ msgstr ""
"vixie cron �ڻ����� UNIX cron ��������һЩ����, �����Ľ��İ�ȫ��, \n"
"�͸�ǿ�������ѡ�"
-#: ../../services.pm_.c:23
+#: ../../services.pm_.c:28
msgid ""
"GPM adds mouse support to text-based Linux applications such the\n"
"Midnight Commander. It also allows mouse-based console cut-and-paste "
@@ -9491,7 +9219,7 @@ msgstr ""
"��ͬʱ�ṩ���������Ŀ���̨���Ʋ�ճ������, ��֧�ֿ���̨�ϵ�\n"
"����ʽ�˵���"
-#: ../../services.pm_.c:26
+#: ../../services.pm_.c:31
msgid ""
"HardDrake runs a hardware probe, and optionally configures\n"
"new/changed hardware."
@@ -9499,12 +9227,12 @@ msgstr ""
"HardDrake����Ӳ�����, �Լ�ѡ������\n"
"����/�޸�Ӳ��"
-#: ../../services.pm_.c:28
+#: ../../services.pm_.c:33
msgid ""
"Apache is a World Wide Web server. It is used to serve HTML files and CGI."
msgstr "Apache ��һ�� WWW ��ά�������������ṩ HTML �ļ��� CGI �ȷ���"
-#: ../../services.pm_.c:29
+#: ../../services.pm_.c:34
msgid ""
"The internet superserver daemon (commonly called inetd) starts a\n"
"variety of other internet services as needed. It is responsible for "
@@ -9517,7 +9245,7 @@ msgstr ""
"��������Ӧ���ַ���, ���� telnet, ftp, rsh �� rlogin��\n"
"��ֹ inetd ��ͬʱ��ֹ������������з���"
-#: ../../services.pm_.c:33
+#: ../../services.pm_.c:38
msgid ""
"Launch packet filtering for Linux kernel 2.2 series, to set\n"
"up a firewall to protect your machine from network attacks."
@@ -9525,7 +9253,7 @@ msgstr ""
"�����ں� 2.2 �����ݰ����˹���, ���÷���ǽ\n"
"�Ա������Ļ����������繥��"
-#: ../../services.pm_.c:35
+#: ../../services.pm_.c:40
msgid ""
"This package loads the selected keyboard map as set in\n"
"/etc/sysconfig/keyboard. This can be selected using the kbdconfig utility.\n"
@@ -9534,7 +9262,7 @@ msgstr ""
"��������� /etc/sysconfig/keyboard ���趨����ѡ��ļ���ӳ�䡣\n"
"������ʹ�� kbdconfig �����޸�����趨���Դ��������, Ӧ�ÿ����������"
-#: ../../services.pm_.c:38
+#: ../../services.pm_.c:43
msgid ""
"Automatic regeneration of kernel header in /boot for\n"
"/usr/include/linux/{autoconf,version}.h"
@@ -9542,17 +9270,17 @@ msgstr ""
"�Զ��������� /boot�µ�\n"
"/usr/include/linux/{autoconf,version}.hͷ�ļ�"
-#: ../../services.pm_.c:40
+#: ../../services.pm_.c:45
msgid "Automatic detection and configuration of hardware at boot."
msgstr "����ʱ�Զ���������Ӳ����"
-#: ../../services.pm_.c:41
+#: ../../services.pm_.c:46
msgid ""
"Linuxconf will sometimes arrange to perform various tasks\n"
"at boot-time to maintain the system configuration."
msgstr "Linuxconf�ڿ���ʱ��ִ��һЩ������ά��ϵͳ���á�"
-#: ../../services.pm_.c:43
+#: ../../services.pm_.c:48
msgid ""
"lpd is the print daemon required for lpr to work properly. It is\n"
"basically a server that arbitrates print jobs to printer(s)."
@@ -9560,19 +9288,19 @@ msgstr ""
"lpd �DZ�֤ lpr ���������ĺ�̨��ӡ��������������Ļ���������\n"
"�Ѵ�ӡ����ָ������Ӧ�Ĵ�ӡ����"
-#: ../../services.pm_.c:45
+#: ../../services.pm_.c:50
msgid ""
"Linux Virtual Server, used to build a high-performance and highly\n"
"available server."
msgstr "Linux���������, �������ܸ�Ч�͸߿���ϵͳ"
-#: ../../services.pm_.c:47
+#: ../../services.pm_.c:52
msgid ""
"named (BIND) is a Domain Name Server (DNS) that is used to resolve host "
"names to IP addresses."
msgstr "named (BIND) ��һ������������ (DNS), �������������� ������ IP ��ַ��"
-#: ../../services.pm_.c:48
+#: ../../services.pm_.c:53
msgid ""
"Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
"Manager/Windows), and NCP (NetWare) mount points."
@@ -9580,7 +9308,7 @@ msgstr ""
"���غ�ж�����������ļ�ϵͳ(NFS), SMB (Lan\n"
"Manager/Windows), �� NCP (NetWare) ���ص㡣"
-#: ../../services.pm_.c:50
+#: ../../services.pm_.c:55
msgid ""
"Activates/Deactivates all network interfaces configured to start\n"
"at boot time."
@@ -9588,7 +9316,7 @@ msgstr ""
"����/��ֹ��������Ϊ������������\n"
"����ӿڡ�"
-#: ../../services.pm_.c:52
+#: ../../services.pm_.c:57
msgid ""
"NFS is a popular protocol for file sharing across TCP/IP networks.\n"
"This service provides NFS server functionality, which is configured via the\n"
@@ -9598,7 +9326,7 @@ msgstr ""
"��������ṩ�� NFS ����������, ����ͨ��\n"
"/etc/exports �ļ����á�"
-#: ../../services.pm_.c:55
+#: ../../services.pm_.c:60
msgid ""
"NFS is a popular protocol for file sharing across TCP/IP\n"
"networks. This service provides NFS file locking functionality."
@@ -9606,17 +9334,17 @@ msgstr ""
"NFS �dz��õ�ͨ�� TCP/IP ���繲���ļ���Э�顣\n"
"��������ṩ�� NFS �ļ��������ܡ�"
-#: ../../services.pm_.c:57
+#: ../../services.pm_.c:62
msgid ""
"Automatically switch on numlock key locker under console\n"
"and XFree at boot."
msgstr "����ʱΪ����̨�� XFree �Զ��������ּ�������"
-#: ../../services.pm_.c:59
+#: ../../services.pm_.c:64
msgid "Support the OKI 4w and compatible winprinters."
msgstr "֧�� OKI 4w ������ݵ��Ӵ���ӡ��"
-#: ../../services.pm_.c:60
+#: ../../services.pm_.c:65
msgid ""
"PCMCIA support is usually to support things like ethernet and\n"
"modems in laptops. It won't get started unless configured so it is safe to "
@@ -9627,7 +9355,7 @@ msgstr ""
"��̫�������ߵ��ƽ���������û����������������,\n"
"���Բ��ص�������"
-#: ../../services.pm_.c:63
+#: ../../services.pm_.c:68
msgid ""
"The portmapper manages RPC connections, which are used by\n"
"protocols such as NFS and NIS. The portmap server must be running on "
@@ -9638,7 +9366,7 @@ msgstr ""
"��ЩЭ����õ���. ������ĵ��Խ�Ҫ�ṩ������ RPC ����Э��ķ���\n"
"�ͱ������� portmap ��������"
-#: ../../services.pm_.c:66
+#: ../../services.pm_.c:71
msgid ""
"Postfix is a Mail Transport Agent, which is the program that moves mail from "
"one machine to another."
@@ -9646,13 +9374,13 @@ msgstr ""
"Postfix ��һ���ʼ����ݴ���, �������������ѵ����ʼ���\n"
"һ̨�����͵���һ̨��"
-#: ../../services.pm_.c:67
+#: ../../services.pm_.c:72
msgid ""
"Saves and restores system entropy pool for higher quality random\n"
"number generation."
msgstr "����ͻָ�ϵͳ�� entropy pool, ���Բ�������Ʒ�ʵ������"
-#: ../../services.pm_.c:69
+#: ../../services.pm_.c:74
msgid ""
"Assign raw devices to block devices (such as hard drive\n"
"partitions), for the use of applications such as Oracle"
@@ -9660,7 +9388,7 @@ msgstr ""
"ָ�����豸(��Ӳ�̷���)��RAWԭʼ�豸\n"
"��Oracle֮���Ӧ����"
-#: ../../services.pm_.c:71
+#: ../../services.pm_.c:76
msgid ""
"The routed daemon allows for automatic IP router table updated via\n"
"the RIP protocol. While RIP is widely used on small networks, more complex\n"
@@ -9669,19 +9397,19 @@ msgstr ""
"��̨���� routed ����ͨ�� RIP Э���Զ����µ� IP ·�ɱ���\n"
"��С�������Ϲ㷺�IJ��� RIP, Ȼ���ڸ����ӵ���������Ҫ�����ӵ�·��Э�顣"
-#: ../../services.pm_.c:74
+#: ../../services.pm_.c:79
msgid ""
"The rstat protocol allows users on a network to retrieve\n"
"performance metrics for any machine on that network."
msgstr "rstat Э�����������ϵ��û���ȡ�������κλ���������ָ�ꡣ"
-#: ../../services.pm_.c:76
+#: ../../services.pm_.c:81
msgid ""
"The rusers protocol allows users on a network to identify who is\n"
"logged in on other responding machines."
msgstr "rusers Э�����������ϵ��û�ȷ������������Ӧ��Ļ���������Щ�û���¼��"
-#: ../../services.pm_.c:78
+#: ../../services.pm_.c:83
msgid ""
"The rwho protocol lets remote users get a list of all of the users\n"
"logged into a machine running the rwho daemon (similiar to finger)."
@@ -9689,11 +9417,11 @@ msgstr ""
"rwho Э��ʹԶ�̵��û����Եõ������� rwho ��̨�����\n"
"���������е�¼�û����嵥 (���� finger)��"
-#: ../../services.pm_.c:80
+#: ../../services.pm_.c:85
msgid "Launch the sound system on your machine"
msgstr "��������ϵͳ"
-#: ../../services.pm_.c:81
+#: ../../services.pm_.c:86
msgid ""
"Syslog is the facility by which many daemons use to log messages\n"
"to various system log files. It is a good idea to always run syslog."
@@ -9701,78 +9429,78 @@ msgstr ""
"Syslog ������һ����ʩ, �ܶ������ĺ�̨������������\n"
"����ϵͳ��־�ļ��м�¼��־��Ϣ. һֱ���� syslog �Ǹ������⡣"
-#: ../../services.pm_.c:83
+#: ../../services.pm_.c:88
msgid "Load the drivers for your usb devices."
msgstr "����USB�豸������"
-#: ../../services.pm_.c:84
+#: ../../services.pm_.c:89
msgid "Starts the X Font Server (this is mandatory for XFree to run)."
msgstr "���� X �������(X����ϵͳ����)��"
-#: ../../services.pm_.c:110 ../../services.pm_.c:152
+#: ../../services.pm_.c:115 ../../services.pm_.c:157
msgid "Choose which services should be automatically started at boot time"
msgstr "ѡ�񿪻�ʱ�Զ������ķ���"
-#: ../../services.pm_.c:122
+#: ../../services.pm_.c:127
msgid "Printing"
msgstr "��ӡ"
-#: ../../services.pm_.c:123
+#: ../../services.pm_.c:128
msgid "Internet"
msgstr "������"
-#: ../../services.pm_.c:126
+#: ../../services.pm_.c:131
msgid "File sharing"
msgstr "�ļ�����"
-#: ../../services.pm_.c:128 ../../standalone/drakbackup_.c:1746
+#: ../../services.pm_.c:133 ../../standalone/drakbackup_.c:1709
msgid "System"
msgstr "ϵͳ"
-#: ../../services.pm_.c:133
+#: ../../services.pm_.c:138
msgid "Remote Administration"
msgstr "Զ�̹���"
-#: ../../services.pm_.c:141
+#: ../../services.pm_.c:146
msgid "Database Server"
msgstr "���ݿ������"
-#: ../../services.pm_.c:170
+#: ../../services.pm_.c:175
#, c-format
msgid "Services: %d activated for %d registered"
msgstr "����: %d �Ǽǵ� %d ����"
-#: ../../services.pm_.c:186
+#: ../../services.pm_.c:191
msgid "Services"
msgstr "����"
-#: ../../services.pm_.c:198
+#: ../../services.pm_.c:203
msgid "running"
msgstr "����"
-#: ../../services.pm_.c:198
+#: ../../services.pm_.c:203
msgid "stopped"
msgstr "ֹͣ"
-#: ../../services.pm_.c:212
+#: ../../services.pm_.c:217
msgid "Services and deamons"
msgstr "�������س���"
-#: ../../services.pm_.c:217
+#: ../../services.pm_.c:222
msgid ""
"No additional information\n"
"about this service, sorry."
msgstr "û�и÷���ĸ�����Ϣ��"
-#: ../../services.pm_.c:224
+#: ../../services.pm_.c:229
msgid "On boot"
msgstr "����ʱ"
-#: ../../services.pm_.c:236
+#: ../../services.pm_.c:241
msgid "Start"
msgstr "����"
-#: ../../services.pm_.c:236
+#: ../../services.pm_.c:241
msgid "Stop"
msgstr "ֹͣ"
@@ -9849,7 +9577,7 @@ msgid ""
msgstr ""
"Mandrake Linux 9.0 ��������õĿ���Դ����Ϸ - ����, ����, ֽ��, ����, ����..."
-#: ../../share/advertising/06-mcc.pl_.c:9 ../../standalone/drakbug_.c:69
+#: ../../share/advertising/06-mcc.pl_.c:9 ../../standalone/drakbug_.c:49
msgid "Mandrake Control Center"
msgstr "Mandrake ��������"
@@ -10017,178 +9745,747 @@ msgstr ""
"�ݡ������ϲ�����ǵIJ�Ʒ, ������Ĺ�˾��Ϊʹ�����ǵIJ�Ʒ������˾�������, Ϊ"
"��֧�� Mandrake Linux �Ŀ���, �����MandrakeClub��"
-#: ../../standalone.pm_.c:49
+#: ../../standalone.pm_.c:21
+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"
+"the Free Software Foundation; either version 2, or (at your option)\n"
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program; if not, write to the Free Software\n"
+"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+msgstr ""
+" �����������������; ���������·���, ���޸���\n"
+" ֻҪ���������� Free Software Foundation ��������������\n"
+" GNU General Public License ͨ�ù�������֤��2��, ����\n"
+" ���µİ汾��\n"
+"\n"
+" ���Ƿ������������ϣ��������,\n"
+" ���Dz��ṩ�κε���; ����֤��\n"
+" �ʺ��κ���ͨ���ض�����;��ϸ��\n"
+" �� GNU General Public License ͨ�ù�������֤��\n"
+"\n"
+" ��Ӧ����ͬ�������õ�һ�� GNU General Public License ͨ�ù�������֤\n"
+" ��Ҳ����д�Ÿ��������������, Ҫ�������ṩ,\n"
+" ��ַ�� Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, "
+"MA 02111-1307, USA.\n"
+
+#: ../../standalone.pm_.c:40
+msgid ""
+"[--config-info] [--daemon] [--debug] [--default] [--show-conf]\n"
+"Backup and Restore application\n"
+"\n"
+"--default : save default directories.\n"
+"--debug : show all debug messages.\n"
+"--show-conf : list of files or directories to backup.\n"
+"--config-info : explain configuration file options (for non-X "
+"users).\n"
+"--daemon : use daemon configuration. \n"
+"--help : show this message.\n"
+"--version : show version name.\n"
+msgstr ""
+"[--config-info] [--daemon] [--debug] [--default] [--show-conf]\n"
+"���ݺͻָ�����\n"
+"\n"
+"--default : ����Ĭ��Ŀ¼��\n"
+"--debug : ��ʾȫ��������Ϣ��\n"
+"--show-conf : �г�Ҫ���ݵ��ļ���Ŀ¼��\n"
+"--config-info : ���������ļ�ѡ��(�Է� X �û�)��\n"
+"--daemon : ʹ���ػ��������á�\n"
+"--help : ��ʾ����Ϣ��\n"
+"--version : ��ʾ�汾�š�\n"
+
+#: ../../standalone.pm_.c:51
+msgid ""
+"[OPTIONS] [PROGRAM_NAME]\n"
+"\n"
+"OPTIONS:\n"
+" --help - print this help message.\n"
+" --report - program should be one of mandrake tools\n"
+" --incident - program should be one of mandrake tools"
+msgstr ""
+"[ѡ��] [������]\n"
+"\n"
+"ѡ��:\n"
+" --help - ��ӡ�˰�����Ϣ��\n"
+" --report - ����Ӧ���� Mandrake ����֮һ\n"
+" --incident - ����Ӧ���� Mandrake ����֮һ"
+
+#: ../../standalone.pm_.c:57
+msgid ""
+"Font Importation and monitoring "
+"application \n"
+"--windows_import : import from all available windows partitions.\n"
+"--xls_fonts : show all fonts that already exist from xls\n"
+"--strong : strong verification of font.\n"
+"--install : accept any font file and any directry.\n"
+"--uninstall : uninstall any font or any directory of font.\n"
+"--replace : replace all font if already exist\n"
+"--application : 0 none application.\n"
+" : 1 all application available supported.\n"
+" : name_of_application like so for staroffice \n"
+" : and gs for ghostscript for only this one."
+msgstr ""
+"���嵼��ͼ��ӳ���\n"
+"--windows_import : �����п��õ� Windows �����е������塣\n"
+"--xls_fonts : ��ʾ�Ѿ������� xls �е�ȫ������\n"
+"--strong : ǿУ�����塣\n"
+"--install : �����κ������ļ����κ�Ŀ¼��\n"
+"--uninstall : ж���κ�������κ�����Ŀ¼��\n"
+"--replace : ������������滻\n"
+"--application : 0 ��Ӧ�ó���\n"
+" : 1 ֧������Ӧ�ó���\n"
+" : Ӧ�ó�����, �� so ���� staroffice \n"
+" : gs ���� ghostscript, ���ڴ˴����á�"
+
+#: ../../standalone.pm_.c:68
+msgid ""
+"[OPTIONS]...\n"
+"\t --debug print debugging information"
+msgstr ""
+"[ѡ��]...\n"
+"\t --debug ��ӡ������Ϣ"
+
+#: ../../standalone.pm_.c:70
+msgid ""
+"[OPTIONS]...\n"
+"Mandrake Terminal Server Configurator\n"
+"--enable : enable MTS\n"
+"--disable : disable MTS\n"
+"--start : start MTS\n"
+"--stop : stop MTS\n"
+"--adduser : add an existing system user to MTS (requires username)\n"
+"--deluser : delete an existing system user from MTS (requires "
+"username)\n"
+"--addclient : add a client machine to MTS (requires MAC address, IP, "
+"nbi image name)\n"
+"--delclient : delete a client machine from MTS (requires MAC address, "
+"IP, nbi image name)"
+msgstr ""
+"[OPTIONS]...\n"
+"Mandrake �ն˷���������\n"
+"--enable : ���� MTS\n"
+"--disable : ���� MTS\n"
+"--start : ���� MTS\n"
+"--stop : ֹͣ MTS\n"
+"--adduser : ������ϵͳ�û����ӵ� MTS (��Ҫ�û���)\n"
+"--deluser : ������ϵͳ�û��� MTS ��ɾ��(��Ҫ�û���)\n"
+"--addclient : ���ͻ������ӵ� MTS (��Ҫ MAC ��ַ, IP, nbi ӳ������)\n"
+"--delclient : ���ͻ����� MTS ��ɾ��(��Ҫ MAC ��ַ, IP, nbi ӳ������)"
+
+#: ../../standalone.pm_.c:82
+msgid "[keyboard]"
+msgstr "[����]"
+
+#: ../../standalone.pm_.c:83
+msgid "[--file=myfyle] [--word=myword] [--explain=regexp] [--alert]"
+msgstr "[--file=myfyle] [--word=myword] [--explain=regexp] [--alert]"
+
+#: ../../standalone.pm_.c:84
+msgid ""
+"[OPTIONS]\n"
+"Network & Internet connection and monitoring application\n"
+"\n"
+"--defaultintf interface : show this interface by default\n"
+"--connect : connect to internet if not already connected\n"
+"--disconnect : disconnect to internet if already connected\n"
+"--force : used with (dis)connect : force (dis)connection.\n"
+"--status : returns 1 if connected 0 otherwise, then exit.\n"
+"--quiet : don't be interactive. To be used with (dis)connect."
+msgstr ""
+"[ѡ��]\n"
+"����ͻ������������úͼ��ӳ���\n"
+"\n"
+"--defaultintf interface : Ĭ����ʾ�˽���\n"
+"--connect : ���û�����ӵ�������������\n"
+"--disconnect : ����Ѿ����ӵ���������Ͽ�\n"
+"--force : ��������/�Ͽ�: ǿ������/�Ͽ���\n"
+"--status : ��������򷵻� 1 ���򷵻� 0, Ȼ���˳���\n"
+"--quiet : �����н��������ڶϿ����ӡ�"
+
+#: ../../standalone.pm_.c:93
+msgid " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
+msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
+
+#: ../../standalone.pm_.c:94
+msgid ""
+"[OPTION]...\n"
+" --no-confirmation don't ask first confirmation question in "
+"MandrakeUpdate mode\n"
+" --no-verify-rpm don't verify packages signatures\n"
+" --changelog-first display changelog before filelist in the "
+"description window\n"
+" --merge-all-rpmnew propose to merge all .rpmnew/.rpmsave files found"
+msgstr ""
+"[ѡ��]...\n"
+" --no-confirmation ��ѯ�� MandrakeUpdate ģ���еĵ�һ��ȷ������\n"
+" --no-verify-rpm ��У���ǩ��\n"
+" --changelog-first �����������е��ļ��б�ǰ��ʾ������־\n"
+" --merge-all-rpmnew �ƻ��ϲ��ҵ������� .rpmnew/.rpmsave �ļ�"
+
+#: ../../standalone.pm_.c:99
+msgid ""
+"[--manual] [--device=dev] [--update-sane=sane_desc_dir] [--update-usbtable] "
+"[--dynamic=dev]"
+msgstr ""
+"[--manual] [--device=dev] [--update-sane=sane_desc_dir] [--update-usbtable] "
+"[--dynamic=dev]"
+
+#: ../../standalone.pm_.c:100
+msgid ""
+" [everything]\n"
+" XFdrake [--noauto] monitor\n"
+" XFdrake resolution"
+msgstr ""
+" [��������]\n"
+" XFdrake [--noauto] ��ʾ��\n"
+" XFdrake �ֱ���"
+
+#: ../../standalone.pm_.c:114
+#, c-format
+msgid ""
+"\n"
+"Usage: %s [--auto] [--beginner] [--expert] [-h|--help] [--noauto] [--"
+"testing] [-v|--version] "
+msgstr ""
+"\n"
+"�÷�: %s [--auto] [--beginner] [--expert] [-h|--help] [--noauto] [--"
+"testing] [-v|--version] "
+
+#: ../../standalone.pm_.c:168
msgid "Installing packages..."
msgstr "���ڰ�װ���� ..."
-#: ../../standalone/XFdrake_.c:148
+#: ../../standalone/XFdrake_.c:138
msgid "Please log out and then use Ctrl-Alt-BackSpace"
msgstr "���˳�, Ȼ��ͬʱ�� Ctrl-Alt-BackSpace"
-#: ../../standalone/XFdrake_.c:152
+#: ../../standalone/XFdrake_.c:142
#, c-format
msgid "Please relog into %s to activate the changes"
msgstr "�����µ�¼�� %s ʹ�������ĸ�����Ч"
-#: ../../standalone/drakTermServ_.c:188
+#: ../../standalone/drakTermServ_.c:239
msgid "Mandrake Terminal Server Configuration"
msgstr "Mandrake �ն˷���������"
-#: ../../standalone/drakTermServ_.c:203
+#: ../../standalone/drakTermServ_.c:253
msgid "Enable Server"
msgstr "ʹ�÷�����"
-#: ../../standalone/drakTermServ_.c:210
+#: ../../standalone/drakTermServ_.c:260
msgid "Disable Server"
msgstr "��ֹ������"
-#: ../../standalone/drakTermServ_.c:218
+#: ../../standalone/drakTermServ_.c:268
msgid "Start Server"
msgstr "����������"
-#: ../../standalone/drakTermServ_.c:225
+#: ../../standalone/drakTermServ_.c:275
msgid "Stop Server"
msgstr "ֹͣ������"
-#: ../../standalone/drakTermServ_.c:233
+#: ../../standalone/drakTermServ_.c:283
msgid "Etherboot Floppy/ISO"
msgstr "Etherboot Floppy/ISO"
-#: ../../standalone/drakTermServ_.c:235
+#: ../../standalone/drakTermServ_.c:288
msgid "Net Boot Images"
msgstr "�����������̾���"
-#: ../../standalone/drakTermServ_.c:239
+#: ../../standalone/drakTermServ_.c:294
msgid "Add/Del Users"
msgstr "����/ɾ���û�"
-#: ../../standalone/drakTermServ_.c:241
+#: ../../standalone/drakTermServ_.c:299
msgid "Add/Del Clients"
msgstr "����/ɾ���û�"
-#: ../../standalone/drakTermServ_.c:436
+#: ../../standalone/drakTermServ_.c:328
+msgid ""
+"\n"
+" Copyright (C) 2002 by MandrakeSoft \n"
+"\tStew Benedict sbenedict\\@mandrakesoft.com\n"
+"\n"
+msgstr ""
+"\n"
+"��Ȩ (C) 2002 by MandrakeSoft \n"
+"\tStew Benedict sbenedict\\@mandrakesoft.com\n"
+"\n"
+
+#: ../../standalone/drakTermServ_.c:332
+msgid ""
+"\n"
+"\n"
+" Thanks:\n"
+"\t- LTSP Project http://www.ltsp.org\n"
+"\t- Michael Brown <mbrown\\@fensystems.co.uk>\n"
+"\n"
+msgstr ""
+"\n"
+"\n"
+"��л:\n"
+"\t- LTSP ��Ŀ http://www.ltsp.org\n"
+"\t- Michael Brown <mbrown\\@fensystems.co.uk>\n"
+"\n"
+
+#: ../../standalone/drakTermServ_.c:365
+msgid ""
+"drakTermServ Overview\n"
+"\t\t\t \n"
+" - Create Etherboot Enabled Boot Images:\n"
+" \t\tTo boot a kernel via etherboot, a special kernel/initrdrd image "
+"must be created.\n"
+" \t\tmkinitrd-net does much of this work and drakTermServ is just a "
+"graphical interface\n"
+" \t\tto help manage/customize these images.\n"
+"\n"
+" - Maintain /etc/dhcpd.conf:\n"
+" \t\tTo net boot clients, each client needs a dhcpd.conf entry, "
+"assigning an IP address\n"
+" \t\tand net boot images to the machine. drakTermServ helps create/"
+"remove these entries.\n"
+"\t\t\t\n"
+" \t\t(PCI cards may omit the image - etherboot will request the "
+"correct image. You should\n"
+" \t\talso consider that when etherboot looks for the images, it "
+"expects names like\n"
+" \t\tboot-3c59x.nbi, rather than boot-3c59x.2.4.19-16mdk.nbi).\n"
+"\t\t\t \n"
+" \t\tA typical dhcpd.conf stanza to support a diskless client looks "
+"like:\n"
+" \t\t\n"
+"\t\t\t\thost curly {\n"
+"\t\t\t\t\thardware ethernet 00:20:af:2f:f7:9d;\n"
+"\t\t\t\t\tfixed-address 192.168.192.3;\n"
+"\t\t\t\t\t/*type fat;*/\n"
+"\t\t\t\t\tfilename \"i386/boot/boot-3c509.2.4.18-6mdk."
+"nbi\";\n"
+"\t\t\t\t}\n"
+"\t\t\t\n"
+"\t\t\tWhile you can use a pool of IP addresses, rather than setup a specific "
+"entry for\n"
+"\t\t\ta client machine, using a fixed address scheme facilitates using the "
+"functionality\n"
+"\t\t\tof client-specific configuration files that ClusterNFS provides.\n"
+"\t\t\t\n"
+"\t\t\tNote: The \"/*type\" entry is only used by drakTermServ. Clients can "
+"either be \"thin\"*/\n"
+"\t\t\tor 'fat'. Thin clients run most software on the server via xdmcp, "
+"while fat clients run most\n"
+"\t\t\tsoftware on the client machine. A special inittab, /etc/inittab\\$\\"
+"$IP=client_ip\\$\\$ is\n"
+"\t\t\twritten for thin clients. System config files xdm-config, kdmrc, and "
+"gdm.conf are modified\n"
+"\t\t\tif thin clients are used, to enable xdmcp. Since there are security "
+"issues in using xdmcp,\n"
+"\t\t\thosts.deny and hosts.allow are modified to limit access to the local "
+"subnet.\n"
+"\t\t\t\n"
+"\t\t\tNote: You must stop/start the server after adding or changing "
+"clients.\n"
+"\t\t\t\n"
+" - Maintain /etc/exports:\n"
+" \t\tClusternfs allows export of the root filesystem to diskless "
+"clients. drakTermServ\n"
+" \t\tsets up the correct entry to allow anonymous access to the root "
+"filesystem from\n"
+" \t\tdiskless clients.\n"
+"\n"
+" \t\tA typical exports entry for clusternfs is:\n"
+" \t\t\n"
+" \t\t/ (ro,all_squash)\n"
+" \t\t/home SUBNET/MASK(rw,root_squash)\n"
+"\t\t\t\n"
+"\t\t\tWith SUBNET/MASK being defined for your network.\n"
+" \t\t\n"
+" - Maintain /etc/shadow\\$\\$CLIENT\\$\\$:\n"
+" \t\tFor users to be able to log into the system from a diskless "
+"client, their entry in\n"
+" \t\t/etc/shadow needs to be duplicated in /etc/shadow\\$\\$CLIENTS\\$"
+"\\$. drakTermServ helps\n"
+" \t\tin this respect by adding or removing system users from this "
+"file.\n"
+"\n"
+" - Per client /etc/X11XF86Config-4\\$\\$IP-ADDRESS\\$\\$:\n"
+" \t\tThrough clusternfs, each diskless client can have it's own "
+"unique configuration files\n"
+" \t\ton the root filesystem of the server. In the future drakTermServ "
+"will help create these\n"
+" \t\tfiles.\n"
+"\n"
+" - Per client system configuration files:\n"
+" \t\tThrough clusternfs, each diskless client can have it's own "
+"unique configuration files\n"
+" \t\ton the root filesystem of the server. In the future, "
+"drakTermServ can help create files\n"
+" \t\tsuch as /etc/modules.conf, /etc/sysconfig/mouse, /etc/sysconfig/"
+"keyboard on a per-client\n"
+" \t\tbasis.\n"
+"\n"
+" - /etc/xinetd.d/tftp:\n"
+" \t\tdrakTermServ will configure this file to work in conjunction "
+"with the images created by\n"
+" \t\tmkinitrd-net, and the entries in /etc/dhcpd.conf, to serve up "
+"the boot image to each\n"
+" \t\tdiskless client.\n"
+"\n"
+" \t\tA typical tftp configuration file looks like:\n"
+" \t\t\n"
+" \t\tservice tftp\n"
+" \t\t(\n"
+" disable = no\n"
+" socket_type = dgram\n"
+" protocol = udp\n"
+" wait = yes\n"
+" user = root\n"
+" server = /usr/sbin/in.tftpd\n"
+" server_args = -s /var/lib/tftpboot\n"
+" \t\t}\n"
+" \t\t\n"
+" \t\tThe changes here from the default installation are changing the "
+"disable flag to\n"
+" \t\t'no' and changing the directory path to /var/lib/tftpboot, where "
+"mkinitrd-net\n"
+" \t\tputs it's images.\n"
+"\n"
+" - Create etherboot floppies/CDs:\n"
+" \t\tThe diskless client machines need either ROM images on the NIC, "
+"or a boot floppy\n"
+" \t\tor CD to initate the boot sequence. drakTermServ will help "
+"generate these images,\n"
+" \t\tbased on the NIC in the client machine.\n"
+" \t\t\n"
+" \t\tA basic example of creating a boot floppy for a 3Com 3c509 "
+"manually:\n"
+" \t\t\n"
+" \t\tcat /usr/lib/etherboot/boot1a.bin /\\n \t\t\t/usr/lib/"
+"etherboot/lzrom/3c509.lzrom > /dev/fd0\n"
+" \n"
+"\n"
+msgstr ""
+"drakTermServ ����\n"
+"\t\t\t \n"
+" - ���� Etherboot ����̫������ӳ��:\n"
+" \t\tҪͨ�� etherboot ��������, ���봴������� kernel/initrdrd ӳ"
+"��\n"
+" \t\tmkinitrd-net �ܹ�����һ�����з��Ӻܴ�����, �� drakTermServ ����"
+"��\n"
+" \t\tb��������/������Щӳ���ͼ�λ����档\n"
+"\n"
+" - �� /etc/dhcpd.conf:\n"
+" \t\tҪͨ�����������ͻ���, ÿ���ͻ��˶���Ҫһ�� dhcpd.conf ��, ָ��"
+"һ\n"
+" \t\t�� IP ��ַ�ͻ�������������ӳ��drakTermServ �ܹ���������/ɾ��"
+"��\n"
+" \t\tЩ�\n"
+"\t\t\t\n"
+" \t\t(PCI ������ʡ��ӳ�� - etherboot ��������ȷ��ӳ����Ӧ�û�����"
+"�� \t\tetherboot ��ʱ����ӳ�������Ҫ������Ϊ\n"
+" \t\tboot-3c59x.nbi, ������ boot-3c59x.2.4.19-16mdk.nbi)��\n"
+"\t\t\t \n"
+" \t\tһ������֧�����̹���վ���͵� dhcpd.conf Ӧ��������:\n"
+" \t\t\n"
+"\t\t\t\thost curly {\n"
+"\t\t\t\t\thardware ethernet 00:20:af:2f:f7:9d;\n"
+"\t\t\t\t\tfixed-address 192.168.192.3;\n"
+"\t\t\t\t\t/*type fat;*/\n"
+"\t\t\t\t\tfilename \"i386/boot/boot-3c509.2.4.18-6mdk."
+"nbi\";\n"
+"\t\t\t\t}\n"
+"\t\t\t\n"
+"\t\t\t����������ʹ�� IP ��ַ��, ������Ϊij���ͻ��������ض��ĵ�ַ, ��ʹ�ù̶�"
+"\\n\t\t\t��ַ��������ٽ� ClusterNFS ���ṩ��ָ���ͻ��������ļ��Ĺ��ܡ�\n"
+"\t\t\t\n"
+"\t\t\tע��: ��/*type������� drakTermServ ʹ�á��ͻ��˿����ǡ�thin��*/��\n"
+"\t\t\t��fat�����ݿͻ��˿���ͨ�� xdmcp ���з������ϵĴ��������, ���ֿͻ�����\n"
+"\t\t\t�ڱ��������д������������һ������� inittab, \n"
+"\t\t\t/etc/inittab\\$\\$IP=client_ip\\$\\$ ��רΪ�ݿͻ���д�ġ����ʹ�õ���"
+"��\n"
+"\t\t\t�ͻ���, Ϊ������ xdmcp, ����Ҫ�޸�ϵͳ�����ļ� xdm-config, kdmrc �� \n"
+"\t\t\tgdm.conf�����ǵ�ʹ�� xdmcp ʱ���ܳ��ֵİ�ȫ����, ��Ҫ�޸� host.deny "
+"�� \n"
+"\t\t\thosts.allow �����ƽ����ɱ����������ʡ�\n"
+"\t\t\t\n"
+"\t\t\tע��: �����ӻ���Ŀͻ��˺�������ֹͣ/������������\n"
+"\t\t\t\n"
+" - �� /etc/exports:\n"
+" \t\tClusternfs ������ root �ļ�ϵͳ���������̹���վ��drakTermServ\n"
+" \t\t��������ȷ��ѡ���Ա����������̿ͻ����������� root �ļ�ϵͳ��\n"
+"\n"
+" \t\tClusternfs �ĵ��͵�����Ϊ:\n"
+" \t\t\n"
+" \t\t/ (ro,all_squash)\n"
+" \t\t/home ����/����(rw,root_squash)\n"
+"\t\t\t\n"
+"\t\t\t���� ����/����Ӧ��������������ͬ��\n"
+" \t\t\n"
+" - �� /etc/shadow\\$\\$CLIENT\\$\\$:\n"
+" \t\t������Щ��Ҫ�����̹���վ��¼��ϵͳ���û���˵, ��������Ӧ�ĵ�¼"
+"��\n"
+" \t\t����Ҫ�� /etc/shadow ��֮��, ��Ӧ�� /etc/shadow\\$\\$CLIENTS\\$\\"
+"$\n"
+" \t\t�д��и�����drakTermServ �ܹ������������һ���̡�\n"
+"\n"
+" - ÿ�ͻ� /etc/X11XF86Config-4\\$\\$IP-ADDRESS\\$\\$:\n"
+" \t\tͨ�� clusternfs, ÿ�����̹���վ�������ڷ������� root �ļ�ϵͳ��"
+"��\n"
+" \t\t���Լ�Ψһ�������ļ����� drakTermServ ��δ���汾��, �����������"
+"��\n"
+" \t\t��Щ�ļ���\n"
+"\n"
+" - ÿ�ͻ�ϵͳ�����ļ�:\n"
+" \t\tͨ�� clusternfs, ÿ�����̹���վ�������ڷ������� root �ļ�ϵͳ��"
+"��\n"
+" \t\t���Լ�Ψһ�������ļ����� drakTermServ ��δ���汾��, �����������"
+"��\n"
+" \t\t��Щ�ļ����� /etc/modules.conf, /etc/sysconfig/mouse, /etc/"
+"sysconfig/\n"
+" \t\tÿ�ͻ������ļ��̡�\n"
+"\n"
+" - /etc/xinetd.d/tftp:\n"
+" \t\tdrakTermServ �����ô��ļ��Ա������� mkinitrd-net ������ӳ��һ��"
+"��,\n"
+" \t\tͬʱ���� /etc/dhcpd.conf, ��������Ϊÿ�����̹���վ�ṩ����ӳ"
+"��\n"
+"\n"
+" \t\t���͵� tftp �����ļ�����������������:\n"
+" \t\t\n"
+" \t\tservice tftp\n"
+" \t\t(\n"
+" disable = no\n"
+" socket_type = dgram\n"
+" protocol = udp\n"
+" wait = yes\n"
+" user = root\n"
+" server = /usr/sbin/in.tftpd\n"
+" server_args = -s /var/lib/tftpboot\n"
+" \t\t}\n"
+" \t\t\n"
+" \t\t��Ĭ�ϰ�װ���, ����ĸ������ڽ� disable ��־��Ϊ��no��, ���ҽ�Ŀ¼"
+"����\n"
+" \t\tΪ /var/lib/tftpboot, �������� mkinitrd-net ���ӳ��ĵص㡣\n"
+"\n"
+" - ���� etherboot ����/����:\n"
+" \t\t�޷�����վ��Ҫ���������� ROM ����, �����������̻��������ʼ������"
+"���̡�\n"
+" \t\tdrakTermServ �ܹ����������ݿͻ��˼����������������Щ����\n"
+" \t\t\n"
+" \t\tΪ 3Com 3c509 �ֹ�����һ���������̵�����:\n"
+" \t\t\n"
+" \t\tcat /usr/lib/etherboot/boot1a.bin /\\n \t\t\t/usr/lib/"
+"etherboot/lzrom/3c509.lzrom > /dev/fd0\n"
+" \n"
+"\n"
+
+#: ../../standalone/drakTermServ_.c:488
msgid "Boot Floppy"
msgstr "��������"
-#: ../../standalone/drakTermServ_.c:438
+#: ../../standalone/drakTermServ_.c:490
msgid "Boot ISO"
msgstr "���� ISO"
-#: ../../standalone/drakTermServ_.c:507
+#: ../../standalone/drakTermServ_.c:559
msgid "Build Whole Kernel -->"
msgstr "���������ں� -->"
-#: ../../standalone/drakTermServ_.c:509 ../../standalone/drakTermServ_.c:539
+#: ../../standalone/drakTermServ_.c:561 ../../standalone/drakTermServ_.c:591
msgid "This will take a few minutes."
msgstr "�⽫���Ѽ����ӡ�"
-#: ../../standalone/drakTermServ_.c:521
+#: ../../standalone/drakTermServ_.c:573
msgid "No kernel selected!"
msgstr "û��ѡ���ں�!"
-#: ../../standalone/drakTermServ_.c:524
+#: ../../standalone/drakTermServ_.c:576
msgid "Build Single NIC -->"
msgstr "���쵥�������� -->"
-#: ../../standalone/drakTermServ_.c:535
+#: ../../standalone/drakTermServ_.c:587
msgid "No nic selected!"
msgstr "û��ѡ������!"
-#: ../../standalone/drakTermServ_.c:538
+#: ../../standalone/drakTermServ_.c:590
msgid "Build All Kernels -->"
msgstr "����ȫ���ں� -->"
-#: ../../standalone/drakTermServ_.c:552
+#: ../../standalone/drakTermServ_.c:604
msgid "<-- Delete"
msgstr "<-- ɾ��"
-#: ../../standalone/drakTermServ_.c:559
+#: ../../standalone/drakTermServ_.c:611
msgid "Delete All NBIs"
msgstr "ɾ������ NBI"
-#: ../../standalone/drakTermServ_.c:621
+#: ../../standalone/drakTermServ_.c:668
+msgid ""
+"!!! Indicates the password in the system database is different than\n"
+" the one in the Terminal Server database.\n"
+"Delete/re-add the user to the Terminal Server to enable login."
+msgstr ""
+"!!! ����ϵͳ���ݿ��е��������ն˷��������ݿ��е����벻ͬ��\n"
+"��ɾ��/���ն˷����������������û�����ܵ�¼��"
+
+#: ../../standalone/drakTermServ_.c:673
msgid "Add User -->"
msgstr "�����û� -->"
-#: ../../standalone/drakTermServ_.c:629
+#: ../../standalone/drakTermServ_.c:681
msgid "<-- Del User"
msgstr "<-- ɾ���û�"
-#: ../../standalone/drakTermServ_.c:694
+#: ../../standalone/drakTermServ_.c:720
+#, c-format
+msgid "type: %s"
+msgstr "����: %s"
+
+#: ../../standalone/drakTermServ_.c:753
msgid "No net boot images created!"
msgstr "û�д���������������!"
-#: ../../standalone/drakTermServ_.c:710
+#: ../../standalone/drakTermServ_.c:773
+msgid "Thin Client"
+msgstr "�ݿͻ���"
+
+#: ../../standalone/drakTermServ_.c:775
+msgid "Allow Thin Clients"
+msgstr "�����ݿͻ���"
+
+#: ../../standalone/drakTermServ_.c:778
msgid "Add Client -->"
msgstr "���ӿͻ� -->"
-#: ../../standalone/drakTermServ_.c:742
-msgid "<-- Del Client"
-msgstr "<-- ɾ���ͻ�"
+#: ../../standalone/drakTermServ_.c:821
+msgid "<-- Edit Client"
+msgstr "<-- �༭�ͻ�"
+
+#: ../../standalone/drakTermServ_.c:837
+msgid "Delete Client"
+msgstr "ɾ���ͻ�"
-#: ../../standalone/drakTermServ_.c:748
+#: ../../standalone/drakTermServ_.c:843
msgid "dhcpd Config..."
msgstr "DHCPD ����..."
-#: ../../standalone/drakTermServ_.c:873
+#: ../../standalone/drakTermServ_.c:876
+msgid ""
+"Need to restart the Display Manager for full changes to take effect. \n"
+"(service dm restart - at the console)"
+msgstr ""
+"��Ҫ����������ʾ�������Ա����и�����Ч��\n"
+"(service dm restart - ����̨��)"
+
+#: ../../standalone/drakTermServ_.c:894
+msgid "Subnet:"
+msgstr "����:"
+
+#: ../../standalone/drakTermServ_.c:901
+msgid "Netmask:"
+msgstr "��������:"
+
+#: ../../standalone/drakTermServ_.c:908
+msgid "Routers:"
+msgstr "·����:"
+
+#: ../../standalone/drakTermServ_.c:915
+msgid "Subnet Mask:"
+msgstr "��������:"
+
+#: ../../standalone/drakTermServ_.c:922
+msgid "Broadcast Address:"
+msgstr "�㲥��ַ:"
+
+#: ../../standalone/drakTermServ_.c:929
+msgid "Domain Name:"
+msgstr "����:"
+
+#: ../../standalone/drakTermServ_.c:937
+msgid "Name Servers:"
+msgstr "����������:"
+
+#: ../../standalone/drakTermServ_.c:948
+msgid "IP Range Start:"
+msgstr "IP �����:"
+
+#: ../../standalone/drakTermServ_.c:949
+msgid "IP Range End:"
+msgstr "IP ��Χ�յ�:"
+
+#: ../../standalone/drakTermServ_.c:1001
msgid "dhcpd Server Configuration"
msgstr "DHCPD ����������"
-#: ../../standalone/drakTermServ_.c:874
+#: ../../standalone/drakTermServ_.c:1002
msgid ""
"Most of these values were extracted\n"
-"from your running system. You can modify as needed."
+"from your running system.\n"
+"You can modify as needed."
msgstr ""
"��Щֵ�о������������������е�ϵͳ\n"
"����ȡ������Ҫ�����Խ����޸ġ�"
-#: ../../standalone/drakTermServ_.c:875
+#: ../../standalone/drakTermServ_.c:1005
+msgid "Dynamic IP Address Pool:"
+msgstr "��̬ IP ��ַ��:"
+
+#: ../../standalone/drakTermServ_.c:1018
msgid "Write Config"
msgstr "�����"
-#: ../../standalone/drakTermServ_.c:965
+#: ../../standalone/drakTermServ_.c:1120
msgid "Please insert floppy disk:"
msgstr "�����һ����������:"
-#: ../../standalone/drakTermServ_.c:969
+#: ../../standalone/drakTermServ_.c:1124
msgid "Couldn't access the floppy!"
msgstr "�޷���������!"
-#: ../../standalone/drakTermServ_.c:971
+#: ../../standalone/drakTermServ_.c:1126
msgid "Floppy can be removed now"
msgstr "���ڿ���ȡ��������"
-#: ../../standalone/drakTermServ_.c:974
+#: ../../standalone/drakTermServ_.c:1129
msgid "No floppy drive available!"
msgstr "û�п��õ�����������!"
-#: ../../standalone/drakTermServ_.c:983
+#: ../../standalone/drakTermServ_.c:1138
#, c-format
msgid "Etherboot ISO image is %s"
msgstr "Etherboot ISO ������ %s"
-#: ../../standalone/drakTermServ_.c:985
+#: ../../standalone/drakTermServ_.c:1140
msgid "Something went wrong! - Is mkisofs installed?"
msgstr "��������! - mkisofs ��װ����?"
-#: ../../standalone/drakTermServ_.c:1004
+#: ../../standalone/drakTermServ_.c:1159
msgid "Need to create /etc/dhcpd.conf first!"
msgstr "��Ҫ�ȴ��� /etc/dhcpd.conf �ļ�!"
-#: ../../standalone/drakautoinst_.c:43
+#: ../../standalone/drakTermServ_.c:1451
+msgid "/etc/hosts.allow and /etc/hosts.deny already configured - not changed"
+msgstr "/etc/hosts.allow �� /etc/hosts.deny �Ѿ����� - �޸���"
+
+#: ../../standalone/drakautoinst_.c:40
msgid "Error!"
msgstr "����!"
-#: ../../standalone/drakautoinst_.c:44
+#: ../../standalone/drakautoinst_.c:41
#, c-format
msgid "I can't find needed image file `%s'."
msgstr "�޷��ҵ�ӳ���ļ���%s����"
-#: ../../standalone/drakautoinst_.c:46
+#: ../../standalone/drakautoinst_.c:43
msgid "Auto Install Configurator"
msgstr "�Զ���װ����"
-#: ../../standalone/drakautoinst_.c:47
+#: ../../standalone/drakautoinst_.c:44
msgid ""
"You are about to configure an Auto Install floppy. This feature is somewhat "
"dangerous and must be used circumspectly.\n"
@@ -10210,21 +10507,29 @@ msgstr ""
"\n"
"������?"
-#: ../../standalone/drakautoinst_.c:69
+#: ../../standalone/drakautoinst_.c:62 ../../standalone/drakautoinst_.c:71
+msgid "manual"
+msgstr "�ֶ�"
+
+#: ../../standalone/drakautoinst_.c:62
+msgid "replay"
+msgstr "�ط�"
+
+#: ../../standalone/drakautoinst_.c:66
msgid "Automatic Steps Configuration"
msgstr "�Զ���������"
-#: ../../standalone/drakautoinst_.c:70
+#: ../../standalone/drakautoinst_.c:67
msgid ""
"Please choose for each step whether it will replay like your install, or it "
"will be manual"
msgstr "��ָ����װ��ÿһ����, ��Ҫ���ձ��ΰ�װ�ط�, �����ֹ����"
-#: ../../standalone/drakautoinst_.c:81 ../../standalone/drakautoinst_.c:82
+#: ../../standalone/drakautoinst_.c:78 ../../standalone/drakautoinst_.c:79
msgid "Creating auto install floppy"
msgstr "���ڴ����Զ���װ����"
-#: ../../standalone/drakautoinst_.c:144
+#: ../../standalone/drakautoinst_.c:139
msgid ""
"\n"
"Welcome.\n"
@@ -10236,12 +10541,12 @@ msgstr ""
"\n"
"����г����Զ���װ���õ�ѡ��"
-#: ../../standalone/drakautoinst_.c:239 ../../standalone/drakgw_.c:508
-#: ../../standalone/scannerdrake_.c:119
+#: ../../standalone/drakautoinst_.c:234 ../../standalone/drakgw_.c:504
+#: ../../standalone/scannerdrake_.c:117
msgid "Congratulations!"
msgstr "��ϲ!"
-#: ../../standalone/drakautoinst_.c:240
+#: ../../standalone/drakautoinst_.c:235
msgid ""
"The floppy has been successfully generated.\n"
"You may now replay your installation."
@@ -10249,35 +10554,35 @@ msgstr ""
"���������Ѿ��ɹ����ɡ�\n"
"����������������ΰ�װ��"
-#: ../../standalone/drakautoinst_.c:278
+#: ../../standalone/drakautoinst_.c:273
msgid "Auto Install"
msgstr "�Զ���װ"
-#: ../../standalone/drakautoinst_.c:348
+#: ../../standalone/drakautoinst_.c:343
msgid "Add an item"
msgstr "������Ŀ"
-#: ../../standalone/drakautoinst_.c:355
+#: ../../standalone/drakautoinst_.c:350
msgid "Remove the last item"
msgstr "ɾ�����һ����?"
-#: ../../standalone/drakbackup_.c:617
+#: ../../standalone/drakbackup_.c:580
msgid "Cron not available yet as non-root"
msgstr "�� root �û�������ʹ�� cron"
-#: ../../standalone/drakbackup_.c:723
+#: ../../standalone/drakbackup_.c:690
msgid "WARNING"
msgstr "����"
-#: ../../standalone/drakbackup_.c:724
+#: ../../standalone/drakbackup_.c:691
msgid "FATAL"
msgstr "���ش���"
-#: ../../standalone/drakbackup_.c:725
+#: ../../standalone/drakbackup_.c:692
msgid "INFO"
msgstr "INFO - ��Ϣ"
-#: ../../standalone/drakbackup_.c:737
+#: ../../standalone/drakbackup_.c:704
msgid ""
"\n"
" DrakBackup Report \n"
@@ -10287,7 +10592,7 @@ msgstr ""
" DrakBackup ���� \n"
"\n"
-#: ../../standalone/drakbackup_.c:738
+#: ../../standalone/drakbackup_.c:705
msgid ""
"\n"
" DrakBackup Daemon Report\n"
@@ -10298,7 +10603,7 @@ msgstr ""
" DrakBackup Daemon ����\n"
"\n"
-#: ../../standalone/drakbackup_.c:742
+#: ../../standalone/drakbackup_.c:709
msgid ""
"\n"
" DrakBackup Report Details\n"
@@ -10309,12 +10614,12 @@ msgstr ""
" DrakBackup ����ϸ��\n"
"\n"
-#: ../../standalone/drakbackup_.c:763 ../../standalone/drakbackup_.c:836
-#: ../../standalone/drakbackup_.c:891
+#: ../../standalone/drakbackup_.c:730 ../../standalone/drakbackup_.c:803
+#: ../../standalone/drakbackup_.c:859
msgid "Total progess"
msgstr "�ܽ���"
-#: ../../standalone/drakbackup_.c:818
+#: ../../standalone/drakbackup_.c:785
#, c-format
msgid ""
"%s exists, delete?\n"
@@ -10327,41 +10632,41 @@ msgstr ""
"����: ��������������������, ��������Ҫ\n"
"�ӷ������ĵ� authorized_keys ɾ������Ŀ��"
-#: ../../standalone/drakbackup_.c:827
+#: ../../standalone/drakbackup_.c:794
msgid "This may take a moment to generate the keys."
msgstr "����һ��Կ����ҪһЩʱ�䡣"
-#: ../../standalone/drakbackup_.c:834
+#: ../../standalone/drakbackup_.c:801
#, c-format
msgid "ERROR: Cannot spawn %s."
msgstr "����: �޷����� %s��"
-#: ../../standalone/drakbackup_.c:851
+#: ../../standalone/drakbackup_.c:818
#, c-format
msgid "No password prompt on %s at port %s"
msgstr "%s �ϵĶ˿� %s û�п�����ʾ"
-#: ../../standalone/drakbackup_.c:852
+#: ../../standalone/drakbackup_.c:819
#, c-format
msgid "Bad password on %s"
msgstr "%s ������Ч"
-#: ../../standalone/drakbackup_.c:853
+#: ../../standalone/drakbackup_.c:820
#, c-format
msgid "Permission denied transferring %s to %s"
msgstr "û��Ȩ�ް� %s Ǩ�Ƶ� %s"
-#: ../../standalone/drakbackup_.c:854
+#: ../../standalone/drakbackup_.c:821
#, c-format
msgid "Can't find %s on %s"
msgstr "û�� %s �� %s ��"
-#: ../../standalone/drakbackup_.c:857
+#: ../../standalone/drakbackup_.c:824
#, c-format
msgid "%s not responding"
msgstr "%s û�л�Ӧ"
-#: ../../standalone/drakbackup_.c:861
+#: ../../standalone/drakbackup_.c:828
#, c-format
msgid ""
"Transfer successful\n"
@@ -10378,64 +10683,64 @@ msgstr ""
"\n"
"�����������ʿ���."
-#: ../../standalone/drakbackup_.c:905
+#: ../../standalone/drakbackup_.c:873
msgid "WebDAV remote site already in sync!"
msgstr "WebDAV Զ��վ���Ѿ�ͬ��!"
-#: ../../standalone/drakbackup_.c:909
+#: ../../standalone/drakbackup_.c:877
msgid "WebDAV transfer failed!"
msgstr "WebDAV ����ʧ��!"
-#: ../../standalone/drakbackup_.c:930
+#: ../../standalone/drakbackup_.c:898
msgid "No CDR/DVDR in drive!"
msgstr "��������û�� CDR/DVDR"
-#: ../../standalone/drakbackup_.c:934
+#: ../../standalone/drakbackup_.c:902
msgid "Does not appear to be recordable media!"
msgstr "���ʲ����ǿ���д���!"
-#: ../../standalone/drakbackup_.c:938
+#: ../../standalone/drakbackup_.c:906
msgid "Not erasable media!"
msgstr "���ʲ������!"
-#: ../../standalone/drakbackup_.c:977
+#: ../../standalone/drakbackup_.c:945
msgid "This may take a moment to erase the media."
msgstr "��ս�����ҪһЩʱ�䡣"
-#: ../../standalone/drakbackup_.c:1062
+#: ../../standalone/drakbackup_.c:1033
msgid "Permission problem accessing CD."
msgstr "û���ʵ���Ȩ�޶�д CD��"
-#: ../../standalone/drakbackup_.c:1089
+#: ../../standalone/drakbackup_.c:1060
#, c-format
msgid "No tape in %s!"
msgstr "%s ��û�дŴ�!"
-#: ../../standalone/drakbackup_.c:1201 ../../standalone/drakbackup_.c:1250
+#: ../../standalone/drakbackup_.c:1174 ../../standalone/drakbackup_.c:1223
msgid "Backup system files..."
msgstr "����ϵͳ�ļ�..."
-#: ../../standalone/drakbackup_.c:1251 ../../standalone/drakbackup_.c:1318
+#: ../../standalone/drakbackup_.c:1224 ../../standalone/drakbackup_.c:1291
msgid "Hard Disk Backup files..."
msgstr "����Ӳ���ļ�..."
-#: ../../standalone/drakbackup_.c:1263
+#: ../../standalone/drakbackup_.c:1236
msgid "Backup User files..."
msgstr "�����û��ļ�..."
-#: ../../standalone/drakbackup_.c:1264
+#: ../../standalone/drakbackup_.c:1237
msgid "Hard Disk Backup Progress..."
msgstr "Ӳ���ļ����ݽ���..."
-#: ../../standalone/drakbackup_.c:1317
+#: ../../standalone/drakbackup_.c:1290
msgid "Backup Other files..."
msgstr "���������ļ�..."
-#: ../../standalone/drakbackup_.c:1323
+#: ../../standalone/drakbackup_.c:1296
msgid "No changes to backup!"
msgstr "û����Ҫ���ݵ��޸�!"
-#: ../../standalone/drakbackup_.c:1339 ../../standalone/drakbackup_.c:1362
+#: ../../standalone/drakbackup_.c:1312 ../../standalone/drakbackup_.c:1335
#, c-format
msgid ""
"\n"
@@ -10446,7 +10751,7 @@ msgstr ""
"Drakbackup ʹ�� %s:\n"
"\n"
-#: ../../standalone/drakbackup_.c:1346
+#: ../../standalone/drakbackup_.c:1319
#, c-format
msgid ""
"file list sent by FTP: %s\n"
@@ -10455,7 +10760,7 @@ msgstr ""
"ͨ�� FTP ���͵��ļ��б�: %s\n"
" "
-#: ../../standalone/drakbackup_.c:1349
+#: ../../standalone/drakbackup_.c:1322
msgid ""
"\n"
" FTP connection problem: It was not possible to send your backup files by "
@@ -10464,7 +10769,7 @@ msgstr ""
"\n"
"FTP ���Ӵ���: �޷�ͨ�� FTP �������ı����ļ���\n"
-#: ../../standalone/drakbackup_.c:1367
+#: ../../standalone/drakbackup_.c:1340
msgid ""
"\n"
"Drakbackup activities via CD:\n"
@@ -10474,7 +10779,7 @@ msgstr ""
"Drakbackup �Ĺ��̲���:\n"
"\n"
-#: ../../standalone/drakbackup_.c:1372
+#: ../../standalone/drakbackup_.c:1345
msgid ""
"\n"
"Drakbackup activities via tape:\n"
@@ -10484,24 +10789,24 @@ msgstr ""
"Drakbackup �ĴŴ�����:\n"
"\n"
-#: ../../standalone/drakbackup_.c:1381
+#: ../../standalone/drakbackup_.c:1354
msgid " Error during mail sending. \n"
msgstr "���͵����ʼ�������\n"
-#: ../../standalone/drakbackup_.c:1406
+#: ../../standalone/drakbackup_.c:1380
msgid "Can't create catalog!"
msgstr "�޷����� catalog!"
-#: ../../standalone/drakbackup_.c:1519 ../../standalone/drakbackup_.c:1530
-#: ../../standalone/drakfont_.c:1004
+#: ../../standalone/drakbackup_.c:1490 ../../standalone/drakbackup_.c:1501
+#: ../../standalone/drakfont_.c:946
msgid "File Selection"
msgstr "ѡ���ļ�"
-#: ../../standalone/drakbackup_.c:1558
+#: ../../standalone/drakbackup_.c:1529
msgid "Select the files or directories and click on 'Add'"
msgstr "ѡ���ļ���Ŀ¼, Ȼ���������ӡ�"
-#: ../../standalone/drakbackup_.c:1602
+#: ../../standalone/drakbackup_.c:1573
msgid ""
"\n"
"Please check all options that you need.\n"
@@ -10509,66 +10814,66 @@ msgstr ""
"\n"
"��ѡ������Ҫ������ѡ�\n"
-#: ../../standalone/drakbackup_.c:1603
+#: ../../standalone/drakbackup_.c:1574
msgid ""
"These options can backup and restore all files in your /etc directory.\n"
-msgstr "��Щѡ����ݺͻָ����� /etc Ŀ¼�е�ȫ���ļ�\n"
+msgstr "��Щѡ����ݺͻָ����� /etc Ŀ¼�е�ȫ���ļ���\n"
-#: ../../standalone/drakbackup_.c:1604
+#: ../../standalone/drakbackup_.c:1575
msgid "Backup your System files. (/etc directory)"
-msgstr "����ϵͳ�ļ�. (/etc Ŀ¼)"
+msgstr "����ϵͳ�ļ���(/etc Ŀ¼)"
-#: ../../standalone/drakbackup_.c:1605
+#: ../../standalone/drakbackup_.c:1576
msgid "Use incremental backup (do not replace old backups)"
msgstr "ʹ���������� (���ƻ��ϱ���)"
-#: ../../standalone/drakbackup_.c:1606
+#: ../../standalone/drakbackup_.c:1577
msgid "Do not include critical files (passwd, group, fstab)"
msgstr "�������ؼ��ļ� (passwd, group, fstab) "
-#: ../../standalone/drakbackup_.c:1607
+#: ../../standalone/drakbackup_.c:1578
msgid ""
"With this option you will be able to restore any version\n"
" of your /etc directory."
msgstr "����ѡ��������/etc Ŀ¼���Իָ����κ���ǰ�İ汾��"
-#: ../../standalone/drakbackup_.c:1624
+#: ../../standalone/drakbackup_.c:1595
msgid "Please check all users that you want to include in your backup."
msgstr "��ѡ����ϣ�����ݵ��û�"
-#: ../../standalone/drakbackup_.c:1651
+#: ../../standalone/drakbackup_.c:1622
msgid "Do not include the browser cache"
msgstr "���������������"
-#: ../../standalone/drakbackup_.c:1652 ../../standalone/drakbackup_.c:1676
+#: ../../standalone/drakbackup_.c:1623 ../../standalone/drakbackup_.c:1647
msgid "Use Incremental Backups (do not replace old backups)"
msgstr "ʹ���������� (���ƻ��ϱ���)"
-#: ../../standalone/drakbackup_.c:1674 ../../standalone/drakfont_.c:1058
+#: ../../standalone/drakbackup_.c:1645 ../../standalone/drakfont_.c:1000
msgid "Remove Selected"
msgstr "ɾ������ѡ�е�"
-#: ../../standalone/drakbackup_.c:1712
+#: ../../standalone/drakbackup_.c:1679
msgid "Windows (FAT32)"
msgstr "Windows(FAT32)"
-#: ../../standalone/drakbackup_.c:1751
+#: ../../standalone/drakbackup_.c:1714
msgid "Users"
msgstr "�û�"
-#: ../../standalone/drakbackup_.c:1777
+#: ../../standalone/drakbackup_.c:1740
msgid "Use network connection to backup"
msgstr "ʹ����������������"
-#: ../../standalone/drakbackup_.c:1779
+#: ../../standalone/drakbackup_.c:1742
msgid "Net Method:"
msgstr "���緽��:"
-#: ../../standalone/drakbackup_.c:1783
+#: ../../standalone/drakbackup_.c:1746
msgid "Use Expect for SSH"
msgstr "�� Expect ���� SSH"
-#: ../../standalone/drakbackup_.c:1784
+#: ../../standalone/drakbackup_.c:1747
msgid ""
"Create/Transfer\n"
"backup keys for SSH"
@@ -10576,7 +10881,7 @@ msgstr ""
"����/����\n"
" SSH �ı�����Կ"
-#: ../../standalone/drakbackup_.c:1785
+#: ../../standalone/drakbackup_.c:1748
msgid ""
" Transfer \n"
"Now"
@@ -10584,7 +10889,7 @@ msgstr ""
" ���� \n"
"����"
-#: ../../standalone/drakbackup_.c:1786
+#: ../../standalone/drakbackup_.c:1749
msgid ""
"Other (not drakbackup)\n"
"keys in place already"
@@ -10592,11 +10897,11 @@ msgstr ""
"����(���� drakbackup)\n"
"��Կ�Ѿ�����"
-#: ../../standalone/drakbackup_.c:1790
+#: ../../standalone/drakbackup_.c:1753
msgid "Please enter the host name or IP."
msgstr "�������������� IP ��ַ."
-#: ../../standalone/drakbackup_.c:1795
+#: ../../standalone/drakbackup_.c:1758
msgid ""
"Please enter the directory (or module) to\n"
" put the backup on this host."
@@ -10604,62 +10909,62 @@ msgstr ""
"��������������ϴ�ű��ݵ�\n"
" Ŀ¼(��ģ��)."
-#: ../../standalone/drakbackup_.c:1800
+#: ../../standalone/drakbackup_.c:1763
msgid "Please enter your login"
msgstr "���������ĵ�¼��"
-#: ../../standalone/drakbackup_.c:1805
+#: ../../standalone/drakbackup_.c:1768
msgid "Please enter your password"
msgstr "���������Ŀ���"
-#: ../../standalone/drakbackup_.c:1811
+#: ../../standalone/drakbackup_.c:1774
msgid "Remember this password"
msgstr "��ס����"
-#: ../../standalone/drakbackup_.c:1822
+#: ../../standalone/drakbackup_.c:1785
msgid "Need hostname, username and password!"
msgstr "��Ҫ ������, �û���, �Ϳ���!"
-#: ../../standalone/drakbackup_.c:1917
+#: ../../standalone/drakbackup_.c:1879
msgid "Use CD/DVDROM to backup"
msgstr "ʹ�� CD/DVDROM ����"
-#: ../../standalone/drakbackup_.c:1920
+#: ../../standalone/drakbackup_.c:1882
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:1925
+#: ../../standalone/drakbackup_.c:1887
msgid "Please choose your CD/DVD media size (Mb)"
msgstr "��ѡ����ʹ�õ� CD/DVD ��������."
-#: ../../standalone/drakbackup_.c:1931
+#: ../../standalone/drakbackup_.c:1893
msgid "Please check for multisession CD"
msgstr "�����ʹ�ö�� CD, ��ѡ������"
-#: ../../standalone/drakbackup_.c:1937
+#: ../../standalone/drakbackup_.c:1899
msgid "Please check if you are using CDRW media"
msgstr "�����ʹ�� CDRW ����, ��ѡ������"
-#: ../../standalone/drakbackup_.c:1943
+#: ../../standalone/drakbackup_.c:1905
msgid "Please check if you want to erase your RW media (1st Session)"
msgstr "�����Ҫ������� RW ����(��һ��), ��ѡ������"
-#: ../../standalone/drakbackup_.c:1944
+#: ../../standalone/drakbackup_.c:1906
msgid " Erase Now "
msgstr " ������� "
-#: ../../standalone/drakbackup_.c:1950
+#: ../../standalone/drakbackup_.c:1912
msgid "Please check if you are using a DVDR device"
msgstr "�����ʹ�� DVDR �豸, ��ѡ������"
-#: ../../standalone/drakbackup_.c:1956
+#: ../../standalone/drakbackup_.c:1918
msgid "Please check if you are using a DVDRAM device"
msgstr "�����ʹ�� DVDRAM �豸, ��ѡ������"
-#: ../../standalone/drakbackup_.c:1969
+#: ../../standalone/drakbackup_.c:1931
msgid ""
"Please enter your CD Writer device name\n"
" ex: 0,1,0"
@@ -10667,92 +10972,92 @@ msgstr ""
"���������Ŀ��̻��豸��\n"
" ��: 0,1,0"
-#: ../../standalone/drakbackup_.c:2002
+#: ../../standalone/drakbackup_.c:1964
msgid "No CD device defined!"
msgstr "û�з��� CD �豸!"
-#: ../../standalone/drakbackup_.c:2050
+#: ../../standalone/drakbackup_.c:2012
msgid "Use tape to backup"
msgstr "ʹ�ôŴ�����"
-#: ../../standalone/drakbackup_.c:2053
+#: ../../standalone/drakbackup_.c:2015
msgid "Please enter the device name to use for backup"
msgstr "���������ڱ��ݵ��豸��"
-#: ../../standalone/drakbackup_.c:2059
+#: ../../standalone/drakbackup_.c:2021
msgid "Please check if you want to use the non-rewinding device."
msgstr "�����ʹ�ò��ؾ����豸, ��ѡ�����"
-#: ../../standalone/drakbackup_.c:2065
+#: ../../standalone/drakbackup_.c:2027
msgid "Please check if you want to erase your tape before the backup."
msgstr "�����Ҫ�ڱ���ǰ����Ŵ�, ��ѡ�����"
-#: ../../standalone/drakbackup_.c:2071
+#: ../../standalone/drakbackup_.c:2033
msgid "Please check if you want to eject your tape after the backup."
msgstr "�����Ҫ�ڱ��ݺ�,��ѡ�����"
-#: ../../standalone/drakbackup_.c:2077 ../../standalone/drakbackup_.c:2151
-#: ../../standalone/drakbackup_.c:3118
+#: ../../standalone/drakbackup_.c:2039 ../../standalone/drakbackup_.c:2112
+#: ../../standalone/drakbackup_.c:3068
msgid ""
"Please enter the maximum size\n"
" allowed for Drakbackup"
msgstr "���������� Drakbackup ʹ�õ����ռ�"
-#: ../../standalone/drakbackup_.c:2142
+#: ../../standalone/drakbackup_.c:2103
msgid "Please enter the directory to save to:"
msgstr "������Ҫ�����ļ���Ŀ¼��:"
-#: ../../standalone/drakbackup_.c:2157 ../../standalone/drakbackup_.c:3124
+#: ../../standalone/drakbackup_.c:2118 ../../standalone/drakbackup_.c:3074
msgid "Use quota for backup files."
msgstr "ʹ���޶���ļ�."
-#: ../../standalone/drakbackup_.c:2223
+#: ../../standalone/drakbackup_.c:2180
msgid "Network"
msgstr "����"
-#: ../../standalone/drakbackup_.c:2228
+#: ../../standalone/drakbackup_.c:2185
msgid "CDROM / DVDROM"
msgstr "CDROM / DVDROM"
-#: ../../standalone/drakbackup_.c:2233
+#: ../../standalone/drakbackup_.c:2190
msgid "HardDrive / NFS"
msgstr "Ӳ�� / NFS"
-#: ../../standalone/drakbackup_.c:2238
+#: ../../standalone/drakbackup_.c:2195
msgid "Tape"
msgstr "�Ŵ�"
-#: ../../standalone/drakbackup_.c:2252 ../../standalone/drakbackup_.c:2256
-#: ../../standalone/drakbackup_.c:2260
+#: ../../standalone/drakbackup_.c:2208 ../../standalone/drakbackup_.c:2212
+#: ../../standalone/drakbackup_.c:2216
msgid "hourly"
msgstr "ÿСʱ"
-#: ../../standalone/drakbackup_.c:2253 ../../standalone/drakbackup_.c:2257
-#: ../../standalone/drakbackup_.c:2260
+#: ../../standalone/drakbackup_.c:2209 ../../standalone/drakbackup_.c:2213
+#: ../../standalone/drakbackup_.c:2216
msgid "daily"
msgstr "ÿ��"
-#: ../../standalone/drakbackup_.c:2254 ../../standalone/drakbackup_.c:2258
-#: ../../standalone/drakbackup_.c:2260
+#: ../../standalone/drakbackup_.c:2210 ../../standalone/drakbackup_.c:2214
+#: ../../standalone/drakbackup_.c:2216
msgid "weekly"
msgstr "ÿ��"
-#: ../../standalone/drakbackup_.c:2255 ../../standalone/drakbackup_.c:2259
-#: ../../standalone/drakbackup_.c:2260
+#: ../../standalone/drakbackup_.c:2211 ../../standalone/drakbackup_.c:2215
+#: ../../standalone/drakbackup_.c:2216
msgid "monthly"
msgstr "ÿ��"
-#: ../../standalone/drakbackup_.c:2273
+#: ../../standalone/drakbackup_.c:2229
msgid "Use daemon"
msgstr "ʹ���ػ�����"
-#: ../../standalone/drakbackup_.c:2278
+#: ../../standalone/drakbackup_.c:2234
msgid ""
"Please choose the time \n"
"interval between each backup"
msgstr "��ѡ����ϣ������ʱ����"
-#: ../../standalone/drakbackup_.c:2284
+#: ../../standalone/drakbackup_.c:2240
msgid ""
"Please choose the\n"
"media for backup."
@@ -10760,7 +11065,7 @@ msgstr ""
"��ѡ��\n"
"����ʹ�õĽ���."
-#: ../../standalone/drakbackup_.c:2291
+#: ../../standalone/drakbackup_.c:2247
msgid ""
"Please be sure that the cron daemon is included in your services. \n"
"\n"
@@ -10770,71 +11075,71 @@ msgstr ""
"\n"
"��ע���������еġ����硱���ʶ�Ҫ����Ӳ�̡�"
-#: ../../standalone/drakbackup_.c:2328
+#: ../../standalone/drakbackup_.c:2283
msgid "Send mail report after each backup to:"
msgstr "��ÿ�α��ݺ����ʼ������:"
-#: ../../standalone/drakbackup_.c:2334
+#: ../../standalone/drakbackup_.c:2289
msgid "Delete Hard Drive tar files after backup to other media."
msgstr "���ݵ���������֮��ɾ��Ӳ���ϵ� tar �ļ���"
-#: ../../standalone/drakbackup_.c:2373
+#: ../../standalone/drakbackup_.c:2324
msgid "What"
msgstr "����"
-#: ../../standalone/drakbackup_.c:2378
+#: ../../standalone/drakbackup_.c:2329
msgid "Where"
msgstr "�"
-#: ../../standalone/drakbackup_.c:2383
+#: ../../standalone/drakbackup_.c:2334
msgid "When"
msgstr "ʱ��"
-#: ../../standalone/drakbackup_.c:2388
+#: ../../standalone/drakbackup_.c:2339
msgid "More Options"
msgstr "����"
-#: ../../standalone/drakbackup_.c:2407 ../../standalone/drakbackup_.c:4532
+#: ../../standalone/drakbackup_.c:2358 ../../standalone/drakbackup_.c:4444
msgid "Drakbackup Configuration"
msgstr "DrakBackup ����"
-#: ../../standalone/drakbackup_.c:2425
+#: ../../standalone/drakbackup_.c:2376
msgid "Please choose where you want to backup"
msgstr "��ѡ����ϣ��������������"
-#: ../../standalone/drakbackup_.c:2427
+#: ../../standalone/drakbackup_.c:2378
msgid "on Hard Drive"
msgstr "��Ӳ����"
-#: ../../standalone/drakbackup_.c:2437
+#: ../../standalone/drakbackup_.c:2388
msgid "across Network"
msgstr "ͨ������"
-#: ../../standalone/drakbackup_.c:2447
+#: ../../standalone/drakbackup_.c:2398
msgid "on CDROM"
msgstr "��CDROM��"
-#: ../../standalone/drakbackup_.c:2455
+#: ../../standalone/drakbackup_.c:2406
msgid "on Tape Device"
msgstr "�ڴŴ�����"
-#: ../../standalone/drakbackup_.c:2498
+#: ../../standalone/drakbackup_.c:2449
msgid "Please choose what you want to backup"
msgstr "��ѡ����Ҫ���ݵ��ļ�"
-#: ../../standalone/drakbackup_.c:2499
+#: ../../standalone/drakbackup_.c:2450
msgid "Backup system"
msgstr "����ϵͳ"
-#: ../../standalone/drakbackup_.c:2500
+#: ../../standalone/drakbackup_.c:2451
msgid "Backup Users"
msgstr "�����û�"
-#: ../../standalone/drakbackup_.c:2503
+#: ../../standalone/drakbackup_.c:2454
msgid "Select user manually"
msgstr "�ֹ�ѡ���û�"
-#: ../../standalone/drakbackup_.c:2586
+#: ../../standalone/drakbackup_.c:2537
msgid ""
"\n"
"Backup Sources: \n"
@@ -10842,7 +11147,7 @@ msgstr ""
"\n"
"������Դ: \n"
-#: ../../standalone/drakbackup_.c:2587
+#: ../../standalone/drakbackup_.c:2538
msgid ""
"\n"
"- System Files:\n"
@@ -10850,7 +11155,7 @@ msgstr ""
"\n"
"- ϵͳ�ļ�:\n"
-#: ../../standalone/drakbackup_.c:2589
+#: ../../standalone/drakbackup_.c:2540
msgid ""
"\n"
"- User Files:\n"
@@ -10858,7 +11163,7 @@ msgstr ""
"\n"
"- �û��ļ�:\n"
-#: ../../standalone/drakbackup_.c:2591
+#: ../../standalone/drakbackup_.c:2542
msgid ""
"\n"
"- Other Files:\n"
@@ -10866,7 +11171,7 @@ msgstr ""
"\n"
"- �����ļ�:\n"
-#: ../../standalone/drakbackup_.c:2593
+#: ../../standalone/drakbackup_.c:2544
#, c-format
msgid ""
"\n"
@@ -10875,7 +11180,7 @@ msgstr ""
"\n"
"- ������Ӳ��·��: %s\n"
-#: ../../standalone/drakbackup_.c:2596
+#: ../../standalone/drakbackup_.c:2547
msgid ""
"\n"
"- Delete hard drive tar files after backup.\n"
@@ -10883,7 +11188,7 @@ msgstr ""
"\n"
"- ���ݺ�ɾ��Ӳ�̵� tar �ļ���\n"
-#: ../../standalone/drakbackup_.c:2602
+#: ../../standalone/drakbackup_.c:2553
msgid ""
"\n"
"- Burn to CD"
@@ -10891,20 +11196,20 @@ msgstr ""
"\n"
"- �չ���"
-#: ../../standalone/drakbackup_.c:2603
+#: ../../standalone/drakbackup_.c:2554
msgid "RW"
msgstr "RW"
-#: ../../standalone/drakbackup_.c:2604
+#: ../../standalone/drakbackup_.c:2555
#, c-format
msgid " on device: %s"
msgstr " ʹ���豸: %s"
-#: ../../standalone/drakbackup_.c:2605
+#: ../../standalone/drakbackup_.c:2556
msgid " (multi-session)"
msgstr " (���)"
-#: ../../standalone/drakbackup_.c:2606
+#: ../../standalone/drakbackup_.c:2557
#, c-format
msgid ""
"\n"
@@ -10913,12 +11218,12 @@ msgstr ""
"\n"
"- ���浽�Ŵ��豸: %s"
-#: ../../standalone/drakbackup_.c:2607
+#: ../../standalone/drakbackup_.c:2558
#, c-format
msgid "\t\tErase=%s"
msgstr "\t\tErase=%s"
-#: ../../standalone/drakbackup_.c:2610
+#: ../../standalone/drakbackup_.c:2561
#, c-format
msgid ""
"\n"
@@ -10927,7 +11232,7 @@ msgstr ""
"\n"
"- ͨ�� %s ���浽����: %s\n"
-#: ../../standalone/drakbackup_.c:2611
+#: ../../standalone/drakbackup_.c:2562
#, c-format
msgid ""
"\t\t user name: %s\n"
@@ -10936,7 +11241,7 @@ msgstr ""
"\t\t �û���: %s\n"
"\t\t ·��: %s \n"
-#: ../../standalone/drakbackup_.c:2612
+#: ../../standalone/drakbackup_.c:2563
msgid ""
"\n"
"- Options:\n"
@@ -10944,19 +11249,19 @@ msgstr ""
"\n"
"- ѡ��:\n"
-#: ../../standalone/drakbackup_.c:2613
+#: ../../standalone/drakbackup_.c:2564
msgid "\tDo not include System Files\n"
msgstr "\t������ϵͳ�ļ�\n"
-#: ../../standalone/drakbackup_.c:2616
+#: ../../standalone/drakbackup_.c:2567
msgid "\tBackups use tar and bzip2\n"
msgstr "\tʹ�� tar �� bzip2 ����\n"
-#: ../../standalone/drakbackup_.c:2618
+#: ../../standalone/drakbackup_.c:2569
msgid "\tBackups use tar and gzip\n"
msgstr "\tʹ�� tar �� gzip ����\n"
-#: ../../standalone/drakbackup_.c:2621
+#: ../../standalone/drakbackup_.c:2572
#, c-format
msgid ""
"\n"
@@ -10965,39 +11270,39 @@ msgstr ""
"\n"
"- Daemon (%s) include:\n"
-#: ../../standalone/drakbackup_.c:2622
+#: ../../standalone/drakbackup_.c:2573
msgid "\t-Hard drive.\n"
msgstr "\t-Ӳ�̡�\n"
-#: ../../standalone/drakbackup_.c:2623
+#: ../../standalone/drakbackup_.c:2574
msgid "\t-CDROM.\n"
msgstr "\t-���̡�\n"
-#: ../../standalone/drakbackup_.c:2624
+#: ../../standalone/drakbackup_.c:2575
msgid "\t-Tape \n"
msgstr "\t-�Ŵ�\n"
-#: ../../standalone/drakbackup_.c:2625
+#: ../../standalone/drakbackup_.c:2576
msgid "\t-Network by FTP.\n"
msgstr "\t-����ͨ��FTP��\n"
-#: ../../standalone/drakbackup_.c:2626
+#: ../../standalone/drakbackup_.c:2577
msgid "\t-Network by SSH.\n"
msgstr "\t-����ͨ��SSH��\n"
-#: ../../standalone/drakbackup_.c:2627
+#: ../../standalone/drakbackup_.c:2578
msgid "\t-Network by rsync.\n"
msgstr "\t-���� ͨ�� rsync��\n"
-#: ../../standalone/drakbackup_.c:2628
+#: ../../standalone/drakbackup_.c:2579
msgid "\t-Network by webdav.\n"
msgstr "\t-���� ͨ��webdav��\n"
-#: ../../standalone/drakbackup_.c:2630
+#: ../../standalone/drakbackup_.c:2581
msgid "No configuration, please click Wizard or Advanced.\n"
msgstr "û������, ��ѡ���򵼻�߼���\n"
-#: ../../standalone/drakbackup_.c:2636
+#: ../../standalone/drakbackup_.c:2587
msgid ""
"List of data to restore:\n"
"\n"
@@ -11005,7 +11310,7 @@ msgstr ""
"Ҫ�ָ����ݵ��嵥:\n"
"\n"
-#: ../../standalone/drakbackup_.c:2803
+#: ../../standalone/drakbackup_.c:2754
msgid ""
"List of data corrupted:\n"
"\n"
@@ -11013,100 +11318,100 @@ msgstr ""
"�ѻٻ����ݵ��嵥:\n"
"\n"
-#: ../../standalone/drakbackup_.c:2805
+#: ../../standalone/drakbackup_.c:2756
msgid "Please uncheck or remove it on next time."
msgstr "��ȡ��ѡ��ɾ������"
-#: ../../standalone/drakbackup_.c:2815
+#: ../../standalone/drakbackup_.c:2766
msgid "Backup files are corrupted"
msgstr "�����ļ�����"
-#: ../../standalone/drakbackup_.c:2836
+#: ../../standalone/drakbackup_.c:2787
msgid " All of your selected data have been "
msgstr " ��ѡ���ȫ�������Ѿ� "
-#: ../../standalone/drakbackup_.c:2837
+#: ../../standalone/drakbackup_.c:2788
#, c-format
msgid " Successfuly Restored on %s "
msgstr "\t�ɹ��Ļָ��� %s "
-#: ../../standalone/drakbackup_.c:2955
+#: ../../standalone/drakbackup_.c:2906
msgid " Restore Configuration "
msgstr " �ָ������� "
-#: ../../standalone/drakbackup_.c:2973
+#: ../../standalone/drakbackup_.c:2924
msgid "OK to restore the other files."
msgstr "OK ���ָ������ļ�"
-#: ../../standalone/drakbackup_.c:2990
+#: ../../standalone/drakbackup_.c:2941
msgid "User list to restore (only the most recent date per user is important)"
msgstr "�ɻָ����û��嵥 (ÿ���û��������������Ҫ��)"
-#: ../../standalone/drakbackup_.c:3068
+#: ../../standalone/drakbackup_.c:3019
msgid "Backup the system files before:"
msgstr "�ȱ���ϵͳ�ļ�:"
-#: ../../standalone/drakbackup_.c:3070
+#: ../../standalone/drakbackup_.c:3021
msgid "please choose the date to restore"
msgstr "��ѡ����Ҫ�ָ�������"
-#: ../../standalone/drakbackup_.c:3107
+#: ../../standalone/drakbackup_.c:3057
msgid "Use Hard Disk to backup"
msgstr "ʹ��Ӳ�̱����ļ�"
-#: ../../standalone/drakbackup_.c:3110
+#: ../../standalone/drakbackup_.c:3060
msgid "Please enter the directory to save:"
msgstr "������Ŀ¼��:"
-#: ../../standalone/drakbackup_.c:3153
+#: ../../standalone/drakbackup_.c:3103
msgid "FTP Connection"
msgstr "FTP ����"
-#: ../../standalone/drakbackup_.c:3160
+#: ../../standalone/drakbackup_.c:3110
msgid "Secure Connection"
msgstr "��������"
-#: ../../standalone/drakbackup_.c:3186
+#: ../../standalone/drakbackup_.c:3134
msgid "Restore from Hard Disk."
msgstr "��Ӳ�ָ̻�"
-#: ../../standalone/drakbackup_.c:3188
+#: ../../standalone/drakbackup_.c:3136
msgid "Please enter the directory where backups are stored"
msgstr "�����뱣�汸�ݵ�Ŀ¼"
-#: ../../standalone/drakbackup_.c:3256
+#: ../../standalone/drakbackup_.c:3204
msgid "Select another media to restore from"
msgstr "��ѡ����һ����"
-#: ../../standalone/drakbackup_.c:3258
+#: ../../standalone/drakbackup_.c:3206
msgid "Other Media"
msgstr "����"
-#: ../../standalone/drakbackup_.c:3263
+#: ../../standalone/drakbackup_.c:3211
msgid "Restore system"
msgstr "�ָ�ϵͳ"
-#: ../../standalone/drakbackup_.c:3264
+#: ../../standalone/drakbackup_.c:3212
msgid "Restore Users"
msgstr "�ָ��û��ļ�"
-#: ../../standalone/drakbackup_.c:3265
+#: ../../standalone/drakbackup_.c:3213
msgid "Restore Other"
msgstr "�ָ������ļ�"
-#: ../../standalone/drakbackup_.c:3267
+#: ../../standalone/drakbackup_.c:3215
msgid "select path to restore (instead of /)"
msgstr "ѡ��Ҫ�ָ�����·�� (/ ����)"
-#: ../../standalone/drakbackup_.c:3271
+#: ../../standalone/drakbackup_.c:3219
msgid "Do new backup before restore (only for incremental backups.)"
msgstr "�ָ�ǰ���µı��� (ֻ�������������ݡ�)"
-#: ../../standalone/drakbackup_.c:3273
+#: ../../standalone/drakbackup_.c:3221
msgid "Remove user directories before restore."
msgstr "�ָ�ǰɾ���û�Ŀ¼��"
-#: ../../standalone/drakbackup_.c:3386
+#: ../../standalone/drakbackup_.c:3334
msgid ""
"Restore Selected\n"
"Catalog Entry"
@@ -11114,7 +11419,7 @@ msgstr ""
"�ָ�ѡ�е�\n"
"Ŀ¼��"
-#: ../../standalone/drakbackup_.c:3396
+#: ../../standalone/drakbackup_.c:3344
msgid ""
"Restore Selected\n"
"Files"
@@ -11122,7 +11427,7 @@ msgstr ""
"�ָ�ѡ�е�\n"
"�ļ�"
-#: ../../standalone/drakbackup_.c:3413
+#: ../../standalone/drakbackup_.c:3361
msgid ""
"Change\n"
"Restore Path"
@@ -11130,12 +11435,12 @@ msgstr ""
"�޸�\n"
"�ָ�·��"
-#: ../../standalone/drakbackup_.c:3479
+#: ../../standalone/drakbackup_.c:3427
#, c-format
msgid "Backup files not found at %s."
msgstr "�� %s û�з��ֱ����ļ���"
-#: ../../standalone/drakbackup_.c:3492
+#: ../../standalone/drakbackup_.c:3440
#, c-format
msgid ""
"Insert the CD with volume label %s\n"
@@ -11144,16 +11449,16 @@ msgstr ""
"��Ѿ���Ϊ %s �Ĺ��̲���\n"
"�������� /mnt/cdrom ����������"
-#: ../../standalone/drakbackup_.c:3492
+#: ../../standalone/drakbackup_.c:3440
msgid "Restore From CD"
msgstr "�ӹ��ָ̻�"
-#: ../../standalone/drakbackup_.c:3494
+#: ../../standalone/drakbackup_.c:3442
#, c-format
msgid "Not the correct CD label. Disk is labelled %s."
msgstr "�����̱겻��. �����̵ľ����� %s��"
-#: ../../standalone/drakbackup_.c:3504
+#: ../../standalone/drakbackup_.c:3452
#, c-format
msgid ""
"Insert the tape with volume label %s\n"
@@ -11162,102 +11467,102 @@ msgstr ""
"��Ѿ���Ϊ %s �ĴŴ�װ��\n"
"�Ŵ��� %s"
-#: ../../standalone/drakbackup_.c:3504
+#: ../../standalone/drakbackup_.c:3452
msgid "Restore From Tape"
msgstr "�ӴŴ��ָ�"
-#: ../../standalone/drakbackup_.c:3506
+#: ../../standalone/drakbackup_.c:3454
#, c-format
msgid "Not the correct tape label. Tape is labelled %s."
msgstr "�Ŵ���Dz��ԡ����̴Ŵ��� %s��"
-#: ../../standalone/drakbackup_.c:3526
+#: ../../standalone/drakbackup_.c:3474
msgid "Restore Via Network"
msgstr "ͨ������ָ�"
-#: ../../standalone/drakbackup_.c:3526
+#: ../../standalone/drakbackup_.c:3474
#, c-format
msgid "Restore Via Network Protocol: %s"
msgstr "�ָ�ʹ�õ�����Э��: %s"
-#: ../../standalone/drakbackup_.c:3527
+#: ../../standalone/drakbackup_.c:3475
msgid "Host Name"
msgstr "������"
-#: ../../standalone/drakbackup_.c:3528
+#: ../../standalone/drakbackup_.c:3476
msgid "Host Path or Module"
msgstr "����·����ģ��"
-#: ../../standalone/drakbackup_.c:3535
+#: ../../standalone/drakbackup_.c:3483
msgid "Password required"
msgstr "��Ҫ����"
-#: ../../standalone/drakbackup_.c:3541
+#: ../../standalone/drakbackup_.c:3489
msgid "Username required"
msgstr "��Ҫ�û���"
-#: ../../standalone/drakbackup_.c:3544
+#: ../../standalone/drakbackup_.c:3492
msgid "Hostname required"
msgstr "��Ҫ��������"
-#: ../../standalone/drakbackup_.c:3549
+#: ../../standalone/drakbackup_.c:3497
msgid "Path or Module required"
msgstr "Ҫ���ṩ·����ģ��"
-#: ../../standalone/drakbackup_.c:3562
+#: ../../standalone/drakbackup_.c:3510
msgid "Files Restored..."
msgstr "�ļ��ѻָ�..."
-#: ../../standalone/drakbackup_.c:3565
+#: ../../standalone/drakbackup_.c:3513
msgid "Restore Failed..."
msgstr "�ָ�ʧ��..."
-#: ../../standalone/drakbackup_.c:3803
+#: ../../standalone/drakbackup_.c:3751
msgid "Restore all backups"
msgstr "�ָ����б���"
-#: ../../standalone/drakbackup_.c:3812
+#: ../../standalone/drakbackup_.c:3760
msgid "Custom Restore"
msgstr "���ƻָ�"
-#: ../../standalone/drakbackup_.c:3858
+#: ../../standalone/drakbackup_.c:3804
msgid "CD in place - continue."
msgstr "���̾��� - ������"
-#: ../../standalone/drakbackup_.c:3864
+#: ../../standalone/drakbackup_.c:3810
msgid "Browse to new restore repository."
msgstr "����µĻָ��ֿ⡣"
-#: ../../standalone/drakbackup_.c:3867
+#: ../../standalone/drakbackup_.c:3813
msgid "Restore From Catalog"
msgstr "��Ŀ¼�ָ�"
-#: ../../standalone/drakbackup_.c:3895
+#: ../../standalone/drakbackup_.c:3841
msgid "Restore Progress"
msgstr "�ָ���չ"
-#: ../../standalone/drakbackup_.c:3937 ../../standalone/drakbackup_.c:3970
-#: ../../standalone/drakbackup_.c:3996 ../../standalone/drakbackup_.c:4023
-#: ../../standalone/drakbackup_.c:4050 ../../standalone/drakbackup_.c:4110
-#: ../../standalone/drakbackup_.c:4137 ../../standalone/drakbackup_.c:4167
-#: ../../standalone/drakbackup_.c:4193
+#: ../../standalone/drakbackup_.c:3883 ../../standalone/drakbackup_.c:3916
+#: ../../standalone/drakbackup_.c:3942 ../../standalone/drakbackup_.c:3969
+#: ../../standalone/drakbackup_.c:3996 ../../standalone/drakbackup_.c:4056
+#: ../../standalone/drakbackup_.c:4083 ../../standalone/drakbackup_.c:4113
+#: ../../standalone/drakbackup_.c:4139
msgid "Previous"
msgstr "ǰһ��"
-#: ../../standalone/drakbackup_.c:3941 ../../standalone/drakbackup_.c:4027
-#: ../../standalone/logdrake_.c:224
+#: ../../standalone/drakbackup_.c:3887 ../../standalone/drakbackup_.c:3973
+#: ../../standalone/logdrake_.c:203
msgid "Save"
msgstr "����"
-#: ../../standalone/drakbackup_.c:4000
+#: ../../standalone/drakbackup_.c:3946
msgid "Build Backup"
msgstr "���ڱ���"
-#: ../../standalone/drakbackup_.c:4054 ../../standalone/drakbackup_.c:4634
+#: ../../standalone/drakbackup_.c:4000 ../../standalone/drakbackup_.c:4544
msgid "Restore"
msgstr "�ָ�"
-#: ../../standalone/drakbackup_.c:4233
+#: ../../standalone/drakbackup_.c:4189
msgid ""
"Error during sendmail.\n"
" Your report mail was not sent.\n"
@@ -11267,15 +11572,7 @@ msgstr ""
" ���ı����ʼ�û�з�����\n"
" ������ sendmail"
-#: ../../standalone/drakbackup_.c:4257
-msgid ""
-"The following packages need to be installed:\n"
-" @list_of_rpm_to_install"
-msgstr ""
-"������������Ҫ����װ:\n"
-" @list_of_rpm_to_install"
-
-#: ../../standalone/drakbackup_.c:4280
+#: ../../standalone/drakbackup_.c:4195
msgid ""
"Error during sending file via FTP.\n"
" Please correct your FTP configuration."
@@ -11283,19 +11580,27 @@ msgstr ""
"ͨ�� FTP �����ļ�������\n"
" ��������� FTP ���á�"
-#: ../../standalone/drakbackup_.c:4303
+#: ../../standalone/drakbackup_.c:4209
+msgid ""
+"The following packages need to be installed:\n"
+" @list_of_rpm_to_install"
+msgstr ""
+"������������Ҫ����װ:\n"
+" @list_of_rpm_to_install"
+
+#: ../../standalone/drakbackup_.c:4232
msgid "Please select data to restore..."
msgstr "��ѡ��Ҫ�ָ�������..."
-#: ../../standalone/drakbackup_.c:4324
+#: ../../standalone/drakbackup_.c:4267
msgid "Please select media for backup..."
msgstr "��ѡ��ʹ�õ�����..."
-#: ../../standalone/drakbackup_.c:4346
+#: ../../standalone/drakbackup_.c:4275
msgid "Please select data to backup..."
msgstr "��ѡ���豸�ݵ�����..."
-#: ../../standalone/drakbackup_.c:4368
+#: ../../standalone/drakbackup_.c:4293 ../../standalone/drakbackup_.c:4304
msgid ""
"No configuration file found \n"
"please click Wizard or Advanced."
@@ -11303,59 +11608,59 @@ msgstr ""
"û���ҵ������ļ�\n"
"�����򵼻�߼���"
-#: ../../standalone/drakbackup_.c:4389
+#: ../../standalone/drakbackup_.c:4308
msgid "Under Devel ... please wait."
msgstr "������...��ȴ��°汾��"
-#: ../../standalone/drakbackup_.c:4470
+#: ../../standalone/drakbackup_.c:4382
msgid "Backup system files"
msgstr "����ϵͳ�ļ�"
-#: ../../standalone/drakbackup_.c:4472
+#: ../../standalone/drakbackup_.c:4384
msgid "Backup user files"
msgstr "�����û��ļ�"
-#: ../../standalone/drakbackup_.c:4474
+#: ../../standalone/drakbackup_.c:4386
msgid "Backup other files"
msgstr "���������ļ�"
-#: ../../standalone/drakbackup_.c:4476 ../../standalone/drakbackup_.c:4509
+#: ../../standalone/drakbackup_.c:4388 ../../standalone/drakbackup_.c:4421
msgid "Total Progress"
msgstr "�ܽ�չ"
-#: ../../standalone/drakbackup_.c:4500
+#: ../../standalone/drakbackup_.c:4412
msgid "files sending by FTP"
msgstr "����ͨ�� FTP �����ļ�"
-#: ../../standalone/drakbackup_.c:4504
+#: ../../standalone/drakbackup_.c:4416
msgid "Sending files..."
msgstr "���ڷ����ļ�..."
-#: ../../standalone/drakbackup_.c:4590
+#: ../../standalone/drakbackup_.c:4500
msgid "Backup Now from configuration file"
msgstr "���ڴ������ļ�����"
-#: ../../standalone/drakbackup_.c:4595
+#: ../../standalone/drakbackup_.c:4505
msgid "View Backup Configuration."
msgstr "�鿴�������á�"
-#: ../../standalone/drakbackup_.c:4616
+#: ../../standalone/drakbackup_.c:4526
msgid "Wizard Configuration"
msgstr "������"
-#: ../../standalone/drakbackup_.c:4621
+#: ../../standalone/drakbackup_.c:4531
msgid "Advanced Configuration"
msgstr "�߼�����"
-#: ../../standalone/drakbackup_.c:4626
+#: ../../standalone/drakbackup_.c:4536
msgid "Backup Now"
msgstr "���ڱ���"
-#: ../../standalone/drakbackup_.c:4660
+#: ../../standalone/drakbackup_.c:4576
msgid "Drakbackup"
msgstr "Drakbackup"
-#: ../../standalone/drakbackup_.c:4711
+#: ../../standalone/drakbackup_.c:4624
msgid ""
"options description:\n"
"\n"
@@ -11415,7 +11720,7 @@ msgstr ""
" \n"
"\n"
-#: ../../standalone/drakbackup_.c:4741
+#: ../../standalone/drakbackup_.c:4654
msgid ""
"\n"
" Some errors during sendmail are caused by \n"
@@ -11428,7 +11733,7 @@ msgstr ""
" ����Ҫ�� /etc/postfix/main.cf ������ myhostname �� mydomain\n"
"\n"
-#: ../../standalone/drakbackup_.c:4749
+#: ../../standalone/drakbackup_.c:4662
msgid ""
"options description:\n"
"\n"
@@ -11502,7 +11807,7 @@ msgstr ""
"\t�����ѡ����������\n"
"\tÿ�α���֮ǰ��ɾ���ɵı��ݡ�\n"
-#: ../../standalone/drakbackup_.c:4788
+#: ../../standalone/drakbackup_.c:4701
msgid ""
"restore description:\n"
" \n"
@@ -11554,50 +11859,20 @@ msgstr ""
"\n"
"\n"
-#: ../../standalone/drakbackup_.c:4814 ../../standalone/drakbackup_.c:4891
+#: ../../standalone/drakbackup_.c:4727
msgid ""
-" Copyright (C) 2001 MandrakeSoft by DUPONT Sebastien <dupont_s\\@epita.fr>"
+" Copyright (C) 2001-2002 MandrakeSoft by DUPONT Sebastien <dupont_s\\@epita."
+"fr>"
msgstr ""
-" Copyright (C) 2001 MandrakeSoft by DUPONT Sebastien <dupont_s\\@epita.fr>"
+" ��Ȩ (C) 2001-2002 MandrakeSoft by DUPONT Sebastien <dupont_s\\@epita.fr>"
-#: ../../standalone/drakbackup_.c:4816 ../../standalone/drakbackup_.c:4893
+#: ../../standalone/drakbackup_.c:4729
msgid ""
" updates 2002 MandrakeSoft by Stew Benedict <sbenedict\\@mandrakesoft.com>"
msgstr ""
-" updates 2002 MandrakeSoft by Stew Benedict <sbenedict\\@mandrakesoft.com>"
+" ���� 2002 MandrakeSoft by Stew Benedict <sbenedict\\@mandrakesoft.com>"
-#: ../../standalone/drakbackup_.c:4818 ../../standalone/drakbackup_.c:4895
-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"
-" the Free Software Foundation; either version 2, or (at your option)\n"
-" any later version.\n"
-"\n"
-" This program is distributed in the hope that it will be useful,\n"
-" but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-" GNU General Public License for more details.\n"
-"\n"
-" You should have received a copy of the GNU General Public License\n"
-" along with this program; if not, write to the Free Software\n"
-" Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
-msgstr ""
-" �����������������; ���������·���, ���޸���\n"
-" ֻҪ���������� Free Software Foundation ��������������\n"
-" GNU General Public License ͨ�ù�������֤��2��, ����\n"
-" ���µİ汾��\n"
-"\n"
-" ���Ƿ������������ϣ��������,\n"
-" ���Dz��ṩ�κε���; ����֤��\n"
-" �ʺ��κ���ͨ���ض�����;��ϸ��\n"
-" �� GNU General Public License ͨ�ù�������֤��\n"
-"\n"
-" ��Ӧ����ͬ�������õ�һ�� GNU General Public License ͨ�ù�������֤\n"
-" ��Ҳ����д�Ÿ��������������, Ҫ�������ṩ,\n"
-" ��ַ�� Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, "
-"MA 02111-1307, USA."
-
-#: ../../standalone/drakbackup_.c:4832
+#: ../../standalone/drakbackup_.c:4732
msgid ""
"Description:\n"
"\n"
@@ -11626,7 +11901,6 @@ msgid ""
" Configuration file:\n"
"\t/etc/drakconf/drakbackup/drakbakup.conf\n"
"\n"
-"\n"
"Restore Step:\n"
" \n"
" During the restore step, DrakBackup will remove \n"
@@ -11642,17 +11916,17 @@ msgstr ""
" ������ʱ������ѡ�� \n"
"\t- ϵͳ�ļ�, \n"
"\t- �û��ļ�, \n"
-"\t- �����ļ�.\n"
+"\t- �����ļ���\n"
"\t��������ϵͳ ... ������ (�� Windows ����)\n"
"\n"
" Drakbackup ���Ա��ݵ�:\n"
"\t- Ӳ��.\n"
"\t- NFS.\n"
-"\t- CDROM (CDRW), DVDROM (�� autoboot, rescue �� autoinstall.)��\n"
+"\t- CDROM (CDRW), DVDROM (�� autoboot, rescue �� autoinstall)��\n"
"\t- FTP.\n"
"\t- Rsync.\n"
"\t- Webdav.\n"
-"\t- Tape.\n"
+"\t- �Ŵ�\n"
"\n"
" Drakbackup ���Իָ�����ϵͳ\n"
" ���û�ָ����Ŀ¼��\n"
@@ -11667,12 +11941,12 @@ msgstr ""
" \n"
" �ڻָ�������, Drakbackup ��\n"
" ɾ����ԭ���ĵ�Ŀ¼, ������֤\n"
-" �����ļ�û���ƻ�. ������\n"
-" �ڻָ�֮ǰ����һ�α���.\n"
+" �����ļ�û���ƻ���������\n"
+" �ڻָ�֮ǰ����һ�α��ݡ�\n"
" \n"
"\n"
-#: ../../standalone/drakbackup_.c:4870
+#: ../../standalone/drakbackup_.c:4769
msgid ""
"options description:\n"
"\n"
@@ -11690,7 +11964,7 @@ msgstr ""
"Ȼ�����������������\n"
"\n"
-#: ../../standalone/drakbackup_.c:4879
+#: ../../standalone/drakbackup_.c:4778
msgid ""
"\n"
"Restore Backup Problems:\n"
@@ -11711,192 +11985,86 @@ msgstr ""
"һ����Ҫ�ֹ��޸ı��������ļ���\n"
".\n"
-#: ../../standalone/drakbackup_.c:4909
-msgid ""
-"Description:\n"
-"\n"
-" Drakbackup is used to backup your system.\n"
-" During the configuration you can select \n"
-"\t- System files, \n"
-"\t- Users files, \n"
-"\t- Other files.\n"
-"\tor All your system ... and Other (like Windows Partitions)\n"
-"\n"
-" Drakbackup allows you to backup your system on:\n"
-"\t- Harddrive.\n"
-"\t- NFS.\n"
-"\t- CDROM (CDRW), DVDROM (with autoboot, rescue and autoinstall.).\n"
-"\t- FTP.\n"
-"\t- Rsync.\n"
-"\t- Webdav.\n"
-"\t- Tape.\n"
-"\n"
-" Drakbackup allows you to restore your system to\n"
-" a user selected directory.\n"
-"\n"
-" Per default all backup will be stored on your\n"
-" /var/lib/drakbackup directory\n"
-"\n"
-" Configuration file:\n"
-"\t/etc/drakconf/drakbackup/drakbakup.conf\n"
-"\n"
-"Restore Step:\n"
-" \n"
-" During the restore step, Drakbackup will remove\n"
-" your original directory and verify that all\n"
-" backup files are not corrupted. It is recommended\n"
-" you do a last backup before restoring.\n"
-" \n"
-"\n"
-msgstr ""
-"����:\n"
-"\n"
-" Drakbackup ���Ա�������ϵͳ��\n"
-" ������ʱ������ѡ�� \n"
-"\t- ϵͳ�ļ�, \n"
-"\t- �û��ļ�, \n"
-"\t- �����ļ�.\n"
-"\t��������ϵͳ ... ������ (�� Windows ����)\n"
-"\n"
-" Drakbackup ���Ա��ݵ�:\n"
-"\t- Ӳ�̡�\n"
-"\t- NFS��\n"
-"\t- CDROM (CDRW), DVDROM (�� autoboot, rescue �� autoinstall.)��\n"
-"\t- FTP��\n"
-"\t- Rsync��\n"
-"\t- Webdav��\n"
-"\t- Tape��\n"
-"\n"
-" Drakbackup ���Իָ�����ϵͳ\n"
-" ���û�ָ����Ŀ¼��\n"
-"\n"
-" Ĭ���趨���б��ݱ�����\n"
-" /var/lib/drakbackup directory\n"
-"\n"
-" �����ļ�:\n"
-"\t/etc/drakconf/drakbackup/drakbakup.conf\n"
-"\n"
-"�ָ�����:\n"
-" \n"
-" �ڻָ�������, Drakbackup ��\n"
-" ɾ����ԭ���ĵ�Ŀ¼, ������֤\n"
-" �����ļ�û���ƻ�. ������\n"
-" �ڻָ�֮ǰ����һ�α��ݡ�\n"
-" \n"
-"\n"
-
-#: ../../standalone/drakboot_.c:57
+#: ../../standalone/drakboot_.c:50
#, c-format
msgid "Installation of %s failed. The following error occured:"
msgstr "��װ %s ʧ��, �������д���:"
-#: ../../standalone/drakbug_.c:40
-#, c-format
-msgid ""
-"drakbug version %s\n"
-"Copyright (C) 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage: drakbug [OPTIONS] [PROGRAM_NAME]\n"
-"\n"
-"OPTIONS:\n"
-msgstr ""
-"drakbug �汾 %s\n"
-"Copyright (C) 2002 MandrakeSoft.\n"
-"����һ����������, ���԰��� GNU GPL ����֤�Ĺ涨�ٴη�����\n"
-"\n"
-"�÷�: drakbug [ѡ��] [������]\n"
-"\n"
-"ѡ��:\n"
-
-#: ../../standalone/drakbug_.c:47
-msgid " --help - print this help message.\n"
-msgstr " --help - �г����������Ϣ��\n"
-
-#: ../../standalone/drakbug_.c:48
-msgid " --report - program should be one of mandrake tools\n"
-msgstr " --report - ������ mandrake ��һ������\n"
-
-#: ../../standalone/drakbug_.c:49
-msgid " --incident - program should be one of mandrake tools\n"
-msgstr " --incident - ������һ�� mandrake �Ĺ���\n"
-
-#: ../../standalone/drakbug_.c:64
+#: ../../standalone/drakbug_.c:45
msgid "Mandrake Bug Report Tool"
msgstr "Mandrake ���ϱ��湤��"
-#: ../../standalone/drakbug_.c:70
+#: ../../standalone/drakbug_.c:50
msgid "First Time Wizard"
msgstr "����ʹ����"
-#: ../../standalone/drakbug_.c:71
+#: ../../standalone/drakbug_.c:51
msgid "Synchronization tool"
msgstr "ͬ������"
-#: ../../standalone/drakbug_.c:72 ../../standalone/drakbug_.c:86
-#: ../../standalone/drakbug_.c:156 ../../standalone/drakbug_.c:158
-#: ../../standalone/drakbug_.c:162
+#: ../../standalone/drakbug_.c:52 ../../standalone/drakbug_.c:66
+#: ../../standalone/drakbug_.c:133 ../../standalone/drakbug_.c:135
+#: ../../standalone/drakbug_.c:139
msgid "Standalone Tools"
msgstr "��������"
-#: ../../standalone/drakbug_.c:73
+#: ../../standalone/drakbug_.c:53
msgid "HardDrake"
msgstr "HardDrake"
-#: ../../standalone/drakbug_.c:74
+#: ../../standalone/drakbug_.c:54
msgid "Mandrake Online"
msgstr "Mandrake����"
-#: ../../standalone/drakbug_.c:75
+#: ../../standalone/drakbug_.c:55
msgid "Menudrake"
msgstr "Menudrake"
-#: ../../standalone/drakbug_.c:76
+#: ../../standalone/drakbug_.c:56
msgid "Msec"
msgstr "����"
-#: ../../standalone/drakbug_.c:77
+#: ../../standalone/drakbug_.c:57
msgid "Remote Control"
msgstr "Զ�̿���"
-#: ../../standalone/drakbug_.c:78
+#: ../../standalone/drakbug_.c:58
msgid "Software Manager"
msgstr "��������Ա"
-#: ../../standalone/drakbug_.c:79
+#: ../../standalone/drakbug_.c:59
msgid "Urpmi"
msgstr "Urpmi"
-#: ../../standalone/drakbug_.c:80
+#: ../../standalone/drakbug_.c:60
msgid "Windows Migration tool"
msgstr "Windows Ǩ�ƹ���"
-#: ../../standalone/drakbug_.c:81
+#: ../../standalone/drakbug_.c:61
msgid "Userdrake"
msgstr "Userdrakeħ���û�����"
-#: ../../standalone/drakbug_.c:82
+#: ../../standalone/drakbug_.c:62
msgid "Configuration Wizards"
msgstr "������"
-#: ../../standalone/drakbug_.c:97
+#: ../../standalone/drakbug_.c:75
msgid "Application:"
msgstr "Ӧ�ó���:"
-#: ../../standalone/drakbug_.c:98
+#: ../../standalone/drakbug_.c:76
msgid "Package: "
msgstr "������:"
-#: ../../standalone/drakbug_.c:99
+#: ../../standalone/drakbug_.c:77
msgid "Kernel:"
msgstr "�ں�:"
-#: ../../standalone/drakbug_.c:100
+#: ../../standalone/drakbug_.c:78
msgid "Release: "
msgstr "����: "
-#: ../../standalone/drakbug_.c:115
+#: ../../standalone/drakbug_.c:93
msgid ""
"\n"
"\n"
@@ -11911,144 +12079,150 @@ msgstr ""
"\n"
"Ҫ�ύ���ϱ���, ������水ť.\n"
"�����һ�����������, ���� https://drakbug.mandrakesoft.com\n"
-" ������һ��������Ҫ����д. ������ʾ����Ϣ���� \n"
-"���͵�������.\n"
+"������һ��������Ҫ����д��������ʾ����Ϣ����\n"
+"���͵���������\n"
"\n"
-#: ../../standalone/drakbug_.c:134
+#: ../../standalone/drakbug_.c:112
msgid "Report"
msgstr "����"
-#: ../../standalone/drakbug_.c:171
+#: ../../standalone/drakbug_.c:148
msgid "Not installed"
msgstr "û�а�װ"
-#: ../../standalone/drakbug_.c:189
+#: ../../standalone/drakbug_.c:160
+msgid "Package not installed"
+msgstr "��δ��װ"
+
+#: ../../standalone/drakbug_.c:173
msgid "connecting to Bugzilla wizard ..."
msgstr "���� Bugzilla ���ϱ����� ..."
-#: ../../standalone/drakbug_.c:196
+#: ../../standalone/drakbug_.c:180
msgid "No browser available! Please install one"
msgstr "û�п��õ������! �밲װһ��"
-#: ../../standalone/drakconnect_.c:79
+#: ../../standalone/drakconnect_.c:75
#, c-format
msgid "Network configuration (%d adapters)"
msgstr "��������(%d ����)"
-#: ../../standalone/drakconnect_.c:86 ../../standalone/drakconnect_.c:594
+#: ../../standalone/drakconnect_.c:83 ../../standalone/drakconnect_.c:591
msgid "Profile: "
msgstr "�����ļ�: "
-#: ../../standalone/drakconnect_.c:94
+#: ../../standalone/drakconnect_.c:91
msgid "Del profile..."
msgstr "ɾ�������ļ�..."
-#: ../../standalone/drakconnect_.c:100
+#: ../../standalone/drakconnect_.c:97
msgid "Profile to delete:"
msgstr "Ҫɾ���������ļ�:"
-#: ../../standalone/drakconnect_.c:128
+#: ../../standalone/drakconnect_.c:125
msgid "New profile..."
msgstr "�½������ļ�..."
-#: ../../standalone/drakconnect_.c:134
+#: ../../standalone/drakconnect_.c:131
msgid ""
"Name of the profile to create (the new profile is created as a copy of the "
"current one) :"
msgstr "�½�profile��:"
-#: ../../standalone/drakconnect_.c:160
+#: ../../standalone/drakconnect_.c:157
msgid "Hostname: "
msgstr "������:"
-#: ../../standalone/drakconnect_.c:167
+#: ../../standalone/drakconnect_.c:164
msgid "Internet access"
msgstr "����������"
-#: ../../standalone/drakconnect_.c:180
+#: ../../standalone/drakconnect_.c:177
msgid "Type:"
msgstr "����: "
-#: ../../standalone/drakconnect_.c:183 ../../standalone/drakconnect_.c:375
+#: ../../standalone/drakconnect_.c:180 ../../standalone/drakconnect_.c:372
msgid "Gateway:"
msgstr "����:"
-#: ../../standalone/drakconnect_.c:183 ../../standalone/drakconnect_.c:375
+#: ../../standalone/drakconnect_.c:180 ../../standalone/drakconnect_.c:372
msgid "Interface:"
msgstr "����:"
-#: ../../standalone/drakconnect_.c:194
+#: ../../standalone/drakconnect_.c:191
msgid "Status:"
msgstr "״̬:"
-#: ../../standalone/drakconnect_.c:201
+#: ../../standalone/drakconnect_.c:198 ../../standalone/net_monitor_.c:145
msgid "Wait please"
msgstr "���Ժ�"
-#: ../../standalone/drakconnect_.c:219
+#: ../../standalone/drakconnect_.c:216
msgid "Configure Internet Access..."
msgstr "�趨���������ʷ���..."
-#: ../../standalone/drakconnect_.c:226 ../../standalone/drakconnect_.c:448
+#: ../../standalone/drakconnect_.c:223 ../../standalone/drakconnect_.c:445
msgid "LAN configuration"
msgstr "����������"
-#: ../../standalone/drakconnect_.c:231
+#: ../../standalone/drakconnect_.c:228
msgid "Driver"
msgstr "��������"
-#: ../../standalone/drakconnect_.c:231
+#: ../../standalone/drakconnect_.c:228
msgid "Interface"
msgstr "�ӿ�"
-#: ../../standalone/drakconnect_.c:231
+#: ../../standalone/drakconnect_.c:228
msgid "Protocol"
msgstr "��"
-#: ../../standalone/drakconnect_.c:231
+#: ../../standalone/drakconnect_.c:228
msgid "State"
msgstr "״̬"
-#: ../../standalone/drakconnect_.c:243
+#: ../../standalone/drakconnect_.c:240
msgid "Configure Local Area Network..."
msgstr "���þ�������..."
-#: ../../standalone/drakconnect_.c:255
+#: ../../standalone/drakconnect_.c:252
msgid "Click here to launch the wizard ->"
msgstr "��������� ->"
-#: ../../standalone/drakconnect_.c:256
+#: ../../standalone/drakconnect_.c:253
msgid "Wizard..."
msgstr "��..."
-#: ../../standalone/drakconnect_.c:282
+#: ../../standalone/drakconnect_.c:279
msgid "Apply"
msgstr "Ӧ��"
-#: ../../standalone/drakconnect_.c:383 ../../standalone/drakconnect_.c:406
+#: ../../standalone/drakconnect_.c:380 ../../standalone/drakconnect_.c:403
+#: ../../standalone/net_monitor_.c:457
msgid "Connected"
msgstr "������"
-#: ../../standalone/drakconnect_.c:383 ../../standalone/drakconnect_.c:406
+#: ../../standalone/drakconnect_.c:380 ../../standalone/drakconnect_.c:403
+#: ../../standalone/net_monitor_.c:457
msgid "Not connected"
msgstr "���"
-#: ../../standalone/drakconnect_.c:384 ../../standalone/drakconnect_.c:407
+#: ../../standalone/drakconnect_.c:381 ../../standalone/drakconnect_.c:404
msgid "Connect..."
msgstr "����..."
-#: ../../standalone/drakconnect_.c:384 ../../standalone/drakconnect_.c:407
+#: ../../standalone/drakconnect_.c:381 ../../standalone/drakconnect_.c:404
msgid "Disconnect..."
msgstr "�Ͽ�..."
-#: ../../standalone/drakconnect_.c:403
+#: ../../standalone/drakconnect_.c:400
msgid ""
"Warning, another Internet connection has been detected, maybe using your "
"network"
msgstr "����, ��⵽����Ļ���������, ������ͨ����������"
-#: ../../standalone/drakconnect_.c:430
+#: ../../standalone/drakconnect_.c:427
msgid ""
"You don't have any configured interface.\n"
"Configure them first by clicking on 'Configure'"
@@ -12056,36 +12230,36 @@ msgstr ""
"��û�����úõĽӿڡ�\n"
"��������á������ýӿ�"
-#: ../../standalone/drakconnect_.c:452
+#: ../../standalone/drakconnect_.c:449
msgid "LAN Configuration"
msgstr "LAN ����"
-#: ../../standalone/drakconnect_.c:463
+#: ../../standalone/drakconnect_.c:460
#, c-format
msgid "Adapter %s: %s"
msgstr "������ %s: %s"
-#: ../../standalone/drakconnect_.c:469
+#: ../../standalone/drakconnect_.c:466
msgid "Boot Protocol"
msgstr "������"
-#: ../../standalone/drakconnect_.c:470
+#: ../../standalone/drakconnect_.c:467
msgid "Started on boot"
msgstr "����ʱ����"
-#: ../../standalone/drakconnect_.c:471
+#: ../../standalone/drakconnect_.c:468
msgid "DHCP client"
msgstr "DHCP�ͻ���"
-#: ../../standalone/drakconnect_.c:496 ../../standalone/drakconnect_.c:499
+#: ../../standalone/drakconnect_.c:493 ../../standalone/drakconnect_.c:496
msgid "activate now"
msgstr "���ڼ���"
-#: ../../standalone/drakconnect_.c:496 ../../standalone/drakconnect_.c:499
+#: ../../standalone/drakconnect_.c:493 ../../standalone/drakconnect_.c:496
msgid "deactivate now"
msgstr "���ڽ���"
-#: ../../standalone/drakconnect_.c:502
+#: ../../standalone/drakconnect_.c:499
msgid ""
"This interface has not been configured yet.\n"
"Launch the configuration wizard in the main window"
@@ -12093,129 +12267,125 @@ msgstr ""
"����ӿڻ�û�����ù���\n"
"������������������"
-#: ../../standalone/drakconnect_.c:559
+#: ../../standalone/drakconnect_.c:556
msgid ""
"You don't have any internet connection.\n"
"Create one first by clicking on 'Configure'"
msgstr ""
-"��û�����������ӡ�\n"
-"��������á��Ƚ�������"
+"��û�����������ӡ�\n"
+"��������á��Ƚ�������"
-#: ../../standalone/drakconnect_.c:583
+#: ../../standalone/drakconnect_.c:580
msgid "Internet connection configuration"
msgstr "��������������"
-#: ../../standalone/drakconnect_.c:587
+#: ../../standalone/drakconnect_.c:584
msgid "Internet Connection Configuration"
msgstr "��������������"
-#: ../../standalone/drakconnect_.c:596
+#: ../../standalone/drakconnect_.c:593 ../../standalone/net_monitor_.c:94
msgid "Connection type: "
msgstr "��������:"
-#: ../../standalone/drakconnect_.c:602
+#: ../../standalone/drakconnect_.c:599
msgid "Parameters"
msgstr "����"
-#: ../../standalone/drakconnect_.c:620
+#: ../../standalone/drakconnect_.c:618
msgid "Gateway"
msgstr "����"
-#: ../../standalone/drakconnect_.c:629
+#: ../../standalone/drakconnect_.c:627
msgid "Ethernet Card"
msgstr "����"
-#: ../../standalone/drakconnect_.c:630
+#: ../../standalone/drakconnect_.c:628
msgid "DHCP Client"
msgstr "DHCP�ͻ���"
-#: ../../standalone/drakfloppy_.c:64
-msgid "usage: drakfloppy\n"
-msgstr "�÷�: drakfloppy\n"
-
-#: ../../standalone/drakfloppy_.c:68
+#: ../../standalone/drakfloppy_.c:39
msgid "-misc-Fixed-Medium-r-*-*-*-140-*-*-*-*-*-*,*"
msgstr "-misc-Fixed-Medium-r-*-*-*-140-*-*-*-*-*-*,*"
-#: ../../standalone/drakfloppy_.c:69
+#: ../../standalone/drakfloppy_.c:40
msgid "Module name"
msgstr "ģ��"
-#: ../../standalone/drakfloppy_.c:69
+#: ../../standalone/drakfloppy_.c:40
msgid "Size"
msgstr "��С"
-#: ../../standalone/drakfloppy_.c:74
+#: ../../standalone/drakfloppy_.c:45
msgid "drakfloppy"
msgstr "drakfloppy"
-#: ../../standalone/drakfloppy_.c:91
+#: ../../standalone/drakfloppy_.c:63
msgid "boot disk creation"
msgstr "�����������̵Ĺ���"
-#: ../../standalone/drakfloppy_.c:99 ../../standalone/drakfloppy_.c:112
+#: ../../standalone/drakfloppy_.c:71 ../../standalone/drakfloppy_.c:84
msgid "default"
msgstr "Ĭ��"
-#: ../../standalone/drakfloppy_.c:115
+#: ../../standalone/drakfloppy_.c:87
#, c-format
msgid "DrakFloppy Error: %s"
msgstr "DrakFloppy ����: %s"
-#: ../../standalone/drakfloppy_.c:126
+#: ../../standalone/drakfloppy_.c:98
msgid "kernel version"
msgstr "�ں˰汾"
-#: ../../standalone/drakfloppy_.c:132
+#: ../../standalone/drakfloppy_.c:104
msgid "General"
msgstr "����"
-#: ../../standalone/drakfloppy_.c:137
+#: ../../standalone/drakfloppy_.c:109
msgid "Expert Area"
msgstr "ר��"
-#: ../../standalone/drakfloppy_.c:140
+#: ../../standalone/drakfloppy_.c:112
msgid "mkinitrd optional arguments"
msgstr "mkinitrdѡ��"
-#: ../../standalone/drakfloppy_.c:141
+#: ../../standalone/drakfloppy_.c:113
msgid "Add a module"
msgstr "����ģ��"
-#: ../../standalone/drakfloppy_.c:161
+#: ../../standalone/drakfloppy_.c:133
msgid "force"
msgstr "ǿ��"
-#: ../../standalone/drakfloppy_.c:162
+#: ../../standalone/drakfloppy_.c:134
msgid "if needed"
msgstr "����Ҫʱ"
-#: ../../standalone/drakfloppy_.c:163
+#: ../../standalone/drakfloppy_.c:135
msgid "omit scsi modules"
msgstr "ʡ�� scsi ģ��"
-#: ../../standalone/drakfloppy_.c:164
+#: ../../standalone/drakfloppy_.c:136
msgid "omit raid modules"
msgstr "ʡ�� RAID ģ��"
-#: ../../standalone/drakfloppy_.c:200
+#: ../../standalone/drakfloppy_.c:172
msgid "Remove a module"
msgstr "ж��ģ��"
-#: ../../standalone/drakfloppy_.c:222
+#: ../../standalone/drakfloppy_.c:194
msgid "Output"
msgstr "���"
-#: ../../standalone/drakfloppy_.c:234
+#: ../../standalone/drakfloppy_.c:206
msgid "Build the disk"
msgstr "��������������"
-#: ../../standalone/drakfloppy_.c:377
+#: ../../standalone/drakfloppy_.c:336
#, c-format
msgid "Be sure a media is present for the device %s"
msgstr "ȷ���豸 %s �Ľ��ʴ���"
-#: ../../standalone/drakfloppy_.c:382
+#: ../../standalone/drakfloppy_.c:341
#, c-format
msgid ""
"There is no medium or it is write-protected for device %s.\n"
@@ -12224,12 +12394,12 @@ msgstr ""
"�豸 %s ���ʲ����ڻ�д����.\n"
"��������."
-#: ../../standalone/drakfloppy_.c:384
+#: ../../standalone/drakfloppy_.c:344
#, c-format
msgid "Unable to fork: %s"
msgstr "�޷���������: %s"
-#: ../../standalone/drakfloppy_.c:388
+#: ../../standalone/drakfloppy_.c:349
#, c-format
msgid ""
"Unable to close properly mkbootdisk: \n"
@@ -12240,99 +12410,99 @@ msgstr ""
"%s \n"
"%s"
-#: ../../standalone/drakfont_.c:231
+#: ../../standalone/drakfont_.c:213
msgid "Search installed fonts"
msgstr "�����Ѱ�װ������"
-#: ../../standalone/drakfont_.c:233
+#: ../../standalone/drakfont_.c:215
msgid "Unselect fonts installed"
msgstr "��ѡ�Ѱ�װ���ļ�"
-#: ../../standalone/drakfont_.c:257
+#: ../../standalone/drakfont_.c:239
msgid "parse all fonts"
msgstr "������������"
-#: ../../standalone/drakfont_.c:260
+#: ../../standalone/drakfont_.c:242
msgid "no fonts found"
-msgstr "�Ҳ����ֿ��ļ�"
+msgstr "�Ҳ��������ļ�"
-#: ../../standalone/drakfont_.c:269 ../../standalone/drakfont_.c:323
-#: ../../standalone/drakfont_.c:379 ../../standalone/drakfont_.c:468
-#: ../../standalone/drakfont_.c:479 ../../standalone/drakfont_.c:506
-#: ../../standalone/drakfont_.c:520 ../../standalone/drakfont_.c:537
+#: ../../standalone/drakfont_.c:251 ../../standalone/drakfont_.c:305
+#: ../../standalone/drakfont_.c:361 ../../standalone/drakfont_.c:454
+#: ../../standalone/drakfont_.c:466 ../../standalone/drakfont_.c:493
+#: ../../standalone/drakfont_.c:514 ../../standalone/drakfont_.c:532
msgid "done"
msgstr "���"
-#: ../../standalone/drakfont_.c:275
+#: ../../standalone/drakfont_.c:257
msgid "could not find any font in your mounted partitions"
-msgstr "�ڷ������Ҳ����κ��ֿ�"
+msgstr "�ڷ������Ҳ����κ�����"
-#: ../../standalone/drakfont_.c:321
+#: ../../standalone/drakfont_.c:303
msgid "Reselect correct fonts"
msgstr "����ѡ����ȷ����"
-#: ../../standalone/drakfont_.c:325
+#: ../../standalone/drakfont_.c:307
msgid "could not find any font.\n"
-msgstr "�Ҳ����κ��ֿ�\n"
+msgstr "�Ҳ����κ�����\n"
-#: ../../standalone/drakfont_.c:349
+#: ../../standalone/drakfont_.c:331
msgid "Search fonts in installed list"
-msgstr "�ڰ�װ��¼�в����ֿ�"
+msgstr "�ڰ�װ��¼�в�������"
-#: ../../standalone/drakfont_.c:377
+#: ../../standalone/drakfont_.c:359
msgid "Fonts copy"
-msgstr "�����ֿ�"
+msgstr "��������"
-#: ../../standalone/drakfont_.c:381
+#: ../../standalone/drakfont_.c:363
msgid "True Type fonts installation"
msgstr "TrueType ���尲װ"
-#: ../../standalone/drakfont_.c:389
+#: ../../standalone/drakfont_.c:371
msgid "please wait during ttmkfdir..."
msgstr "�������� ttmkfdir..."
-#: ../../standalone/drakfont_.c:394
+#: ../../standalone/drakfont_.c:377
msgid "True Type install done"
msgstr "TrueType ���尲װ���"
-#: ../../standalone/drakfont_.c:403 ../../standalone/drakfont_.c:429
+#: ../../standalone/drakfont_.c:386 ../../standalone/drakfont_.c:413
msgid "Fonts conversion"
-msgstr "ת���ֿ�"
+msgstr "ת������"
-#: ../../standalone/drakfont_.c:409 ../../standalone/drakfont_.c:433
-#: ../../standalone/drakfont_.c:464
+#: ../../standalone/drakfont_.c:392 ../../standalone/drakfont_.c:417
+#: ../../standalone/drakfont_.c:450
msgid "type1inst building"
msgstr "���ڹ��� type1inst"
-#: ../../standalone/drakfont_.c:419 ../../standalone/drakfont_.c:442
+#: ../../standalone/drakfont_.c:403 ../../standalone/drakfont_.c:427
msgid "Ghostscript referencing"
msgstr "Ghostscript ����"
-#: ../../standalone/drakfont_.c:452
+#: ../../standalone/drakfont_.c:437
msgid "ttf fonts conversion"
-msgstr "ttf �ֿ�ת��"
+msgstr "ttf ����ת��"
-#: ../../standalone/drakfont_.c:459
+#: ../../standalone/drakfont_.c:444
msgid "pfm fonts conversion"
-msgstr "pfm �ֿ�ת��"
+msgstr "pfm ����ת��"
-#: ../../standalone/drakfont_.c:470
+#: ../../standalone/drakfont_.c:456
msgid "Suppress temporary Files"
msgstr "ɾ����ʱ�ļ�"
-#: ../../standalone/drakfont_.c:473
+#: ../../standalone/drakfont_.c:459
msgid "Restart XFS"
msgstr "�������� XFS"
-#: ../../standalone/drakfont_.c:518 ../../standalone/drakfont_.c:532
+#: ../../standalone/drakfont_.c:512 ../../standalone/drakfont_.c:526
msgid "Suppress Fonts Files"
-msgstr "ɾ���ֿ��ļ�"
+msgstr "ɾ�������ļ�"
-#: ../../standalone/drakfont_.c:534
+#: ../../standalone/drakfont_.c:528
msgid "xfs restart"
msgstr "xfs restart"
-#: ../../standalone/drakfont_.c:542 ../../standalone/drakfont_.c:951
+#: ../../standalone/drakfont_.c:536 ../../standalone/drakfont_.c:902
msgid ""
"Before installing any fonts, be sure that you have the right to use and "
"install them on your system.\n"
@@ -12344,111 +12514,275 @@ msgstr ""
"\n"
"-ͨ�����尲װ�����������С����к���������, ������������ʹ X ��ס��"
-#: ../../standalone/drakfont_.c:630
+#: ../../standalone/drakfont_.c:621
msgid "Fonts Importation"
-msgstr "�����ֿ�"
+msgstr "���嵼��"
-#: ../../standalone/drakfont_.c:660
+#: ../../standalone/drakfont_.c:650
msgid "Get Windows Fonts"
-msgstr "���� Windows �ֿ�"
+msgstr "��� Windows ����"
-#: ../../standalone/drakfont_.c:668
+#: ../../standalone/drakfont_.c:658
msgid "Uninstall Fonts"
-msgstr "ж���ֿ�"
+msgstr "�����"
-#: ../../standalone/drakfont_.c:679
+#: ../../standalone/drakfont_.c:669
msgid "Advanced Options"
msgstr "�߼�ѡ��"
-#: ../../standalone/drakfont_.c:687
+#: ../../standalone/drakfont_.c:677
msgid "Font List"
-msgstr "�����ֿ�"
+msgstr "�����б�"
-#: ../../standalone/drakfont_.c:909
+#: ../../standalone/drakfont_.c:737
+msgid ""
+"\n"
+" Copyright (C) 2001-2002 by MandrakeSoft \n"
+"\tDUPONT Sebastien sdupont\\@mandrakesoft.com\n"
+"\n"
+" 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"
+" the Free Software Foundation; either version 2, or (at your option)\n"
+" any later version.\n"
+"\n"
+" This program is distributed in the hope that it will be useful,\n"
+" but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
+" GNU General Public License for more details.\n"
+"\n"
+" You should have received a copy of the GNU General Public License\n"
+" along with this program; if not, write to the Free Software\n"
+" Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"\n"
+" Thanks:\n"
+" - pfm2afm: \n"
+"\t by Ken Borgendale:\n"
+"\t Convert a Windows .pfm file to a .afm (Adobe Font Metrics)\n"
+" - type1inst:\n"
+"\t by James Macnicol: \n"
+"\t type1inst generates files fonts.dir fonts.scale & Fontmap.\n"
+" - ttf2pt1: \n"
+"\t by Andrew Weeks, Frank Siegert, Thomas Henlich, Sergey Babkin \n"
+" Convert ttf font files to afm and pfb fonts\n"
+"\n"
+"\n"
+msgstr ""
+"\n"
+" ��Ȩ (C) 2001-2002 by MandrakeSoft \n"
+"\tDUPONT Sebastien sdupont\\@mandrakesoft.com\n"
+"\n"
+" �����������������; ���������·���, ���޸���\n"
+" ֻҪ���������� Free Software Foundation ��������������\n"
+" GNU General Public License ͨ�ù�������֤��2��, ����\n"
+" ���µİ汾��\n"
+"\n"
+" ���Ƿ������������ϣ��������,\n"
+" ���Dz��ṩ�κε���; ����֤��\n"
+" �ʺ��κ���ͨ���ض�����;��ϸ��\n"
+" �� GNU General Public License ͨ�ù�������֤��\n"
+"\n"
+" ��Ӧ����ͬ�������õ�һ�� GNU General Public License ͨ�ù�������֤\n"
+" ��Ҳ����д�Ÿ��������������, Ҫ�������ṩ,\n"
+" ��ַ�� Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, "
+"MA 02111-1307, USA.\n"
+"\n"
+" ��л:\n"
+" - pfm2afm: \n"
+"\t ���� Ken Borgendale:\n"
+"\t �� Windows .pfm �ļ�ת��Ϊ .afm (Adobe Font Metrics)\n"
+" - type1inst:\n"
+"\t ���� James Macnicol: \n"
+"\t type1inst �����ļ� fonts.dir fonts.scale �� Fontmap��\n"
+" - ttf2pt1: \n"
+"\t ���� Andrew Weeks, Frank Siegert, Thomas Henlich, Sergey Babkin\n"
+"\t �� ttf �����ļ�ת��Ϊ afm �� pfb ����\n"
+"\n"
+"\n"
+
+#: ../../standalone/drakfont_.c:793
+msgid ""
+"drakfont Future Overview\n"
+" - Fonts import:\n"
+" pfb ( Adobe Type 1 binary )\n"
+" pfa ( Adobe Type 1 ASCII )\n"
+" ttf ( True-Type )\n"
+" pcf.gz\n"
+" Speedo\n"
+" and Bitmap (PCF, BDF, and SNF)\n"
+" - Features\n"
+" - Install fonts from any directory\n"
+" - Get windows fonts on any vfat partitions\n"
+" - Get fonts on any partitions.\n"
+" - UN-installation of any fonts (even if not installed "
+"through drakfont)\n"
+" - Support\n"
+" - Xfs\n"
+" - ghostscript & printer\n"
+" - Staroffice & printer\n"
+" - abiword\n"
+"\t - netscape\n"
+" - Koffice, Gnumeric, ... studying\n"
+" - all fonts supported by printer\n"
+" - anti-aliases by RENDER in Xfree86 .... \n"
+"\t\t\t\tsupported by KDE.\n"
+"\t\t\t\twill be supported by gnome 1.2.\n"
+"Visual Interface:\n"
+" Window interface:\n"
+" - Fontselectiondialog widget\n"
+" - Command buttons under Fontselectiondialog (like the actual "
+"frontend).\n"
+" Commands buttons:\n"
+" - import from windows partition.\n"
+" import from all fat32 partitions and look for winnt/windows/"
+"font\n"
+" and import all (delete doublon) but don't import if already "
+"exist.\n"
+" - import from directory\n"
+" look for if it exist before for each font and not delete the "
+"original.\n"
+" (replace all, no, none)\n"
+" expert options:\n"
+" ask the directory, and look for if it exist before\n"
+" if it exist ask: (replace all, no, none)\n"
+" - uninstall with list per font type\n"
+" Expert additional switch\n"
+" - option support: ghostscript, Staroffice, etc...\n"
+" check-button. (by default all check)\n"
+" - Printer Application Fonts Support...\n"
+"\n"
+"\n"
+msgstr ""
+"drakfont ǰ��Ԥ��\n"
+" - ���嵼��:\n"
+" pfb ( Adobe Type 1 binary )\n"
+" pfa ( Adobe Type 1 ASCII )\n"
+" ttf ( True-Type )\n"
+" pcf.gz\n"
+" Speedo\n"
+" ��λͼ(PCF, BDF �� SNF)\n"
+" - ����\n"
+" - ���κ�Ŀ¼��װ����\n"
+" - ���λ���κ� vfat �����ϵ� Windows ����\n"
+" - ���λ���κη����ϵ����塣\n"
+" - ж���κ�����(��������ͨ�� drakfont ��װ��)\n"
+" - ֧��\n"
+" - Xfs\n"
+" - ghostscript & printer\n"
+" - Staroffice & printer\n"
+" - abiword\n"
+" - netscape\n"
+" - Koffice, Gnumeric, ... �����о�\n"
+" - ��ӡ��֧�ֵ���������\n"
+" - XFree86 ��ѡȾ�ķ����Ч��....\n"
+"\t\t\t\tKDE ֧�֡�\n"
+"\t\t\t\tgnome 1.2 Ҳ֧�֡�\n"
+"���ӻ�����:\n"
+" ���ڽ���:\n"
+" - ����ѡ��Ի��򲿼�\n"
+" - ����ѡ��Ի����µ����ť(����ʵ�ʵ�ǰ��)��\n"
+" ���ť:\n"
+" - �� Windows �������롣\n"
+" ������ FAT32 �������, ���� Winnt/Windows ����\n"
+" ����������û�е����������(ɾ���ظ���)��\n"
+" - ��Ŀ¼����\n"
+" ����ÿ������ǰ���Ҹ������Ƿ��Ѿ�����, �Ƿ�ɾ��ԭ���ġ�\n"
+" (ȫ���滻, ��, ��)\n"
+" ר��ѡ��:\n"
+" ѯ��Ŀ¼, �Ȳ����Ƿ����\n"
+" ���Ѵ�����ѯ��: (ȫ���滻, ��, ��)\n"
+" - ж��ÿ���������͵��б�\n"
+" ר�Ҷ��⿪��\n"
+" - ѡ��֧��: ghostscript, Staroffice, �ȵ�...\n"
+" ��ѡ��(Ĭ��ȫ��ѡ��)\n"
+" - ��ӡ����������֧��...\n"
+"\n"
+"\n"
+
+#: ../../standalone/drakfont_.c:862
msgid "Choose the applications that will support the fonts:"
-msgstr "��ѡ��ʹ���������Ӧ�ó���:"
+msgstr "��ѡ��֧�������Ӧ�ó���:"
-#: ../../standalone/drakfont_.c:918
+#: ../../standalone/drakfont_.c:870
msgid "Ghostscript"
msgstr "Ghostscript"
-#: ../../standalone/drakfont_.c:925
+#: ../../standalone/drakfont_.c:877
msgid "StarOffice"
msgstr "StarOffice"
-#: ../../standalone/drakfont_.c:932
+#: ../../standalone/drakfont_.c:884
msgid "Abiword"
msgstr "Abiword"
-#: ../../standalone/drakfont_.c:939
+#: ../../standalone/drakfont_.c:891
msgid "Generic Printers"
msgstr "������ӡ"
-#: ../../standalone/drakfont_.c:1016
+#: ../../standalone/drakfont_.c:958
msgid "Select the font file or directory and click on 'Add'"
msgstr "ѡ�������ļ���Ŀ¼, Ȼ���������ӡ�"
-#: ../../standalone/drakfont_.c:1063
+#: ../../standalone/drakfont_.c:1005
msgid "Install List"
msgstr "��װ�б�"
-#: ../../standalone/drakfont_.c:1106
+#: ../../standalone/drakfont_.c:1048
msgid "click here if you are sure."
msgstr "ȷ��"
-#: ../../standalone/drakfont_.c:1113
+#: ../../standalone/drakfont_.c:1055
msgid "here if no."
msgstr "����"
-#: ../../standalone/drakfont_.c:1174
+#: ../../standalone/drakfont_.c:1112
msgid "Unselected All"
msgstr "ȡ��ѡ��"
-#: ../../standalone/drakfont_.c:1178
+#: ../../standalone/drakfont_.c:1116
msgid "Selected All"
msgstr "ѡ������"
-#: ../../standalone/drakfont_.c:1182
+#: ../../standalone/drakfont_.c:1120
msgid "Remove List"
msgstr "ɾ���б�"
-#: ../../standalone/drakfont_.c:1204 ../../standalone/drakfont_.c:1237
+#: ../../standalone/drakfont_.c:1142 ../../standalone/drakfont_.c:1175
msgid "Initials tests"
msgstr "��ʼ����"
-#: ../../standalone/drakfont_.c:1207
+#: ../../standalone/drakfont_.c:1145
msgid "Copy fonts on your system"
-msgstr "�����ֿ�"
+msgstr "����ϵͳ�е�����"
-#: ../../standalone/drakfont_.c:1211
+#: ../../standalone/drakfont_.c:1149
msgid "Install & convert Fonts"
-msgstr "��װ��ת���ֿ�"
+msgstr "��װ��ת������"
-#: ../../standalone/drakfont_.c:1215
+#: ../../standalone/drakfont_.c:1153
msgid "Post Install"
msgstr "��װ����趨"
-#: ../../standalone/drakfont_.c:1240
+#: ../../standalone/drakfont_.c:1178
msgid "Remove fonts on your system"
-msgstr "ɾ���ֿ�"
+msgstr "ɾ��ϵͳ�е�����"
-#: ../../standalone/drakfont_.c:1244
+#: ../../standalone/drakfont_.c:1182
msgid "Post Uninstall"
msgstr "ɾ������趨"
-#: ../../standalone/drakgw_.c:43 ../../standalone/drakgw_.c:184
+#: ../../standalone/drakgw_.c:42 ../../standalone/drakgw_.c:182
msgid "Internet Connection Sharing"
msgstr "��������������"
-#: ../../standalone/drakgw_.c:115
+#: ../../standalone/drakgw_.c:114
msgid "Sorry, we support only 2.4 kernels."
msgstr "�Բ���, ����ֻ֧�� 2.4 �ںˡ�"
-#: ../../standalone/drakgw_.c:126
+#: ../../standalone/drakgw_.c:125
msgid "Internet Connection Sharing currently enabled"
-msgstr "���������ӹ��������Ѿ�����"
+msgstr "���������ӹ��������Ѿ�����"
-#: ../../standalone/drakgw_.c:127
+#: ../../standalone/drakgw_.c:126
msgid ""
"The setup of Internet connection sharing has already been done.\n"
"It's currently enabled.\n"
@@ -12456,35 +12790,35 @@ msgid ""
"What would you like to do?"
msgstr ""
"���������ӹ������趨�Ѿ���ɡ�\n"
-"����ǰ�Ѿ���������\n"
+"����ǰ�Ѿ������á�\n"
"\n"
"��Ҫ��ʲô?"
-#: ../../standalone/drakgw_.c:131
+#: ../../standalone/drakgw_.c:130
msgid "disable"
-msgstr "��ֹ"
+msgstr "����"
-#: ../../standalone/drakgw_.c:131 ../../standalone/drakgw_.c:156
+#: ../../standalone/drakgw_.c:130 ../../standalone/drakgw_.c:154
msgid "dismiss"
msgstr "�뿪"
-#: ../../standalone/drakgw_.c:131 ../../standalone/drakgw_.c:156
+#: ../../standalone/drakgw_.c:130 ../../standalone/drakgw_.c:154
msgid "reconfigure"
msgstr "��������"
-#: ../../standalone/drakgw_.c:134
+#: ../../standalone/drakgw_.c:133
msgid "Disabling servers..."
-msgstr "ֹͣ����..."
+msgstr "���ڽ��÷�����..."
#: ../../standalone/drakgw_.c:142
msgid "Internet connection sharing is now disabled."
-msgstr "���������ӹ������ڱ���ֹ�ˡ�"
+msgstr "���������ӹ������ڱ������ˡ�"
-#: ../../standalone/drakgw_.c:151
+#: ../../standalone/drakgw_.c:149
msgid "Internet Connection Sharing currently disabled"
-msgstr "���������ӹ������ڱ���ֹ"
+msgstr "���������ӹ������ڱ�����"
-#: ../../standalone/drakgw_.c:152
+#: ../../standalone/drakgw_.c:150
msgid ""
"The setup of Internet connection sharing has already been done.\n"
"It's currently disabled.\n"
@@ -12492,23 +12826,23 @@ msgid ""
"What would you like to do?"
msgstr ""
"���������ӹ������趨�Ѿ���ɡ�\n"
-"����ǰ�Ѿ�����ֹ.\n"
+"����ǰ�Ѿ������á�\n"
"\n"
"��Ҫ��ʲô?"
-#: ../../standalone/drakgw_.c:156
+#: ../../standalone/drakgw_.c:154
msgid "enable"
-msgstr "����"
+msgstr "����"
-#: ../../standalone/drakgw_.c:163
+#: ../../standalone/drakgw_.c:161
msgid "Enabling servers..."
-msgstr "��������..."
+msgstr "�������÷�����..."
-#: ../../standalone/drakgw_.c:168
+#: ../../standalone/drakgw_.c:166
msgid "Internet connection sharing is now enabled."
-msgstr "���������ӹ��������Ѿ����"
+msgstr "���������ӹ��������Ѿ����á�"
-#: ../../standalone/drakgw_.c:185
+#: ../../standalone/drakgw_.c:183
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 "
@@ -12527,31 +12861,31 @@ msgstr ""
"\n"
"ע��: ��������ҪһƬר�õ��������þ�����(LAN)��"
-#: ../../standalone/drakgw_.c:213
+#: ../../standalone/drakgw_.c:211
#, c-format
msgid "Interface %s (using module %s)"
msgstr "���� %s (ʹ�� %s ģ��)"
-#: ../../standalone/drakgw_.c:214
+#: ../../standalone/drakgw_.c:212
#, c-format
msgid "Interface %s"
msgstr "���� %s"
-#: ../../standalone/drakgw_.c:222
+#: ../../standalone/drakgw_.c:220
msgid "No network adapter on your system!"
msgstr "��ϵͳ��û�����翨!"
-#: ../../standalone/drakgw_.c:223
+#: ../../standalone/drakgw_.c:221
msgid ""
"No ethernet network adapter has been detected on your system. Please run the "
"hardware configuration tool."
msgstr "����ϵͳ��û��������̫������������Ӳ�����ù��ߡ�"
-#: ../../standalone/drakgw_.c:229
+#: ../../standalone/drakgw_.c:227
msgid "Network interface"
msgstr "����ӿڿ�"
-#: ../../standalone/drakgw_.c:230
+#: ../../standalone/drakgw_.c:228
#, c-format
msgid ""
"There is only one configured network adapter on your system:\n"
@@ -12566,17 +12900,17 @@ msgstr ""
"\n"
"����������������ľ�������"
-#: ../../standalone/drakgw_.c:239
+#: ../../standalone/drakgw_.c:235
msgid ""
"Please choose what network adapter will be connected to your Local Area "
"Network."
msgstr "��ѡ���ĸ��������������ľ�������"
-#: ../../standalone/drakgw_.c:265
+#: ../../standalone/drakgw_.c:261
msgid "Network interface already configured"
msgstr "�������������"
-#: ../../standalone/drakgw_.c:266
+#: ../../standalone/drakgw_.c:262
#, c-format
msgid ""
"Warning, the network adapter (%s) is already configured.\n"
@@ -12585,21 +12919,29 @@ msgid ""
"\n"
"You can do it manually but you need to know what you're doing."
msgstr ""
-"����,���� (%s) �Ѿ����ù���\n"
+"����, ���� (%s) �Ѿ����ù���\n"
"\n"
"��ϣ���Զ�����������?\n"
"\n"
"�����֪��������, Ҳ�����ֹ����á�"
-#: ../../standalone/drakgw_.c:271
+#: ../../standalone/drakgw_.c:267
msgid "Automatic reconfiguration"
msgstr "�Զ���������"
-#: ../../standalone/drakgw_.c:272
+#: ../../standalone/drakgw_.c:267
+msgid "No (experts only)"
+msgstr "�� (����ר��)"
+
+#: ../../standalone/drakgw_.c:268
msgid "Show current interface configuration"
-msgstr "�޸ĵ�ǰ������������"
+msgstr "�޸ĵ�ǰ����ӿڵ�����"
+
+#: ../../standalone/drakgw_.c:269
+msgid "Current interface configuration"
+msgstr "��ǰ�ӿ�����"
-#: ../../standalone/drakgw_.c:274
+#: ../../standalone/drakgw_.c:270
#, c-format
msgid ""
"Current configuration of `%s':\n"
@@ -12609,14 +12951,14 @@ msgid ""
"IP attribution: %s\n"
"Driver: %s"
msgstr ""
-"��ǰ�� `%s' ����Ϊ:\n"
+"��%s���ĵ�ǰ����:\n"
"\n"
"����: %s\n"
"IP ��ַ: %s\n"
"IP ����: %s\n"
"����: %s"
-#: ../../standalone/drakgw_.c:287
+#: ../../standalone/drakgw_.c:283
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 Network that you use "
@@ -12625,7 +12967,7 @@ msgid ""
"\n"
"The default DNS entry is the Caching Nameserver configured on the firewall. "
"You can replace that with your ISP DNS IP, for example.\n"
-"\n"
+"\t\t \n"
"Else, I can reconfigure your interface and (re)configure a DHCP server for "
"you.\n"
"\n"
@@ -12640,11 +12982,11 @@ msgstr ""
"�����Ҿͻ������������Ľӿڲ�����Ϊ������ DHCP ��������\n"
"\n"
-#: ../../standalone/drakgw_.c:294
+#: ../../standalone/drakgw_.c:290
msgid "Local Network adress"
msgstr "���������ַ"
-#: ../../standalone/drakgw_.c:298
+#: ../../standalone/drakgw_.c:294
msgid ""
"DHCP Server Configuration.\n"
"\n"
@@ -12658,61 +13000,61 @@ msgstr ""
"�������֪��ѡ��ĺ��壬��ô�Ͳ��ؽ����޸ġ�\n"
"\n"
-#: ../../standalone/drakgw_.c:304
+#: ../../standalone/drakgw_.c:300
msgid "(This) DHCP Server IP"
msgstr "DHCP ������ IP"
-#: ../../standalone/drakgw_.c:305
+#: ../../standalone/drakgw_.c:301
msgid "The DNS Server IP"
msgstr "DNS ������ IP"
-#: ../../standalone/drakgw_.c:306
+#: ../../standalone/drakgw_.c:302
msgid "The internal domain name"
msgstr "�ڲ�����"
-#: ../../standalone/drakgw_.c:307
+#: ../../standalone/drakgw_.c:303
msgid "The DHCP start range"
msgstr "DHCP ��ʼ��Χ"
-#: ../../standalone/drakgw_.c:308
+#: ../../standalone/drakgw_.c:304
msgid "The DHCP end range"
msgstr "DHCP ��ֹ��Χ"
-#: ../../standalone/drakgw_.c:309
+#: ../../standalone/drakgw_.c:305
msgid "The default lease (in seconds)"
msgstr "Ĭ������(����Ϊ��λ)"
-#: ../../standalone/drakgw_.c:310
+#: ../../standalone/drakgw_.c:306
msgid "The maximum lease (in seconds)"
msgstr "�����(����Ϊ��λ)"
-#: ../../standalone/drakgw_.c:311
+#: ../../standalone/drakgw_.c:307
msgid "Re-configure interface and DHCP server"
msgstr "���������������� DHCP "
-#: ../../standalone/drakgw_.c:318
+#: ../../standalone/drakgw_.c:314
msgid "The Local Network did not finish with `.0', bailing out."
msgstr "��������û����`.0'����, �Ѿ��޸�"
-#: ../../standalone/drakgw_.c:329
+#: ../../standalone/drakgw_.c:325
#, c-format
msgid "Potential LAN address conflict found in current config of %s!\n"
msgstr "�ڵ�ǰ�� %s �����з��ֿ��ܵ� LAN ��ַ��ͻ! \n"
-#: ../../standalone/drakgw_.c:339
+#: ../../standalone/drakgw_.c:335
msgid "Configuring..."
msgstr "��������..."
-#: ../../standalone/drakgw_.c:340
+#: ../../standalone/drakgw_.c:336
msgid "Configuring scripts, installing software, starting servers..."
msgstr "�������ýű�, ��װ����, ����������� ..."
-#: ../../standalone/drakgw_.c:376
+#: ../../standalone/drakgw_.c:372
#, c-format
msgid "Problems installing package %s"
msgstr "��װ %s ��������������"
-#: ../../standalone/drakgw_.c:509
+#: ../../standalone/drakgw_.c:505
msgid ""
"Everything has been configured.\n"
"You may now share Internet connection with other computers on your Local "
@@ -12722,23 +13064,23 @@ msgstr ""
"�����ڿ��������Զ��������� (DHCP).�����ľ������������ĵ��Թ������Ļ���������"
"��."
-#: ../../standalone/drakgw_.c:528
+#: ../../standalone/drakgw_.c:523
msgid "The setup has already been done, but it's currently disabled."
-msgstr "�����Ѿ���ɡ�����ǰ�Ѿ�����ֹ��"
+msgstr "�����Ѿ���ɡ�����ǰ�Ѿ������á�"
-#: ../../standalone/drakgw_.c:529
+#: ../../standalone/drakgw_.c:524
msgid "The setup has already been done, and it's currently enabled."
-msgstr "�����Ѿ���ɡ�����ǰ�Ѿ���������"
+msgstr "�����Ѿ���ɡ�����ǰ�Ѿ������á�"
-#: ../../standalone/drakgw_.c:530
+#: ../../standalone/drakgw_.c:525
msgid "No Internet Connection Sharing has ever been configured."
-msgstr "���������ӹ���û������"
+msgstr "���������ӹ���û�����á�"
-#: ../../standalone/drakgw_.c:535
+#: ../../standalone/drakgw_.c:531
msgid "Internet connection sharing configuration"
msgstr "���������ӹ�������"
-#: ../../standalone/drakgw_.c:542
+#: ../../standalone/drakgw_.c:539
#, c-format
msgid ""
"Welcome to the Internet Connection Sharing utility!\n"
@@ -12747,53 +13089,53 @@ msgid ""
"\n"
"Click on Configure to launch the setup wizard."
msgstr ""
-"��ӭʹ�û��������ӹ�������!\n"
+"��ӭʹ�û��������ӹ������ù���!\n"
"\n"
"%s\n"
"\n"
"��������á����������򵼡�"
-#: ../../standalone/drakperm_.c:42
+#: ../../standalone/drakperm_.c:36
msgid "group"
msgstr "��"
-#: ../../standalone/drakperm_.c:42
+#: ../../standalone/drakperm_.c:36
msgid "path"
msgstr "·��"
-#: ../../standalone/drakperm_.c:42
+#: ../../standalone/drakperm_.c:36
msgid "permissions"
msgstr "Ȩ��"
-#: ../../standalone/drakperm_.c:42
+#: ../../standalone/drakperm_.c:36
msgid "user"
msgstr "�û�"
-#: ../../standalone/drakperm_.c:49
+#: ../../standalone/drakperm_.c:43
msgid "Up"
msgstr "���"
-#: ../../standalone/drakperm_.c:50
+#: ../../standalone/drakperm_.c:44
msgid "delete"
msgstr "ɾ��"
-#: ../../standalone/drakperm_.c:51
+#: ../../standalone/drakperm_.c:45
msgid "edit"
msgstr "�༭"
-#: ../../standalone/drakperm_.c:52
+#: ../../standalone/drakperm_.c:46
msgid "Down"
msgstr "����"
-#: ../../standalone/drakperm_.c:53
+#: ../../standalone/drakperm_.c:47
msgid "add a rule"
msgstr "���ӹ���"
-#: ../../standalone/drakperm_.c:54
+#: ../../standalone/drakperm_.c:48
msgid "select perm file to see/edit"
msgstr "��ѡҪ�鿴/�޸ĵ�Ȩ�޶����ļ�"
-#: ../../standalone/drakperm_.c:57
+#: ../../standalone/drakperm_.c:51
msgid ""
"Drakperm is used to see files to use in order to fix permissions, owners, "
"and groups via msec.\n"
@@ -12803,59 +13145,59 @@ msgstr ""
"��ȡ�\n"
"�����Ա�д�Լ��Ĺ����Դ������Ĭ�ϵĹ���"
-#: ../../standalone/drakperm_.c:62
+#: ../../standalone/drakperm_.c:56
msgid "Add a new rule at the end"
msgstr "��ĩβ�����µĹ���"
-#: ../../standalone/drakperm_.c:63
+#: ../../standalone/drakperm_.c:57
msgid "Edit curent rule"
msgstr "�༭��ǰ�Ĺ���"
-#: ../../standalone/drakperm_.c:64
+#: ../../standalone/drakperm_.c:58
msgid "Up selected rule one level"
msgstr "��ѡ�еĹ������һ��"
-#: ../../standalone/drakperm_.c:65
+#: ../../standalone/drakperm_.c:59
msgid "Down selected rule one level"
msgstr "��ѡ�еĹ��򽵵�һ��"
-#: ../../standalone/drakperm_.c:66
+#: ../../standalone/drakperm_.c:60
msgid "Delete selected rule"
msgstr "ɾ��ѡ�еĹ���"
-#: ../../standalone/drakperm_.c:237
+#: ../../standalone/drakperm_.c:224
msgid "browse"
msgstr "���"
-#: ../../standalone/drakperm_.c:244
+#: ../../standalone/drakperm_.c:231
msgid "Current user"
msgstr "��ǰ�û�"
-#: ../../standalone/drakperm_.c:249
+#: ../../standalone/drakperm_.c:236
msgid "Permissions"
msgstr "Ȩ��"
-#: ../../standalone/drakperm_.c:250
+#: ../../standalone/drakperm_.c:237
msgid "Path"
msgstr "·��"
-#: ../../standalone/drakperm_.c:251
+#: ../../standalone/drakperm_.c:238
msgid "Property"
msgstr "����Ȩ"
-#: ../../standalone/drakperm_.c:253
+#: ../../standalone/drakperm_.c:240
msgid "sticky-bit"
msgstr "sticky-bit"
-#: ../../standalone/drakperm_.c:254
+#: ../../standalone/drakperm_.c:241
msgid "Set-UID"
msgstr "Set-UID"
-#: ../../standalone/drakperm_.c:255
+#: ../../standalone/drakperm_.c:242
msgid "Set-GID"
msgstr "Set-GID"
-#: ../../standalone/drakperm_.c:310
+#: ../../standalone/drakperm_.c:296
msgid ""
"Used for directory:\n"
" only owner of directory or file in this directory can delete it"
@@ -12863,35 +13205,35 @@ msgstr ""
"����Ŀ¼:\n"
" ֻ��Ŀ¼�������߻�Ŀ¼���ļ��������߿���ɾ����"
-#: ../../standalone/drakperm_.c:311
+#: ../../standalone/drakperm_.c:297
msgid "Use owner id for execution"
msgstr "ʹ�������� ID ִ��"
-#: ../../standalone/drakperm_.c:312
+#: ../../standalone/drakperm_.c:298
msgid "Use group id for execution"
msgstr "ʹ���� ID ִ��"
-#: ../../standalone/drakperm_.c:313
+#: ../../standalone/drakperm_.c:299
msgid "when checked, owner and group won't be changed"
msgstr "ѡ�����ܸı������ߺ���"
-#: ../../standalone/drakperm_.c:318
+#: ../../standalone/drakperm_.c:304
msgid "Path selection"
msgstr "ѡ��·��"
-#: ../../standalone/drakperm_.c:364
+#: ../../standalone/drakperm_.c:350
msgid "user :"
msgstr "�û� :"
-#: ../../standalone/drakperm_.c:366
+#: ../../standalone/drakperm_.c:352
msgid "group :"
msgstr "�� :"
-#: ../../standalone/draksound_.c:47
+#: ../../standalone/draksound_.c:46
msgid "No Sound Card detected!"
msgstr "û�з�������!"
-#: ../../standalone/draksound_.c:48
+#: ../../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"
@@ -12909,9 +13251,9 @@ msgstr ""
"�����Է���Ӳ�����ݿ�:\n"
"\n"
"\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.linux-mandrake.com/zh_CN/hardware.php3"
-#: ../../standalone/draksound_.c:55
+#: ../../standalone/draksound_.c:54
msgid ""
"\n"
"\n"
@@ -12925,7 +13267,7 @@ msgstr ""
"ע��: ������������� ISA ���弴�õ�, ����Ҫʹ�� sndconfig ����ֻ���ڿ���̨"
"�����롰sndconfig����"
-#: ../../standalone/draksplash_.c:34
+#: ../../standalone/draksplash_.c:21
msgid ""
"package 'ImageMagick' is required for correct working.\n"
"Click \"Ok\" to install 'ImageMagick' or \"Cancel\" to quit"
@@ -12933,122 +13275,122 @@ msgstr ""
"Ҫ����������Ҫ������ ImageMagick��\n"
"�뵥����ȷ������װ ImageMagick ��ȡ�����˳�"
-#: ../../standalone/draksplash_.c:78
+#: ../../standalone/draksplash_.c:67
msgid "first step creation"
msgstr "��һ������"
-#: ../../standalone/draksplash_.c:79
+#: ../../standalone/draksplash_.c:70
msgid "final resolution"
msgstr "���շֱ���"
-#: ../../standalone/draksplash_.c:80 ../../standalone/draksplash_.c:172
+#: ../../standalone/draksplash_.c:71 ../../standalone/draksplash_.c:163
msgid "choose image file"
msgstr "ѡ��ͼ���ļ�"
-#: ../../standalone/draksplash_.c:81
+#: ../../standalone/draksplash_.c:72
msgid "Theme name"
msgstr "��������"
-#: ../../standalone/draksplash_.c:85
+#: ../../standalone/draksplash_.c:77
msgid "Browse"
msgstr "���"
-#: ../../standalone/draksplash_.c:99 ../../standalone/draksplash_.c:162
+#: ../../standalone/draksplash_.c:87 ../../standalone/draksplash_.c:153
msgid "Configure bootsplash picture"
msgstr "���ÿ�������ͼƬ"
-#: ../../standalone/draksplash_.c:100
+#: ../../standalone/draksplash_.c:90
msgid ""
"x coordinate of text box\n"
"in number of character"
-msgstr "�ı����� X ����, ���ַ�������"
+msgstr "�ı���� X ����, ���ַ�������"
-#: ../../standalone/draksplash_.c:101
+#: ../../standalone/draksplash_.c:91
msgid ""
"y coordinate of text box\n"
"in number of character"
-msgstr "�ı����� Y ����, ���ַ�������"
+msgstr "�ı���� Y ����, ���ַ�������"
-#: ../../standalone/draksplash_.c:102
+#: ../../standalone/draksplash_.c:92
msgid "text width"
msgstr "�ı�����"
-#: ../../standalone/draksplash_.c:103
+#: ../../standalone/draksplash_.c:93
msgid "text box height"
msgstr "�ı����߶�"
-#: ../../standalone/draksplash_.c:104
+#: ../../standalone/draksplash_.c:94
msgid ""
"the progress bar x coordinate\n"
"of its upper left corner"
-msgstr "��չ�������Ͻǵ� X ����"
+msgstr "�����������Ͻǵ� X ����"
-#: ../../standalone/draksplash_.c:105
+#: ../../standalone/draksplash_.c:95
msgid ""
"the progress bar y coordinate\n"
"of its upper left corner"
-msgstr "��չ�������Ͻǵ� Y ����"
+msgstr "�����������Ͻǵ� Y ����"
-#: ../../standalone/draksplash_.c:106
+#: ../../standalone/draksplash_.c:96
msgid "the width of the progress bar"
-msgstr "��չ���Ŀ���"
+msgstr "�������Ŀ���"
-#: ../../standalone/draksplash_.c:107
+#: ../../standalone/draksplash_.c:97
msgid "the heigth of the progress bar"
-msgstr "��չ���ĸ߶�"
+msgstr "�������ĸ߶�"
-#: ../../standalone/draksplash_.c:108
+#: ../../standalone/draksplash_.c:98
msgid "the color of the progress bar"
-msgstr "��չ������ɫ"
+msgstr "����������ɫ"
-#: ../../standalone/draksplash_.c:121
+#: ../../standalone/draksplash_.c:113
msgid "Preview"
msgstr "Ԥ��"
-#: ../../standalone/draksplash_.c:123
+#: ../../standalone/draksplash_.c:115
msgid "Save theme"
msgstr "��������"
-#: ../../standalone/draksplash_.c:124
+#: ../../standalone/draksplash_.c:116
msgid "Choose color"
msgstr "ѡ����ɫ"
-#: ../../standalone/draksplash_.c:127
+#: ../../standalone/draksplash_.c:119
msgid "Display logo on Console"
msgstr "�ڿ���̨��ʾ LOGO"
-#: ../../standalone/draksplash_.c:128
+#: ../../standalone/draksplash_.c:120
msgid "Make kernel message quiet by default"
msgstr "Ĭ���趨�ں���Ϣ����ʾ"
-#: ../../standalone/draksplash_.c:165 ../../standalone/draksplash_.c:329
+#: ../../standalone/draksplash_.c:156 ../../standalone/draksplash_.c:321
#, c-format
msgid "This theme haven't yet any bootsplash in %s !"
msgstr "�������� %s ���滹û���κο�������!"
-#: ../../standalone/draksplash_.c:212
+#: ../../standalone/draksplash_.c:205
msgid "saving Bootsplash theme..."
msgstr "���濪����������..."
-#: ../../standalone/draksplash_.c:435
+#: ../../standalone/draksplash_.c:428
msgid "ProgressBar color selection"
-msgstr "��չ����ɫѡ��"
+msgstr "��������ɫѡ��"
-#: ../../standalone/draksplash_.c:456
+#: ../../standalone/draksplash_.c:449
msgid "You must choose an image file first!"
msgstr "��������ѡ��һ��ͼ���ļ�!"
-#: ../../standalone/draksplash_.c:465
+#: ../../standalone/draksplash_.c:458
msgid "Generating preview ..."
msgstr "��������Ԥ�� ..."
#. -PO First %s is theme name, second %s (in parenthesis) is resolution
-#: ../../standalone/draksplash_.c:511
+#: ../../standalone/draksplash_.c:506
#, c-format
msgid "%s BootSplash (%s) preview"
msgstr "%s ��������(%s) Ԥ��"
-#: ../../standalone/drakxtv_.c:49
+#: ../../standalone/drakxtv_.c:46
msgid ""
"XawTV isn't installed!\n"
"\n"
@@ -13073,71 +13415,71 @@ msgstr ""
"\n"
"��������Ϊ root �ӿ���̨���С�urpmi xawtv������װ��."
-#: ../../standalone/drakxtv_.c:66
+#: ../../standalone/drakxtv_.c:63
msgid "Canada (cable)"
msgstr "���ô� (����)"
-#: ../../standalone/drakxtv_.c:66
+#: ../../standalone/drakxtv_.c:63
msgid "USA (broadcast)"
msgstr "����(�㲥)"
-#: ../../standalone/drakxtv_.c:66
+#: ../../standalone/drakxtv_.c:63
msgid "USA (cable)"
msgstr "����(����)"
-#: ../../standalone/drakxtv_.c:66
+#: ../../standalone/drakxtv_.c:63
msgid "USA (cable-hrc)"
msgstr "����(cable-hrc)"
-#: ../../standalone/drakxtv_.c:67
+#: ../../standalone/drakxtv_.c:64
msgid "China (broadcast)"
msgstr "�й� (�㲥)"
-#: ../../standalone/drakxtv_.c:67
+#: ../../standalone/drakxtv_.c:64
msgid "Japan (broadcast)"
msgstr "�ձ� (�㲥)"
-#: ../../standalone/drakxtv_.c:67
+#: ../../standalone/drakxtv_.c:64
msgid "Japan (cable)"
msgstr "�ձ� (����)"
-#: ../../standalone/drakxtv_.c:68
+#: ../../standalone/drakxtv_.c:65
msgid "East Europe"
msgstr "��ŷ"
-#: ../../standalone/drakxtv_.c:68
+#: ../../standalone/drakxtv_.c:65
msgid "France [SECAM]"
msgstr "���� [SECAM]"
-#: ../../standalone/drakxtv_.c:68
+#: ../../standalone/drakxtv_.c:65
msgid "Ireland"
msgstr "������"
-#: ../../standalone/drakxtv_.c:68
+#: ../../standalone/drakxtv_.c:65
msgid "West Europe"
msgstr "��ŷ"
-#: ../../standalone/drakxtv_.c:69
+#: ../../standalone/drakxtv_.c:66
msgid "Australia"
msgstr "�Ĵ�����"
-#: ../../standalone/drakxtv_.c:69
+#: ../../standalone/drakxtv_.c:66
msgid "Newzealand"
msgstr "������"
-#: ../../standalone/drakxtv_.c:70
+#: ../../standalone/drakxtv_.c:67
msgid "South Africa"
msgstr "�Ϸ�"
-#: ../../standalone/drakxtv_.c:71
+#: ../../standalone/drakxtv_.c:68
msgid "Argentina"
msgstr "����͢"
-#: ../../standalone/drakxtv_.c:72
+#: ../../standalone/drakxtv_.c:69
msgid "Australian Optus cable TV"
msgstr "�Ĵ����� Optus ���� TV"
-#: ../../standalone/drakxtv_.c:107
+#: ../../standalone/drakxtv_.c:102
msgid ""
"Please,\n"
"type in your tv norm and country"
@@ -13145,43 +13487,43 @@ msgstr ""
"������, \n"
"���ĵ�����ʽ�͹���"
-#: ../../standalone/drakxtv_.c:109
+#: ../../standalone/drakxtv_.c:104
msgid "TV norm:"
msgstr "������ʽ:"
-#: ../../standalone/drakxtv_.c:110
+#: ../../standalone/drakxtv_.c:105
msgid "Area:"
msgstr "����:"
-#: ../../standalone/drakxtv_.c:114
+#: ../../standalone/drakxtv_.c:109
msgid "Scanning for TV channels in progress ..."
msgstr "������������Ƶ��..."
-#: ../../standalone/drakxtv_.c:122
+#: ../../standalone/drakxtv_.c:116
msgid "Scanning for TV channels"
msgstr "��������Ƶ��"
-#: ../../standalone/drakxtv_.c:125
+#: ../../standalone/drakxtv_.c:120
msgid "There was an error while scanning for TV channels"
msgstr "��������Ƶ��ʱ����:"
-#: ../../standalone/drakxtv_.c:126
+#: ../../standalone/drakxtv_.c:121
msgid "XawTV isn't installed!"
msgstr "XawTV û�а�װ!"
-#: ../../standalone/drakxtv_.c:129
+#: ../../standalone/drakxtv_.c:124
msgid "Have a nice day!"
msgstr "ף�����!"
-#: ../../standalone/drakxtv_.c:130
+#: ../../standalone/drakxtv_.c:125
msgid "Now, you can run xawtv (under X Window!) !\n"
msgstr "�����ڿ����� X ������ xawtv ��������!\n"
-#: ../../standalone/drakxtv_.c:153
+#: ../../standalone/drakxtv_.c:147
msgid "No TV Card detected!"
msgstr "û�з��ֵ��ӿ�!"
-#: ../../standalone/drakxtv_.c:154
+#: ../../standalone/drakxtv_.c:148
msgid ""
"No TV Card has been detected on your machine. Please verify that a Linux-"
"supported Video/TV Card is correctly plugged in.\n"
@@ -13192,39 +13534,430 @@ msgid ""
"\n"
"http://www.linux-mandrake.com/en/hardware.php3"
msgstr ""
-"û�з������������е��ӿ��������Ƿ���ȷ��װ�� Linux-֧�ֵ� ��Ƶ/���ӿ���\n"
+"û�з������������е��ӿ��������Ƿ���ȷ��װ�� Linux ֧�ֵ���Ƶ/���ӿ���\n"
"\n"
"\n"
"�����������ǵ�Ӳ�����ݿ�:\n"
"\n"
"\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.linux-mandrake.com/zh_CN/hardware.php3"
+
+#: ../../standalone/harddrake2_.c:17
+msgid "Alternative drivers"
+msgstr "�������������"
-#: ../../standalone/harddrake2_.c:8
+#: ../../standalone/harddrake2_.c:18
+msgid "the list of alternative drivers for this sound card"
+msgstr "���������������������б�"
+
+#: ../../standalone/harddrake2_.c:20
+msgid "Bus"
+msgstr "����"
+
+#: ../../standalone/harddrake2_.c:21
msgid ""
+"this is the physical bus on which the device is plugged (eg: PCI, USB, ...)"
+msgstr "�豸�����ڵ��������� (����: PCI, USB, ...)"
+
+#: ../../standalone/harddrake2_.c:22
+msgid "Channel"
+msgstr "ͨ��"
+
+#: ../../standalone/harddrake2_.c:22
+msgid "EIDE/SCSI channel"
+msgstr "EIDE/SCSI ͨ��"
+
+#: ../../standalone/harddrake2_.c:23
+msgid "Bogomips"
+msgstr "Bogomips"
+
+#: ../../standalone/harddrake2_.c:23
+msgid ""
+"The GNU/Linux kernel needs to do run a calculation loop at boot time\n"
+"\t to initialize a timer counter. Its result is stored as bogomips as a way "
+"to \"benchmark\" the cpu."
+msgstr ""
+"GNU/Linux ������Ҫ������ʱ���м���ѭ���Ա��ʼ����ʱ������������\n"
+"\t�洢���Ա���Ϊ CPU �ĺ�������׼��(Benchmark)��"
+
+#: ../../standalone/harddrake2_.c:26
+msgid "Bus identification"
+msgstr "���߱�ʶ"
+
+#: ../../standalone/harddrake2_.c:27
+msgid ""
+"- PCI and USB devices: this list the vendor, device, subvendor and subdevice "
+"PCI/USB ids"
+msgstr ""
+"- PCI �� USB �豸: �г� PCI/USB �� vendor, device, subvendor �� subdevice ��"
+"��"
+
+#: ../../standalone/harddrake2_.c:29
+msgid "Location on the bus"
+msgstr "�������ϵ�λ��"
+
+#: ../../standalone/harddrake2_.c:30
+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"
+"- scsi devices: the scsi bus and the scsi device ids"
+msgstr ""
+"- pci �豸: �г� PCI ���, �豸�͹���\n"
+"- eide �豸: ���豸����豸\n"
+"- scsi �豸: �г� scsi ���ߺ� scsi �豸��"
+
+#: ../../standalone/harddrake2_.c:33
+msgid "Cache size"
+msgstr "�����С"
+
+#: ../../standalone/harddrake2_.c:33
+msgid "Size of the (second level) cpu cache"
+msgstr "CPU ���������С"
+
+#: ../../standalone/harddrake2_.c:34
+msgid "Coma bug:"
+msgstr "Coma����:"
+
+#: ../../standalone/harddrake2_.c:34
+msgid "Does this cpu has Cyrix 6x86 Coma bug ?"
+msgstr "�� CPU �Ƿ��� Cyrix 6x86 Coma����?"
+
+#: ../../standalone/harddrake2_.c:35
+msgid "Cpuid family"
+msgstr "CPUID ����"
+
+#: ../../standalone/harddrake2_.c:35
+msgid "Family of the cpu (eg: 6 for i686 class)"
+msgstr "CPU ����(�� 6 ���� i686 ����)"
+
+#: ../../standalone/harddrake2_.c:36
+msgid "Cpuid level"
+msgstr "CPUID ����"
+
+#: ../../standalone/harddrake2_.c:36
+msgid "Information level that can be obtained through the cpuid instruction"
+msgstr "ͨ�� CPUID ָ��ɻ�ȡ����Ϣ����"
+
+#: ../../standalone/harddrake2_.c:37
+msgid "Frequency (MHz)"
+msgstr "Ƶ�� (MHz)"
+
+#: ../../standalone/harddrake2_.c:37
+msgid ""
+"The cpu frequency in Mhz (Mega herz which in first approximation may be "
+"coarsely assimilated to number of instructions the cpu is able to execute "
+"per second)"
+msgstr ""
+"�� MHz Ϊ��λ�� CPU Ƶ��(���ι��Ƶ��׺��ȿ��ܱȽϽӽ� CPU ÿ���ִ�е�ָ����)"
+
+#: ../../standalone/harddrake2_.c:38
+msgid "This field describes the device"
+msgstr "�˴��������豸"
+
+#: ../../standalone/harddrake2_.c:39
+msgid "Old device file"
+msgstr "�ɵ��豸�ļ�"
+
+#: ../../standalone/harddrake2_.c:40
+msgid "old static device name used in dev package"
+msgstr "dev ��������ʹ�õľɵľ�̬�豸��"
+
+#: ../../standalone/harddrake2_.c:41
+msgid "New devfs device"
+msgstr "�µ� devfs �豸"
+
+#: ../../standalone/harddrake2_.c:42
+msgid "new dinamic device name generated by incore kernel devfs"
+msgstr "�ں��Դ��� devfs ��ʹ�õ��µĶ�̬�豸��"
+
+#: ../../standalone/harddrake2_.c:43
+msgid "Module"
+msgstr "ģ��"
+
+#: ../../standalone/harddrake2_.c:43
+msgid "the module of the GNU/Linux kernel that handle that device"
+msgstr "�������豸�� GNU/Linux �ں�ģ��"
+
+#: ../../standalone/harddrake2_.c:44
+msgid "CPU flags reported by the kernel"
+msgstr "���ı���� CPU ��־"
+
+#: ../../standalone/harddrake2_.c:44
+msgid "Flags"
+msgstr "��־"
+
+#: ../../standalone/harddrake2_.c:45
+msgid "Fdiv bug"
+msgstr "Fdiv ����"
+
+#: ../../standalone/harddrake2_.c:46
+msgid ""
+"Early Intel Pentium chips manufactured have a bug in their floating point "
+"processor which did not achieve the attended precision when performing a "
+"Floating point DIVision (FDIV)"
+msgstr ""
+"���ڵ� Intel Pentium оƬ�ڸ��㴦�������д��󣬵�����ִ�и������(FDIV)ʱ����"
+"�½�"
+
+#: ../../standalone/harddrake2_.c:49
+msgid "Is FPU present"
+msgstr "FPU ����"
+
+#: ../../standalone/harddrake2_.c:49
+msgid "yes means the processor has an arithmetic coprocessor"
+msgstr "���ǡ�����������������Э������"
+
+#: ../../standalone/harddrake2_.c:50
+msgid "Does FPU have an irq vector"
+msgstr "FPU �Ƿ��� IRQ ����"
+
+#: ../../standalone/harddrake2_.c:50
+msgid "yes means the arithmetic coprocessor has an exception vector attached"
+msgstr "���ǡ���������Э��������������������"
+
+#: ../../standalone/harddrake2_.c:51
+msgid "Early pentium were buggy and freezed when decoding the F00F bytecode"
+msgstr "���ڵ� Pentium оƬ�ڽ��� FOOF �ֽ���ʱ���ڴ��󲢿��ܻ�����"
+
+#: ../../standalone/harddrake2_.c:51
+msgid "F00f bug"
+msgstr "F00f ����"
+
+#: ../../standalone/harddrake2_.c:52
+msgid "Halt bug"
+msgstr "��������"
+
+#: ../../standalone/harddrake2_.c:53
+msgid ""
+"Some of the early i486DX-100 chips cannot reliably return to operating mode "
+"after the \"halt\" instruction is used"
+msgstr "ijЩ���ڵ� i486DX-100 оƬ��ʹ�á�halt��ָ����޷�ȷ�����ز���ģʽ"
+
+#: ../../standalone/harddrake2_.c:55
+msgid "Floppy format"
+msgstr "���̸�ʽ��"
+
+#: ../../standalone/harddrake2_.c:55
+msgid "Format of floppies the drive accept"
+msgstr "���������ܵ����̸�ʽ"
+
+#: ../../standalone/harddrake2_.c:56
+msgid "Level"
+msgstr "����"
+
+#: ../../standalone/harddrake2_.c:56
+msgid "Sub generation of the cpu"
+msgstr "CPU �Ĵ�����"
+
+#: ../../standalone/harddrake2_.c:57
+msgid "Media class"
+msgstr "���ʷ���"
+
+#: ../../standalone/harddrake2_.c:57
+msgid "class of hardware device"
+msgstr "Ӳ���豸�ķ���"
+
+#: ../../standalone/harddrake2_.c:58 ../../standalone/harddrake2_.c:59
+msgid "Model"
+msgstr "�ͺ�"
+
+#: ../../standalone/harddrake2_.c:58
+msgid "hard disk model"
+msgstr "Ӳ���ͺ�"
+
+#: ../../standalone/harddrake2_.c:59
+msgid "Generation of the cpu (eg: 8 for PentiumIII, ...)"
+msgstr "CPU ����(�� 8 ���� PentiumIII, �ȵ�)"
+
+#: ../../standalone/harddrake2_.c:60
+msgid "Model name"
+msgstr "�ͺ�����"
+
+#: ../../standalone/harddrake2_.c:60
+msgid "Official vendor name of the cpu"
+msgstr "�豸�ij�������"
+
+#: ../../standalone/harddrake2_.c:61
+msgid "Number of buttons"
+msgstr "��ť��Ŀ"
+
+#: ../../standalone/harddrake2_.c:62
+msgid "Name"
+msgstr "����"
+
+#: ../../standalone/harddrake2_.c:63
+msgid "network printer port"
+msgstr "�����ӡ���˿�"
+
+#: ../../standalone/harddrake2_.c:64
+msgid "Processor ID"
+msgstr "������ ID"
+
+#: ../../standalone/harddrake2_.c:64
+msgid "the number of the processor"
+msgstr "���������"
+
+#: ../../standalone/harddrake2_.c:65
+msgid "Model stepping"
+msgstr "�ͺŲ���"
+
+#: ../../standalone/harddrake2_.c:65
+msgid "Stepping of the cpu (sub model (generation) number)"
+msgstr "CPU ����(���ͺ�(����))"
+
+#: ../../standalone/harddrake2_.c:66
+msgid "The type of bus on which the mouse is connected"
+msgstr "��ѡ������������ӵ���������"
+
+#: ../../standalone/harddrake2_.c:67
+msgid "the vendor name of the device"
+msgstr "�豸�ij�������"
+
+#: ../../standalone/harddrake2_.c:68
+msgid "the vendor name of the processor"
+msgstr "��������Ӧ��"
+
+#: ../../standalone/harddrake2_.c:82
+msgid "/_Quit"
+msgstr "/�˳�(_Q)"
+
+#: ../../standalone/harddrake2_.c:83
+msgid "/Autodetect _printers"
+msgstr "/�Զ�����ӡ��(_P)"
+
+#: ../../standalone/harddrake2_.c:83 ../../standalone/harddrake2_.c:85
+#: ../../standalone/logdrake_.c:81
+msgid "/_Options"
+msgstr "/ѡ��(_O)"
+
+#: ../../standalone/harddrake2_.c:85
+msgid "/Autodetect _modems"
+msgstr "/�Զ������ƽ����(_M)"
+
+#: ../../standalone/harddrake2_.c:87 ../../standalone/harddrake2_.c:89
+#: ../../standalone/harddrake2_.c:100 ../../standalone/harddrake2_.c:102
+#: ../../standalone/logdrake_.c:83
+msgid "/_Help"
+msgstr "/����(_H)"
+
+#: ../../standalone/harddrake2_.c:89
+msgid "/_Help..."
+msgstr "/����(_H)..."
+
+#: ../../standalone/harddrake2_.c:92
+msgid "Harddrake help"
+msgstr "Harddrake ����"
+
+#: ../../standalone/harddrake2_.c:93
+msgid ""
+"Description of the fields:\n"
"\n"
-"Usage: harddrake [-h|--help] [--test]\n"
msgstr ""
+"�����ֶε�����:\n"
"\n"
-"�÷�: harddrake [-h|--help] [--test]\n"
-#: ../../standalone/keyboarddrake_.c:16
-msgid "usage: keyboarddrake [--expert] [keyboard]\n"
-msgstr "�÷�: keyboarddrake [--expert] [keyboard]\n"
+#: ../../standalone/harddrake2_.c:96
+msgid ""
+"Once you've selected a device, you'll be able to see explanations on fields "
+"displayed on the right frame (\"Information\")"
+msgstr "ֻҪ��ѡ�����豸, �����ܿ������Ҳ���(����Ϣ��)����ʾ�Ľ��͡�"
+
+#: ../../standalone/harddrake2_.c:96
+msgid "Select a device !"
+msgstr "��ѡ���豸!"
+
+#: ../../standalone/harddrake2_.c:100
+msgid "/_Report Bug"
+msgstr "/���ϱ���(_R)"
+
+#: ../../standalone/harddrake2_.c:102
+msgid "/_About..."
+msgstr "/����(_A)..."
+
+#: ../../standalone/harddrake2_.c:104
+msgid "About Harddrake"
+msgstr "���� Harddrake"
+
+#: ../../standalone/harddrake2_.c:105
+msgid ""
+"This is HardDrake, a Mandrake hardware configuration tool.\n"
+"Version:"
+msgstr ""
+"���� Harddrake, Mandrake ��Ӳ�����ù��ߡ�\n"
+"�汾:"
+
+#: ../../standalone/harddrake2_.c:106
+msgid "Author:"
+msgstr "����:"
+
+#: ../../standalone/harddrake2_.c:113
+msgid "Detection in progress"
+msgstr "��������"
+
+#: ../../standalone/harddrake2_.c:119
+msgid "Harddrake2 version "
+msgstr "Harddrake2 �汾 "
+
+#: ../../standalone/harddrake2_.c:126
+msgid "Detected hardware"
+msgstr "��⵽��Ӳ��"
+
+#: ../../standalone/harddrake2_.c:129
+msgid "Information"
+msgstr "��Ϣ"
+
+#: ../../standalone/harddrake2_.c:131
+msgid "Configure module"
+msgstr "����ģ��"
+
+#: ../../standalone/harddrake2_.c:137
+msgid "Run config tool"
+msgstr "�������ù���"
+
+#: ../../standalone/harddrake2_.c:143
+#, c-format
+msgid "Running \"%s\" ..."
+msgstr "��������%s��..."
+
+#: ../../standalone/harddrake2_.c:159
+msgid ""
+"Click on a device in the left tree in order to get its information displayed "
+"here."
+msgstr "����������е��豸, �Ϳ��ڴ���ʾ����Ϣ��"
-#: ../../standalone/keyboarddrake_.c:32
+#: ../../standalone/harddrake2_.c:231
+msgid "primary"
+msgstr "��"
+
+#: ../../standalone/harddrake2_.c:231
+msgid "secondary"
+msgstr "��"
+
+#: ../../standalone/harddrake2_.c:260
+msgid "/Autodetect modems"
+msgstr "/�Զ������ƽ����(M)"
+
+#: ../../standalone/harddrake2_.c:260
+msgid "/Autodetect printers"
+msgstr "/�Զ�����ӡ��(_P)"
+
+#: ../../standalone/harddrake2_.c:261
+msgid "/Options"
+msgstr "/ѡ��(_O)"
+
+#: ../../standalone/keyboarddrake_.c:26
msgid "Please, choose your keyboard layout."
msgstr "��ѡ����ʹ�õļ��̲��֡�"
-#: ../../standalone/keyboarddrake_.c:41
+#: ../../standalone/keyboarddrake_.c:35
msgid "Do you want the BackSpace to return Delete in console?"
msgstr "���Ƿ���ҪBackSpace�ڿ���̨�� Delete ������?"
-#: ../../standalone/livedrake_.c:24
+#: ../../standalone/livedrake_.c:18
msgid "Change Cd-Rom"
msgstr "������"
-#: ../../standalone/livedrake_.c:25
+#: ../../standalone/livedrake_.c:19
msgid ""
"Please insert the Installation Cd-Rom in your drive and press Ok when done.\n"
"If you don't have it, press Cancel to avoid live upgrade."
@@ -13232,136 +13965,124 @@ msgstr ""
"�����������в��밲װ����, Ȼ������ȷ������\n"
"�����û�����Ź���, ������ȡ����, ��������������"
-#: ../../standalone/livedrake_.c:35
+#: ../../standalone/livedrake_.c:29
msgid "Unable to start live upgrade !!!\n"
msgstr "�޷���ʼ�������� !!!\n"
-#: ../../standalone/localedrake_.c:33
+#: ../../standalone/localedrake_.c:34
msgid "The change is done, but to be effective you must logout"
msgstr "�޸��Ѿ����, �����������˳���¼�޸IJŻ���Ч"
-#: ../../standalone/logdrake_.c:86 ../../ugtk.pm_.c:285
+#: ../../standalone/logdrake_.c:56 ../../ugtk.pm_.c:284 ../../ugtk2.pm_.c:350
msgid "logdrake"
msgstr "logdrake"
-#: ../../standalone/logdrake_.c:96
+#: ../../standalone/logdrake_.c:68
msgid "Show only for the selected day"
msgstr "����ʾ��ѡ�������"
-#: ../../standalone/logdrake_.c:103
+#: ../../standalone/logdrake_.c:75
msgid "/File/_New"
msgstr "/�ļ�/�½�(_N)"
-#: ../../standalone/logdrake_.c:103
+#: ../../standalone/logdrake_.c:75
msgid "<control>N"
msgstr "<control>N"
-#: ../../standalone/logdrake_.c:104
+#: ../../standalone/logdrake_.c:76
msgid "/File/_Open"
msgstr "/�ļ�/��(_O)"
-#: ../../standalone/logdrake_.c:104
+#: ../../standalone/logdrake_.c:76
msgid "<control>O"
msgstr "<control>O"
-#: ../../standalone/logdrake_.c:105
+#: ../../standalone/logdrake_.c:77
msgid "/File/_Save"
msgstr "/�ļ�/����(_S)"
-#: ../../standalone/logdrake_.c:105
+#: ../../standalone/logdrake_.c:77
msgid "<control>S"
msgstr "<control>S"
-#: ../../standalone/logdrake_.c:106
+#: ../../standalone/logdrake_.c:78
msgid "/File/Save _As"
msgstr "/�ļ�/����Ϊ(_A)"
-#: ../../standalone/logdrake_.c:107
+#: ../../standalone/logdrake_.c:79
msgid "/File/-"
msgstr "/�ļ�/-"
-#: ../../standalone/logdrake_.c:109
-msgid "/_Options"
-msgstr "/ѡ��(_O)"
-
-#: ../../standalone/logdrake_.c:110
+#: ../../standalone/logdrake_.c:82
msgid "/Options/Test"
msgstr "/ѡ��/����"
-#: ../../standalone/logdrake_.c:112
+#: ../../standalone/logdrake_.c:84
msgid "/Help/_About..."
msgstr "/����/����(_A)..."
-#: ../../standalone/logdrake_.c:119
-msgid "-misc-fixed-medium-r-*-*-*-100-*-*-*-*-*-*,*"
-msgstr "-misc-fixed-medium-r-*-*-*-100-*-*-*-*-*-*,*"
-
-#: ../../standalone/logdrake_.c:120
-msgid "-misc-fixed-bold-r-*-*-*-100-*-*-*-*-*-*,*"
-msgstr "-misc-fixed-bold-r-*-*-*-100-*-*-*-*-*-*,*"
-
-#: ../../standalone/logdrake_.c:174
+#: ../../standalone/logdrake_.c:145
msgid "User"
msgstr "�û�"
-#: ../../standalone/logdrake_.c:175
+#: ../../standalone/logdrake_.c:146
msgid "Messages"
msgstr "��Ϣ"
-#: ../../standalone/logdrake_.c:176
+#: ../../standalone/logdrake_.c:147
msgid "Syslog"
msgstr "Syslog"
-#: ../../standalone/logdrake_.c:177
+#: ../../standalone/logdrake_.c:148
msgid "Mandrake Tools Explanations"
msgstr "Mandrake ���ߵĽ���"
-#: ../../standalone/logdrake_.c:180
+#: ../../standalone/logdrake_.c:151
msgid "search"
msgstr "����"
-#: ../../standalone/logdrake_.c:186
+#: ../../standalone/logdrake_.c:161
msgid "A tool to monitor your logs"
msgstr "��־�鿴����"
-#: ../../standalone/logdrake_.c:187
+#: ../../standalone/logdrake_.c:162 ../../standalone/net_monitor_.c:91
msgid "Settings"
msgstr "����"
-#: ../../standalone/logdrake_.c:192
+#: ../../standalone/logdrake_.c:167
msgid "matching"
msgstr "ƥ��"
-#: ../../standalone/logdrake_.c:193
+#: ../../standalone/logdrake_.c:168
msgid "but not matching"
msgstr "��ƥ��"
-#: ../../standalone/logdrake_.c:197
+#: ../../standalone/logdrake_.c:172
msgid "Choose file"
msgstr "ѡ���ļ�"
-#: ../../standalone/logdrake_.c:202
+#: ../../standalone/logdrake_.c:181
msgid "Calendar"
msgstr "����"
-#: ../../standalone/logdrake_.c:212
+#: ../../standalone/logdrake_.c:191
msgid "Content of the file"
msgstr "�ļ�����"
-#: ../../standalone/logdrake_.c:216 ../../standalone/logdrake_.c:392
+#: ../../standalone/logdrake_.c:195 ../../standalone/logdrake_.c:375
msgid "Mail alert"
msgstr "�ʼ�����"
-#: ../../standalone/logdrake_.c:268
+#: ../../standalone/logdrake_.c:245
#, c-format
msgid "please wait, parsing file: %s"
msgstr "��ȴ�, ���ڷ����ļ�: %s"
-#: ../../standalone/logdrake_.c:409
+#: ../../standalone/logdrake_.c:392
msgid "Mail alert configuration"
msgstr "�ʼ������趨"
-#: ../../standalone/logdrake_.c:410
+#: ../../standalone/logdrake_.c:393
msgid ""
"Welcome to the mail configuration utility.\n"
"\n"
@@ -13371,113 +14092,217 @@ msgstr ""
"\n"
"�����������������þ��档\n"
-#: ../../standalone/logdrake_.c:417
+#: ../../standalone/logdrake_.c:400
msgid "Apache World Wide Web Server"
msgstr "Apache WWW ����������"
-#: ../../standalone/logdrake_.c:418
+#: ../../standalone/logdrake_.c:401
msgid "Domain Name Resolver"
msgstr "����������"
-#: ../../standalone/logdrake_.c:419
+#: ../../standalone/logdrake_.c:402
msgid "Ftp Server"
msgstr "FTP ������"
-#: ../../standalone/logdrake_.c:420
+#: ../../standalone/logdrake_.c:403
msgid "Postfix Mail Server"
msgstr "Postfix �ʼ�����"
-#: ../../standalone/logdrake_.c:421
+#: ../../standalone/logdrake_.c:404
msgid "Samba Server"
msgstr "Samba ������"
-#: ../../standalone/logdrake_.c:422
+#: ../../standalone/logdrake_.c:405
msgid "SSH Server"
msgstr "SSH ������"
-#: ../../standalone/logdrake_.c:423
+#: ../../standalone/logdrake_.c:406
msgid "Webmin Service"
msgstr "Webmin ����"
-#: ../../standalone/logdrake_.c:424
+#: ../../standalone/logdrake_.c:407
msgid "Xinetd Service"
msgstr "Xinetd ������"
-#: ../../standalone/logdrake_.c:431
+#: ../../standalone/logdrake_.c:414
msgid "service setting"
msgstr "��������"
-#: ../../standalone/logdrake_.c:432
+#: ../../standalone/logdrake_.c:415
msgid ""
"You will receive an alert if one of the selected services is no more running"
msgstr "���ѡ�еķ��������κ�һ��ֹͣ���������յ�����"
-#: ../../standalone/logdrake_.c:444
+#: ../../standalone/logdrake_.c:428
msgid "load setting"
msgstr "��������"
-#: ../../standalone/logdrake_.c:445
+#: ../../standalone/logdrake_.c:429
msgid "You will receive an alert if the load is higher than this value"
msgstr "�����س������ֵʱ�����յ�һ������"
-#: ../../standalone/logdrake_.c:458
+#: ../../standalone/logdrake_.c:444
msgid "alert configuration"
msgstr "�����趨"
-#: ../../standalone/logdrake_.c:459
+#: ../../standalone/logdrake_.c:445
msgid "Please enter your email address below "
msgstr "�����������ʼ���ַ "
-#: ../../standalone/logdrake_.c:498
+#: ../../standalone/logdrake_.c:486
msgid "Save as.."
msgstr "����Ϊ.."
-#: ../../standalone/mousedrake_.c:45
+#: ../../standalone/mousedrake_.c:37
msgid "Please, choose the type of your mouse."
msgstr "��ѡ�������������һ������."
-#: ../../standalone/mousedrake_.c:58
+#: ../../standalone/mousedrake_.c:50
msgid "Emulate third button?"
msgstr "ģ������"
-#: ../../standalone/printerdrake_.c:57
+#: ../../standalone/net_monitor_.c:53 ../../standalone/net_monitor_.c:87
+msgid "Network Monitoring"
+msgstr "�������"
+
+#: ../../standalone/net_monitor_.c:96
+msgid "Profile "
+msgstr "�����ļ�: "
+
+#: ../../standalone/net_monitor_.c:99
+msgid "Statistics"
+msgstr "ͳ��"
+
+#: ../../standalone/net_monitor_.c:103
+msgid "Sending Speed:"
+msgstr "�����ٶ�:"
+
+#: ../../standalone/net_monitor_.c:104
+msgid "Receiving Speed:"
+msgstr "�����ٶ�:"
+
+#: ../../standalone/net_monitor_.c:106
+msgid "Connection Time: "
+msgstr "����ʱ��:"
+
+#: ../../standalone/net_monitor_.c:113
+msgid "Logs"
+msgstr "��־"
+
+#: ../../standalone/net_monitor_.c:147
+msgid "Wait please, testing your connection..."
+msgstr "���Ժ����ڲ�������..."
+
+#: ../../standalone/net_monitor_.c:178 ../../standalone/net_monitor_.c:191
+msgid "Connecting to Internet "
+msgstr "���ӵ�������"
+
+#: ../../standalone/net_monitor_.c:178 ../../standalone/net_monitor_.c:191
+msgid "Disconnecting from Internet "
+msgstr "�ӻ������Ͽ�"
+
+#: ../../standalone/net_monitor_.c:222
+msgid "Disconnection from Internet failed."
+msgstr "�ӻ������Ͽ�ʧ�ܡ�"
+
+#: ../../standalone/net_monitor_.c:223
+msgid "Disconnection from Internet complete."
+msgstr "�ӻ������Ͽ���ɡ�"
+
+#: ../../standalone/net_monitor_.c:225
+msgid "Connection complete."
+msgstr "������ɡ�"
+
+#: ../../standalone/net_monitor_.c:226
+msgid ""
+"Connection failed.\n"
+"Verify your configuration in the Mandrake Control Center."
+msgstr ""
+"����ʧ�ܡ�\n"
+"���� Mandrake ���������м���������á�"
+
+#: ../../standalone/net_monitor_.c:330
+msgid "Color configuration"
+msgstr "��ɫ����"
+
+#: ../../standalone/net_monitor_.c:383 ../../standalone/net_monitor_.c:403
+msgid "sent: "
+msgstr "�ѷ�:"
+
+#: ../../standalone/net_monitor_.c:390 ../../standalone/net_monitor_.c:407
+msgid "received: "
+msgstr "����:"
+
+#: ../../standalone/net_monitor_.c:397
+msgid "average"
+msgstr "ƽ��"
+
+#: ../../standalone/net_monitor_.c:400
+msgid "Local measure"
+msgstr "��������"
+
+#: ../../standalone/net_monitor_.c:432
+msgid "transmitted"
+msgstr "�Ѵ���"
+
+#: ../../standalone/net_monitor_.c:433
+msgid "received"
+msgstr "�ѽ���"
+
+#: ../../standalone/net_monitor_.c:453
+msgid ""
+"Warning, another internet connection has been detected, maybe using your "
+"network"
+msgstr "����, ��⵽����Ļ���������, ������ͨ����������"
+
+#: ../../standalone/net_monitor_.c:459
+#, c-format
+msgid "Connect %s"
+msgstr "���� %s"
+
+#: ../../standalone/net_monitor_.c:459
+#, c-format
+msgid "Disconnect %s"
+msgstr "�Ͽ� %s"
+
+#: ../../standalone/printerdrake_.c:47
msgid "Reading printer data ..."
msgstr "���ڶ�ȡ��ӡ������..."
-#: ../../standalone/scannerdrake_.c:41
+#: ../../standalone/scannerdrake_.c:39
msgid "Detecting devices ..."
msgstr "���ڼ���豸..."
-#: ../../standalone/scannerdrake_.c:41
+#: ../../standalone/scannerdrake_.c:39
msgid "Test ports"
msgstr "���Զ˿�"
-#: ../../standalone/scannerdrake_.c:53 ../../standalone/scannerdrake_.c:68
-#: ../../standalone/scannerdrake_.c:81
+#: ../../standalone/scannerdrake_.c:51 ../../standalone/scannerdrake_.c:66
+#: ../../standalone/scannerdrake_.c:79
#, c-format
msgid "The %s is not supported by this version of Mandrake Linux."
msgstr "����汾�� Mandrake Linux ��֧�� %s��"
-#: ../../standalone/scannerdrake_.c:56
+#: ../../standalone/scannerdrake_.c:54
#, c-format
msgid "%s found on %s, configure it?"
msgstr "���� %s ������ %s ��, �Ƿ�������?"
-#: ../../standalone/scannerdrake_.c:59
+#: ../../standalone/scannerdrake_.c:57
#, c-format
msgid "%s is not in the scanner database, configure it manually?"
msgstr "ɨ�������ݿ���û�� %s, Ҫ�ֹ���������?"
-#: ../../standalone/scannerdrake_.c:65
+#: ../../standalone/scannerdrake_.c:63
msgid "Select a scanner"
msgstr "ѡ��ɨ����"
-#: ../../standalone/scannerdrake_.c:93
+#: ../../standalone/scannerdrake_.c:91
#, c-format
msgid "This %s scanner is unsupported"
msgstr "ɨ���� %s ��ʱ��֧��"
-#: ../../standalone/scannerdrake_.c:107
+#: ../../standalone/scannerdrake_.c:105
#, c-format
msgid ""
"Scannerdrake was not able to detect your %s scanner.\n"
@@ -13486,11 +14311,11 @@ msgstr ""
"Scannerdrake û�ܼ�⵽���� %s ɨ���ǡ�\n"
"��ѡ������ɨ�������ӵ��豸��"
-#: ../../standalone/scannerdrake_.c:109
+#: ../../standalone/scannerdrake_.c:107
msgid "choose device"
msgstr "ѡ���豸"
-#: ../../standalone/scannerdrake_.c:115
+#: ../../standalone/scannerdrake_.c:113
#, c-format
msgid ""
"This %s scanner must be configured by printerdrake.\n"
@@ -13500,25 +14325,29 @@ msgstr ""
"��� %s ɨ���DZ���ʹ�� printerdrake �����á�\n"
"��������Mandrake �������ĵ�Ӳ�����ִ� printerdrake��"
-#: ../../standalone/scannerdrake_.c:120
+#: ../../standalone/scannerdrake_.c:118
#, c-format
msgid ""
"Your %s scanner has been configured.\n"
"You may now scan documents using ``XSane'' from Multimedia/Graphics in the "
"applications menu."
msgstr ""
-"���� %s ɨ�����Ѿ����ú�.\n"
-"���������Դ�Ӧ�ó���˵��� ��ý��/ͼ�� ��ʹ�� ``XSane'' ��ɨ���ĵ�. "
+"���� %s ɨ�����Ѿ����úá�\n"
+"���������Դ�Ӧ�ó���˵��� ��ý��/ͼ�� ��ʹ�á�XSane����ɨ���ĵ���"
#: ../../standalone/service_harddrake_.c:44
#, c-format
msgid "Some devices in the \"%s\" hardware class were removed:\n"
-msgstr "ɾ����һЩ ��%s�� �����豸:\n"
+msgstr "ɾ����һЩ��%s�������豸:\n"
#: ../../standalone/service_harddrake_.c:48
msgid "Some devices were added:\n"
msgstr "������һЩ�豸:\n"
+#: ../../standalone/service_harddrake_.c:64
+msgid "Hardware probing in progress"
+msgstr "Ӳ����������"
+
#: ../../steps.pm_.c:14
msgid "Choose your language"
msgstr "ѡ������"
@@ -13529,11 +14358,11 @@ msgstr "ѡ��װ���"
#: ../../steps.pm_.c:16
msgid "Hard drive detection"
-msgstr "̽��Ӳ��"
+msgstr "���Ӳ��"
#: ../../steps.pm_.c:17
msgid "Configure mouse"
-msgstr "�趨���"
+msgstr "�������"
#: ../../steps.pm_.c:18
msgid "Choose your keyboard"
@@ -13545,7 +14374,7 @@ msgstr "��ȫ"
#: ../../steps.pm_.c:20
msgid "Setup filesystems"
-msgstr "�趨�ļ�ϵͳ"
+msgstr "�����ļ�ϵͳ"
#: ../../steps.pm_.c:21
msgid "Format partitions"
@@ -13553,7 +14382,7 @@ msgstr "��ʽ������"
#: ../../steps.pm_.c:22
msgid "Choose packages to install"
-msgstr "��ѡ������"
+msgstr "ѡ��������"
#: ../../steps.pm_.c:23
msgid "Install system"
@@ -13565,11 +14394,11 @@ msgstr "�����û�"
#: ../../steps.pm_.c:26
msgid "Configure networking"
-msgstr "��������"
+msgstr "��������"
#: ../../steps.pm_.c:28
msgid "Configure services"
-msgstr "�趨��̨����"
+msgstr "���÷���"
#: ../../steps.pm_.c:29
msgid "Install bootloader"
@@ -13577,7 +14406,7 @@ msgstr "��װ��������"
#: ../../steps.pm_.c:31
msgid "Create a bootdisk"
-msgstr "������������"
+msgstr "����������"
#: ../../steps.pm_.c:33
msgid "Configure X"
@@ -13585,16 +14414,20 @@ msgstr "���� X"
#: ../../steps.pm_.c:34
msgid "Install system updates"
-msgstr "��װϵͳ���°�"
+msgstr "��װϵͳ����"
#: ../../steps.pm_.c:35
msgid "Exit install"
msgstr "�˳���װ"
-#: ../../ugtk.pm_.c:648
+#: ../../ugtk.pm_.c:636
msgid "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
msgstr "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
+#: ../../ugtk2.pm_.c:711
+msgid "utopia 25"
+msgstr "utopia 25"
+
#: ../../share/compssUsers:999
msgid "Web/FTP"
msgstr "Web/FTP"
@@ -13665,7 +14498,7 @@ msgstr "��ý�� - ��Ƶ"
#: ../../share/compssUsers:999
msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr "һ������ �ʼ�, ����, �ļ�����, ����Ĺ���"
+msgstr "һ�������ʼ�, ����, �ļ�����, ����Ĺ���"
#: ../../share/compssUsers:999
msgid "Database"
@@ -13693,7 +14526,7 @@ msgstr "����̨����"
#: ../../share/compssUsers:999
msgid "Postfix mail server, Inn news server"
-msgstr "Postfix�ʼ�����, Inn ���������"
+msgstr "Postfix�ʼ�����, Inn ���������"
#: ../../share/compssUsers:999
msgid "Internet station"
@@ -13803,7 +14636,7 @@ msgstr "LSB"
#: ../../share/compssUsers:999
msgid "Internet gateway"
-msgstr "��������������"
+msgstr "����������"
#: ../../share/compssUsers:999
msgid "Sound and video playing/editing programs"
@@ -13832,27 +14665,3 @@ msgstr "��ý�� - ��¼����"
#: ../../share/compssUsers:999
msgid "Scientific Workstation"
msgstr "��ѧ���㹤��վ"
-
-#~ msgid ""
-#~ "WebDAV is a protocol that allows you to mount a web server's directory\n"
-#~ "locally, and treat it like a local filesystem (provided the web server "
-#~ "is\n"
-#~ "configured as a WebDAV server). If you would like to add WebDAV mount\n"
-#~ "points, select ��New��."
-#~ msgstr ""
-#~ "WebDAV ��һ��Э��, ���������� Web ��������Ŀ¼װ�ص�����, �����俴����\n"
-#~ "�ص��ļ�ϵͳ(����� Web �������Ѿ�����Ϊ WebDAV ������)���������Ҫ����\n"
-#~ "WebDAV �����, ��ѡ���½�����"
-
-#~ msgid ""
-#~ "Please select the correct port. For example, the ��COM1�� port under\n"
-#~ "Windows is named \"ttyS0\" under GNU/Linux."
-#~ msgstr ""
-#~ "��ѡ����ȷ�Ķ˿ڡ�����, \n"
-#~ "MS Windows ��� COM1, �� GNU/Linux ������� ��ttyS0����"
-
-#~ msgid "unable to backup lilo message"
-#~ msgstr "�޷����� LILO ��Ϣ"
-
-#~ msgid "can't change lilo message"
-#~ msgstr "�޷��޸� LILO ��Ϣ"