upstream/oracle/g11n/messages: comparison messages/install/zh_CN/usr/share/locale/__LOCALE__/LC

equal deleted inserted replaced

-:ecd02baa4dc8
+:1f67fabe64f4
 #
 # CDDL HEADER END
 #
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
-#: ../src/user_screen.py:300
+#: ../src/user_screen.py:355
 msgid ""
-msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2011-08-12 16:54+0900\nPO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\nLast-Translator: FULL NAME <EMAIL@ADDRESS>\nLanguage-Team: LANGUAGE <[email protected]>\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\n"
+msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2011-08-26 12:39+0900\nPO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\nLast-Translator: FULL NAME <EMAIL@ADDRESS>\nLanguage-Team: LANGUAGE <[email protected]>\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\n"
-#: ../src/__init__.py:269
+#: ../src/__init__.py:262
 #, python-format
 msgid "The %s installer must be run as root. Quitting."
 msgstr "%s 安装程序必须以超级用户身份运行。正在退出。"
-#: ../src/__init__.py:274
+#: ../src/__init__.py:267
 msgid "Installer Startup Terminated"
 msgstr "安装程序启动被终止"
-#: ../src/__init__.py:275 ../src/__init__.py:277
+#: ../src/__init__.py:268 ../src/__init__.py:270
 msgid ""
 "Only one instance of this Installer is allowed. Another instance is already "
 "running."
 msgstr "只允许此安装程序的一个实例运行。另一个实例已经在运行。"
-#: ../src/__init__.py:285
+#: ../src/__init__.py:278
 #, python-format
 msgid "Set log location to FILE (default: %default)"
 msgstr "将日志位置设置为 FILE（缺省值：%default）"
-#: ../src/__init__.py:289
+#: ../src/__init__.py:282
 #, python-format
 msgid ""
 "Set log verbosity to LEVEL. In order of increasing verbosity, valid values "
 "are 'error' 'warn' 'info' 'debug' or 'input'\n"
 "[default: %default]"
 msgstr "将日志详细级别设置为 LEVEL。按照详细级别递增的顺序，有效值依次为 'error'、'warn'、'info'、'debug' 或 'input'\n[缺省值：%default]"
-#: ../src/__init__.py:296
+#: ../src/__init__.py:289
 msgid ""
 "Enable debug mode. Sets logging level to 'input' and enables CTRL-C for "
 "killing the program\n"
 msgstr "启用调试模式。将日志记录级别设置为 'input' 并使 CTRL-C 组合键可用来中止程序\n"
-#: ../src/base_screen.py:69 ../src/welcome_screen.py:62
+#: ../src/base_screen.py:69 ../src/welcome_screen.py:63
 msgid "Welcome"
 msgstr "欢迎"
 #: ../src/base_screen.py:70 ../src/disk_screen.py:706
 msgid "Disk"
 #: ../src/base_screen.py:71
 msgid "Time Zone"
 msgstr "时区"
-#: ../src/base_screen.py:72 ../src/user_screen.py:109
+#: ../src/base_screen.py:72 ../src/user_screen.py:158
 #: ../xml/users.xml.glade.h:9
 msgid "Users"
 msgstr "用户"
 #: ../src/base_screen.py:73 ../src/confirm_screen.py:92
 msgstr "完成"
 #: ../src/base_screen.py:97 ../src/confirm_screen.py:82
 #: ../src/disk_screen.py:141 ../src/failure_screen.py:62
 #: ../src/fdisk_panel.py:152 ../src/finish_screen.py:65
-#: ../src/help_dialog.py:64 ../src/progress_screen.py:104
+#: ../src/help_dialog.py:64 ../src/progress_screen.py:111
 #: ../src/screen_manager.py:217 ../src/textview_dialog.py:53
-#: ../src/timezone.py:210 ../src/timezone_screen.py:75
+#: ../src/timezone.py:230 ../src/timezone_screen.py:75
-#: ../src/user_screen.py:79 ../src/welcome_screen.py:52
+#: ../src/user_screen.py:86 ../src/welcome_screen.py:53
 msgid "Internal error"
 msgstr "内部错误"
 #: ../src/confirm_screen.py:93
 msgid ""
 "Review the settings below before installing. Click the back button to make "
 "changes."
 msgstr "在安装前查看以下设置。单击“上一步”按钮进行更改。"
