summaryrefslogtreecommitdiffstats
path: root/perl-install/share/po/zh_CN.po
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install/share/po/zh_CN.po')
-rw-r--r--perl-install/share/po/zh_CN.po1914
1 files changed, 964 insertions, 950 deletions
diff --git a/perl-install/share/po/zh_CN.po b/perl-install/share/po/zh_CN.po
index e6f4c3994..d2984d3a8 100644
--- a/perl-install/share/po/zh_CN.po
+++ b/perl-install/share/po/zh_CN.po
@@ -4,13 +4,14 @@
# Jesse Kuang <kjx@mandrakesoft.com>, 2002
# Funda Wang <mandrake@en2china.com>, 2002
# Shiyu Tang <shiyutang@netscape.net>, 2003
+# Funda Wang <mandrake@en2china.com>, 2003
#
msgid ""
msgstr ""
"Project-Id-Version: DrakX 9.1\n"
"POT-Creation-Date: 2002-12-05 19:52+0100\n"
-"PO-Revision-Date: 2003-02-14 15:50+0800\n"
-"Last-Translator: Shiyu Tang <shiyutang@netscape.net>\n"
+"PO-Revision-Date: 2003-02-24 03:55+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"
@@ -26,16 +27,18 @@ msgstr ""
"���û��Ĺ���ʹ���顰fileshare����\n"
"������ʹ�� userdrake ����һ���û�������顣"
-#: ../../any.pm:1 ../../bootlook.pm:1 ../../install_steps_gtk.pm:1
-#: ../../interactive.pm:1 ../../my_gtk.pm:1 ../../ugtk2.pm:1 ../../ugtk.pm:1
+#: ../../any.pm:1 ../../install_steps_gtk.pm:1
+#: ../../install_steps_interactive.pm:1 ../../interactive.pm:1
+#: ../../my_gtk.pm:1 ../../ugtk2.pm:1 ../../ugtk.pm:1
#: ../../Xconfig/resolution_and_depth.pm:1 ../../diskdrake/smbnfs_gtk.pm:1
#: ../../interactive/http.pm:1 ../../interactive/newt.pm:1
#: ../../interactive/stdio.pm:1 ../../network/netconnect.pm:1
#: ../../printer/printerdrake.pm:1 ../../standalone/drakautoinst:1
-#: ../../standalone/drakbackup:1 ../../standalone/drakconnect:1
-#: ../../standalone/drakfloppy:1 ../../standalone/drakfont:1
-#: ../../standalone/drakgw:1 ../../standalone/draksec:1
-#: ../../standalone/logdrake:1 ../../standalone/net_monitor:1
+#: ../../standalone/drakbackup:1 ../../standalone/drakboot:1
+#: ../../standalone/drakconnect:1 ../../standalone/drakfloppy:1
+#: ../../standalone/drakfont:1 ../../standalone/drakgw:1
+#: ../../standalone/draksec:1 ../../standalone/logdrake:1
+#: ../../standalone/net_monitor:1
#, c-format
msgid "Cancel"
msgstr "ȡ��"
@@ -54,8 +57,8 @@ msgid ""
"\n"
"\"Custom\" permit a per-user granularity.\n"
msgstr ""
-"��Ը�����û��ܹ������ǵ�Ŀ¼��?\n"
-"������ѡ������, �û��������� KDE �� Gnome ���ļ��������е�����������˵���\n"
+"��Ը�����û��ܹ������ǵ�Ŀ¼��\n"
+"������ѡ���������û��������� KDE �� Gnome ���ļ��������е������������˵���\n"
"�����ơ��������ղ�ͬ�û�ϸ�����á�\n"
#: ../../any.pm:1 ../../install_any.pm:1 ../../standalone.pm:1
@@ -67,12 +70,12 @@ msgstr "�޷��ҵ������������ %s"
#, c-format
msgid ""
"You can export using NFS or Samba. Please select which you'd like to use."
-msgstr "������ͨ�� NFS �� Samba �������ļ�����ϣ��ʹ����һ��? "
+msgstr "������ͨ�� NFS �� Samba �������ļ�����ϣ��ʹ����һ����"
#: ../../any.pm:1 ../../install_any.pm:1 ../../standalone.pm:1
#, c-format
msgid "The package %s needs to be installed. Do you want to install it?"
-msgstr "��Ҫ��װ������ %s����ͬ�ⰲװ��?"
+msgstr "��Ҫ��װ������ %s����ͬ�ⰲװ��"
#: ../../any.pm:1 ../../Xconfig/main.pm:1 ../../Xconfig/monitor.pm:1
#, c-format
@@ -98,28 +101,27 @@ msgstr "����"
#: ../../any.pm:1
#, c-format
msgid "Here is the full list of available countries"
-msgstr "�����������ṩ�Ĺ��ң���������б�"
+msgstr "�����������ṩ�Ĺ���/�����б�"
#: ../../any.pm:1
#, c-format
msgid "Please choose your country."
-msgstr "��ѡ�����Ĺ��ң����������"
+msgstr "��ѡ�����Ĺ���/������"
#: ../../any.pm:1 ../../install_steps_interactive.pm:1
#, c-format
msgid "Country"
-msgstr "���ң����������"
+msgstr "����/������"
#: ../../any.pm:1
#, c-format
-msgid "Use Unicode by default"
-msgstr "Ĭ��ʹ�� Unicode"
+msgid "All languages"
+msgstr "��������"
-#: ../../any.pm:1 ../../install_steps_interactive.pm:1
-#: ../../standalone/drakxtv:1
+#: ../../any.pm:1
#, c-format
-msgid "All"
-msgstr "ȫ��"
+msgid "Use Unicode by default"
+msgstr "Ĭ��ʹ�� Unicode"
#: ../../any.pm:1
#, c-format
@@ -149,7 +151,7 @@ msgstr "ѡ��Ĭ�ϵ��û���"
#: ../../any.pm:1
#, c-format
msgid "Do you want to use this feature?"
-msgstr "��Ҫʹ�����������"
+msgstr "��Ҫʹ�ô�������"
#: ../../any.pm:1
#, c-format
@@ -192,7 +194,7 @@ msgstr "�û���¼��"
#: ../../any.pm:1
#, c-format
msgid "Real name"
-msgstr "�û���ʵ����"
+msgstr "��ʵ����"
#: ../../any.pm:1
#, c-format
@@ -466,12 +468,12 @@ msgstr "����Ϊ��λ�����ڴ��С"
#: ../../any.pm:1
#, c-format
msgid "Enable multiple profiles"
-msgstr "���������"
+msgstr "������������"
#: ../../any.pm:1
#, c-format
msgid "Precise RAM size if needed (found %d MB)"
-msgstr "��ȷ�Ĵ洢����С���ҵ� %d MB��"
+msgstr "��ȷ���ڴ��С���ҵ� %d MB��"
#: ../../any.pm:1
#, c-format
@@ -495,6 +497,16 @@ msgstr "����������ѡ��"
#: ../../any.pm:1
#, c-format
+msgid "Force No APIC"
+msgstr "ǿ���� APIC"
+
+#: ../../any.pm:1
+#, c-format
+msgid "Enable ACPI"
+msgstr "���� ACPI"
+
+#: ../../any.pm:1
+#, c-format
msgid "Delay before booting default image"
msgstr "����Ĭ��ӳ��ǰ���ӳ�"
@@ -550,6 +562,11 @@ msgstr "��������"
#: ../../any.pm:1
#, c-format
+msgid "First sector of the root partition"
+msgstr "root �����ĵ�һ����"
+
+#: ../../any.pm:1
+#, c-format
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: "
@@ -566,7 +583,7 @@ msgstr ""
#: ../../any.pm:1
#, c-format
msgid "Creating bootdisk..."
-msgstr "���������������̡���"
+msgstr "����������������..."
#: ../../any.pm:1
#, c-format
@@ -612,7 +629,7 @@ msgstr ""
"��������밲װ LILO���� grub����������������ϵͳ�� LILO ɾ���ˣ�����\n"
" LILO ������Ӳ���ϲ��ܹ�������ô��ͺ����ô��ˡ�\n"
"�����̻����Ժ� Mandrake �޸������ʹ�ã������������ɵĻָ����ع��ϵ�ϵͳ��\n"
-"���ھ͸�����ϵͳ��һ�������̣�����?\n"
+"���ھ͸�����ϵͳ��һ�������̣�����\n"
"%s"
#: ../../any.pm:1
@@ -652,7 +669,7 @@ msgstr ""
"��������밲װ SILO, ������������ϵͳ�� SILO ɾ���ˣ�����\n"
" SILO ������Ӳ���ϲ��ܹ�������ô��ͺ����ô��ˡ�\n"
"�����̻����Ժ� Mandrake �޸������ʹ�ã������������ɵĻָ����ع��ϵ�ϵͳ��\n"
-"���ھ͸�����ϵͳ��һ�������̣�����? \n"
+"���ھ͸�����ϵͳ��һ�������̣�����\n"
"�ڵ�һ���������������һƬ���̣�Ȼ�󰴡�ȷ����"
#: ../../bootloader.pm:1
@@ -741,240 +758,6 @@ msgstr ""
"wait %d seconds for default boot.\n"
"\n"
-#: ../../bootlook.pm:1 ../../ugtk2.pm:1 ../../ugtk.pm:1
-#: ../../network/netconnect.pm:1 ../../standalone/drakTermServ:1
-#: ../../standalone/drakbackup:1 ../../standalone/drakconnect:1
-#: ../../standalone/drakfont:1 ../../standalone/net_monitor:1
-#, c-format
-msgid "OK"
-msgstr "ȷ��"
-
-#: ../../bootlook.pm:1
-#, c-format
-msgid "Yes, I want autologin with this (user, desktop)"
-msgstr "�ǣ��ԣ��û������棩��¼"
-
-#: ../../bootlook.pm:1
-#, c-format
-msgid "No, I don't want autologin"
-msgstr "�񣬲�Ҫ�Զ���¼"
-
-#: ../../bootlook.pm:1
-#, c-format
-msgid "Launch the graphical environment when your system starts"
-msgstr "ϵͳ����ʱװ��ͼ�λ���"
-
-#: ../../bootlook.pm:1
-#, c-format
-msgid "System mode"
-msgstr "ϵͳģʽ"
-
-#: ../../bootlook.pm:1
-#, c-format
-msgid "Bootsplash"
-msgstr "Bootsplash ��������"
-
-#: ../../bootlook.pm:1
-#, c-format
-msgid "Lilo screen"
-msgstr "Lilo ��Ļ"
-
-#: ../../bootlook.pm:1
-#, c-format
-msgid ""
-"\n"
-"Select the theme for\n"
-"lilo and bootsplash,\n"
-"you can choose\n"
-"them separately"
-msgstr ""
-"\n"
-"ѡ������ lilo �� bootsplash �����⣬\n"
-"�����Էֱ�ѡ��"
-
-#: ../../bootlook.pm:1
-#, c-format
-msgid "Themes"
-msgstr "����"
-
-#: ../../bootlook.pm:1
-#, c-format
-msgid "Splash selection"
-msgstr "ѡ����������"
-
-#: ../../bootlook.pm:1 ../../standalone/drakbackup:1 ../../standalone/drakgw:1
-#, c-format
-msgid "Configure"
-msgstr "����"
-
-#: ../../bootlook.pm:1
-#, c-format
-msgid ""
-"You are currently using %s as your boot manager.\n"
-"Click on Configure to launch the setup wizard."
-msgstr ""
-"��Ŀǰʹ�� %s ��Ϊ���������������\n"
-"��������á���ť���������򵼡�"
-
-#: ../../bootlook.pm:1
-#, c-format
-msgid "LiLo and Bootsplash themes installation successfull"
-msgstr "LiLo �� Bootsplash ���ⰲװ�ɹ�"
-
-#: ../../bootlook.pm:1
-#, c-format
-msgid "Theme installation failed!"
-msgstr "���ⰲװʧ�ܣ�"
-
-#: ../../bootlook.pm:1 ../../standalone/draksplash:1
-#, c-format
-msgid "Notice"
-msgstr "ע��"
-
-#: ../../bootlook.pm:1 ../../fsedit.pm:1 ../../install_steps_interactive.pm:1
-#: ../../install_steps.pm:1 ../../diskdrake/dav.pm:1
-#: ../../diskdrake/hd_gtk.pm:1 ../../diskdrake/interactive.pm:1
-#: ../../diskdrake/smbnfs_gtk.pm:1 ../../interactive/http.pm:1
-#: ../../standalone/draksplash:1
-#, c-format
-msgid "Error"
-msgstr "����"
-
-#: ../../bootlook.pm:1
-#, c-format
-msgid "Relaunch 'lilo'"
-msgstr "����������lilo��"
-
-#: ../../bootlook.pm:1
-#, c-format
-msgid ""
-"Can't relaunch LiLo!\n"
-"Launch \"lilo\" as root in command line to complete LiLo theme installation."
-msgstr ""
-"�޷��������� LiLo!\n"
-"�� root �������С�lilo���������� LiLo ���ⰲװ��"
-
-#: ../../bootlook.pm:1
-#, c-format
-msgid "Make initrd 'mkinitrd -f /boot/initrd-%s.img %s'."
-msgstr "���� initrd 'mkinitrd -f /boot/initrd-%s.img %s'��"
-
-#: ../../bootlook.pm:1
-#, c-format
-msgid "Can't launch mkinitrd -f /boot/initrd-%s.img %s."
-msgstr "�޷��� mkinitrd -f /boot/initrd-%s.img %s��"
-
-#: ../../bootlook.pm:1
-#, c-format
-msgid ""
-"Can't write /etc/sysconfig/bootsplash\n"
-"File not found."
-msgstr ""
-"�޷�д�� /etc/sysconfig/bootsplash\n"
-"û���ҵ��ļ���"
-
-#: ../../bootlook.pm:1
-#, c-format
-msgid "Write %s"
-msgstr "� %s"
-
-#: ../../bootlook.pm:1
-#, c-format
-msgid "Can't write /etc/sysconfig/bootsplash."
-msgstr "�޷�д�� /etc/sysconfig/bootsplash��"
-
-#: ../../bootlook.pm:1
-#, c-format
-msgid "Lilo message not found"
-msgstr "û���ҵ� LILO ��Ϣ"
-
-#: ../../bootlook.pm:1
-#, c-format
-msgid "Copy %s to %s"
-msgstr "�� %s ���Ƶ� %s"
-
-#: ../../bootlook.pm:1
-#, c-format
-msgid "Backup %s to %s.old"
-msgstr "�� %s ���ݵ� %s.old"
-
-#: ../../bootlook.pm:1
-#, c-format
-msgid "Create new theme"
-msgstr "�����µ�����"
-
-#: ../../bootlook.pm:1
-#, c-format
-msgid ""
-"Display theme\n"
-"under console"
-msgstr ""
-"�ڿ���̨\n"
-"��ʾ����"
-
-#: ../../bootlook.pm:1
-#, c-format
-msgid "Install themes"
-msgstr "��װ����"
-
-#: ../../bootlook.pm:1
-#, c-format
-msgid "Lilo/grub mode"
-msgstr "Lilo/grubģʽ"
-
-#: ../../bootlook.pm:1
-#, c-format
-msgid "Yaboot mode"
-msgstr "Yaboot ģʽ"
-
-#: ../../bootlook.pm:1
-#, c-format
-msgid "Launch Aurora at boot time"
-msgstr "����ʱ���� Aurora"
-
-#: ../../bootlook.pm:1
-#, c-format
-msgid "Traditional Gtk+ Monitor"
-msgstr "��ͳ Gtk+ ��ʾ��"
-
-#: ../../bootlook.pm:1
-#, c-format
-msgid "Traditional Monitor"
-msgstr "��ͳ��ʾ��"
-
-#: ../../bootlook.pm:1
-#, c-format
-msgid "NewStyle Monitor"
-msgstr "������ʾ��"
-
-#: ../../bootlook.pm:1
-#, c-format
-msgid "NewStyle Categorizing Monitor"
-msgstr "������ʾ��"
-
-#: ../../bootlook.pm:1 ../../standalone/drakfloppy:1
-#: ../../standalone/harddrake2:1 ../../standalone/logdrake:1
-#, c-format
-msgid "<control>Q"
-msgstr "<control>Q"
-
-#: ../../bootlook.pm:1 ../../standalone/drakfloppy:1
-#: ../../standalone/logdrake:1
-#, c-format
-msgid "/File/_Quit"
-msgstr "�ļ�/�˳�(Q)"
-
-#: ../../bootlook.pm:1 ../../standalone/drakfloppy:1
-#: ../../standalone/harddrake2:1 ../../standalone/logdrake:1
-#, c-format
-msgid "/_File"
-msgstr "�ļ�(F)"
-
-#: ../../bootlook.pm:1
-#, c-format
-msgid "Boot Style Configuration"
-msgstr "�����������"
-
#: ../../common.pm:1
#, c-format
msgid "consolehelper missing"
@@ -988,7 +771,7 @@ msgstr "ȱ�� kdesu"
#: ../../common.pm:1
#, c-format
msgid "Screenshots will be available after install in %s"
-msgstr "�������ڰ�װ�� %s ֮����ʹ����Ļ��׽����"
+msgstr "��װ��ɺ����е���Ļץͼ���ᱣ�浽 %s ֮��"
#: ../../common.pm:1
#, c-format
@@ -1099,7 +882,7 @@ msgstr "�ڴ� %s д��ʱ��������%s"
#: ../../fsedit.pm:1
#, c-format
msgid "Nothing to do"
-msgstr "�����"
+msgstr "���¿���"
#: ../../fsedit.pm:1
#, c-format
@@ -1116,7 +899,7 @@ msgstr "����� %s ����ʹ���ü��ܵ��ļ�ϵͳ"
msgid ""
"You need a true filesystem (ext2/ext3, reiserfs, xfs, or jfs) for this mount "
"point\n"
-msgstr "������ص���Ҫһ���������ļ�ϵͳ��ext2/ext3��reiserfs��xfs �� jfs)\n"
+msgstr "������ص���Ҫһ���������ļ�ϵͳ��ext2/ext3��reiserfs��xfs �� jfs��\n"
#: ../../fsedit.pm:1
#, c-format
@@ -1130,11 +913,27 @@ msgstr "������ LVM �߼����� %s װ�ص�"
#: ../../fsedit.pm:1
#, c-format
+msgid ""
+"You've selected a software RAID partition as root (/).\n"
+"No bootloader is able to handle this without a /boot partition.\n"
+"Please be sure to add a /boot partition"
+msgstr ""
+"��ѡ���˰����� RAID ������Ϊ�� (/)��\n"
+"���û��һ�� /boot ����, �����������������޷��������������\n"
+"����, ������һ�� /boot ������"
+
+#: ../../fsedit.pm:1
+#, c-format
msgid "There is already a partition with mount point %s\n"
msgstr "�Ѿ���һ��������װ�ص��� %s\n"
#: ../../fsedit.pm:1
#, c-format
+msgid "Mount points should contain only alphanumerical characters"
+msgstr "�����ֻ�ܰ�����ĸ������"
+
+#: ../../fsedit.pm:1
+#, c-format
msgid "Mount points must begin with a leading /"
msgstr "װ�ص����Ҫ�� / Ϊ��ͷ"
@@ -1165,6 +964,15 @@ msgstr ""
"\n"
"��ͬ��������з�����\n"
+#: ../../fsedit.pm:1 ../../install_steps_interactive.pm:1
+#: ../../install_steps.pm:1 ../../diskdrake/dav.pm:1
+#: ../../diskdrake/hd_gtk.pm:1 ../../diskdrake/interactive.pm:1
+#: ../../diskdrake/smbnfs_gtk.pm:1 ../../interactive/http.pm:1
+#: ../../standalone/drakboot:1 ../../standalone/draksplash:1
+#, c-format
+msgid "Error"
+msgstr "����"
+
#: ../../fsedit.pm:1
#, c-format
msgid "server"
@@ -1226,7 +1034,7 @@ msgid "%s formatting of %s failed"
msgstr "%s ��ʽ�� %s ʧ��"
#: ../../help.pm:1
-#, fuzzy, c-format
+#, c-format
msgid ""
"Click on \"Next ->\" if you want to delete all data and partitions present\n"
"on this hard drive. Be careful, after clicking on \"Next ->\", you will not\n"
@@ -1236,10 +1044,10 @@ msgid ""
"Click on \"<- Previous\" to stop this operation without losing any data and\n"
"partitions present on this hard drive."
msgstr ""
-"�����ȷ����ɾ����Ӳ���������ݼ�������\n"
-"ע�⣬�����ȷ�����������޷��ָ����ݼ����������� Windows ��\n"
-"�ݣ���\n"
-"�����ȡ����ȡ�����������ݼ��������ᶪʧ��"
+"�������Ҫɾ����Ӳ���ϵ��������ݺͷ������뵥������һ�� ->����\n"
+"ע�⣬��������һ�� ->���������޷��ָ���Ӳ���ϵ��κ����ݻ����������\n"
+"�κ� Windows ���ݣ���\n"
+"������<- ��һ��������ֹͣ�˲�������Ӳ���ϵ��κ����ݻ�������ᶪʧ��"
#: ../../help.pm:1
#, c-format
@@ -1248,11 +1056,11 @@ msgid ""
"Mandrake Linux partition. Be careful, all data present on it will be lost\n"
"and will not be recoverable!"
msgstr ""
-"ѡ��Ӳ����׼���������װ Mandrake������\n"
-"ע�⣬�������ݽ���ʧ�����޷��ָ���"
+"��ѡ����Ϊ�˰�װ�µ� Mandrake Linux ������Ҫɾ����Ӳ�̡�\n"
+"ע�⣬��Ӳ���ϵ��������ݽ���ʧ�����޷��ָ���"
#: ../../help.pm:1
-#, fuzzy, c-format
+#, c-format
msgid ""
"As a review, DrakX will present a summary of various information it has\n"
"about your system. Depending on your installed hardware, you may have some\n"
@@ -1269,8 +1077,8 @@ msgid ""
"\n"
" * \"Timezone\": By default, DrakX deduces your time zone based on the\n"
"primary language you have chosen. But here, just as in your choice of a\n"
-"keyboard, you may not be in the country for which the chosen language\n"
-"should correspond. You may need to click on the \"Timezone\" button to\n"
+"keyboard, you may not be in a country to which the chosen language\n"
+"corresponds. You may need to click on the \"Timezone\" button to\n"
"configure the clock for the correct timezone.\n"
"\n"
" * \"Printer\": clicking on the \"No Printer\" button will open the printer\n"
@@ -1283,7 +1091,7 @@ msgid ""
"\n"
" * \"Graphical Interface\": by default, DrakX configures your graphical\n"
"interface in \"800x600\" resolution. If that does not suits you, click on\n"
-"the button to reconfigure your grapical interface.\n"
+"the button to reconfigure your graphical interface.\n"
"\n"
" * \"Network\": If you want to configure your Internet or local network\n"
"access now, you can by clicking on this button.\n"
@@ -1301,35 +1109,40 @@ msgid ""
"displayed here. You can click on the button to change the parameters\n"
"associated with the card."
msgstr ""
-"�����г����й����ĵ��Եĸ�����Ϣ����������װ��\n"
-"��Ӳ����ͬ�������ܿ���������Ŀ��\n"
+"Ϊ�˸���һ����������ʶ��DrakX �����ڴ��г��й���ϵͳ�ĸ�����Ϣ������������\n"
+"װ��Ӳ����ͬ�������ܿ������¼��ֻ�ȫ����Ŀ��\n"
"\n"
-" * ����ꡱ���鿴���ڵ�������ã�\n"
-"��Ҫ�Ļ�����޸İ�ť��\n"
+" * ����ꡱ��������ڵ�������ã���Ҫ�Ļ�������ť���и��ġ�\n"
"\n"
-" * �����̡����鿴���ڵļ������ã�\n"
-"��Ҫ�Ļ�����޸İ�ť��\n"
+" * �����̡���������ڵļ������ã���Ҫ�Ļ�������ť���и��ġ�\n"
"\n"
-" * ��ʱ������DrakX ��ͨ����ѡ�������\n"
-"�²������ڵ�ʱ����������Ҳ����ʹ������\n"
-"ȴ�����й�����ô����Ҫ�����ʱ�����İ�\n"
-"ť����ȷ����������ϵͳʱ���Է���������\n"
-"��ʱ����\n"
+" * ������/��������������ڵĹ���/����ѡ�����������λ�ڸù���/�������뵥\n"
+"����ť��ѡ������һ������/������\n"
"\n"
-" * ����ӡ�����������û�д�ӡ������ť\n"
-"��������ӡ�����þ��飻��ο�����ѧ��ָ\n"
-"�ϡ����Ķ��������ô�ӡ���������Ͱ�װ\n"
-"��ࣻ\n"
+" * ��ʱ������Ĭ������£�DrakX �������ѡ�����Ҫ���Բ²������ڵ�ʱ������\n"
+"�ǣ������������ڴ�ѡ�����һ����������ѡ��ʹ�����ĵ��������й�����ʱ������\n"
+"������Ҫ������ʱ������ť��������ȷʱ����ʱ�ӡ�\n"
"\n"
-" * ���������������������ϵͳ��������\n"
-"������������ʾ��\n"
+" * ����ӡ�������������޴�ӡ������ť��������ӡ�������򵼡���ο�����ѧ��ָ\n"
+"�ϡ����Ķ�����������ô�ӡ���ĸ�����Ϣ���ڴ�����ʾ�Ľ���Ͱ�װʱ��ʹ�õĽ�\n"
+"��ʮ�����ơ�\n"
"\n"
-" * �����ӿ����������������ϵͳ�е��ӿ���\n"
-"������������ʾ��\n"
+" * ���������򡱣��������Ҫ�������������������ã��뵥���ð�ť������ֻ�и�\n"
+"���û���ʹ�øù��ܡ�\n"
"\n"
-" * ��ISDN �����������������ϵͳ�� ISDN\n"
-"����������������ʾ�������Ե����ť����\n"
-"�������йصIJ�����"
+" * ��ͼ�ν��桱��Ĭ������£�DrakX �Ὣ����ͼ�ν�������Ϊ��800x600���ķֱ�\n"
+"�ʡ��������Ҫ�����Ļ����뵥���ð�ť������������ͼ�ν��档\n"
+"\n"
+" * �����硱���������Ҫ������������ Internet ����������Ϳ��Ե����ð�ť��\n"
+"\n"
+" * ���������������������ϵͳ���������ͻ��ڴ���ʾ����������������ڴ���ʾ\n"
+"����������ʵ��ӵ�е����������Ļ����Ϳ��Ե����ð�ťѡ����������������\n"
+"\n"
+" * �����ӿ����������������ϵͳ�е��ӿ����ͻ��ڴ���ʾ������������е��ӿ���\n"
+"����δ�����������뵥���ð�ť�����ֶ��������á�\n"
+"\n"
+" * ��ISDN �����������������ϵͳ�� ISDN �����ͻ��ڴ���ʾ�����������Ե�����\n"
+"ť���޸��йز�����"
#: ../../help.pm:1
#, c-format
@@ -1339,9 +1152,11 @@ msgid ""
"actually present on your system, you can click on the button and choose\n"
"another driver."
msgstr ""
+"���������������������ϵͳ���������ͻ��ڴ���ʾ����������������ڴ���ʾ\n"
+"����������ʵ��ӵ�е����������Ļ����Ϳ��Ե����ð�ťѡ����������������"
#: ../../help.pm:1
-#, fuzzy, c-format
+#, c-format
msgid ""
"Yaboot is a bootloader for NewWorld Macintosh hardware and can be used to\n"
"boot GNU/Linux, MacOS or MacOSX. Normally, MacOS and MacOSX are correctly\n"
@@ -1374,34 +1189,37 @@ msgid ""
" * Default OS: you can select which OS will boot by default when the Open\n"
"Firmware Delay expires."
msgstr ""
-"Yaboot �Ǹ�����һ�� MacIntosh Ӳ������������ϵͳ���������� GNU/Linux��"
-"MacOS \n"
-"�� MacOS X��ͨ������׼ȷ��̽�⵽��������ϵͳ�Ĵ��ڲ���װ��Ӧ����Ŀ�������"
-"��\n"
-"������\n"
-"�������ֹ������µ�ѡ�����ϸ�������IJ�����\n"
+"Yaboot �Ǹ�����һ�� Macintosh Ӳ���������������򣬿����������� GNU/Linux��\n"
+"MacOS �� MacOS X��ͨ������£����������������ȷ��⵽ MacOS �� MacOSX����\n"
+"����������������������IJ˵��С���������������������ڴ���Ļ�ֹ������µ�ѡ\n"
+"�����ϸ�������IJ�����\n"
"\n"
-"Yaboot��Ҫѡ�\n"
+"Yaboot ����Ҫѡ�\n"
"\n"
"\n"
-" - ��ʼ��Ϣ������������Ϣ��\n"
+" - ��ʼ��Ϣ��������ʾǰ��ʾ�ļ��ı���Ϣ��\n"
"\n"
"\n"
-" - �����豸����������װ�أ�\n"
+" - �����豸����������Ҫ�� GNU/Linux ����������Ϣ���������ͨ������£�\n"
+"��Ӧ��������һ���Ծٷ�������Ŵ���Ϣ��\n"
"\n"
"\n"
-" - �̼��ӳ٣�yaboot �Ŀ����ӳ�֮һ��\n"
+" - ���Ź̼��ӳ٣����� LILO��yaboot ���������ӳ١��������ڴ�ѡ���һ����"
+"�٣�\n"
+"��λ���룬�������� CD��OF ������MacOS �� Linux ֮��ѡ��\n"
"\n"
"\n"
-" - ���������ӳ٣����������ӳ١�\n"
+" - ���������ӳ٣����ӳ��� LILO �����ӳ����ơ�ѡ�� Linux ֮����������ѡ\n"
+"��Ĭ���ں�����֮ǰ�ȴ����ٸ� 0.1 �롣\n"
"\n"
"\n"
-" - ����CD��������'C' CD������\n"
-" - ����OF��������'N' �̼�������\n"
-" - Ĭ�ϲ���ϵͳ���̼�Ĭ�������IJ���ϵͳ��"
+" - ����CD��������ѡ�д�ѡ��������ڵ�һ��������ʾʱѡ��C����CD������\n"
+" - ����OF��������ѡ�д�ѡ��������ڵ�һ��������ʾʱѡ��N���ÿ��Ź̼�\n"
+"������\n"
+" - Ĭ�ϲ���ϵͳ��������ѡ���ڿ��Ź̼��ӳٵ�ʱ��Ĭ�������ĸ�����ϵͳ��"
#: ../../help.pm:1
-#, fuzzy, c-format
+#, c-format
msgid ""
"You can add additional entries in yaboot for other operating systems,\n"
"alternate kernels, or for an emergency boot image.\n"
@@ -1449,23 +1267,22 @@ msgid ""
"selectable by pressing ENTER at the yaboot prompt. This entry will also be\n"
"highlighted with a ``*'' if you press [Tab] to see the boot selections."
msgstr ""
-"������Ϊ Yaboot ���Ӹ������Ŀ���������IJ���ϵͳ�����õ��ںˣ�����\n"
-"һ��������������\n"
+"������Ϊ Yaboot ���Ӹ������Ŀ���������IJ���ϵͳ�����õ��ںˣ�����һ������\n"
+"��������\n"
"\n"
"����������ϵͳ����Ŀ����һ����ǩ���йصġ�����������\n"
"\n"
"���� Linux���м������ܵ�ѡ�\n"
"\n"
-" * Label����ֻ����Ϊ��ѡ���������ѡ�Ҫ�� yaboot ��ʾ����������֣�\n"
+" * Label����ֻ����Ϊ��ѡ���������ѡ�Ҫ�� yaboot ��ʾ����������֡�\n"
"\n"
-" * Image������Ҫ�������ں˵����֡�ͨ���� vmlinux\n"
-"���� vmlinux ���ϲ�ͬ����չ��\n"
+" * Image������Ҫ�������ں˵����֡�ͨ���� vmlinux ���� vmlinux ���ϲ�ͬ����\n"
+"չ��\n"
"\n"
-" * Root�������� �豸�������� Linux ��װ�� ``/''��\n"
+" * Root���������豸�������� Linux ��װ�ġ�/����\n"
"\n"
-" * Append����ƻ��Ӳ���У��ں˵� append ѡ��ᾭ���õ���\n"
-"�Ա��ʼ����ƵӲ�������߻�����̵�����ģ�⣬��Ϊƻ�������\n"
-"ֻ��һ��������\n"
+" * Append����ƻ����Ӳ���У��ں˵� append ѡ��ᾭ���õ����Ա��ʼ����ƵӲ\n"
+"�������߻�����̵�����ģ�⣬��Ϊƻ�������ֻ��һ��������\n"
"���磺\n"
"\n"
" video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111\n"
@@ -1473,22 +1290,20 @@ msgstr ""
"\n"
" video=atyfb:vmode:12,cmode:24 adb_buttons=103,111\n"
"\n"
-" * Initrd: ���ѡ������������������豸����֮ǰ���س�ʼģ�飬\n"
-"�����ڽ���������״������������һ�� ramdisk �ڴ��ļ�ϵͳ;\n"
+" * Initrd�����ѡ������������������豸����֮ǰ���س�ʼģ�飬�����ڽ�����\n"
+"����״������������һ�� ramdisk �ڴ��ļ�ϵͳ��\n"
"\n"
-" * Initrd-size: ȱʡ�� ramdisk ��Сһ���� 4,096 �ֽڡ� �����\n"
-"��Ҫ����һ����� ramdisk, ����ʹ�����ѡ��;\n"
+" * Initrd-size��ȱʡ�� ramdisk ��Сһ���� 4,096 �ֽڡ� �������Ҫ����һ��\n"
+"��� ramdisk������ʹ�����ѡ�\n"
"\n"
-" * Read-write: ͨ�� ��root�� �����������ֻ����ʽ���صģ��Ա���ϵͳ����\n"
-"��ʼ����֮ǰ����ļ�ϵͳ��\n"
-"���ѡ����������������ʽ��\n"
+" * Read-write��ͨ����root�������������ֻ����ʽ���صģ��Ա���ϵͳ������ʼ\n"
+"����֮ǰ����ļ�ϵͳ�����������ô�ѡ��Ϊ������ʽ��\n"
"\n"
-" * NoVideo: ����ƻ������Ƶ�豸����̫������⣬������ѡ��\n"
-"���ѡ���``novideo'' ģʽ����, ʹ���ڽ���֡����֧��;\n"
+" * NoVideo������ƻ������Ƶ�豸���������̫�࣬������ѡ�����ѡ���������\n"
+"�á�novideo��ģʽ������ʹ���ڽ���֡����֧�֡�\n"
"\n"
-" * Default: �������Ŀ���ó�ȱʡ�� Linux ѡ��,\n"
-"�� yaboot ��ʾ�а� ENTER �Ϳ��Խ��롣������� [Tab] �г���������ѡ�������Ŀ"
-"ǰ�����һ��``*''��"
+" * Default: �������Ŀ���ó�ȱʡ�� Linux ѡ���� yaboot ��ʾ�а� ENTER ��\n"
+"���Խ��롣������� [Tab] �г���������ѡ�������Ŀǰ�����һ����*����"
#: ../../help.pm:1
#, fuzzy, c-format
@@ -1520,11 +1335,11 @@ msgstr ""
"��� DrakX �ҵ��� SCSI ���������Զ���װ���ʵ���������\n"
"\n"
"Ӳ�����δ�����ܷ���ÿ���豸����ˣ�DrakX ������ȷ���Ƿ�װ�� PCI SCSI ����"
-"�����֪�����Ļ����ﰲװ�� SCSI �������� ���ǡ��� \n"
-"����Ҫ����ʾ�����б�����ѡ���Ŀ��� �����û�� SCSI �������� ���񡱡�\n"
+"�����֪�����Ļ����ﰲװ�� SCSI �����뵥�� ���ǡ��� \n"
+"����Ҫ����ʾ�����б�����ѡ���Ŀ��� �����û�� SCSI �����뵥�� ���񡱡�\n"
"�����Ҳ���������ѡ�񣬡��鿴Ӳ����Ϣ�����鿴���Ļ�����Ӳ�����Ľ����\n"
"Ȼ��ѡ��ȷ�ϡ���\n"
-"���Ӳ���嵥֮�󣬵�� ��ȷ�ϡ� ��ť�ص� SCSI �������⡣\n"
+"���Ӳ���嵥֮�󣬵��� ��ȷ�ϡ� ��ť�ص� SCSI �������⡣\n"
"\n"
"��������ò��ֹ���ѡ��������DrakX ���������Ƿ�Ҫָ���ر�IJ�����\n"
"������� DrakX ȥ̽��Ӳ����ȷ���ض�Ӳ����ʼ����Ҫ���ر������ \n"
@@ -1573,7 +1388,7 @@ msgstr ""
"�����������һ��ʹ�� GNU/Linux����ѡ��pdq����\n"
"��װ֮����������޸����ã�������\n"
"Mandrake �������ĵ� PrinterDrake ��ӡ�����á�\n"
-"�����ר��ģʽ��\n"
+"������ר��ģʽ��\n"
"\n"
" * ��CUPS�� - ��ͨ�� Unix ��ӡϵͳ���������Ǵ�ӡ��\n"
"���ش�ӡ�����Ǵ�ӡ��������һ��������ӡ�������ϵͳ����ʤ�Ρ�\n"
@@ -1612,7 +1427,7 @@ msgid ""
"installed on the second hard drive (\"/dev/hdb\"), or even on a floppy disk\n"
"(\"On Floppy\").\n"
"\n"
-"Checking \"Create a boot disk\" allows you to have a rescue bot media\n"
+"Checking \"Create a boot disk\" allows you to have a rescue boot media\n"
"handy.\n"
"\n"
"The Mandrake Linux CD-ROM has a built-in rescue mode. You can access it by\n"
@@ -1749,7 +1564,7 @@ msgstr ""
"Linux ϵͳ�����Ҫ�޸��κ�ѡ�һ��Ҫ���\n"
"������ʲô����\n"
"\n"
-"������߼�����ť����ʹ�ø����\n"
+"�������߼�����ť����ʹ�ø����\n"
"ѡ�ֻ��ר���û�����Ҫ���ǡ�\n"
"\n"
"������ͨ�õĿ�����������ѡ��֮�󣬻��ٴ�\n"
@@ -1757,7 +1572,7 @@ msgstr ""
"\n"
"������ĵ��Ի���װ�������IJ���ϵͳ�������Զ���\n"
"���ӵ������˵���������������ϸ�����е�ѡ�\n"
-"��ѡ��һ����Ŀ��������޸ġ������޸Ļ�ɾ������\n"
+"��ѡ��һ����Ŀ���������޸ġ������޸Ļ�ɾ������\n"
"�����ӡ�����һ������Ŀ��������ɡ� ������\n"
"��һ����װ���衣"
@@ -1789,7 +1604,7 @@ msgid ""
"``incorrect'' password will have to be used the first time you connect.\n"
"\n"
"If you wish access to this computer to be controlled by an authentication\n"
-"server, clisk the \"Advanced\" button.\n"
+"server, click the \"Advanced\" button.\n"
"\n"
"If your network uses either LDAP, NIS, or PDC Windows Domain authentication\n"
"services, select the appropriate one as \"authentication\". If you do not\n"
@@ -1903,12 +1718,12 @@ msgid ""
msgstr ""
"��ѡ������Ҫ�ڰ�װ��ƽ������ϵͳʱʹ�õ����ԡ�\n"
"\n"
-"������߼�����ťѡ������Ҫ��װ�����ԡ�ѡ���������Խ���װ�����Ե��ĵ�����ص�"
+"�������߼�����ťѡ������Ҫ��װ�����ԡ�ѡ���������Խ���װ�����Ե��ĵ�����ص�"
"�����ļ���\n"
"���磬������ͼ��ѡ���˼���������Ϊ��Ҫ���ԣ��ڸ߼�ѡ���л�����ѡ������"
"�ġ�\n"
"\n"
-"������ѡ����ָ��ӵ����Ժ͵������ã������ȷ�ϡ�������"
+"������ѡ����ָ��ӵ����Ժ͵������ã�������ȷ�ϡ�������"
#: ../../help.pm:1
#, fuzzy, c-format
@@ -1932,7 +1747,7 @@ msgstr ""
"ͨ����DrakX ������ѡ�������ѡ�����ú��ʵļ��̡�\n"
"������ļ��̲����ϸ�������Ե�Ҫ�������Դ��б���ѡ����Ҫ�ļ��̡�\n"
"\n"
-"��������ࡱ��ť���г�����֧�ֵļ��̡�"
+"���������ࡱ��ť���г�����֧�ֵļ��̡�"
#: ../../help.pm:1
#, c-format
@@ -2105,7 +1920,7 @@ msgstr ""
"��, ���붨��Ӳ�̷�����\n"
"\n"
"\n"
-"Ҫ������������������ѡ��һ��Ӳ�̡������hda������ѡ�е�һ�� IDE ������������"
+"Ҫ������������������ѡ��һ��Ӳ�̡�������hda������ѡ�е�һ�� IDE ������������"
"������\n"
"��hdb��ѡ�еڶ�������sda�����ڵ�һ�� SCSI ���������������ơ�\n"
"\n"
@@ -2201,7 +2016,7 @@ msgstr ""
"\n"
"ѡ���ǡ�����ʾһ���嵥���г��ܶ�ط������Դ������ȡ���µ���������\n"
"��ѡ�����������ٶ�����һ����ͨ����������ͬһ�����һ��һЩ��\n"
-"֮������һ���������ص��������嵥�����ѡ��Ȼ��������װ������ȡ\n"
+"֮������һ���������ص��������嵥�����ѡ��Ȼ�󵥻�����װ������ȡ\n"
"����װѡ�е���������Ҳֹͣ��ѡ��ȡ������"
#: ../../help.pm:1
@@ -2241,10 +2056,10 @@ msgstr ""
"\n"
"��С��ѡ�������һ��������ʽ���������ϵ��������ݽ���������޷��ָ���\n"
"\n"
-"׼���ú󣬵����ȷ�ϡ���ʼ��ʽ����\n"
+"׼���ú󣬵�����ȷ�ϡ���ʼ��ʽ����\n"
"\n"
"\n"
-"�����ȡ����ѡ������������װ Mandrake Linux ϵͳ��"
+"������ȡ����ѡ������������װ Mandrake Linux ϵͳ��"
#: ../../help.pm:1
#, fuzzy, c-format
@@ -2280,14 +2095,14 @@ msgid ""
"(*) You need a FAT-formatted floppy (to create one under GNU/Linux, type\n"
"\"mformat a:\")"
msgstr ""
-"���ˣ����� GNU/Linux ϵͳ�Ѿ�����ʹ���ˡ������ȷ����������������\n"
+"���ˣ����� GNU/Linux ϵͳ�Ѿ�����ʹ���ˡ�������ȷ����������������\n"
"\n"
"���߼�����ť��ֻ��ר��ģʽ���֣����������书�ܣ�\n"
"\n"
" * �������Զ���װ���̡������Դ���һ�����̣����԰������ղŵ�����\n"
"���°�װһ�����Ƶ�ϵͳ��������Ҫ�˹���Ԥ��\n"
"\n"
-" �����ť������ѡ�\n"
+" ������ť������ѡ�\n"
"\n"
" * ���طš��������Զ���װ��ֻ�д��̷��������ǽ����ģ�\n"
"\n"
@@ -2418,7 +2233,7 @@ msgstr ""
#: ../../help.pm:1
#, fuzzy, c-format
msgid ""
-"Checking \"Create a boot disk\" allows you to have a rescue bot media\n"
+"Checking \"Create a boot disk\" allows you to have a rescue boot media\n"
"handy.\n"
"\n"
"The Mandrake Linux CD-ROM has a built-in rescue mode. You can access it by\n"
@@ -2490,7 +2305,7 @@ msgid ""
"\n"
" You can choose here resolutions and color depth between those available\n"
"for your hardware. Choose the one that best suit your needs (you will be\n"
-"able to change that after installation though). Asample of the chosen\n"
+"able to change that after installation though). A sample of the chosen\n"
"configuration is shown in the monitor."
msgstr ""
@@ -2536,7 +2351,7 @@ msgid ""
"\n"
" You can choose here resolutions and color depth between those available\n"
"for your hardware. Choose the one that best suit your needs (you will be\n"
-"able to change that after installation though). Asample of the chosen\n"
+"able to change that after installation though). A sample of the chosen\n"
"configuration is shown in the monitor.\n"
"\n"
"\n"
@@ -2663,7 +2478,7 @@ msgid ""
"installed and use the program described there to configure your connection."
msgstr ""
"����������������������/���������ӡ������ϣ��\n"
-"�����ĵ������ӵ����������߱�������, ����\n"
+"�����ĵ������ӵ����������߱�������, �뵥��\n"
"��ȷ�������⽫�����Զ���������豸�͵��ƽ���������\n"
"���ʧ��, �������ʹ���Զ���⡱ѡ�������һ�Ρ���\n"
"Ҳ���Բ���������, �����Ժ�����; �������,\n"
@@ -2722,7 +2537,7 @@ msgstr ""
"����ѡ��������\n"
"\n"
"��������ͼ��ѡ��һ��������ʱ, �ұ߻��������˵����\n"
-"ѡ����Ҫ��װ����������, ��������װ����ť��\n"
+"ѡ����Ҫ��װ����������, �뵥������װ����ť��\n"
"��ͬ��Ӳ�����úͲ�ͬ��������ѡ��, ��Ҫ��ͬ��ʱ������ɰ�װ��\n"
"��Ļ�ϻ���ʾ��ɰ�װ���ƻ���Ҫ����ʱ�䡣\n"
"�����������ж��Ƿ�Ӧ����ȥ����һ���ò衣\n"
@@ -2733,14 +2548,14 @@ msgstr ""
"������\n"
"�����п���������汾�� Mandrake Linux ���֮�����µİ�ȫ©����\n"
"�������̫����йصķ�������������ʲô����, ����ΪʲôҪ��װ��, ���"
-"�����񡱡����������ǡ��г��ķ���������������װ, ����ȱʡ��������Щ��"
+"�����񡱡�����������ǡ��г��ķ���������������װ, ����ȱʡ��������Щ��"
"�� ����\n"
"\n"
" ���Զ������ԡ�ѡ���ڰ�װ�����Զ�ѡ����Ҫ��������ʱ����������档\n"
"����װ����ȷ������ҪΪ������һ����������������Ҫ��, ���밲װ�����\n"
"������ʱ, ���ͻ��Զ�ѡ�С�\n"
"\n"
-"������ʹ����ǰ�İ�װʱ������������б�������±ߵ��Ǹ�����ͼ��\n"
+"������ʹ����ǰ�İ�װʱ������������б��������±ߵ��Ǹ�����ͼ��\n"
"�ͻ�Ҫ���������ϴΰ�װ����ʱ������һ�����̡�\n"
"Ҫ�˽������������������, �뿴���һ������ʾ��"
@@ -2960,12 +2775,12 @@ msgstr ""
"ȫ������Ҫ,\n"
"Ȼ��û�����ɺ�����; ���Ͼ�ϣ�������Լ����ļ���\n"
"\n"
-"����������û���֮��, �����Լ������Ӹ�����û�������, ������ÿ������, ���ĸ�"
+"�����������û���֮��, �����Լ������Ӹ�����û�������, ������ÿ������, ���ĸ�"
"ĸ, �ֵܽ���\n"
"�ֱ���һ���ʻ���\n"
-"ȫ����֮��, �������ɡ���\n"
+"ȫ����֮��, ��������ɡ���\n"
"\n"
-"������߼�����ť�������޸��û��ġ�shell-������ͳ���\n"
+"�������߼�����ť�������޸��û��ġ�shell-������ͳ���\n"
"(ȱʡ������ bash )��"
#: ../../help.pm:1
@@ -2978,8 +2793,8 @@ msgid ""
msgstr ""
"���������Ķ������������ Mandrake Linux ���а涼������Լ�����������ͬ����"
"��\n"
-"ȫ������������ܾ�����ť����װ���̽�����ֹͣ��\n"
-"��������ܡ���ť��������װ��"
+"ȫ������뵥�����ܾ�����ť����װ���̽�����ֹͣ��\n"
+"���������ܡ���ť��������װ��"
#: ../../install2.pm:1
#, c-format
@@ -3047,12 +2862,14 @@ msgstr ""
#: ../../install_any.pm:1 ../../interactive.pm:1 ../../my_gtk.pm:1
#: ../../ugtk2.pm:1 ../../modules/interactive.pm:1
+#: ../../standalone/harddrake2:1
#, c-format
msgid "No"
msgstr "��"
#: ../../install_any.pm:1 ../../interactive.pm:1 ../../my_gtk.pm:1
#: ../../ugtk2.pm:1 ../../modules/interactive.pm:1 ../../standalone/drakgw:1
+#: ../../standalone/harddrake2:1
#, c-format
msgid "Yes"
msgstr "��"
@@ -3158,6 +2975,13 @@ msgstr "ɾ�� Windows(TM)"
msgid "There is no FAT partition to resize (or not enough space left)"
msgstr "û�� FAT ��������������С������û���㹻ʣ��ռ䣩"
+#: ../../install_interactive.pm:1 ../../diskdrake/interactive.pm:1
+#, c-format
+msgid ""
+"To ensure data integrity after resizing the partition(s), \n"
+"filesystem checks will be run on your next boot into Windows(TM)"
+msgstr ""
+
#: ../../install_interactive.pm:1
#, c-format
msgid "FAT resizing failed: %s"
@@ -3310,7 +3134,7 @@ msgid ""
"Then choose action ``Mount point'' and set it to `/'"
msgstr ""
"����ָ��һ����������\n"
-"���ȴ���һ�� Linux ���� (����ͼ�е�����е�һ��)��\n"
+"���ȴ���һ�� Linux ���� (����ͼ�е������е�һ��)��\n"
"Ȼ�����б���ѡ��װ�ص㡱, ��Ϊ��/����"
#: ../../install_interactive.pm:1
@@ -3617,6 +3441,26 @@ msgstr ""
msgid "Entering step `%s'\n"
msgstr "���벽�衰%s��\n"
+#: ../../install_steps_gtk.pm:1 ../../interactive.pm:1 ../../ugtk2.pm:1
+#: ../../Xconfig/resolution_and_depth.pm:1 ../../diskdrake/hd_gtk.pm:1
+#: ../../interactive/gtk.pm:1 ../../standalone/drakTermServ:1
+#: ../../standalone/drakbackup:1 ../../standalone/drakbug:1
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "Help"
+msgstr "����"
+
+#: ../../install_steps_gtk.pm:1 ../../install_steps_interactive.pm:1
+#, c-format
+msgid "not configured"
+msgstr "���"
+
+#: ../../install_steps_gtk.pm:1 ../../standalone/drakbackup:1
+#: ../../standalone/drakboot:1 ../../standalone/drakgw:1
+#, c-format
+msgid "Configure"
+msgstr "����"
+
#: ../../install_steps_gtk.pm:1 ../../install_steps_interactive.pm:1
#, c-format
msgid "Go on anyway?"
@@ -3643,8 +3487,8 @@ msgid ""
msgstr ""
"�뻻��һƬ����!\n"
"\n"
-"�����������в�����С�%s���Ĺ���, Ȼ������ȷ������\n"
-"�����û�����Ź���, ������ȡ����, ������װ��������ϵ�������"
+"�����������в�����С�%s���Ĺ���, Ȼ�󵥻���ȷ������\n"
+"�����û�����Ź���, �뵥����ȡ����, ������װ��������ϵ�������"
#: ../../install_steps_gtk.pm:1 ../../install_steps_interactive.pm:1
#, c-format
@@ -3668,9 +3512,9 @@ msgid "%d packages"
msgstr "%d ��������"
#: ../../install_steps_gtk.pm:1
-#, fuzzy, c-format
+#, c-format
msgid "No details"
-msgstr "��ϸ���"
+msgstr "����ϸ���"
#: ../../install_steps_gtk.pm:1 ../../diskdrake/hd_gtk.pm:1
#: ../../diskdrake/smbnfs_gtk.pm:1
@@ -3829,14 +3673,6 @@ msgstr "��һ�� ->"
msgid "Individual package selection"
msgstr "ѡ�񵥸�������"
-#: ../../install_steps_gtk.pm:1 ../../ugtk2.pm:1
-#: ../../Xconfig/resolution_and_depth.pm:1 ../../diskdrake/hd_gtk.pm:1
-#: ../../interactive/gtk.pm:1 ../../standalone/drakTermServ:1
-#: ../../standalone/drakbackup:1 ../../standalone/drakbug:1
-#, c-format
-msgid "Help"
-msgstr "����"
-
#: ../../install_steps_gtk.pm:1 ../../install_steps_interactive.pm:1
#, c-format
msgid "Package Group Selection"
@@ -4069,12 +3905,13 @@ msgstr "��֤"
msgid "This password is too short (it must be at least %d characters long)"
msgstr "�������̫���� (����Ҫ�� %d ���ַ�)"
+#. -PO: keep this short or else the buttons will not fit in the window
#: ../../install_steps_interactive.pm:1
#, c-format
msgid "No password"
msgstr "û�п���"
-#: ../../install_steps_interactive.pm:1 ../../steps.pm:1
+#: ../../install_steps_interactive.pm:1
#, c-format
msgid "Set root password"
msgstr "�����û�����"
@@ -4106,24 +3943,24 @@ msgid "Bootloader"
msgstr "������������"
#: ../../install_steps_interactive.pm:1
-#, fuzzy, c-format
+#, c-format
msgid "Boot"
-msgstr "��Ŀ¼"
+msgstr "����"
#: ../../install_steps_interactive.pm:1
-#, fuzzy, c-format
+#, c-format
msgid "disabled"
-msgstr "����"
+msgstr "�ѽ���"
#: ../../install_steps_interactive.pm:1
-#, fuzzy, c-format
+#, c-format
msgid "activated"
-msgstr "���ڼ���"
+msgstr "�Ѽ���"
#: ../../install_steps_interactive.pm:1
-#, fuzzy, c-format
+#, c-format
msgid "Firewall"
-msgstr "����ǽ/·����"
+msgstr "����ǽ"
#: ../../install_steps_interactive.pm:1 ../../steps.pm:1
#, c-format
@@ -4131,14 +3968,9 @@ msgid "Security"
msgstr "��ȫ"
#: ../../install_steps_interactive.pm:1
-#, fuzzy, c-format
-msgid "Security Level"
-msgstr "��ȫ����:"
-
-#: ../../install_steps_interactive.pm:1
#, c-format
-msgid "not configured"
-msgstr "���"
+msgid "Security Level"
+msgstr "��ȫ����"
#: ../../install_steps_interactive.pm:1 ../../standalone/drakbackup:1
#, c-format
@@ -4146,9 +3978,9 @@ msgid "Network"
msgstr "����"
#: ../../install_steps_interactive.pm:1
-#, fuzzy, c-format
+#, c-format
msgid "Network & Internet"
-msgstr "����ӿڿ�"
+msgstr "����� Internet"
#: ../../install_steps_interactive.pm:1
#, c-format
@@ -4156,19 +3988,19 @@ msgid "Graphical interface"
msgstr "ͼ�ν���"
#: ../../install_steps_interactive.pm:1
-#, fuzzy, c-format
+#, c-format
msgid "Hardware"
msgstr "HardDrake"
#: ../../install_steps_interactive.pm:1
#, c-format
msgid "TV card"
-msgstr "TV ��"
+msgstr "���ӿ�"
#: ../../install_steps_interactive.pm:1
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
-msgstr "û���ҵ�����. ���ڰ�װ֮���ԡ�harddrake����"
+msgstr "û�м�⵽���������ڰ�װ֮���ԡ�harddrake����"
#: ../../install_steps_interactive.pm:1
#, c-format
@@ -4242,6 +4074,16 @@ msgid "Which is your timezone?"
msgstr "�����ڵ�ʱ��?"
#: ../../install_steps_interactive.pm:1
+#, fuzzy, c-format
+msgid "Would you like to try again?"
+msgstr "�����ѡ��, ������\n"
+
+#: ../../install_steps_interactive.pm:1
+#, fuzzy, c-format
+msgid "Unable to contact mirror %s"
+msgstr "�޷���������: %s"
+
+#: ../../install_steps_interactive.pm:1
#, c-format
msgid "Contacting the mirror to get the list of available packages..."
msgstr "�������Ӿ�����վ��ȡ�ÿɹ���װ������б�..."
@@ -4317,9 +4159,14 @@ msgid ""
"If you have none of those CDs, click Cancel.\n"
"If only some CDs are missing, unselect them, then click Ok."
msgstr ""
-"�����ӵ���������еĹ���, ��� ȷ����\n"
-"�����û���κ�һ��, ��� ȡ����\n"
-"�����ȱ������һ��, �������ѡ�б��, Ȼ���� ȷ�ϡ�"
+"�����ӵ���������еĹ���, ���� ȷ����\n"
+"�����û���κ�һ��, ���� ȡ����\n"
+"�����ȱ������һ��, �������ѡ�б��, Ȼ�󵥻� ȷ�ϡ�"
+
+#: ../../install_steps_interactive.pm:1 ../../standalone/drakxtv:1
+#, c-format
+msgid "All"
+msgstr "ȫ��"
#: ../../install_steps_interactive.pm:1
#, c-format
@@ -4396,6 +4243,11 @@ msgstr "����ϵͳ��ʣ��Ŀռ䲻�����а�װ������ (%d > %d)"
#: ../../install_steps_interactive.pm:1
#, c-format
+msgid "Looking for available packages..."
+msgstr "����Ѱ�ҿɰ�װ�ij���..."
+
+#: ../../install_steps_interactive.pm:1
+#, c-format
msgid "Finding packages to upgrade..."
msgstr "����Ѱ�ҿ������ij���..."
@@ -4406,11 +4258,6 @@ msgstr "���ڲ����Ѿ���װ����������..."
#: ../../install_steps_interactive.pm:1
#, c-format
-msgid "Looking for available packages..."
-msgstr "����Ѱ�ҿɰ�װ�ij���..."
-
-#: ../../install_steps_interactive.pm:1
-#, c-format
msgid "Looking for available packages and rebuilding rpm database..."
msgstr "����Ѱ�ҿɰ�װ�ij����ؽ� rpm ���ݿ�..."
@@ -4517,11 +4364,6 @@ msgstr "��ѡ������������͡�"
#: ../../install_steps_interactive.pm:1
#, c-format
-msgid "Upgrade"
-msgstr "����"
-
-#: ../../install_steps_interactive.pm:1
-#, c-format
msgid "Upgrade %s"
msgstr "���� %s"
@@ -4545,17 +4387,21 @@ msgstr "�����嵥"
msgid "Please choose your keyboard layout."
msgstr "��ѡ����ʹ�õļ��̲��֡�"
+#: ../../install_steps_interactive.pm:1 ../../Xconfig/main.pm:1
+#: ../../diskdrake/dav.pm:1 ../../printer/printerdrake.pm:1
+#: ../../standalone/drakperm:1 ../../standalone/draksplash:1
+#: ../../standalone/harddrake2:1 ../../standalone/logdrake:1
+#: ../../standalone/scannerdrake:1
+#, c-format
+msgid "Quit"
+msgstr "�˳�"
+
#: ../../install_steps_interactive.pm:1
#, c-format
msgid "License agreement"
msgstr "������"
#: ../../install_steps_interactive.pm:1
-#, fuzzy, c-format
-msgid "default:LTR"
-msgstr "Ĭ��"
-
-#: ../../install_steps_interactive.pm:1
#, c-format
msgid "An error occurred"
msgstr "����һ������"
@@ -5107,6 +4953,11 @@ msgstr "Azerbaidjani (latin)"
#: ../../keyboard.pm:1
#, c-format
+msgid "Arabic"
+msgstr "������"
+
+#: ../../keyboard.pm:1
+#, c-format
msgid "Armenian (phonetic)"
msgstr "���� (����)"
@@ -5446,7 +5297,7 @@ msgid "Portugal"
msgstr "������"
#: ../../lang.pm:1
-#, fuzzy, c-format
+#, c-format
msgid "Palestine"
msgstr "����˹̹"
@@ -5772,7 +5623,7 @@ msgid "Japan"
msgstr "�ձ�"
#: ../../lang.pm:1
-#, fuzzy, c-format
+#, c-format
msgid "Jordan"
msgstr "Լ��"
@@ -6267,6 +6118,11 @@ msgstr "������"
msgid "Afghanistan"
msgstr "������"
+#: ../../lang.pm:1
+#, c-format
+msgid "default:LTR"
+msgstr "Ĭ��:LTR"
+
#: ../../loopback.pm:1
#, c-format
msgid "Circular mounts %s\n"
@@ -6673,10 +6529,10 @@ msgstr ""
"��С�������Ϲ㷺�IJ��� RIP, Ȼ���ڸ����ӵ���������Ҫ�����ӵ�·��Э�顣"
#: ../../services.pm:1
-#, c-format
+#, fuzzy, c-format
msgid ""
"Assign raw devices to block devices (such as hard drive\n"
-"partitions), for the use of applications such as Oracle"
+"partitions), for the use of applications such as Oracle or DVD players"
msgstr ""
"ָ�����豸(��Ӳ�̷���)��RAWԭʼ�豸\n"
"��Oracle֮���Ӧ����"
@@ -6945,11 +6801,11 @@ msgstr ""
#: ../../standalone.pm:1
#, c-format
msgid ""
-"[--manual] [--device=dev] [--update-sane=sane_desc_dir] [--update-usbtable] "
-"[--dynamic=dev]"
+"[--manual] [--device=dev] [--update-sane=sane_source_dir] [--update-"
+"usbtable] [--dynamic=dev]"
msgstr ""
-"[--manual] [--device=dev] [--update-sane=sane_desc_dir] [--update-usbtable] "
-"[--dynamic=dev]"
+"[--manual] [--device=dev] [--update-sane=sane_source_dir] [--update-"
+"usbtable] [--dynamic=dev]"
#: ../../standalone.pm:1
#, c-format
@@ -7144,8 +7000,8 @@ msgstr "�˳���װ"
#: ../../steps.pm:1
#, c-format
-msgid "Install system updates"
-msgstr "��װϵͳ����"
+msgid "Install updates"
+msgstr "��װ����"
#: ../../steps.pm:1
#, c-format
@@ -7174,6 +7030,11 @@ msgstr "�����û�"
#: ../../steps.pm:1
#, c-format
+msgid "Root password"
+msgstr "Root ����"
+
+#: ../../steps.pm:1
+#, c-format
msgid "Install system"
msgstr "��װϵͳ"
@@ -7219,7 +7080,7 @@ msgstr "����֤"
#: ../../steps.pm:1
#, c-format
-msgid "Choose your language"
+msgid "Language"
msgstr "ѡ������"
#: ../../ugtk2.pm:1
@@ -7227,6 +7088,14 @@ msgstr "ѡ������"
msgid "utopia 25"
msgstr "utopia 25"
+#: ../../ugtk2.pm:1 ../../ugtk.pm:1 ../../network/netconnect.pm:1
+#: ../../standalone/drakTermServ:1 ../../standalone/drakbackup:1
+#: ../../standalone/drakboot:1 ../../standalone/drakconnect:1
+#: ../../standalone/drakfont:1 ../../standalone/net_monitor:1
+#, c-format
+msgid "OK"
+msgstr "ȷ��"
+
#: ../../ugtk2.pm:1 ../../ugtk.pm:1 ../../standalone/logdrake:1
#, c-format
msgid "logdrake"
@@ -7405,7 +7274,7 @@ msgstr ""
#: ../../Xconfig/main.pm:1 ../../diskdrake/dav.pm:1
#: ../../diskdrake/interactive.pm:1 ../../diskdrake/removable.pm:1
-#: ../../diskdrake/smbnfs_gtk.pm:1
+#: ../../diskdrake/smbnfs_gtk.pm:1 ../../standalone/harddrake2:1
#, c-format
msgid "Options"
msgstr "ѡ��"
@@ -7430,14 +7299,6 @@ msgstr "��ʾ��"
msgid "Graphic Card"
msgstr "ͼ�ο�"
-#: ../../Xconfig/main.pm:1 ../../diskdrake/dav.pm:1
-#: ../../printer/printerdrake.pm:1 ../../standalone/drakperm:1
-#: ../../standalone/draksplash:1 ../../standalone/harddrake2:1
-#: ../../standalone/logdrake:1 ../../standalone/scannerdrake:1
-#, c-format
-msgid "Quit"
-msgstr "�˳�"
-
#: ../../Xconfig/monitor.pm:1
#, c-format
msgid "Vertical refresh rate"
@@ -8092,41 +7953,6 @@ msgstr "������ %s �ķ���������д�������!"
#: ../../diskdrake/interactive.pm:1
#, c-format
-msgid ""
-"You've selected a software RAID partition as root (/).\n"
-"No bootloader is able to handle this without a /boot partition.\n"
-"Please be sure to add a /boot partition"
-msgstr ""
-"��ѡ���˰����� RAID ������Ϊ�� (/)��\n"
-"���û��һ�� /boot ����, �����������������޷��������������\n"
-"����, ������һ�� /boot ������"
-
-#: ../../diskdrake/interactive.pm:1
-#, c-format
-msgid ""
-"The partition you've selected to add as root (/) is physically located "
-"beyond\n"
-"the 1024th cylinder of the hard drive, and you have no /boot partition.\n"
-"If you plan to use the LILO boot manager, be careful to add a /boot partition"
-msgstr ""
-"��ѡ����Ϊ�� (/) ����ķ���, ��Ӳ���ϵ�λ��λ�ڵ� 1024 ����֮��,\n"
-"������û�д��� /boot ����/\n"
-"������ƻ�ʹ�� LILO ������������, �����ʵ�λ�ü��� /boot ������"
-
-#: ../../diskdrake/interactive.pm:1
-#, c-format
-msgid ""
-"Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
-"1024).\n"
-"Either you use LILO and it won't work, or you don't use LILO and you don't "
-"need /boot"
-msgstr ""
-"�벻Ҫ��Ӳ�̵����� 1024 ֮�󴴽� /boot ������\n"
-"�����ʹ�� LILO, ��û����������; ��������ʹ�� LILO, \n"
-"����Ҫ���� /boot ����"
-
-#: ../../diskdrake/interactive.pm:1
-#, c-format
msgid "The package %s is needed. Install it?"
msgstr "��Ҫ��װ������ %s����ͬ�ⰲװ��?"
@@ -8614,6 +8440,11 @@ msgid "SCSI controllers"
msgstr "SCSI ������"
#: ../../harddrake/data.pm:1
+#, fuzzy, c-format
+msgid "Firewire controllers"
+msgstr "USB ������"
+
+#: ../../harddrake/data.pm:1
#, c-format
msgid "(E)IDE/ATA controllers"
msgstr "(E)IDE/ATA ������"
@@ -8751,7 +8582,7 @@ msgid ""
"- \"lspcidrake -v | fgrep AUDIO\" will tell you which driver your card use\n"
"by default\n"
"\n"
-"- \"grep snd-slot /etc/modules.conf\" will tell you what driver it\n"
+"- \"grep sound-slot /etc/modules.conf\" will tell you what driver it\n"
"currently uses\n"
"\n"
"- \"/sbin/lsmod\" will enable you to check if its module (driver) is\n"
@@ -8770,7 +8601,7 @@ msgstr ""
"\n"
"- ��lspcidrake -v | fgrep AUDIO�������������������Ĭ��ʹ��������������\n"
"\n"
-"- ��grep snd-slot /etc/modules.conf���������������Ŀǰʹ�õ���������\n"
+"- ��grep sound-slot /etc/modules.conf���������������Ŀǰʹ�õ���������\n"
"\n"
"- ��/sbin/lsmod���������������������Ƿ��Ѿ�װ��\n"
"\n"
@@ -9040,7 +8871,7 @@ msgstr "���� `void' �����һ��û������"
#: ../../interactive/stdio.pm:1
#, c-format
msgid "Do you want to click on this button?"
-msgstr "��ϣ������˰�ť��?"
+msgstr "��ϣ�������˰�ť��?"
#: ../../interactive/stdio.pm:1
#, c-format
@@ -9220,8 +9051,8 @@ msgstr "���ӵ�������"
#: ../../network/adsl.pm:1
#, c-format
-msgid "Sagem (using pppoe) usb"
-msgstr "Sagem (ʹ�� pppoe) USB"
+msgid "Sagem (using pppoa) usb"
+msgstr "Sagem (ʹ�� pppoa) USB"
#: ../../network/adsl.pm:1
#, c-format
@@ -9335,17 +9166,17 @@ msgstr "Web ������"
#: ../../network/ethernet.pm:1 ../../network/network.pm:1
#, c-format
msgid "Zeroconf host name must not contain a ."
-msgstr ""
+msgstr "Zeroconf ������������� ."
#: ../../network/ethernet.pm:1 ../../network/network.pm:1
#, c-format
-msgid "Zeroconf Host name"
-msgstr "Zeroconf ������"
+msgid "Host name"
+msgstr "������"
#: ../../network/ethernet.pm:1 ../../network/network.pm:1
#, c-format
-msgid "Host name"
-msgstr "������"
+msgid "Zeroconf Host name"
+msgstr "Zeroconf ������"
#: ../../network/ethernet.pm:1 ../../network/network.pm:1
#, c-format
@@ -9360,19 +9191,6 @@ msgstr ""
"���� Zeroconf ����������Ҫ�κε㣬����㲻��ʹ��Ĭ�ϵ�\n"
"�������Ļ���"
-#: ../../network/ethernet.pm:1
-#, c-format
-msgid ""
-"Please enter your host name if you know it.\n"
-"Some DHCP servers require the hostname to work.\n"
-"Your host name should be a fully-qualified host name,\n"
-"such as ``mybox.mylab.myco.com''."
-msgstr ""
-"�����֪��, ��������������������\n"
-"��Щ DHCP ��������Ҫ�������Ʋ��ܹ���.\n"
-"�����������Ʊ����Ǹ���ȫ�޶���������, \n"
-"���硰mybox.mylab.myco.com��"
-
#: ../../network/ethernet.pm:1 ../../network/network.pm:1
#, c-format
msgid "Configuring network"
@@ -9838,7 +9656,7 @@ msgid ""
"Internet & Network connection.\n"
msgstr ""
"�����ڰ�װ����,���������Ѿ����úá�\n"
-"��� ȷ�� ��������, �� ȡ�� �����������硣\n"
+"���� ȷ�� ��������, �� ȡ�� �����������硣\n"
#: ../../network/netconnect.pm:1
#, c-format
@@ -10010,6 +9828,11 @@ msgid "Start at boot"
msgstr "����ʱ����"
#: ../../network/network.pm:1
+#, fuzzy, c-format
+msgid "Assign host name from DHCP address"
+msgstr "������������������ IP ��ַ��\n"
+
+#: ../../network/network.pm:1
#, c-format
msgid "Network Hotplugging"
msgstr "�����Ȳ��"
@@ -10020,14 +9843,9 @@ msgid "Track network card id (useful for laptops)"
msgstr "��¼������־"
#: ../../network/network.pm:1
-#, c-format
-msgid "(bootp/dhcp/zeroconf)"
-msgstr "(bootp/dhcp/zeroconf)"
-
-#: ../../network/network.pm:1
-#, c-format
-msgid "Automatic IP"
-msgstr "�Զ� IP"
+#, fuzzy, c-format
+msgid "DHCP host name"
+msgstr "������"
#: ../../network/network.pm:1 ../../standalone/drakconnect:1
#: ../../standalone/drakgw:1
@@ -10035,13 +9853,24 @@ msgstr "�Զ� IP"
msgid "Netmask"
msgstr "��������"
-#: ../../network/network.pm:1 ../../standalone/drakconnect:1
+#: ../../network/network.pm:1 ../../printer/printerdrake.pm:1
+#: ../../standalone/drakconnect:1
#, c-format
msgid "IP address"
msgstr "IP ��ַ"
#: ../../network/network.pm:1
#, c-format
+msgid "(bootp/dhcp/zeroconf)"
+msgstr "(bootp/dhcp/zeroconf)"
+
+#: ../../network/network.pm:1
+#, c-format
+msgid "Automatic IP"
+msgstr "�Զ� IP"
+
+#: ../../network/network.pm:1
+#, c-format
msgid " (driver %s)"
msgstr "(���� %s)"
@@ -10288,7 +10117,7 @@ msgstr "PDQ"
msgid "PDQ - Print, Don't Queue"
msgstr "PDQ - ��ӡ, ���Ŷ�"
-#: ../../printer/detect.pm:1
+#: ../../printer/detect.pm:1 ../../printer/printerdrake.pm:1
#, c-format
msgid "Unknown Model"
msgstr "δ֪�ͺ�"
@@ -10300,6 +10129,11 @@ msgstr "δ֪ģʽ"
#: ../../printer/main.pm:1
#, c-format
+msgid "%s (Port %s)"
+msgstr "%s (�˿� %s)"
+
+#: ../../printer/main.pm:1
+#, c-format
msgid "Host %s"
msgstr "���� %s"
@@ -10450,11 +10284,6 @@ msgstr "Printerdrake"
#: ../../printer/printerdrake.pm:1
#, c-format
-msgid "Do you want to configure another printer?"
-msgstr "����Ҫ����������ӡ����?"
-
-#: ../../printer/printerdrake.pm:1
-#, c-format
msgid "Removing printer \"%s\"..."
msgstr "����ɾ����ӡ����%s��..."
@@ -10470,8 +10299,8 @@ msgstr "ɾ����ӡ��"
#: ../../printer/printerdrake.pm:1
#, c-format
-msgid "Know how to use this printer"
-msgstr "֪������ʹ�ô˴�ӡ��"
+msgid "Learn how to use this printer"
+msgstr "�˽�����ʹ�ô˴�ӡ��"
#: ../../printer/printerdrake.pm:1
#, c-format
@@ -10569,11 +10398,6 @@ msgstr "��ӡ����������"
#: ../../printer/printerdrake.pm:1
#, c-format
-msgid "Learn how to use this printer"
-msgstr "�˽�����ʹ�ô˴�ӡ��"
-
-#: ../../printer/printerdrake.pm:1
-#, c-format
msgid "Raw printer"
msgstr "ԭʼ��ӡ��"
@@ -10609,6 +10433,7 @@ msgid "Add a new printer"
msgstr "���Ӵ�ӡ��"
#: ../../printer/printerdrake.pm:1 ../../standalone/drakconnect:1
+#: ../../standalone/drakfloppy:1
#, c-format
msgid "Normal Mode"
msgstr "��ͨģʽ"
@@ -10635,14 +10460,18 @@ msgstr "�����б� (��ʾԶ�� CUPS ��ӡ������)"
#: ../../printer/printerdrake.pm:1
#, c-format
+msgid "Display all available remote CUPS printers"
+msgstr "��ʾ���п��õ�Զ�� CUPS ��ӡ��"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
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 "
"it."
msgstr ""
-"���д�ӡ�������á�\n"
-"���ȥ�޸Ļ��ȡ��Ϣ,\n"
-"��������Ӵ�ӡ���������µĴ�ӡ����"
+"���д�ӡ�������á�˫����ӡ���ɸ��������á�������ΪĬ�ϴ�ӡ�������߲鿴�����"
+"Ϣ��"
#: ../../printer/printerdrake.pm:1
#, c-format
@@ -10664,16 +10493,6 @@ msgstr "��ӡϵͳ:"
#: ../../printer/printerdrake.pm:1
#, c-format
-msgid "Would you like to configure printing?"
-msgstr "����Ҫ���ô�ӡ����?"
-
-#: ../../printer/printerdrake.pm:1
-#, c-format
-msgid "Preparing Printerdrake..."
-msgstr "׼�� Printerdrake..."
-
-#: ../../printer/printerdrake.pm:1
-#, c-format
msgid "Checking installed software..."
msgstr "����Ѿ���װ������..."
@@ -10709,6 +10528,11 @@ msgstr "ѡ���ӡ��"
#: ../../printer/printerdrake.pm:1
#, c-format
+msgid "Setting Default Printer..."
+msgstr "��������Ĭ�ϴ�ӡ��..."
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
msgid "Installing %s ..."
msgstr "���ڰ�װ %s..."
@@ -10897,7 +10721,7 @@ msgid ""
"You can also type a new name or skip this printer."
msgstr ""
"��ӡ����%s���Ѿ���%s���ڡ�\n"
-"�����Ǩ�ơ��������á�\n"
+"������Ǩ�ơ��������á�\n"
"��Ҳ����ѡ���µ����ƻ��Թ��ô�ӡ����"
#: ../../printer/printerdrake.pm:1
@@ -10913,7 +10737,7 @@ msgid ""
"\"Transfer\"."
msgstr ""
"\n"
-"�����ҪǨ�ƵĴ�ӡ���������Ǩ�ơ���"
+"�����ҪǨ�ƵĴ�ӡ����������Ǩ�ơ���"
#: ../../printer/printerdrake.pm:1
#, c-format
@@ -11043,7 +10867,7 @@ msgid ""
"list shown below or click on the \"Print option list\" button.%s%s\n"
"\n"
msgstr ""
-"Ҫ�˽⵱ǰ��ӡ�����õ�ѡ��, �뿴������б�, ���ߵ������ӡѡ���б�����ť��%s%"
+"Ҫ�˽⵱ǰ��ӡ�����õ�ѡ��, �뿴������б�, ���ߵ�������ӡѡ���б�����ť��%s%"
"s\n"
"\n"
@@ -11093,7 +10917,7 @@ msgstr "�����%s <�ļ�>����%s <�ļ�>����ӡ�ļ���\n"
msgid ""
"To get a list of the options available for the current printer click on the "
"\"Print option list\" button."
-msgstr "�������ӡѡ���ť�����оٵ�ǰ��ӡ���Ŀ���ѡ�"
+msgstr "��������ӡѡ���ť�����оٵ�ǰ��ӡ���Ŀ���ѡ�"
#: ../../printer/printerdrake.pm:1
#, c-format
@@ -11316,7 +11140,7 @@ msgid ""
"adjust the head alignment settings with this program."
msgstr ""
"Ҫ����������ī��ӡ����Ҫ��������վ(http://www.lexmark.com/)\n"
-"������ī��ӡ���������򡣵����Drivers������. Ȼ����ѡ�����ͺ� ��ѡ"
+"������ī��ӡ���������򡣵�����Drivers������. Ȼ����ѡ�����ͺ� ��ѡ"
"��Linux������ϵͳ�������������ʽ�� RPM ������л���ʽͼ�ν���Ľű�����. "
"�����ʹ��������ù���, �Ͳ���ʹ��ͼ�ν���İ�װ����������Э��֮��ֱ�Ӱ�ȡ"
"������ ��lexmarkmaintain�������ӡ��ͷ�������ҳ, Ȼ����������������ͷ��"
@@ -12058,7 +11882,7 @@ msgstr ""
"������Ĵ�ӡ��ֱ��������̨����, �����(��)��ӵ���̨���Բ��򿪵�Դ, ��������"
"����(��)�����Զ���⡣\n"
"\n"
-"׼���þ͵������һ����, ����������������ô�ӡ���͵����ȡ������"
+"׼���þ͵�������һ����, ����������������ô�ӡ���͵�����ȡ������"
#: ../../printer/printerdrake.pm:1
#, c-format
@@ -12091,7 +11915,7 @@ msgstr ""
"ע���Զ���������ϵĴ�ӡ���ȼ�������ڱ����Ĵ�ӡ������ʱ��Ҫ��. ���������"
"Ҫ, ��رն������ӡ�����Զ���⡣\n"
"\n"
-"׼���þ͵������һ����, ����������������ô�ӡ��, �����ȡ������"
+"׼���þ͵�������һ����, ����������������ô�ӡ��, ������ȡ������"
#: ../../printer/printerdrake.pm:1
#, c-format
@@ -12127,7 +11951,7 @@ msgstr ""
"ע���Զ���������ϵĴ�ӡ���ȼ�������ڱ����Ĵ�ӡ������ʱ��Ҫ������� ������"
"Ҫ, ��رն������ӡ����Windows��ӡ�����Զ���⡣\n"
"\n"
-"׼���þ͵������һ����, ����������������ô�ӡ��, �����ȡ������"
+"׼���þ͵�������һ����, ����������������ô�ӡ��, ������ȡ������"
#: ../../printer/printerdrake.pm:1
#, c-format
@@ -12152,6 +11976,38 @@ msgstr ""
#: ../../printer/printerdrake.pm:1
#, c-format
+msgid ""
+"\n"
+"\n"
+"Printerdrake could not determine which model your printer %s is. Please "
+"choose the correct model from the list."
+msgstr ""
+"\n"
+"\n"
+"Printerdrake �޷�ȷ�����Ĵ�ӡ�� %s ��ʲô�ͺŵġ�����б���ѡ����ȷ���ͺš�"
+
+#: ../../printer/printerdrake.pm:1 ../../standalone/scannerdrake:1
+#, c-format
+msgid ")"
+msgstr ")"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid " on "
+msgstr " � "
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "("
+msgstr "("
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Configuring printer ..."
+msgstr "�������ô�ӡ��..."
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
msgid "Searching for new printers..."
msgstr "�����µĴ�ӡ������"
@@ -12267,47 +12123,77 @@ msgstr "��һ̨δ֪�Ĵ�ӡ��"
#: ../../printer/printerdrake.pm:1
#, c-format
msgid "Checking your system..."
-msgstr "���ڼ������ϵͳ ..."
+msgstr "���ڼ������ϵͳ..."
+
+#: ../../printer/printerdrake.pm:1
+#, fuzzy, c-format
+msgid "Restarting CUPS..."
+msgstr "�������� XFS"
#: ../../printer/printerdrake.pm:1
#, c-format
-msgid "IP address of host/network:"
-msgstr "����/����� IP ��ַ:"
+msgid "This server is already in the list, it cannot be added again.\n"
+msgstr "�˷������Ѿ�λ���б��У��޷��ٴ����ӡ�\n"
#: ../../printer/printerdrake.pm:1
#, c-format
-msgid "This host/network is already in the list, it cannot be added again.\n"
-msgstr "������/�����Ѿ�λ���б���, �޷��ٴ����ӡ�\n"
+msgid "Examples for correct IPs:\n"
+msgstr "��ȷ IP ��ַ������:\n"
#: ../../printer/printerdrake.pm:1
#, c-format
-msgid "192.168.100.0/255.255.255.0\n"
-msgstr "192.168.100.0/255.255.255.0\n"
+msgid "The entered IP is not correct.\n"
+msgstr "����� IP ����ȷ��\n"
#: ../../printer/printerdrake.pm:1
#, c-format
-msgid "192.168.100.0/24\n"
-msgstr "192.168.100.0/24\n"
+msgid "Server IP missing!"
+msgstr "ȱ�ٷ����� IP!"
#: ../../printer/printerdrake.pm:1
#, c-format
-msgid "10.1.*\n"
-msgstr "10.1.*\n"
+msgid "Enter IP address and port of the host whose printers you want to use."
+msgstr "����������ʹ�õĴ�ӡ������������ IP ��ַ�Ͷ˿ڡ�"
#: ../../printer/printerdrake.pm:1
#, c-format
-msgid "10.0.0.*\n"
-msgstr "10.0.0.*\n"
+msgid "Accessing printers on remote CUPS servers"
+msgstr "���ڷ���Զ�� CUPS �������ϵĴ�ӡ��"
#: ../../printer/printerdrake.pm:1
#, c-format
-msgid "192.168.100.194\n"
-msgstr "192.168.100.194\n"
+msgid "Remove selected server"
+msgstr "ɾ��ѡ�еķ�����"
#: ../../printer/printerdrake.pm:1
#, c-format
-msgid "Examples for correct IPs:\n"
-msgstr "��ȷ IP ��ַ������:\n"
+msgid "Edit selected server"
+msgstr "�༭ѡ�еķ�����"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Add server"
+msgstr "���ӷ�����"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid ""
+"Add here the CUPS servers whose printers you want to use. You only need to "
+"do this if the servers do not broadcast their printer information into the "
+"local network."
+msgstr ""
+"�ڴ���������Ҫʹ�õĴ�ӡ������ CUPS �����������Ƿ�����δ�����ӡ����Ϣ�㲥��"
+"�������ϣ������������ṩ����Ϣ��"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "IP address of host/network:"
+msgstr "����/����� IP ��ַ:"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "This host/network is already in the list, it cannot be added again.\n"
+msgstr "������/�����Ѿ�λ���б���, �޷��ٴ����ӡ�\n"
#: ../../printer/printerdrake.pm:1
#, c-format
@@ -12316,6 +12202,11 @@ msgstr "���������/���� IP ����ȷ��\n"
#: ../../printer/printerdrake.pm:1
#, c-format
+msgid "Host/network IP address missing."
+msgstr "ȱ������/���� IP ��ַ��"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
msgid ""
"Choose the network or host on which the local printers should be made "
"available:"
@@ -12380,6 +12271,29 @@ msgstr ""
msgid "Automatic correction of CUPS configuration"
msgstr "�Զ�����CUPS ����"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid ""
+"To get access to printers on remote CUPS servers in your local network you "
+"only need to turn on the \"Automatically find available printers on remote "
+"machines\" option; the CUPS servers inform your machine automatically about "
+"their printers. All printers currently known to your machine are listed in "
+"the \"Remote printers\" section in the main window of Printerdrake. If your "
+"CUPS server(s) is/are not in your local network, you have to enter the IP "
+"address(es) and optionally the port number(s) here to get the printer "
+"information from the server(s)."
+msgstr ""
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "None"
+msgstr "��"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Additional CUPS servers: "
+msgstr "����� CUPS ������: "
+
#: ../../printer/printerdrake.pm:1 ../../standalone/scannerdrake:1
#, c-format
msgid "No remote machines"
@@ -12548,8 +12462,8 @@ msgstr ""
#: ../../security/help.pm:1
#, c-format
msgid ""
-"if set to yes, check for empty password, or a password while it should be "
-"in /etc/shadow or other users with id 0."
+"if set to yes, check for empty passwords, for no password in /etc/shadow and "
+"for users with the 0 id other than root."
msgstr ""
#: ../../security/help.pm:1
@@ -12579,6 +12493,9 @@ msgid ""
"\n"
"Set the root umask."
msgstr ""
+"����: (umask)\n"
+"\n"
+"���� root umask��"
#: ../../security/help.pm:1
#, c-format
@@ -14322,7 +14239,12 @@ msgid ""
"please click Wizard or Advanced."
msgstr ""
"û���ҵ������ļ�\n"
-"�����򵼻�߼���"
+"�뵥���򵼻�߼���"
+
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "%s"
+msgstr ""
#: ../../standalone/drakbackup:1
#, c-format
@@ -14587,16 +14509,6 @@ msgstr "��Ӳ�ָ̻�"
#: ../../standalone/drakbackup:1
#, c-format
-msgid "Secure Connection"
-msgstr "��������"
-
-#: ../../standalone/drakbackup:1
-#, c-format
-msgid "FTP Connection"
-msgstr "FTP ����"
-
-#: ../../standalone/drakbackup:1
-#, c-format
msgid "Use quota for backup files."
msgstr "ʹ���޶���ļ�."
@@ -15238,7 +15150,7 @@ msgstr ""
#: ../../standalone/drakbackup:1
#, c-format
msgid "Select the files or directories and click on 'Add'"
-msgstr "ѡ���ļ���Ŀ¼, Ȼ���������ӡ�"
+msgstr "ѡ���ļ���Ŀ¼, Ȼ�󵥻������ӡ�"
#: ../../standalone/drakbackup:1 ../../standalone/drakfont:1
#, c-format
@@ -15507,6 +15419,193 @@ msgstr "�� root �û�������ʹ�� cron"
msgid "Installation of %s failed. The following error occured:"
msgstr "��װ %s ʧ��, �������д���:"
+#: ../../standalone/drakboot:1
+#, c-format
+msgid "No, I don't want autologin"
+msgstr "�񣬲�Ҫ�Զ���¼"
+
+#: ../../standalone/drakboot:1
+#, c-format
+msgid "Yes, I want autologin with this (user, desktop)"
+msgstr "�ǣ��ԣ��û������棩��¼"
+
+#: ../../standalone/drakboot:1
+#, c-format
+msgid "Launch the graphical environment when your system starts"
+msgstr "ϵͳ����ʱװ��ͼ�λ���"
+
+#: ../../standalone/drakboot:1
+#, c-format
+msgid "System mode"
+msgstr "ϵͳģʽ"
+
+#: ../../standalone/drakboot:1
+#, c-format
+msgid "Bootsplash"
+msgstr "Bootsplash ��������"
+
+#: ../../standalone/drakboot:1
+#, c-format
+msgid "Lilo screen"
+msgstr "Lilo ��Ļ"
+
+#: ../../standalone/drakboot:1
+#, c-format
+msgid ""
+"\n"
+"Select the theme for\n"
+"lilo and bootsplash,\n"
+"you can choose\n"
+"them separately"
+msgstr ""
+"\n"
+"ѡ������ lilo �� bootsplash �����⣬\n"
+"�����Էֱ�ѡ��"
+
+#: ../../standalone/drakboot:1
+#, c-format
+msgid "Themes"
+msgstr "����"
+
+#: ../../standalone/drakboot:1
+#, c-format
+msgid "Splash selection"
+msgstr "ѡ����������"
+
+#: ../../standalone/drakboot:1
+#, c-format
+msgid ""
+"You are currently using %s as your boot manager.\n"
+"Click on Configure to launch the setup wizard."
+msgstr ""
+"��Ŀǰʹ�� %s ��Ϊ���������������\n"
+"���������á���ť���������򵼡�"
+
+#: ../../standalone/drakboot:1
+#, c-format
+msgid "LiLo and Bootsplash themes installation successfull"
+msgstr "LiLo �� Bootsplash ���ⰲװ�ɹ�"
+
+#: ../../standalone/drakboot:1
+#, c-format
+msgid "Theme installation failed!"
+msgstr "���ⰲװʧ�ܣ�"
+
+#: ../../standalone/drakboot:1 ../../standalone/draksplash:1
+#, c-format
+msgid "Notice"
+msgstr "ע��"
+
+#: ../../standalone/drakboot:1
+#, c-format
+msgid "Relaunch 'lilo'"
+msgstr "����������lilo��"
+
+#: ../../standalone/drakboot:1
+#, c-format
+msgid ""
+"Can't relaunch LiLo!\n"
+"Launch \"lilo\" as root in command line to complete LiLo theme installation."
+msgstr ""
+"�޷��������� LiLo��\n"
+"������������ root �������С�lilo���������� LiLo ���ⰲװ��"
+
+#: ../../standalone/drakboot:1
+#, c-format
+msgid "Make initrd 'mkinitrd -f /boot/initrd-%s.img %s'."
+msgstr "���� initrd 'mkinitrd -f /boot/initrd-%s.img %s'��"
+
+#: ../../standalone/drakboot:1
+#, c-format
+msgid "Can't launch mkinitrd -f /boot/initrd-%s.img %s."
+msgstr "�޷��� mkinitrd -f /boot/initrd-%s.img %s��"
+
+#: ../../standalone/drakboot:1
+#, c-format
+msgid ""
+"Can't write /etc/sysconfig/bootsplash\n"
+"File not found."
+msgstr ""
+"�޷�д�� /etc/sysconfig/bootsplash\n"
+"û���ҵ��ļ���"
+
+#: ../../standalone/drakboot:1
+#, c-format
+msgid "Write %s"
+msgstr "� %s"
+
+#: ../../standalone/drakboot:1
+#, c-format
+msgid "Can't write /etc/sysconfig/bootsplash."
+msgstr "�޷�д�� /etc/sysconfig/bootsplash��"
+
+#: ../../standalone/drakboot:1
+#, c-format
+msgid "Lilo message not found"
+msgstr "û���ҵ� LILO ��Ϣ"
+
+#: ../../standalone/drakboot:1
+#, c-format
+msgid "Copy %s to %s"
+msgstr "�� %s ���Ƶ� %s"
+
+#: ../../standalone/drakboot:1
+#, c-format
+msgid "Backup %s to %s.old"
+msgstr "�� %s ���ݵ� %s.old"
+
+#: ../../standalone/drakboot:1
+#, c-format
+msgid "Create new theme"
+msgstr "�����µ�����"
+
+#: ../../standalone/drakboot:1
+#, c-format
+msgid ""
+"Display theme\n"
+"under console"
+msgstr ""
+"�ڿ���̨\n"
+"��ʾ����"
+
+#: ../../standalone/drakboot:1
+#, c-format
+msgid "Install themes"
+msgstr "��װ����"
+
+#: ../../standalone/drakboot:1
+#, c-format
+msgid "Lilo/grub mode"
+msgstr "Lilo/grub ģʽ"
+
+#: ../../standalone/drakboot:1
+#, c-format
+msgid "Yaboot mode"
+msgstr "Yaboot ģʽ"
+
+#: ../../standalone/drakboot:1 ../../standalone/drakfloppy:1
+#: ../../standalone/harddrake2:1 ../../standalone/logdrake:1
+#, c-format
+msgid "<control>Q"
+msgstr "<control>Q"
+
+#: ../../standalone/drakboot:1 ../../standalone/drakfloppy:1
+#: ../../standalone/logdrake:1
+#, c-format
+msgid "/File/_Quit"
+msgstr "/�ļ�(F)/�˳�(_Q)"
+
+#: ../../standalone/drakboot:1 ../../standalone/drakfloppy:1
+#: ../../standalone/harddrake2:1 ../../standalone/logdrake:1
+#, c-format
+msgid "/_File"
+msgstr "/�ļ�(_F)"
+
+#: ../../standalone/drakboot:1
+#, c-format
+msgid "Boot Style Configuration"
+msgstr "�����������"
+
#: ../../standalone/drakbug:1
#, c-format
msgid "No browser available! Please install one"
@@ -15551,7 +15650,7 @@ msgid ""
msgstr ""
"\n"
"\n"
-"Ҫ�ύ���ϱ���, ������水ť.\n"
+"Ҫ�ύ���ϱ���, �������水ť.\n"
"�����һ�����������, ���� https://drakbug.mandrakesoft.com\n"
"������һ��������Ҫ����д��������ʾ����Ϣ����\n"
"���͵���������\n"
@@ -15644,6 +15743,16 @@ msgstr "Mandrake ���ϱ��湤��"
#: ../../standalone/drakconnect:1
#, c-format
+msgid "Parameters"
+msgstr "����"
+
+#: ../../standalone/drakconnect:1
+#, c-format
+msgid "Internet Connection Configuration"
+msgstr "��������������"
+
+#: ../../standalone/drakconnect:1
+#, c-format
msgid "DHCP Client"
msgstr "DHCP�ͻ���"
@@ -15657,11 +15766,6 @@ msgstr "����"
msgid "Gateway"
msgstr "����"
-#: ../../standalone/drakconnect:1
-#, c-format
-msgid "Parameters"
-msgstr "����"
-
#: ../../standalone/drakconnect:1 ../../standalone/net_monitor:1
#, c-format
msgid "Connection type: "
@@ -15674,11 +15778,6 @@ msgstr "�����ļ�: "
#: ../../standalone/drakconnect:1
#, c-format
-msgid "Internet Connection Configuration"
-msgstr "��������������"
-
-#: ../../standalone/drakconnect:1
-#, c-format
msgid "Internet connection configuration"
msgstr "��������������"
@@ -15689,7 +15788,7 @@ msgid ""
"Create one first by clicking on 'Configure'"
msgstr ""
"��û�����������ӡ�\n"
-"��������á��Ƚ�������"
+"���������á��Ƚ�������"
#: ../../standalone/drakconnect:1
#, c-format
@@ -15747,7 +15846,7 @@ msgid ""
"Configure them first by clicking on 'Configure'"
msgstr ""
"��û�����úõĽӿڡ�\n"
-"��������á������ýӿ�"
+"���������á������ýӿ�"
#: ../../standalone/drakconnect:1
#, c-format
@@ -15794,7 +15893,7 @@ msgstr "Ӧ��"
#: ../../standalone/drakconnect:1
#, c-format
msgid "Click here to launch the wizard ->"
-msgstr "��������� ->"
+msgstr "���������� ->"
#: ../../standalone/drakconnect:1
#, c-format
@@ -15946,8 +16045,8 @@ msgstr "ж��ģ��"
#: ../../standalone/drakfloppy:1
#, c-format
-msgid "omit raid modules"
-msgstr "ʡ�� RAID ģ��"
+msgid "Add a module"
+msgstr "����ģ��"
#: ../../standalone/drakfloppy:1
#, c-format
@@ -15961,13 +16060,13 @@ msgstr "����Ҫʱ"
#: ../../standalone/drakfloppy:1
#, c-format
-msgid "force"
-msgstr "ǿ��"
+msgid "omit raid modules"
+msgstr "ʡ�� RAID ģ��"
#: ../../standalone/drakfloppy:1
#, c-format
-msgid "Add a module"
-msgstr "����ģ��"
+msgid "force"
+msgstr "ǿ��"
#: ../../standalone/drakfloppy:1
#, c-format
@@ -15981,23 +16080,18 @@ msgstr "ר��"
#: ../../standalone/drakfloppy:1
#, c-format
-msgid "General"
-msgstr "����"
-
-#: ../../standalone/drakfloppy:1
-#, c-format
msgid "kernel version"
msgstr "�ں˰汾"
#: ../../standalone/drakfloppy:1
#, c-format
-msgid "DrakFloppy Error: %s"
-msgstr "DrakFloppy ����: %s"
+msgid "default"
+msgstr "Ĭ��"
#: ../../standalone/drakfloppy:1
#, c-format
-msgid "default"
-msgstr "Ĭ��"
+msgid "General"
+msgstr "����"
#: ../../standalone/drakfloppy:1
#, c-format
@@ -16019,11 +16113,6 @@ msgstr "��С"
msgid "Module name"
msgstr "ģ��"
-#: ../../standalone/drakfloppy:1
-#, c-format
-msgid "-misc-Fixed-Medium-r-*-*-*-140-*-*-*-*-*-*,*"
-msgstr "-misc-Fixed-Medium-r-*-*-*-140-*-*-*-*-*-*,*"
-
#: ../../standalone/drakfont:1
#, c-format
msgid "Post Uninstall"
@@ -16087,7 +16176,7 @@ msgstr "��װ�б�"
#: ../../standalone/drakfont:1
#, c-format
msgid "Select the font file or directory and click on 'Add'"
-msgstr "ѡ�������ļ���Ŀ¼, Ȼ���������ӡ�"
+msgstr "ѡ�������ļ���Ŀ¼, Ȼ�󵥻������ӡ�"
#: ../../standalone/drakfont:1
#, c-format
@@ -16346,7 +16435,7 @@ msgstr ""
"\n"
"%s\n"
"\n"
-"��������á����������򵼡�"
+"���������á����������򵼡�"
#: ../../standalone/drakgw:1
#, c-format
@@ -16710,6 +16799,11 @@ msgstr "������ϵͳ��û�а�װ�����, �������Ҫ�������ϵͳ���Ȱ�װһ��"
#: ../../standalone/drakperm:1
#, c-format
+msgid "Path"
+msgstr "·��"
+
+#: ../../standalone/drakperm:1
+#, c-format
msgid "group :"
msgstr "�� :"
@@ -16769,11 +16863,6 @@ msgstr "����Ȩ"
#: ../../standalone/drakperm:1
#, c-format
-msgid "Path"
-msgstr "·��"
-
-#: ../../standalone/drakperm:1
-#, c-format
msgid "Permissions"
msgstr "Ȩ��"
@@ -16789,22 +16878,6 @@ msgstr "���"
#: ../../standalone/drakperm:1
#, c-format
-msgid "select perm file to see/edit"
-msgstr "��ѡҪ�鿴/�޸ĵ�Ȩ�޶����ļ�"
-
-#: ../../standalone/drakperm:1
-#, c-format
-msgid ""
-"Drakperm is used to see files to use in order to fix permissions, owners, "
-"and groups via msec.\n"
-"You can also edit your own rules which will owerwrite the default rules."
-msgstr ""
-"����ʹ�� Drakperm �鿴Ȩ�޶����ļ�, msec ʹ�����������������ļ�Ȩ��, ������, "
-"��ȡ�\n"
-"�����Ա�д�Լ��Ĺ����Դ������Ĭ�ϵĹ���"
-
-#: ../../standalone/drakperm:1
-#, c-format
msgid "Edit current rule"
msgstr "�༭��ǰ�Ĺ���"
@@ -16855,6 +16928,22 @@ msgstr "���"
#: ../../standalone/drakperm:1
#, c-format
+msgid "select perm file to see/edit"
+msgstr "��ѡҪ�鿴/�޸ĵ�Ȩ�޶����ļ�"
+
+#: ../../standalone/drakperm:1
+#, c-format
+msgid ""
+"Drakperm is used to see files to use in order to fix permissions, owners, "
+"and groups via msec.\n"
+"You can also edit your own rules which will owerwrite the default rules."
+msgstr ""
+"����ʹ�� Drakperm �鿴Ȩ�޶����ļ�, msec ʹ�����������������ļ�Ȩ��, ������, "
+"��ȡ�\n"
+"�����Ա�д�Լ��Ĺ����Դ������Ĭ�ϵĹ���"
+
+#: ../../standalone/drakperm:1
+#, c-format
msgid "permissions"
msgstr "Ȩ��"
@@ -17034,16 +17123,16 @@ msgstr "��ȫ����:"
#: ../../standalone/draksec:1
#, c-format
-msgid "(default value: %s)"
-msgstr "(Ĭ��ֵ: %s)"
-
-#: ../../standalone/draksec:1
-#, c-format
msgid "Security Level:"
msgstr "��ȫ����:"
#: ../../standalone/draksec:1
#, c-format
+msgid "(default value: %s)"
+msgstr "(Ĭ��ֵ: %s)"
+
+#: ../../standalone/draksec:1
+#, fuzzy, c-format
msgid ""
"Standard: This is the standard security recommended for a computer that will "
"be used to connect\n"
@@ -17056,7 +17145,7 @@ msgid ""
"which can accept\n"
" connections from many clients. If your machine is only a "
"client on the Internet, you\n"
-"\t should choose a lower level.\n"
+" should choose a lower level.\n"
"\n"
"Paranoid: This is similar to the previous level, but the system is entirely "
"closed and security\n"
@@ -17065,7 +17154,7 @@ msgid ""
"Security Administrator:\n"
" If the 'Security Alerts' option is set, security alerts will "
"be sent to this user (username or\n"
-"\t email)"
+" email)"
msgstr ""
"��׼: �Ƽ�Ҫ���ӵ� Internet �Ŀͻ��˼����ʹ�õı�׼��ȫ����\n"
"\n"
@@ -17431,26 +17520,6 @@ msgstr ""
#: ../../standalone/harddrake2:1
#, c-format
-msgid "/Options"
-msgstr "/ѡ��(O)"
-
-#: ../../standalone/harddrake2:1
-#, c-format
-msgid "/Autodetect jazz drives"
-msgstr "/�Զ���� jazz ������(J)"
-
-#: ../../standalone/harddrake2:1
-#, c-format
-msgid "/Autodetect modems"
-msgstr "/�Զ������ƽ����(M)"
-
-#: ../../standalone/harddrake2:1
-#, c-format
-msgid "/Autodetect printers"
-msgstr "/�Զ�����ӡ��(P)"
-
-#: ../../standalone/harddrake2:1
-#, c-format
msgid "primary"
msgstr "��"
@@ -17467,6 +17536,16 @@ msgstr "����������е��豸���Ϳ��ڴ���ʾ����Ϣ��"
#: ../../standalone/harddrake2:1
#, c-format
+msgid "Unknown"
+msgstr "δ֪"
+
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "unknown"
+msgstr "δ֪"
+
+#: ../../standalone/harddrake2:1
+#, c-format
msgid "Running \"%s\" ..."
msgstr "��������%s��..."
@@ -17493,7 +17572,7 @@ msgstr "��⵽��Ӳ��"
#: ../../standalone/harddrake2:1
#, c-format
msgid "Harddrake2 version "
-msgstr "ħ��Ӳ�� 2 �汾 "
+msgstr "Harddrake2 �汾 "
#: ../../standalone/harddrake2:1
#, c-format
@@ -17511,28 +17590,23 @@ msgid ""
"This is HardDrake, a Mandrake hardware configuration tool.\n"
"Version:"
msgstr ""
-"����ħ��Ӳ����Mandrake ��Ӳ�����ù��ߡ�\n"
+"���� HardDrake��Mandrake ��Ӳ�����ù��ߡ�\n"
"�汾��"
#: ../../standalone/harddrake2:1
#, c-format
msgid "About Harddrake"
-msgstr "����ħ��Ӳ��"
+msgstr "���� Harddrake"
#: ../../standalone/harddrake2:1
#, c-format
msgid "/_About..."
-msgstr "����(A)..."
-
-#: ../../standalone/harddrake2:1 ../../standalone/logdrake:1
-#, c-format
-msgid "/_Help"
-msgstr "����(H)"
+msgstr "/����(_A)..."
#: ../../standalone/harddrake2:1
#, c-format
msgid "/_Report Bug"
-msgstr "���ϱ���(R)"
+msgstr "/���ϱ���(_R)"
#: ../../standalone/harddrake2:1
#, c-format
@@ -17558,37 +17632,42 @@ msgstr ""
#: ../../standalone/harddrake2:1
#, c-format
msgid "Harddrake help"
-msgstr "ħ��Ӳ������"
+msgstr "Harddrake ����"
#: ../../standalone/harddrake2:1
#, c-format
msgid "/_Fields description"
-msgstr "����(F)"
+msgstr "/����(_F)"
+
+#: ../../standalone/harddrake2:1 ../../standalone/logdrake:1
+#, c-format
+msgid "/_Help"
+msgstr "/����(_H)"
#: ../../standalone/harddrake2:1
#, c-format
-msgid "/Autodetect _jazz drives"
-msgstr "�Զ���� jazz ������(J)"
+msgid "/_Quit"
+msgstr "/�˳�(_Q)"
-#: ../../standalone/harddrake2:1 ../../standalone/logdrake:1
+#: ../../standalone/harddrake2:1
#, c-format
-msgid "/_Options"
-msgstr "ѡ��(O)"
+msgid "/Autodetect _jazz drives"
+msgstr "/�Զ���� jazz ������(_J)"
#: ../../standalone/harddrake2:1
#, c-format
msgid "/Autodetect _modems"
-msgstr "�Զ������ƽ����(M)"
+msgstr "/�Զ������ƽ����(_M)"
#: ../../standalone/harddrake2:1
#, c-format
msgid "/Autodetect _printers"
-msgstr "�Զ�����ӡ��(P)"
+msgstr "/�Զ�����ӡ��(_P)"
-#: ../../standalone/harddrake2:1
+#: ../../standalone/harddrake2:1 ../../standalone/logdrake:1
#, c-format
-msgid "/_Quit"
-msgstr "�˳�(Q)"
+msgid "/_Options"
+msgstr "/ѡ��(_O)"
#: ../../standalone/harddrake2:1
#, c-format
@@ -17687,7 +17766,7 @@ msgstr "����"
#: ../../standalone/harddrake2:1
#, c-format
-msgid "Format of floppies the drive accept"
+msgid "Format of floppies supported by the drive"
msgstr "���������ܵ����̸�ʽ"
#: ../../standalone/harddrake2:1
@@ -17843,6 +17922,16 @@ msgstr "Coma����"
#: ../../standalone/harddrake2:1
#, c-format
+msgid "special capacities of the driver (burning ability and or DVD support)"
+msgstr ""
+
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "Drive capacity"
+msgstr ""
+
+#: ../../standalone/harddrake2:1
+#, c-format
msgid "Size of the (second level) cpu cache"
msgstr "CPU ���������С"
@@ -17948,8 +18037,8 @@ 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."
msgstr ""
-"�����������в��밲װ����, Ȼ������ȷ������\n"
-"�����û�����Ź���, ������ȡ����, ��������������"
+"�����������в��밲װ����, Ȼ�󵥻���ȷ������\n"
+"�����û�����Ź���, �뵥����ȡ����, ��������������"
#: ../../standalone/livedrake:1
#, c-format
@@ -18127,17 +18216,17 @@ msgstr "�û�"
#: ../../standalone/logdrake:1
#, c-format
msgid "/Help/_About..."
-msgstr "/����/����(_A)..."
+msgstr "/����(H)/����(_A)..."
#: ../../standalone/logdrake:1
#, c-format
msgid "/Options/Test"
-msgstr "/ѡ��/����"
+msgstr "/ѡ��(O)/����"
#: ../../standalone/logdrake:1
#, c-format
msgid "/File/-"
-msgstr "/�ļ�/-"
+msgstr "/�ļ�(F)/-"
#: ../../standalone/logdrake:1
#, c-format
@@ -18152,7 +18241,7 @@ msgstr "<control>S"
#: ../../standalone/logdrake:1
#, c-format
msgid "/File/_Save"
-msgstr "/�ļ�/����(_S)"
+msgstr "/�ļ�(F)/����(_S)"
#: ../../standalone/logdrake:1
#, c-format
@@ -18162,7 +18251,7 @@ msgstr "<control>O"
#: ../../standalone/logdrake:1
#, c-format
msgid "/File/_Open"
-msgstr "/�ļ�/��(_O)"
+msgstr "/�ļ�(F)/��(_O)"
#: ../../standalone/logdrake:1
#, c-format
@@ -18172,7 +18261,7 @@ msgstr "<control>N"
#: ../../standalone/logdrake:1
#, c-format
msgid "/File/_New"
-msgstr "/�ļ�/�½�(_N)"
+msgstr "/�ļ�(F)/�½�(_N)"
#: ../../standalone/logdrake:1
#, c-format
@@ -18317,136 +18406,187 @@ msgstr "�������"
#: ../../standalone/printerdrake:1
#, c-format
-msgid "Reading printer data ..."
-msgstr "���ڶ�ȡ��ӡ������..."
+msgid "Reading data of installed printers..."
+msgstr "���ڶ�ȡ����װ��ӡ��������..."
#: ../../standalone/scannerdrake:1
-#, fuzzy, c-format
+#, c-format
msgid "Name/IP address of host:"
-msgstr "����/����� IP ��ַ:"
+msgstr "����������/IP ��ַ:"
#: ../../standalone/scannerdrake:1
-#, fuzzy, c-format
+#, c-format
msgid "This host is already in the list, it cannot be added again.\n"
-msgstr "������/�����Ѿ�λ���б���, �޷��ٴ����ӡ�\n"
+msgstr "�������Ѿ�λ���б��У��޷��ٴ����ӡ�\n"
#: ../../standalone/scannerdrake:1
-#, fuzzy, c-format
+#, c-format
msgid "Scannerdrake"
-msgstr "ɨ����"
+msgstr "Scannerdrake"
#: ../../standalone/scannerdrake:1
-#, fuzzy, c-format
+#, c-format
msgid "You must enter a host name or an IP address.\n"
-msgstr "�������������� IP ��ַ."
+msgstr "������������������ IP ��ַ��\n"
#: ../../standalone/scannerdrake:1
-#, fuzzy, c-format
+#, c-format
msgid "Choose the host on which the local scanners should be made available:"
-msgstr "ѡ�񱾵ش�ӡ�����õ����������:"
+msgstr "ѡ�񱾵�ɨ�������õ����������:"
#: ../../standalone/scannerdrake:1
-#, fuzzy, c-format
+#, c-format
msgid "Sharing of local scanners"
-msgstr "�������ش�ӡ��"
+msgstr "��������ɨ����"
#: ../../standalone/scannerdrake:1
-#, fuzzy, c-format
+#, c-format
msgid "This machine"
-msgstr "(�����������)"
+msgstr "����"
#: ../../standalone/scannerdrake:1
-#, fuzzy, c-format
+#, c-format
msgid "Remove selected host"
-msgstr "ɾ��ѡ�е�����/����"
+msgstr "ɾ��ѡ�е�����"
#: ../../standalone/scannerdrake:1
-#, fuzzy, c-format
+#, c-format
msgid "Edit selected host"
-msgstr "�༭ѡ�е�����/����"
+msgstr "�༭ѡ�е�����"
#: ../../standalone/scannerdrake:1
-#, fuzzy, c-format
+#, c-format
msgid "Add host"
-msgstr "��������/����"
+msgstr "��������"
#: ../../standalone/scannerdrake:1
-#, fuzzy, c-format
+#, c-format
msgid "These are the machines from which the scanners should be used:"
-msgstr "�����DZ������ӵĴ�ӡ��Ҫ�����ļ����������:"
+msgstr "������Ҫʹ��ɨ���ǵļ����:"
#: ../../standalone/scannerdrake:1
-#, fuzzy, c-format
+#, c-format
msgid "Usage of remote scanners"
-msgstr "ʹ�ÿ��пռ�"
+msgstr "Զ��ɨ����ʹ�����"
#: ../../standalone/scannerdrake:1
-#, fuzzy, c-format
+#, c-format
msgid "All remote machines"
-msgstr "û��Զ�̼����"
+msgstr "����Զ�̼����"
#: ../../standalone/scannerdrake:1
-#, fuzzy, c-format
+#, c-format
msgid ""
"These are the machines on which the locally connected scanner(s) should be "
"available:"
-msgstr "�����DZ������ӵĴ�ӡ��Ҫ�����ļ����������:"
+msgstr "�����DZ������ӵ�ɨ����Ҫ���ŵļ����:"
#: ../../standalone/scannerdrake:1
#, c-format
msgid "Use the scanners on hosts: "
-msgstr ""
+msgstr "������������ʹ��ɨ����: "
#: ../../standalone/scannerdrake:1
#, c-format
msgid "Use scanners on remote computers"
-msgstr ""
+msgstr "��Զ�̼������ʹ��ɨ����"
#: ../../standalone/scannerdrake:1
-#, fuzzy, c-format
+#, c-format
msgid "Scanner sharing to hosts: "
-msgstr "������/�����Ϲ�����ӡ����"
+msgstr "�������Ϲ���ɨ����: "
#: ../../standalone/scannerdrake:1
-#, fuzzy, c-format
+#, c-format
msgid "The scanners on this machine are available to other computers"
-msgstr "�˼�����ϵĴ�ӡ���ɹ����������"
+msgstr "�˼�����ϵ�ɨ���ǿɹ����������"
#: ../../standalone/scannerdrake:1
-#, fuzzy, c-format
+#, c-format
msgid ""
"You can also decide here whether scanners on remote machines should be made "
"available on this machine."
-msgstr "���������ڴ˾����Ƿ�Ҫ��Զ�̵Ĵ�ӡ���Զ���װΪ�������á�"
+msgstr "���������ڴ˾����Ƿ�Ҫ��Զ�̵�ɨ�����Զ���װΪ�������á�"
#: ../../standalone/scannerdrake:1
-#, fuzzy, c-format
+#, c-format
msgid ""
"Here you can choose whether the scanners connected to this machine should be "
"accessable by remote machines and by which remote machines."
msgstr ""
-"�������ڴ�ѡ���Ƿ����ӵ������Ĵ�ӡ��������Զ�̼����, �Լ���������Щ����"
+"�������ڴ�ѡ���Ƿ����ӵ�������ɨ���ǹ�����Զ�̼�������Լ���������Щ����"
"����"
#: ../../standalone/scannerdrake:1
#, c-format
+msgid "Re-generating list of configured scanners ..."
+msgstr "�����������������õ�ɨ�����嵥..."
+
+#: ../../standalone/scannerdrake:1
+#, c-format
+msgid "Searching for new scanners ..."
+msgstr "���������µ�ɨ����..."
+
+#: ../../standalone/scannerdrake:1
+#, c-format
+msgid "Searching for configured scanners ..."
+msgstr "�������������õ�ɨ����..."
+
+#: ../../standalone/scannerdrake:1
+#, c-format
+msgid "Scanner sharing"
+msgstr "ɨ���ǹ���"
+
+#: ../../standalone/scannerdrake:1
+#, c-format
+msgid "Add a scanner manually"
+msgstr "�ֶ�����ɨ����"
+
+#: ../../standalone/scannerdrake:1
+#, c-format
+msgid "Search for new scanners"
+msgstr "������ɨ����"
+
+#: ../../standalone/scannerdrake:1
+#, c-format
+msgid "There are no scanners found which are available on your system.\n"
+msgstr "û�з���ɨ����ֱ�����������Ļ����ϡ�\n"
+
+#: ../../standalone/scannerdrake:1
+#, c-format
msgid ""
-"Your %s has been configured.\n"
-"You may now scan documents using \"XSane\" from Multimedia/Graphics in the "
-"applications menu."
+"The following scanner\n"
+"\n"
+"%s\n"
+"is available on your system.\n"
msgstr ""
-"���� %s �Ѿ����úá�\n"
-"���������Դ�Ӧ�ó���˵��ġ���ý��/ͼ����ʹ�á�XSane����ɨ���ĵ���"
+"����ɨ����\n"
+"\n"
+"%s\n"
+"ֱ������������ϵͳ��\n"
#: ../../standalone/scannerdrake:1
#, c-format
msgid ""
-"The %s must be configured by printerdrake.\n"
-"You can launch printerdrake from the Mandrake Control Center in Hardware "
-"section."
+"The following scanners\n"
+"\n"
+"%s\n"
+"are available on your system.\n"
msgstr ""
-"��� %s ����ʹ�� printerdrake �����á�\n"
-"�������� Mandrake �������ĵ�Ӳ�����ִ� printerdrake��"
+"����ɨ����\n"
+"\n"
+"%s\n"
+"ֱ������������ϵͳ��\n"
+
+#: ../../standalone/scannerdrake:1
+#, c-format
+msgid ""
+"Your %s has been configured.\n"
+"You may now scan documents using \"XSane\" from Multimedia/Graphics in the "
+"applications menu."
+msgstr ""
+"���� %s �Ѿ����úá�\n"
+"���������Դ�Ӧ�ó���˵��ġ���ý��/ͼ����ʹ�á�XSane����ɨ���ĵ���"
#: ../../standalone/scannerdrake:1
#, c-format
@@ -18454,92 +18594,74 @@ msgid "choose device"
msgstr "ѡ���豸"
#: ../../standalone/scannerdrake:1
-#, fuzzy, c-format
+#, c-format
msgid "Please select the device where your %s is attached"
-msgstr ""
-"Scannerdrake û�ܼ�⵽���� %s ɨ���ǡ�\n"
-"��ѡ������ɨ�������ӵ��豸��"
+msgstr "��ѡ������ %s �����ӵ��豸��"
#: ../../standalone/scannerdrake:1
#, c-format
-msgid "The %s is unsupported"
-msgstr "ɨ���� %s ����֧��"
+msgid "Searching for scanners ..."
+msgstr "��������ɨ����..."
#: ../../standalone/scannerdrake:1
-#, fuzzy, c-format
-msgid "The %s is not known by this version of Scannerdrake."
-msgstr "����汾�� ScannerDrake ��֧�� %s��"
+#, c-format
+msgid "Auto-detect available ports"
+msgstr "�Զ������õĶ˿�"
#: ../../standalone/scannerdrake:1
#, c-format
-msgid "The %s is not supported by this version of Mandrake Linux."
-msgstr "����汾�� Mandrake Linux ��֧�� %s��"
+msgid "(Note: Parallel ports cannot be auto-detected)"
+msgstr "(ע��: ���ж˿��޷��Զ����)"
#: ../../standalone/scannerdrake:1
#, c-format
-msgid "Re-generating list of configured scanners ..."
+msgid ""
+"The %s must be configured by printerdrake.\n"
+"You can launch printerdrake from the Mandrake Control Center in Hardware "
+"section."
msgstr ""
+"��� %s ����ʹ�� printerdrake �����á�\n"
+"�������� Mandrake �������ĵ�Ӳ�����ִ� printerdrake��"
#: ../../standalone/scannerdrake:1
-#, fuzzy, c-format
-msgid "Searching for new scanners ..."
-msgstr "�����µĴ�ӡ������"
-
-#: ../../standalone/scannerdrake:1
-#, fuzzy, c-format
-msgid "Searching for configured scanners ..."
-msgstr "�����µĴ�ӡ������"
+#, c-format
+msgid "The %s is unsupported"
+msgstr "ɨ���� %s ����֧��"
#: ../../standalone/scannerdrake:1
-#, fuzzy, c-format
-msgid "Scanner sharing"
-msgstr "��ӡ������"
+#, c-format
+msgid "The %s is not known by this version of Scannerdrake."
+msgstr "����汾�� ScannerDrake ��֧�� %s��"
#: ../../standalone/scannerdrake:1
-#, fuzzy, c-format
-msgid "Add a scanner manually"
-msgstr "�ֹ�ѡ���û�"
+#, c-format
+msgid "The %s is not supported by this version of Mandrake Linux."
+msgstr "����汾�� Mandrake Linux ��֧�� %s��"
#: ../../standalone/scannerdrake:1
-#, fuzzy, c-format
-msgid "Search for new scanners"
-msgstr "�����µĴ�ӡ������"
+#, c-format
+msgid "Port: %s"
+msgstr "�˿�: %s"
#: ../../standalone/scannerdrake:1
-#, fuzzy, c-format
-msgid "There are no scanners found which are available on your system.\n"
-msgstr "û�з��ִ�ӡ��ֱ�����������Ļ�����"
+#, c-format
+msgid ", "
+msgstr ", "
#: ../../standalone/scannerdrake:1
-#, fuzzy, c-format
-msgid ""
-"The following scanner\n"
-"\n"
-"%s\n"
-"is available on your system.\n"
-msgstr ""
-"���д�ӡ��\n"
-"\n"
-"%s%s\n"
-"ֱ������������ϵͳ"
+#, c-format
+msgid "Detected model: %s"
+msgstr "��⵽�ͺ�: %s"
#: ../../standalone/scannerdrake:1
-#, fuzzy, c-format
-msgid ""
-"The following scanners\n"
-"\n"
-"%s\n"
-"are available on your system.\n"
-msgstr ""
-"���д�ӡ��\n"
-"\n"
-"%s%s\n"
-"ֱ������������ϵͳ"
+#, c-format
+msgid " ("
+msgstr " ("
#: ../../standalone/scannerdrake:1
#, c-format
-msgid "Select a scanner"
-msgstr "ѡ��ɨ����"
+msgid "Select a scanner model"
+msgstr "ѡ��ɨ�����ͺ�"
#: ../../standalone/scannerdrake:1
#, c-format
@@ -18629,6 +18751,10 @@ msgid "Scientific Workstation"
msgstr "��ѧ���㹤��վ"
#: ../../share/compssUsers:999
+msgid "Scientific applications such as gnuplot"
+msgstr "�� gnuplot �����Ŀ�ѧӦ�ó���"
+
+#: ../../share/compssUsers:999
msgid "Console Tools"
msgstr "����̨����"
@@ -18652,7 +18778,7 @@ msgstr "ͼ�λ���"
#: ../../share/compssUsers:999
msgid "Gnome Workstation"
-msgstr "Gnome����վ"
+msgstr "Gnome ����վ"
#: ../../share/compssUsers:999
msgid ""
@@ -18701,12 +18827,14 @@ msgid "Apache, Pro-ftpd"
msgstr "Apache�� Pro-ftpd"
#: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "�ʼ�/���/����"
+#, fuzzy
+msgid "Mail"
+msgstr "����"
#: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr "Postfix�ʼ�����, Inn ���������"
+#, fuzzy
+msgid "Postfix mail server"
+msgstr "Postfix �ʼ�����"
#: ../../share/compssUsers:999
msgid "Database"
@@ -18805,162 +18933,48 @@ msgid "Programs to manage your finances, such as gnucash"
msgstr "���ڹ������IJ���, �� gnucash"
#~ msgid ""
-#~ "You must indicate where you wish to place the information required to "
-#~ "boot\n"
-#~ "GNU/Linux.\n"
-#~ "\n"
-#~ "Unless you know exactly what you are doing, choose \"First sector of "
-#~ "drive\n"
-#~ "(MBR)\"."
+#~ "Please enter your host name if you know it.\n"
+#~ "Some DHCP servers require the hostname to work.\n"
+#~ "Your host name should be a fully-qualified host name,\n"
+#~ "such as ``mybox.mylab.myco.com''."
#~ msgstr ""
-#~ "��ָ��������������� GNU/Linux ����Ϣ��\n"
-#~ "\n"
-#~ "ѡ��Ӳ�̵ĵ�һ��������MBR�������������������ѡ��ĺ����"
+#~ "�����֪��, ��������������������\n"
+#~ "��Щ DHCP ��������Ҫ�������Ʋ��ܹ���.\n"
+#~ "�����������Ʊ����Ǹ���ȫ�޶���������, \n"
+#~ "���硰mybox.mylab.myco.com��"
-#~ msgid ""
-#~ "DrakX now needs to know if you want to perform a default (\"Recommended"
-#~ "\")\n"
-#~ "installation or if you want to have greater control (\"Expert\") over "
-#~ "your\n"
-#~ "installation. You can also choose to do a new installation or upgrade "
-#~ "your\n"
-#~ "existing Mandrake Linux system:\n"
-#~ "\n"
-#~ " * \"Install\": completely wipes out the old system. However, depending "
-#~ "on\n"
-#~ "what is currently installed on your machine, you may be able to keep "
-#~ "some\n"
-#~ "old partitions (Linux or otherwise) unchanged;\n"
-#~ "\n"
-#~ " * \"Upgrade\": this installation class allows to simply update the\n"
-#~ "packages currently installed on your Mandrake Linux system. It keeps "
-#~ "your\n"
-#~ "hard drives' current partitions as well as user configurations. All "
-#~ "other\n"
-#~ "configuration steps remain available, similar to a normal installation;\n"
-#~ "\n"
-#~ " * \"Upgrade Packages Only\": this new installation class allows you to\n"
-#~ "upgrade an existing Mandrake Linux system while keeping all system\n"
-#~ "configurations unchanged. Adding new packages to the current "
-#~ "installation\n"
-#~ "is also possible.\n"
-#~ "\n"
-#~ "Upgrades should work fine on Mandrake Linux systems using version \"8.1"
-#~ "\"\n"
-#~ "or later.\n"
-#~ "\n"
-#~ "Depending on your GNU/Linux knowledge, select one of the following "
-#~ "choices:\n"
-#~ "\n"
-#~ " * Recommended: choose this if you have never installed a GNU/Linux\n"
-#~ "operating system. The installation will be very easy and you will only "
-#~ "be\n"
-#~ "asked a few questions;\n"
-#~ "\n"
-#~ " * Expert: if you have a good GNU/Linux understanding, you may wish to\n"
-#~ "perform a highly customized installation. Some of the decisions you will\n"
-#~ "have to make may be difficult if you do not have good GNU/Linux "
-#~ "knowledge,\n"
-#~ "so it is not recommended that those without a fair amount of experience\n"
-#~ "select this installation class."
-#~ msgstr ""
-#~ "DrakX ������Ҫ֪����ѡ��ȱʡ�ģ����Ƽ�������װ����Ը���Լ����ƾ��棨\n"
-#~ "��ר�ҡ�)��\n"
-#~ "��������ѡ����ȫ�°�װ����������һ�����е� Mandrake Linux ϵͳ��\n"
-#~ "\n"
-#~ " * ����װ������װȫ�µ�ϵͳ����ʵ��ijЩ����£��������Ա���\n"
-#~ "ϵͳԭ�е�һЩ��Linux ���������������ı䣻\n"
-#~ "\n"
-#~ " * �����������򵥵����������е� Mandrake Linux ϵͳ���Ѿ���װ\n"
-#~ "�ĸ���������������������Ӳ���ϵ�ǰ�ķ������Լ����е��û����á�\n"
-#~ "������ͨ��װ�����ò���ͬ������ʹ�ã�\n"
-#~ "\n"
-#~ " * ��ֻ������������������µİ�װ���Ϳ������������е� Mandrake Linux \n"
-#~ "ϵͳ��ͬʱ�������е�ϵͳ���ò��䡣Ҳ���������µ���������\n"
-#~ "\n"
-#~ "���������ڰ汾��8.1���Ժ�� Mandrake Linux ϵͳ��\n"
-#~ "\n"
-#~ "\n"
-#~ "�����Ը����Լ��� GNU/Linux �˽�ij̶ȣ�ѡ�����еİ�װ����\n"
-#~ "\n"
-#~ "* �Ƽ������������û�а�װ���κ� GNU/Linux ����ϵͳ����ѡ�������\n"
-#~ "��װ���Զ����У��dz��򵥣���ֻ��Ҫ�ش���ٵ����⡣\n"
-#~ "\n"
-#~ "* ר�ң��������ͨ GNU/Linux��������ѡ�������װ����\n"
-#~ "ר�Ұ�װ���������Զ���ϵͳ�ĺܶ෽�档������� GNU/Linux û�к�����\n"
-#~ "���˽⣬�������ѻش�ijЩ���⡣���ԣ������������ᷢ��ʲô���벻Ҫѡ�����"
-#~ "����"
-
-#~ msgid "Please be patient. This operation can take several minutes."
-#~ msgstr "�����ĵȴ����ò������ܻ��ü����ӡ�"
+#~ msgid "DrakFloppy Error: %s"
+#~ msgstr "DrakFloppy ����: %s"
-#~ msgid ""
-#~ "Your new Mandrake Linux operating system is currently being installed.\n"
-#~ "Depending on the number of packages you will be installing and the speed "
-#~ "of\n"
-#~ "your computer, this operation could take from a few minutes to a\n"
-#~ "significant amount of time.\n"
-#~ "\n"
-#~ "Please be patient."
-#~ msgstr ""
-#~ "����Ϊ����װ�µ� Mandrake Linux ����ϵͳ��\n"
-#~ "��װʱ���������ļ�����ٶȺ�����ѡ�İ�װ����������ͬ��\n"
-#~ "�Ӽ����ӵ��ܳ�ʱ�䡣\n"
-#~ "\n"
-#~ "�����ĵȴ���"
+#~ msgid "-misc-Fixed-Medium-r-*-*-*-140-*-*-*-*-*-*,*"
+#~ msgstr "-misc-Fixed-Medium-r-*-*-*-140-*-*-*-*-*-*,*"
-#~ msgid ""
-#~ "X (for X Window System) is the heart of the GNU/Linux graphical "
-#~ "interface\n"
-#~ "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
-#~ "WindowMaker, etc.) bundled with Mandrake Linux rely.\n"
-#~ "\n"
-#~ "You will be presented the list of available resolutions and color depth\n"
-#~ "available for your hardware. Choose the one that best suit your needs "
-#~ "(you\n"
-#~ "will be able to change that after installation though). When you are\n"
-#~ "satisfied with the sample shown in the monitor, click \"OK\". A window "
-#~ "will\n"
-#~ "then appear and ask you if you can see it.\n"
-#~ "\n"
-#~ "If you are doing an \"Expert\" installation, you will enter the X\n"
-#~ "configuration wizard. See the corresponding section of the manual for "
-#~ "more\n"
-#~ "information about this wizard.\n"
-#~ "\n"
-#~ "If you can see the message during the test, and answer \"Yes\", then "
-#~ "DrakX\n"
-#~ "will proceed to the next step. If you cannot see the message, it simply\n"
-#~ "means that the configuration was wrong and the test will automatically "
-#~ "end\n"
-#~ "after 10 seconds, restoring the screen. Refer then to the video\n"
-#~ "configuration section of the user guide for more information on how to\n"
-#~ "configure your display."
-#~ msgstr ""
-#~ "X (����ϵͳ) �� GNU/Linux ��ͼ�ν��������, Mandrake Linux �ĸ���\n"
-#~ "ͼ�λ���(KDE, GNOME, AfterStep, WindowMaker, �ȵ�.)��������.\n"
-#~ "����һ����, DrakX ���᳢���Զ����� X.\n"
-#~ "\n"
-#~ "ʧ�ܵ�����ܺ���, ��������Ӳ���dz�����( ����̫�� ). ����ɹ�, �����Զ�\n"
-#~ "���� X, ������ʾ�豸֧�ֵ���߷ֱ���, һ�����ڻ����, ������ʾ�Ƿ�����.\n"
-#~ "\n"
-#~ "��������С�ר�ҡ� ��װ, �����Խ��� X���þ���. \n"
-#~ "�ֲ�����ר���½ڽ����������.\n"
-#~ "\n"
-#~ "��������Կ������Ե�����, ���ش� ���ǡ�, DrakX �������һ��.\n"
-#~ "��������ܿ�������, ��Ȼ�����д���, ���Ի��� 10 ���Ӻ�������ָ���ʾ."
-
-#~ msgid "Switching between ALSA and OSS help"
-#~ msgstr "�� ALSA �� OSS �������л�"
-
-#~ msgid "quit"
-#~ msgstr "�˳�"
-
-#~ msgid "save"
-#~ msgstr "����"
-
-#~ msgid "Detecting devices ..."
-#~ msgstr "���ڼ���豸..."
-
-#~ msgid "Test ports"
-#~ msgstr "���Զ˿�"
+#~ msgid "Launch Aurora at boot time"
+#~ msgstr "����ʱ���� Aurora"
+
+#~ msgid "Traditional Gtk+ Monitor"
+#~ msgstr "��ͳ Gtk+ ��ʾ��"
+
+#~ msgid "Traditional Monitor"
+#~ msgstr "��ͳ��ʾ��"
+
+#~ msgid "NewStyle Monitor"
+#~ msgstr "������ʾ��"
+
+#~ msgid "NewStyle Categorizing Monitor"
+#~ msgstr "���͹�����ʾ��"
+
+#~ msgid "Secure Connection"
+#~ msgstr "��������"
+
+#~ msgid "FTP Connection"
+#~ msgstr "FTP ����"
+
+#~ msgid "Mail/Groupware/News"
+#~ msgstr "�ʼ�/���/����"
+
+#~ msgid "Postfix mail server, Inn news server"
+#~ msgstr "Postfix�ʼ�����, Inn ���������"
+
+#~ msgid "Format of floppies the drive accept"
+#~ msgstr "���������ܵ����̸�ʽ"