Hello community,
here is the log from the commit of package yast2-trans-zh_CN
checked in at Mon Apr 10 19:57:25 CEST 2006.
--------
--- yast2-trans-zh_CN/yast2-trans-zh_CN.changes 2006-03-24 15:48:50.000000000 +0100
+++ NOARCH/yast2-trans-zh_CN/yast2-trans-zh_CN.changes 2006-04-10 19:50:03.000000000 +0200
@@ -1,0 +2,10 @@
+Mon Apr 10 19:49:41 2006 - ke@suse.de
+
+- Update to version 2.13.10.
+
+------------------------------------------------------------------------
+Mon Apr 10 11:16:16 2006 - ke@suse.de
+
+- Update to version 2.13.9.
+
+------------------------------------------------------------------------
Old:
----
yast2-trans-zh_CN-2.13.8.tar.bz2
New:
----
yast2-trans-zh_CN-2.13.10.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-trans-zh_CN.spec ++++++
--- /var/tmp/diff_new_pack.pro45j/_old 2006-04-10 19:57:14.000000000 +0200
+++ /var/tmp/diff_new_pack.pro45j/_new 2006-04-10 19:57:14.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-trans-zh_CN (Version 2.13.8)
+# spec file for package yast2-trans-zh_CN (Version 2.13.10)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-trans-zh_CN
-Version: 2.13.8
+Version: 2.13.10
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-trans-zh_CN-2.13.8.tar.bz2
+Source0: yast2-trans-zh_CN-2.13.10.tar.bz2
prefix: /usr
Provides: locale(yast2:zh_CN)
BuildRequires: pkgconfig yast2-devtools
@@ -31,7 +31,7 @@
YaST2 - Simplified Chinese Translations
%prep
-%setup -n yast2-trans-zh_CN-2.13.8
+%setup -n yast2-trans-zh_CN-2.13.10
%build
autoreconf --force --install
@@ -63,6 +63,10 @@
/usr/share/YaST2/locale
%changelog -n yast2-trans-zh_CN
+* Mon Apr 10 2006 - ke@suse.de
+- Update to version 2.13.10.
+* Mon Apr 10 2006 - ke@suse.de
+- Update to version 2.13.9.
* Fri Mar 24 2006 - ke@suse.de
- Update to version 2.13.8.
* Fri Mar 03 2006 - ke@suse.de
++++++ yast2-trans-zh_CN-2.13.8.tar.bz2 -> yast2-trans-zh_CN-2.13.10.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-zh_CN-2.13.8/VERSION new/yast2-trans-zh_CN-2.13.10/VERSION
--- old/yast2-trans-zh_CN-2.13.8/VERSION 2006-03-24 15:48:23.000000000 +0100
+++ new/yast2-trans-zh_CN-2.13.10/VERSION 2006-04-10 19:49:41.000000000 +0200
@@ -1 +1 @@
-2.13.8
+2.13.10
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-zh_CN-2.13.8/configure new/yast2-trans-zh_CN-2.13.10/configure
--- old/yast2-trans-zh_CN-2.13.8/configure 2006-03-24 15:48:30.000000000 +0100
+++ new/yast2-trans-zh_CN-2.13.10/configure 2006-04-10 19:49:47.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-trans-zh_CN 2.13.8.
+# Generated by GNU Autoconf 2.59 for yast2-trans-zh_CN 2.13.10.
#
# Report bugs to http://www.suse.de/feedback.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-trans-zh_CN'
PACKAGE_TARNAME='yast2-trans-zh_CN'
-PACKAGE_VERSION='2.13.8'
-PACKAGE_STRING='yast2-trans-zh_CN 2.13.8'
+PACKAGE_VERSION='2.13.10'
+PACKAGE_STRING='yast2-trans-zh_CN 2.13.10'
PACKAGE_BUGREPORT='http://www.suse.de/feedback'
ac_unique_file="RPMNAME"
@@ -728,7 +728,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-trans-zh_CN 2.13.8 to adapt to many kinds of systems.
+\`configure' configures yast2-trans-zh_CN 2.13.10 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -795,7 +795,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-trans-zh_CN 2.13.8:";;
+ short | recursive ) echo "Configuration of yast2-trans-zh_CN 2.13.10:";;
esac
cat <<\_ACEOF
@@ -910,7 +910,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-trans-zh_CN configure 2.13.8
+yast2-trans-zh_CN configure 2.13.10
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -924,7 +924,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-trans-zh_CN $as_me 2.13.8, which was
+It was created by yast2-trans-zh_CN $as_me 2.13.10, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1654,7 +1654,7 @@
# Define the identity of the package.
PACKAGE='yast2-trans-zh_CN'
- VERSION='2.13.8'
+ VERSION='2.13.10'
cat >>confdefs.h <<_ACEOF
@@ -1865,7 +1865,7 @@
-VERSION="2.13.8"
+VERSION="2.13.10"
RPMNAME="yast2-trans-zh_CN"
MAINTAINER="Karl Eichwalder "
@@ -2761,7 +2761,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-trans-zh_CN $as_me 2.13.8, which was
+This file was extended by yast2-trans-zh_CN $as_me 2.13.10, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2816,7 +2816,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-trans-zh_CN config.status 2.13.8
+yast2-trans-zh_CN config.status 2.13.10
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-zh_CN-2.13.8/configure.in new/yast2-trans-zh_CN-2.13.10/configure.in
--- old/yast2-trans-zh_CN-2.13.8/configure.in 2006-03-24 15:48:25.000000000 +0100
+++ new/yast2-trans-zh_CN-2.13.10/configure.in 2006-04-10 19:49:43.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-trans-zh_CN, 2.13.8, http://www.suse.de/feedback, yast2-trans-zh_CN)
+AC_INIT(yast2-trans-zh_CN, 2.13.10, http://www.suse.de/feedback, yast2-trans-zh_CN)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.13.8"
+VERSION="2.13.10"
RPMNAME="yast2-trans-zh_CN"
MAINTAINER="Karl Eichwalder "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-zh_CN-2.13.8/po/installation.zh_CN.po new/yast2-trans-zh_CN-2.13.10/po/installation.zh_CN.po
--- old/yast2-trans-zh_CN-2.13.8/po/installation.zh_CN.po 2006-03-24 15:33:34.000000000 +0100
+++ new/yast2-trans-zh_CN-2.13.10/po/installation.zh_CN.po 2006-04-10 18:55:42.000000000 +0200
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: installation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-13 14:14+0100\n"
+"POT-Creation-Date: 2006-03-28 23:07+0200\n"
"PO-Revision-Date: 2005-05-06 17:12+0100\n"
"Last-Translator: Novell Language \n"
"Language-Team: Novell Language \n"
@@ -28,6 +28,16 @@
msgid "&Dummy"
msgstr "虚设(&D)"
+#: src/clients/add-on_auto.ycp:55
+#, ycp-format
+msgid "<li>Media: %1, Path: %2, Product: %3</li>\n"
+msgstr "<li> 媒体: %1,路径: %2,产品: %3</li>\n"
+
+#. error report
+#: src/clients/add-on_auto.ycp:123
+msgid "Failed to add Add-On Product."
+msgstr "未能添加附加产品。"
+
#. progress step title
#: src/clients/copy_files_finish.ycp:45
msgid "Copying files to installed system..."
@@ -48,46 +58,6 @@
msgid "Initializing fonts..."
msgstr "正在初始化字体..."
-#. main screen heading
-#: src/clients/inst_add-on.ycp:27
-msgid "Add-On Product Installation"
-msgstr "附加产品安装"
-
-#. placeholder for unknown path
-#. placeholder for unknown URL
-#. placeholder for unknown directory
-#. place holder for unknown URL
-#: src/clients/inst_add-on.ycp:34 src/clients/inst_add-on.ycp:40
-#: src/include/add-on-workflow.ycp:281 src/include/add-on-workflow.ycp:286
-msgid "Unknown"
-msgstr "未知"
-
-#. table cell, %1 is URL, %2 is directory name
-#: src/clients/inst_add-on.ycp:38 src/include/add-on-workflow.ycp:284
-#, ycp-format
-msgid "URL: %1, Directory: %2"
-msgstr "URL: %1,目录: %2"
-
-#: src/clients/inst_add-on.ycp:43
-#, ycp-format
-msgid "Product %1"
-msgstr "产品 %1"
-
-#. table header
-#: src/clients/inst_add-on.ycp:48
-msgid "Media"
-msgstr "媒体"
-
-#. table header
-#: src/clients/inst_add-on.ycp:50
-msgid "Product"
-msgstr "产品"
-
-#. message report
-#: src/clients/inst_add-on.ycp:82
-msgid "Select a product to delete."
-msgstr "选择要删除的产品。"
-
#. strings for "ask for online update"-popup
#: src/clients/inst_ask_online_update.ycp:34
msgid "Run Update"
@@ -345,16 +315,16 @@
msgstr "保存安装设置"
#. progress stage
-#: src/clients/inst_finish.ycp:86
+#: src/clients/inst_finish.ycp:85
msgid "Prepare system for initial boot"
msgstr "为初次引导准备系统"
#. Headline for last dialog of base installation: Install LILO etc.
-#: src/clients/inst_finish.ycp:149
+#: src/clients/inst_finish.ycp:148
msgid "Finishing Basic Installation"
msgstr "正在完成基本安装"
-#: src/clients/inst_finish.ycp:193
+#: src/clients/inst_finish.ycp:192
msgid "Finished."
msgstr "已完成。"
@@ -364,22 +334,22 @@
msgstr "我不同意(&N)"
#. dialog caption
-#: src/clients/inst_license.ycp:86
+#: src/clients/inst_license.ycp:85 src/modules/AddOnProduct.ycp:686
msgid "License Agreement"
msgstr "许可协议"
#. radio button
-#: src/clients/inst_license.ycp:102
+#: src/clients/inst_license.ycp:101 src/modules/AddOnProduct.ycp:702
msgid "Yes, I Agree to the License Agreement"
msgstr "是,我接受许可协议"
#. radio button
-#: src/clients/inst_license.ycp:106
+#: src/clients/inst_license.ycp:105 src/modules/AddOnProduct.ycp:706
msgid "No, I Do Not Agree"
msgstr "否,我不同意"
#. help text
-#: src/clients/inst_license.ycp:115
+#: src/clients/inst_license.ycp:114 src/modules/AddOnProduct.ycp:716
msgid ""
"<p>Read the license agreement carefully and select\n"
"one of the available options. If you do not agree to the license agreement,\n"
@@ -390,34 +360,34 @@
"配置将中止。</p>\n"
#. yes-no popup
-#: src/clients/inst_license.ycp:149
+#: src/clients/inst_license.ycp:148 src/modules/AddOnProduct.ycp:823
msgid "Reread or reconsider the license agreement?"
msgstr "是否重新阅读或重新考虑该许可协议?"
#. timed ok/cancel popup
-#: src/clients/inst_license.ycp:163
+#: src/clients/inst_license.ycp:162
msgid "System is shutting down..."
msgstr "系统正在关闭..."
#. message popup
-#: src/clients/inst_license.ycp:180
+#: src/clients/inst_license.ycp:179 src/modules/AddOnProduct.ycp:837
msgid "Accept or decline the license agreement."
msgstr "接受或拒绝该许可协议。"
#. label
-#: src/clients/inst_mode.ycp:49 src/clients/inst_system_analysis.ycp:45
+#: src/clients/inst_mode.ycp:49 src/clients/inst_system_analysis.ycp:47
msgid "Evaluating root partition. One moment please..."
msgstr "正在评估根分区。 请稍候..."
#. a popup
-#: src/clients/inst_mode.ycp:57 src/clients/inst_system_analysis.ycp:53
+#: src/clients/inst_mode.ycp:57 src/clients/inst_system_analysis.ycp:55
msgid "No Linux root partition found."
msgstr "未找到 Linux 根分区。"
#. Information popup: Inform user what partition
#. will be booted from after user selected
#. "Boot installed system"
-#: src/clients/inst_mode.ycp:80 src/clients/inst_system_analysis.ycp:76
+#: src/clients/inst_mode.ycp:80 src/clients/inst_system_analysis.ycp:78
#, ycp-format
msgid "Booting from %1"
msgstr "正在从 %1 引导"
@@ -458,7 +428,7 @@
"</p>"
#. help text for installation method
-#: src/clients/inst_mode.ycp:164 src/clients/inst_system_analysis.ycp:154
+#: src/clients/inst_mode.ycp:164 src/clients/inst_system_analysis.ycp:156
msgid ""
"<p>\n"
"Select <b>New Installation</b> if there is no existing Linux system on your\n"
@@ -473,7 +443,7 @@
"</p>"
#. help text for installation method
-#: src/clients/inst_mode.ycp:175 src/clients/inst_system_analysis.ycp:162
+#: src/clients/inst_mode.ycp:175 src/clients/inst_system_analysis.ycp:164
msgid ""
"<p>\n"
"Select <b>Update an Existing System</b> to update a Linux system already\n"
@@ -534,7 +504,7 @@
#. label for radio button 3: Start repair system
#. radio button
-#: src/clients/inst_mode.ycp:230 src/clients/inst_system_analysis.ycp:137
+#: src/clients/inst_mode.ycp:230 src/clients/inst_system_analysis.ycp:139
msgid "&Repair Installed System"
msgstr "修复已安装系统(&R)"
@@ -549,7 +519,7 @@
msgstr "请选择"
#. this is a label of a message box
-#: src/clients/inst_mode.ycp:333 src/clients/inst_system_analysis.ycp:253
+#: src/clients/inst_mode.ycp:333 src/clients/inst_system_analysis.ycp:265
msgid ""
"Choose one of the\n"
"options to continue."
@@ -796,8 +766,12 @@
msgid "Release Notes"
msgstr "发行说明"
+#: src/clients/inst_release_notes.ycp:78
+msgid "&Product"
+msgstr "产品(&P)"
+
#. help text for dialog "Release Notes"
-#: src/clients/inst_release_notes.ycp:86
+#: src/clients/inst_release_notes.ycp:85
msgid ""
"<p>Here are the <b>release notes</b> for the installed\n"
"Linux system. They provide a brief summary of new features and changes.</p>"
@@ -863,11 +837,16 @@
"请检査您的硬件。\n"
#. strings for main (wizard) layout
-#: src/clients/inst_suse_register.ycp:48
+#. Transltors: This is title/brand - only translate the Configuration
+#: src/clients/inst_suse_register.ycp:54
msgid "Novell Customer Center Configuration"
msgstr "Novell 客户中心配置"
-#: src/clients/inst_suse_register.ycp:49
+#: src/clients/inst_suse_register.ycp:55
+msgid "Update Configuration"
+msgstr "更新配置"
+
+#: src/clients/inst_suse_register.ycp:61
msgid ""
"Get technical support and product updates and\n"
"manage subscriptions with Novell Customer Center."
@@ -875,49 +854,58 @@
"通过 Novell 客户中心,获得技术支持和产品更新\n"
"并管理订购。"
-#: src/clients/inst_suse_register.ycp:52
+#: src/clients/inst_suse_register.ycp:67
msgid "Configure Now (Recommended)"
msgstr "立即配置(建议)"
-#: src/clients/inst_suse_register.ycp:53
+#: src/clients/inst_suse_register.ycp:68
msgid "Configure Later"
msgstr "稍后配置"
-#: src/clients/inst_suse_register.ycp:55
-msgid "Include Extra Information"
-msgstr "包括额外信息"
-
-#: src/clients/inst_suse_register.ycp:56
+#: src/clients/inst_suse_register.ycp:70
+msgid "Include for Convenience"
+msgstr "包含可提供方便"
+
+#. Translators: Text for UI Label - capitalized
+#: src/clients/inst_suse_register.ycp:71
+#: src/clients/suse_register_auto.ycp:198
msgid "Hardware Profile"
msgstr "硬件简报"
-#: src/clients/inst_suse_register.ycp:57
-msgid "Optional Data"
-msgstr "可选数据"
-
-#: src/clients/inst_suse_register.ycp:58
-msgid "Preview Information"
-msgstr "预览信息"
+#. Translators: Text for UI Label - capitalized
+#: src/clients/inst_suse_register.ycp:72
+#: src/clients/suse_register_auto.ycp:200
+msgid "Optional Information"
+msgstr "可选信息"
+
+#: src/clients/inst_suse_register.ycp:73
+msgid "Registration Code"
+msgstr "注册代码"
+
+#: src/clients/inst_suse_register.ycp:74
+#: src/clients/inst_suse_register.ycp:164
+msgid "Details..."
+msgstr "细节..."
#. strings for success popup
-#: src/clients/inst_suse_register.ycp:62
+#: src/clients/inst_suse_register.ycp:78
msgid "Your configuration was successful."
msgstr "配置已成功完成。"
#. strings for manual interaction popup
-#: src/clients/inst_suse_register.ycp:66
+#: src/clients/inst_suse_register.ycp:82
msgid "Manual Interaction Required"
msgstr "必需的手动干预"
-#: src/clients/inst_suse_register.ycp:67
+#: src/clients/inst_suse_register.ycp:83
msgid "Needed Information"
msgstr "需要的信息"
-#: src/clients/inst_suse_register.ycp:68
+#: src/clients/inst_suse_register.ycp:84
msgid "Continue"
msgstr "继续"
-#: src/clients/inst_suse_register.ycp:69
+#: src/clients/inst_suse_register.ycp:86
msgid ""
"A Web browser will start in which to complete\n"
"the configuration on the opened Web site."
@@ -926,12 +914,11 @@
"打开的万维网站点的配置。"
#. string for show information popup
-#: src/clients/inst_suse_register.ycp:75
-msgid "Information to Send"
-msgstr "要发送的信息"
+#: src/clients/inst_suse_register.ycp:92
+msgid "Registration and Privacy Information"
+msgstr "注册和隐私信息"
-#. strings for conflict popup
-#: src/clients/inst_suse_register.ycp:78
+#: src/clients/inst_suse_register.ycp:96
msgid ""
"The server requires additional system information. Activating \n"
"submission of the hardware profile automatically."
@@ -939,49 +926,121 @@
"服务器需要附加系统信息。手动\n"
"激活硬件简报的提交。"
+#. nonroot-message strings
+#: src/clients/inst_suse_register.ycp:101
+msgid "Update Source Issues"
+msgstr "更新源问题"
+
+#: src/clients/inst_suse_register.ycp:103
+msgid ""
+"Registering as a regular user does not include the update source\n"
+"in the Online Update YaST module. If you continue and later want \n"
+"to update with Online Update, the source must be added manually.\n"
+"Other tools, such as Software Updater in the panel, can still be \n"
+"used. Alternatively, cancel then register through YaST as root \n"
+"so the sources are available to all tools."
+msgstr ""
+"作为普通用户注册就不会在线更新 YaST 模块\n"
+"中包含更新源。如果继续并在稍后要\n"
+"用在线更新来更新,必须手动添加源。\n"
+" 其他工具(例如面板中的软件更新程序)\n"
+" 仍可使用。或者在取消后,通过 YaST 作为 root 用户注册,\n"
+"以使源可用于所有工具。"
+
#. error messages
-#: src/clients/inst_suse_register.ycp:83
+#: src/clients/inst_suse_register.ycp:114
msgid "Error: Recieved data is invalid."
msgstr "错误: 收到的数据无效。"
-#: src/clients/inst_suse_register.ycp:84
+#: src/clients/inst_suse_register.ycp:115
msgid "Error: Could not retrieve data."
msgstr "错误: 无法检索数据。"
-#. help text for dialog "Novell Customer Center Configuration"
-#: src/clients/inst_suse_register.ycp:88
+#: src/clients/inst_suse_register.ycp:121
+msgid ""
+"<p>\n"
+"Configure your system to enable online updates by registering it with Novell.\n"
+"To do this now, select <b>Configure Now</b>. Delay the registration with\n"
+"<b>Configure Later</b>.\n"
+"</p>"
+msgstr ""
+"<p>\n"
+"请通过向 Novell 注册您的系统,来将系统配置为启用在线更新。\n"
+" 要立即执行此操作,请选择<b>立即配置</b>。使用\n"
+" <b>稍后配置</b>可延迟注册。\n"
+" </p>"
+
+#: src/clients/inst_suse_register.ycp:129
+msgid ""
+"<p>\n"
+"To simplify the registration process, include information from your system\n"
+"with <b>Optional Information</b> and <b>Hardware Profile</b>. \n"
+"<b>Details</b> shows the maximum amount of information that can be involved\n"
+" in your registration. To obtain this information, it contacts the Novell\n"
+"server to query what information is needed for your product. Only the identity\n"
+"of the installed product is sent in this initial exchange.\n"
+"</p>"
+msgstr ""
+"<p>\n"
+"要简化注册流程,使用\n"
+"<b>可选信息</b>和<b>硬件简报</b>从系统包含信息。\n"
+" <b>细节</b>显示在注册中可包含的\n"
+"最详细信息。要获取此信息,连接 Novell\n"
+"服务器来查询产品所需的信息。在初始交换中,仅发送\n"
+"已安装产品的标识。\n"
+" </p>"
+
+#: src/clients/inst_suse_register.ycp:140
+msgid ""
+"<p>\n"
+"If you purchased your copy of this product, enable <b>Registration Code</b>\n"
+"so you are prompted for your product code. \n"
+"This registers you for the installation support included with your product.\n"
+"</p>"
+msgstr ""
+"<p>\n"
+"如果已购买此产品的副本,请启用<b>注册代码</b>,\n"
+"以便得到产品代码的提示。\n"
+" 这会注册产品包含的安装支持。\n"
+" </p>"
+
+#: src/clients/inst_suse_register.ycp:148
msgid ""
-"<p><b>Novell Customer Center Configuration</b></p>\n"
-"<p>To be replaced by a useful text. This text should explain what we are doing here in this yast module.</p>"
+"<p>\n"
+"No information is passed to anyone outside Novell. The data is used for\n"
+"statistical purposes and to enhance your convenience regarding driver support\n"
+"and your Web account. Find a detailed privacy policy in <b>Details</b>. View\n"
+"the transmitted information in the log file <tt>~/.suse_register.log</tt>.\n"
+"</p>"
msgstr ""
-"<p><b>Novell 客户中心配置</b></p>\n"
-"<p>要替换为有用的文本。此文本应解释正在此 yast 模块上执行的操作。</p>"
+"<p>\n"
+"没有信息会传送给 Novell 以外的任何人。此数据用于\n"
+"统计,并在驱动器支持和万维网帐户\n"
+"方面为您提供更多方便。请在<b>细节</b>中查找详细的隐私策略。请在\n"
+"日志文件 <tt>~/.suse_register.log</tt> 中查看传送的信息。\n"
+" </p>"
+
+#. further strings
+#: src/clients/inst_suse_register.ycp:161
+msgid "Checking..."
+msgstr "正在检查..."
-#: src/clients/inst_suse_register.ycp:195
+#: src/clients/inst_suse_register.ycp:162
msgid "Error"
msgstr "错误"
-#: src/clients/inst_suse_register.ycp:197
+#: src/clients/inst_suse_register.ycp:163
msgid "An error occurred while connecting to the server."
msgstr "连接服务器时出错。"
-#: src/clients/inst_suse_register.ycp:201
-msgid "Details"
-msgstr "细节"
-
-#: src/clients/inst_suse_register.ycp:212
+#: src/clients/inst_suse_register.ycp:165
msgid "Error Message"
msgstr "错误讯息"
-#: src/clients/inst_suse_register.ycp:506
+#: src/clients/inst_suse_register.ycp:166
msgid "Starting Browser..."
msgstr "正在启动浏览器..."
-#. show the user, that we are doing something
-#: src/clients/inst_suse_register.ycp:535
-msgid "Checking..."
-msgstr "正在检查..."
-
#. //////////////////////////////////////////////////////////////////////////////
#. Main Dialog
#. //////////////////////////////////////////////////////////////////////////////
@@ -1054,43 +1113,43 @@
"以激活新内核。\n"
#. frame
-#: src/clients/inst_system_analysis.ycp:103
-#: src/clients/inst_system_analysis.ycp:232
+#: src/clients/inst_system_analysis.ycp:105
+#: src/clients/inst_system_analysis.ycp:238
msgid "Installation Mode"
msgstr "安装方式"
#. radio button
-#: src/clients/inst_system_analysis.ycp:105
+#: src/clients/inst_system_analysis.ycp:107
msgid "New &Installation"
msgstr "全新安装(&I)"
#. radio button
-#: src/clients/inst_system_analysis.ycp:109
+#: src/clients/inst_system_analysis.ycp:111
msgid "&Update"
msgstr "更新(&U)"
#. check box
-#: src/clients/inst_system_analysis.ycp:114
+#: src/clients/inst_system_analysis.ycp:116
msgid "In&clude Add-On Products from Separate Media"
msgstr "包括个别媒体中的附加产品(&C)"
#. push button
-#: src/clients/inst_system_analysis.ycp:125
+#: src/clients/inst_system_analysis.ycp:127
msgid "&Other..."
msgstr "其他(&O)..."
#. frame
-#: src/clients/inst_system_analysis.ycp:133
+#: src/clients/inst_system_analysis.ycp:135
msgid "Other Options"
msgstr "其他选项"
#. radio button
-#: src/clients/inst_system_analysis.ycp:140
+#: src/clients/inst_system_analysis.ycp:142
msgid "&Boot Installed System"
msgstr "引导已安装系统(&B)"
#. help text for installation method
-#: src/clients/inst_system_analysis.ycp:150
+#: src/clients/inst_system_analysis.ycp:152
msgid ""
"<p><big><b>Installation Mode</b></big><br>\n"
"Select what to do:</p>"
@@ -1099,7 +1158,7 @@
"请选择要执行的操作:</p>"
#. help text for installation method
-#: src/clients/inst_system_analysis.ycp:169
+#: src/clients/inst_system_analysis.ycp:171
msgid ""
"<p>\n"
"To install an add-on product from separate media together with &product;, select\n"
@@ -1110,7 +1169,7 @@
" <b>包括个别媒体中的附加产品</b>。</p>\n"
#. help text for installation method
-#: src/clients/inst_system_analysis.ycp:175
+#: src/clients/inst_system_analysis.ycp:177
msgid ""
"<p>Click <b>Other</b> then \n"
"select <b>Repair Installed System</b> if you have a damaged Linux system on\n"
@@ -1123,7 +1182,7 @@
" </p>"
#. help text for installation method
-#: src/clients/inst_system_analysis.ycp:181
+#: src/clients/inst_system_analysis.ycp:183
msgid ""
"<p>Click <b>Other</b> then\n"
"select <b>Boot Installed System</b> if you have a Linux system on your hard\n"
@@ -1134,7 +1193,7 @@
" 。可利用此选项尝试手工解决问题。\n"
" </p>"
-#: src/clients/inst_system_analysis.ycp:188
+#: src/clients/inst_system_analysis.ycp:190
msgid "Analyzing the Computer"
msgstr "正在分析计算机"
@@ -1172,7 +1231,7 @@
#. }
#. dialog caption
-#: src/clients/installation.ycp:140 src/modules/AddOnProduct.ycp:689
+#: src/clients/installation.ycp:140 src/modules/AddOnProduct.ycp:915
msgid "Initializing..."
msgstr "正在初始化..."
@@ -1295,32 +1354,32 @@
msgstr "正在保存时区..."
#. progress step title
-#: src/clients/save_config_finish.ycp:64
+#: src/clients/save_config_finish.ycp:66
msgid "Saving language..."
msgstr "正在保存语言..."
#. progress step title
-#: src/clients/save_config_finish.ycp:68
+#: src/clients/save_config_finish.ycp:71
msgid "Saving keyboard configuration..."
msgstr "正在保存键盘配置..."
#. progress step title
-#: src/clients/save_config_finish.ycp:72
+#: src/clients/save_config_finish.ycp:75
msgid "Saving product information..."
msgstr "正在保存产品信息..."
#. progress step title
-#: src/clients/save_config_finish.ycp:78
+#: src/clients/save_config_finish.ycp:81
msgid "Saving automatical installation settings..."
msgstr "正在保存自动安装设置..."
#. progress step title
-#: src/clients/save_config_finish.ycp:83
+#: src/clients/save_config_finish.ycp:86
msgid "Saving console configuration..."
msgstr "正在保存控制台配置..."
#. progress step title
-#: src/clients/save_config_finish.ycp:88
+#: src/clients/save_config_finish.ycp:91
msgid "Configuring the superuser's environment..."
msgstr "正在配置超级用户环境..."
@@ -1334,6 +1393,109 @@
msgid "Copying SSH settings to installed system..."
msgstr "正在将 SSH 设置复制到已安装的系统..."
+#. Translators: Heading - capitalized
+#: src/clients/suse_register_auto.ycp:64
+#: src/clients/suse_register_auto.ycp:176
+msgid "Product Registration"
+msgstr "产品注册"
+
+#. Translators: Text in a sentece-like environment - normal capitalization
+#: src/clients/suse_register_auto.ycp:66
+msgid "Run during autoinstallation"
+msgstr "自动安装期间运行"
+
+#: src/clients/suse_register_auto.ycp:66
+msgid "Do not run during autoinstallation"
+msgstr "自动安装期间不运行"
+
+#. Translators: Sentence-like text for singular and plural (incl. zero) of items
+#: src/clients/suse_register_auto.ycp:70
+msgid "1 item of registration data"
+msgstr "1 项注册数据"
+
+#: src/clients/suse_register_auto.ycp:70
+#, ycp-format
+msgid "%1 items of registration data"
+msgstr "%1 项注册数据"
+
+#: src/clients/suse_register_auto.ycp:74
+msgid "Included Information"
+msgstr "包含的信息"
+
+#. Translators: Text in a sentece-like environment - normal capitalization
+#: src/clients/suse_register_auto.ycp:77
+msgid "Hardware profile"
+msgstr "硬件简报"
+
+#. Translators: Text in a sentece-like environment - normal capitalization
+#: src/clients/suse_register_auto.ycp:79
+msgid "Optional information"
+msgstr "可选信息"
+
+#. TextEntry label
+#: src/clients/suse_register_auto.ycp:128
+msgid "&Key"
+msgstr "密钥(&K)"
+
+#. TextEntry label
+#: src/clients/suse_register_auto.ycp:130
+msgid "&Value"
+msgstr "值(&V)"
+
+#: src/clients/suse_register_auto.ycp:157
+msgid "Key is invalid."
+msgstr "密钥无效。"
+
+#: src/clients/suse_register_auto.ycp:179
+msgid "<p>Product registration includes your product in Novell's database, enabling you to get online updates and technical support. To register while installing automatically, select <b>Run Product Registration</b>. To simplify the procedure, include information from your system with <b>Hardware Profile</b> and <b>Optional Information</b>.</p>"
+msgstr ""
+"<p>产品注册将您的产品包含在 Novell 数据库中,使您能够获取在线更新和技术支持。要在自动安装期间注册,请选择<b>运行产品注册</b>。<p>\n"
+"要简化过程,使用\n"
+"<b>可选信息</b>和<b>硬件简报</b>从系统包含信息。"
+
+#: src/clients/suse_register_auto.ycp:182
+msgid "<p>Get more information about the registration process with <tt>suse_register -h</tt>.</p>"
+msgstr "<p>使用 <tt>suse_register -h</tt> 获取有关注册过程的更多信息。</p>"
+
+#: src/clients/suse_register_auto.ycp:185
+msgid "<p>Other information used for registration is shown in <b>Registration Data</b>. Add a new key and value pair by pressing <b>Add</b> then entering the appropriate values. These parameters are those that can be passed with <tt>suse_register -a</tt>. Get more information about them with <tt>suse_register -p</tt>. Remove a pair with <b>Delete</b> or modify an existing pair with <b>Edit</b>.</p>"
+msgstr "<p>用于注册的其他信息显示在<b>注册数据</b>中。按<b>添加</b>,然后输入适当的值,添加新密钥和值对。这些参数可使用 <tt>suse_register -a</tt> 传递。使用 <tt>suse_register -p</tt> 获取有关这些参数的更多信息。 使用<b>删除</b>去除值对和使用<b>编辑</b>修改现有值对。</p>"
+
+#. Translators: Text for UI Label - capitalized
+#: src/clients/suse_register_auto.ycp:193
+msgid "Run Product Registration"
+msgstr "运行产品注册"
+
+#. Translators: Text for UI Label - capitalized
+#: src/clients/suse_register_auto.ycp:196
+msgid "Include in Registration"
+msgstr "包含在注册中"
+
+#. Translators: Text for UI Label - capitalized
+#: src/clients/suse_register_auto.ycp:205
+msgid "Registration Data to Use"
+msgstr "要使用的注册数据"
+
+#: src/clients/suse_register_auto.ycp:206
+msgid "Key"
+msgstr "密钥"
+
+#: src/clients/suse_register_auto.ycp:206
+msgid "Value"
+msgstr "值"
+
+#: src/clients/suse_register_auto.ycp:208
+msgid "Ad&d"
+msgstr "添加(&D)"
+
+#: src/clients/suse_register_auto.ycp:209
+msgid "&Edit"
+msgstr "编辑(&E)"
+
+#: src/clients/suse_register_auto.ycp:210
+msgid "De&lete"
+msgstr "删除(&L)"
+
#. progress step title
#: src/clients/switch_scr_finish.ycp:42
msgid "Moving to installed system..."
@@ -1413,62 +1575,62 @@
msgstr "正在写入 YaST 配置..."
#. radio button
-#: src/include/add-on-workflow.ycp:43
+#: src/include/add-on-workflow.ycp:61
msgid "&Scan Using SLP..."
msgstr "使用 SLP 扫描(&S)..."
#. radio button
-#: src/include/add-on-workflow.ycp:45
+#: src/include/add-on-workflow.ycp:63
msgid "&FTP..."
msgstr "FTP(&F)..."
#. radio button
-#: src/include/add-on-workflow.ycp:47
+#: src/include/add-on-workflow.ycp:65
msgid "&HTTP..."
msgstr "HTTP(&H)..."
#. radio button
-#: src/include/add-on-workflow.ycp:49
+#: src/include/add-on-workflow.ycp:67
msgid "HTT&PS..."
msgstr "HTTPS(&P)..."
#. radio button
-#: src/include/add-on-workflow.ycp:51
+#: src/include/add-on-workflow.ycp:69
msgid "&SMB/CIFS"
msgstr "SMB/CIFS(&S)"
#. radio button
-#: src/include/add-on-workflow.ycp:53
+#: src/include/add-on-workflow.ycp:71
msgid "&NFS..."
msgstr "NFS(&N)..."
#. radio button
-#: src/include/add-on-workflow.ycp:55
+#: src/include/add-on-workflow.ycp:73 src/include/add-on-workflow.ycp:95
msgid "&CD..."
msgstr "CD(&C)..."
#. radio button
-#: src/include/add-on-workflow.ycp:57
+#: src/include/add-on-workflow.ycp:75 src/include/add-on-workflow.ycp:97
msgid "&DVD..."
msgstr "DVD(&D)..."
#. radio button
-#: src/include/add-on-workflow.ycp:59
+#: src/include/add-on-workflow.ycp:77 src/include/add-on-workflow.ycp:99
msgid "&Local Directory..."
msgstr "本地目录(&L)..."
#. radio button
-#: src/include/add-on-workflow.ycp:61
+#: src/include/add-on-workflow.ycp:79
msgid "Specify &URL..."
msgstr "指定 URL(&U)..."
#. dialog caption
-#: src/include/add-on-workflow.ycp:67
+#: src/include/add-on-workflow.ycp:106
msgid "Add-On Product Media"
msgstr "附加产品媒体"
#. help
-#: src/include/add-on-workflow.ycp:69
+#: src/include/add-on-workflow.ycp:108
msgid ""
"<p><big><b>Catalog Media</b></big><br>\n"
"Add-on products can be installed from CD, over a\n"
@@ -1479,7 +1641,7 @@
"或硬盘安装附加产品。</p>\n"
#. help, continued
-#: src/include/add-on-workflow.ycp:75
+#: src/include/add-on-workflow.ycp:114
msgid ""
"<p>\n"
"To install add-on product from <b>CD</b>,\n"
@@ -1490,7 +1652,7 @@
"应有产品 CD 集或 DVD 可用。</p>"
#. help, continued
-#: src/include/add-on-workflow.ycp:80
+#: src/include/add-on-workflow.ycp:119
msgid ""
"<p>\n"
"The product CDs can be copied to the hard disk.\n"
@@ -1507,7 +1669,7 @@
"只需要基本路径。</p>\n"
#. help, continued
-#: src/include/add-on-workflow.ycp:89
+#: src/include/add-on-workflow.ycp:128
msgid ""
"<p>\n"
"Network installation requires a working network connection.\n"
@@ -1520,56 +1682,77 @@
" 目录,例如 /data1/CD1。</p>\n"
#. yes-no popup
-#: src/include/add-on-workflow.ycp:115 src/include/add-on-workflow.ycp:319
-#: src/include/add-on-workflow.ycp:430
+#. popup question
+#: src/include/add-on-workflow.ycp:154 src/include/add-on-workflow.ycp:375
+#: src/include/add-on-workflow.ycp:512 src/modules/AddOnProduct.ycp:813
msgid "Really abort add-on product installation?"
msgstr "确实要中止附加产品的安装吗?"
#. translators: popup busy message
-#: src/include/add-on-workflow.ycp:126
+#: src/include/add-on-workflow.ycp:165
msgid "Scanning network..."
msgstr "扫描网络..."
#. error popup
-#: src/include/add-on-workflow.ycp:132
+#: src/include/add-on-workflow.ycp:171
msgid "No SLP catalogs found."
msgstr "未找到任何 SLP 编目。"
#. translators: popup heading
-#: src/include/add-on-workflow.ycp:146
+#: src/include/add-on-workflow.ycp:185
msgid "Choose SLP Catalog"
msgstr "选择 SLP 编目"
#. table header
-#: src/include/add-on-workflow.ycp:151
+#: src/include/add-on-workflow.ycp:190
msgid "Type"
msgstr "类型"
#. table header
-#: src/include/add-on-workflow.ycp:153
+#: src/include/add-on-workflow.ycp:192
msgid "URL"
msgstr "URL"
-#: src/include/add-on-workflow.ycp:206
+#: src/include/add-on-workflow.ycp:245
msgid "Insert the add-on product CD"
msgstr "插入附加产品 CD"
-#: src/include/add-on-workflow.ycp:214
+#: src/include/add-on-workflow.ycp:253
msgid "Insert the add-on product DVD"
msgstr "插入附加产品 DVD"
#. error report
-#: src/include/add-on-workflow.ycp:255
+#: src/include/add-on-workflow.ycp:294
msgid "No catalog found on medium."
msgstr "在媒体中没找到编目"
+#. error report
+#: src/include/add-on-workflow.ycp:315 src/include/add-on-workflow.ycp:416
+msgid "Failed to initialize the catalog."
+msgstr "未能初始化编目。"
+
+#. placeholder for unknown directory
+#. place holder for unknown URL
+#. placeholder for unknown path
+#. placeholder for unknown URL
+#: src/include/add-on-workflow.ycp:337 src/include/add-on-workflow.ycp:342
+#: src/include/add-on-workflow.ycp:596 src/include/add-on-workflow.ycp:602
+msgid "Unknown"
+msgstr "未知"
+
+#. table cell, %1 is URL, %2 is directory name
+#: src/include/add-on-workflow.ycp:340 src/include/add-on-workflow.ycp:600
+#, ycp-format
+msgid "URL: %1, Directory: %2"
+msgstr "URL: %1,目录: %2"
+
#. dialog caption
-#: src/include/add-on-workflow.ycp:290
+#: src/include/add-on-workflow.ycp:346
msgid "Catalog Selection"
msgstr "编目选择"
#. help text
-#: src/include/add-on-workflow.ycp:292
+#: src/include/add-on-workflow.ycp:348
msgid ""
"<p><big><b>Catalog Selection</b></big><br>\n"
"There were multiple catalogs found on the selected medium.\n"
@@ -1580,32 +1763,32 @@
" 选择要使用的编目。</p>\n"
#. popup message
-#: src/include/add-on-workflow.ycp:335
+#: src/include/add-on-workflow.ycp:391
msgid "Select a catalog."
msgstr "选择一个编目。"
#. table cell
-#: src/include/add-on-workflow.ycp:375
+#: src/include/add-on-workflow.ycp:450
msgid "No product found in the catalog"
msgstr "在编目中未找到产品"
#. message popup
-#: src/include/add-on-workflow.ycp:388
+#: src/include/add-on-workflow.ycp:465
msgid "Dependencies of the add-on product cannot be fullfilled."
msgstr "不能满足附加产品的依赖性。"
#. dialog caption
-#: src/include/add-on-workflow.ycp:403
+#: src/include/add-on-workflow.ycp:485
msgid "Product Selection"
msgstr "产品选择"
#. multi selection list
-#: src/include/add-on-workflow.ycp:407
+#: src/include/add-on-workflow.ycp:489
msgid "Available Products"
msgstr "可用产品"
#. help text
-#: src/include/add-on-workflow.ycp:411
+#: src/include/add-on-workflow.ycp:493
msgid ""
"<p><b><big>Product Selection</big></b><br>\n"
"There were multiple products found in the catalog. Select the products\n"
@@ -1616,17 +1799,44 @@
"安装的产品。</p>\n"
#. message popup
-#: src/include/add-on-workflow.ycp:447
+#: src/include/add-on-workflow.ycp:529
msgid "Dependencies of the selected add-on products cannot be fullfilled."
msgstr "不能满足所选附加产品的依赖性。"
+#. main screen heading
+#: src/include/add-on-workflow.ycp:589
+msgid "Add-On Product Installation"
+msgstr "附加产品安装"
+
+#: src/include/add-on-workflow.ycp:605
+#, ycp-format
+msgid "Product %1"
+msgstr "产品 %1"
+
+#. table header
+#: src/include/add-on-workflow.ycp:610
+msgid "Media"
+msgstr "媒体"
+
+#. table header
+#: src/include/add-on-workflow.ycp:612
+msgid "Product"
+msgstr "产品"
+
+#. message report
+#: src/include/add-on-workflow.ycp:641
+msgid "Select a product to delete."
+msgstr "选择要删除的产品。"
+
+#. popup error
#. error report
-#: src/modules/AddOnProduct.ycp:672
+#: src/modules/AddOnProduct.ycp:767 src/modules/AddOnProduct.ycp:788
+#: src/modules/AddOnProduct.ycp:892
msgid "An error occurred while preparing the installation system."
msgstr "准备安装系统时出错。"
#. error report
-#: src/modules/AddOnProduct.ycp:681
+#: src/modules/AddOnProduct.ycp:907
#, ycp-format
msgid "Control file %1 not found on media."
msgstr "在媒体上找不到控制文件 %1。"
@@ -1642,6 +1852,30 @@
msgid "<p>Do you want to install it now?</p>"
msgstr "<p>是否要立即安装?</p>"
+#. label text
+#: src/ui.ycp:1674
+msgid "Reading packages available on the installation sources..."
+msgstr "正在读取安装源中可用的包..."
+
+#~ msgid "Optional Data"
+#~ msgstr "可选数据"
+
+#~ msgid "Preview Information"
+#~ msgstr "预览信息"
+
+#~ msgid "Information to Send"
+#~ msgstr "要发送的信息"
+
+#~ msgid ""
+#~ "<p><b>Novell Customer Center Configuration</b></p>\n"
+#~ "<p>To be replaced by a useful text. This text should explain what we are doing here in this yast module.</p>"
+#~ msgstr ""
+#~ "<p><b>Novell 客户中心配置</b></p>\n"
+#~ "<p>要替换为有用的文本。此文本应解释正在此 yast 模块上执行的操作。</p>"
+
+#~ msgid "Details"
+#~ msgstr "细节"
+
#~ msgid ""
#~ "<p>The clone check box allows you to create an autoyast profile.\n"
#~ "Autoyast is a way to do a complete SUSE Linux installation without user interaction. To let Autoyast\n"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-zh_CN-2.13.8/po/status.txt new/yast2-trans-zh_CN-2.13.10/po/status.txt
--- old/yast2-trans-zh_CN-2.13.8/po/status.txt 2006-03-24 15:34:48.000000000 +0100
+++ new/yast2-trans-zh_CN-2.13.10/po/status.txt 2006-04-10 18:56:45.000000000 +0200
@@ -1,6 +1,6 @@
-Translated : 14992
+Translated : 15025
Fuzzy : 2
Untranslated : 0
--------------------
- All strings : 14994
+ All strings : 15027
100 % are translated
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...