-#: ../src/confirm_screen.py:176
+#. There is no definitive way to detect whether "Use the whole
-#, python-format
+#. disk" or "Partition the disk" was selected, so we will display
-msgid "%.1f GB disk (%s)"
+#. a message about the Solaris2 partition details for each disk.
-msgstr "%.1f GB 磁盘 (%s)"
+#: ../src/confirm_screen.py:187
+#, python-format
-#: ../src/confirm_screen.py:179
+msgid "%(partsize).1f GB partition on %(disksize).1f GB disk (%(disk)s)"
-msgid "This disk will be erased"
+msgstr "%(disksize).1f GB 磁盘 (%(disk)s) 上的 %(partsize).1f GB 分区"
-msgstr "将会删除此磁盘"
+#: ../src/confirm_screen.py:191
-#: ../src/confirm_screen.py:183
+msgid "This partition will be erased"
+msgstr "将会删除此分区"
+#: ../src/confirm_screen.py:200
 #, python-format
 msgid "The whole installation will take up %.1fGB hard disk space."
 msgstr "整个安装将占用 %.1fGB 的硬盘空间。"
-#: ../src/confirm_screen.py:202
+#: ../src/confirm_screen.py:219
 #, python-format
 msgid "Default Language: %s"
 msgstr "缺省语言: %s"
-#: ../src/confirm_screen.py:207
+#: ../src/confirm_screen.py:224
 msgid "Language Support:"
 msgstr "语言支持："
-#: ../src/confirm_screen.py:215 ../src/confirm_screen.py:217
+#: ../src/confirm_screen.py:232 ../src/confirm_screen.py:234
 #, python-format
 msgid "User Account: %s"
 msgstr "用户帐户：%s"
-#: ../src/confirm_screen.py:215
+#: ../src/confirm_screen.py:232
 msgid "No user account."
 msgstr "无用户帐户。"
-#: ../src/confirm_screen.py:221
+#: ../src/confirm_screen.py:238
 msgid "Root Password: Same as user account."
 msgstr "超级用户口令：与用户帐户相同。"
-#: ../src/confirm_screen.py:224
+#: ../src/confirm_screen.py:241
 #, python-format
 msgid "Host name: %s"
 msgstr "主机名称: %s"
 #: ../src/disk_screen.py:86
 msgid "Validation failed."
 msgstr "验证失败。"
 #: ../src/disk_screen.py:291 ../src/disk_screen.py:363
 #: ../src/disk_screen.py:457 ../src/disk_screen.py:491
-#: ../src/disk_screen.py:521 ../src/disk_screen.py:757
+#: ../src/disk_screen.py:521 ../src/disk_screen.py:762
 msgid "See log file for details."
 msgstr "有关详细信息，请参见日志文件。"
 #: ../src/disk_screen.py:362
 msgid "Final validation failed."
 #: ../src/disk_screen.py:441
 msgid "This disk is too small"
 msgstr "该磁盘太小"
 #: ../src/disk_screen.py:456 ../src/disk_screen.py:490
-#: ../src/disk_screen.py:520 ../src/disk_screen.py:756
+#: ../src/disk_screen.py:520 ../src/disk_screen.py:761
-#: ../src/user_screen.py:299
+#: ../src/user_screen.py:354
 msgid "Internal Error"
 msgstr "内部错误"
 #. NB This messing about is because we want to re-use the existing
 #. localized size formatting string from C, but the Python formatting
 #: ../src/disk_screen.py:707
 msgid "Where should Oracle Solaris be installed?"
 msgstr "Oracle Solaris 应安装在什么位置？"
-#: ../src/disk_screen.py:749
+#: ../src/disk_screen.py:754
 msgid "No disks were found."
 msgstr "未找到磁盘。"
 #. If we cannot get the icon info from the theme, then
 #. just fall back to making up a blank image
-#: ../src/disk_screen.py:852
+#: ../src/disk_screen.py:860
 msgid ""
 "Unable to display correct 'disk' graphics, but all other information is "
 "available."
 msgstr "无法显示正确的“磁盘”图形，但所有其他信息都可用。"
-#: ../src/failure_screen.py:70 ../xml/failure.xml.glade.h:4
+#: ../src/failure_screen.py:71 ../xml/failure.xml.glade.h:4
 msgid "Failure"
 msgstr "失败"
-#: ../src/failure_screen.py:70 ../src/finish_screen.py:80
+#: ../src/failure_screen.py:71 ../src/finish_screen.py:81
-#: ../src/progress_screen.py:137 ../src/user_screen.py:109
+#: ../src/progress_screen.py:144 ../src/user_screen.py:158
 msgid " "
 msgstr " "
 #: ../src/fdisk_panel.py:64
 msgid "Unused"
 "<span size=\"smaller\"><span font_desc=\"Bold\">Warning: </span> The data in "
 "this partition will be erased.</span>"
 msgstr "<span size=\"smaller\"><span font_desc=\"Bold\">警告：</span>将会删除此分区中的数据。</span>"
 #: ../src/fdisk_panel.py:1388 ../src/install_profile.py:124
-#: ../src/user_screen.py:301
+#: ../src/user_screen.py:356
 msgid "Unknown"
 msgstr "未知"
-#: ../src/finish_screen.py:80
+#: ../src/finish_screen.py:81
 msgid "Finished"
 msgstr "已完成"
 #: ../src/gui_install_common.py:53
 msgid "Unable to retrieve a widget from Glade XML files."
 "Internal Error\n"
 "\n"
 "No help available"
 msgstr "内部错误\n\n没有帮助"
-#: ../src/progress_screen.py:137
+#: ../src/progress_screen.py:144
 msgid "Installing"
 msgstr "正在安装"
 #. make a list of translated labels excluding trailing '\n'
 #: ../src/screen_manager.py:256
 #: ../src/textview_dialog.py:80
 msgid "Error:No log file found"
 msgstr "错误：没有找到日志文件"
-#: ../src/timezone.py:42
+#: ../src/timezone.py:48
 msgid "- Select -"
 msgstr "- 选择 -"
 #: ../src/timezone_screen.py:89
 msgid "Time Zone, Date and Time"
 msgid ""
 "Select a city near you on the map or set your time zone below,then set the "
 "date and time."
 msgstr "在地图上选择离您较近的城市或在下面设置您的时区，然后设置日期和时间。"
-#: ../src/timezone_screen.py:387
+#: ../src/timezone_screen.py:385
 msgid "Time Zone Invalid"
 msgstr "时区无效"
-#: ../src/timezone_screen.py:387
+#: ../src/timezone_screen.py:385
 msgid "Please select a valid time zone"
 msgstr "请选择有效的时区"
 #. update the label message
-#: ../src/user_screen.py:155 ../src/user_screen.py:183
+#: ../src/user_screen.py:206 ../src/user_screen.py:234
-#: ../src/user_screen.py:201 ../src/user_screen.py:346
+#: ../src/user_screen.py:254 ../src/user_screen.py:401
 #: ../xml/users.xml.glade.h:8
 msgid "Re-enter to check for typing errors."
 msgstr "重新输入以检查打字错误。"
-#: ../src/user_screen.py:203 ../src/user_screen.py:348
+#: ../src/user_screen.py:256 ../src/user_screen.py:403
 msgid "The two user passwords do not match."
 msgstr "两个用户口令不匹配。"
-#: ../src/user_screen.py:277
+#: ../src/user_screen.py:332
 msgid "<b>Error:</b> A computer name is required."
 msgstr "<b>错误：</b>需要计算机名称。"
-#: ../src/user_screen.py:279
+#: ../src/user_screen.py:334
 msgid "<b>Error:</b> Computer name exceeds maximum length."
 msgstr "<b>错误：</b>计算机名称超过了最大长度。"
-#: ../src/user_screen.py:281
+#: ../src/user_screen.py:336
 msgid "<b>Error:</b> Computer name contains invalid characters."
 msgstr "<b>错误：</b>计算机名称包含无效字符。"
-#: ../src/user_screen.py:283
+#: ../src/user_screen.py:338
 msgid "<b>Error:</b> Computer name ends with invalid character."
 msgstr "<b>错误：</b>计算机名称以无效字符结尾。"
-#: ../src/user_screen.py:293 ../src/user_screen.py:295
+#: ../src/user_screen.py:348 ../src/user_screen.py:350
 msgid "Invalid User Account"
 msgstr "用户帐户无效"
-#: ../src/user_screen.py:294
+#: ../src/user_screen.py:349
 msgid "Enter a Log-in name."
 msgstr "输入登录名。"
-#: ../src/user_screen.py:296
+#: ../src/user_screen.py:351
 msgid "Enter a user password."
 msgstr "输入用户口令。"
-#: ../src/user_screen.py:297
+#: ../src/user_screen.py:352
 msgid "Invalid Computer Name"
 msgstr "计算机名称无效"
-#: ../src/user_screen.py:298
+#: ../src/user_screen.py:353
 msgid "Enter a computer name."
 msgstr "输入计算机名称。"
-#: ../src/user_screen.py:302
+#: ../src/user_screen.py:357
 msgid "Recheck entries."
 msgstr "重新检查条目。"
-#: ../src/user_screen.py:380
+#: ../src/user_screen.py:435
 msgid "Internal error occurred creating profile"
 msgstr "创建配置文件时发生内部错误"
 #: ../xml/confirmation.xml.glade.h:1
 msgid "<span font_desc=\"Arial Bold\">Disk</span>"

changeset 195	1f67fabe64f4
parent 194	ecd02baa4dc8
child 196	4ddebedd5a63