Author: keichwa Date: 2014-10-29 17:00:17 +0100 (Wed, 29 Oct 2014) New Revision: 90432 Modified: trunk/yast/zh_CN/po/audit-laf.zh_CN.po trunk/yast/zh_CN/po/auth-client.zh_CN.po trunk/yast/zh_CN/po/auth-server.zh_CN.po trunk/yast/zh_CN/po/autoinst.zh_CN.po trunk/yast/zh_CN/po/base.zh_CN.po trunk/yast/zh_CN/po/bootloader.zh_CN.po trunk/yast/zh_CN/po/cluster.zh_CN.po trunk/yast/zh_CN/po/control.zh_CN.po trunk/yast/zh_CN/po/crowbar.zh_CN.po trunk/yast/zh_CN/po/drbd.zh_CN.po trunk/yast/zh_CN/po/ftp-server.zh_CN.po trunk/yast/zh_CN/po/geo-cluster.zh_CN.po trunk/yast/zh_CN/po/inetd.zh_CN.po trunk/yast/zh_CN/po/installation.zh_CN.po trunk/yast/zh_CN/po/instserver.zh_CN.po trunk/yast/zh_CN/po/iscsi-lio-server.zh_CN.po trunk/yast/zh_CN/po/isns.zh_CN.po trunk/yast/zh_CN/po/ldap.zh_CN.po trunk/yast/zh_CN/po/mail.zh_CN.po trunk/yast/zh_CN/po/network.zh_CN.po trunk/yast/zh_CN/po/packager.zh_CN.po trunk/yast/zh_CN/po/proxy.zh_CN.po trunk/yast/zh_CN/po/registration.zh_CN.po trunk/yast/zh_CN/po/s390.zh_CN.po trunk/yast/zh_CN/po/samba-server.zh_CN.po trunk/yast/zh_CN/po/security.zh_CN.po trunk/yast/zh_CN/po/services-manager.zh_CN.po trunk/yast/zh_CN/po/storage.zh_CN.po trunk/yast/zh_CN/po/vm.zh_CN.po Log: merged Modified: trunk/yast/zh_CN/po/audit-laf.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/audit-laf.zh_CN.po 2014-10-29 15:59:29 UTC (rev 90431) +++ trunk/yast/zh_CN/po/audit-laf.zh_CN.po 2014-10-29 16:00:17 UTC (rev 90432) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:51+0200\n" +"POT-Creation-Date: 2014-10-29 16:20+0100\n" "PO-Revision-Date: 2014-07-05 15:44+0800\n" "Last-Translator: 玛格丽特 · 苏 <marguerite@opensuse.org>\n" "Language-Team: Chinese Simplified <kde-i18n-doc@kde.org>\n" @@ -855,42 +855,58 @@ #. question shown in a popup about start of audit daemon #: src/modules/AuditLaf.rb:463 -msgid "Do you want to start it and enable start at boot\n" +#, fuzzy +#| msgid "Do you want to start it and enable start at boot\n" +msgid "" +"Do you want to start it and enable start at boot\n" +"or only start the daemon for now?" msgstr "您想要启动它并启用其引导时启动吗\n" -#. question continues -#: src/modules/AuditLaf.rb:467 +#: src/modules/AuditLaf.rb:466 msgid "The daemon 'auditd' doesn't run.\n" msgstr "'auditd' 守护进程未运行。\n" #. message about loaded kernel module -#: src/modules/AuditLaf.rb:471 -msgid "The 'apparmor' kernel module is loaded.\n" -msgstr "已加载 'apparmor' 内核模块。\n" +#: src/modules/AuditLaf.rb:470 +#, fuzzy +#| msgid "" +#| " The 'apparmor' kernel module is loaded.\n" +#| "The kernel uses a running audit daemon to log audit\n" +#| "events to /var/log/audit/audit.log (default). \n" +#| "Do you want to start the daemon now?" +msgid "" +"The 'apparmor' kernel module is loaded.\n" +"The kernel uses a running audit daemon to log audit\n" +"events to /var/log/audit/audit.log (default).\n" +msgstr "" +" ‘apparmor’ 内核模块已加载。\n" +"内核使用一个运行中的审计守护精灵来记录审计事件到\n" +"/var/log/audit/audit.log (默认)。\n" +"您想要立即启动守护精灵吗？" #. Headline of a popup -#: src/modules/AuditLaf.rb:480 +#: src/modules/AuditLaf.rb:477 msgid "Start of Audit Daemon" msgstr "启动审计守护进程" #. label of three buttons belonging to the popup -#: src/modules/AuditLaf.rb:482 +#: src/modules/AuditLaf.rb:479 msgid "Start and &Enable" msgstr "启动和启用(&E)" -#: src/modules/AuditLaf.rb:482 +#: src/modules/AuditLaf.rb:479 msgid "&Start" msgstr "启动(&S)" -#: src/modules/AuditLaf.rb:482 +#: src/modules/AuditLaf.rb:479 msgid "&Do not start" msgstr "不启动(&D)" -#: src/modules/AuditLaf.rb:491 +#: src/modules/AuditLaf.rb:488 msgid "Cannot start the audit daemon." msgstr "无法启动审计守护精灵。" -#: src/modules/AuditLaf.rb:492 +#: src/modules/AuditLaf.rb:489 msgid "" "The rules may be locked.\n" "Continue to check the rules. You can change\n" @@ -901,36 +917,36 @@ "继续检查规则。您可以变更 '启用标识'，但稍后需要重启才能激活变更。\n" #. Auditd read dialog caption -#: src/modules/AuditLaf.rb:548 +#: src/modules/AuditLaf.rb:545 msgid "Saving Audit Configuration" msgstr "正在保存审计配置" #. Progress stage 1/2 -#: src/modules/AuditLaf.rb:564 +#: src/modules/AuditLaf.rb:561 msgid "Write the settings" msgstr "写入设置" #. Progress stage 2/2 -#: src/modules/AuditLaf.rb:566 +#: src/modules/AuditLaf.rb:563 msgid "Write the rules" msgstr "写入规则" #. Progress step 1/2 -#: src/modules/AuditLaf.rb:570 +#: src/modules/AuditLaf.rb:567 msgid "Writing the settings..." msgstr "正在写入设置..." #. Progress step 2/2 -#: src/modules/AuditLaf.rb:572 +#: src/modules/AuditLaf.rb:569 msgid "Writing the rules..." msgstr "正在写入规则..." #. check first whether rules are already locked -#: src/modules/AuditLaf.rb:588 +#: src/modules/AuditLaf.rb:585 msgid "The rules are already locked." msgstr "规则已经锁定。" -#: src/modules/AuditLaf.rb:589 +#: src/modules/AuditLaf.rb:586 msgid "" "Do you want to change the 'Enabled Flag'?\n" "If yes, the new rules will be written to /etc/audit/audit.rules.\n" @@ -941,30 +957,33 @@ "之后重启系统以让变更生效。\n" #. Error message -#: src/modules/AuditLaf.rb:614 +#: src/modules/AuditLaf.rb:611 msgid "Restart of the audit daemon failed." msgstr "重启 audit 守护精灵失败。" #. Error message -#: src/modules/AuditLaf.rb:621 +#: src/modules/AuditLaf.rb:618 msgid "Cannot write settings to auditd.conf." msgstr "无法将配置写入 auditd.conf。" #. Error message, rules cannot be set -#: src/modules/AuditLaf.rb:652 +#: src/modules/AuditLaf.rb:649 msgid "Start yast2-audit-laf again and check the rules." msgstr "请再次启动 yast2-audit-laf 并检查规则。" -#: src/modules/AuditLaf.rb:658 +#: src/modules/AuditLaf.rb:655 msgid "Cannot write settings to auditd.rules." msgstr "无法将设置写入 auditd.rules。" #. Create a textual summary and a list of unconfigured cards #. @return summary of the current configuration -#: src/modules/AuditLaf.rb:707 +#: src/modules/AuditLaf.rb:704 msgid "Log file" msgstr "日志文件" +#~ msgid "The 'apparmor' kernel module is loaded.\n" +#~ msgstr "已加载 'apparmor' 内核模块。\n" + #~ msgid "" #~ "The audit daemon doesn't run.\n" #~ "Do you want to start it now?" @@ -972,17 +991,6 @@ #~ "审计守护精灵未运行。\n" #~ "您是否要立即启动它？" -#~ msgid "" -#~ " The 'apparmor' kernel module is loaded.\n" -#~ "The kernel uses a running audit daemon to log audit\n" -#~ "events to /var/log/audit/audit.log (default). \n" -#~ "Do you want to start the daemon now?" -#~ msgstr "" -#~ " ‘apparmor’ 内核模块已加载。\n" -#~ "内核使用一个运行中的审计守护精灵来记录审计事件到\n" -#~ "/var/log/audit/audit.log (默认)。\n" -#~ "您想要立即启动守护精灵吗？" - #~ msgid "Audit daemon not running." #~ msgstr "审计守护精灵未运行。" Modified: trunk/yast/zh_CN/po/auth-client.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/auth-client.zh_CN.po 2014-10-29 15:59:29 UTC (rev 90431) +++ trunk/yast/zh_CN/po/auth-client.zh_CN.po 2014-10-29 16:00:17 UTC (rev 90432) @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: opensuse-i 18n\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:51+0200\n" +"POT-Creation-Date: 2014-10-29 16:20+0100\n" "PO-Revision-Date: 2014-06-25 23:10+0800\n" "Last-Translator: 玛格丽特 · 苏 <marguerite@opensuse.org>\n" "Language-Team: Chinese Simplified <kde-i18n-doc@kde.org>\n" @@ -180,11 +180,13 @@ #. Main dialog contents #: src/include/dialogs.rb:512 -msgid "SPAM Prevention" -msgstr "SPAM 防护" +#, fuzzy +#| msgid "Authentication Key" +msgid "Authentication Client" +msgstr "身份验证密钥" -#: src/include/dialogs.rb:526 src/include/dialogs.rb:580 -#: src/include/dialogs.rb:586 +#: src/include/dialogs.rb:526 src/include/dialogs.rb:599 +#: src/include/dialogs.rb:605 msgid "Configured Authentication Domains" msgstr "配置认证域" @@ -207,871 +209,871 @@ #. initialize GUI #: src/include/dialogs.rb:553 -msgid "TODO WRITE HELP" -msgstr "待办：撰写帮助" +msgid "SSSD provides a set of daemons to manage access to remote directories and authentication mechanisms.<br>You have to confiugre at least one authentication domain.<br>The first you have to set for a authentication domain is the identification and auth provider used for the domain.<br>In the next step you have to set some mandatory parameter for the selected providers.You can select later all parameters available for the selected identification and auth provider.SSSD provides following id_provider:<br><b>proxy</b>: Support a legacy NSS provider.<br><b>local</b>: SSSD internal provider for local users.<br><b>ldap</b>: LDAP provider. See sssd-ldap(5) for more information on configuring LDAP.<br><b>ipa</b>: FreeIPA and Red Hat Enterprise Identity Management provider.<br><b>ad</b>: Active Directory provider.<br>Supported auth providers are:<br><b>ldap</b> for native LDAP authentication.<br><b>krb5</b> for Kerberos authentication.<br><b>ipa</b> FreeIPA and Red Hat Enterprise Identity Management provider.<br><b>ad</b> Active Directory provider.<br><b>proxy</b> for relaying authentication to some other PAM target.<br><b>none</b> disables authentication explicitly.<br>The default auth provider is the id_provider.<br>" +msgstr "" #. Define Global Parameters #: src/include/sssd-parameters.rb:17 msgid "Indicates what is the syntax of the config file." msgstr "揭示了配置文件的语法。" -#: src/include/sssd-parameters.rb:22 +#: src/include/sssd-parameters.rb:21 msgid "Comma separated list of services that are started when sssd itself starts." msgstr "以逗号分隔的当 sssd 自身启动时也将启动的服务列表。" -#: src/include/sssd-parameters.rb:27 src/include/sssd-parameters.rb:80 +#: src/include/sssd-parameters.rb:26 src/include/sssd-parameters.rb:79 msgid "Number of times services should attempt to reconnect in the event of a Data Provider crash or restart before they give up" msgstr "当数据提供者崩溃或重启时在放弃前服务应尝试重连的次数" -#: src/include/sssd-parameters.rb:31 +#: src/include/sssd-parameters.rb:30 msgid "SSSD can use more domains at the same time, but at least one must be configured or SSSD won't start." msgstr "SSSD 可同时使用更多域，但必须配置至少一个否则 SSSD 不会启动。" -#: src/include/sssd-parameters.rb:32 +#: src/include/sssd-parameters.rb:31 msgid "This parameter contains the list of domains in the order these will be queried." msgstr "此参数包含了以查询顺序排列的域列表。" -#: src/include/sssd-parameters.rb:36 +#: src/include/sssd-parameters.rb:35 msgid "Default regular expression that describes how to parse the string containing user name and domain into these components" msgstr "默认正则表达式描述了如何解析包含用户名和域的字符串到这些组件中" -#: src/include/sssd-parameters.rb:40 +#: src/include/sssd-parameters.rb:39 msgid "The default printf(3)-compatible format that describes how to translate a (name, domain) tuple into a fully qualified name." msgstr "默认的 printf(3) 兼容格式，描述了如何转义 (name, domain) 元组为完全限定名称。" -#: src/include/sssd-parameters.rb:44 +#: src/include/sssd-parameters.rb:43 msgid "SSSD monitors the state of resolv.conf to identify when it needs to update its internal DNS resolver." msgstr "SSSD 监控着 resolv.conf 的状态来识别它是否需要更新其内部 DNS 解析器。" -#: src/include/sssd-parameters.rb:45 +#: src/include/sssd-parameters.rb:44 msgid "By default, we will attempt to use inotify for this, and will fall back to polling resolv.conf every five seconds if inotify cannot be used." msgstr "默认我们将尝试使用 inotify，若 inotify 不可用则回退为每五秒轮询 resolv.conf 一次。" -#: src/include/sssd-parameters.rb:49 +#: src/include/sssd-parameters.rb:48 msgid "Directory on the filesystem where SSSD should store Kerberos replay cache files." msgstr "SSSD 应在文件系统上存放 Kerberos 回放缓存文件的文件夹。" -#: src/include/sssd-parameters.rb:53 +#: src/include/sssd-parameters.rb:52 msgid "This string will be used as a default domain name for all names without a domain name component." msgstr "此字符串将用作全部没有域名组件的名称的默认域名。" #. Define Global Services Parameters -#: src/include/sssd-parameters.rb:60 +#: src/include/sssd-parameters.rb:59 msgid "Bit mask that indicates which debug levels will be visible. 0x0010 is the default value as well as the lowest allowed value, 0xFFF0 is the most verbose mode." msgstr "表示可见调试级别的位掩码。0x0010 是默认值也是允许的最小值，0xFFF0是最详尽模式。" -#: src/include/sssd-parameters.rb:65 +#: src/include/sssd-parameters.rb:64 msgid "Add a timestamp to the debug messages" msgstr "为调试信息添加时间戳" -#: src/include/sssd-parameters.rb:70 +#: src/include/sssd-parameters.rb:69 msgid "Add microseconds to the timestamp in debug messages" msgstr "为调试信息中的时间戳添加毫秒" -#: src/include/sssd-parameters.rb:75 +#: src/include/sssd-parameters.rb:74 msgid "Timeout in seconds between heartbeats for this service." msgstr "此服务心跳间超时秒数。" -#: src/include/sssd-parameters.rb:85 +#: src/include/sssd-parameters.rb:84 msgid "This option specifies the maximum number of file descriptors that may be opened at one time by this SSSD process." msgstr "此选项指定了此 SSSD 进程同一时间可打开的最大文件描述符数目。" -#: src/include/sssd-parameters.rb:90 +#: src/include/sssd-parameters.rb:89 msgid "This option specifies the number of seconds that a client of an SSSD process can hold onto a file descriptor without communicating on it." msgstr "此选项指定了 SSSD 进程客户端可持有文件描述符而不与之通信的秒数。" -#: src/include/sssd-parameters.rb:95 +#: src/include/sssd-parameters.rb:94 msgid "If a service is not responding to ping checks (see the “timeout” option), it is first sent the SIGTERM signal that instructs it to quit gracefully." msgstr "若服务不响应 ping 检查 (参考「超时」选项) ，它将会先发送 SIGTERM 信号引导服务优雅地退出。" #. NSS configuration options -#: src/include/sssd-parameters.rb:103 +#: src/include/sssd-parameters.rb:102 msgid "How many seconds should cache nss_sss enumerations (requests for info about all users)?" msgstr "缓存 nss_css 枚举 (对全部用户信息的请求) 的秒数" -#: src/include/sssd-parameters.rb:108 +#: src/include/sssd-parameters.rb:107 msgid "The entry cache can be set to automatically update entries in the background if they are requested beyond a percentage of the entry_cache_timeout value for the domain." msgstr "若请求条目时间超出了该域 entry_cache_timeout 值的某个百分比，则可将条目缓存设为在后台自动更新条目。" -#: src/include/sssd-parameters.rb:113 +#: src/include/sssd-parameters.rb:112 msgid "Specifies for how many seconds nss_sss should cache negative cache hits (that is, queries for invalid database entries, like nonexistent ones) before asking the back end again." msgstr "指定了再次询问后端前 nss_sss 应缓存否定缓存次数 (即，针对无效数据库条目如不存在条目的查询) 的秒数。" -#: src/include/sssd-parameters.rb:118 +#: src/include/sssd-parameters.rb:117 msgid "Exclude certain users from being fetched from the sss NSS database." msgstr "从 sss NSS 数据库撷取用户时排除特定用户。" -#: src/include/sssd-parameters.rb:123 +#: src/include/sssd-parameters.rb:122 msgid "Exclude certain groups from being fetched from the sss NSS database." msgstr "从 sss NSS 数据库撷取组时排除特定组。" -#: src/include/sssd-parameters.rb:128 +#: src/include/sssd-parameters.rb:127 msgid "If you want filtered user to still be group members set this option to false." msgstr "若您想使被过滤的用户仍留作组成员则请设置此选项为假。" -#: src/include/sssd-parameters.rb:132 +#: src/include/sssd-parameters.rb:131 msgid "Override the user's home directory. You can either provide an absolute value or a template." msgstr "覆盖用户主文件夹。您可以提供一个绝对值或一个模板。" -#: src/include/sssd-parameters.rb:136 src/include/sssd-parameters.rb:1103 +#: src/include/sssd-parameters.rb:135 src/include/sssd-parameters.rb:1101 msgid "Set a default template for a user's home directory if one is not specified explicitly by the domain's data provider." msgstr "设置当某域的数据提供者未显式指定用户主文件夹时所用的默认模板。" -#: src/include/sssd-parameters.rb:140 +#: src/include/sssd-parameters.rb:139 msgid "Override the login shell for all users." msgstr "覆盖全部用户的登录壳层。" -#: src/include/sssd-parameters.rb:144 +#: src/include/sssd-parameters.rb:143 msgid "Restrict user shell to one of the listed values." msgstr "限制用户使用的壳层为列出值其一。" -#: src/include/sssd-parameters.rb:148 +#: src/include/sssd-parameters.rb:147 msgid "Replace any instance of these shells with the shell_fallback" msgstr "使用 shell_fallback 替换这些壳层中的任何一种" -#: src/include/sssd-parameters.rb:153 +#: src/include/sssd-parameters.rb:152 msgid "The default shell to use if an allowed shell is not installed on the machine." msgstr "机器上未安装获准使用的壳层时所使用的默认壳层。" -#: src/include/sssd-parameters.rb:157 src/include/sssd-parameters.rb:1107 +#: src/include/sssd-parameters.rb:156 src/include/sssd-parameters.rb:1105 msgid "The default shell to use if the provider does not return one during lookup." msgstr "查询时提供者未返回值时所使用的默认壳层。" -#: src/include/sssd-parameters.rb:162 src/include/sssd-parameters.rb:205 +#: src/include/sssd-parameters.rb:161 src/include/sssd-parameters.rb:204 msgid "Specifies time in seconds for which the list of subdomains will be considered valid." msgstr "指定了子域列表被认定有效的秒数 。" -#: src/include/sssd-parameters.rb:167 +#: src/include/sssd-parameters.rb:166 msgid "Specifies time in seconds for which records in the in-memory cache will be valid." msgstr "指定了内存缓存中记录的有效秒数。" #. PAM configuration options -#: src/include/sssd-parameters.rb:175 +#: src/include/sssd-parameters.rb:174 msgid "If the authentication provider is offline, how long we should allow cached logins (in days since the last successful online login)." msgstr "认证提供者离线时应允许缓存登入的天数 (自上次成功在线登入起的天数)" -#: src/include/sssd-parameters.rb:180 src/include/sssd-parameters.rb:185 +#: src/include/sssd-parameters.rb:179 src/include/sssd-parameters.rb:184 msgid "The time in minutes which has to pass after offline_failed_login_attempts has been reached before a new login attempt is possible." msgstr "触及 offline_failed_login_attempts 后可进行新登录尝试前必须等待的以分钟计的时间。" -#: src/include/sssd-parameters.rb:190 +#: src/include/sssd-parameters.rb:189 msgid "Controls what kind of messages are shown to the user during authentication." msgstr "控制在认证期间展示给用户的消息类型。" -#: src/include/sssd-parameters.rb:195 +#: src/include/sssd-parameters.rb:194 msgid "For any PAM request while SSSD is online, the SSSD will attempt to immediately update the cached identity information for the user in order to ensure that authentication takes place with the latest information." msgstr "SSSD 在线时对于任何 PAM 请求，SSSD 均会尝试立即更新缓存的该用户身份信息以确保认证使用了最新信息。" #. The kerberos domain section -#: src/include/sssd-parameters.rb:200 src/include/sssd-parameters.rb:693 -#: src/include/sssd-parameters.rb:990 +#: src/include/sssd-parameters.rb:199 src/include/sssd-parameters.rb:691 +#: src/include/sssd-parameters.rb:988 msgid "Display a warning N days before the password expires." msgstr "在密码过期前 N 天展示一条警告。" #. SUDO configuration options -#: src/include/sssd-parameters.rb:213 +#: src/include/sssd-parameters.rb:212 msgid "Whether or not to evaluate the sudoNotBefore and sudoNotAfter attributes that implement time-dependent sudoers entries." msgstr "是否评骘实现了随时间变化的 sudoer 项的 sudoNotBefore 和 sudoNotAfter 属性。" #. AUTOFS configuration options -#: src/include/sssd-parameters.rb:221 +#: src/include/sssd-parameters.rb:220 msgid "Specifies for how many seconds the autofs responder should cache negative hits before asking the back end again." msgstr "指定了再次询问后端前 autofs 回应者应缓存否定次数的秒数。" #. SSH configuration options -#: src/include/sssd-parameters.rb:229 +#: src/include/sssd-parameters.rb:228 msgid "Whether or not to hash host names and addresses in the managed known_hosts file." msgstr "是否在受管 known_hosts 文件中哈希化主机名和地址。" -#: src/include/sssd-parameters.rb:234 +#: src/include/sssd-parameters.rb:233 msgid "How many seconds to keep a host in the managed known_hosts file after its host keys were requested." msgstr "已请求主机密钥后在受管 known_hosts 文件中保存主机的秒数。" #. DOMAIN SECTIONS #. These configuration options can be present in a domain configuration section, that is, in a section called “[domain/NAME]” -#: src/include/sssd-parameters.rb:243 src/include/sssd-parameters.rb:248 +#: src/include/sssd-parameters.rb:242 src/include/sssd-parameters.rb:247 msgid "UID and GID limits for the domain. If a domain contains an entry that is outside these limits, it is ignored." msgstr "该域的 UID 和 GID 限制。若某域含有一个超出这些限制的项，则忽略该项。" -#: src/include/sssd-parameters.rb:253 +#: src/include/sssd-parameters.rb:252 msgid "Determines if a domain can be enumerated." msgstr "确定某域是否可枚举。" -#: src/include/sssd-parameters.rb:258 +#: src/include/sssd-parameters.rb:257 msgid "If the service does not terminate after “force_timeout” seconds, the monitor will forcibly shut it down by sending a SIGKILL signal." msgstr "若服务在 \"force_timeout\" 秒后未终止，监控器将发送一个 SIGKILL 信号强制关闭它。" -#: src/include/sssd-parameters.rb:263 +#: src/include/sssd-parameters.rb:262 msgid "How many seconds nss_sss should consider entries valid before asking the backend again." msgstr "再次询问后端前 nss_sss 应认定条目有效的秒数。" -#: src/include/sssd-parameters.rb:268 +#: src/include/sssd-parameters.rb:267 msgid "How many seconds nss_sss should consider user entries valid before asking the backend again." msgstr "再次询问后端前 nss_sss 应认定用户项有效的秒数。" -#: src/include/sssd-parameters.rb:273 +#: src/include/sssd-parameters.rb:272 msgid "How many seconds nss_sss should consider group entries valid before asking the backend again." msgstr "再次询问后端前 nss_sss 应认定组项有效的秒数。" -#: src/include/sssd-parameters.rb:278 +#: src/include/sssd-parameters.rb:277 msgid "How many seconds nss_sss should consider netgroup entries valid before asking the backend again." msgstr "再次询问后端前 nss_sss 应认定网络组项有效的秒数。" -#: src/include/sssd-parameters.rb:283 +#: src/include/sssd-parameters.rb:282 msgid "How many seconds nss_sss should consider service entries valid before asking the backend again." msgstr "再次询问后端前 nss_sss 应认定服务项有效的秒数。" -#: src/include/sssd-parameters.rb:288 +#: src/include/sssd-parameters.rb:287 msgid "How many seconds sudo should consider rules valid before asking the backend again." msgstr "再次询问后端前 sudo 应认定规则有效的秒数。" -#: src/include/sssd-parameters.rb:293 +#: src/include/sssd-parameters.rb:292 msgid "How many seconds the autofs service should consider automounter maps valid before asking the backend again." msgstr "再次询问后端前 autofs 服务应认定自动挂载器映射有效的秒数。" -#: src/include/sssd-parameters.rb:298 +#: src/include/sssd-parameters.rb:297 msgid "Determines if user credentials are also cached in the local LDB cache." msgstr "确定是否也在本地 LDB 缓存中缓存用户机要。" -#: src/include/sssd-parameters.rb:303 +#: src/include/sssd-parameters.rb:302 msgid "Number of days entries are left in cache after last successful login before being removed during a cleanup of the cache." msgstr "在自缓存清理期间移除前应在缓存中保留条目的从最后成功登入日起计的天数。" -#: src/include/sssd-parameters.rb:308 +#: src/include/sssd-parameters.rb:307 msgid "The identification provider used for the domain." msgstr "该域所用的标识提供者。" -#: src/include/sssd-parameters.rb:313 +#: src/include/sssd-parameters.rb:312 msgid "Use the full name and domain (as formatted by the domain's full_name_format) as the user's login name reported to NSS." msgstr "使用完整名称和域 (格式化成该域的完整名称格式) 作为汇报给 NSS 的该用户的登录名。" -#: src/include/sssd-parameters.rb:319 +#: src/include/sssd-parameters.rb:318 msgid "The authentication provider used for the domain." msgstr "该域所用的认证提供者。" -#: src/include/sssd-parameters.rb:325 +#: src/include/sssd-parameters.rb:324 msgid "The access control provider used for the domain." msgstr "该域所用的访问控制提供者。" -#: src/include/sssd-parameters.rb:331 +#: src/include/sssd-parameters.rb:330 msgid "The provider which should handle change password operations for the domain." msgstr "应受理该域的密码变更操作的提供者。" -#: src/include/sssd-parameters.rb:337 +#: src/include/sssd-parameters.rb:336 msgid "The SUDO provider used for the domain." msgstr "该域所用的 SUDO 提供者。" -#: src/include/sssd-parameters.rb:343 +#: src/include/sssd-parameters.rb:342 msgid "The provider which should handle loading of selinux settings." msgstr "应受理 selinux 设置加载的提供者。" -#: src/include/sssd-parameters.rb:349 +#: src/include/sssd-parameters.rb:348 msgid "The provider which should handle fetching of subdomains." msgstr "应受理子域撷取的提供者。" -#: src/include/sssd-parameters.rb:355 +#: src/include/sssd-parameters.rb:354 msgid "The autofs provider used for the domain." msgstr "该域所用的 autofs 提供者。" -#: src/include/sssd-parameters.rb:361 +#: src/include/sssd-parameters.rb:360 msgid "The provider used for retrieving host identity information." msgstr "用于撷取主机身份信息的提供者。" -#: src/include/sssd-parameters.rb:366 +#: src/include/sssd-parameters.rb:365 msgid "Regular expression for this domain that describes how to parse the string containing user name and domain into these components." msgstr "用于此域的正则表达式，描述了如何解析包含用户名和域的字符串到这些组件中。" -#: src/include/sssd-parameters.rb:371 +#: src/include/sssd-parameters.rb:370 msgid "A printf(3)-compatible format that describes how to translate a (name, domain) tuple for this domain into a fully qualified name." msgstr "一种 printf(3) 兼容格式，描述了如何转义此域的 (name, domain) 元组为完全限定名称。" -#: src/include/sssd-parameters.rb:377 +#: src/include/sssd-parameters.rb:376 msgid "Provides the ability to select preferred address family to use when performing DNS lookups." msgstr "提供了执行 DNS 查询时选择偏好的地址族的能力。" -#: src/include/sssd-parameters.rb:382 +#: src/include/sssd-parameters.rb:381 msgid "Defines the amount of time (in seconds) to wait for a reply from the DNS resolver before assuming that it is unreachable." msgstr "定义了假设其不可达前等待 DNS 解析者回复的以秒计的时间。" -#: src/include/sssd-parameters.rb:386 +#: src/include/sssd-parameters.rb:385 msgid "Use the domain part of machine's hostname." msgstr "使用机器主机名的域部分。" -#: src/include/sssd-parameters.rb:387 +#: src/include/sssd-parameters.rb:386 msgid "If service discovery is used in the back end, specifies the domain part of the service discovery DNS query." msgstr "若后端使用了服务发现，则指定了服务发现 DNS 查询的域部分。" -#: src/include/sssd-parameters.rb:391 +#: src/include/sssd-parameters.rb:390 msgid "Override the primary GID value with the one specified." msgstr "使用指定组 ID 值覆盖主要组 ID 值。" -#: src/include/sssd-parameters.rb:396 +#: src/include/sssd-parameters.rb:395 msgid "Treat user and group names as case sensitive." msgstr "视用户和组名称为大小写敏感的。" -#: src/include/sssd-parameters.rb:401 +#: src/include/sssd-parameters.rb:400 msgid "When a user or group is looked up by name in the proxy provider, a second lookup by ID is performed to 'canonicalize' the name in case the requested name was an alias." msgstr "当在代理提供者上按名称查询某个用户或组时，也执行按 ID 的二次查询以 '规范化' 该名称以防止所请求的名称是一个别名。" -#: src/include/sssd-parameters.rb:406 +#: src/include/sssd-parameters.rb:405 msgid "Use this homedir as default value for all subdomains within this domain." msgstr "使用此主文件夹作为此域中全部子域的默认值。" #. Following options will be provided by SSSD's 'simple' access-control provider -#: src/include/sssd-parameters.rb:412 +#: src/include/sssd-parameters.rb:411 msgid "Comma separated list of users who are allowed to log in." msgstr "逗号分隔的允许登入用户列表。" -#: src/include/sssd-parameters.rb:417 +#: src/include/sssd-parameters.rb:416 msgid "Comma separated list of groups who are allowed to log in. This applies only to groups within this SSSD domain." msgstr "逗号分隔的允许登入组列表。这仅应用于此 SSSD 域中的组。" -#: src/include/sssd-parameters.rb:422 +#: src/include/sssd-parameters.rb:421 msgid "Comma separated list of users who are explicitly denied access." msgstr "逗号分隔的显式拒绝访问用户列表。" -#: src/include/sssd-parameters.rb:427 +#: src/include/sssd-parameters.rb:426 msgid "Comma separated list of groups that are explicitly denied access. This applies only to groups within this SSSD domain." msgstr "逗号分隔的显式拒绝访问组列表。这仅应用于此 SSSD 域中的组。" -#: src/include/sssd-parameters.rb:433 +#: src/include/sssd-parameters.rb:432 msgid "The default base DN to use for performing LDAP sudo rules." msgstr "用于执行 LDAP sudo 规则的默认基本判别名。" #. The local domain section #. This section contains settings for domain that stores users and groups in SSSD native database, that is, a domain that uses id_provider=local. -#: src/include/sssd-parameters.rb:442 +#: src/include/sssd-parameters.rb:441 msgid "The tools append the login name to base_directory and use that as the home directory." msgstr "此工具会追加登入名到 base_directory 并用其作为主文件夹。" -#: src/include/sssd-parameters.rb:447 +#: src/include/sssd-parameters.rb:446 msgid "Indicate if a home directory should be created by default for new users." msgstr "指出是否应为新用户默认创建主文件夹。" -#: src/include/sssd-parameters.rb:452 +#: src/include/sssd-parameters.rb:451 msgid "Indicate if a home directory should be removed by default for deleted users." msgstr "指出是否应默认移除已删除用户的主文件夹。" -#: src/include/sssd-parameters.rb:457 +#: src/include/sssd-parameters.rb:456 msgid "Used by sss_useradd(8) to specify the default permissions on a newly created home directory." msgstr "被 sss_useradd(8) 用来指定新创建的主文件夹的默认权限。" -#: src/include/sssd-parameters.rb:462 +#: src/include/sssd-parameters.rb:461 msgid "The skeleton directory, which contains files and directories to be copied in the user's home directory, when the home directory is created by sss_useradd(8)" msgstr "骨架文件夹，其收纳了当 sss_useradd(8) 创建主文件夹时复制至用户主文件夹的文件和文件夹。" -#: src/include/sssd-parameters.rb:467 +#: src/include/sssd-parameters.rb:466 msgid "The mail spool directory." msgstr "邮件卷文件夹。" -#: src/include/sssd-parameters.rb:471 +#: src/include/sssd-parameters.rb:470 msgid "The command that is run after a user is removed." msgstr "移除用户后运行的命令。" #. The ldap domain section -#: src/include/sssd-parameters.rb:480 src/include/sssd-parameters.rb:485 +#: src/include/sssd-parameters.rb:479 src/include/sssd-parameters.rb:484 msgid "Specifies the comma-separated list of URIs of the LDAP servers to which SSSD should connect in the order of preference." msgstr "指定了逗号分隔的 SSSD 应以优先级顺序连接的 LDAP 服务器 URI 列表。" -#: src/include/sssd-parameters.rb:491 src/include/sssd-parameters.rb:497 +#: src/include/sssd-parameters.rb:490 src/include/sssd-parameters.rb:496 msgid "Specifies the comma-separated list of URIs of the LDAP servers to which SSSD should connect in the order of preference to change the password of a user." msgstr "指定了逗号分隔的 LDAP 服务器 URI 列表，SSSD 应以优先级顺序连接以修改用户密码。" -#: src/include/sssd-parameters.rb:503 +#: src/include/sssd-parameters.rb:501 msgid "The default base DN to use for performing LDAP user operations." msgstr "指定 LDAP 用户操作所用的默认基本判别名。" -#: src/include/sssd-parameters.rb:509 +#: src/include/sssd-parameters.rb:507 msgid "Specifies the Schema Type in use on the target LDAP server." msgstr "指定了目标 LDAP 服务器上使用的方案类型。" -#: src/include/sssd-parameters.rb:513 +#: src/include/sssd-parameters.rb:511 msgid "The default bind DN to use for performing LDAP operations." msgstr "指定 LDAP 操作所用的默认绑定判别名。" -#: src/include/sssd-parameters.rb:519 +#: src/include/sssd-parameters.rb:517 msgid "The type of the authentication token of the default bind DN." msgstr "默认绑定判别名的认证 token 的类型。" -#: src/include/sssd-parameters.rb:523 +#: src/include/sssd-parameters.rb:521 msgid "The authentication token of the default bind DN." msgstr "默认绑定判别名的认证 token。" -#: src/include/sssd-parameters.rb:528 +#: src/include/sssd-parameters.rb:526 msgid "The object class of a user entry in LDAP." msgstr "LDAP 中用户项的对象类。" -#: src/include/sssd-parameters.rb:533 +#: src/include/sssd-parameters.rb:531 msgid "The LDAP attribute that corresponds to the user's login name." msgstr "对应着用户登录名的 LDAP 属性。" -#: src/include/sssd-parameters.rb:538 +#: src/include/sssd-parameters.rb:536 msgid "The LDAP attribute that corresponds to the user's id." msgstr "对应着用户 ID 的 LDAP 属性。" -#: src/include/sssd-parameters.rb:543 +#: src/include/sssd-parameters.rb:541 msgid "The LDAP attribute that corresponds to the user's primary group id." msgstr "对应着用户的首要组 ID 的 LDAP 属性。" -#: src/include/sssd-parameters.rb:548 +#: src/include/sssd-parameters.rb:546 msgid "The LDAP attribute that corresponds to the user's gecos field." msgstr "对应着用户 gecos 字段的 LDAP 属性。" -#: src/include/sssd-parameters.rb:553 +#: src/include/sssd-parameters.rb:551 msgid " The LDAP attribute that contains the name of the user's home directory." msgstr "存放用户主文件夹名称的 LDAP 属性。" -#: src/include/sssd-parameters.rb:558 +#: src/include/sssd-parameters.rb:556 msgid "The LDAP attribute that contains the path to the user's default shell." msgstr "存放用户默认壳层路径的 LDAP 属性。" -#: src/include/sssd-parameters.rb:563 +#: src/include/sssd-parameters.rb:561 msgid "The LDAP attribute that contains the UUID/GUID of an LDAP user object." msgstr "存放 LDAP 用户对象的 UUID/GUID 的 LDAP 属性。" -#: src/include/sssd-parameters.rb:568 +#: src/include/sssd-parameters.rb:566 msgid "The LDAP attribute that contains the objectSID of an LDAP user object." msgstr "存放 LDAP 用户对象的 objectSID 的 LDAP 属性。" -#: src/include/sssd-parameters.rb:573 src/include/sssd-parameters.rb:778 +#: src/include/sssd-parameters.rb:571 src/include/sssd-parameters.rb:776 msgid "The LDAP attribute that contains timestamp of the last modification of the parent object." msgstr "存放父对象最后修订时间戳记的 LDAP 属性。" -#: src/include/sssd-parameters.rb:578 +#: src/include/sssd-parameters.rb:576 msgid "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (date of the last password change)." msgstr "当使用 ldap_pwd_policy=shadow 时，此参数存放了对应着其 shadow(5) 对手方(上次密码变更日期) 的 LDAP 属性名称。" -#: src/include/sssd-parameters.rb:583 +#: src/include/sssd-parameters.rb:581 msgid "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (minimum password age)." msgstr "当使用 ldap_pwd_policy=shadow 时，此参数存放了对应着其 shadow(5) 对手方(最小密码有效期) 的 LDAP 属性名称。" -#: src/include/sssd-parameters.rb:588 +#: src/include/sssd-parameters.rb:586 msgid "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (maximum password age)." msgstr "当使用 ldap_pwd_policy=shadow 时，此参数存放了对应着其 shadow(5) 对手方(最大密码有效期) 的 LDAP 属性名称。" -#: src/include/sssd-parameters.rb:593 +#: src/include/sssd-parameters.rb:591 msgid "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (password warning period)." msgstr "当使用 ldap_pwd_policy=shadow 时，此参数存放了对应着其 shadow(5) 对手方(密码告警时间) 的 LDAP 属性名称。" -#: src/include/sssd-parameters.rb:598 +#: src/include/sssd-parameters.rb:596 msgid "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (password inactivity period)." msgstr "当使用 ldap_pwd_policy=shadow 时，此参数存放了对应着其 shadow(5) 对手方(密码无活动时间) 的 LDAP 属性名称。" -#: src/include/sssd-parameters.rb:603 +#: src/include/sssd-parameters.rb:601 msgid "When using ldap_pwd_policy=shadow or ldap_account_expire_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (account expiration date)." msgstr "当使用 ldap_pwd_policy=shadow 或 ldap_account_expire_policy=shadow 时，此参数存放了对应着其 shadow(5) 对手方(账户过期日) 的 LDAP 属性名称。" -#: src/include/sssd-parameters.rb:608 +#: src/include/sssd-parameters.rb:606 msgid "When using ldap_pwd_policy=mit_kerberos, this parameter contains the name of an LDAP attribute storing the date and time of last password change in kerberos." msgstr "当使用 ldap_pwd_policy=mit_kerberos 时，此参数存放了存储 kerberos 中上次密码变更日期和时间的 LDAP 属性的名称。" -#: src/include/sssd-parameters.rb:613 +#: src/include/sssd-parameters.rb:611 msgid "When using ldap_pwd_policy=mit_kerberos, this parameter contains the name of an LDAP attribute storing the date and time when current password expires." msgstr "当使用 ldap_pwd_policy=mit_kerberos 时，此参数存放了存储当前密码过期日期和时间的 LDAP 属性的名称。" -#: src/include/sssd-parameters.rb:618 +#: src/include/sssd-parameters.rb:616 msgid "When using ldap_account_expire_policy=ad, this parameter contains the name of an LDAP attribute storing the expiration time of the account." msgstr "当使用 ldap_account_expire_policy=ad 时，此参数存放了存储账户过期时间的 LDAP 属性的名称。" -#: src/include/sssd-parameters.rb:623 +#: src/include/sssd-parameters.rb:621 msgid "When using ldap_account_expire_policy=ad, this parameter contains the name of an LDAP attribute storing the user account control bit field." msgstr "当使用 ldap_account_expire_policy=ad 时，此参数存放了存储用户账户控制字节段的 LDAP 属性的名称。" -#: src/include/sssd-parameters.rb:628 +#: src/include/sssd-parameters.rb:626 msgid "When using ldap_account_expire_policy=rhds or equivalent, this parameter determines if access is allowed or not." msgstr "当使用 ldap_account_expire_policy=rhds 或等价物时，此参数确定了是否允许访问。" -#: src/include/sssd-parameters.rb:633 +#: src/include/sssd-parameters.rb:631 msgid "When using ldap_account_expire_policy=nds, this attribute determines if access is allowed or not." msgstr "当使用 ldap_account_expire_policy=nds 时，此属性确定了是否允许访问。" -#: src/include/sssd-parameters.rb:638 +#: src/include/sssd-parameters.rb:636 msgid "When using ldap_account_expire_policy=nds, this attribute determines until which date access is granted." msgstr "当使用 ldap_account_expire_policy=nds 时，此属性确定了准予访问至的日期。" -#: src/include/sssd-parameters.rb:643 +#: src/include/sssd-parameters.rb:641 msgid "When using ldap_account_expire_policy=nds, this attribute determines the hours of a day in a week when access is granted." msgstr "当使用 ldap_account_expire_policy=nds 时，此属性确定了一周中每天准予访问的小时数。" -#: src/include/sssd-parameters.rb:648 +#: src/include/sssd-parameters.rb:646 msgid "The LDAP attribute that contains the user's Kerberos User Principal Name (UPN)." msgstr "存放用户的 Kerberos 用户实体名称 (UPN) 的 LDAP 属性。" -#: src/include/sssd-parameters.rb:652 +#: src/include/sssd-parameters.rb:650 msgid "The LDAP attribute that contains the user's SSH public keys." msgstr "存放用户 SSH 公钥的 LDAP 属性。" -#: src/include/sssd-parameters.rb:657 +#: src/include/sssd-parameters.rb:655 msgid "Some directory servers, for example Active Directory, might deliver the realm part of the UPN in lower case, which might cause the authentication to fail." msgstr "某些目录服务器，例如活动目录服务器，可能会以小写传递 UPN 的领域部分，这可能造成认证失败。" -#: src/include/sssd-parameters.rb:658 +#: src/include/sssd-parameters.rb:656 msgid "Set this option to true if you want to use an upper-case realm." msgstr "若您想要使用大写领域则请将此选项设为真。" -#: src/include/sssd-parameters.rb:663 +#: src/include/sssd-parameters.rb:661 msgid "Specifies how many seconds SSSD has to wait before refreshing its cache of enumerated records." msgstr "指定了刷新其枚举记录缓存前 SSSD 必须等待的秒数。" -#: src/include/sssd-parameters.rb:668 +#: src/include/sssd-parameters.rb:666 msgid "Determine how often to check the cache for inactive entries (such as groups with no members and users who have never logged in) and remove them to save space." msgstr "确定了检查缓存中不活动项 (诸如没有成员的组和从未登入过的用户) 并移除它们节省空间的频率。" -#: src/include/sssd-parameters.rb:673 +#: src/include/sssd-parameters.rb:671 msgid "The LDAP attribute that corresponds to the user's full name." msgstr "对应着用户完整名称的 LDAP 属性。" -#: src/include/sssd-parameters.rb:678 +#: src/include/sssd-parameters.rb:676 msgid "The LDAP attribute that lists the user's group memberships." msgstr "列出了用户的组成员资格的 LDAP 属性。" -#: src/include/sssd-parameters.rb:683 +#: src/include/sssd-parameters.rb:681 msgid "If access_provider=ldap and ldap_access_order=authorized_service, SSSD will use the presence of the authorizedService attribute in the user's LDAP entry to determine access privilege." msgstr "若 access_provider=ldap 且 ldap_access_order=authorized_service，SSSD 将依据 authorizedService 属性是否在该用户 LDAP 项中出现来确定访问权限。" -#: src/include/sssd-parameters.rb:688 +#: src/include/sssd-parameters.rb:686 msgid "If access_provider=ldap and ldap_access_order=host, SSSD will use the presence of the host attribute in the user's LDAP entry to determine access privilege." msgstr "若 access_provider=ldap 且 ldap_access_order=host，SSSD 将依据主机属性是否在该用户 LDAP 项中出现来确定访问权限。" -#: src/include/sssd-parameters.rb:698 +#: src/include/sssd-parameters.rb:696 msgid "The object class of a group entry in LDAP." msgstr "LDAP 中组项的对象类。" -#: src/include/sssd-parameters.rb:703 +#: src/include/sssd-parameters.rb:701 msgid "The LDAP attribute that corresponds to the group name." msgstr "对应着组名称的 LDAP 属性。" -#: src/include/sssd-parameters.rb:708 +#: src/include/sssd-parameters.rb:706 msgid "The LDAP attribute that corresponds to the group's id." msgstr "对应着组 ID 的 LDAP 属性。" -#: src/include/sssd-parameters.rb:713 +#: src/include/sssd-parameters.rb:711 msgid "The LDAP attribute that contains the names of the group's members." msgstr "存放组成员名称的 LDAP 属性。" -#: src/include/sssd-parameters.rb:718 +#: src/include/sssd-parameters.rb:716 msgid "The LDAP attribute that contains the UUID/GUID of an LDAP group object." msgstr "存放某 LDAP 组对象的 UUID/GUID 的 LDAP 属性。" -#: src/include/sssd-parameters.rb:723 +#: src/include/sssd-parameters.rb:721 msgid "The LDAP attribute that contains the objectSID of an LDAP group object." msgstr "存放某 LDAP 组对象的 objectSID 的 LDAP 属性。" -#: src/include/sssd-parameters.rb:728 +#: src/include/sssd-parameters.rb:726 msgid " The LDAP attribute that contains timestamp of the last modification of the parent object." msgstr "存放父对象最后修订时间戳记的 LDAP 属性。" -#: src/include/sssd-parameters.rb:734 +#: src/include/sssd-parameters.rb:732 msgid "If ldap_schema is set to a schema format that supports nested groups (e.g. RFC2307bis), then this option controls how many levels of nesting SSSD will follow." msgstr "若 ldap_schema 设为支持嵌套组的方案格式 (例如 RFC2307bis)，则此选项控制了 SSSD 将跟随的嵌套级数。" -#: src/include/sssd-parameters.rb:740 +#: src/include/sssd-parameters.rb:738 msgid "This option tells SSSD to take advantage of an Active Directory-specific feature which may speed up group lookup operations on deployments with complex or deep nested groups." msgstr "此选项告知 SSSD 利用一项活动目录独有特性，其可能加速在具有复杂或深度嵌套的组的部署上的组查询操作。" -#: src/include/sssd-parameters.rb:746 +#: src/include/sssd-parameters.rb:744 msgid "This option tells SSSD to take advantage of an Active Directory-specific feature which might speed up initgroups operations (most notably when dealing with complex or deep nested groups)." msgstr "此选项告知 SSSD 利用一项活动目录独有特性，其可能加速 initgroups 操作 (当处理复杂或深度嵌套的组时最为显著)。" -#: src/include/sssd-parameters.rb:752 +#: src/include/sssd-parameters.rb:750 msgid " The object class of a netgroup entry in LDAP." msgstr " LDAP 中网络组项的对象类。" -#: src/include/sssd-parameters.rb:758 +#: src/include/sssd-parameters.rb:756 msgid "The LDAP attribute that corresponds to the netgroup name." msgstr "对应着网络组名称的 LDAP 属性。" -#: src/include/sssd-parameters.rb:763 +#: src/include/sssd-parameters.rb:761 msgid "The LDAP attribute that contains the names of the netgroup's members." msgstr "存放网络组成员名称的 LDAP 属性。" -#: src/include/sssd-parameters.rb:768 +#: src/include/sssd-parameters.rb:766 msgid "The LDAP attribute that contains the (host, user, domain) netgroup triples." msgstr "存放 (主机，用户，域) 网络组铁三角的 LDAP 属性。" -#: src/include/sssd-parameters.rb:773 +#: src/include/sssd-parameters.rb:771 msgid "The LDAP attribute that contains the UUID/GUID of an LDAP netgroup object." msgstr "存放某个 LDAP 网络组对象的 UUID/GUID 的 LDAP 属性。" -#: src/include/sssd-parameters.rb:783 +#: src/include/sssd-parameters.rb:781 msgid "The object class of a service entry in LDAP." msgstr "LDAP 中服务项的对象类。" -#: src/include/sssd-parameters.rb:788 +#: src/include/sssd-parameters.rb:786 msgid "The LDAP attribute that contains the name of service attributes and their aliases." msgstr "存放服务属性名称和其别名的 LDAP 属性。" -#: src/include/sssd-parameters.rb:793 +#: src/include/sssd-parameters.rb:791 msgid "The LDAP attribute that contains the port managed by this service." msgstr "存放此服务管理的端口的 LDAP 属性。" -#: src/include/sssd-parameters.rb:798 +#: src/include/sssd-parameters.rb:796 msgid "The LDAP attribute that contains the protocols understood by this service." msgstr "存放此服务可解析协议的 LDAP 属性。" -#: src/include/sssd-parameters.rb:804 +#: src/include/sssd-parameters.rb:802 msgid "An optional base DN, search scope and LDAP filter to restrict LDAP searches for this attribute type." msgstr "一个可选的基本判别名/搜索范围/LDAP 过滤器，可限制 LDAP 搜索只搜索此属性类型。" -#: src/include/sssd-parameters.rb:809 +#: src/include/sssd-parameters.rb:807 msgid " Specifies the timeout (in seconds) that ldap searches are allowed to run before they are cancelled and cached results are returned (and offline mode is entered)." msgstr "指定了取消并返回缓存结果 (并进入离线模式) 前 LDAP 搜索允许运行的以秒计超时。" -#: src/include/sssd-parameters.rb:814 +#: src/include/sssd-parameters.rb:812 msgid "Specifies the timeout (in seconds) that ldap searches for user and group enumerations are allowed to run before they are cancelled and cached results are returned (and offline mode is entered)." msgstr "指定了取消并返回缓存结果 (并进入离线模式) 前 LDAP 用户和组枚举搜索允许运行的以秒计超时。" -#: src/include/sssd-parameters.rb:819 +#: src/include/sssd-parameters.rb:817 msgid "Specifies the timeout (in seconds) after which the poll(2)/select(2) following a connect(2) returns in case of no activity." msgstr "指定了无活动时 poll(2)/select(2) 跟随 connect(2) 返回的以秒计超时。" -#: src/include/sssd-parameters.rb:824 +#: src/include/sssd-parameters.rb:822 msgid "Specifies a timeout (in seconds) after which calls to synchronous LDAP APIs will abort if no response is received." msgstr "指定了无回应时同步 LDAP API 调用中止的以秒计超时。" -#: src/include/sssd-parameters.rb:829 +#: src/include/sssd-parameters.rb:827 msgid "Specifies a timeout (in seconds) that a connection to an LDAP server will be maintained." msgstr "指定了维持到 LDAP 服务器连接的以秒计超时。" -#: src/include/sssd-parameters.rb:834 +#: src/include/sssd-parameters.rb:832 msgid "Specify the number of records to retrieve from LDAP in a single request. Some LDAP servers enforce a maximum limit per-request." msgstr "指定了单一请求从 LDAP 撷取的记录数。某些 LDAP 服务器强制单一请求最大限制。" -#: src/include/sssd-parameters.rb:839 +#: src/include/sssd-parameters.rb:837 msgid "Disable the LDAP paging control." msgstr "禁用 LDAP 分页控制。" -#: src/include/sssd-parameters.rb:844 +#: src/include/sssd-parameters.rb:842 msgid "When communicating with an LDAP server using SASL, specify the minimum security level necessary to establish the connection." msgstr "当使用 SASL 与 LDAP 服务器通信时，请指定建立连接必需的最小安全级别。" -#: src/include/sssd-parameters.rb:849 +#: src/include/sssd-parameters.rb:847 msgid "Specify the number of group members that must be missing from the internal cache in order to trigger a dereference lookup." msgstr "指定了为触发解引用查询内部缓存必须缺失的组成员数。" -#: src/include/sssd-parameters.rb:855 +#: src/include/sssd-parameters.rb:853 msgid "Specifies what checks to perform on server certificates in a TLS session, if any." msgstr "指定了若需要检查则在 TLS 会话中对服务器证书要进行的检查。" -#: src/include/sssd-parameters.rb:860 +#: src/include/sssd-parameters.rb:858 msgid "Specifies the file that contains certificates for all of the Certificate Authorities that sssd will recognize." msgstr "指定了包含全部 sssd 应认得的证书授权机构证书的文件。" -#: src/include/sssd-parameters.rb:865 +#: src/include/sssd-parameters.rb:863 msgid "Specifies the path of a directory that contains Certificate Authority certificates in separate individual files." msgstr "指定了包含以几个单独文件形式存在的证书授权机构证书的文件夹路径。" -#: src/include/sssd-parameters.rb:869 +#: src/include/sssd-parameters.rb:867 msgid "Specifies the file that contains the certificate for the client's key." msgstr "指定了包含客户端密钥证书的文件。" -#: src/include/sssd-parameters.rb:873 +#: src/include/sssd-parameters.rb:871 msgid "Specifies the file that contains the client's key." msgstr "指定了包含客户端密钥的文件。" -#: src/include/sssd-parameters.rb:878 +#: src/include/sssd-parameters.rb:876 msgid "Specifies acceptable cipher suites." msgstr "指定了可接受的密码套件。" -#: src/include/sssd-parameters.rb:883 +#: src/include/sssd-parameters.rb:881 msgid "Specifies that the id_provider connection must also use tls to protect the channel." msgstr "指定了 id_provider 连接必须也使用 TLS 来保护通道。" -#: src/include/sssd-parameters.rb:888 +#: src/include/sssd-parameters.rb:886 msgid "Specifies that SSSD should attempt to map user and group IDs from the ldap_user_objectsid and ldap_group_objectsid attributes instead of relying on ldap_user_uid_number and ldap_group_gid_number." msgstr "指定了 SSSD 应尝试从 ldap_user_objectsid 和 ldap_group_objectsid 属性映射用户和组 ID 而不是依赖于 ldap_user_uid_number 和 ldap_group_gid_number。" -#: src/include/sssd-parameters.rb:892 +#: src/include/sssd-parameters.rb:890 msgid "Specify the SASL mechanism to use." msgstr "指定了要使用的 SASL 机制。" -#: src/include/sssd-parameters.rb:897 +#: src/include/sssd-parameters.rb:895 msgid "Specify the SASL authorization id to use." msgstr "指定了要使用的 SASL 认证 ID。" -#: src/include/sssd-parameters.rb:902 +#: src/include/sssd-parameters.rb:900 msgid "Specify the SASL realm to use." msgstr "指定了要使用的 SASL 领域。" -#: src/include/sssd-parameters.rb:907 +#: src/include/sssd-parameters.rb:905 msgid "If set to true, the LDAP library would perform a reverse lookup to canonicalize the host name during a SASL bind." msgstr "若设为真，LDAP 函数库在 SASL 绑定时应执行一次反向查询以规范化主机名。" -#: src/include/sssd-parameters.rb:912 +#: src/include/sssd-parameters.rb:910 msgid "Specify the keytab to use when using SASL/GSSAPI." msgstr "指定了使用 SASL/GSSAPI 时使用的密钥表。" -#: src/include/sssd-parameters.rb:917 +#: src/include/sssd-parameters.rb:915 msgid "Specifies that the id_provider should init Kerberos credentials (TGT)." msgstr "指定了 id_provider 应初始化 Kerberos 机要资料 (票据授权票据)。" -#: src/include/sssd-parameters.rb:922 +#: src/include/sssd-parameters.rb:920 msgid "Specifies the lifetime in seconds of the TGT if GSSAPI is used." msgstr "指定了使用 GSSAPI 时票据授权票据以秒计的生命周期。" -#: src/include/sssd-parameters.rb:927 +#: src/include/sssd-parameters.rb:925 msgid "Select the policy to evaluate the password expiration on the client side." msgstr "选择客户端方面用于评估密码有效期的策略。" -#: src/include/sssd-parameters.rb:932 +#: src/include/sssd-parameters.rb:930 msgid "Specifies whether automatic referral chasing should be enabled." msgstr "指定了是否应启用自动引用跟踪。" -#: src/include/sssd-parameters.rb:937 +#: src/include/sssd-parameters.rb:935 msgid "Specifies the service name to use when service discovery is enabled." msgstr "制定了当启用了服务发现时使用的服务名称。" -#: src/include/sssd-parameters.rb:941 +#: src/include/sssd-parameters.rb:939 msgid "Specifies the service name to use to find an LDAP server which allows password changes when service discovery is enabled." msgstr "指定了当启用了服务发现时用于查找允许密码变更的 LDAP 服务器的服务名称。" -#: src/include/sssd-parameters.rb:946 +#: src/include/sssd-parameters.rb:944 msgid "Specifies whether to update the ldap_user_shadow_last_change attribute with days since the Epoch after a password change operation." msgstr "指定了在密码变更操作过后是否使用上次操作天数更新 ldap_user_shadow_last_change 属性。" -#: src/include/sssd-parameters.rb:951 +#: src/include/sssd-parameters.rb:949 msgid "If using access_provider = ldap and ldap_access_order = filter (default), this option is mandatory. It specifies an LDAP search filter criterion that must be met for the user to be granted access on this host." msgstr "若使用了 access_provider = ldap 和 ldap_access_order = filter (默认)，则此选项是必需的。它指定了一个 LDAP 搜索过滤器标准，用户想要获得此主机的访问权就必须满足此标准。" -#: src/include/sssd-parameters.rb:956 +#: src/include/sssd-parameters.rb:954 msgid " With this option a client side evaluation of access control attributes can be enabled." msgstr "使用此选项可启用客户端访问控制属性评估。" -#: src/include/sssd-parameters.rb:962 +#: src/include/sssd-parameters.rb:960 msgid "Comma separated list of access control options." msgstr "逗号分隔的访问控制选项列表。" -#: src/include/sssd-parameters.rb:967 +#: src/include/sssd-parameters.rb:965 msgid "Specifies how alias dereferencing is done when performing a search." msgstr "指定了执行搜索时如何解引用别名。" -#: src/include/sssd-parameters.rb:972 +#: src/include/sssd-parameters.rb:970 msgid "Allows to retain local users as members of an LDAP group for servers that use the RFC2307 schema." msgstr "针对使用 RFC2307 方案的服务器允许保留本地用户作为某个 LDAP 组的成员。" -#: src/include/sssd-parameters.rb:995 src/include/sssd-parameters.rb:999 +#: src/include/sssd-parameters.rb:993 src/include/sssd-parameters.rb:997 msgid "Specifies the comma-separated list of IP addresses or hostnames of the Kerberos servers to which SSSD should connect, in the order of preference." msgstr "指定了逗号分隔的 SSSD 应以优先级顺序连接的 Kerberos 服务器 IP 地址或主机名列表。" -#: src/include/sssd-parameters.rb:1004 +#: src/include/sssd-parameters.rb:1002 msgid "The name of the Kerberos realm." msgstr "Kerberos 领域的名称。" -#: src/include/sssd-parameters.rb:1009 src/include/sssd-parameters.rb:1014 +#: src/include/sssd-parameters.rb:1007 src/include/sssd-parameters.rb:1012 msgid "If the change password service is not running on the KDC, alternative servers can be defined here." msgstr "若 KDC 上未运行密码变更服务，则可在此定义替代服务器。" -#: src/include/sssd-parameters.rb:1019 +#: src/include/sssd-parameters.rb:1017 msgid "Directory to store credential caches." msgstr "存储机要缓存的文件夹。" -#: src/include/sssd-parameters.rb:1024 +#: src/include/sssd-parameters.rb:1022 msgid "Location of the user's credential cache." msgstr "用户机要缓存的位置。" -#: src/include/sssd-parameters.rb:1029 +#: src/include/sssd-parameters.rb:1027 msgid " Timeout in seconds after an online authentication request or change password request is aborted." msgstr "在线认证请求或密码变更请求以秒计的超时。" -#: src/include/sssd-parameters.rb:1034 +#: src/include/sssd-parameters.rb:1032 msgid "Verify with the help of krb5_keytab that the TGT obtained has not been spoofed." msgstr "在 krb5_keytab 的帮助下校验获取的票据授权票据未被冒名顶替。" -#: src/include/sssd-parameters.rb:1039 +#: src/include/sssd-parameters.rb:1037 msgid "The location of the keytab to use when validating credentials obtained from KDCs." msgstr "当认证从 KDC 获取的机要资料时所用的密钥表的位置。" -#: src/include/sssd-parameters.rb:1044 +#: src/include/sssd-parameters.rb:1042 msgid "Store the password of the user if the provider is offline and use it to request a TGT when the provider comes online again." msgstr "若提供者离线则存储用户密码并在提供者再次上线时用其请求票据授权票据。" -#: src/include/sssd-parameters.rb:1048 +#: src/include/sssd-parameters.rb:1046 msgid "Request a renewable ticket with a total lifetime, given as an integer immediately followed by a time unit." msgstr "请求可续期票据和其完整生命期，以整数后接时间单位的形式给出。" -#: src/include/sssd-parameters.rb:1052 +#: src/include/sssd-parameters.rb:1050 msgid "Request ticket with a with a lifetime, given as an integer immediately followed by a time unit." msgstr "请求票据和其生命期，以整数后接时间单位的形式给出。" -#: src/include/sssd-parameters.rb:1056 +#: src/include/sssd-parameters.rb:1054 msgid "The time in seconds between two checks if the TGT should be renewed." msgstr "当票据授权票据应续期时两次检查间的秒数。" -#: src/include/sssd-parameters.rb:1061 +#: src/include/sssd-parameters.rb:1059 msgid "Enables flexible authentication secure tunneling (FAST) for Kerberos pre-authentication." msgstr "为 Kerberos 预认证启用灵活认证安全隧道 (FAST)。" -#: src/include/sssd-parameters.rb:1065 +#: src/include/sssd-parameters.rb:1063 msgid "Specifies the server principal to use for FAST." msgstr "指定了用于灵活认证安全隧道的服务器实体。" -#: src/include/sssd-parameters.rb:1070 +#: src/include/sssd-parameters.rb:1068 msgid "Specifies if the host and user principal should be canonicalized." msgstr "指定了是否应规范化主机和用户实体。" #. The Active Directory domain section -#: src/include/sssd-parameters.rb:1083 +#: src/include/sssd-parameters.rb:1081 msgid "Specifies the name of the Active Directory domain." msgstr "指定了活动目录域的名称。" -#: src/include/sssd-parameters.rb:1087 src/include/sssd-parameters.rb:1091 +#: src/include/sssd-parameters.rb:1085 src/include/sssd-parameters.rb:1089 msgid "The comma-separated list of IP addresses or hostnames of the AD servers to which SSSD should connect in order of preference." msgstr "以优先级顺序指定了 SSSD 应连接的活动目录服务器的以逗号分隔的 IP 地址或主机名列表。" -#: src/include/sssd-parameters.rb:1095 +#: src/include/sssd-parameters.rb:1093 msgid "Optional. May be set on machines where the hostname(5) does not reflect the fully qualified name used in the Active Directory domain to identify this host." msgstr "可选。可以在 hostname(5) 未反映在活动目录域中用于识别此主机的完全限定名称的机器上设置。" -#: src/include/sssd-parameters.rb:1099 +#: src/include/sssd-parameters.rb:1097 msgid "Override the user's home directory." msgstr "覆盖用户主文件夹。" -#: src/include/sssd-parameters.rb:1112 +#: src/include/sssd-parameters.rb:1110 msgid " Specifies the lower bound of the range of POSIX IDs to use for mapping Active Directory user and group SIDs." msgstr "指定了用于映射活动目录用户和组 SID 的 POSIX ID 范围的下界。" -#: src/include/sssd-parameters.rb:1117 +#: src/include/sssd-parameters.rb:1115 msgid "Specifies the upper bound of the range of POSIX IDs to use for mapping Active Directory user and group SIDs." msgstr "指定了用于映射活动目录用户和组 SID 的 POSIX ID 范围的上界。" -#: src/include/sssd-parameters.rb:1122 +#: src/include/sssd-parameters.rb:1120 msgid "Specifies the number of IDs available for each slice." msgstr "指定了每一切片可用的 ID 数。" -#: src/include/sssd-parameters.rb:1126 +#: src/include/sssd-parameters.rb:1124 msgid "Specify the domain SID of the default domain." msgstr "指定默认域的域 SID。" -#: src/include/sssd-parameters.rb:1130 +#: src/include/sssd-parameters.rb:1128 msgid "Specify the name of the default domain." msgstr "指定默认域的名称。" -#: src/include/sssd-parameters.rb:1135 +#: src/include/sssd-parameters.rb:1133 msgid "Changes the behavior of the ID-mapping algorithm to behave more similarly to winbind's “idmap_autorid” algorithm." msgstr "修改 ID 映射算法的行为以与 winbind 的 \"idmap_autorid\" 算法更加相似。" #. The Active Directory domain section -#: src/include/sssd-parameters.rb:1147 +#: src/include/sssd-parameters.rb:1145 msgid "Specifies the name of the IPA domain." msgstr "指定 IPA 域的名称。" -#: src/include/sssd-parameters.rb:1151 +#: src/include/sssd-parameters.rb:1149 msgid "The comma-separated list of IP addresses or hostnames of the IPA servers to which SSSD should connect in the order of preference." msgstr "指定了逗号分隔的 SSSD 应以优先级顺序连接的 IPA 服务器 IP 地址或主机名列表。" -#: src/include/sssd-parameters.rb:1155 +#: src/include/sssd-parameters.rb:1153 msgid "May be set on machines where the hostname(5) does not reflect the fully qualified name." msgstr "可以在 hostname(5) 未反映完全限定名称的机器上设置。" -#: src/include/sssd-parameters.rb:1160 +#: src/include/sssd-parameters.rb:1158 msgid "This option tells SSSD to automatically update the DNS server built into FreeIPA v2 with the IP address of this client." msgstr "此选项告知 SSSD 使用此客户端的 IP 地址自动更新被构建成 FreeIPA v2 的 DNS 服务器。" -#: src/include/sssd-parameters.rb:1165 +#: src/include/sssd-parameters.rb:1163 msgid "The TTL to apply to the client DNS record when updating it." msgstr "更新客户端 DNS 记录时应用的 TTL。" -#: src/include/sssd-parameters.rb:1169 +#: src/include/sssd-parameters.rb:1167 msgid "Choose the interface whose IP address should be used for dynamic DNS updates." msgstr "选择其 IP 地址应用于动态 DNS 更新的接口。" @@ -1081,18 +1083,24 @@ #. Summary() #. returns html formated configuration summary #. @return summary -#: src/modules/AuthClient.rb:334 +#: src/modules/AuthClient.rb:336 msgid "System is configured for using nss_ldap.\n" msgstr "系统配置为使用 nss_ldap。\n" -#: src/modules/AuthClient.rb:337 +#: src/modules/AuthClient.rb:339 msgid "System is configured for using sssd.\n" msgstr "系统配置为使用 sssd。\n" -#: src/modules/AuthClient.rb:343 +#: src/modules/AuthClient.rb:345 msgid "System is configured for using OES.\n" msgstr "系统配置为使用 OES。\n" -#: src/modules/AuthClient.rb:346 +#: src/modules/AuthClient.rb:348 msgid "System is configured for using /etc/passwd only.\n" msgstr "系统配置为仅使用 /etc/passwd。\n" + +#~ msgid "SPAM Prevention" +#~ msgstr "SPAM 防护" + +#~ msgid "TODO WRITE HELP" +#~ msgstr "待办：撰写帮助" Modified: trunk/yast/zh_CN/po/auth-server.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/auth-server.zh_CN.po 2014-10-29 15:59:29 UTC (rev 90431) +++ trunk/yast/zh_CN/po/auth-server.zh_CN.po 2014-10-29 16:00:17 UTC (rev 90432) @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: opensuse-i 18n\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:51+0200\n" +"POT-Creation-Date: 2014-10-29 16:20+0100\n" "PO-Revision-Date: 2014-06-24 15:11+0800\n" "Last-Translator: 玛格丽特 · 苏 <marguerite@opensuse.org>\n" "Language-Team: Chinese Simplified <opensuse-zh@opensuse.org>\n" @@ -276,8 +276,8 @@ #. Initialization dialog caption #: src/include/auth-server/dialogs.rb:32 src/include/auth-server/wizards.rb:52 #: src/include/auth-server/wizards.rb:122 -#: src/include/auth-server/wizards.rb:202 -#: src/include/auth-server/wizards.rb:295 +#: src/include/auth-server/wizards.rb:205 +#: src/include/auth-server/wizards.rb:298 msgid "Authentication Server Configuration" msgstr "认证服务器配置" @@ -460,15 +460,15 @@ #: src/include/auth-server/dialogs.rb:1093 #: src/include/auth-server/dialogs.rb:1565 -#: src/include/auth-server/tree_structure.rb:907 -#: src/include/auth-server/widgets.rb:420 +#: src/include/auth-server/tree_structure.rb:910 +#: src/include/auth-server/widgets.rb:424 msgid "Enter a password" msgstr "请输入一个密码" #: src/include/auth-server/dialogs.rb:1101 #: src/include/auth-server/dialogs.rb:1570 -#: src/include/auth-server/tree_structure.rb:913 -#: src/include/auth-server/widgets.rb:430 +#: src/include/auth-server/tree_structure.rb:916 +#: src/include/auth-server/widgets.rb:435 msgid "The passwords you have entered do not match. Try again." msgstr "您输入的密码不匹配。请重试。" @@ -605,9 +605,9 @@ msgstr "请输入新密码(&P)" #: src/include/auth-server/dialogs.rb:1537 -#: src/include/auth-server/tree_structure.rb:961 -#: src/include/auth-server/tree_structure.rb:1003 -#: src/include/auth-server/widgets.rb:405 src/modules/LdapDatabase.rb:219 +#: src/include/auth-server/tree_structure.rb:964 +#: src/include/auth-server/tree_structure.rb:1006 +#: src/include/auth-server/widgets.rb:406 src/modules/LdapDatabase.rb:219 msgid "&Validate Password" msgstr "校验密码(&V)" @@ -1955,8 +1955,8 @@ #: src/include/auth-server/mirrormode-wizard.rb:175 #: src/include/auth-server/wizards.rb:53 #: src/include/auth-server/wizards.rb:124 -#: src/include/auth-server/wizards.rb:204 -#: src/include/auth-server/wizards.rb:297 +#: src/include/auth-server/wizards.rb:207 +#: src/include/auth-server/wizards.rb:300 msgid "Initializing..." msgstr "正在初始化..." @@ -2068,74 +2068,74 @@ #. Error Popup #. Error Popup #: src/include/auth-server/tree_structure.rb:750 -#: src/include/auth-server/tree_structure.rb:884 +#: src/include/auth-server/tree_structure.rb:887 msgid "Unable to write settings for the current database." msgstr "无法写入设置到当前数据库。" #: src/include/auth-server/tree_structure.rb:804 -#: src/include/auth-server/tree_structure.rb:941 +#: src/include/auth-server/tree_structure.rb:944 msgid "Unable to read settings for the current database." msgstr "无法从当前数据库读取设置。" -#: src/include/auth-server/tree_structure.rb:959 -#: src/include/auth-server/tree_structure.rb:1001 -#: src/include/auth-server/widgets.rb:403 +#: src/include/auth-server/tree_structure.rb:962 +#: src/include/auth-server/tree_structure.rb:1004 +#: src/include/auth-server/widgets.rb:404 msgid "New Administrator &Password" msgstr "新管理员密码(&P)" -#: src/include/auth-server/tree_structure.rb:965 -#: src/include/auth-server/tree_structure.rb:1007 -#: src/include/auth-server/widgets.rb:407 +#: src/include/auth-server/tree_structure.rb:968 +#: src/include/auth-server/tree_structure.rb:1010 +#: src/include/auth-server/widgets.rb:408 msgid "Password &Encryption" msgstr "密码加密(&E)" -#: src/include/auth-server/tree_structure.rb:1015 +#: src/include/auth-server/tree_structure.rb:1018 #: src/include/auth-server/widgets.rb:368 msgid "Change Administration Password" msgstr "修改管理密码" -#: src/include/auth-server/tree_structure.rb:1038 -#: src/include/auth-server/tree_structure.rb:1039 -#: src/include/auth-server/tree_structure.rb:1040 #: src/include/auth-server/tree_structure.rb:1041 +#: src/include/auth-server/tree_structure.rb:1042 +#: src/include/auth-server/tree_structure.rb:1043 +#: src/include/auth-server/tree_structure.rb:1044 #: src/modules/AuthServer.pm:2193 src/modules/AuthServer.pm:2212 #: src/modules/AuthServer.pm:2213 src/modules/AuthServer.pm:2214 msgid "No" msgstr "否" -#: src/include/auth-server/tree_structure.rb:1043 -#: src/include/auth-server/tree_structure.rb:1044 -#: src/include/auth-server/tree_structure.rb:1045 +#: src/include/auth-server/tree_structure.rb:1046 +#: src/include/auth-server/tree_structure.rb:1047 +#: src/include/auth-server/tree_structure.rb:1048 #: src/modules/AuthServer.pm:2193 src/modules/AuthServer.pm:2212 #: src/modules/AuthServer.pm:2213 src/modules/AuthServer.pm:2214 msgid "Yes" msgstr "是" #. skip attribute that already have an index defined -#: src/include/auth-server/tree_structure.rb:1188 +#: src/include/auth-server/tree_structure.rb:1191 msgid "Multiple Replication Consumers not supported currently" msgstr "目前不支持多个复制使用者" #. **************************************** #. tree generation functions ** #. *************************************** -#: src/include/auth-server/tree_structure.rb:1290 +#: src/include/auth-server/tree_structure.rb:1293 msgid "Index Configuration" msgstr "索引配置" -#: src/include/auth-server/tree_structure.rb:1298 +#: src/include/auth-server/tree_structure.rb:1301 msgid "Password Policy Configuration" msgstr "密码策略配置" -#: src/include/auth-server/tree_structure.rb:1307 +#: src/include/auth-server/tree_structure.rb:1310 msgid "Access Control Configuration" msgstr "访问控制配置" -#: src/include/auth-server/tree_structure.rb:1316 +#: src/include/auth-server/tree_structure.rb:1319 msgid "Replication Provider" msgstr "复制提供者" -#: src/include/auth-server/tree_structure.rb:1325 +#: src/include/auth-server/tree_structure.rb:1328 msgid "Replication Consumer" msgstr "复制使用者" @@ -2369,25 +2369,31 @@ msgstr "属性" #: src/include/auth-server/widgets.rb:384 -#: src/include/auth-server/widgets.rb:452 +#: src/include/auth-server/widgets.rb:457 msgid "Presence" msgstr "模糊匹配" #: src/include/auth-server/widgets.rb:384 -#: src/include/auth-server/widgets.rb:453 +#: src/include/auth-server/widgets.rb:458 msgid "Equality" msgstr "精确匹配" #: src/include/auth-server/widgets.rb:384 -#: src/include/auth-server/widgets.rb:454 +#: src/include/auth-server/widgets.rb:459 msgid "Substring" msgstr "子字符串" -#: src/include/auth-server/widgets.rb:402 +#: src/include/auth-server/widgets.rb:403 msgid "Change Administrator Password" msgstr "修改管理员密码" -#: src/include/auth-server/widgets.rb:447 +#: src/include/auth-server/widgets.rb:410 +#, fuzzy +#| msgid "Use Kerberos" +msgid "Update Kerberos Stash" +msgstr "使用 Kerberos" + +#: src/include/auth-server/widgets.rb:452 msgid "Add Index" msgstr "添加索引" @@ -2842,7 +2848,7 @@ msgstr "Kerberos 方案对于 LDAP 服务器是未知的。" #: src/modules/AuthServer.pm:975 src/modules/AuthServer.pm:3482 -#: src/modules/AuthServer.pm:3529 src/modules/AuthServer.pm:3575 +#: src/modules/AuthServer.pm:3536 src/modules/AuthServer.pm:3581 msgid "Cannot execute kdb5_ldap_util." msgstr "无法执行 kdb5_ldap_util。" @@ -3105,7 +3111,7 @@ msgid "Could not create database directory." msgstr "无法创建数据库文件夹。" -#: src/modules/AuthServer.pm:2810 src/modules/AuthServer.pm:4101 +#: src/modules/AuthServer.pm:2810 src/modules/AuthServer.pm:4107 #: src/modules/YaPI/LdapServer.pm:498 msgid "Could not adjust ownership of database directory." msgstr "无法调整数据库文件夹所有权。" @@ -3128,91 +3134,91 @@ msgid "Creating Kerberos database failed." msgstr "创建 Kerberos 数据库失败。" -#: src/modules/AuthServer.pm:3560 src/modules/AuthServer.pm:3606 +#: src/modules/AuthServer.pm:3566 src/modules/AuthServer.pm:3612 msgid "Writing to password file failed." msgstr "写入到密码文件失败。" -#: src/modules/AuthServer.pm:3972 src/modules/AuthServer.pm:3982 +#: src/modules/AuthServer.pm:3978 src/modules/AuthServer.pm:3988 msgid "is not a valid LDAP DN." msgstr "不是一个有效的 LDAP 判别名。" -#: src/modules/AuthServer.pm:3977 src/modules/AuthServer.pm:3987 +#: src/modules/AuthServer.pm:3983 src/modules/AuthServer.pm:3993 msgid "has multivalued RDNs." msgstr "有多重赋值的相对判别名。" -#: src/modules/AuthServer.pm:4019 +#: src/modules/AuthServer.pm:4025 #, perl-format msgid "Invalid LDAP DN: \"%s\", cannot extract RDN values" msgstr "无效的 LDAP 判别名：\"%s\"，无法提取相对判别名 (RDN) 值" -#: src/modules/AuthServer.pm:4027 +#: src/modules/AuthServer.pm:4033 msgid "The value of the \"c\" attribute must contain a valid ISO-3166 country 2-letter code." msgstr "\"c\" 属性的值必须包含一个有效的 ISO-3166 国家/地区的 2 字母代码。" #. parameter check failed -#: src/modules/AuthServer.pm:4034 src/modules/YaPI/LdapServer.pm:373 +#: src/modules/AuthServer.pm:4040 src/modules/YaPI/LdapServer.pm:373 msgid "First part of suffix must be c=, st=, l=, o=, ou= or dc=." msgstr "后缀的第一部分必须为 c=, st=, l=, o=, ou= 或 dc=。" -#: src/modules/AuthServer.pm:4046 +#: src/modules/AuthServer.pm:4052 #, perl-format msgid "Base DN \"%s\" is not a valid LDAP DN." msgstr "基本判别名 \"%s\" 不是一个有效的 LDAP_DN。" -#: src/modules/AuthServer.pm:4051 +#: src/modules/AuthServer.pm:4057 #, perl-format msgid "Base DN \"%s\" has multivalued RDNs (not supported by YaST)." msgstr "基本判别名 \"%s\" 有多重赋值的相对判别名 (不为 YaST 所支持)。" -#: src/modules/AuthServer.pm:4060 +#: src/modules/AuthServer.pm:4066 #, perl-format msgid "Root DN \"%s\" is not a valid LDAP DN." msgstr "根判别名 \"%s\" 不是一个有效的 LDAP_DN。" -#: src/modules/AuthServer.pm:4065 +#: src/modules/AuthServer.pm:4071 #, perl-format msgid "Root DN \"%s\" has multivalued RDNs (not supported by YaST)." msgstr "根判别名 \"%s\" 有多重赋值的相对判别名 (不为 YaST 所支持)。" -#: src/modules/AuthServer.pm:4072 +#: src/modules/AuthServer.pm:4078 msgid "The Root DN must be a child object of the Base DN." msgstr "根判别名必须是基本判别名的一个子对象。" -#: src/modules/AuthServer.pm:4094 src/modules/YaPI/LdapServer.pm:484 +#: src/modules/AuthServer.pm:4100 src/modules/YaPI/LdapServer.pm:484 msgid "Could not create directory." msgstr "无法创建文件夹。" -#: src/modules/AuthServer.pm:4871 +#: src/modules/AuthServer.pm:4877 #, perl-format msgid "CA Certificate File: \"%s\" does not exist." msgstr "CA 证书文件：\"%s\" 不存在。" -#: src/modules/AuthServer.pm:4881 +#: src/modules/AuthServer.pm:4887 msgid "Error while trying to verify the server certificate of the provider server.\n" msgstr "尝试验证提供者服务器的服务器证书时出错。\n" -#: src/modules/AuthServer.pm:4882 +#: src/modules/AuthServer.pm:4888 #, perl-format msgid "" "Please make sure that \"%s\" contains the correct\n" "CA file to verify the remote Server Certificate." msgstr "请确保 \"%s\" 包含了正确的 CA 文件以验证远程服务器证书。" -#: src/modules/AuthServer.pm:4890 +#: src/modules/AuthServer.pm:4896 #, perl-format msgid "Certificate File: \"%s\" does not exist." msgstr "证书文件：\"%s\" 不存在。" -#: src/modules/AuthServer.pm:4895 +#: src/modules/AuthServer.pm:4901 #, perl-format msgid "Certificate Key File: \"%s\" does not exist." msgstr "证书密钥文件：\"%s\" 不存在。" -#: src/modules/AuthServer.pm:4976 src/modules/AuthServer.pm:4986 +#: src/modules/AuthServer.pm:4982 src/modules/AuthServer.pm:4992 msgid "Writing to krb5.conf failed." msgstr "写入到 krb5.conf 失败。" -#: src/modules/AuthServer.pm:5354 src/modules/AuthServer.pm:5363 +#: src/modules/AuthServer.pm:5360 src/modules/AuthServer.pm:5369 msgid "Writing to kdc.conf failed." msgstr "写入到 kdc.conf 失败。" Modified: trunk/yast/zh_CN/po/autoinst.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/autoinst.zh_CN.po 2014-10-29 15:59:29 UTC (rev 90431) +++ trunk/yast/zh_CN/po/autoinst.zh_CN.po 2014-10-29 16:00:17 UTC (rev 90432) @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: autoinst\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:51+0200\n" +"POT-Creation-Date: 2014-10-29 16:20+0100\n" "PO-Revision-Date: 2014-06-24 15:12+0800\n" "Last-Translator: 玛格丽特 · 苏 <marguerite@opensuse.org>\n" "Language-Team: Chinese Simplified <opensuse-zh@opensuse.org>\n" @@ -61,9 +61,9 @@ #. Backup #. Now check if there any classes defined in theis pre final control file #: src/clients/autoyast.rb:114 src/clients/ayast_setup.rb:148 -#: src/clients/inst_autoinit.rb:188 src/clients/inst_autosetup.rb:374 -#: src/clients/inst_autosetup_upgrade.rb:423 -#: src/modules/AutoInstallRules.rb:1001 +#: src/clients/inst_autoinit.rb:188 src/clients/inst_autosetup.rb:403 +#: src/clients/inst_autosetup_upgrade.rb:482 +#: src/modules/AutoInstallRules.rb:1006 msgid "" "Error while parsing the control file.\n" "Check the log files for more details or fix the\n" @@ -114,7 +114,7 @@ msgid "enable/disable all package handling" msgstr "启用/禁用全部软件包处理" -#: src/clients/ayast_setup.rb:87 src/clients/clone_system.rb:82 +#: src/clients/ayast_setup.rb:87 src/clients/clone_system.rb:81 msgid "Empty parameter list" msgstr "空参数列表" @@ -125,24 +125,31 @@ msgstr "必须设置 AutoYaST 方案路径。" #. if we get no argument or map of options we are not in command line -#: src/clients/clone_system.rb:47 +#: src/clients/clone_system.rb:46 msgid "Client for creating an AutoYaST profile based on the currently running system" msgstr "基于当前运行中系统创建 AutoYaST 方案的客户端" -#: src/clients/clone_system.rb:57 +#: src/clients/clone_system.rb:56 msgid "known modules: %1" msgstr "已知模块：%1" -#: src/clients/clone_system.rb:64 +#: src/clients/clone_system.rb:63 msgid "comma separated list of modules to clone" msgstr "逗号分隔的待克隆模块列表" -#: src/clients/clone_system.rb:89 +#. TRANSLATORS: Warning that an already existing autoyast configuration file will be overwritten. +#: src/clients/clone_system.rb:94 +#, fuzzy +#| msgid "%1 exists! Really overwrite?" +msgid "File %s exists! Really overwrite?" +msgstr "%1 已存在！ 是否确实要覆盖？" + +#: src/clients/clone_system.rb:98 msgid "Cloning the system..." msgstr "正在克隆系统..." #. TRANSLATORS: %s is path where profile can be found -#: src/clients/clone_system.rb:91 +#: src/clients/clone_system.rb:100 msgid "The resulting autoyast profile can be found in %s." msgstr "生成的 autoyast 方案可在 %s 找到。" @@ -492,64 +499,74 @@ msgid "Create partition plans" msgstr "创建分区计划" -#: src/clients/inst_autosetup.rb:57 src/clients/inst_autosetup_upgrade.rb:54 +#: src/clients/inst_autosetup.rb:57 src/clients/inst_autosetup_upgrade.rb:56 +msgid "Configure Bootloader" +msgstr "配置引导加载器" + +#: src/clients/inst_autosetup.rb:58 src/clients/inst_autosetup_upgrade.rb:54 +msgid "Registration" +msgstr "注册" + +#: src/clients/inst_autosetup.rb:59 src/clients/inst_autosetup_upgrade.rb:55 msgid "Configure Software selections" msgstr "配置软件选集" -#: src/clients/inst_autosetup.rb:58 -msgid "Configure Bootloader" -msgstr "配置引导加载器" - -#: src/clients/inst_autosetup.rb:59 +#: src/clients/inst_autosetup.rb:60 msgid "Configure Systemd Default Target" msgstr "配置 Systemd 默认对象" -#: src/clients/inst_autosetup.rb:63 src/clients/inst_autosetup_upgrade.rb:59 +#: src/clients/inst_autosetup.rb:64 src/clients/inst_autosetup_upgrade.rb:61 msgid "Executing pre-install user scripts..." msgstr "正在执行安装前用户脚本..." -#: src/clients/inst_autosetup.rb:64 src/clients/inst_autosetup_upgrade.rb:58 +#: src/clients/inst_autosetup.rb:65 src/clients/inst_autosetup_upgrade.rb:60 msgid "Configuring general settings..." msgstr "正在配置常规设置..." -#: src/clients/inst_autosetup.rb:65 +#: src/clients/inst_autosetup.rb:66 src/clients/inst_autosetup_upgrade.rb:62 msgid "Setting up language..." msgstr "正在设置语言..." -#: src/clients/inst_autosetup.rb:66 +#: src/clients/inst_autosetup.rb:67 msgid "Creating partition plans..." msgstr "正在创建分区计划..." -#: src/clients/inst_autosetup.rb:67 src/clients/inst_autosetup_upgrade.rb:60 +#: src/clients/inst_autosetup.rb:68 src/clients/inst_autosetup_upgrade.rb:65 +msgid "Configuring Bootloader..." +msgstr "正在配置引导加载器..." + +#: src/clients/inst_autosetup.rb:69 src/clients/inst_autosetup_upgrade.rb:63 +#, fuzzy +#| msgid "Repairing file system..." +msgid "Registering the system..." +msgstr "正在修复文件系统..." + +#: src/clients/inst_autosetup.rb:70 src/clients/inst_autosetup_upgrade.rb:64 msgid "Configuring Software selections..." msgstr "正在配置软件选集..." -#: src/clients/inst_autosetup.rb:68 -msgid "Configuring Bootloader..." -msgstr "正在配置引导加载器..." - -#: src/clients/inst_autosetup.rb:69 +#: src/clients/inst_autosetup.rb:71 msgid "Configuring Systemd Default Target..." msgstr "正在配置 Systemd 默认对象..." -#: src/clients/inst_autosetup.rb:73 src/clients/inst_autosetup_upgrade.rb:64 +#: src/clients/inst_autosetup.rb:75 src/clients/inst_autosetup_upgrade.rb:69 msgid "Preparing System for Automated Installation" msgstr "准备系统以进行自动安装" #. configure general settings -#: src/clients/inst_autosetup.rb:161 +#: src/clients/inst_autosetup.rb:163 msgid "Handling Add-On Products..." msgstr "正在处理附加产品..." #. Set it in the Language module. #. #. Set it in the Language module. -#: src/clients/inst_autosetup.rb:181 src/clients/inst_autosetup_upgrade.rb:144 +#: src/clients/inst_autosetup.rb:183 src/clients/inst_autosetup_upgrade.rb:149 msgid "Configuring language..." msgstr "正在配置语言..." #. Yes, do not set Storage testsuite here as we want really GUI with proposal -#: src/clients/inst_autosetup.rb:267 +#: src/clients/inst_autosetup.rb:272 msgid "" "Error while configuring partitions.\n" "Try again.\n" @@ -558,7 +575,7 @@ "请重试。\n" #. Software -#: src/clients/inst_autosetup.rb:289 +#: src/clients/inst_autosetup.rb:328 msgid "" "Error while configuring software selections.\n" "Try again.\n" @@ -568,67 +585,67 @@ #. ReportingDialog() #. @return sumbol -#: src/clients/report_auto.rb:99 +#: src/clients/report_auto.rb:103 msgid "Messages" msgstr "消息" -#: src/clients/report_auto.rb:105 +#: src/clients/report_auto.rb:109 msgid "Sho&w messages" msgstr "显示消息(&W)" -#: src/clients/report_auto.rb:113 +#: src/clients/report_auto.rb:117 msgid "Lo&g messages" msgstr "记录消息(&G)" -#: src/clients/report_auto.rb:124 +#: src/clients/report_auto.rb:128 msgid "&Time-out (in sec.)" msgstr "超时(以秒为单位)(&T)" -#: src/clients/report_auto.rb:136 +#: src/clients/report_auto.rb:140 msgid "Warnings" msgstr "警告" -#: src/clients/report_auto.rb:142 +#: src/clients/report_auto.rb:146 msgid "Sh&ow warnings" msgstr "显示警告(&O)" -#: src/clients/report_auto.rb:150 +#: src/clients/report_auto.rb:154 msgid "Log wa&rnings" msgstr "记录警告(&R)" -#: src/clients/report_auto.rb:161 +#: src/clients/report_auto.rb:165 msgid "Time-out (in s&ec.)" msgstr "超时(以秒为单位)(&E)" -#: src/clients/report_auto.rb:173 +#: src/clients/report_auto.rb:177 msgid "Errors" msgstr "错误" -#: src/clients/report_auto.rb:179 +#: src/clients/report_auto.rb:183 msgid "Show error&s" msgstr "显示错误(&S)" -#: src/clients/report_auto.rb:187 +#: src/clients/report_auto.rb:191 msgid "&Log errors" msgstr "记录错误(&L)" -#: src/clients/report_auto.rb:198 +#: src/clients/report_auto.rb:202 msgid "Time-o&ut (in sec.)" msgstr "超时(以秒为单位)(&U)" -#: src/clients/report_auto.rb:213 +#: src/clients/report_auto.rb:217 msgid "" "<p>Depending on your experience, you can skip, log, and show (with time-out)\n" "installation messages.</p> \n" msgstr "<p>取决于您的经验，您可以跳过、记录和显示 (允许超时) 安装消息。</p> \n" -#: src/clients/report_auto.rb:219 +#: src/clients/report_auto.rb:223 msgid "" "<p>It is recommended to show all <b>messages</b> with time-out.\n" "Warnings can be skipped in some places, but should not be ignored.</p>\n" msgstr "<p>推荐显示全部<b>消息</b>并允许超时。在某些地方可以跳过警告，但不应忽略它们。</p>\n" -#: src/clients/report_auto.rb:226 +#: src/clients/report_auto.rb:230 msgid "Messages and Logging" msgstr "消息和日志记录" @@ -1004,7 +1021,7 @@ msgstr "新建(&W)" #: src/include/autoinstall/classes.rb:65 -#: src/include/autoinstall/conftree.rb:172 +#: src/include/autoinstall/conftree.rb:175 msgid "&Edit" msgstr "编辑(&E)" @@ -1183,31 +1200,27 @@ msgid "Groups" msgstr "组" -#. Creates the modules selection box displaying modules in the specified group. -#. The specified YaST module is selected. -#. -#. @param [String] group_name YaST group of modules to display. -#. @param [String] selectedModule Module to preselect. -#: src/include/autoinstall/conftree.rb:151 +#. bnc #887115 comment #9: Desktop file is "hidden" and should not be shown at all +#: src/include/autoinstall/conftree.rb:154 msgid "No modules available" msgstr "无可用模块" -#: src/include/autoinstall/conftree.rb:154 +#: src/include/autoinstall/conftree.rb:157 msgid "Modules" msgstr "模块" #. Creates an `HBox containing the buttons to be displayed below the summary column #. #. @return The `HBox widget. -#: src/include/autoinstall/conftree.rb:167 +#: src/include/autoinstall/conftree.rb:170 msgid "&Clone" msgstr "复制(&C)" -#: src/include/autoinstall/conftree.rb:168 +#: src/include/autoinstall/conftree.rb:171 msgid "&Apply to System" msgstr "应用到系统(&A)" -#: src/include/autoinstall/conftree.rb:173 +#: src/include/autoinstall/conftree.rb:176 msgid "Clea&r" msgstr "清除(&R)" @@ -1215,7 +1228,7 @@ #. #. @param [String] module_name The module to summarize. #. @return The `VBox widget. -#: src/include/autoinstall/conftree.rb:192 +#: src/include/autoinstall/conftree.rb:195 msgid "Details" msgstr "细节" @@ -1512,7 +1525,7 @@ #. list<any> l = [ "key1",0,"key3" ]; #. m[ l ] = v; #. @return [Hash] -#: src/include/autoinstall/dialogs.rb:410 src/modules/Profile.rb:791 +#: src/include/autoinstall/dialogs.rb:410 src/modules/Profile.rb:794 msgid "Checking XML with RNG validation..." msgstr "正在进行 RNG 校验以检查 XML..." @@ -1522,7 +1535,7 @@ msgstr "部分 %1：" #. jing validation -- validates complete xml profile -#: src/include/autoinstall/dialogs.rb:459 src/modules/Profile.rb:803 +#: src/include/autoinstall/dialogs.rb:459 src/modules/Profile.rb:806 msgid "Checking XML with RNC validation..." msgstr "正在进行 RNC 校验以检查 XML..." @@ -1561,7 +1574,7 @@ msgstr "第二阶段后重启计算机" #: src/include/autoinstall/general_dialogs.rb:90 -#: src/modules/AutoinstGeneral.rb:118 +#: src/modules/AutoinstGeneral.rb:121 msgid "Signature Handling" msgstr "签名处理" @@ -2195,7 +2208,7 @@ #. Read rules file #. @return [void] -#: src/modules/AutoInstallRules.rb:448 +#: src/modules/AutoInstallRules.rb:453 msgid "Parsing the rules file failed. XML parser reports:\n" msgstr "解析规则文件失败。XML 解析器报告：\n" @@ -2203,12 +2216,12 @@ #. @param [String] result_profile the resulting control file path #. @return [Boolean] true on success #. autoyast has read the autoyast configuration file but something went wrong -#: src/modules/AutoInstallRules.rb:909 src/modules/Profile.rb:722 +#: src/modules/AutoInstallRules.rb:914 src/modules/Profile.rb:725 msgid "The XML parser reported an error while parsing the autoyast profile. The error message is:\n" msgstr "XML 解析器在解析 autoyast 方案时报告了一个错误。错误消息为：\n" #. backdoor for merging problems. -#: src/modules/AutoInstallRules.rb:1054 +#: src/modules/AutoInstallRules.rb:1059 msgid "" "\n" "User-defined classes could not be retrieved. Make sure all classes \n" @@ -2222,45 +2235,45 @@ #. The line above needs to be fixed when we have more attributes #. comment will look like this: "(description=BLA BLA)" -#: src/modules/AutoinstConfig.rb:271 +#: src/modules/AutoinstConfig.rb:273 msgid "Choose Profile" msgstr "选择方案" #. SetProtocolMessage () #. @return [void] -#: src/modules/AutoinstConfig.rb:327 +#: src/modules/AutoinstConfig.rb:329 msgid "Retrieving control file from floppy." msgstr "正在软盘中撷取控制文件。" -#: src/modules/AutoinstConfig.rb:330 +#: src/modules/AutoinstConfig.rb:332 msgid "Retrieving control file (%1) from TFTP server: %2." msgstr "正在从 TFTP 服务器中撷取控制文件(%1)：%2。" -#: src/modules/AutoinstConfig.rb:336 +#: src/modules/AutoinstConfig.rb:338 msgid "Retrieving control file (%1) from NFS server: %2." msgstr "正在从 NFS 服务器中撷取控制文件(%1)：%2。" -#: src/modules/AutoinstConfig.rb:342 +#: src/modules/AutoinstConfig.rb:344 msgid "Retrieving control file (%1) from HTTP server: %2." msgstr "正在从 HTTP 服务器中撷取控制文件(%1)：%2。" -#: src/modules/AutoinstConfig.rb:348 +#: src/modules/AutoinstConfig.rb:350 msgid "Retrieving control file (%1) from FTP server: %2." msgstr "正在从 FTP 服务器中撷取控制文件(%1)：%2。" -#: src/modules/AutoinstConfig.rb:354 +#: src/modules/AutoinstConfig.rb:356 msgid "Copying control file from file: %1." msgstr "正在从文件中复制控制文件：%1。" -#: src/modules/AutoinstConfig.rb:359 +#: src/modules/AutoinstConfig.rb:361 msgid "Copying control file from device: /dev/%1." msgstr "正在从设备中复制控制文件：/dev/%1。" -#: src/modules/AutoinstConfig.rb:363 +#: src/modules/AutoinstConfig.rb:365 msgid "Copying control file from default location." msgstr "正在从默认位置复制控制文件。" -#: src/modules/AutoinstConfig.rb:365 +#: src/modules/AutoinstConfig.rb:367 msgid "Source unknown." msgstr "未知来源。" @@ -2270,7 +2283,7 @@ #. { #. local_rules_file = (string)WFM::Args(1); #. } -#: src/modules/AutoinstConfig.rb:445 +#: src/modules/AutoinstConfig.rb:447 msgid "" "<h3>AutoYaST Configuration Management System</h3>\n" "<p>Almost all resources of the control file can be\n" @@ -2279,7 +2292,7 @@ "<h3>AutoYaST 配置管理系统</h3>\n" "<p>使用配置管理系统几乎可以配置控制文件的全部资源。</p>\n" -#: src/modules/AutoinstConfig.rb:450 +#: src/modules/AutoinstConfig.rb:452 msgid "" "<p>Most of the modules used to create the configuration are identical to those available\n" "through the YaST Control Center. Instead of configuring this system, the data\n" @@ -2292,7 +2305,7 @@ "而该文件可通过 AutoYaST 用于安装另一个系统。\n" "</p>\n" -#: src/modules/AutoinstConfig.rb:457 +#: src/modules/AutoinstConfig.rb:459 msgid "" "<p>In addition to the existing and familiar modules,\n" "new interfaces were created for special and complex configurations, including\n" @@ -2307,12 +2320,12 @@ #. @param [Hash{String => Object}] drive to create node name for #. #. @return the newly created node name -#: src/modules/AutoinstDrive.rb:129 +#: src/modules/AutoinstDrive.rb:128 msgid " - Drive" msgstr " - 驱动器" #. volume group -#: src/modules/AutoinstDrive.rb:133 +#: src/modules/AutoinstDrive.rb:132 msgid " - Volume group" msgstr " - 卷组" @@ -2323,74 +2336,74 @@ #. string language_name = ""; #. string keyboard_name = ""; -#: src/modules/AutoinstGeneral.rb:82 +#: src/modules/AutoinstGeneral.rb:85 msgid "Confirm installation?" msgstr "确认安装吗？" -#: src/modules/AutoinstGeneral.rb:85 src/modules/AutoinstGeneral.rb:91 -#: src/modules/AutoinstGeneral.rb:100 src/modules/AutoinstGeneral.rb:107 -#: src/modules/AutoinstGeneral.rb:114 +#: src/modules/AutoinstGeneral.rb:88 src/modules/AutoinstGeneral.rb:94 +#: src/modules/AutoinstGeneral.rb:103 src/modules/AutoinstGeneral.rb:110 +#: src/modules/AutoinstGeneral.rb:117 msgid "Yes" msgstr "是" -#: src/modules/AutoinstGeneral.rb:85 src/modules/AutoinstGeneral.rb:91 -#: src/modules/AutoinstGeneral.rb:100 +#: src/modules/AutoinstGeneral.rb:88 src/modules/AutoinstGeneral.rb:94 +#: src/modules/AutoinstGeneral.rb:103 msgid "No" msgstr "否" -#: src/modules/AutoinstGeneral.rb:88 +#: src/modules/AutoinstGeneral.rb:91 msgid "Second Stage of AutoYaST" msgstr "AutoYaST 第二阶段" -#: src/modules/AutoinstGeneral.rb:96 +#: src/modules/AutoinstGeneral.rb:99 msgid "Halting the machine after stage one" msgstr "第一阶段后挂起计算机" -#: src/modules/AutoinstGeneral.rb:105 +#: src/modules/AutoinstGeneral.rb:108 msgid "Halting the machine after stage two" msgstr "第二阶段后挂起计算机" -#: src/modules/AutoinstGeneral.rb:112 +#: src/modules/AutoinstGeneral.rb:115 msgid "Reboot the machine after stage two" msgstr "第二阶段后重启计算机" -#: src/modules/AutoinstGeneral.rb:122 +#: src/modules/AutoinstGeneral.rb:125 msgid "Accepting unsigned files" msgstr "接受未签名文件" -#: src/modules/AutoinstGeneral.rb:123 +#: src/modules/AutoinstGeneral.rb:126 msgid "Not accepting unsigned files" msgstr "不接受未签名文件" -#: src/modules/AutoinstGeneral.rb:132 +#: src/modules/AutoinstGeneral.rb:135 msgid "Accepting files without a checksum" msgstr "接受没有校验和的文件" -#: src/modules/AutoinstGeneral.rb:133 +#: src/modules/AutoinstGeneral.rb:136 msgid "Not accepting files without a checksum" msgstr "不接受没有校验和的文件" -#: src/modules/AutoinstGeneral.rb:142 +#: src/modules/AutoinstGeneral.rb:145 msgid "Accepting failed verifications" msgstr "接受失败的验证" -#: src/modules/AutoinstGeneral.rb:143 +#: src/modules/AutoinstGeneral.rb:146 msgid "Not accepting failed verifications" msgstr "不接受失败的验证" -#: src/modules/AutoinstGeneral.rb:148 +#: src/modules/AutoinstGeneral.rb:151 msgid "Accepting unknown GPG keys" msgstr "接受未知 GPG 密钥" -#: src/modules/AutoinstGeneral.rb:149 +#: src/modules/AutoinstGeneral.rb:152 msgid "Not accepting unknown GPG Keys" msgstr "不接受未知 GPG 密钥" -#: src/modules/AutoinstGeneral.rb:154 +#: src/modules/AutoinstGeneral.rb:157 msgid "Importing new GPG keys" msgstr "导入新 GPG 密钥" -#: src/modules/AutoinstGeneral.rb:155 +#: src/modules/AutoinstGeneral.rb:158 msgid "Not importing new GPG Keys" msgstr "不导入新 GPG 密钥" @@ -2411,11 +2424,11 @@ #. @return [String] configuration summary dialog #. return Summary of configuration #. @return [String] configuration summary dialog -#: src/modules/AutoinstPartPlan.rb:681 src/modules/AutoinstStorage.rb:912 +#: src/modules/AutoinstPartPlan.rb:682 src/modules/AutoinstStorage.rb:912 msgid "Drives" msgstr "驱动器" -#: src/modules/AutoinstPartPlan.rb:685 src/modules/AutoinstStorage.rb:916 +#: src/modules/AutoinstPartPlan.rb:686 src/modules/AutoinstStorage.rb:916 msgid "Total of %1 drive" msgstr "%1 驱动器总计" @@ -2479,31 +2492,31 @@ #. 4 means "already exists" #. Add add-ons -#: src/modules/AutoinstSoftware.rb:312 src/modules/AutoinstSoftware.rb:332 +#: src/modules/AutoinstSoftware.rb:315 src/modules/AutoinstSoftware.rb:335 msgid "Adding repo %1 failed" msgstr "添加软件源 %1 失败" #. Install -#: src/modules/AutoinstSoftware.rb:360 +#: src/modules/AutoinstSoftware.rb:363 msgid "Image creation failed while pattern installation. Please check /tmp/ay_image.log" msgstr "映像创建失败于软件集安装环节。请检查 /tmp/ay_image.log" -#: src/modules/AutoinstSoftware.rb:368 +#: src/modules/AutoinstSoftware.rb:371 msgid "Creating Image - installing packages" msgstr "正在创建映像 - 安装软件包" -#: src/modules/AutoinstSoftware.rb:378 +#: src/modules/AutoinstSoftware.rb:381 msgid "Image creation failed while package installation. Please check /tmp/ay_image.log" msgstr "映像创建失败于软件包安装环节。请检查 /tmp/ay_image.log" #. Popup::Message( _("in the next file dialog you have to choose the target directory to save the image") ); -#: src/modules/AutoinstSoftware.rb:389 +#: src/modules/AutoinstSoftware.rb:392 msgid "Store image to ..." msgstr "存储映像到..." #. Compress image: #. tar cfz /srv/www/htdocs/image.tar.gz --exclude="proc*" . -#: src/modules/AutoinstSoftware.rb:418 +#: src/modules/AutoinstSoftware.rb:421 msgid "" "You can do changes to the image now in %1/\n" "If you press the ok-button, the image will be compressed and can't be changed anymore." @@ -2511,16 +2524,16 @@ "您现在可以在 %1/ 修改映像。\n" "您若按下确认按钮，%1/ 将被压缩成映像，便再也不能修改了。" -#: src/modules/AutoinstSoftware.rb:432 +#: src/modules/AutoinstSoftware.rb:435 msgid "Image compressing failed in '%1'. Please check /tmp/ay_image.log" msgstr "映像压缩失败于 '%1'。请检查 /tmp/ay_image.log" -#: src/modules/AutoinstSoftware.rb:439 +#: src/modules/AutoinstSoftware.rb:442 msgid "Image created successfully" msgstr "已成功创建映像" #. copy a directory (ends with / in directory.yast) -#: src/modules/AutoinstSoftware.rb:475 +#: src/modules/AutoinstSoftware.rb:478 msgid "" "can not get the directory.yast file at `%1`.\n" "You can create that file with 'ls -F > directory.yast' if it's missing." @@ -2529,30 +2542,30 @@ "若缺失了它，您可以通过 'ls -F > directory.yast' 命令创建该文件。" #. don't copy subdirs. They have to be mentioned explicit. Copy only files from that dir. -#: src/modules/AutoinstSoftware.rb:509 +#: src/modules/AutoinstSoftware.rb:512 msgid "can not read '%1'. Try again?" msgstr "无法读取 '%1'。重试吗？" #. copy a file -#: src/modules/AutoinstSoftware.rb:527 +#: src/modules/AutoinstSoftware.rb:530 msgid "can not read '%1'. ISO creation failed" msgstr "无法读取 '%1'。创建 ISO 失败" #. we will have the image.tar.gz and autoinst.xml on the root of the DVD/CD -#: src/modules/AutoinstSoftware.rb:557 +#: src/modules/AutoinstSoftware.rb:560 msgid "Preparing ISO Filestructure ..." msgstr "正在准备 ISO 文件结构..." #. prepare and save isolinux.cfg boot menu of the media -#: src/modules/AutoinstSoftware.rb:606 +#: src/modules/AutoinstSoftware.rb:609 msgid "boot config for the DVD" msgstr "DVD 引导配置" -#: src/modules/AutoinstSoftware.rb:610 +#: src/modules/AutoinstSoftware.rb:613 msgid "Ok" msgstr "好呢" -#: src/modules/AutoinstSoftware.rb:613 +#: src/modules/AutoinstSoftware.rb:616 msgid "" "You can do changes to the ISO now in %1, like adding a complete different AutoYaST XML file.\n" "If you press the ok-button, the iso will be created." @@ -2562,43 +2575,43 @@ #. create the actual ISO file #. Popup::Message( _("Please choose a place where you want to save the ISO file in the next dialog") ); -#: src/modules/AutoinstSoftware.rb:632 +#: src/modules/AutoinstSoftware.rb:635 msgid "Store ISO image to ..." msgstr "存储 ISO 映像到..." -#: src/modules/AutoinstSoftware.rb:633 +#: src/modules/AutoinstSoftware.rb:636 msgid "Creating ISO File ..." msgstr "正在创建 ISO 文件..." -#: src/modules/AutoinstSoftware.rb:654 +#: src/modules/AutoinstSoftware.rb:657 msgid "ISO successfully created at %1" msgstr "ISO 成功创建于 %1" #. Summary #. @return Html formatted configuration summary -#: src/modules/AutoinstSoftware.rb:730 +#: src/modules/AutoinstSoftware.rb:733 msgid "Selected Patterns" msgstr "所选软件集" -#: src/modules/AutoinstSoftware.rb:740 +#: src/modules/AutoinstSoftware.rb:743 msgid "Individually Selected Packages" msgstr "单选的软件包" -#: src/modules/AutoinstSoftware.rb:746 +#: src/modules/AutoinstSoftware.rb:749 msgid "Packages to Remove" msgstr "待移除软件包" -#: src/modules/AutoinstSoftware.rb:753 +#: src/modules/AutoinstSoftware.rb:756 msgid "Force Kernel Package" msgstr "强制内核软件包" #. set SoftLock to avoid the installation of recommended patterns (#159466) -#: src/modules/AutoinstSoftware.rb:843 +#: src/modules/AutoinstSoftware.rb:846 msgid "Could not set patterns: %1." msgstr "无法设置软件集：%1。" #. Solve dependencies -#: src/modules/AutoinstSoftware.rb:903 +#: src/modules/AutoinstSoftware.rb:907 msgid "The package resolver run failed. Please check your software section in the autoyast profile." msgstr "软件包依赖关系解决器运行失败。请检查 autoyast 方案中的软件部分。" @@ -2644,7 +2657,7 @@ #. Save YCP data into XML #. @param path to file #. @return [Boolean] true on success -#: src/modules/Profile.rb:438 +#: src/modules/Profile.rb:441 msgid "Encrypted AutoYaST profile. Enter the password twice." msgstr "加密的 AutoYaST 方案。请输入两次密码。" @@ -2652,14 +2665,14 @@ #. #. @param [String] dir - directory to store section xml files in #. @return - list of filenames -#: src/modules/Profile.rb:512 +#: src/modules/Profile.rb:515 msgid "Could not write section %1 to file %2." msgstr "无法将部分 %1 写入到文件 %2。" #. Read XML into YCP data #. @param path to file #. @return [Boolean] -#: src/modules/Profile.rb:679 src/modules/ProfileLocation.rb:190 +#: src/modules/Profile.rb:682 src/modules/ProfileLocation.rb:190 msgid "Encrypted AutoYaST profile. Enter the correct password." msgstr "加密的 AutoYaST 方案。请输入正确的密码。" Modified: trunk/yast/zh_CN/po/base.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/base.zh_CN.po 2014-10-29 15:59:29 UTC (rev 90431) +++ trunk/yast/zh_CN/po/base.zh_CN.po 2014-10-29 16:00:17 UTC (rev 90432) @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: Base\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-07 13:28+0200\n" +"POT-Creation-Date: 2014-10-29 16:22+0100\n" "PO-Revision-Date: 2014-08-09 14:03+0800\n" "Last-Translator: 玛格丽特 · 苏 <marguerite@opensuse.org>\n" "Language-Team: Chinese Simplified <opensuse-zh@opensuse.org>\n" @@ -1266,7 +1266,7 @@ #. this media (CD) so no packages from this media will be installed #. PushButton label #: library/general/src/modules/Label.rb:250 -#: library/packages/src/modules/PackageCallbacks.rb:887 +#: library/packages/src/modules/PackageCallbacks.rb:889 #: library/wizard/src/modules/Confirm.rb:127 msgid "&Skip" msgstr "跳过(&S)" @@ -1289,7 +1289,7 @@ #. TextEntry Label #. textentry label #: library/general/src/modules/Label.rb:319 -#: library/packages/src/modules/PackageCallbacks.rb:2562 +#: library/packages/src/modules/PackageCallbacks.rb:2581 msgid "&Password" msgstr "密码(&P)" @@ -2607,37 +2607,37 @@ "不允许使用空格。\n" #. TRANSLATORS: Firewall zone name - used in combo box or dialog title -#: library/network/src/modules/SuSEFirewall.rb:109 +#: library/network/src/modules/SuSEFirewall.rb:114 msgid "External Zone" msgstr "外部区域" #. TRANSLATORS: Firewall zone name - used in combo box or dialog title -#: library/network/src/modules/SuSEFirewall.rb:113 +#: library/network/src/modules/SuSEFirewall.rb:118 msgid "Internal Zone" msgstr "内部区域" #. TRANSLATORS: Firewall zone name - used in combo box or dialog title -#: library/network/src/modules/SuSEFirewall.rb:117 +#: library/network/src/modules/SuSEFirewall.rb:122 msgid "Demilitarized Zone" msgstr "隔离区域" #. protocol name -#: library/network/src/modules/SuSEFirewall.rb:238 +#: library/network/src/modules/SuSEFirewall.rb:243 msgid "TCP" msgstr "TCP" #. protocol name -#: library/network/src/modules/SuSEFirewall.rb:240 +#: library/network/src/modules/SuSEFirewall.rb:245 msgid "UDP" msgstr "UDP" #. protocol name -#: library/network/src/modules/SuSEFirewall.rb:242 +#: library/network/src/modules/SuSEFirewall.rb:247 msgid "RPC" msgstr "RPC" #. protocol name -#: library/network/src/modules/SuSEFirewall.rb:244 +#: library/network/src/modules/SuSEFirewall.rb:249 msgid "IP" msgstr "IP" @@ -2673,82 +2673,72 @@ "请运行 YaST2 防火墙并指派它。\n" #. TRANSLATORS: Dialog caption -#: library/network/src/modules/SuSEFirewall.rb:2486 +#: library/network/src/modules/SuSEFirewall.rb:2478 msgid "Initializing Firewall Configuration" msgstr "初始化防火墙配置" #. TRANSLATORS: Progress step -#: library/network/src/modules/SuSEFirewall.rb:2494 +#: library/network/src/modules/SuSEFirewall.rb:2486 msgid "Check for network devices" msgstr "检查网络设备" #. TRANSLATORS: Progress step -#: library/network/src/modules/SuSEFirewall.rb:2496 +#: library/network/src/modules/SuSEFirewall.rb:2488 msgid "Read current configuration" msgstr "读取当前配置" #. TRANSLATORS: Progress step -#: library/network/src/modules/SuSEFirewall.rb:2498 +#: library/network/src/modules/SuSEFirewall.rb:2490 msgid "Check possibly conflicting services" msgstr "检查可能冲突的服务" #. TRANSLATORS: Progress step -#: library/network/src/modules/SuSEFirewall.rb:2500 -msgid "Read dynamic definitions of installed services" -msgstr "读取已安装服务的动态定义" - -#. TRANSLATORS: Progress step -#: library/network/src/modules/SuSEFirewall.rb:2504 +#: library/network/src/modules/SuSEFirewall.rb:2494 msgid "Checking for network devices..." msgstr "正在检查网络设备..." #. TRANSLATORS: Progress step -#: library/network/src/modules/SuSEFirewall.rb:2506 +#: library/network/src/modules/SuSEFirewall.rb:2496 msgid "Reading current configuration..." msgstr "正在读取当前配置..." #. TRANSLATORS: Progress step -#: library/network/src/modules/SuSEFirewall.rb:2508 +#: library/network/src/modules/SuSEFirewall.rb:2498 msgid "Checking possibly conflicting services..." msgstr "正在检查可能冲突的服务..." -#. TRANSLATORS: Progress step -#: library/network/src/modules/SuSEFirewall.rb:2510 -msgid "Reading dynamic definitions of installed services..." -msgstr "正在读取已安装服务的动态定义..." - #. TRANSLATORS: Dialog caption -#: library/network/src/modules/SuSEFirewall.rb:2671 +#: library/network/src/modules/SuSEFirewall.rb:2655 msgid "Writing Firewall Configuration" msgstr "写入防火墙配置" #. TRANSLATORS: Progress step -#: library/network/src/modules/SuSEFirewall.rb:2679 +#: library/network/src/modules/SuSEFirewall.rb:2663 msgid "Write firewall settings" msgstr "写入防火墙设置" #. TRANSLATORS: Progress step -#: library/network/src/modules/SuSEFirewall.rb:2681 +#: library/network/src/modules/SuSEFirewall.rb:2665 msgid "Adjust firewall service" msgstr "调整防火墙服务" #. TRANSLATORS: Progress step -#: library/network/src/modules/SuSEFirewall.rb:2685 +#: library/network/src/modules/SuSEFirewall.rb:2669 msgid "Writing firewall settings..." msgstr "正在写入防火墙设置..." #. TRANSLATORS: Progress step -#: library/network/src/modules/SuSEFirewall.rb:2687 +#: library/network/src/modules/SuSEFirewall.rb:2671 msgid "Adjusting firewall service..." msgstr "正在调整防火墙服务..." #. TRANSLATORS: a popup error message -#: library/network/src/modules/SuSEFirewall.rb:2706 +#: library/network/src/modules/SuSEFirewall.rb:2690 msgid "Writing settings failed" msgstr "写入设置失败" #. table item, %1 stands for the buggy protocol name -#: library/network/src/modules/SuSEFirewall.rb:3504 +#: library/network/src/modules/SuSEFirewall.rb:3488 msgid "Unknown protocol (%1)" msgstr "未知协议 (%1)" @@ -2871,18 +2861,18 @@ #. "broadcast_ports" : [ ], #. ] #. ); -#: library/network/src/modules/SuSEFirewallServices.rb:345 -#: library/network/src/modules/SuSEFirewallServices.rb:617 +#: library/network/src/modules/SuSEFirewallServices.rb:355 +#: library/network/src/modules/SuSEFirewallServices.rb:638 msgid "Service with name '%{service_name}' does not exist" msgstr "名为 '%{service_name}' 的服务不存在" #. Fallback for presented service -#: library/network/src/modules/SuSEFirewallServices.rb:420 +#: library/network/src/modules/SuSEFirewallServices.rb:431 msgid "Service: %{filename}" msgstr "服务：%{filename}" #. TRANSLATORS: Name of unknown service. %1 is a requested service id like nis-server -#: library/network/src/modules/SuSEFirewallServices.rb:483 +#: library/network/src/modules/SuSEFirewallServices.rb:504 msgid "Unknown service '%1'" msgstr "未知服务 '%1'" @@ -2907,51 +2897,51 @@ msgstr "卸载(&U)" #. popup heading -#: library/packages/src/modules/PackageCallbacks.rb:205 -#: library/packages/src/modules/PackageCallbacks.rb:1725 +#: library/packages/src/modules/PackageCallbacks.rb:207 +#: library/packages/src/modules/PackageCallbacks.rb:1727 msgid "Package: " msgstr "软件包：" -#: library/packages/src/modules/PackageCallbacks.rb:206 +#: library/packages/src/modules/PackageCallbacks.rb:208 msgid "Size: " msgstr "大小：" -#: library/packages/src/modules/PackageCallbacks.rb:229 +#: library/packages/src/modules/PackageCallbacks.rb:231 msgid "Remaining time to automatic retry: %1" msgstr "自动重试前剩余时间：%1" #. at start of file providal -#: library/packages/src/modules/PackageCallbacks.rb:242 -#: library/packages/src/modules/PackageCallbacks.rb:250 +#: library/packages/src/modules/PackageCallbacks.rb:244 +#: library/packages/src/modules/PackageCallbacks.rb:252 msgid "Downloading package %1 (%2)..." msgstr "正在下载软件包 %1 (%2)..." #. popup heading -#: library/packages/src/modules/PackageCallbacks.rb:254 +#: library/packages/src/modules/PackageCallbacks.rb:256 msgid "Downloading Package" msgstr "正在下载软件包" #. check box -#: library/packages/src/modules/PackageCallbacks.rb:312 +#: library/packages/src/modules/PackageCallbacks.rb:314 msgid "Show &details" msgstr "显示细节(&D)" #. error message, %1 is a package name -#: library/packages/src/modules/PackageCallbacks.rb:378 +#: library/packages/src/modules/PackageCallbacks.rb:380 msgid "Package %1 is broken, integrity check has failed." msgstr "软件包 %1 已损坏，完整性检查失败。" #. command line mode - ask user whether installation of the failed package should be retried #. command line mode - ask user whether installation of the failed package should be retried -#: library/packages/src/modules/PackageCallbacks.rb:391 -#: library/packages/src/modules/PackageCallbacks.rb:608 +#: library/packages/src/modules/PackageCallbacks.rb:393 +#: library/packages/src/modules/PackageCallbacks.rb:610 msgid "Retry installation of the package?" msgstr "重试安装该软件包吗？" #. command line mode - ask user whether the installation should be aborted #. command line mode - ask user whether the installation should be aborted -#: library/packages/src/modules/PackageCallbacks.rb:399 -#: library/packages/src/modules/PackageCallbacks.rb:616 +#: library/packages/src/modules/PackageCallbacks.rb:401 +#: library/packages/src/modules/PackageCallbacks.rb:618 msgid "Abort the installation?" msgstr "中止安装吗？" @@ -2960,15 +2950,15 @@ #. detail string is appended to the end #. error message, %1 is code of the error, #. detail string is appended to the end -#: library/packages/src/modules/PackageCallbacks.rb:427 -#: library/packages/src/modules/PackageCallbacks.rb:461 -#: library/packages/src/modules/PackageCallbacks.rb:2491 +#: library/packages/src/modules/PackageCallbacks.rb:429 +#: library/packages/src/modules/PackageCallbacks.rb:463 +#: library/packages/src/modules/PackageCallbacks.rb:2493 msgid "Error: %1:" msgstr "错误：%1：" #. TODO: add "Don't show again" checkbox #. a warning popup displayed after pressing [Ignore] after a download error -#: library/packages/src/modules/PackageCallbacks.rb:484 +#: library/packages/src/modules/PackageCallbacks.rb:486 msgid "" "Ignoring a download failure may result in a broken system.\n" "Verify the system later by running the Software Management module.\n" @@ -2977,35 +2967,35 @@ "请稍后运行软件管理模块校验系统。\n" #. At start of package install. -#: library/packages/src/modules/PackageCallbacks.rb:524 +#: library/packages/src/modules/PackageCallbacks.rb:526 msgid "Uninstalling package %1 (%2)..." msgstr "正在卸载软件包 %1 (%2)..." -#: library/packages/src/modules/PackageCallbacks.rb:525 +#: library/packages/src/modules/PackageCallbacks.rb:527 msgid "Installing package %1 (%2)..." msgstr "正在安装软件包 %1 (%2)..." -#: library/packages/src/modules/PackageCallbacks.rb:532 +#: library/packages/src/modules/PackageCallbacks.rb:534 msgid "Uninstalling Package" msgstr "正在卸载软件包" -#: library/packages/src/modules/PackageCallbacks.rb:532 +#: library/packages/src/modules/PackageCallbacks.rb:534 msgid "Installing Package" msgstr "正在安装软件包" #. error popup during package installation, %1 is the name of the package -#: library/packages/src/modules/PackageCallbacks.rb:593 +#: library/packages/src/modules/PackageCallbacks.rb:595 msgid "Removal of package %1 failed." msgstr "软件包 %1 移除失败。" #. error popup during package installation, %1 is the name of the package -#: library/packages/src/modules/PackageCallbacks.rb:595 +#: library/packages/src/modules/PackageCallbacks.rb:597 msgid "Installation of package %1 failed." msgstr "软件包 %1 安装失败。" #. TODO: add "Don't show again" checkbox #. a warning popup displayed after pressing [Ignore] after a package installation error -#: library/packages/src/modules/PackageCallbacks.rb:667 +#: library/packages/src/modules/PackageCallbacks.rb:669 msgid "" "Ignoring a package failure may result in a broken system.\n" "The system should be later verified by running the Software Management module." @@ -3014,7 +3004,7 @@ "稍后应运行软件管理模块校验系统。" #. error report -#: library/packages/src/modules/PackageCallbacks.rb:790 +#: library/packages/src/modules/PackageCallbacks.rb:792 msgid "" "<p>The repository at the specified URL now provides a different media ID.\n" "If the URL is correct, this indicates that the repository content has changed. To \n" @@ -3029,27 +3019,27 @@ #. media is double sided, we want the user to insert the 'Side A' of the media #. the complete string will be "<product> <media> <number>, <side>" #. e.g. "'SuSE Linux 9.0' DVD 1, Side A" -#: library/packages/src/modules/PackageCallbacks.rb:805 +#: library/packages/src/modules/PackageCallbacks.rb:807 msgid "Side A" msgstr "A 面" #. media is double sided, we want the user to insert the 'Side B' of the media -#: library/packages/src/modules/PackageCallbacks.rb:808 +#: library/packages/src/modules/PackageCallbacks.rb:810 msgid "Side B" msgstr "B 面" #. label for a repository - %1 product name (e.g. openSUSE 10.2), %2 medium number (e.g. 2) -#: library/packages/src/modules/PackageCallbacks.rb:822 +#: library/packages/src/modules/PackageCallbacks.rb:824 msgid "%1 (Disc %2)" msgstr "%1 (光盘 %2)" #. label for a repository - %1 product name (e.g. openSUSE 10.2), %2 medium number (e.g. 2) -#: library/packages/src/modules/PackageCallbacks.rb:824 +#: library/packages/src/modules/PackageCallbacks.rb:826 msgid "%1 (Medium %2)" msgstr "%1 (介质 %2)" #. prompt to insert product (%1 == "SuSE Linux version 9.2 CD 2") -#: library/packages/src/modules/PackageCallbacks.rb:829 +#: library/packages/src/modules/PackageCallbacks.rb:831 msgid "" "Insert\n" "'%1'" @@ -3058,7 +3048,7 @@ "'%1'" #. report error while accessing local directory with product (%1 = URL, %2 = "SuSE Linux ...") -#: library/packages/src/modules/PackageCallbacks.rb:834 +#: library/packages/src/modules/PackageCallbacks.rb:836 msgid "" "Cannot access installation media\n" "%1\n" @@ -3071,7 +3061,7 @@ "请检查能否访问文件夹。" #. report error while accessing network media of product (%1 = URL, %2 = "SuSE Linux ...") -#: library/packages/src/modules/PackageCallbacks.rb:846 +#: library/packages/src/modules/PackageCallbacks.rb:848 msgid "" "Cannot access installation media \n" "%1\n" @@ -3084,89 +3074,89 @@ "请检查能否访问服务器。" #. currently unused -#: library/packages/src/modules/PackageCallbacks.rb:858 +#: library/packages/src/modules/PackageCallbacks.rb:860 msgid "The correct repository medium could not be mounted." msgstr "无法挂载正确的软件源介质。" #. wrong media id, offer "Ignore" #. push button label -#: library/packages/src/modules/PackageCallbacks.rb:879 -#: library/packages/src/modules/PackageCallbacks.rb:2168 +#: library/packages/src/modules/PackageCallbacks.rb:881 +#: library/packages/src/modules/PackageCallbacks.rb:2170 msgid "Skip Autorefresh" msgstr "跳过自动刷新" #. menu button label - used for more then one device #. push button label - in the media change popup, user can eject the CD/DVD -#: library/packages/src/modules/PackageCallbacks.rb:902 -#: library/packages/src/modules/PackageCallbacks.rb:907 +#: library/packages/src/modules/PackageCallbacks.rb:904 +#: library/packages/src/modules/PackageCallbacks.rb:909 msgid "&Eject" msgstr "弹出(&E)" -#: library/packages/src/modules/PackageCallbacks.rb:919 +#: library/packages/src/modules/PackageCallbacks.rb:921 msgid "A&utomatically Eject CD or DVD Medium" msgstr "自动弹出 CD 或 DVD 介质(&U)" #. command line mode - ask user whether installation of the failed package should be retried -#: library/packages/src/modules/PackageCallbacks.rb:987 +#: library/packages/src/modules/PackageCallbacks.rb:989 msgid "Retry the installation?" msgstr "重试安装吗？" #. command line mode - ask user whether the installation should be aborted -#: library/packages/src/modules/PackageCallbacks.rb:995 +#: library/packages/src/modules/PackageCallbacks.rb:997 msgid "Skip the medium?" msgstr "跳过介质吗？" #. otherwise ignore the medium -#: library/packages/src/modules/PackageCallbacks.rb:1002 +#: library/packages/src/modules/PackageCallbacks.rb:1004 msgid "Ignoring the bad medium..." msgstr "正在忽略损坏的介质..." #. TextEntry label #. TextEntry label -#: library/packages/src/modules/PackageCallbacks.rb:1023 -#: library/packages/src/modules/PackageCallbacks.rb:1084 +#: library/packages/src/modules/PackageCallbacks.rb:1025 +#: library/packages/src/modules/PackageCallbacks.rb:1086 msgid "&URL" msgstr "&URL" #. popup label (%1 is repository URL) -#: library/packages/src/modules/PackageCallbacks.rb:1331 +#: library/packages/src/modules/PackageCallbacks.rb:1333 msgid "Creating Repository %1" msgstr "正在创建软件源 %1" #. error message - a label followed by a richtext with details -#: library/packages/src/modules/PackageCallbacks.rb:1364 +#: library/packages/src/modules/PackageCallbacks.rb:1366 msgid "An error occurred while creating the repository." msgstr "创建软件源时出错。" #. error message - a label followed by a richtext with details #. error message - a label followed by a richtext with details #. error message - a label followed by a richtext with details -#: library/packages/src/modules/PackageCallbacks.rb:1368 -#: library/packages/src/modules/PackageCallbacks.rb:1499 -#: library/packages/src/modules/PackageCallbacks.rb:1611 +#: library/packages/src/modules/PackageCallbacks.rb:1370 +#: library/packages/src/modules/PackageCallbacks.rb:1501 +#: library/packages/src/modules/PackageCallbacks.rb:1613 msgid "Unable to retrieve the remote repository description." msgstr "不能撷取远程软件源描述。" #. error message - a label followed by a richtext with details #. error message - a label followed by a richtext with details #. error message - a label followed by a richtext with details -#: library/packages/src/modules/PackageCallbacks.rb:1371 -#: library/packages/src/modules/PackageCallbacks.rb:1502 -#: library/packages/src/modules/PackageCallbacks.rb:1614 +#: library/packages/src/modules/PackageCallbacks.rb:1373 +#: library/packages/src/modules/PackageCallbacks.rb:1504 +#: library/packages/src/modules/PackageCallbacks.rb:1616 msgid "An error occurred while retrieving the new metadata." msgstr "撷取新的元数据时出错。" #. error message - a label followed by a richtext with details #. error message - a label followed by a richtext with details #. error message - a label followed by a richtext with details -#: library/packages/src/modules/PackageCallbacks.rb:1374 -#: library/packages/src/modules/PackageCallbacks.rb:1505 -#: library/packages/src/modules/PackageCallbacks.rb:1617 +#: library/packages/src/modules/PackageCallbacks.rb:1376 +#: library/packages/src/modules/PackageCallbacks.rb:1507 +#: library/packages/src/modules/PackageCallbacks.rb:1619 msgid "The repository is not valid." msgstr "该软件源无效。" #. error message - a label followed by a richtext with details -#: library/packages/src/modules/PackageCallbacks.rb:1377 +#: library/packages/src/modules/PackageCallbacks.rb:1379 msgid "The repository metadata is invalid." msgstr "软件源元数据无效。" @@ -3174,96 +3164,96 @@ #. command line mode - ask user whether the repository refreshment should be retried #. command line mode - ask user whether the repository refreshment should be retried #. command line mode - ask user whether target initializatin can be restarted -#: library/packages/src/modules/PackageCallbacks.rb:1390 -#: library/packages/src/modules/PackageCallbacks.rb:1524 -#: library/packages/src/modules/PackageCallbacks.rb:1630 -#: library/packages/src/modules/PackageCallbacks.rb:2445 +#: library/packages/src/modules/PackageCallbacks.rb:1392 +#: library/packages/src/modules/PackageCallbacks.rb:1526 +#: library/packages/src/modules/PackageCallbacks.rb:1632 +#: library/packages/src/modules/PackageCallbacks.rb:2447 msgid "Retry?" msgstr "重试吗？" #. popup label (%1 is repository URL) -#: library/packages/src/modules/PackageCallbacks.rb:1438 -#: library/packages/src/modules/PackageCallbacks.rb:1446 +#: library/packages/src/modules/PackageCallbacks.rb:1440 +#: library/packages/src/modules/PackageCallbacks.rb:1448 msgid "Probing Repository %1" msgstr "正在检测软件源 %1" #. error message - a label followed by a richtext with details -#: library/packages/src/modules/PackageCallbacks.rb:1495 +#: library/packages/src/modules/PackageCallbacks.rb:1497 msgid "Error occurred while probing the repository." msgstr "检测软件源时出错。" #. error message - a label followed by a richtext with details -#: library/packages/src/modules/PackageCallbacks.rb:1508 +#: library/packages/src/modules/PackageCallbacks.rb:1510 msgid "Repository probing details." msgstr "检测到的软件源细节。" #. error message - a label followed by a richtext with details -#: library/packages/src/modules/PackageCallbacks.rb:1511 +#: library/packages/src/modules/PackageCallbacks.rb:1513 msgid "Repository metadata is invalid." msgstr "软件源元数据无效。" #. error message - a label followed by a richtext with details -#: library/packages/src/modules/PackageCallbacks.rb:1607 +#: library/packages/src/modules/PackageCallbacks.rb:1609 msgid "Repository %1" msgstr "软件源 %1" #. at start of delta providal -#: library/packages/src/modules/PackageCallbacks.rb:1695 +#: library/packages/src/modules/PackageCallbacks.rb:1697 msgid "Downloading delta RPM package %1 (%2)..." msgstr "正在下载增量 RPM 包 %1 (%2)..." #. popup heading -#: library/packages/src/modules/PackageCallbacks.rb:1703 +#: library/packages/src/modules/PackageCallbacks.rb:1705 msgid "Downloading Delta RPM package" msgstr "正在下载增量 RPM 包" #. at start of delta application -#: library/packages/src/modules/PackageCallbacks.rb:1716 +#: library/packages/src/modules/PackageCallbacks.rb:1718 msgid "Applying delta RPM package %1..." msgstr "正在应用增量 RPM 包 %1..." #. popup heading -#: library/packages/src/modules/PackageCallbacks.rb:1723 +#: library/packages/src/modules/PackageCallbacks.rb:1725 msgid "Applying delta RPM package" msgstr "正在应用增量 RPM 包" #. at start of patch providal -#: library/packages/src/modules/PackageCallbacks.rb:1744 +#: library/packages/src/modules/PackageCallbacks.rb:1746 msgid "Downloading patch RPM package %1 (%2)..." msgstr "正在下载补丁 RPM 包 %1 (%2)..." #. popup heading -#: library/packages/src/modules/PackageCallbacks.rb:1752 +#: library/packages/src/modules/PackageCallbacks.rb:1754 msgid "Downloading Patch RPM Package" msgstr "正在下载补丁 RPM 包" #. close popup -#: library/packages/src/modules/PackageCallbacks.rb:1822 +#: library/packages/src/modules/PackageCallbacks.rb:1824 msgid "Starting script %1 (patch %2)..." msgstr "正在启动脚本 %1 (补丁 %2)..." #. popup heading -#: library/packages/src/modules/PackageCallbacks.rb:1831 +#: library/packages/src/modules/PackageCallbacks.rb:1833 msgid "Running Script" msgstr "正在运行脚本" #. label, patch name follows -#: library/packages/src/modules/PackageCallbacks.rb:1836 +#: library/packages/src/modules/PackageCallbacks.rb:1838 msgid "Patch: " msgstr "补丁：" #. label, script name follows -#: library/packages/src/modules/PackageCallbacks.rb:1843 +#: library/packages/src/modules/PackageCallbacks.rb:1845 msgid "Script: " msgstr "脚本：" #. label -#: library/packages/src/modules/PackageCallbacks.rb:1849 +#: library/packages/src/modules/PackageCallbacks.rb:1851 msgid "Output of the Script" msgstr "脚本输出" #. label, %1 is patch name with version and architecture -#: library/packages/src/modules/PackageCallbacks.rb:1937 +#: library/packages/src/modules/PackageCallbacks.rb:1939 msgid "" "Patch: %1\n" "\n" @@ -3272,7 +3262,7 @@ "\n" #. a popup question with "Continue", "Skip" and "Abort" buttons -#: library/packages/src/modules/PackageCallbacks.rb:1954 +#: library/packages/src/modules/PackageCallbacks.rb:1956 msgid "" "The repositories are being refreshed.\n" "Continue with refreshing?\n" @@ -3286,44 +3276,44 @@ "注意：若跳过刷新，某些软件包可能会缺失或者过时。" #. push button label -#: library/packages/src/modules/PackageCallbacks.rb:1969 +#: library/packages/src/modules/PackageCallbacks.rb:1971 msgid "&Skip Refresh" msgstr "跳过刷新(&S)" #. heading of popup #. heading of popup -#: library/packages/src/modules/PackageCallbacks.rb:2003 -#: library/packages/src/modules/PackageCallbacks.rb:2045 +#: library/packages/src/modules/PackageCallbacks.rb:2005 +#: library/packages/src/modules/PackageCallbacks.rb:2047 msgid "Downloading" msgstr "正在下载" #. message in a progress popup #. progress bar label, %1 is URL with optional download rate -#: library/packages/src/modules/PackageCallbacks.rb:2053 -#: library/packages/src/modules/PackageCallbacks.rb:2101 +#: library/packages/src/modules/PackageCallbacks.rb:2055 +#: library/packages/src/modules/PackageCallbacks.rb:2103 msgid "Downloading: %1" msgstr "正在下载：%1" #. heading of popup #. heading of popup -#: library/packages/src/modules/PackageCallbacks.rb:2206 -#: library/packages/src/modules/PackageCallbacks.rb:2281 +#: library/packages/src/modules/PackageCallbacks.rb:2208 +#: library/packages/src/modules/PackageCallbacks.rb:2283 msgid "Checking Package Database" msgstr "正在检查软件包数据库" #. message in a progress popup -#: library/packages/src/modules/PackageCallbacks.rb:2209 +#: library/packages/src/modules/PackageCallbacks.rb:2211 msgid "Rebuilding package database. This process can take some time." msgstr "正在重建软件包数据库。此过程要花费一点时间。" #. progress bar label -#: library/packages/src/modules/PackageCallbacks.rb:2214 -#: library/packages/src/modules/PackageCallbacks.rb:2297 +#: library/packages/src/modules/PackageCallbacks.rb:2216 +#: library/packages/src/modules/PackageCallbacks.rb:2299 msgid "Status" msgstr "状态" #. error message, %1 is the cause for the error -#: library/packages/src/modules/PackageCallbacks.rb:2247 +#: library/packages/src/modules/PackageCallbacks.rb:2249 msgid "" "Rebuilding of package database failed:\n" "%1" @@ -3332,12 +3322,12 @@ "%1" #. message in a progress popup -#: library/packages/src/modules/PackageCallbacks.rb:2284 +#: library/packages/src/modules/PackageCallbacks.rb:2286 msgid "Converting package database. This process can take some time." msgstr "正在转换软件包数据库。此过程要花费一点时间。" #. error message, %1 is the cause for the error -#: library/packages/src/modules/PackageCallbacks.rb:2323 +#: library/packages/src/modules/PackageCallbacks.rb:2325 msgid "" "Conversion of package database failed:\n" "%1" @@ -3346,12 +3336,12 @@ "%1" #. progress message (command line mode) -#: library/packages/src/modules/PackageCallbacks.rb:2363 +#: library/packages/src/modules/PackageCallbacks.rb:2365 msgid "Reading RPM database..." msgstr "正在读取 RPM 数据库..." #. popup heading -#: library/packages/src/modules/PackageCallbacks.rb:2373 +#: library/packages/src/modules/PackageCallbacks.rb:2375 msgid "Reading Installed Packages" msgstr "正在读取已安装的软件包" @@ -3362,27 +3352,27 @@ #. `Label(""), #. `PushButton(`id(`abort), Label::AbortButton()) #. ) -#: library/packages/src/modules/PackageCallbacks.rb:2379 -#: library/packages/src/modules/PackageCallbacks.rb:2395 +#: library/packages/src/modules/PackageCallbacks.rb:2381 +#: library/packages/src/modules/PackageCallbacks.rb:2397 msgid "Scanning RPM database..." msgstr "正在扫描 RPM 数据库..." #. error message, could not read RPM database -#: library/packages/src/modules/PackageCallbacks.rb:2434 +#: library/packages/src/modules/PackageCallbacks.rb:2436 msgid "Initialization of the target failed." msgstr "目标初始化失败。" #. status message (command line mode) -#: library/packages/src/modules/PackageCallbacks.rb:2525 +#: library/packages/src/modules/PackageCallbacks.rb:2527 msgid "RPM database read" msgstr "已读取 RPM 数据库" #. heading in a popup window -#: library/packages/src/modules/PackageCallbacks.rb:2544 +#: library/packages/src/modules/PackageCallbacks.rb:2563 msgid "User Authentication" msgstr "用户认证" -#: library/packages/src/modules/PackageCallbacks.rb:2550 +#: library/packages/src/modules/PackageCallbacks.rb:2569 msgid "" "URL: %1\n" "\n" @@ -3393,7 +3383,7 @@ "%2" #. textentry label -#: library/packages/src/modules/PackageCallbacks.rb:2559 +#: library/packages/src/modules/PackageCallbacks.rb:2578 msgid "&User Name" msgstr "用户名(&U)" @@ -4812,7 +4802,7 @@ msgstr "不再显示此消息" #. error report -#: library/system/src/modules/Initrd.rb:409 +#: library/system/src/modules/Initrd.rb:416 msgid "An error occurred during initrd creation." msgstr "initrd 创建过程中出错。" @@ -5799,6 +5789,12 @@ "DNS 服务器管理的 %1 没有反向区域。\n" "无法添加主机名 %2。" +#~ msgid "Read dynamic definitions of installed services" +#~ msgstr "读取已安装服务的动态定义" + +#~ msgid "Reading dynamic definitions of installed services..." +#~ msgstr "正在读取已安装服务的动态定义..." + #~ msgid "No running network detected." #~ msgstr "未检测到运行中的网络。" Modified: trunk/yast/zh_CN/po/bootloader.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/bootloader.zh_CN.po 2014-10-29 15:59:29 UTC (rev 90431) +++ trunk/yast/zh_CN/po/bootloader.zh_CN.po 2014-10-29 16:00:17 UTC (rev 90432) @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: bootloader\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-30 10:10+0200\n" +"POT-Creation-Date: 2014-10-29 16:20+0100\n" "PO-Revision-Date: 2014-08-01 02:20+0800\n" "Last-Translator: 玛格丽特 · 苏 <marguerite@opensuse.org>\n" "Language-Team: Chinese Simplified <kde-i18n-doc@kde.org>\n" @@ -35,77 +35,53 @@ #. command line help text for delete action #: src/clients/bootloader.rb:58 -msgid "Delete a global option or option of a section" -msgstr "删除全局选项或某引导项的选项" +#, fuzzy +#| msgid "Set a global option" +msgid "Delete a global option" +msgstr "设置全局选项" #. command line help text for set action #: src/clients/bootloader.rb:65 -msgid "Set a global option or option of a section" -msgstr "设置全局选项或某引导项的选项" +msgid "Set a global option" +msgstr "设置全局选项" -#. command line help text for add action -#: src/clients/bootloader.rb:72 -msgid "Add a new section - please use interactive mode" -msgstr "添加新引导项 - 请使用交互模式" - #. command line help text for print action -#: src/clients/bootloader.rb:82 +#: src/clients/bootloader.rb:75 msgid "Print value of specified option" msgstr "打印指定选项的值" #. command line help text for an option -#: src/clients/bootloader.rb:90 -msgid "The name of the section" -msgstr "引导项名称" - -#. command line help text for an option -#: src/clients/bootloader.rb:97 +#: src/clients/bootloader.rb:83 msgid "The key of the option" msgstr "选项的键" #. command line help text for an option -#: src/clients/bootloader.rb:104 +#: src/clients/bootloader.rb:90 msgid "The value of the option" msgstr "选项的值" -#. command line error report, %1 is section name -#. command line error report, %1 is section name -#: src/clients/bootloader.rb:185 src/clients/bootloader.rb:225 -msgid "Section %1 not found." -msgstr "未找到引导项 %1。" - #. command line error report -#: src/clients/bootloader.rb:201 +#: src/clients/bootloader.rb:154 msgid "Value was not specified." msgstr "未指定值。" -#. Add a new bootloader section with specified name -#. @param [Hash] options a list of parameters passed as args -#. @return [Boolean] true on success -#: src/clients/bootloader.rb:239 -msgid "Add option is available only in commandline interactive mode" -msgstr "添加选项只在命令行交互模式中可用" - #. command line error report -#: src/clients/bootloader.rb:245 -msgid "Section name must be specified." -msgstr "必须指定引导项名称。" - -#. command line error report -#: src/clients/bootloader.rb:265 +#: src/clients/bootloader.rb:176 msgid "Option was not specified." msgstr "未指定选项。" +#. command line, %1 is the value of bootloader option +#: src/clients/bootloader.rb:182 +#, fuzzy +#| msgid "Value: %1" +msgid "Value: %s" +msgstr "值：%1" + #. command line error report -#: src/clients/bootloader.rb:284 +#: src/clients/bootloader.rb:185 msgid "Specified option does not exist." msgstr "指定选项不存在。" -#. command line, %1 is the value of bootloader option -#: src/clients/bootloader.rb:287 -msgid "Value: %1" -msgstr "值：%1" - #. progress step title #: src/clients/bootloader_finish.rb:52 msgid "Saving bootloader configuration..." @@ -133,52 +109,25 @@ msgstr "系统将立即重引导..." #. warning text in the summary richtext -#: src/clients/bootloader_proposal.rb:116 +#: src/clients/bootloader_proposal.rb:115 msgid "No boot loader is selected for installation. Your system might not be bootable." msgstr "未选择安装任何引导加载器。您的系统可能无法引导。" #. error in the proposal -#: src/clients/bootloader_proposal.rb:126 +#: src/clients/bootloader_proposal.rb:125 msgid "Because of the partitioning, the bootloader cannot be installed properly" msgstr "出于分区原因，无法正确安装引导加载器" #. proposal part - bootloader label -#: src/clients/bootloader_proposal.rb:225 +#: src/clients/bootloader_proposal.rb:224 msgid "Booting" msgstr "引导" #. menubutton entry -#: src/clients/bootloader_proposal.rb:227 +#: src/clients/bootloader_proposal.rb:226 msgid "&Booting" msgstr "引导(&B)" -#. Run dialog to adjust installation on i386 and AMD64 -#. @return [Symbol] for wizard sequencer -#. Run dialog to adjust installation on i386 and AMD64 -#. @return [Symbol] for wizard sequencer -#: src/include/bootloader/grub/dialogs.rb:41 -#: src/include/bootloader/grub2/dialogs.rb:221 -msgid "Disk Order" -msgstr "磁盘顺序" - -#: src/include/bootloader/grub/dialogs.rb:50 -#: src/include/bootloader/grub2/dialogs.rb:230 -msgid "Disk order settings" -msgstr "磁盘顺序设置" - -#. Run dialog for loader installation details on i386 -#. @return [Symbol] for wizard sequencer -#: src/include/bootloader/grub/dialogs.rb:68 -msgid "Boot Menu" -msgstr "引导菜单" - -#. `VSpacing(1), -#. Window title -#: src/include/bootloader/grub/dialogs.rb:106 -#: src/include/bootloader/grub2/dialogs.rb:143 -msgid "Boot Loader Options" -msgstr "引导加载器选项" - #. encoding: utf-8 #. File: #. include/bootloader/grup/helps.ycp @@ -261,19 +210,11 @@ #: src/include/bootloader/grub/helps.rb:47 msgid "" -"<p><b>Use Trusted Grub</b> means install trusted grub and use it. Option <i>Graphical Menu File</i> will be ignored.\n" -"It is recommended to install grub to MBR</p>" -msgstr "" -"<p><b>使用信任的 Grub</b>是指安装并使用信任的 grub。选项<i>图形菜单文件</i>将被忽略。\n" -"推荐将 grub 安装到主引导记录。</p>" - -#: src/include/bootloader/grub/helps.rb:50 -msgid "" "<p><b>Boot from Master Boot Record</b> is not recommended if you have another operating system\n" "installed on your computer</p>" msgstr "<p>若您计算机上还安装着另一个操作系统，则不推荐使用<b>从主引导记录引导</b>。</p>" -#: src/include/bootloader/grub/helps.rb:53 +#: src/include/bootloader/grub/helps.rb:50 msgid "" "<p><b>Boot from Root Partition</b> is the recommended option whenever there is a suitable\n" "partition. Either select <b>Set active Flag in Partition Table for Boot Partition</b> and <b>Write generic Boot Code to MBR</b>\n" @@ -283,31 +224,35 @@ "<p>当有合适的分区时，<b>从根分区引导</b>是推荐选项。\n" "若需要更新主引导记录，可选择在<b>引导加载器选项</b>中<b>在分区表中为引导分区设置活动旗标</b>并<b>写入通用引导代码到主引导记录</b>。或者也可以配置您其它的引导管理器去启动此引导项。</p>" -#: src/include/bootloader/grub/helps.rb:59 +#: src/include/bootloader/grub/helps.rb:56 msgid "" "<p><b>Boot from Extended Partition</b> should be selected if your root partition is on \n" "logical partition and the /boot partition is missing</p>" msgstr "若您的根分区位于逻辑分区上且没有 /boot 分区则应该选择<p><b>从扩展分区引导</b></p>" -#: src/include/bootloader/grub/helps.rb:62 +#: src/include/bootloader/grub/helps.rb:59 msgid "<p><b>Custom Boot Partition</b> lets you choose a partition to boot from.</p>" msgstr "<p><b>自定义引导分区</b>可让您选择要从之引导的分区。</p>" -#: src/include/bootloader/grub/helps.rb:65 +#: src/include/bootloader/grub/helps.rb:62 msgid "" "<p>MD array is build from 2 disks. <b>Enable Redundancy for MD Array</b>\n" "enable to write GRUB to MBR of both disks.</p>" msgstr "<p>多设备 (MD) 阵列由两个磁盘构建而成。激活<b>启用多设备阵列冗余</b>可将 GRUB 写入两个磁盘的主引导记录。</p>" -#: src/include/bootloader/grub/helps.rb:68 +#: src/include/bootloader/grub/helps.rb:65 +#, fuzzy +#| msgid "" +#| "<p><b>Use Serial Console</b> lets you define the parameters to use\n" +#| "for a serial console. Please see the grub documentation (<code>info grub</code>) for details.</p>" msgid "" "<p><b>Use Serial Console</b> lets you define the parameters to use\n" -"for a serial console. Please see the grub documentation (<code>info grub</code>) for details.</p>" +"for a serial console. Please see the grub documentation (<code>info grub2</code>) for details.</p>" msgstr "" "<p><b>使用串行控制台</b>可让您定义用于串行控制台的参数。\n" "细节请参考 grub 文档 (<code>info grub</code>)。</p>" -#: src/include/bootloader/grub/helps.rb:71 +#: src/include/bootloader/grub/helps.rb:68 msgid "" "<p><b>Terminal Definition</b></p><br>\n" "Defines the type of terminal you want to use. For a serial terminal (eg. a serial console),\n" @@ -321,7 +266,7 @@ "您也可以向命令传递 <code>console</code> 参数，如 <code>serial console</code>。\n" "在这种情况下，将把您在其中按下了任何键的终端选择为 GRUB 终端。</p>" -#: src/include/bootloader/grub/helps.rb:78 +#: src/include/bootloader/grub/helps.rb:75 msgid "" "<p><b>Fallback Sections if default Fails</b> contains a list of section numbers\n" "that will be used for booting in case the default section is unbootable.</p>" @@ -329,19 +274,11 @@ "<p><b>默认项失败时的备用引导项</b>包含了一个引导项编号列表，\n" "当默认引导项无法引导时，可使用该列表来引导。</p>" -#: src/include/bootloader/grub/helps.rb:81 +#: src/include/bootloader/grub/helps.rb:78 msgid "<p>Selecting <b>Hide Menu on Boot</b> will hide the boot menu.</p>" msgstr "<p>选择<b>引导时隐藏菜单</b>后将隐藏引导菜单。</p>" -#: src/include/bootloader/grub/helps.rb:84 -msgid "<p><b>Graphical Menu File</b> defines the file to use for the graphical boot menu.</p>" -msgstr "<p><b>图形菜单文件</b>定义了要用于图形引导菜单的文件。</p>" - -#: src/include/bootloader/grub/helps.rb:87 -msgid "<p><b>Enable Acoustic Signals</b> turn on/off acoustic signals.</p>" -msgstr "<p><b>启用声音信号</b>开启/关闭声音信号。</p>" - -#: src/include/bootloader/grub/helps.rb:90 +#: src/include/bootloader/grub/helps.rb:81 msgid "" "<p><b>Protect Boot Loader with Password</b><br>\n" "Define the password that will be required to access the boot menu. YaST will only accept the password if you repeat\n" @@ -352,7 +289,7 @@ "YaST 只在您在<b>重新键入密码</b>中重复了密码后才会接受该密码。</p>" #. help text 1/5 -#: src/include/bootloader/grub/helps.rb:97 +#: src/include/bootloader/grub/helps.rb:88 msgid "" "<p><big><b>Disks Order</b></big><br>\n" "To specify the order of the disks according to the order in BIOS, use\n" @@ -366,197 +303,120 @@ "要添加磁盘，请按<b>添加</b>。\n" "要移除磁盘，请按<b>移除</b>。</p>" -#: src/include/bootloader/grub/helps.rb:108 +#: src/include/bootloader/grub/helps.rb:99 msgid "Boot Loader Locations" msgstr "引导加载器位置" -#: src/include/bootloader/grub/helps.rb:109 +#: src/include/bootloader/grub/helps.rb:100 msgid "Set &active Flag in Partition Table for Boot Partition" msgstr "在分区表中为引导分区设置活动旗标(&A)" -#: src/include/bootloader/grub/helps.rb:112 +#: src/include/bootloader/grub/helps.rb:103 #: src/include/bootloader/routines/common_helps.rb:29 msgid "&Timeout in Seconds" msgstr "超时 (以秒计)(&T)" -#: src/include/bootloader/grub/helps.rb:113 +#: src/include/bootloader/grub/helps.rb:104 msgid "&Default Boot Section" msgstr "默认引导项(&D)" -#: src/include/bootloader/grub/helps.rb:114 +#: src/include/bootloader/grub/helps.rb:105 msgid "Write &generic Boot Code to MBR" msgstr "将通用引导代码写入主引导记录(&G)" -#: src/include/bootloader/grub/helps.rb:115 -msgid "Use &Trusted Grub" -msgstr "使用信任的 Grub(&T)" - -#: src/include/bootloader/grub/helps.rb:116 +#: src/include/bootloader/grub/helps.rb:106 msgid "Custom Boot Partition" msgstr "自定义引导分区" -#: src/include/bootloader/grub/helps.rb:117 +#: src/include/bootloader/grub/helps.rb:107 msgid "Boot from Master Boot Record" msgstr "从主引导记录引导" -#: src/include/bootloader/grub/helps.rb:118 +#: src/include/bootloader/grub/helps.rb:108 msgid "Boot from Root Partition" msgstr "从根分区引导" -#: src/include/bootloader/grub/helps.rb:119 +#: src/include/bootloader/grub/helps.rb:109 msgid "Boot from Boot Partition" msgstr "从引导分区引导" -#: src/include/bootloader/grub/helps.rb:120 +#: src/include/bootloader/grub/helps.rb:110 msgid "Boot from Extended Partition" msgstr "从扩展分区引导" -#: src/include/bootloader/grub/helps.rb:121 +#: src/include/bootloader/grub/helps.rb:111 msgid "Serial Connection &Parameters" msgstr "串行连接参数(&P)" -#: src/include/bootloader/grub/helps.rb:122 +#: src/include/bootloader/grub/helps.rb:112 msgid "Fallback Sections if Default fails" msgstr "默认引导项失败时的备用引导项" -#: src/include/bootloader/grub/helps.rb:123 +#: src/include/bootloader/grub/helps.rb:113 msgid "&Hide Menu on Boot" msgstr "引导时隐藏菜单(&H)" -#: src/include/bootloader/grub/helps.rb:124 -msgid "Graphical &Menu File" -msgstr "图形菜单文件(&M)" - -#: src/include/bootloader/grub/helps.rb:125 +#: src/include/bootloader/grub/helps.rb:114 msgid "Pa&ssword for the Menu Interface" msgstr "菜单界面密码(&S)" -#: src/include/bootloader/grub/helps.rb:126 +#: src/include/bootloader/grub/helps.rb:115 msgid "Debugg&ing Flag" msgstr "调试旗标(&I)" -#. encoding: utf-8 -#. File: -#. modules/BootGRUB.ycp -#. -#. Module: -#. Bootloader installation and configuration -#. -#. Summary: -#. Module containing specific functions for GRUB configuration -#. and installation -#. -#. Authors: -#. Jiri Srain <jsrain@suse.cz> -#. Joachim Plack <jplack@suse.de> -#. Olaf Dabrunz <od@suse.de> -#. Philipp Thomas <pth@suse.de> -#. -#. $Id$ -#: src/include/bootloader/grub/options.rb:68 -msgid "Choose new graphical menu file" -msgstr "选择新图形菜单文件" - -#. `Left(`CheckBox(`id(`enable_acoustic_signals), _("Enable Acoustic &Signals"))), -#: src/include/bootloader/grub/options.rb:129 -msgid "Enable Acoustic &Signals" -msgstr "启用声音信号(&S)" - #. Validate function of a popup #. @param [String] key any widget key #. @param [Hash] event map event that caused validation #. @return [Boolean] true if widget settings ok -#: src/include/bootloader/grub/options.rb:254 +#: src/include/bootloader/grub/options.rb:73 msgid "Prot&ect Boot Loader with Password" msgstr "使用密码保护引导加载器(&E)" #. text entry -#: src/include/bootloader/grub/options.rb:259 +#: src/include/bootloader/grub/options.rb:78 msgid "&Password" msgstr "密码(&P)" #. text entry -#: src/include/bootloader/grub/options.rb:262 +#: src/include/bootloader/grub/options.rb:81 msgid "Re&type Password" msgstr "再次键入密码(&T)" -#. Common widget of a console -#. @return [Hash{String => Object}] CWS widget -#: src/include/bootloader/grub/options.rb:359 -#: src/include/bootloader/grub2/options.rb:295 -msgid "Use &serial console" -msgstr "使用串行控制台(&S)" - -#: src/include/bootloader/grub/options.rb:366 -#: src/include/bootloader/grub2/options.rb:302 -msgid "&Console arguments" -msgstr "控制台参数(&C)" - -#. textentry header -#: src/include/bootloader/grub/options.rb:455 -msgid "&Device" -msgstr "设备(&D)" - -#. disabling & enabling up/down -#: src/include/bootloader/grub/options.rb:544 -msgid "Device map must contain at least one device" -msgstr "设备映射必须包含至少一个设备" - -#: src/include/bootloader/grub/options.rb:553 -msgid "D&isks" -msgstr "磁盘(&I)" - -#: src/include/bootloader/grub/options.rb:565 -msgid "&Up" -msgstr "向上(&U)" - -#: src/include/bootloader/grub/options.rb:566 -msgid "&Down" -msgstr "向下(&D)" - #. Create Frame "Boot Loader Location" #. #. @return [Yast::Term] with widgets -#: src/include/bootloader/grub/options.rb:740 +#: src/include/bootloader/grub/options.rb:217 msgid "Boot from &Root Partition" msgstr "从根分区引导(&R)" -#: src/include/bootloader/grub/options.rb:741 +#: src/include/bootloader/grub/options.rb:218 msgid "Boo&t from Boot Partition" msgstr "从引导分区引导(&T)" -#: src/include/bootloader/grub/options.rb:749 -#: src/include/bootloader/grub/options.rb:776 -#: src/include/bootloader/grub/options.rb:811 +#: src/include/bootloader/grub/options.rb:228 +msgid "C&ustom Boot Partition" +msgstr "自定义引导分区(&U)" + +#: src/include/bootloader/grub/options.rb:243 +#: src/include/bootloader/grub/options.rb:271 +#: src/include/bootloader/grub/options.rb:292 msgid "Boot Loader Location" msgstr "引导加载器位置" -#: src/include/bootloader/grub/options.rb:755 -#: src/include/bootloader/grub/options.rb:782 -#: src/include/bootloader/grub/options.rb:817 +#: src/include/bootloader/grub/options.rb:249 +#: src/include/bootloader/grub/options.rb:277 +#: src/include/bootloader/grub/options.rb:298 msgid "Boot from &Master Boot Record" msgstr "从主引导记录引导(&M)" -#: src/include/bootloader/grub/options.rb:762 +#: src/include/bootloader/grub/options.rb:256 msgid "Boot from &Extended Partition" msgstr "从扩展分区引导(&E)" -#: src/include/bootloader/grub/options.rb:788 -#: src/include/bootloader/grub/options.rb:829 -msgid "C&ustom Boot Partition" -msgstr "自定义引导分区(&U)" - -#: src/include/bootloader/grub/options.rb:822 +#: src/include/bootloader/grub/options.rb:303 msgid "Enable Red&undancy for MD Array" msgstr "启用多设备 (MD) 阵列冗余(&U)" -#. push button -#. push button -#: src/include/bootloader/grub/options.rb:881 -#: src/include/bootloader/routines/global_widgets.rb:831 -msgid "Boot Loader Installation &Details" -msgstr "引导加载器安装细节(&D)" - #. Title in tab #: src/include/bootloader/grub2/dialogs.rb:57 msgid "Boot Code Options" @@ -572,6 +432,11 @@ msgid "Bootloader Options" msgstr "引导加载器选项" +#. Window title +#: src/include/bootloader/grub2/dialogs.rb:143 +msgid "Boot Loader Options" +msgstr "引导加载器选项" + #: src/include/bootloader/grub2/dialogs.rb:183 msgid "Secure Boot" msgstr "安全引导 (Secure Boot)" @@ -581,12 +446,12 @@ msgstr "启用安全引导支持 (Secure Boot)" #. TRANSLATORS: place where boot code is installed -#: src/include/bootloader/grub2/dialogs.rb:262 +#: src/include/bootloader/grub2/dialogs.rb:240 msgid "Boot &Loader Location" msgstr "引导加载器位置(&L)" #. help text -#: src/include/bootloader/grub2/dialogs.rb:281 +#: src/include/bootloader/grub2/dialogs.rb:259 msgid "Choose partition where is boot sequence installed." msgstr "请选择将安装引导程序的分区。" @@ -605,12 +470,10 @@ #. #. $Id: helps.ycp 58279 2009-08-04 16:01:51Z juhliarik $ #: src/include/bootloader/grub2/helps.rb:23 -#: src/include/bootloader/routines/section_helps.rb:33 msgid "<p><b>Optional Kernel Command Line Parameter</b> lets you define additional parameters to pass to the kernel.</p>" msgstr "<p><b>可选内核命令行参数</b>可让您定义要传递给内核的额外参数。</p>" #: src/include/bootloader/grub2/helps.rb:26 -#: src/include/bootloader/routines/section_helps.rb:30 msgid "<p><b>Vga Mode</b> defines the VGA mode the kernel should set the <i>console</i> to when booting.</p>" msgstr "<p><b>VGA 模式</b>定义了引导时内核应设置的<i>控制台</i> VGA 模式。</p>" @@ -631,7 +494,6 @@ msgstr "<p><b>发行方</b>指定了用于创建引导项名称的内核发行方名称。</p>" #: src/include/bootloader/grub2/helps.rb:44 -#: src/include/bootloader/routines/section_helps.rb:99 msgid "O&ptional Kernel Command Line Parameter" msgstr "可选内核命令行参数(&P)" @@ -640,7 +502,6 @@ msgstr "发行方(&I)" #: src/include/bootloader/grub2/helps.rb:46 -#: src/include/bootloader/routines/section_helps.rb:98 msgid "&Vga Mode" msgstr "&VGA 模式" @@ -661,30 +522,20 @@ #. %2 is Y resolution (height) in pixels #. %3 is color depth (usually one of 8, 16, 24, 32) #. %4 is the VGA mode ID (hexadecimal number) -#. combo box item -#. %1 is X resolution (width) in pixels -#. %2 is Y resolution (height) in pixels -#. %3 is color depth (usually one of 8, 16, 24, 32) -#. %4 is the VGA mode ID (hexadecimal number) #: src/include/bootloader/grub2/options.rb:58 -#: src/include/bootloader/routines/section_widgets.rb:523 msgid "%1x%2, %3 bits (mode %4)" msgstr "%1x%2，%3 位 (模式 %4)" #: src/include/bootloader/grub2/options.rb:68 -#: src/include/bootloader/routines/section_widgets.rb:537 msgid "Standard 8-pixel font mode." msgstr "标准 8 像素字体模式。" #. item of a combo box -#. item of a combo box #: src/include/bootloader/grub2/options.rb:71 -#: src/include/bootloader/routines/section_widgets.rb:540 msgid "Text Mode" msgstr "文本模式" #: src/include/bootloader/grub2/options.rb:72 -#: src/include/bootloader/routines/section_widgets.rb:541 msgid "Unspecified" msgstr "未指定" @@ -727,17 +578,21 @@ msgid "&Console theme" msgstr "控制台主题(&C)" +#: src/include/bootloader/grub2/options.rb:295 +msgid "Use &serial console" +msgstr "使用串行控制台(&S)" + +#: src/include/bootloader/grub2/options.rb:302 +msgid "&Console arguments" +msgstr "控制台参数(&C)" + #. FIXME this should be better handled by exception and show it properly, but it require too big change now -#: src/include/bootloader/routines/autoinstall.rb:169 +#: src/include/bootloader/routines/autoinstall.rb:132 msgid "Unsupported bootloader '%s'. Adapt your AutoYaST profile accordingly." msgstr "不支持的引导加载器 '%s'。请调整您的 AutoYaST 方案。" #. file open popup caption -#. file open popup caption -#. file open popup caption #: src/include/bootloader/routines/common_options.rb:102 -#: src/include/bootloader/routines/section_widgets.rb:265 -#: src/include/bootloader/routines/section_widgets.rb:279 msgid "Select File" msgstr "选择文件" @@ -745,183 +600,27 @@ #. kokso: additional warning that root partition is nfs type -> bootloader will not be installed #. F#300779 - Install diskless client (NFS-root) #. kokso: additional warning that root partition is nfs type -> bootloader will not be installed -#: src/include/bootloader/routines/dialogs.rb:90 src/modules/Bootloader.rb:270 +#: src/include/bootloader/routines/dialogs.rb:85 src/modules/Bootloader.rb:256 msgid "The boot partition is of type NFS. Bootloader cannot be installed." msgstr "引导分区类型是 NFS。无法安装引导加载器。" #. dialog caption -#: src/include/bootloader/routines/dialogs.rb:131 +#: src/include/bootloader/routines/dialogs.rb:115 msgid "Boot Loader Settings" msgstr "引导加载器设置" #. message -#: src/include/bootloader/routines/dialogs.rb:159 +#: src/include/bootloader/routines/dialogs.rb:143 msgid "There are no options to set for the current boot loader." msgstr "没有要为当前引导加载器设置的选项。" -#. heading -#. heading -#. heading -#: src/include/bootloader/routines/dialogs.rb:177 -#: src/include/bootloader/routines/dialogs.rb:255 -#: src/include/bootloader/routines/dialogs.rb:325 -msgid "Kernel Section" -msgstr "内核项" - -#. frame -#. frame -#. frame -#. frame -#. frame -#. frame -#. frame -#. frame -#: src/include/bootloader/routines/dialogs.rb:183 -#: src/include/bootloader/routines/dialogs.rb:261 -#: src/include/bootloader/routines/dialogs.rb:331 -#: src/include/bootloader/routines/dialogs.rb:399 -#: src/include/bootloader/routines/dialogs.rb:474 -#: src/include/bootloader/routines/dialogs.rb:522 -#: src/include/bootloader/routines/dialogs.rb:581 -#: src/include/bootloader/routines/dialogs.rb:636 -msgid "Section Settings" -msgstr "引导项设置" - -#. dialog caption -#. dialog caption -#. dialog caption -#. dialog caption -#. dialog caption -#. dialog caption -#. dialog caption -#. dialog caption -#. dialog caption -#: src/include/bootloader/routines/dialogs.rb:231 -#: src/include/bootloader/routines/dialogs.rb:302 -#: src/include/bootloader/routines/dialogs.rb:370 -#: src/include/bootloader/routines/dialogs.rb:445 -#: src/include/bootloader/routines/dialogs.rb:494 -#: src/include/bootloader/routines/dialogs.rb:542 -#: src/include/bootloader/routines/dialogs.rb:605 -#: src/include/bootloader/routines/dialogs.rb:683 -#: src/include/bootloader/routines/dialogs.rb:721 -msgid "Boot Loader Settings: Section Management" -msgstr "引导加载器设置：引导项管理" - -#. heading -#. radio button -#: src/include/bootloader/routines/dialogs.rb:393 -#: src/include/bootloader/routines/section_helps.rb:108 -#: src/include/bootloader/routines/section_widgets.rb:585 -msgid "Xen Section" -msgstr "Xen 项" - -#. heading -#. radio button -#: src/include/bootloader/routines/dialogs.rb:468 -#: src/include/bootloader/routines/section_helps.rb:111 -#: src/include/bootloader/routines/section_helps.rb:121 -#: src/include/bootloader/routines/section_widgets.rb:591 -msgid "Menu Section" -msgstr "菜单项" - -#. heading -#. radio button -#: src/include/bootloader/routines/dialogs.rb:516 -#: src/include/bootloader/routines/section_widgets.rb:593 -msgid "Dump Section" -msgstr "转储项" - -#. label -#. label -#: src/include/bootloader/routines/dialogs.rb:573 -#: src/include/bootloader/routines/dialogs.rb:628 -msgid "Other System Section" -msgstr "其它系统项" - -#. combobox label -#: src/include/bootloader/routines/dialogs.rb:803 -msgid "&Filename" -msgstr "文件名(&F)" - -#. label. %1 is name of file (eg. /etc/lilo.conf -#: src/include/bootloader/routines/dialogs.rb:811 -msgid "Filename: %1" -msgstr "文件名：%1" - -#. multiline edit header -#: src/include/bootloader/routines/dialogs.rb:828 -msgid "Fi&le Contents" -msgstr "文件内容(&L)" - -#. dialog caption -#: src/include/bootloader/routines/dialogs.rb:836 -msgid "Expert Manual Configuration" -msgstr "专家手动配置" - -#. sections list widget -#. Refresh and redraw widget wits sections -#. @param [Array<Hash{String => Object>}] sects list of current sections -#. menu button -#: src/include/bootloader/routines/global_widgets.rb:114 -#: src/include/bootloader/routines/global_widgets.rb:641 -msgid "Other" -msgstr "其它" - -#: src/include/bootloader/routines/global_widgets.rb:116 -msgid "Image" -msgstr "映像" - -#: src/include/bootloader/routines/global_widgets.rb:134 -msgid "Xen" -msgstr "Xen" - -#: src/include/bootloader/routines/global_widgets.rb:152 -msgid "Floppy" -msgstr "软盘" - -#: src/include/bootloader/routines/global_widgets.rb:154 -msgid "Menu" -msgstr "菜单" - -#: src/include/bootloader/routines/global_widgets.rb:161 -msgid "Dump" -msgstr "转储" - -#. table header, Def stands for default -#: src/include/bootloader/routines/global_widgets.rb:255 -msgid "Def." -msgstr "默认" - -#. table header -#: src/include/bootloader/routines/global_widgets.rb:257 -msgid "Label" -msgstr "标签" - -#. table header -#: src/include/bootloader/routines/global_widgets.rb:259 -#: src/include/bootloader/routines/global_widgets.rb:746 -msgid "Type" -msgstr "类型" - -#. table header; header for section details, either -#. the specification of the kernel image to load, -#. or the specification of device to boot from -#: src/include/bootloader/routines/global_widgets.rb:263 -msgid "Image / Device" -msgstr "映像 / 设备" - -#: src/include/bootloader/routines/global_widgets.rb:271 -msgid "Set as De&fault" -msgstr "设置为默认(&F)" - #. combo box -#: src/include/bootloader/routines/global_widgets.rb:312 +#: src/include/bootloader/routines/global_widgets.rb:114 msgid "&Boot Loader" msgstr "引导加载器(&B)" #. popup - Continue/Cancel -#: src/include/bootloader/routines/global_widgets.rb:343 +#: src/include/bootloader/routines/global_widgets.rb:144 msgid "" "\n" "If you do not install any boot loader, the system\n" @@ -934,115 +633,66 @@ "\n" "继续咩？后果很严重哦\n" -#. warning - popup, followed by radio buttons -#: src/include/bootloader/routines/global_widgets.rb:377 -msgid "" -"\n" -"You chose to change your boot loader. When converting \n" -"the configuration, some settings might be lost.\n" -"\n" -"The current configuration will be saved and you can\n" -"restore it if you return to the current boot loader.\n" -"\n" -"Select a course of action:\n" -msgstr "" -"\n" -"您选择了修改您的引导加载器。\n" -"当转换配置时，可能丢失一些设置。\n" -"\n" -"当前配置将被保存，若您后面再使用现在这个引导加载器时可以恢复当前配置。\n" -"\n" -"请选择一个动作：\n" +#. menu button entry +#: src/include/bootloader/routines/global_widgets.rb:181 +msgid "E&dit Configuration Files" +msgstr "编辑配置文件(&D)" -#. radiobutton #. menubutton item, keep as short as possible -#: src/include/bootloader/routines/global_widgets.rb:399 -#: src/include/bootloader/routines/global_widgets.rb:593 +#: src/include/bootloader/routines/global_widgets.rb:188 msgid "&Propose New Configuration" msgstr "建议新配置(&P)" -#. radiobutton -#: src/include/bootloader/routines/global_widgets.rb:406 -msgid "Co&nvert Current Configuration" -msgstr "转换当前配置(&N)" - -#. radiobutton -#: src/include/bootloader/routines/global_widgets.rb:415 -msgid "&Start New Configuration from Scratch" -msgstr "从零开始新配置(&S)" - -#. radiobutton -#: src/include/bootloader/routines/global_widgets.rb:423 -msgid "&Read Configuration Saved on Disk" -msgstr "读取保存在磁盘上的配置(&R)" - -#. radiobutton -#: src/include/bootloader/routines/global_widgets.rb:433 -msgid "Res&tore Configuration Saved before Conversion" -msgstr "恢复转换前保存的配置(&T)" - -#. popup message -#: src/include/bootloader/routines/global_widgets.rb:514 -msgid "Select the boot loader before editing sections." -msgstr "在编辑各项前请选择引导加载器。" - -#. pushbutton -#. menu button entry -#: src/include/bootloader/routines/global_widgets.rb:563 -#: src/include/bootloader/routines/global_widgets.rb:586 -msgid "E&dit Configuration Files" -msgstr "编辑配置文件(&D)" - #. menubutton item, keep as short as possible -#: src/include/bootloader/routines/global_widgets.rb:600 +#: src/include/bootloader/routines/global_widgets.rb:195 msgid "&Start from Scratch" msgstr "从零开始(&S)" #. menubutton item, keep as short as possible -#: src/include/bootloader/routines/global_widgets.rb:608 +#: src/include/bootloader/routines/global_widgets.rb:203 msgid "&Reread Configuration from Disk" msgstr "从磁盘重新读取配置(&R)" #. menubutton item, keep as short as possible -#: src/include/bootloader/routines/global_widgets.rb:625 +#: src/include/bootloader/routines/global_widgets.rb:220 msgid "Restore MBR of Hard Disk" msgstr "恢复硬盘的主引导记录" #. menubutton item, keep as short as possible -#: src/include/bootloader/routines/global_widgets.rb:633 +#: src/include/bootloader/routines/global_widgets.rb:228 msgid "Write bootloader boot code to disk" msgstr "将引导加载器引导代码写入磁盘" +#. menu button +#: src/include/bootloader/routines/global_widgets.rb:236 +msgid "Other" +msgstr "其它" + #. message popup -#: src/include/bootloader/routines/global_widgets.rb:665 +#: src/include/bootloader/routines/global_widgets.rb:260 msgid "MBR restored successfully." msgstr "已成功恢复主引导记录。" #. message popup -#: src/include/bootloader/routines/global_widgets.rb:668 +#: src/include/bootloader/routines/global_widgets.rb:263 msgid "Failed to restore MBR." msgstr "恢复主引导记录失败。" #. Bootloader::blSave (false, false, false); -#: src/include/bootloader/routines/global_widgets.rb:691 +#: src/include/bootloader/routines/global_widgets.rb:286 msgid "Writing bootloader settings failed." msgstr "写入引导加载器设置失败。" -#. tab header -#: src/include/bootloader/routines/global_widgets.rb:730 -msgid "&Section Management" -msgstr "引导项管理(&S)" - -#. tab header -#: src/include/bootloader/routines/global_widgets.rb:740 -msgid "Boot Loader &Installation" -msgstr "引导加载器安装(&I)" - #. push button -#: src/include/bootloader/routines/global_widgets.rb:818 +#: src/include/bootloader/routines/global_widgets.rb:340 msgid "Boot &Loader Options" msgstr "引导加载器选项(&L)" +#. push button +#: src/include/bootloader/routines/global_widgets.rb:353 +msgid "Boot Loader Installation &Details" +msgstr "引导加载器安装细节(&D)" + #. help text 1/1 (shown during settings reading progress) #: src/include/bootloader/routines/helps.rb:32 msgid "" @@ -1061,16 +711,9 @@ "<P><B><BIG>正在保存引导加载器配置</BIG></B><BR>\n" "请稍候...<br></p>" -#. help text, optional part of following +#. help text 1/2 (%1 may be following sentence, optionally empty) #: src/include/bootloader/routines/helps.rb:52 msgid "" -"If you have multiple Linux systems installed,\n" -"YaST can try to find them and merge their menus." -msgstr "若您安装了多个 Linux 系统，YaST 可以尝试查找它们并合并它们的菜单。" - -#. help text 1/2 (%1 may be following sentence, optionally empty) -#: src/include/bootloader/routines/helps.rb:58 -msgid "" "<P>From <B>Other</B>,\n" "you can manually edit the boot loader configuration files, clear the current \n" "configuration and propose a new configuration, start from scratch, or reread\n" @@ -1078,28 +721,28 @@ msgstr "<P>从<B>其它</B>中，您可以手动编辑引导加载器配置文件，清除当前配置并提出一个新方案，从零开始新配置，或重新读取保存在您磁盘上的配置。%1</P>" #. help text 1/1 -#: src/include/bootloader/routines/helps.rb:73 +#: src/include/bootloader/routines/helps.rb:67 msgid "" "<P>To edit boot loader configuration files\n" "manually, click <B>Edit Configuration Files</B>.</P>" msgstr "<P>要手动编辑引导加载器配置文件，请点击<B>编辑配置文件</B>。</P>" #. help 1/4 -#: src/include/bootloader/routines/helps.rb:83 +#: src/include/bootloader/routines/helps.rb:77 msgid "" "<P> In the table, each section represents one item\n" "in the boot menu.</P>" msgstr "<P>表格中的每项均代表了引导菜单中的一个引导项。</P>" #. help 2/4 -#: src/include/bootloader/routines/helps.rb:87 +#: src/include/bootloader/routines/helps.rb:81 msgid "" "<P> Press <B>Edit</B> to display the properties of the\n" "selected section.</P>" msgstr "<P>按<B>编辑</B>可显示所选引导项的属性。</P>" #. help 3/4 -#: src/include/bootloader/routines/helps.rb:91 +#: src/include/bootloader/routines/helps.rb:85 msgid "" "<P> By pressing <b>Set as Default</b>, mark the selected \n" "section as default. When booting, the boot loader will provide \n" @@ -1114,7 +757,7 @@ "引导加载器菜单中的引导项顺序客使用<b>向上</b>和<b>向下</b>按钮调整。</P>" #. help 4/4 -#: src/include/bootloader/routines/helps.rb:100 +#: src/include/bootloader/routines/helps.rb:94 msgid "" "<P>Press <B>Add</B> to create a new boot loader section\n" "or <B>Delete</B> to delete the selected section.</P>" @@ -1125,7 +768,7 @@ #. help text for the custom boot manager installation, 1 of 7 #. %1 = name of boot loader (e.g. "LILO") #. this should be per architecture -#: src/include/bootloader/routines/helps.rb:115 +#: src/include/bootloader/routines/helps.rb:109 msgid "" "<p><big><b>Boot Loader Location</b></big><br>\n" "The boot manager (%1) can be installed in the following ways:</p>" @@ -1134,7 +777,7 @@ "引导管理器 (%1) 可以以下方式安装：</p>" #. custom bootloader help text, 2 of 7 -#: src/include/bootloader/routines/helps.rb:124 +#: src/include/bootloader/routines/helps.rb:118 msgid "" "<p>- In the <b>Master Boot Record</b> (MBR).\n" "This is not recommended if there is another operating system installed\n" @@ -1144,7 +787,7 @@ "若计算机上安装了其它操作系统则不推荐此方法。</p>" #. custom bootloader help text, 3 of 7 -#: src/include/bootloader/routines/helps.rb:134 +#: src/include/bootloader/routines/helps.rb:128 msgid "" "<p>\n" "- In the <b>Boot Sector</b> of the <tt>/boot</tt> or <tt>/</tt> (root) \n" @@ -1162,23 +805,8 @@ "和<b>使用通用代码替换主引导记录</b>。\n" "或者也可以配置您其它的引导管理器去启动 &product;。</p>" -#. custom bootloader help text, 4 of 7 -#. this part will only be shown if a floppy drive is attached. -#: src/include/bootloader/routines/helps.rb:151 -msgid "" -"<p>\n" -"- On a <b>Floppy Disk</b>.\n" -"Use this to avoid the risk of interfering with an already existing\n" -"boot mechanism. Enable booting from floppy disk in\n" -"the BIOS of your machine to use this option.</p>" -msgstr "" -"<p>\n" -"- 在<b>软盘</b>上。\n" -"可使用此选项规避干扰已存在的引导机制的风险。\n" -"请先在您计算机的 BIOS 中启用从软盘引导再使用此选项。</p>" - #. custom bootloader help text, 5 of 7 -#: src/include/bootloader/routines/helps.rb:164 +#: src/include/bootloader/routines/helps.rb:143 msgid "" "<p>\n" "- In some <b>Other</b> partition. Consider your system's restrictions\n" @@ -1189,7 +817,7 @@ "当选择此选项时请考虑到您系统的限制。</p>" #. optional part, only inserted on x86 architectures. 6 of 7 -#: src/include/bootloader/routines/helps.rb:174 +#: src/include/bootloader/routines/helps.rb:153 msgid "" "<p>For example, most PCs have a BIOS\n" "limit that restricts booting to\n" @@ -1200,7 +828,7 @@ "取决于所用的引导管理器，您可能能够也可能不能从一个逻辑分区引导。</p>" #. custom bootloader help text, 7 of 7 -#: src/include/bootloader/routines/helps.rb:186 +#: src/include/bootloader/routines/helps.rb:165 msgid "" "<p>\n" "Enter the device name of the partition (for example, <tt>/dev/hda3</tt> or\n" @@ -1210,7 +838,7 @@ "请在输入字段中输入分区的设备名 (例如，<tt>/dev/hda3</tt> 或 <tt>/dev/sdb</tt>)。</p>" #. help text 1/1 -#: src/include/bootloader/routines/helps.rb:199 +#: src/include/bootloader/routines/helps.rb:178 msgid "" "<p><b>Boot Loader Installation Details</b><br>\n" "To adjust advanced boot loader installation options (such as the device\n" @@ -1221,7 +849,7 @@ "请点击<b>引导加载器安装细节</b>。</p>" #. help text 1/1 -#: src/include/bootloader/routines/helps.rb:210 +#: src/include/bootloader/routines/helps.rb:189 msgid "" "<p><b>Boot Loader Type</b><br>\n" "To select whether to install a boot loader and which bootloader to install,\n" @@ -1231,7 +859,7 @@ "要选择是否安装引导加载器以及安装哪个引导加载器，请使用<b>引导加载器</b>。</p>" #. help text 1/1 -#: src/include/bootloader/routines/helps.rb:222 +#: src/include/bootloader/routines/helps.rb:201 msgid "" "<p><b>Boot Loader Options</b><br>\n" "To adjust options of the boot loader, such as the time-out, click\n" @@ -1241,7 +869,7 @@ "要调整引导加载器的选项，诸如超时，请点击<b>引导加载器选项</b>。</p>" #. help text 1/1 -#: src/include/bootloader/routines/helps.rb:233 +#: src/include/bootloader/routines/helps.rb:212 msgid "" "<P><B>Expert Manual Configuration</B><BR>\n" "Here, manually edit the boot loader configuration.</P>\n" @@ -1252,7 +880,7 @@ "<P>注意：最终配置文件中的缩进可能有所不同。</P>" #. help text 1/1 -#: src/include/bootloader/routines/helps.rb:244 +#: src/include/bootloader/routines/helps.rb:223 msgid "" "<p><b>Section Name</b><br>\n" "Use <b>Section Name</b> to specify the boot loader section name. The section\n" @@ -1263,7 +891,7 @@ "引导项必须是唯一。</p>" #. help text 1/5 -#: src/include/bootloader/routines/helps.rb:255 +#: src/include/bootloader/routines/helps.rb:234 msgid "" "<p><big><b>Type of the New Section</b></big><br>\n" "Select the type of the new section to create.</p>" @@ -1272,7 +900,7 @@ "选择要创建的新引导项类型。</p>" #. help text 2/5 -#: src/include/bootloader/routines/helps.rb:259 +#: src/include/bootloader/routines/helps.rb:238 msgid "" "<p>Select <b>Clone Selected Section</b> to clone the currently selected\n" "section. Then modify the options that should differ from the\n" @@ -1282,21 +910,21 @@ "然后再修改应与所选引导项不同的选项。</p>" #. help text 3/5 -#: src/include/bootloader/routines/helps.rb:265 +#: src/include/bootloader/routines/helps.rb:244 msgid "" "<p>Select <b>Image Section</b> to add a new Linux kernel or other image\n" "to load and start.</p>" msgstr "<p>选择<b>映像项</b>可添加一个新的 Linux 内核或其它要加载并启动的映像。</p>" #. help text 4/5 -#: src/include/bootloader/routines/helps.rb:269 +#: src/include/bootloader/routines/helps.rb:248 msgid "" "<p>Select <b>Xen Section</b> to add a new Linux kernel or other image,\n" "but to start it in a Xen environment.</p>" msgstr "<p>选择 <b>Xen 项</b>也可添加新的 Linux 内核或其它映像，但需要在 XEN 环境中启动它。</p>" #. help text 5/5 -#: src/include/bootloader/routines/helps.rb:273 +#: src/include/bootloader/routines/helps.rb:252 msgid "" "<p>Select <b>Other System (Chainloader)</b> to add a section that \n" "loads and starts a boot sector of a partition of the disk. This is used for\n" @@ -1305,7 +933,7 @@ "<p>选择<b>其它系统 (链式加载器) </b>可添加一个加载并启动磁盘某分区的引导扇区的项。\n" "这用于引导其它操作系统。</p>" -#: src/include/bootloader/routines/helps.rb:278 +#: src/include/bootloader/routines/helps.rb:257 msgid "" "<p>Select <b>Menu Section</b> to add a section that \n" "loads configuration file (the list of boot sections) from a partition of the disk. This is used for\n" @@ -1315,50 +943,40 @@ "这用于引导其它操作系统。</p>" #. part of summary, %1 is a list of hard disks device names -#: src/include/bootloader/routines/lilolike.rb:743 +#: src/include/bootloader/routines/lilolike.rb:266 msgid "Order of Hard Disks: %1" msgstr "硬盘顺序：%1" #. summary string -#: src/include/bootloader/routines/misc.rb:48 +#: src/include/bootloader/routines/misc.rb:51 msgid "Do not install any boot loader" msgstr "不安装任何引导加载器" #. combo box item -#: src/include/bootloader/routines/misc.rb:50 +#: src/include/bootloader/routines/misc.rb:53 msgid "Do Not Install Any Boot Loader" msgstr "不安装任何引导加载器" #. summary string -#: src/include/bootloader/routines/misc.rb:55 +#: src/include/bootloader/routines/misc.rb:58 msgid "Install the default boot loader" msgstr "安装默认引导加载器" #. combo box item -#: src/include/bootloader/routines/misc.rb:57 +#: src/include/bootloader/routines/misc.rb:60 msgid "Install Default Boot Loader" msgstr "安装默认引导加载器" #. summary string -#: src/include/bootloader/routines/misc.rb:61 +#: src/include/bootloader/routines/misc.rb:64 msgid "Boot loader" msgstr "引导加载器" #. combo box item -#: src/include/bootloader/routines/misc.rb:63 +#: src/include/bootloader/routines/misc.rb:66 msgid "Boot Loader" msgstr "引导加载器" -#. popup, %1 is bootloader name -#: src/include/bootloader/routines/misc.rb:101 -msgid "The %1 boot sector has been written to the floppy disk." -msgstr "已将 %1 引导扇区写入软盘。" - -#. popup - continuing -#: src/include/bootloader/routines/misc.rb:113 -msgid "Leave the floppy disk in the drive." -msgstr "请将软盘留在驱动器中。" - #. popup message #: src/include/bootloader/routines/popups.rb:35 msgid "" @@ -1375,97 +993,27 @@ "真的不保存就离开引导加载器配置界面吗？\n" "全部修改均将不复存在。\n" -#. yes-no popup question -#: src/include/bootloader/routines/popups.rb:59 -msgid "Really delete section %1?" -msgstr "真的删除引导项 %1 吗？" - #. error popup -#: src/include/bootloader/routines/popups.rb:65 +#: src/include/bootloader/routines/popups.rb:57 msgid "The password must not be empty." msgstr "密码不能为空。" #. error popup -#: src/include/bootloader/routines/popups.rb:74 +#: src/include/bootloader/routines/popups.rb:66 msgid "" "'Password' and 'Retype password'\n" "do not match. Retype the password." msgstr "'密码' 和 '再次键入密码' 中的内容不匹配。请再次键入密码。" -#. message popup, %1 is sectino label -#: src/include/bootloader/routines/popups.rb:88 -msgid "" -"The disk settings have changed.\n" -"Check section %1 settings.\n" -msgstr "" -"磁盘设置已修改。\n" -"请检查引导项 %1 的设置。\n" - -#. message popup -#: src/include/bootloader/routines/popups.rb:100 -msgid "" -"The disk settings have changed and you edited boot loader\n" -"configuration files manually. Check the boot loader settings.\n" -msgstr "" -"磁盘设置已修改并且您手动编辑了引导加载器配置文件。\n" -"请检查引导加载器设置。\n" - #. Confirmation box with yes-no popup. %1 is reason why we need to set #. default location. It is translated on caller side and it is complete #. sentence. -#: src/include/bootloader/routines/popups.rb:116 +#: src/include/bootloader/routines/popups.rb:82 msgid "%1Set default boot loader location?\n" msgstr "%1 设置默认引导装载器位置吗？\n" -#. combobox item -#: src/include/bootloader/routines/popups.rb:128 -msgid "Do Not Create a File System" -msgstr "不创建文件系统" - -#. combobox item -#: src/include/bootloader/routines/popups.rb:130 -msgid "Create an ext2 File System" -msgstr "创建 ext2 文件系统" - -#. combobox item -#: src/include/bootloader/routines/popups.rb:136 -msgid "Create a FAT File System" -msgstr "创建 FAT 文件系统" - -#. label -#: src/include/bootloader/routines/popups.rb:142 -msgid "" -"The boot loader boot sector will be written\n" -"to a floppy disk. Insert a floppy disk\n" -"and confirm with OK.\n" -msgstr "" -"引导加载器引导扇区将被写入到一张软盘。\n" -"请插入软盘并按「好呢」确认。\n" - -#. checkbox -#: src/include/bootloader/routines/popups.rb:150 -msgid "&Low Level Format" -msgstr "低级格式化(&L)" - -#. combobox -#: src/include/bootloader/routines/popups.rb:153 -msgid "&Create File System" -msgstr "创建文件系统(&C)" - -#. yes-no popup -#: src/include/bootloader/routines/popups.rb:182 -msgid "Low level format failed. Try again?" -msgstr "低级格式化失败。重试吗？" - -#. error report -#. error report -#: src/include/bootloader/routines/popups.rb:195 -#: src/include/bootloader/routines/popups.rb:207 -msgid "Creating file system failed." -msgstr "创建文件系统失败。" - #. error popup -#: src/include/bootloader/routines/popups.rb:218 +#: src/include/bootloader/routines/popups.rb:90 msgid "" "The name selected is already used.\n" "Use a different one.\n" @@ -1474,7 +1022,7 @@ "请使用其它名称。\n" #. yes-no popup -#: src/include/bootloader/routines/popups.rb:229 +#: src/include/bootloader/routines/popups.rb:101 msgid "" "An error occurred during boot loader\n" "installation. Retry boot loader configuration?\n" @@ -1482,14 +1030,9 @@ "引导加载器安装期间出错。\n" "重试引导加载器配置吗？\n" -#. FIXME too generic, but was already translated -#: src/include/bootloader/routines/popups.rb:241 -msgid "Unable to install the boot loader." -msgstr "无法安装引导加载器。" - #. warning popup. %1 is device name, %2 is date/time in form of #. 'date' command output -#: src/include/bootloader/routines/popups.rb:283 +#: src/include/bootloader/routines/popups.rb:125 msgid "" "Warning!\n" "\n" @@ -1511,313 +1054,10 @@ "继续吗？\n" #. PushButton -#: src/include/bootloader/routines/popups.rb:305 +#: src/include/bootloader/routines/popups.rb:147 msgid "&Yes, Rewrite" msgstr "是，覆盖(&Y)" -#. encoding: utf-8 -#. File: -#. include/bootloader/routines/section_helps.ycp -#. -#. Module: -#. Bootloader installation and configuration -#. -#. Summary: -#. Help and label strings for bootloader section widgets -#. -#. Authors: -#. Josef Reidinger <jreidinger@suse.cz> -#. -#. $Id$ -#: src/include/bootloader/routines/section_helps.rb:23 -msgid "<p><b>Image Section</b></p>" -msgstr "<p><b>映像项</b></p>" - -#: src/include/bootloader/routines/section_helps.rb:24 -msgid "<p><b>Kernel Image</b> defines the kernel to boot. Either enter the name directly or choose via <b>Browse</b>.</p>" -msgstr "<p><b>内核映像</b>定义了要引导的内核。可直接输入名称，或通过<b>浏览</b>选择。</p>" - -#: src/include/bootloader/routines/section_helps.rb:27 -msgid "<p><b>Root Device</b> sets the device to pass to the kernel as root device.</p>" -msgstr "<p><b>根设备</b>设置了要传递给内核作为根设备的设备。</p>" - -#: src/include/bootloader/routines/section_helps.rb:36 -msgid "" -"<p><b>Initial RAM Disk</b>, if not empty, defines the initial ramdisk to use. Either enter the path and file name\n" -"directly or choose by using <b>Browse</b>.</p>\n" -msgstr "" -"<p><b>初始内存磁盘</b>，若非空则定义了要使用的初始 ramdisk。\n" -"可直接输入路径和文件名或通过<b>浏览</b>选择。</p>\n" - -#: src/include/bootloader/routines/section_helps.rb:39 -msgid "<p>Select <b>Chainloader Section</b> if you want to define a section for booting an OS other than Linux.</p>" -msgstr "<p>若您想要定义一个引导非 Linux 操作系统的引导项，请选择<b>链式加载器项</b>。</p>" - -#: src/include/bootloader/routines/section_helps.rb:42 -msgid "<p>Setting <b>Use Password Protection</p> will require a password to select this section.</p>" -msgstr "<p>设置<b>使用密码保护</p>将会在选择此项时询问密码。</p>" - -#: src/include/bootloader/routines/section_helps.rb:45 -msgid "<p><b>Other System</b> lets you choose among the non-Linux operating systems found on your computer.</p>" -msgstr "<p><b>其它系统</b>可让您从您计算机上发现的非 Linux 操作系统中选择。</p>" - -#: src/include/bootloader/routines/section_helps.rb:48 -msgid "<p>Select <b>Activate this Partition when selected for Boot</b> if your BIOS needs this flag set in order to boot it</p>" -msgstr "<p>若您 BIOS 需要设置此旗标才能引导之，请选择<b>当选为引导分区时激活此分区</b></p>" - -#: src/include/bootloader/routines/section_helps.rb:51 -msgid "" -"<p><b>Block Offset for Chainloading</b> lets you specify the list of blocks to boot. In most cases you want\n" -"to specify <code>+1</code> here. For specifics on blocklist notation see the grub documentation.</p>\n" -msgstr "" -"<p><b>阻止链式加载偏移</b>可让您指定要引导的块列表。 \n" -"在多数情况下您需要在此指定 <code>+1</code>。 \n" -"有关块列表的规范请参考 grub 文档。</p>\n" - -#: src/include/bootloader/routines/section_helps.rb:54 -msgid "" -"<p>Select <b>Xen Section</b> if you want to add a new Linux kernel or other image \n" -"and start it in a Xen environment.</p>\n" -msgstr "<p>若您想要添加一个新 Linux 内核或其它映像并在 Xen 环境中启动之，请选择 <b>Xen 项</b>。</p>\n" - -#: src/include/bootloader/routines/section_helps.rb:57 -msgid "<p><b>Hypervisor</b> specifies the Hypervisor to use.</p>" -msgstr "<p><b>管理程序</b>指定了要使用的管理程序。</p>" - -#: src/include/bootloader/routines/section_helps.rb:60 -msgid "<p><b>Additional Xen Hypervisor Parameters</b> lets you define additional parameters to pass to the xen hypervisor.</p>" -msgstr "<p><b>Xen 管理程序额外参数</b>可让您定义要传递给 xen 管理程序的额外参数。</p>" - -#: src/include/bootloader/routines/section_helps.rb:63 -msgid "<p><b>Menu Section</b></p>" -msgstr "<p><b>菜单项</b></p>" - -#: src/include/bootloader/routines/section_helps.rb:64 -msgid "<p><b>Partition of Menu File</b></p>" -msgstr "<p><b>菜单文件的分区</b></p>" - -#: src/include/bootloader/routines/section_helps.rb:65 -msgid "<p><b>Menu Description File</b> specifies path on root device from which is loaded menu file.</p>" -msgstr "<p><b>菜单描述文件</b>指定了从其加载菜单文件的根设备路径。</p>" - -#: src/include/bootloader/routines/section_helps.rb:68 -msgid "<p><b>Map Section to the First Disk from Device Map</b> Windows usually need to be on the first disk.</p>" -msgstr "<p><b>映射引导项到设备映射中的第一个磁盘</b> Windows 通常需要在第一个磁盘上。</p>l" - -#: src/include/bootloader/routines/section_helps.rb:71 -msgid "" -"<p><b>Measures</b> includes measured files with PCR. Change table is possible via buttons: <b>Add</b> , \n" -"<b>Edit</b> and <b>Delete</b></p>" -msgstr "" -"<p><b>测量</b> 包含了用于 PCR 的测量文件。\n" -"可通过 <b>添加</b>，<b>编辑</b>和<b>删除</b>修改表格。</p>" - -#: src/include/bootloader/routines/section_helps.rb:74 -msgid "" -"<p><b>Allow attempt to relocate</b>\n" -"Usually specified in global section</p>" -msgstr "" -"<p><b>允许尝试重新定位</b>\n" -"通常在全局项中指定</p>" - -#: src/include/bootloader/routines/section_helps.rb:77 -msgid "" -"<p><b>Force root filesystem to be mounted read-only</b><br>\n" -"Usually specified in global section</p>" -msgstr "" -"<p><b>强制只读挂载根文件系统</b><br>\n" -"通常在全局项中指定</p>" - -#: src/include/bootloader/routines/section_helps.rb:80 -msgid "" -"<p>Select <b>Dump Section</b> to add a section that specifies how to\n" -"create a system dump either on a DASD disk partition or tape device or to a\n" -"file on a SCSI disk partition.</p>" -msgstr "" -"<p>选择<b>转储项</b>来添加一个指定了如何\n" -"在 DASD 磁盘分区、磁带设备或者 SCSI 磁盘分区的文件中创建系统转储的项。</p>" - -#: src/include/bootloader/routines/section_helps.rb:85 -msgid "" -"<p>Select <b>Menu Section</b> to add a new menu to the configuration.\n" -"Menu sections represent a list of tasks which are grouped together.</p>\n" -msgstr "" -"<p>选择<b>菜单项</b>来添加一个新菜单到配置。\n" -"菜单项代表了一系列组合在一起的任务。</p>\n" - -#: src/include/bootloader/routines/section_helps.rb:88 -msgid "" -"<p>Select <b>Enable SELinux</b> to add the needed kernel boot parameters to enable the SELinux security framework. \n" -"Please note that this will also disable AppArmor.</p>" -msgstr "" -"<p>选择<b>启用 SELinux</b> 来添加必要的内核引导参数来启用 SELinux 安全框架。\n" -"请注意这也将禁用 AppArmor。</p>" - -#. radio button -#: src/include/bootloader/routines/section_helps.rb:95 -#: src/include/bootloader/routines/section_widgets.rb:583 -msgid "Image Section" -msgstr "映像项" - -#: src/include/bootloader/routines/section_helps.rb:96 -msgid "&Kernel Image" -msgstr "内核映像(&K)" - -#: src/include/bootloader/routines/section_helps.rb:97 -msgid "&Root Device" -msgstr "根设备(&R)" - -#: src/include/bootloader/routines/section_helps.rb:100 -msgid "&Initial RAM Disk" -msgstr "初始内存磁盘(&I)" - -#: src/include/bootloader/routines/section_helps.rb:101 -msgid "Chainloader Section" -msgstr "链式加载器项" - -#: src/include/bootloader/routines/section_helps.rb:102 -msgid "Use Password Protection" -msgstr "使用密码保护" - -#: src/include/bootloader/routines/section_helps.rb:103 -msgid "&Other System" -msgstr "其它系统(&O)" - -#: src/include/bootloader/routines/section_helps.rb:104 -msgid "Do not &verify Filesystem before Booting" -msgstr "引导前不校验文件系统(&V)" - -#: src/include/bootloader/routines/section_helps.rb:105 -msgid "&Activate this Partition when selected for Boot" -msgstr "当选为引导分区时激活此分区(&A)" - -#: src/include/bootloader/routines/section_helps.rb:106 -msgid "B&lock Offset for Chainloading" -msgstr "阻止链式加载的偏移(&L)" - -#: src/include/bootloader/routines/section_helps.rb:107 -msgid "&Map Section to the First Disk in Device Map" -msgstr "映射引导项到设备映射中的第一个磁盘(&M)" - -#: src/include/bootloader/routines/section_helps.rb:109 -msgid "&Hypervisor" -msgstr "管理程序(&H)" - -#: src/include/bootloader/routines/section_helps.rb:110 -msgid "&Additional Xen Hypervisor Parameters" -msgstr "Xen 管理程序额外参数(&A)" - -#: src/include/bootloader/routines/section_helps.rb:112 -msgid "&Partition of Menu File" -msgstr "菜单文件的分区(&P)" - -#: src/include/bootloader/routines/section_helps.rb:113 -msgid "&Menu Description File" -msgstr "菜单描述文件(&M)" - -#: src/include/bootloader/routines/section_helps.rb:114 -msgid "&Force root filesystem to be mounted read-only" -msgstr "强制只读挂载根文件系统(&F)" - -#: src/include/bootloader/routines/section_helps.rb:115 -msgid "Allow attempt to &relocate" -msgstr "允许尝试重新定位(&R)" - -#: src/include/bootloader/routines/section_helps.rb:116 -msgid "Tar&get Directory for Section" -msgstr "引导项目标文件夹(&G)" - -#: src/include/bootloader/routines/section_helps.rb:117 -msgid "Op&tional Parameter File" -msgstr "可选参数文件(&T)" - -#: src/include/bootloader/routines/section_helps.rb:118 -msgid "Dump Section (obsolete)" -msgstr "转储项目(淘汰)" - -#: src/include/bootloader/routines/section_helps.rb:119 -msgid "&Dump Device" -msgstr "转储设备(&D)" - -#: src/include/bootloader/routines/section_helps.rb:120 -msgid "&SCSI Dump Device" -msgstr "&SCSI 转储设备" - -#: src/include/bootloader/routines/section_helps.rb:122 -msgid "&List of Menu Entries" -msgstr "菜单项列表(&L)" - -#: src/include/bootloader/routines/section_helps.rb:123 -msgid "&Number of Default Entry" -msgstr "默认项数量(&N)" - -#: src/include/bootloader/routines/section_helps.rb:124 -msgid "&Timeout in seconds" -msgstr "超时(以秒计)(&S)" - -#: src/include/bootloader/routines/section_helps.rb:125 -msgid "&Show boot menu" -msgstr "显示引导菜单(&S)" - -#: src/include/bootloader/routines/section_helps.rb:126 -msgid "C&opy Image to Boot Partition" -msgstr "复制映像到引导分区(&C)" - -#: src/include/bootloader/routines/section_helps.rb:127 -msgid "&Skip Section gracefully on Errors" -msgstr "出错时优雅地跳过该项(&S)" - -#: src/include/bootloader/routines/section_helps.rb:128 -msgid "Boot &Partition of Other System" -msgstr "其它系统的引导分区(&P)" - -#. Cache for CommonSectionWidgets -#: src/include/bootloader/routines/section_widgets.rb:58 -msgid "Image section must have specified kernel image" -msgstr "映像项必须指定内核映像" - -#: src/include/bootloader/routines/section_widgets.rb:65 -msgid "Image file doesn't exist now. Do you really want use it?" -msgstr "映像文件目前不存在。您真的想要使用它吗？" - -#: src/include/bootloader/routines/section_widgets.rb:82 -msgid "Initrd file doesn't exist now. Do you really want use it?" -msgstr "Initrd 文件目前不存在。您真的想要使用它吗？" - -#. string append = BootCommon::current_section["append"]:""; -#: src/include/bootloader/routines/section_widgets.rb:227 -msgid "Enable &SELinux" -msgstr "启用 &SELinux" - -#. bnc#456362 filter out special chars like diacritics china chars etc. -#: src/include/bootloader/routines/section_widgets.rb:401 -msgid "The name includes unallowable char(s)" -msgstr "名称包含了不允许的字符" - -#: src/include/bootloader/routines/section_widgets.rb:533 -msgid "Ask for resolution during boot." -msgstr "引导期间询问分辨率。" - -#. radio button -#: src/include/bootloader/routines/section_widgets.rb:573 -msgid "Clone Selected Section" -msgstr "克隆所选引导项" - -#. radio button (don't translate 'chainloader') -#: src/include/bootloader/routines/section_widgets.rb:587 -msgid "Other System (Chainloader)" -msgstr "其它系统 (链式加载器)" - -#. frame -#: src/include/bootloader/routines/section_widgets.rb:609 -msgid "Section Type" -msgstr "引导项类型" - -#. text entry -#: src/include/bootloader/routines/section_widgets.rb:668 -msgid "Section &Name" -msgstr "引导项名称(&N)" - #. error report #: src/include/bootloader/routines/wizards.rb:36 msgid "Because of the partitioning, the boot loader cannot be installed properly." @@ -1825,99 +1065,65 @@ #. FATE#303643 Enable one-click changes in bootloader proposal #. -#. -#. FIXME identical code in BootGRUB module -#: src/modules/BootGRUB.rb:657 src/modules/BootGRUB2.rb:189 +#: src/modules/BootGRUB2.rb:193 msgid "Install bootcode into MBR (<a href=\"disable_boot_mbr\">do not install</a>)" msgstr "安装引导代码至 MBR(<a href=\"disable_boot_mbr\">不安装</a>)" -#: src/modules/BootGRUB.rb:661 src/modules/BootGRUB2.rb:193 +#: src/modules/BootGRUB2.rb:197 msgid "Do not install bootcode into MBR (<a href=\"enable_boot_mbr\">install</a>)" msgstr "不安装引导代码至 MBR(<a href=\"enable_boot_mbr\">安装</a>)" #. check for separated boot partition, use root otherwise -#. check for separated boot partition, use root otherwise -#: src/modules/BootGRUB.rb:673 src/modules/BootGRUB2.rb:206 +#: src/modules/BootGRUB2.rb:210 msgid "Install bootcode into /boot partition (<a href=\"disable_boot_boot\">do not install</a>)" msgstr "安装引导代码至 /boot 分区(<a href=\"disable_boot_boot\">不安装</a>)" -#: src/modules/BootGRUB.rb:677 src/modules/BootGRUB2.rb:210 +#: src/modules/BootGRUB2.rb:214 msgid "Do not install bootcode into /boot partition (<a href=\"enable_boot_boot\">install</a>)" msgstr "不安装引导代码至 /boot 分区(<a href=\"enable_boot_boot\">安装</a>)" -#: src/modules/BootGRUB.rb:683 src/modules/BootGRUB2.rb:216 +#: src/modules/BootGRUB2.rb:220 msgid "Install bootcode into \"/\" partition (<a href=\"disable_boot_root\">do not install</a>)" msgstr "安装引导代码至 \"/\" 分区(<a href=\"disable_boot_root\">不安装</a>)" -#: src/modules/BootGRUB.rb:687 src/modules/BootGRUB2.rb:220 +#: src/modules/BootGRUB2.rb:224 msgid "Do not install bootcode into \"/\" partition (<a href=\"enable_boot_root\">install</a>)" msgstr "不安装引导代码至 \"/\" 分区(<a href=\"enable_boot_root\">安装</a>)" +#. no location chosen, so warn user that it is problem unless he is sure +#: src/modules/BootGRUB2.rb:234 +msgid "Warning: No location for bootloader stage1 selected.Unless you know what you are doing please select above location." +msgstr "警告：没有为引导加载器 stage1 选择位置。除非您知道您正在做什么否则请选择上面的位置。" + #. TRANSLATORS: title for list of location proposals -#: src/modules/BootGRUB.rb:695 src/modules/BootGRUB2.rb:238 +#: src/modules/BootGRUB2.rb:242 msgid "Change Location: %s" msgstr "变动位置：%s" -#. summary text, %1 is bootloader name (eg. LILO) #. Display bootloader summary #. @return a list of summary lines #. Display bootloader summary #. @return a list of summary lines -#: src/modules/BootGRUB.rb:708 src/modules/BootGRUB2.rb:248 -#: src/modules/BootGRUB2EFI.rb:94 +#: src/modules/BootGRUB2.rb:252 src/modules/BootGRUB2EFI.rb:96 msgid "Boot Loader Type: %1" msgstr "引导加载器类型：%1" -#. summary text, location is location description (eg. /dev/hda) -#: src/modules/BootGRUB.rb:718 -msgid " (\"/boot\")" -msgstr " (\"/boot\")" - #. TRANSLATORS: extended is here for extended partition. Keep translation short. -#: src/modules/BootGRUB.rb:724 src/modules/BootGRUB2.rb:259 +#: src/modules/BootGRUB2.rb:263 msgid " (extended)" msgstr " (扩展分区)" -#: src/modules/BootGRUB.rb:730 -msgid " (\"/\")" -msgstr " (根分区)" - #. TRANSLATORS: MBR is acronym for Master Boot Record, if nothing locally specific #. is used in your language, then keep it as it is. -#: src/modules/BootGRUB.rb:736 src/modules/BootGRUB2.rb:267 +#: src/modules/BootGRUB2.rb:271 msgid " (MBR)" msgstr " (主引导记录)" -#. FIXME: should we translate all devices to names and add MBR suffixes? -#: src/modules/BootGRUB.rb:750 src/modules/BootGRUB2.rb:274 +#: src/modules/BootGRUB2.rb:278 msgid "Status Location: %1" msgstr "状态位置：%1" -#. section name "suffix" for default section -#: src/modules/BootGRUB.rb:768 -msgid " (default)" -msgstr " (默认)" - -#: src/modules/BootGRUB.rb:779 -msgid "Sections:<br>%1" -msgstr "项：<br>%1" - -#. summary text -#: src/modules/BootGRUB.rb:788 -msgid "Do not install boot loader; just create configuration files" -msgstr "不安装引导加载器；仅创建配置文件" - -#. menubutton item, keep as short as possible -#: src/modules/BootGRUB.rb:919 -msgid "Propose and &Merge with Existing GRUB Menus" -msgstr "建议并与已有 GRUB 菜单合并(&M)" - -#. no location chosen, so warn user that it is problem unless he is sure -#: src/modules/BootGRUB2.rb:230 -msgid "Warning: No location for bootloader stage1 selected.Unless you know what you are doing please select above location." -msgstr "警告：没有为引导加载器 stage1 选择位置。除非您知道您正在做什么否则请选择上面的位置。" - -#: src/modules/BootGRUB2EFI.rb:102 +#: src/modules/BootGRUB2EFI.rb:104 msgid "Enable Secure Boot: %1" msgstr "启用安全引导：%1" @@ -1931,111 +1137,586 @@ msgid "Unsupported combination of hardware platform %1 and bootloader %2" msgstr "不支持硬件平台 %1 和引导加载器 %2 的组合" -#. TODO add more devices -#: src/modules/BootSupportCheck.rb:128 -msgid "Partition number > 3 is being used for booting with GPT partition table" -msgstr ">3 的分区号正用于引导 GPT 分区表" - #. TRANSLATORS: description of technical problem. Do not translate technical terms unless native language have well known translation. -#: src/modules/BootSupportCheck.rb:153 +#: src/modules/BootSupportCheck.rb:140 msgid "Boot from MBR does not work together with btrfs filesystem and GPT disk label without bios_grub partition.To fix this issue, create bios_grub partition or use any ext filesystem for boot partition or do not install stage 1 to MBR." msgstr "从 MBR 引导不能与 btrfs 文件系统和没有 bios_grub 分区的 GPT 磁盘标签一起使用。要修复此问题，可创建 bios_grub 分区或使用任意 ext 文件系统作为引导分区，或不要把 stage 1 安装到 MBR。" #. check if boot device is on raid0 -#: src/modules/BootSupportCheck.rb:181 +#: src/modules/BootSupportCheck.rb:168 msgid "The boot device is on raid type: %1. System will not boot." msgstr "引导设备在 RAID 类型 %1 上。系统将无法引导。" #. bnc#501043 added check for valid configuration -#: src/modules/BootSupportCheck.rb:201 +#: src/modules/BootSupportCheck.rb:188 msgid "The boot device is on software RAID1. Select other bootloader location, e.g. Master Boot Record" msgstr "引导设备在软件 RAID1 上。请选择其他的引导加载器位置，例如，主引导记录" -#. s390 do not have bios boot order (bnc#874106) -#: src/modules/BootSupportCheck.rb:256 -msgid "YaST could not determine the exact boot order of disks needed for the device map. Review and possibly adjust the boot order of disks in \"Boot Loader Installation Details\"" -msgstr "YaST 无法确定设备映射所需的精确磁盘引导顺序。请在 \"引导加载器安装细节\" 中复核并调整磁盘的引导顺序" - #. if partitioning worked before upgrade, it will keep working (bnc#886604) -#: src/modules/BootSupportCheck.rb:276 +#: src/modules/BootSupportCheck.rb:244 msgid "Missing ext partition for booting. Cannot install boot code." msgstr "缺失用于引导的 ext 分区。无法安装引导代码。" #. progress stage, text in dialog (short, infinitiv) -#: src/modules/Bootloader.rb:170 +#: src/modules/Bootloader.rb:159 msgid "Check boot loader" msgstr "检查引导加载器" #. progress stage, text in dialog (short, infinitiv) -#: src/modules/Bootloader.rb:172 +#: src/modules/Bootloader.rb:161 msgid "Read partitioning" msgstr "读取分区" #. progress stage, text in dialog (short, infinitiv) -#: src/modules/Bootloader.rb:174 +#: src/modules/Bootloader.rb:163 msgid "Load boot loader settings" msgstr "加载引导加载器设置" #. progress step, text in dialog (short) -#: src/modules/Bootloader.rb:178 +#: src/modules/Bootloader.rb:167 msgid "Checking boot loader..." msgstr "正在检查引导加载器..." #. progress step, text in dialog (short) -#: src/modules/Bootloader.rb:180 +#: src/modules/Bootloader.rb:169 msgid "Reading partitioning..." msgstr "正在读取分区..." #. progress step, text in dialog (short) -#: src/modules/Bootloader.rb:182 +#: src/modules/Bootloader.rb:171 msgid "Loading boot loader settings..." msgstr "正在加载引导加载器设置..." #. dialog header -#: src/modules/Bootloader.rb:186 +#: src/modules/Bootloader.rb:175 msgid "Initializing Boot Loader Configuration" msgstr "正在初始化引导加载器配置" -#. part of summary, %1 is a part of kernel command line -#: src/modules/Bootloader.rb:307 -msgid "Added Kernel Parameters: %1" -msgstr "添加的内核参数：%1" - #. progress stage, text in dialog (short) -#: src/modules/Bootloader.rb:367 +#: src/modules/Bootloader.rb:322 msgid "Create initrd" msgstr "创建 initrd" #. progress stage, text in dialog (short) -#: src/modules/Bootloader.rb:369 +#: src/modules/Bootloader.rb:324 msgid "Save boot loader configuration files" msgstr "保存引导加载器配置文件" #. progress stage, text in dialog (short) -#: src/modules/Bootloader.rb:371 +#: src/modules/Bootloader.rb:326 msgid "Install boot loader" msgstr "安装引导加载器" #. progress step, text in dialog (short) -#: src/modules/Bootloader.rb:375 +#: src/modules/Bootloader.rb:330 msgid "Creating initrd..." msgstr "正在创建 initrd..." #. progress step, text in dialog (short) -#: src/modules/Bootloader.rb:377 +#: src/modules/Bootloader.rb:332 msgid "Saving boot loader configuration files..." msgstr "正在保存引导加载器配置文件..." #. progress step, text in dialog (short) -#: src/modules/Bootloader.rb:379 +#: src/modules/Bootloader.rb:334 msgid "Installing boot loader..." msgstr "正在安装引导加载器..." #. progress line -#: src/modules/Bootloader.rb:385 +#: src/modules/Bootloader.rb:340 msgid "Saving Boot Loader Configuration" msgstr "正在保存引导加载器配置" +#~ msgid "Delete a global option or option of a section" +#~ msgstr "删除全局选项或某引导项的选项" + +#~ msgid "Set a global option or option of a section" +#~ msgstr "设置全局选项或某引导项的选项" + +#~ msgid "Add a new section - please use interactive mode" +#~ msgstr "添加新引导项 - 请使用交互模式" + +#~ msgid "The name of the section" +#~ msgstr "引导项名称" + +#~ msgid "Section %1 not found." +#~ msgstr "未找到引导项 %1。" + +#~ msgid "Add option is available only in commandline interactive mode" +#~ msgstr "添加选项只在命令行交互模式中可用" + +#~ msgid "Section name must be specified." +#~ msgstr "必须指定引导项名称。" + +#~ msgid "Disk Order" +#~ msgstr "磁盘顺序" + +#~ msgid "Disk order settings" +#~ msgstr "磁盘顺序设置" + +#~ msgid "Boot Menu" +#~ msgstr "引导菜单" + +#~ msgid "" +#~ "<p><b>Use Trusted Grub</b> means install trusted grub and use it. Option <i>Graphical Menu File</i> will be ignored.\n" +#~ "It is recommended to install grub to MBR</p>" +#~ msgstr "" +#~ "<p><b>使用信任的 Grub</b>是指安装并使用信任的 grub。选项<i>图形菜单文件</i>将被忽略。\n" +#~ "推荐将 grub 安装到主引导记录。</p>" + +#~ msgid "<p><b>Graphical Menu File</b> defines the file to use for the graphical boot menu.</p>" +#~ msgstr "<p><b>图形菜单文件</b>定义了要用于图形引导菜单的文件。</p>" + +#~ msgid "<p><b>Enable Acoustic Signals</b> turn on/off acoustic signals.</p>" +#~ msgstr "<p><b>启用声音信号</b>开启/关闭声音信号。</p>" + +#~ msgid "Use &Trusted Grub" +#~ msgstr "使用信任的 Grub(&T)" + +#~ msgid "Graphical &Menu File" +#~ msgstr "图形菜单文件(&M)" + +#~ msgid "Choose new graphical menu file" +#~ msgstr "选择新图形菜单文件" + +#~ msgid "Enable Acoustic &Signals" +#~ msgstr "启用声音信号(&S)" + +#~ msgid "&Device" +#~ msgstr "设备(&D)" + +#~ msgid "Device map must contain at least one device" +#~ msgstr "设备映射必须包含至少一个设备" + +#~ msgid "D&isks" +#~ msgstr "磁盘(&I)" + +#~ msgid "&Up" +#~ msgstr "向上(&U)" + +#~ msgid "&Down" +#~ msgstr "向下(&D)" + +#~ msgid "Kernel Section" +#~ msgstr "内核项" + +#~ msgid "Section Settings" +#~ msgstr "引导项设置" + +#~ msgid "Boot Loader Settings: Section Management" +#~ msgstr "引导加载器设置：引导项管理" + +#~ msgid "Xen Section" +#~ msgstr "Xen 项" + +#~ msgid "Menu Section" +#~ msgstr "菜单项" + +#~ msgid "Dump Section" +#~ msgstr "转储项" + +#~ msgid "Other System Section" +#~ msgstr "其它系统项" + +#~ msgid "&Filename" +#~ msgstr "文件名(&F)" + +#~ msgid "Filename: %1" +#~ msgstr "文件名：%1" + +#~ msgid "Fi&le Contents" +#~ msgstr "文件内容(&L)" + +#~ msgid "Expert Manual Configuration" +#~ msgstr "专家手动配置" + +#~ msgid "Image" +#~ msgstr "映像" + +#~ msgid "Xen" +#~ msgstr "Xen" + +#~ msgid "Floppy" +#~ msgstr "软盘" + +#~ msgid "Menu" +#~ msgstr "菜单" + +#~ msgid "Dump" +#~ msgstr "转储" + +#~ msgid "Def." +#~ msgstr "默认" + +#~ msgid "Label" +#~ msgstr "标签" + +#~ msgid "Type" +#~ msgstr "类型" + +#~ msgid "Image / Device" +#~ msgstr "映像 / 设备" + +#~ msgid "Set as De&fault" +#~ msgstr "设置为默认(&F)" + +#~ msgid "" +#~ "\n" +#~ "You chose to change your boot loader. When converting \n" +#~ "the configuration, some settings might be lost.\n" +#~ "\n" +#~ "The current configuration will be saved and you can\n" +#~ "restore it if you return to the current boot loader.\n" +#~ "\n" +#~ "Select a course of action:\n" +#~ msgstr "" +#~ "\n" +#~ "您选择了修改您的引导加载器。\n" +#~ "当转换配置时，可能丢失一些设置。\n" +#~ "\n" +#~ "当前配置将被保存，若您后面再使用现在这个引导加载器时可以恢复当前配置。\n" +#~ "\n" +#~ "请选择一个动作：\n" + +#~ msgid "Co&nvert Current Configuration" +#~ msgstr "转换当前配置(&N)" + +#~ msgid "&Start New Configuration from Scratch" +#~ msgstr "从零开始新配置(&S)" + +#~ msgid "&Read Configuration Saved on Disk" +#~ msgstr "读取保存在磁盘上的配置(&R)" + +#~ msgid "Res&tore Configuration Saved before Conversion" +#~ msgstr "恢复转换前保存的配置(&T)" + +#~ msgid "Select the boot loader before editing sections." +#~ msgstr "在编辑各项前请选择引导加载器。" + +#~ msgid "&Section Management" +#~ msgstr "引导项管理(&S)" + +#~ msgid "Boot Loader &Installation" +#~ msgstr "引导加载器安装(&I)" + +#~ msgid "" +#~ "If you have multiple Linux systems installed,\n" +#~ "YaST can try to find them and merge their menus." +#~ msgstr "若您安装了多个 Linux 系统，YaST 可以尝试查找它们并合并它们的菜单。" + +#~ msgid "" +#~ "<p>\n" +#~ "- On a <b>Floppy Disk</b>.\n" +#~ "Use this to avoid the risk of interfering with an already existing\n" +#~ "boot mechanism. Enable booting from floppy disk in\n" +#~ "the BIOS of your machine to use this option.</p>" +#~ msgstr "" +#~ "<p>\n" +#~ "- 在<b>软盘</b>上。\n" +#~ "可使用此选项规避干扰已存在的引导机制的风险。\n" +#~ "请先在您计算机的 BIOS 中启用从软盘引导再使用此选项。</p>" + +#~ msgid "The %1 boot sector has been written to the floppy disk." +#~ msgstr "已将 %1 引导扇区写入软盘。" + +#~ msgid "Leave the floppy disk in the drive." +#~ msgstr "请将软盘留在驱动器中。" + +#~ msgid "Really delete section %1?" +#~ msgstr "真的删除引导项 %1 吗？" + +#~ msgid "" +#~ "The disk settings have changed.\n" +#~ "Check section %1 settings.\n" +#~ msgstr "" +#~ "磁盘设置已修改。\n" +#~ "请检查引导项 %1 的设置。\n" + +#~ msgid "" +#~ "The disk settings have changed and you edited boot loader\n" +#~ "configuration files manually. Check the boot loader settings.\n" +#~ msgstr "" +#~ "磁盘设置已修改并且您手动编辑了引导加载器配置文件。\n" +#~ "请检查引导加载器设置。\n" + +#~ msgid "Do Not Create a File System" +#~ msgstr "不创建文件系统" + +#~ msgid "Create an ext2 File System" +#~ msgstr "创建 ext2 文件系统" + +#~ msgid "Create a FAT File System" +#~ msgstr "创建 FAT 文件系统" + +#~ msgid "" +#~ "The boot loader boot sector will be written\n" +#~ "to a floppy disk. Insert a floppy disk\n" +#~ "and confirm with OK.\n" +#~ msgstr "" +#~ "引导加载器引导扇区将被写入到一张软盘。\n" +#~ "请插入软盘并按「好呢」确认。\n" + +#~ msgid "&Low Level Format" +#~ msgstr "低级格式化(&L)" + +#~ msgid "&Create File System" +#~ msgstr "创建文件系统(&C)" + +#~ msgid "Low level format failed. Try again?" +#~ msgstr "低级格式化失败。重试吗？" + +#~ msgid "Creating file system failed." +#~ msgstr "创建文件系统失败。" + +#~ msgid "Unable to install the boot loader." +#~ msgstr "无法安装引导加载器。" + +#~ msgid "<p><b>Image Section</b></p>" +#~ msgstr "<p><b>映像项</b></p>" + +#~ msgid "<p><b>Kernel Image</b> defines the kernel to boot. Either enter the name directly or choose via <b>Browse</b>.</p>" +#~ msgstr "<p><b>内核映像</b>定义了要引导的内核。可直接输入名称，或通过<b>浏览</b>选择。</p>" + +#~ msgid "<p><b>Root Device</b> sets the device to pass to the kernel as root device.</p>" +#~ msgstr "<p><b>根设备</b>设置了要传递给内核作为根设备的设备。</p>" + +#~ msgid "" +#~ "<p><b>Initial RAM Disk</b>, if not empty, defines the initial ramdisk to use. Either enter the path and file name\n" +#~ "directly or choose by using <b>Browse</b>.</p>\n" +#~ msgstr "" +#~ "<p><b>初始内存磁盘</b>，若非空则定义了要使用的初始 ramdisk。\n" +#~ "可直接输入路径和文件名或通过<b>浏览</b>选择。</p>\n" + +#~ msgid "<p>Select <b>Chainloader Section</b> if you want to define a section for booting an OS other than Linux.</p>" +#~ msgstr "<p>若您想要定义一个引导非 Linux 操作系统的引导项，请选择<b>链式加载器项</b>。</p>" + +#~ msgid "<p>Setting <b>Use Password Protection</p> will require a password to select this section.</p>" +#~ msgstr "<p>设置<b>使用密码保护</p>将会在选择此项时询问密码。</p>" + +#~ msgid "<p><b>Other System</b> lets you choose among the non-Linux operating systems found on your computer.</p>" +#~ msgstr "<p><b>其它系统</b>可让您从您计算机上发现的非 Linux 操作系统中选择。</p>" + +#~ msgid "<p>Select <b>Activate this Partition when selected for Boot</b> if your BIOS needs this flag set in order to boot it</p>" +#~ msgstr "<p>若您 BIOS 需要设置此旗标才能引导之，请选择<b>当选为引导分区时激活此分区</b></p>" + +#~ msgid "" +#~ "<p><b>Block Offset for Chainloading</b> lets you specify the list of blocks to boot. In most cases you want\n" +#~ "to specify <code>+1</code> here. For specifics on blocklist notation see the grub documentation.</p>\n" +#~ msgstr "" +#~ "<p><b>阻止链式加载偏移</b>可让您指定要引导的块列表。 \n" +#~ "在多数情况下您需要在此指定 <code>+1</code>。 \n" +#~ "有关块列表的规范请参考 grub 文档。</p>\n" + +#~ msgid "" +#~ "<p>Select <b>Xen Section</b> if you want to add a new Linux kernel or other image \n" +#~ "and start it in a Xen environment.</p>\n" +#~ msgstr "<p>若您想要添加一个新 Linux 内核或其它映像并在 Xen 环境中启动之，请选择 <b>Xen 项</b>。</p>\n" + +#~ msgid "<p><b>Hypervisor</b> specifies the Hypervisor to use.</p>" +#~ msgstr "<p><b>管理程序</b>指定了要使用的管理程序。</p>" + +#~ msgid "<p><b>Additional Xen Hypervisor Parameters</b> lets you define additional parameters to pass to the xen hypervisor.</p>" +#~ msgstr "<p><b>Xen 管理程序额外参数</b>可让您定义要传递给 xen 管理程序的额外参数。</p>" + +#~ msgid "<p><b>Menu Section</b></p>" +#~ msgstr "<p><b>菜单项</b></p>" + +#~ msgid "<p><b>Partition of Menu File</b></p>" +#~ msgstr "<p><b>菜单文件的分区</b></p>" + +#~ msgid "<p><b>Menu Description File</b> specifies path on root device from which is loaded menu file.</p>" +#~ msgstr "<p><b>菜单描述文件</b>指定了从其加载菜单文件的根设备路径。</p>" + +#~ msgid "<p><b>Map Section to the First Disk from Device Map</b> Windows usually need to be on the first disk.</p>" +#~ msgstr "<p><b>映射引导项到设备映射中的第一个磁盘</b> Windows 通常需要在第一个磁盘上。</p>l" + +#~ msgid "" +#~ "<p><b>Measures</b> includes measured files with PCR. Change table is possible via buttons: <b>Add</b> , \n" +#~ "<b>Edit</b> and <b>Delete</b></p>" +#~ msgstr "" +#~ "<p><b>测量</b> 包含了用于 PCR 的测量文件。\n" +#~ "可通过 <b>添加</b>，<b>编辑</b>和<b>删除</b>修改表格。</p>" + +#~ msgid "" +#~ "<p><b>Allow attempt to relocate</b>\n" +#~ "Usually specified in global section</p>" +#~ msgstr "" +#~ "<p><b>允许尝试重新定位</b>\n" +#~ "通常在全局项中指定</p>" + +#~ msgid "" +#~ "<p><b>Force root filesystem to be mounted read-only</b><br>\n" +#~ "Usually specified in global section</p>" +#~ msgstr "" +#~ "<p><b>强制只读挂载根文件系统</b><br>\n" +#~ "通常在全局项中指定</p>" + +#~ msgid "" +#~ "<p>Select <b>Dump Section</b> to add a section that specifies how to\n" +#~ "create a system dump either on a DASD disk partition or tape device or to a\n" +#~ "file on a SCSI disk partition.</p>" +#~ msgstr "" +#~ "<p>选择<b>转储项</b>来添加一个指定了如何\n" +#~ "在 DASD 磁盘分区、磁带设备或者 SCSI 磁盘分区的文件中创建系统转储的项。</p>" + +#~ msgid "" +#~ "<p>Select <b>Menu Section</b> to add a new menu to the configuration.\n" +#~ "Menu sections represent a list of tasks which are grouped together.</p>\n" +#~ msgstr "" +#~ "<p>选择<b>菜单项</b>来添加一个新菜单到配置。\n" +#~ "菜单项代表了一系列组合在一起的任务。</p>\n" + +#~ msgid "" +#~ "<p>Select <b>Enable SELinux</b> to add the needed kernel boot parameters to enable the SELinux security framework. \n" +#~ "Please note that this will also disable AppArmor.</p>" +#~ msgstr "" +#~ "<p>选择<b>启用 SELinux</b> 来添加必要的内核引导参数来启用 SELinux 安全框架。\n" +#~ "请注意这也将禁用 AppArmor。</p>" + +#~ msgid "Image Section" +#~ msgstr "映像项" + +#~ msgid "&Kernel Image" +#~ msgstr "内核映像(&K)" + +#~ msgid "&Root Device" +#~ msgstr "根设备(&R)" + +#~ msgid "&Initial RAM Disk" +#~ msgstr "初始内存磁盘(&I)" + +#~ msgid "Chainloader Section" +#~ msgstr "链式加载器项" + +#~ msgid "Use Password Protection" +#~ msgstr "使用密码保护" + +#~ msgid "&Other System" +#~ msgstr "其它系统(&O)" + +#~ msgid "Do not &verify Filesystem before Booting" +#~ msgstr "引导前不校验文件系统(&V)" + +#~ msgid "&Activate this Partition when selected for Boot" +#~ msgstr "当选为引导分区时激活此分区(&A)" + +#~ msgid "B&lock Offset for Chainloading" +#~ msgstr "阻止链式加载的偏移(&L)" + +#~ msgid "&Map Section to the First Disk in Device Map" +#~ msgstr "映射引导项到设备映射中的第一个磁盘(&M)" + +#~ msgid "&Hypervisor" +#~ msgstr "管理程序(&H)" + +#~ msgid "&Additional Xen Hypervisor Parameters" +#~ msgstr "Xen 管理程序额外参数(&A)" + +#~ msgid "&Partition of Menu File" +#~ msgstr "菜单文件的分区(&P)" + +#~ msgid "&Menu Description File" +#~ msgstr "菜单描述文件(&M)" + +#~ msgid "&Force root filesystem to be mounted read-only" +#~ msgstr "强制只读挂载根文件系统(&F)" + +#~ msgid "Allow attempt to &relocate" +#~ msgstr "允许尝试重新定位(&R)" + +#~ msgid "Tar&get Directory for Section" +#~ msgstr "引导项目标文件夹(&G)" + +#~ msgid "Op&tional Parameter File" +#~ msgstr "可选参数文件(&T)" + +#~ msgid "Dump Section (obsolete)" +#~ msgstr "转储项目(淘汰)" + +#~ msgid "&Dump Device" +#~ msgstr "转储设备(&D)" + +#~ msgid "&SCSI Dump Device" +#~ msgstr "&SCSI 转储设备" + +#~ msgid "&List of Menu Entries" +#~ msgstr "菜单项列表(&L)" + +#~ msgid "&Number of Default Entry" +#~ msgstr "默认项数量(&N)" + +#~ msgid "&Timeout in seconds" +#~ msgstr "超时(以秒计)(&S)" + +#~ msgid "&Show boot menu" +#~ msgstr "显示引导菜单(&S)" + +#~ msgid "C&opy Image to Boot Partition" +#~ msgstr "复制映像到引导分区(&C)" + +#~ msgid "&Skip Section gracefully on Errors" +#~ msgstr "出错时优雅地跳过该项(&S)" + +#~ msgid "Boot &Partition of Other System" +#~ msgstr "其它系统的引导分区(&P)" + +#~ msgid "Image section must have specified kernel image" +#~ msgstr "映像项必须指定内核映像" + +#~ msgid "Image file doesn't exist now. Do you really want use it?" +#~ msgstr "映像文件目前不存在。您真的想要使用它吗？" + +#~ msgid "Initrd file doesn't exist now. Do you really want use it?" +#~ msgstr "Initrd 文件目前不存在。您真的想要使用它吗？" + +#~ msgid "Enable &SELinux" +#~ msgstr "启用 &SELinux" + +#~ msgid "The name includes unallowable char(s)" +#~ msgstr "名称包含了不允许的字符" + +#~ msgid "Ask for resolution during boot." +#~ msgstr "引导期间询问分辨率。" + +#~ msgid "Clone Selected Section" +#~ msgstr "克隆所选引导项" + +#~ msgid "Other System (Chainloader)" +#~ msgstr "其它系统 (链式加载器)" + +#~ msgid "Section Type" +#~ msgstr "引导项类型" + +#~ msgid "Section &Name" +#~ msgstr "引导项名称(&N)" + +#~ msgid " (\"/boot\")" +#~ msgstr " (\"/boot\")" + +#~ msgid " (\"/\")" +#~ msgstr " (根分区)" + +#~ msgid " (default)" +#~ msgstr " (默认)" + +#~ msgid "Sections:<br>%1" +#~ msgstr "项：<br>%1" + +#~ msgid "Do not install boot loader; just create configuration files" +#~ msgstr "不安装引导加载器；仅创建配置文件" + +#~ msgid "Propose and &Merge with Existing GRUB Menus" +#~ msgstr "建议并与已有 GRUB 菜单合并(&M)" + +#~ msgid "Partition number > 3 is being used for booting with GPT partition table" +#~ msgstr ">3 的分区号正用于引导 GPT 分区表" + +#~ msgid "YaST could not determine the exact boot order of disks needed for the device map. Review and possibly adjust the boot order of disks in \"Boot Loader Installation Details\"" +#~ msgstr "YaST 无法确定设备映射所需的精确磁盘引导顺序。请在 \"引导加载器安装细节\" 中复核并调整磁盘的引导顺序" + +#~ msgid "Added Kernel Parameters: %1" +#~ msgstr "添加的内核参数：%1" + #~ msgid "The bootloader is installed on a partition that does not lie entirely below %1 GB. The system might not boot if BIOS support only lba24 (result is error 18 during install grub MBR)." #~ msgstr "引导加载器安装在一个不完全小于 %1 GB 的分区上。若 BIOS 只支持 lba24 (安装 grub 主引导记录时出现 error 18 即为表象)，则系统可能无法引导。" Modified: trunk/yast/zh_CN/po/cluster.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/cluster.zh_CN.po 2014-10-29 15:59:29 UTC (rev 90431) +++ trunk/yast/zh_CN/po/cluster.zh_CN.po 2014-10-29 16:00:17 UTC (rev 90432) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2014-10-29 16:20+0100\n" "PO-Revision-Date: 2014-07-08 13:15+0800\n" "Last-Translator: 玛格丽特 · 苏 <marguerite@opensuse.org>\n" "Language-Team: Chinese Simplified <kde-i18n-doc@kde.org>\n" @@ -97,170 +97,259 @@ msgid "Redundant IP Address" msgstr "冗余 IP 地址" -#: src/include/cluster/dialogs.rb:115 -msgid "nodeid" -msgstr "节点 ID" +#: src/include/cluster/dialogs.rb:115 src/include/cluster/dialogs.rb:499 +#, fuzzy +#| msgid "Node IP" +msgid "Node ID" +msgstr "节点 IP" +#. Set need to require 'set' +#: src/include/cluster/dialogs.rb:163 +msgid "Node ID has to be fulfilled with a positive integer" +msgstr "" + +#: src/include/cluster/dialogs.rb:170 +#, fuzzy +#| msgid "The hardware address must be unique." +msgid "Node ID must be unique" +msgstr "硬件地址必须是唯一的。" + +#. BNC#871970, change member address struct +#: src/include/cluster/dialogs.rb:191 src/include/cluster/dialogs.rb:245 +#, fuzzy +#| msgid "Bind Network Address:" +msgid "The Bind Network Address has to be fulfilled" +msgstr "绑定网络地址：" + +#: src/include/cluster/dialogs.rb:197 +msgid "The cluster name has to be fulfilled" +msgstr "" + +#: src/include/cluster/dialogs.rb:214 +#, fuzzy +#| msgid "The hardware address must be defined." +msgid "The Member Address has to be fulfilled" +msgstr "硬件地址必须定义。" + +#. BNC#880242, expected_votes must have value when "udp" +#: src/include/cluster/dialogs.rb:220 +#, fuzzy +#| msgid "Play the test sound when the card is configured" +msgid "The Expected Votes has to be fulfilled when udp is configured" +msgstr "配置声卡时播放测试声音" + +#: src/include/cluster/dialogs.rb:226 src/include/cluster/dialogs.rb:254 +#: src/include/cluster/dialogs.rb:1463 +msgid "The Multicast Address has to be fulfilled" +msgstr "" + +#: src/include/cluster/dialogs.rb:236 src/include/cluster/dialogs.rb:264 +#, fuzzy +#| msgid "The value for pos must be a positive integer." +msgid "The Multicast port must be a positive integer" +msgstr "位置值必须为正整数。" + +#: src/include/cluster/dialogs.rb:270 +msgid "Only passive or active can be chosen if multiple interface used. Set to passive." +msgstr "" + #. BNC#871970, change member address struct to memberaddr #: src/include/cluster/dialogs.rb:439 msgid "Transport:" msgstr "传输：" -#: src/include/cluster/dialogs.rb:444 +#: src/include/cluster/dialogs.rb:447 msgid "Channel" msgstr "频道" -#: src/include/cluster/dialogs.rb:449 src/include/cluster/dialogs.rb:470 +#: src/include/cluster/dialogs.rb:452 src/include/cluster/dialogs.rb:473 msgid "Bind Network Address:" msgstr "绑定网络地址：" -#: src/include/cluster/dialogs.rb:455 src/include/cluster/dialogs.rb:473 -#: src/include/cluster/dialogs.rb:1396 +#: src/include/cluster/dialogs.rb:458 src/include/cluster/dialogs.rb:476 +#: src/include/cluster/dialogs.rb:1399 msgid "Multicast Address:" msgstr "多播地址：" -#: src/include/cluster/dialogs.rb:457 src/include/cluster/dialogs.rb:474 +#: src/include/cluster/dialogs.rb:460 src/include/cluster/dialogs.rb:477 msgid "Multicast Port:" msgstr "多播端口：" -#: src/include/cluster/dialogs.rb:464 +#: src/include/cluster/dialogs.rb:467 msgid "Redundant Channel" msgstr "冗余频道" -#: src/include/cluster/dialogs.rb:480 +#: src/include/cluster/dialogs.rb:483 msgid "Cluster Name:" msgstr "集群名称：" -#: src/include/cluster/dialogs.rb:481 +#: src/include/cluster/dialogs.rb:484 msgid "Expected Votes:" msgstr "期望票数：" -#: src/include/cluster/dialogs.rb:485 +#: src/include/cluster/dialogs.rb:488 msgid "rrp mode:" msgstr "rrp 模式：" -#: src/include/cluster/dialogs.rb:490 +#: src/include/cluster/dialogs.rb:493 msgid "Auto Generate Node ID" msgstr "自动生成节点 ID" -#: src/include/cluster/dialogs.rb:495 +#: src/include/cluster/dialogs.rb:498 msgid "Member Address:" msgstr "成员地址：" +#: src/include/cluster/dialogs.rb:499 +msgid "IP" +msgstr "IP" + +#: src/include/cluster/dialogs.rb:499 +#, fuzzy +#| msgid "Redundant IP Address" +msgid "Redundant IP" +msgstr "冗余 IP 地址" + +#. BNC#879596, check the corosync.conf format +#: src/include/cluster/dialogs.rb:539 +msgid "" +" NOTICE: Detected old corosync configuration.\n" +" Please reconfigure the member list and confirm all other settings." +msgstr "" + #. Notice, current could be "nil" if the list is empty. -#: src/include/cluster/dialogs.rb:731 +#: src/include/cluster/dialogs.rb:690 +msgid "Number of threads must be integer" +msgstr "" + +#: src/include/cluster/dialogs.rb:696 +msgid "Number of threads must larger then 0" +msgstr "" + +#: src/include/cluster/dialogs.rb:734 msgid "Enable Security Auth" msgstr "启用安全认证" -#: src/include/cluster/dialogs.rb:734 +#: src/include/cluster/dialogs.rb:737 msgid "Threads:" msgstr "线程：" -#: src/include/cluster/dialogs.rb:737 +#: src/include/cluster/dialogs.rb:740 msgid "For a newly created cluster, push the button below to generate /etc/corosync/authkey." msgstr "新创建的集群，请按下面按钮生成 /etc/corosync/authkey。" -#: src/include/cluster/dialogs.rb:742 +#: src/include/cluster/dialogs.rb:745 msgid "To join an existing cluster, please copy /etc/corosync/authkey from other nodes manually." msgstr "要加入一个已有集群，请从其他节点手动复制 /etc/corosync/authkey。" -#: src/include/cluster/dialogs.rb:847 src/include/cluster/dialogs.rb:917 +#: src/include/cluster/dialogs.rb:773 +msgid "Failed to create /etc/corosync/authkey" +msgstr "" + +#: src/include/cluster/dialogs.rb:775 +msgid "Create /etc/corosync/authkey succeeded" +msgstr "" + +#: src/include/cluster/dialogs.rb:850 src/include/cluster/dialogs.rb:920 msgid "Running" msgstr "运行中" -#: src/include/cluster/dialogs.rb:849 +#: src/include/cluster/dialogs.rb:852 msgid "Not running" msgstr "未运行" #. servie:cluster is the name of /etc/sysconfig/SuSEfirewall2.d/services/cluster -#: src/include/cluster/dialogs.rb:885 +#: src/include/cluster/dialogs.rb:888 msgid "Booting" msgstr "引导时" -#: src/include/cluster/dialogs.rb:895 -msgid "On -- Start pacemaker at booting" +#: src/include/cluster/dialogs.rb:898 +#, fuzzy +#| msgid "On -- Start pacemaker at booting" +msgid "On -- Start pacemaker during boot" msgstr "开 -- 引导时启动 pacemaker" -#: src/include/cluster/dialogs.rb:902 -msgid "Off -- Start pacemaker manually only" +#: src/include/cluster/dialogs.rb:905 +#, fuzzy +#| msgid "Off -- Start pacemaker manually only" +msgid "Off -- Start pacemaker manually" msgstr "关 -- 仅手动启动 pacemaker" -#: src/include/cluster/dialogs.rb:911 +#: src/include/cluster/dialogs.rb:914 msgid "Switch On and Off" msgstr "打开和关闭" -#: src/include/cluster/dialogs.rb:916 +#: src/include/cluster/dialogs.rb:919 msgid "Current Status: " msgstr "当前状态：" -#: src/include/cluster/dialogs.rb:925 +#: src/include/cluster/dialogs.rb:928 msgid "Start pacemaker Now" msgstr "立即启动 pacemaker" -#: src/include/cluster/dialogs.rb:926 +#: src/include/cluster/dialogs.rb:929 msgid "Stop pacemaker Now" msgstr "立即停止 pacemaker" #. BNC#874563,stop pacemaker could stop corosync since BNC#872651 is fixed -#: src/include/cluster/dialogs.rb:1024 +#: src/include/cluster/dialogs.rb:1027 msgid "Sync Host" msgstr "同步主机" -#: src/include/cluster/dialogs.rb:1028 src/include/cluster/dialogs.rb:1040 +#: src/include/cluster/dialogs.rb:1031 src/include/cluster/dialogs.rb:1043 msgid "Add" msgstr "添加" -#: src/include/cluster/dialogs.rb:1029 src/include/cluster/dialogs.rb:1041 +#: src/include/cluster/dialogs.rb:1032 src/include/cluster/dialogs.rb:1044 msgid "Del" msgstr "删除" -#: src/include/cluster/dialogs.rb:1030 src/include/cluster/dialogs.rb:1042 +#: src/include/cluster/dialogs.rb:1033 src/include/cluster/dialogs.rb:1045 msgid "Edit" msgstr "编辑" -#: src/include/cluster/dialogs.rb:1036 +#: src/include/cluster/dialogs.rb:1039 msgid "Sync File" msgstr "同步文件" -#: src/include/cluster/dialogs.rb:1043 +#: src/include/cluster/dialogs.rb:1046 msgid "Add Suggested Files" msgstr "添加建议的文件" -#: src/include/cluster/dialogs.rb:1052 +#: src/include/cluster/dialogs.rb:1055 msgid "Generate Pre-Shared-Keys" msgstr "生成预共享密钥" #. remove duplicated elements -#: src/include/cluster/dialogs.rb:1176 +#: src/include/cluster/dialogs.rb:1179 msgid "Csync2 Status Unknown" msgstr "Csync2 状态未知" -#: src/include/cluster/dialogs.rb:1179 +#: src/include/cluster/dialogs.rb:1182 msgid "Turn csync2 ON" msgstr "开启 csync2" -#: src/include/cluster/dialogs.rb:1182 +#: src/include/cluster/dialogs.rb:1185 msgid "Turn csync2 OFF" msgstr "关闭 csync2" -#: src/include/cluster/dialogs.rb:1212 +#: src/include/cluster/dialogs.rb:1215 msgid "Enter a hostname" msgstr "请输入一个主机名" -#: src/include/cluster/dialogs.rb:1226 +#: src/include/cluster/dialogs.rb:1229 msgid "Edit the hostname" msgstr "编辑主机名" -#: src/include/cluster/dialogs.rb:1240 +#: src/include/cluster/dialogs.rb:1243 msgid "Enter a filename to synchronize" msgstr "请输入要同步的文件名" -#: src/include/cluster/dialogs.rb:1255 +#: src/include/cluster/dialogs.rb:1258 msgid "Edit the filename" msgstr "编辑文件名" #. key file exist -#: src/include/cluster/dialogs.rb:1287 +#: src/include/cluster/dialogs.rb:1290 msgid "" "Key file %1 already exist.\n" "Do you want to overwrite it?" @@ -269,12 +358,12 @@ "您想要覆盖它吗？" #. remove exist key file -#: src/include/cluster/dialogs.rb:1297 +#: src/include/cluster/dialogs.rb:1300 msgid "Delete key file %1 failed." msgstr "未能删除密钥文件 %1。" #. generate key file -#: src/include/cluster/dialogs.rb:1311 +#: src/include/cluster/dialogs.rb:1314 msgid "" "Key file %1 is generated.\n" "Clicking \"Add Suggested Files\" button adds it to sync list." @@ -282,12 +371,12 @@ "已生成密钥文件 %1。\n" "点击\"添加建议的文件\"按钮将它添加到同步列表。" -#: src/include/cluster/dialogs.rb:1318 +#: src/include/cluster/dialogs.rb:1321 msgid "Key generation failed." msgstr "未能生成密钥。" #. SaveCsync2(); -#: src/include/cluster/dialogs.rb:1380 +#: src/include/cluster/dialogs.rb:1383 msgid "" "Conntrackd is a daemon which helps to duplicate firewall status between cluster nodes.\n" "YaST can help to configure some basic aspects of conntrackd.\n" @@ -297,29 +386,45 @@ "YaST 可辅助配置 conntrackd 的一些基础部分。\n" "您需要与 ocf:heartbeat:conntrackd 一起启动它。" -#: src/include/cluster/dialogs.rb:1391 +#: src/include/cluster/dialogs.rb:1394 msgid "Dedicated Interface:" msgstr "专用接口：" -#: src/include/cluster/dialogs.rb:1394 +#: src/include/cluster/dialogs.rb:1397 msgid "IP:" msgstr "IP：" -#: src/include/cluster/dialogs.rb:1397 +#: src/include/cluster/dialogs.rb:1400 msgid "Group Number:" msgstr "组编号：" -#: src/include/cluster/dialogs.rb:1401 +#: src/include/cluster/dialogs.rb:1404 msgid "Generate /etc/conntrackd/conntrackd.conf" msgstr "生成 /etc/conntrackd/conntrackd.conf" +#: src/include/cluster/dialogs.rb:1471 +#, fuzzy +#| msgid "The value for pos must be a positive integer." +msgid "The Group Number must be a positive integer" +msgstr "位置值必须为正整数。" + #. All helps are here #: src/include/cluster/helps.rb:35 +#, fuzzy +#| msgid "" +#| "<p><b><big>Bind Network Address</big></b><br>This specifies the address which the openais executive should bind. This address should always end in zero. If the totem traffic should be routed over 192.168.5.92, set bindnetaddr to 192.168.5.0.<br>This may also be an IPV6 address, in which case IPV6 networking will be used. In this case, the full address must be specified and there is no automatic selection of the network interface within a specific subnet as with IPv4. If IPv6 networking is used, the nodeid field must be specified.<br></p>\n" +#| "<p><b><big>Multicast Address</big></b><br>This is the multicast address used by openais executive. The default should work for most networks, but the network administrator should be queried about a multicast address to use. Avoid 224.x.x.x because this is a \"config\" multicast address.<br>This may also be an IPV6 multicast address, in which case IPV6 networking will be used. If IPv6 networking is used, the nodeid field must be specified.</p>\n" +#| "<p><b><big>Port</big></b><br>This specifies the UDP port number. It is possible to use the same multicast address on a network with the openais services configured for different UDP ports.<br></p>\n" +#| "<p><b><big>Member Address</big></b><br>This list specifies all the nodes in the cluster by IP address. This could be configurable when using udpu <br></p>\n" +#| "<p><b><big>Node ID</big></b><br>This configuration option is optional when using IPv4 and required when using IPv6. This is a 32 bit value specifying the node identifier delivered to the cluster membership service. If this is not specified with IPv4, the node id will be determined from the 32 bit IP address the system to which the system is bound with ring identifier of 0. The node identifier value of zero is reserved and should not be used.<br></p>\n" +#| "<p><b><big>rrp_mode</big></b><br>This specifies the mode of redundant ring, which may be none, active, or passive. Active replication offers slightly lower latency from transmit to delivery in faulty network environments but with less performance. Passive replication may nearly double the speed of the totem protocol if the protocol doesn't become cpu bound. The final option is none, in which case only one network interface will be used to operate the totem protocol. If only one interface directive is specified, none is automatically chosen. If multiple interface directives are specified, only active or passive may be chosen.<br></p>\n" +#| "<p><b><big>Expected votes</big></b><br>Expect vote number for voting quorum. Will be automatically calculated when the nodelist {} section is present in corosync.conf or can be specified in the quorum {} section.<br></p>\n" +#| "<p><b><big>Auto Generate Node ID</big></b><br>Nodeid is required when using IPv6. Auto node ID enabled will generate nodeid automatically.<br></p>\n" msgid "" "<p><b><big>Bind Network Address</big></b><br>This specifies the address which the openais executive should bind. This address should always end in zero. If the totem traffic should be routed over 192.168.5.92, set bindnetaddr to 192.168.5.0.<br>This may also be an IPV6 address, in which case IPV6 networking will be used. In this case, the full address must be specified and there is no automatic selection of the network interface within a specific subnet as with IPv4. If IPv6 networking is used, the nodeid field must be specified.<br></p>\n" "<p><b><big>Multicast Address</big></b><br>This is the multicast address used by openais executive. The default should work for most networks, but the network administrator should be queried about a multicast address to use. Avoid 224.x.x.x because this is a \"config\" multicast address.<br>This may also be an IPV6 multicast address, in which case IPV6 networking will be used. If IPv6 networking is used, the nodeid field must be specified.</p>\n" "<p><b><big>Port</big></b><br>This specifies the UDP port number. It is possible to use the same multicast address on a network with the openais services configured for different UDP ports.<br></p>\n" -"<p><b><big>Member Address</big></b><br>This list specifies all the nodes in the cluster by IP address. This could be configurable when using udpu <br></p>\n" +"<p><b><big>Member Address</big></b><br>This list specifies all the nodes in the cluster by IP address. This could be configurable when using udpu(Unicast). <br></p>\n" "<p><b><big>Node ID</big></b><br>This configuration option is optional when using IPv4 and required when using IPv6. This is a 32 bit value specifying the node identifier delivered to the cluster membership service. If this is not specified with IPv4, the node id will be determined from the 32 bit IP address the system to which the system is bound with ring identifier of 0. The node identifier value of zero is reserved and should not be used.<br></p>\n" "<p><b><big>rrp_mode</big></b><br>This specifies the mode of redundant ring, which may be none, active, or passive. Active replication offers slightly lower latency from transmit to delivery in faulty network environments but with less performance. Passive replication may nearly double the speed of the totem protocol if the protocol doesn't become cpu bound. The final option is none, in which case only one network interface will be used to operate the totem protocol. If only one interface directive is specified, none is automatically chosen. If multiple interface directives are specified, only active or passive may be chosen.<br></p>\n" "<p><b><big>Expected votes</big></b><br>Expect vote number for voting quorum. Will be automatically calculated when the nodelist {} section is present in corosync.conf or can be specified in the quorum {} section.<br></p>\n" @@ -335,10 +440,15 @@ "<p><b><big>自动生成节点 ID</big></b><br>当使用 IDv6 时需要节点 ID。启用自动生成节点 ID 将自动生成节点 ID。<br></p>\n" #: src/include/cluster/helps.rb:45 +#, fuzzy +#| msgid "" +#| "\n" +#| "<p><b><big>Threads</big></b><br>This directive controls how many threads are used to encrypt and send multicast messages. If secauth is off, the protocol will never use threaded sending. If secauth is on, this directive allows systems to be configured to use multiple threads to encrypt and send multicast messages. A thread directive of 0 indicates that no threaded send should be used. This mode offers best performance for non-SMP systems. The default is 0. <br></p>\n" +#| "<p><b><big>Enable Security Auth</big></b><br>This specifies that HMAC/SHA1 authentication should be used to authenticate all messages. It further specifies that all data should be encrypted with the sober128 encryption algorithm to protect data from eavesdropping. Enabling this option adds a 36 byte header to every message sent by totem which reduces total throughput. Encryption and authentication consume 75% of CPU cycles in aisexec as measured with gprof when enabled. For 100mbit networks with 1500 MTU frame transmissions: A throughput of 9mb/sec is possible with 100% cpu utilization when this option is enabled on 3ghz cpus. A throughput of 10mb/sec is possible wth 20% cpu utilization when this option is disabled on 3ghz cpus. For gig-e networks with large frame transmissions: A throughput of 20mb/sec is possible when this option is enabled on 3ghz cpus. A throughput of 60mb/sec is possible when this option is disabled on 3ghz cpus. The defaul t is on. <br></p>\n" msgid "" "\n" "<p><b><big>Threads</big></b><br>This directive controls how many threads are used to encrypt and send multicast messages. If secauth is off, the protocol will never use threaded sending. If secauth is on, this directive allows systems to be configured to use multiple threads to encrypt and send multicast messages. A thread directive of 0 indicates that no threaded send should be used. This mode offers best performance for non-SMP systems. The default is 0. <br></p>\n" -"<p><b><big>Enable Security Auth</big></b><br>This specifies that HMAC/SHA1 authentication should be used to authenticate all messages. It further specifies that all data should be encrypted with the sober128 encryption algorithm to protect data from eavesdropping. Enabling this option adds a 36 byte header to every message sent by totem which reduces total throughput. Encryption and authentication consume 75% of CPU cycles in aisexec as measured with gprof when enabled. For 100mbit networks with 1500 MTU frame transmissions: A throughput of 9mb/sec is possible with 100% cpu utilization when this option is enabled on 3ghz cpus. A throughput of 10mb/sec is possible wth 20% cpu utilization when this option is disabled on 3ghz cpus. For gig-e networks with large frame transmissions: A throughput of 20mb/sec is possible when this option is enabled on 3ghz cpus. A throughput of 60mb/sec is possible when this option is disabled on 3ghz cpus. The default i s on. <br></p>\n" +"<p><b><big>Enable Security Auth</big></b><br>This specifies that HMAC/SHA1 authentication should be used to authenticate all messages. It further specifies that all data should be encrypted with the sober128 encryption algorithm to protect data from eavesdropping. Enabling this option adds a 36 byte header to every message sent by totem which reduces total throughput. Encryption and authentication consume 75% of CPU cycles in aisexec as measured with gprof when enabled. For 100Mbit networks with 1500 MTU frame transmissions: A throughput of 9Mb/s is possible with 100% cpu utilization when this option is enabled on 3GHz cpus. A throughput of 10Mb/s is possible wth 20% cpu utilization when this option is disabled on 3GHz cpus. For gig-e networks with large frame transmissions: A throughput of 20Mb/s is possible when this option is enabled on 3GHz cpus. A throughput of 60Mb/s is possible when this option is disabled on 3GHz cpus. The default is on. <b r></p>\n" msgstr "" "\n" "<p><b><big>线程</big></b><br>该指令控制用于加密和发送多播消息的线程数。若安全认证为关，则协议永不使用多线程发送。若安全认证为开，此指令允许系统配置使用多线程来加密和发送多播消息。线程指令为 0 表明不使用多线程发送。此模式为非 SMP 系统提供了最大性能。默认为 0。</br></p>\n" @@ -531,6 +641,9 @@ msgid "Cannot write settings." msgstr "无法写入设置。" +#~ msgid "nodeid" +#~ msgstr "节点 ID" + #~ msgid "Enter a member address" #~ msgstr "请输入一个成员地址" Modified: trunk/yast/zh_CN/po/control.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/control.zh_CN.po 2014-10-29 15:59:29 UTC (rev 90431) +++ trunk/yast/zh_CN/po/control.zh_CN.po 2014-10-29 16:00:17 UTC (rev 90432) @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: control\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2014-10-29 16:21+0100\n" "PO-Revision-Date: 2014-06-08 16:22+0800\n" "Last-Translator: 玛格丽特 · 苏 <marguerite@opensuse.org>\n" "Language-Team: Chinese Simplified <opensuse-zh@opensuse.org>\n" @@ -24,220 +24,310 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" -#: control/control.SLES.glade.translations.glade:3 +#: control/control.openSUSE.glade.translations.glade:3 +#, fuzzy +#| msgid "" +#| "\n" +#| "<p><b>Congratulations!</b></p>\n" +#| "<p>The installation of openSUSE on your machine is complete.\n" +#| "After clicking <b>Finish</b>, you can log in to the system.</p>\n" +#| "<p>Visit us at %1.</p>\n" +#| "<p>Have a lot of fun!<br>Your openSUSE Development Team</p>\n" +#| "\t " msgid "" "\n" -"<p>\n" -"The installation has completed successfully.\n" -"Your system is ready for use.\n" -"Click Finish to log in to the system.\n" -"</p>\n" -"<p>\n" -"Please visit us at http://www.suse.com/.\n" -"</p>\n" -" " +"<p><b>Congratulations!</b></p>\n" +"<p>The installation of openSUSE on your machine is complete.\n" +"After clicking <b>Finish</b>, you can log in to the system.</p>\n" +"<p>Visit us at %1.</p>\n" +"<p>Have a lot of fun!<br>Your openSUSE Development Team</p>\n" +" " msgstr "" "\n" -"<p>\n" -"已成功完成安装。\n" -"您的系统已经可以使用了。\n" -"请点击完成来登入系统。\n" -"</p>\n" -"<p>\n" -"欢迎访问我们的站点 http://www.suse.com/。\n" -"</p>\n" -" " +"<p><b>恭喜！</b></p>\n" +"<p>openSUSE 已在您的计算机上安装完毕。\n" +"点击<b>完成</b>后，您就可以登入系统了。</p>\n" +"<p>欢迎访问我们的站点：%1。</p>\n" +"<p>祝您使用愉快！<br>您的 openSUSE 开发团队</p>\n" +"\t " -#: control/control.SLES.glade.translations.glade:14 -msgid "CIM Server" -msgstr "通用信息模型 (CIM) 服务器" +#: control/control.openSUSE.glade.translations.glade:10 +msgid "" +"The desktop environment on your computer provides the graphical user\n" +"interface for your computer, as well as a suite of applications for\n" +"email, Web browsing, office productivity, games, and utilities to\n" +"manage your computer.\n" +"\n" +"openSUSE offers a choice of desktop environments. The most widely\n" +"used desktop environments are GNOME and KDE, and they are equally\n" +"supported under openSUSE. Both desktop environments are easy to use,\n" +"highly integrated, and have an attractive look and feel. Each desktop\n" +"environment has a distinct style, so personal taste determines which\n" +"is the most appropriate desktop for you." +msgstr "" +"您计算机上的桌面环境为您的计算机提供了图形用户界面，以及用于\n" +"电子邮件、网络浏览、办公生产、游戏的一套应用程序\n" +"和管理计算机的实用工具。\n" +"\n" +"openSUSE 提供了几种桌面环境供您选择。使用最广泛的\n" +"桌面环境是 GNOME 和 KDE，它们在 openSUSE 下有着平等\n" +"的支持。两者均易于使用、高度集成、外观诱人。\n" +"每种桌面环境都有独特的风格，因此个人品味决定了哪款\n" +"桌面最适合您。" -#: control/control.SLES.glade.translations.glade:15 -#: control/control.SLES.glade.translations.glade:16 -#: control/control.SLES.glade.translations.glade:17 -#: control/control.SLES.glade.translations.glade:22 -#: control/control.SLES.glade.translations.glade:23 -#: control/control.SLES.glade.translations.glade:58 -#: control/control.SLES.glade.translations.glade:59 +#: control/control.openSUSE.glade.translations.glade:21 +msgid "GNOME Desktop" +msgstr "GNOME 桌面" + +#: control/control.openSUSE.glade.translations.glade:22 +msgid "KDE Desktop" +msgstr "KDE 桌面" + +#: control/control.openSUSE.glade.translations.glade:23 +msgid "XFCE Desktop" +msgstr "XFCE 桌面" + +#: control/control.openSUSE.glade.translations.glade:24 +msgid "LXDE Desktop" +msgstr "LXDE 桌面" + +#: control/control.openSUSE.glade.translations.glade:25 +msgid "Minimal X Window" +msgstr "极简 X 窗口系统" + +#: control/control.openSUSE.glade.translations.glade:26 +msgid "Enlightenment Desktop" +msgstr "Enlightenment 桌面" + +#: control/control.openSUSE.glade.translations.glade:27 +msgid "Minimal Server Selection (Text Mode)" +msgstr "极简服务器选集 (文本模式)" + +#: control/control.openSUSE.glade.translations.glade:28 +#: control/control.openSUSE.glade.translations.glade:29 +#: control/control.openSUSE.glade.translations.glade:32 +#: control/control.openSUSE.glade.translations.glade:70 +#: control/control.openSUSE.glade.translations.glade:71 msgid "Installation Settings" msgstr "安装设置" -#: control/control.SLES.glade.translations.glade:18 -msgid "Overview" -msgstr "概览" - -#: control/control.SLES.glade.translations.glade:19 -msgid "Expert" -msgstr "专家" - -#: control/control.SLES.glade.translations.glade:20 +#: control/control.openSUSE.glade.translations.glade:30 msgid "Live Installation Settings" msgstr "Live 安装设置" -#: control/control.SLES.glade.translations.glade:21 +#: control/control.openSUSE.glade.translations.glade:31 +#: control/control.openSUSE.glade.translations.glade:85 msgid "Update Settings" msgstr "更新设置" -#: control/control.SLES.glade.translations.glade:24 -#: control/control.SLES.glade.translations.glade:25 +#: control/control.openSUSE.glade.translations.glade:33 msgid "Network Configuration" msgstr "网络配置" -#: control/control.SLES.glade.translations.glade:26 -msgid "Network Services Configuration" -msgstr "网络服务配置" - -#: control/control.SLES.glade.translations.glade:27 -#: control/control.SLES.glade.translations.glade:28 -#: control/control.SLES.glade.translations.glade:29 +#: control/control.openSUSE.glade.translations.glade:34 msgid "Hardware Configuration" msgstr "硬件配置" -#: control/control.SLES.glade.translations.glade:30 -#: control/control.SLES.glade.translations.glade:65 -#: control/control.SLES.glade.translations.glade:91 +#: control/control.openSUSE.glade.translations.glade:35 +#: control/control.openSUSE.glade.translations.glade:77 +#: control/control.openSUSE.glade.translations.glade:103 msgid "Preparation" msgstr "准备" -#: control/control.SLES.glade.translations.glade:31 -#: control/control.SLES.glade.translations.glade:52 -#: control/control.SLES.glade.translations.glade:66 -msgid "Load Linuxrc Network Configuration" +#: control/control.openSUSE.glade.translations.glade:36 +#: control/control.openSUSE.glade.translations.glade:63 +#, fuzzy +#| msgid "Load Linuxrc Network Configuration" +msgid "Load linuxrc Network Configuration" msgstr "加载 Linuxrc 网络配置" -#: control/control.SLES.glade.translations.glade:32 -#: control/control.SLES.glade.translations.glade:53 -#: control/control.SLES.glade.translations.glade:67 +#: control/control.openSUSE.glade.translations.glade:37 +#: control/control.openSUSE.glade.translations.glade:64 msgid "Network Autosetup" msgstr "自动网络设置" -#: control/control.SLES.glade.translations.glade:33 -#: control/control.SLES.glade.translations.glade:54 -#: control/control.SLES.glade.translations.glade:68 +#: control/control.openSUSE.glade.translations.glade:38 +#: control/control.openSUSE.glade.translations.glade:65 +#: control/control.openSUSE.glade.translations.glade:78 msgid "Welcome" msgstr "欢迎" -#: control/control.SLES.glade.translations.glade:34 -#: control/control.SLES.glade.translations.glade:55 -#: control/control.SLES.glade.translations.glade:69 +#: control/control.openSUSE.glade.translations.glade:39 msgid "Network Activation" msgstr "网络激活" -#: control/control.SLES.glade.translations.glade:35 -#: control/control.SLES.glade.translations.glade:70 +#: control/control.openSUSE.glade.translations.glade:40 +#: control/control.openSUSE.glade.translations.glade:79 msgid "Disk Activation" msgstr "磁盘激活" -#: control/control.SLES.glade.translations.glade:36 -#: control/control.SLES.glade.translations.glade:37 -#: control/control.SLES.glade.translations.glade:71 -#: control/control.SLES.glade.translations.glade:92 +#: control/control.openSUSE.glade.translations.glade:41 +#: control/control.openSUSE.glade.translations.glade:42 +#: control/control.openSUSE.glade.translations.glade:80 +#: control/control.openSUSE.glade.translations.glade:104 msgid "System Analysis" msgstr "系统分析" -#: control/control.SLES.glade.translations.glade:38 -#: control/control.SLES.glade.translations.glade:73 -msgid "Add-On Products" -msgstr "附加产品" - -#: control/control.SLES.glade.translations.glade:39 -#: control/control.SLES.glade.translations.glade:56 +#: control/control.openSUSE.glade.translations.glade:43 +#: control/control.openSUSE.glade.translations.glade:67 msgid "Disk" msgstr "磁盘" -#: control/control.SLES.glade.translations.glade:40 -#: control/control.SLES.glade.translations.glade:57 +#: control/control.openSUSE.glade.translations.glade:44 +#: control/control.openSUSE.glade.translations.glade:66 msgid "Time Zone" msgstr "时区" -#: control/control.SLES.glade.translations.glade:41 -#: control/control.SLES.glade.translations.glade:51 +#: control/control.openSUSE.glade.translations.glade:45 +#: control/control.openSUSE.glade.translations.glade:82 +msgid "Online Repositories" +msgstr "在线软件源" + +#: control/control.openSUSE.glade.translations.glade:46 +#: control/control.openSUSE.glade.translations.glade:83 +msgid "Add-On Products" +msgstr "附加产品" + +#: control/control.openSUSE.glade.translations.glade:47 +msgid "Desktop Selection" +msgstr "桌面选择" + +#: control/control.openSUSE.glade.translations.glade:48 +#: control/control.openSUSE.glade.translations.glade:49 +#: control/control.openSUSE.glade.translations.glade:68 +#: control/control.openSUSE.glade.translations.glade:69 +msgid "User Settings" +msgstr "用户设置" + +#: control/control.openSUSE.glade.translations.glade:50 +#: control/control.openSUSE.glade.translations.glade:62 msgid "Installation" msgstr "安装" -#: control/control.SLES.glade.translations.glade:42 -msgid "Installation Summary" -msgstr "安装摘要" +#: control/control.openSUSE.glade.translations.glade:51 +msgid "Installation Overview" +msgstr "安装概览" -#: control/control.SLES.glade.translations.glade:43 -#: control/control.SLES.glade.translations.glade:44 -#: control/control.SLES.glade.translations.glade:45 -#: control/control.SLES.glade.translations.glade:46 -#: control/control.SLES.glade.translations.glade:47 -#: control/control.SLES.glade.translations.glade:48 -#: control/control.SLES.glade.translations.glade:49 -#: control/control.SLES.glade.translations.glade:50 -#: control/control.SLES.glade.translations.glade:60 -#: control/control.SLES.glade.translations.glade:61 -#: control/control.SLES.glade.translations.glade:62 -#: control/control.SLES.glade.translations.glade:63 -#: control/control.SLES.glade.translations.glade:64 -#: control/control.SLES.glade.translations.glade:85 -#: control/control.SLES.glade.translations.glade:86 -#: control/control.SLES.glade.translations.glade:87 -#: control/control.SLES.glade.translations.glade:88 -#: control/control.SLES.glade.translations.glade:89 -#: control/control.SLES.glade.translations.glade:90 -#: control/control.SLES.glade.translations.glade:105 -#: control/control.SLES.glade.translations.glade:106 -#: control/control.SLES.glade.translations.glade:107 +#: control/control.openSUSE.glade.translations.glade:52 +#: control/control.openSUSE.glade.translations.glade:53 +#: control/control.openSUSE.glade.translations.glade:54 +#: control/control.openSUSE.glade.translations.glade:55 +#: control/control.openSUSE.glade.translations.glade:56 +#: control/control.openSUSE.glade.translations.glade:57 +#: control/control.openSUSE.glade.translations.glade:58 +#: control/control.openSUSE.glade.translations.glade:59 +#: control/control.openSUSE.glade.translations.glade:60 +#: control/control.openSUSE.glade.translations.glade:61 +#: control/control.openSUSE.glade.translations.glade:72 +#: control/control.openSUSE.glade.translations.glade:73 +#: control/control.openSUSE.glade.translations.glade:74 +#: control/control.openSUSE.glade.translations.glade:75 +#: control/control.openSUSE.glade.translations.glade:76 +#: control/control.openSUSE.glade.translations.glade:96 +#: control/control.openSUSE.glade.translations.glade:97 +#: control/control.openSUSE.glade.translations.glade:98 +#: control/control.openSUSE.glade.translations.glade:99 +#: control/control.openSUSE.glade.translations.glade:100 +#: control/control.openSUSE.glade.translations.glade:101 +#: control/control.openSUSE.glade.translations.glade:102 +#: control/control.openSUSE.glade.translations.glade:117 +#: control/control.openSUSE.glade.translations.glade:118 +#: control/control.openSUSE.glade.translations.glade:119 msgid "Perform Installation" msgstr "执行安装" -#: control/control.SLES.glade.translations.glade:72 -#: control/control.SLES.glade.translations.glade:93 +#: control/control.openSUSE.glade.translations.glade:81 +#: control/control.openSUSE.glade.translations.glade:105 msgid "System for Update" msgstr "待更新系统" -#: control/control.SLES.glade.translations.glade:74 -#: control/control.SLES.glade.translations.glade:96 +#: control/control.openSUSE.glade.translations.glade:84 +#: control/control.openSUSE.glade.translations.glade:108 msgid "Update" msgstr "更新" -#: control/control.SLES.glade.translations.glade:75 -msgid "Update Summary" -msgstr "更新摘要" - -#: control/control.SLES.glade.translations.glade:76 -#: control/control.SLES.glade.translations.glade:77 -#: control/control.SLES.glade.translations.glade:78 -#: control/control.SLES.glade.translations.glade:79 -#: control/control.SLES.glade.translations.glade:80 -#: control/control.SLES.glade.translations.glade:98 -#: control/control.SLES.glade.translations.glade:99 -#: control/control.SLES.glade.translations.glade:100 -#: control/control.SLES.glade.translations.glade:101 -#: control/control.SLES.glade.translations.glade:102 -#: control/control.SLES.glade.translations.glade:103 -#: control/control.SLES.glade.translations.glade:104 -#: control/control.SLES.glade.translations.glade:110 -#: control/control.SLES.glade.translations.glade:111 +#: control/control.openSUSE.glade.translations.glade:86 +#: control/control.openSUSE.glade.translations.glade:87 +#: control/control.openSUSE.glade.translations.glade:88 +#: control/control.openSUSE.glade.translations.glade:89 +#: control/control.openSUSE.glade.translations.glade:90 +#: control/control.openSUSE.glade.translations.glade:110 +#: control/control.openSUSE.glade.translations.glade:111 +#: control/control.openSUSE.glade.translations.glade:112 +#: control/control.openSUSE.glade.translations.glade:113 +#: control/control.openSUSE.glade.translations.glade:114 +#: control/control.openSUSE.glade.translations.glade:115 +#: control/control.openSUSE.glade.translations.glade:116 +#: control/control.openSUSE.glade.translations.glade:122 +#: control/control.openSUSE.glade.translations.glade:123 msgid "Perform Update" msgstr "执行更新" -#: control/control.SLES.glade.translations.glade:81 +#: control/control.openSUSE.glade.translations.glade:91 +#: control/control.openSUSE.glade.translations.glade:120 +#: control/control.openSUSE.glade.translations.glade:124 +msgid "Configuration" +msgstr "配置" + +#: control/control.openSUSE.glade.translations.glade:92 msgid "Base Installation" msgstr "基本安装" -#: control/control.SLES.glade.translations.glade:82 -#: control/control.SLES.glade.translations.glade:83 -#: control/control.SLES.glade.translations.glade:84 -#: control/control.SLES.glade.translations.glade:94 -#: control/control.SLES.glade.translations.glade:95 -#: control/control.SLES.glade.translations.glade:97 +#: control/control.openSUSE.glade.translations.glade:93 +#: control/control.openSUSE.glade.translations.glade:94 +#: control/control.openSUSE.glade.translations.glade:95 +#: control/control.openSUSE.glade.translations.glade:106 +#: control/control.openSUSE.glade.translations.glade:107 +#: control/control.openSUSE.glade.translations.glade:109 msgid "AutoYaST Settings" msgstr "AutoYaST 设置" -#: control/control.SLES.glade.translations.glade:108 -#: control/control.SLES.glade.translations.glade:112 -msgid "Configuration" -msgstr "配置" - -#: control/control.SLES.glade.translations.glade:109 -#: control/control.SLES.glade.translations.glade:113 +#: control/control.openSUSE.glade.translations.glade:121 +#: control/control.openSUSE.glade.translations.glade:125 msgid "System Configuration" msgstr "系统配置" +#~ msgid "" +#~ "\n" +#~ "<p>\n" +#~ "The installation has completed successfully.\n" +#~ "Your system is ready for use.\n" +#~ "Click Finish to log in to the system.\n" +#~ "</p>\n" +#~ "<p>\n" +#~ "Please visit us at http://www.suse.com/.\n" +#~ "</p>\n" +#~ " " +#~ msgstr "" +#~ "\n" +#~ "<p>\n" +#~ "已成功完成安装。\n" +#~ "您的系统已经可以使用了。\n" +#~ "请点击完成来登入系统。\n" +#~ "</p>\n" +#~ "<p>\n" +#~ "欢迎访问我们的站点 http://www.suse.com/。\n" +#~ "</p>\n" +#~ " " + +#~ msgid "CIM Server" +#~ msgstr "通用信息模型 (CIM) 服务器" + +#~ msgid "Overview" +#~ msgstr "概览" + +#~ msgid "Expert" +#~ msgstr "专家" + +#~ msgid "Network Services Configuration" +#~ msgstr "网络服务配置" + +#~ msgid "Installation Summary" +#~ msgstr "安装摘要" + +#~ msgid "Update Summary" +#~ msgstr "更新摘要" + #~ msgid "Add-On Product Installation" #~ msgstr "附加产品安装" @@ -279,12 +369,6 @@ #~ msgid "Finishing configuration..." #~ msgstr "正在完成配置..." -#~ msgid "User Settings" -#~ msgstr "用户设置" - -#~ msgid "Installation Overview" -#~ msgstr "安装概览" - #~ msgid "Repair" #~ msgstr "修复" @@ -355,79 +439,12 @@ #~ msgid "KVM Virtualization Host (Local X11 Not Configured by Default)" #~ msgstr "KVM 虚拟化主机 (默认未配置本地 X11 窗口系统)" -#~ msgid "Desktop Selection" -#~ msgstr "桌面选择" - #~ msgid "Root Password" #~ msgstr "根用户密码" #~ msgid "" #~ "\n" #~ "<p><b>Congratulations!</b></p>\n" -#~ "<p>The installation of openSUSE on your machine is complete.\n" -#~ "After clicking <b>Finish</b>, you can log in to the system.</p>\n" -#~ "<p>Visit us at %1.</p>\n" -#~ "<p>Have a lot of fun!<br>Your openSUSE Development Team</p>\n" -#~ "\t " -#~ msgstr "" -#~ "\n" -#~ "<p><b>恭喜！</b></p>\n" -#~ "<p>openSUSE 已在您的计算机上安装完毕。\n" -#~ "点击<b>完成</b>后，您就可以登入系统了。</p>\n" -#~ "<p>欢迎访问我们的站点：%1。</p>\n" -#~ "<p>祝您使用愉快！<br>您的 openSUSE 开发团队</p>\n" -#~ "\t " - -#~ msgid "" -#~ "The desktop environment on your computer provides the graphical user\n" -#~ "interface for your computer, as well as a suite of applications for\n" -#~ "email, Web browsing, office productivity, games, and utilities to\n" -#~ "manage your computer.\n" -#~ "\n" -#~ "openSUSE offers a choice of desktop environments. The most widely\n" -#~ "used desktop environments are GNOME and KDE, and they are equally\n" -#~ "supported under openSUSE. Both desktop environments are easy to use,\n" -#~ "highly integrated, and have an attractive look and feel. Each desktop\n" -#~ "environment has a distinct style, so personal taste determines which\n" -#~ "is the most appropriate desktop for you." -#~ msgstr "" -#~ "您计算机上的桌面环境为您的计算机提供了图形用户界面，以及用于\n" -#~ "电子邮件、网络浏览、办公生产、游戏的一套应用程序\n" -#~ "和管理计算机的实用工具。\n" -#~ "\n" -#~ "openSUSE 提供了几种桌面环境供您选择。使用最广泛的\n" -#~ "桌面环境是 GNOME 和 KDE，它们在 openSUSE 下有着平等\n" -#~ "的支持。两者均易于使用、高度集成、外观诱人。\n" -#~ "每种桌面环境都有独特的风格，因此个人品味决定了哪款\n" -#~ "桌面最适合您。" - -#~ msgid "GNOME Desktop" -#~ msgstr "GNOME 桌面" - -#~ msgid "KDE Desktop" -#~ msgstr "KDE 桌面" - -#~ msgid "XFCE Desktop" -#~ msgstr "XFCE 桌面" - -#~ msgid "LXDE Desktop" -#~ msgstr "LXDE 桌面" - -#~ msgid "Minimal X Window" -#~ msgstr "极简 X 窗口系统" - -#~ msgid "Enlightenment Desktop" -#~ msgstr "Enlightenment 桌面" - -#~ msgid "Minimal Server Selection (Text Mode)" -#~ msgstr "极简服务器选集 (文本模式)" - -#~ msgid "Online Repositories" -#~ msgstr "在线软件源" - -#~ msgid "" -#~ "\n" -#~ "<p><b>Congratulations!</b></p>\n" #~ "<p>The installation of &product; on your machine is complete.\n" #~ "After clicking <b>Finish</b>, you can log in to the system.</p>\n" #~ "<p>Visit us at %1.</p>\n" Modified: trunk/yast/zh_CN/po/crowbar.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/crowbar.zh_CN.po 2014-10-29 15:59:29 UTC (rev 90431) +++ trunk/yast/zh_CN/po/crowbar.zh_CN.po 2014-10-29 16:00:17 UTC (rev 90432) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2014-10-29 16:20+0100\n" "PO-Revision-Date: 2013-02-02 02:23+0800\n" "Last-Translator: 玛格丽特 · 苏 <i@marguerite.su>\n" "Language-Team: Chinese Simplified <opensuse-zh@opensuse.org>\n" @@ -25,89 +25,202 @@ msgid "Configuration of crowbar" msgstr "Crowbar 配置" +#. table header +#: src/include/crowbar/complex.rb:96 +#, fuzzy +#| msgid "&Repository Name" +msgid "Repository Name" +msgstr "安装源名称(&R)" + +#: src/include/crowbar/complex.rb:96 +msgid "URL" +msgstr "URL" + +#: src/include/crowbar/complex.rb:96 +#, fuzzy +#| msgid "User Found Error" +msgid "Ask On Error" +msgstr "用户发现错误" + +#. help text +#: src/include/crowbar/complex.rb:106 +msgid "" +"<p>Here you can edit the location of your <b>Update Repositories</b>.</p>\n" +"<p>\n" +"Some examples of how the URL could look like:\n" +"</p><p>\n" +"<ul>\n" +"<li><i>http://smt.example.com/repo/$RCE/SLES11-SP3-Pool/sle-11-x86_64/</i> for SMT server\n" +"<li><i>http://manager.example.com/ks/dist/child/suse-cloud-3.0-pool-x86_64/sles11-sp3-x86_64/</i> for SUSE Manager Server.\n" +"</p><p>\n" +"For detailed description, check the Deployment Guide.\n" +"</p>" +msgstr "" + #. textentry label -#: src/include/crowbar/complex.rb:71 -msgid "Password for Crowbar Administrator" -msgstr "Crowbar 系统管理员密码" +#: src/include/crowbar/complex.rb:122 +#, fuzzy +#| msgid "Repository URL" +msgid "Repository &URL" +msgstr "安装源 URL" +#. textentry label +#: src/include/crowbar/complex.rb:135 +#, fuzzy +#| msgid "User Found Error" +msgid "&Ask On Error" +msgstr "用户发现错误" + +#. table header +#: src/include/crowbar/complex.rb:155 +#, fuzzy +#| msgid "Administrator DN" +msgid "Administrator Name" +msgstr "管理员 DN" + #. help text -#: src/include/crowbar/complex.rb:75 -msgid "<p>Enter the password for Crowbar administrator.</p>" +#: src/include/crowbar/complex.rb:165 +#, fuzzy +#| msgid "<p>Enter the password for Crowbar administrator.</p>" +msgid "<p>Manage user names and passwords for Crowbar administrators.</p>" msgstr "<p>请输入 Crowbar 系统管理员密码。</p>" #. textentry label -#: src/include/crowbar/complex.rb:97 -msgid "Repeat the Password" -msgstr "重复密码" +#: src/include/crowbar/complex.rb:201 +#, fuzzy +#| msgid "&Model" +msgid "&Mode" +msgstr "型号(&M)" -#. textentry label -#: src/include/crowbar/complex.rb:104 -msgid "Mode" -msgstr "模式" +#. help text for the Network mode tab (do not translate bastion) +#: src/include/crowbar/complex.rb:203 +msgid "" +"<p>Here, define a <b>Network Mode</b> with relevant <b>Bonding Policy</b>.</p>\n" +"<p>You can also specify interface names for the bastion network conduits as space-separated list.</p>" +msgstr "" #. textentry label -#: src/include/crowbar/complex.rb:113 -msgid "Bonding Policy" +#: src/include/crowbar/complex.rb:213 +#, fuzzy +#| msgid "Bonding Policy" +msgid "Bonding &Policy" msgstr "绑定策略" +#. textentry label +#: src/include/crowbar/complex.rb:222 +msgid "P&hysical interfaces mapping for bastion network" +msgstr "" + +#. help text for conduit if list +#: src/include/crowbar/complex.rb:231 +msgid "" +"<p>Each physical interface definition needs to fit the pattern\n" +"<tt>[Quantifier][Speed][Order]</tt>.\n" +"Valid examples are <tt>+1g2</tt>, <tt>10g1</tt> or <tt>?1g2</tt>.</p>" +msgstr "" + #. table header -#: src/include/crowbar/complex.rb:139 +#: src/include/crowbar/complex.rb:265 msgid "Network" msgstr "网络" -#: src/include/crowbar/complex.rb:140 +#: src/include/crowbar/complex.rb:266 msgid "Subnet Address" msgstr "子网地址" -#: src/include/crowbar/complex.rb:141 +#: src/include/crowbar/complex.rb:267 msgid "Network Mask" msgstr "网络掩码" -#: src/include/crowbar/complex.rb:142 +#: src/include/crowbar/complex.rb:268 msgid "VLAN" msgstr "虚拟局域网" #. checkbox label -#: src/include/crowbar/complex.rb:159 -msgid "Use VLAN" +#: src/include/crowbar/complex.rb:286 +#, fuzzy +#| msgid "Use VLAN" +msgid "Use &VLAN" msgstr "使用虚拟局域网" #. textentry label -#: src/include/crowbar/complex.rb:169 -msgid "VLAN ID" +#: src/include/crowbar/complex.rb:296 +#, fuzzy +#| msgid "VLAN ID" +msgid "VLAN &ID" msgstr "虚拟局域网 ID" #. textentry label -#: src/include/crowbar/complex.rb:179 -msgid "Router" -msgstr "路由器" +#: src/include/crowbar/complex.rb:306 +msgid "Rou&ter" +msgstr "" #. textentry label -#: src/include/crowbar/complex.rb:201 -msgid "Subnet" -msgstr "子网" +#: src/include/crowbar/complex.rb:328 +#, fuzzy +#| msgid "Restoring user preferences..." +msgid "Router pre&ference" +msgstr "正在恢复用户首选项..." #. textentry label -#: src/include/crowbar/complex.rb:224 -msgid "Netmask" -msgstr "网络掩码" +#: src/include/crowbar/complex.rb:338 +msgid "&Subnet" +msgstr "子网(&S)" -#: src/include/crowbar/complex.rb:246 -msgid "Broadcast" +#. textentry label +#: src/include/crowbar/complex.rb:361 +msgid "Net&mask" +msgstr "网络掩码(&M)" + +#: src/include/crowbar/complex.rb:383 +#, fuzzy +#| msgid "Broadcast" +msgid "Broa&dcast" msgstr "广播" #. checkbox label -#: src/include/crowbar/complex.rb:256 -msgid "Add Bridge" +#: src/include/crowbar/complex.rb:393 +#, fuzzy +#| msgid "Add Bridge" +msgid "&Add Bridge" msgstr "添加网桥" -#. push button label -#: src/include/crowbar/complex.rb:265 -msgid "&Edit Ranges..." +#. push button label& +#: src/include/crowbar/complex.rb:402 +#, fuzzy +#| msgid "&Edit Ranges..." +msgid "Edit Ran&ges..." msgstr "编辑地址段(&E)..." +#. checkbox label +#: src/include/crowbar/complex.rb:413 +#, fuzzy +#| msgid "Bond Network" +msgid "Add &Bastion Network" +msgstr "绑定网络" + +#. textentry label +#: src/include/crowbar/complex.rb:425 +msgid "&IP Address" +msgstr "IP 地址(&I)" + +#. text entry label +#: src/include/crowbar/complex.rb:585 +msgid "User Name" +msgstr "用户名" + +#. text entry label +#: src/include/crowbar/complex.rb:587 +msgid "Password" +msgstr "密码" + +#. text entry label +#: src/include/crowbar/complex.rb:589 +msgid "Repeat the Password" +msgstr "重复密码" + #. error popup -#: src/include/crowbar/complex.rb:391 +#: src/include/crowbar/complex.rb:627 msgid "" "The passwords do not match.\n" "Try again." @@ -115,13 +228,33 @@ "密码不匹配。\n" "请重试。" +#. error popup +#: src/include/crowbar/complex.rb:636 +#, fuzzy +#| msgid "" +#| "Configuration name %1 already exists.\n" +#| "Choose a different one." +msgid "" +"User '%1' already exists.\n" +"Choose a different name." +msgstr "" +"配置名称 %1 已存在。\n" +"请选择一个不同的名称。" + +#. error popup +#: src/include/crowbar/complex.rb:781 +#, fuzzy +#| msgid "The entered URL '%1' is invalid" +msgid "The interface format '%1' is not valid" +msgstr "输入的 URL '%1' 无效。" + #. table entry (VLAN status) -#: src/include/crowbar/complex.rb:426 +#: src/include/crowbar/complex.rb:861 msgid "disabled" msgstr "已禁用" #. error popup -#: src/include/crowbar/complex.rb:527 +#: src/include/crowbar/complex.rb:986 msgid "" "The netmask '%1' is invalid.\n" "%2" @@ -130,7 +263,8 @@ "%2" #. error popup -#: src/include/crowbar/complex.rb:540 +#. error popup +#: src/include/crowbar/complex.rb:999 src/include/crowbar/complex.rb:1036 msgid "" "The IP address '%1' is invalid.\n" "%2" @@ -139,7 +273,7 @@ "%2" #. error popup -#: src/include/crowbar/complex.rb:552 +#: src/include/crowbar/complex.rb:1011 msgid "" "The router address '%1' is invalid.\n" "%2" @@ -148,12 +282,19 @@ "%2" #. error popup -#: src/include/crowbar/complex.rb:564 +#: src/include/crowbar/complex.rb:1023 msgid "The router address '%1' is not part of network '%2'." msgstr "路由器地址 '%1' 不是网络 '%2' 的一部分。" +#. error popup +#: src/include/crowbar/complex.rb:1047 +#, fuzzy +#| msgid "The address '%1' is not part of network '%2'." +msgid "The IP address '%1' is not part of network '%2'." +msgstr "地址 '%1' 不是网络 '%2' 的一部分。" + #. popup message -#: src/include/crowbar/complex.rb:585 +#: src/include/crowbar/complex.rb:1068 msgid "" "Some address ranges are not part of network '%1'.\n" "Adapt them using 'Edit ranges' button." @@ -162,46 +303,75 @@ "请使用 '编辑地址段' 按钮来调整它们。" #. inputfield label -#: src/include/crowbar/complex.rb:687 +#: src/include/crowbar/complex.rb:1173 msgid "Min IP Address" msgstr "最小 IP 地址" #. inputfield label -#: src/include/crowbar/complex.rb:694 +#: src/include/crowbar/complex.rb:1180 msgid "Max IP Address" msgstr "最大 IP 地址" -#: src/include/crowbar/complex.rb:761 +#: src/include/crowbar/complex.rb:1247 msgid "The address '%1' is not part of network '%2'." msgstr "地址 '%1' 不是网络 '%2' 的一部分。" #. error message -#: src/include/crowbar/complex.rb:777 +#: src/include/crowbar/complex.rb:1263 msgid "The lowest address must be lower than the highest one." msgstr "最低地址必须低于最高地址。" #. error message -#: src/include/crowbar/complex.rb:810 +#: src/include/crowbar/complex.rb:1296 msgid "Ranges '%1' and '%2' are overlapping." msgstr "地址段 '%1' 和 '%2' 有重叠。" #. tab header -#: src/include/crowbar/complex.rb:841 -msgid "Administration Settings" -msgstr "管理设置" +#: src/include/crowbar/complex.rb:1373 +#, fuzzy +#| msgid "User Settings" +msgid "&User Settings" +msgstr "用户设置" +#. label (hint for user) +#: src/include/crowbar/complex.rb:1385 +msgid "If no user is present, user 'crowbar' with default password will be used." +msgstr "" + #. tab header -#: src/include/crowbar/complex.rb:851 -msgid "Network Mode" +#: src/include/crowbar/complex.rb:1403 +#, fuzzy +#| msgid "Network Mode" +msgid "N&etwork Mode" msgstr "网络模式" +#: src/include/crowbar/complex.rb:1411 +#, fuzzy +#| msgid "Bond Network" +msgid "Bastion Network" +msgstr "绑定网络" + #. tab header -#: src/include/crowbar/complex.rb:861 -msgid "Networks" +#: src/include/crowbar/complex.rb:1454 +#, fuzzy +#| msgid "Networks" +msgid "Net&works" msgstr "网络" +#. tab header +#: src/include/crowbar/complex.rb:1490 +#, fuzzy +#| msgid "Repositories" +msgid "Re&positories" +msgstr "安装源" + +#. label (hint for user) +#: src/include/crowbar/complex.rb:1501 +msgid "Empty URL means that default value will be used." +msgstr "" + #. popup message %1 is FQDN -#: src/include/crowbar/complex.rb:925 +#: src/include/crowbar/complex.rb:1653 msgid "" "The SUSE Cloud Admin Server has been deployed. Changing the network is\n" "currently not supported.\n" @@ -213,7 +383,7 @@ "您可通过 http://%1:3000/ 访问 Crowbar 网页用户界面。" #. default dialog caption -#: src/include/crowbar/complex.rb:943 +#: src/include/crowbar/complex.rb:1671 msgid "Crowbar Configuration Overview" msgstr "Crowbar 配置概览" @@ -267,37 +437,55 @@ msgstr "正在初始化..." #. Crowbar read dialog caption -#: src/modules/Crowbar.rb:114 +#: src/modules/Crowbar.rb:144 msgid "Initializing crowbar Configuration" msgstr "正在初始化 Crowbar 配置" #. Progress stage -#: src/modules/Crowbar.rb:125 +#: src/modules/Crowbar.rb:155 msgid "Read the configuraton" msgstr "读取配置" #. Progress step -#: src/modules/Crowbar.rb:129 +#: src/modules/Crowbar.rb:159 msgid "Reading the configuration..." msgstr "正在读取配置..." #. Progress finished #. Progress finished -#: src/modules/Crowbar.rb:131 src/modules/Crowbar.rb:200 +#: src/modules/Crowbar.rb:161 src/modules/Crowbar.rb:255 msgid "Finished" msgstr "已完成" #. Crowbar read dialog caption -#: src/modules/Crowbar.rb:183 +#: src/modules/Crowbar.rb:238 msgid "Saving crowbar Configuration" msgstr "正在保存 Crowbar 配置" #. Progress stage 1/2 -#: src/modules/Crowbar.rb:194 +#: src/modules/Crowbar.rb:249 msgid "Write the settings" msgstr "写入设置" #. Progress step 1/2 -#: src/modules/Crowbar.rb:198 +#: src/modules/Crowbar.rb:253 msgid "Writing the settings..." msgstr "正在写入设置..." + +#~ msgid "Password for Crowbar Administrator" +#~ msgstr "Crowbar 系统管理员密码" + +#~ msgid "Mode" +#~ msgstr "模式" + +#~ msgid "Router" +#~ msgstr "路由器" + +#~ msgid "Subnet" +#~ msgstr "子网" + +#~ msgid "Netmask" +#~ msgstr "网络掩码" + +#~ msgid "Administration Settings" +#~ msgstr "管理设置" Modified: trunk/yast/zh_CN/po/drbd.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/drbd.zh_CN.po 2014-10-29 15:59:29 UTC (rev 90431) +++ trunk/yast/zh_CN/po/drbd.zh_CN.po 2014-10-29 16:00:17 UTC (rev 90432) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2014-10-29 16:20+0100\n" "PO-Revision-Date: 2014-07-08 13:23+0800\n" "Last-Translator: 玛格丽特 · 苏 <marguerite@opensuse.org>\n" "Language-Team: Chinese Simplified <kde-i18n-doc@kde.org>\n" @@ -238,12 +238,22 @@ "\t\t" #: src/include/drbd/helps.rb:75 +#, fuzzy +#| msgid "" +#| "\n" +#| "\t\t<p>\"Name\" is mandatory and must match the Linux host name (uname -n) of one of the nodes</p>\n" +#| "\t\t<p>\"Address:Port\": A resource needs one IP address per device, which is used to wait for incoming connections from the partner device to reach the device. Each DRBD resource needs a TCP port which is used to connect to the node's partner device.</p>\n" +#| "\t\t<p>\"Device\": The name of the block device node of the resource being described. You must use this device with your application (file system) and you must not use the low level block device which is specified with the disk parameter,following its minor number.\n" +#| "\t\tLike: '/dev/drbd_r0 minor 0'</p>\n" +#| "\t\t<p>\"Disk\": DRBD uses this block device to actually store and retrieve the data. Never access such a device while DRBD is running on top of it.</p>\n" +#| "\t\t<p>\"Meta-disk\": internal. Internal means that the last part of the backing device is used to store the meta-data.</p>\n" +#| "\t\t" msgid "" "\n" -"\t\t<p>\"Name\" is mandatory and must match the Linux host name (uname -n) of one of the nodes</p>\n" +"\t\t<p>\"Name\" is mandatory and must match the Linux host name (uname -n) of one of the nodes. Should not include \".\" in hostname.</p>\n" "\t\t<p>\"Address:Port\": A resource needs one IP address per device, which is used to wait for incoming connections from the partner device to reach the device. Each DRBD resource needs a TCP port which is used to connect to the node's partner device.</p>\n" -"\t\t<p>\"Device\": The name of the block device node of the resource being described. You must use this device with your application (file system) and you must not use the low level block device which is specified with the disk parameter,following its minor number.\n" -"\t\tLike: '/dev/drbd_r0 minor 0'</p>\n" +"\t\t<p>\"Device\": The name of the block device node of the resource being described. You must use this device with your application (file system) and you must not use the low level block device which is specified with the disk parameter,following its minor number. Or either omit the name or minor and the minor number. If you omit the name a default of /dev/drbdminor will be used.\n" +"\t\tLike: '/dev/drbd{service} minor {minor drbd number [0...255]}' or '/dev/drbd{minor drbd number [0...255]}'</p>\n" "\t\t<p>\"Disk\": DRBD uses this block device to actually store and retrieve the data. Never access such a device while DRBD is running on top of it.</p>\n" "\t\t<p>\"Meta-disk\": internal. Internal means that the last part of the backing device is used to store the meta-data.</p>\n" "\t\t" @@ -449,7 +459,11 @@ msgid "Node names must be different." msgstr "节点名称不能相同。" -#: src/include/drbd/resource_conf.rb:568 +#: src/include/drbd/resource_conf.rb:552 +msgid "Node names must not include \".\" , using the local hostname." +msgstr "" + +#: src/include/drbd/resource_conf.rb:582 msgid "Please fill out all fields." msgstr "请填写全部字段。" @@ -591,7 +605,7 @@ msgid "Reading daemon status..." msgstr "正在读取守护程序状态..." -#: src/modules/Drbd.rb:149 src/modules/Drbd.rb:492 +#: src/modules/Drbd.rb:149 src/modules/Drbd.rb:494 msgid "Finished" msgstr "已完成" @@ -621,33 +635,35 @@ msgid "Writing DRBD Configuration" msgstr "正在写入分布式复制块设备 (DRBD) 配置" -#. if (!modified) return true; +#. Comment code below due to change the "booting" status +#. won't change modified flag +#. return true if !@modified #. We do not set help text here, because it was set outside -#: src/modules/Drbd.rb:484 +#: src/modules/Drbd.rb:486 msgid "Write global settings" msgstr "写入全局设置" -#: src/modules/Drbd.rb:485 +#: src/modules/Drbd.rb:487 msgid "Write resources" msgstr "写入资源" -#: src/modules/Drbd.rb:486 +#: src/modules/Drbd.rb:488 msgid "Set daemon status" msgstr "设置守护程序状态" -#: src/modules/Drbd.rb:489 +#: src/modules/Drbd.rb:491 msgid "Writing global settings..." msgstr "正在写入全局设置..." -#: src/modules/Drbd.rb:490 +#: src/modules/Drbd.rb:492 msgid "Writing resources..." msgstr "正在写入资源..." -#: src/modules/Drbd.rb:491 +#: src/modules/Drbd.rb:493 msgid "Setting daemon status..." msgstr "正在设置守护程序状态..." -#: src/modules/Drbd.rb:502 +#: src/modules/Drbd.rb:504 msgid "Failed to make directory /etc/drbd.d" msgstr "创建文件夹 /etc/drbd.d 失败" Modified: trunk/yast/zh_CN/po/ftp-server.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/ftp-server.zh_CN.po 2014-10-29 15:59:29 UTC (rev 90431) +++ trunk/yast/zh_CN/po/ftp-server.zh_CN.po 2014-10-29 16:00:17 UTC (rev 90432) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2014-10-29 16:20+0100\n" "PO-Revision-Date: 2012-07-13 17:45+0800\n" "Last-Translator: Marguerite Su\n" "Language-Team: Chinese Simplified <kde-i18n-doc@kde.org>\n" @@ -806,8 +806,8 @@ #: src/include/ftp-server/wid_functions.rb:263 #: src/include/ftp-server/wid_functions.rb:317 #: src/include/ftp-server/wid_functions.rb:408 -#: src/include/ftp-server/wid_functions.rb:498 -#: src/include/ftp-server/wid_functions.rb:507 +#: src/include/ftp-server/wid_functions.rb:502 +#: src/include/ftp-server/wid_functions.rb:511 msgid "FTP is running" msgstr "FTP 正在运行" @@ -1756,7 +1756,7 @@ #. Valid function of "Umask (umask files:umask dirs)" #. check value of textentry #. only pure-ftpd -#: src/include/ftp-server/wid_functions.rb:619 +#: src/include/ftp-server/wid_functions.rb:623 msgid "Not a valid umask." msgstr "无效的用户遮罩。" @@ -1764,21 +1764,21 @@ #. handling value in textentry of "Umask for Anonynmous Users" #. Handle function of "Browse" #. handling value in textentry of "Umask for Authenticated Users" -#: src/include/ftp-server/wid_functions.rb:781 -#: src/include/ftp-server/wid_functions.rb:819 +#: src/include/ftp-server/wid_functions.rb:785 +#: src/include/ftp-server/wid_functions.rb:823 msgid "Select directory" msgstr "选择目录" #. end of if (button == "EnableUpload") { -#: src/include/ftp-server/wid_functions.rb:1055 +#: src/include/ftp-server/wid_functions.rb:1059 msgid "Create the \"upload\" directory in %1\n" msgstr "在 %1 中创建 \"upload\" 目录\n" -#: src/include/ftp-server/wid_functions.rb:1060 +#: src/include/ftp-server/wid_functions.rb:1064 msgid "and enable write access?\n" msgstr "是否启用写入权限？\n" -#: src/include/ftp-server/wid_functions.rb:1062 +#: src/include/ftp-server/wid_functions.rb:1066 msgid "" "If you want anonymous users to be able to upload,\n" " you need to create a directory with write access.\n" @@ -1788,15 +1788,15 @@ "您需要创建一个可以写入的目录。\n" "\n" -#: src/include/ftp-server/wid_functions.rb:1069 -#: src/include/ftp-server/wid_functions.rb:1090 -#: src/include/ftp-server/wid_functions.rb:1116 -#: src/include/ftp-server/wid_functions.rb:1139 +#: src/include/ftp-server/wid_functions.rb:1073 +#: src/include/ftp-server/wid_functions.rb:1094 +#: src/include/ftp-server/wid_functions.rb:1120 +#: src/include/ftp-server/wid_functions.rb:1143 msgid " is a home directory after the login of anonymous users." msgstr " 是匿名用户登录后的主目录。" -#: src/include/ftp-server/wid_functions.rb:1080 -#: src/include/ftp-server/wid_functions.rb:1127 +#: src/include/ftp-server/wid_functions.rb:1084 +#: src/include/ftp-server/wid_functions.rb:1131 msgid "" "Do you want to change permissions\n" "for\n" @@ -1804,12 +1804,12 @@ "您是否希望改变权限\n" "为\n" -#: src/include/ftp-server/wid_functions.rb:1083 -#: src/include/ftp-server/wid_functions.rb:1130 +#: src/include/ftp-server/wid_functions.rb:1087 +#: src/include/ftp-server/wid_functions.rb:1134 msgid "Upload (allow writing)?" msgstr "上传(允许写入)？" -#: src/include/ftp-server/wid_functions.rb:1085 +#: src/include/ftp-server/wid_functions.rb:1089 msgid "" "To allow anonymous users to upload, you need a directory with write access.\n" "\n" @@ -1817,15 +1817,15 @@ "如果要让匿名用户可以上传，您需要创建一个可以写入的目录。\n" "\n" -#: src/include/ftp-server/wid_functions.rb:1104 +#: src/include/ftp-server/wid_functions.rb:1108 msgid "Do you want to create a directory?\n" msgstr "您要创建一个目录吗？\n" -#: src/include/ftp-server/wid_functions.rb:1107 +#: src/include/ftp-server/wid_functions.rb:1111 msgid "Upload with write access?" msgstr "是否带写入权限上传？" -#: src/include/ftp-server/wid_functions.rb:1109 +#: src/include/ftp-server/wid_functions.rb:1113 msgid "" "If you want to allow anonymous users to create directories,\n" " you have to create a directory with write access.\n" @@ -1835,7 +1835,7 @@ "您需要创建一个可以写入的目录。\n" "\n" -#: src/include/ftp-server/wid_functions.rb:1132 +#: src/include/ftp-server/wid_functions.rb:1136 msgid "" "If you want anonymous users to be able to create directories,\n" " you need a directory with write access.\n" @@ -1853,15 +1853,15 @@ #. check permissions for upload dir #. #. end of if (FtpServer::pure_ftp_allowed_permissios_upload == 0) -#: src/include/ftp-server/wid_functions.rb:1199 -#: src/include/ftp-server/wid_functions.rb:1219 -#: src/include/ftp-server/wid_functions.rb:1286 -#: src/include/ftp-server/wid_functions.rb:1306 +#: src/include/ftp-server/wid_functions.rb:1203 +#: src/include/ftp-server/wid_functions.rb:1223 +#: src/include/ftp-server/wid_functions.rb:1290 +#: src/include/ftp-server/wid_functions.rb:1310 msgid "Change permissions of %1 ?\n" msgstr "更改 %1 的权限？\n" -#: src/include/ftp-server/wid_functions.rb:1203 -#: src/include/ftp-server/wid_functions.rb:1290 +#: src/include/ftp-server/wid_functions.rb:1207 +#: src/include/ftp-server/wid_functions.rb:1294 msgid "" "If you want to allow uploads for \"anonymous\" users, \n" "you need a directory with write access for them." @@ -1869,136 +1869,136 @@ "如果您希望允许\"匿名\"用户上传，\n" "您需要为他们准备一个具有写入权限的目录。" -#: src/include/ftp-server/wid_functions.rb:1223 +#: src/include/ftp-server/wid_functions.rb:1227 msgid "For anonymous connections the home directory of an anonymous user should have no write access.\n" msgstr "对于匿名连接，其匿名用户不具有 home 目录写入权限。\n" -#: src/include/ftp-server/wid_functions.rb:1310 +#: src/include/ftp-server/wid_functions.rb:1314 msgid "For anonymous connections the home directory of an anonymous user should have no write access." msgstr "对于匿名连接，其匿名用户不具有 home 目录写入权限。" #. Valid function of "Max Port for Pas. Mode" #. check values Max Port >= Min Port -#: src/include/ftp-server/wid_functions.rb:1453 +#: src/include/ftp-server/wid_functions.rb:1457 msgid "Condition for ports is max port > min port." msgstr "端口限制，最大端口号要大于最小端口号。" #. Valid function of "DSA Certificate to Use for SSL Encrypted Connections" #. check value if user enable SSL Certificate (textentry) doesn't be empty -#: src/include/ftp-server/wid_functions.rb:1633 +#: src/include/ftp-server/wid_functions.rb:1637 msgid "DSA certificate is missing." msgstr "缺少 DSA 证书。" #. Handle function of "Browse" #. handling value in textentry of "DSA Certificate to Use for SSL Encrypted Connections" -#: src/include/ftp-server/wid_functions.rb:1660 +#: src/include/ftp-server/wid_functions.rb:1664 msgid "Select File" msgstr "选择文件" #. Valid function of "Security Settings" #. check of existing certificate -#: src/include/ftp-server/wid_functions.rb:1718 +#: src/include/ftp-server/wid_functions.rb:1722 msgid "The <tt>/etc/ssl/private/pure-ftpd.pem</tt> certificate for the SSL connection is missing." msgstr "缺少用于 SSL 连接的证书 <tt>/etc/ssl/private/pure-ftpd.pem</tt>。" #. 0 => anonymous only, 1 => authenticated only, 2=> both -#: src/modules/FtpServer.rb:219 +#: src/modules/FtpServer.rb:214 msgid "Welcome message" msgstr "欢迎消息" #. FtpServer read dialog caption -#: src/modules/FtpServer.rb:893 +#: src/modules/FtpServer.rb:816 msgid "Initializing FTP Configuration" msgstr "正在初始化 FTP 配置" #. Part for commandline - it is necessary choose daemon if both are installed -#: src/modules/FtpServer.rb:904 +#: src/modules/FtpServer.rb:827 msgid "You have installed both daemons:" msgstr "您安装了两个守护精灵：" -#: src/modules/FtpServer.rb:906 +#: src/modules/FtpServer.rb:829 msgid "Choose one of them for configuration." msgstr "选择其中之一进行配置。" -#: src/modules/FtpServer.rb:908 +#: src/modules/FtpServer.rb:831 msgid "Do you want to configure vsftpd? Alternatively choose pure-ftpd." msgstr "您想配置 vsftpd 么？或者您也可以选择 pure-ftpd" -#: src/modules/FtpServer.rb:916 +#: src/modules/FtpServer.rb:839 msgid "You have installed both daemons. Therefore you have to run the configuration in interactive mode." msgstr "您安装了两个守护精灵。所以，您必须以交互模式运行配置。" #. Progress stage 1/2 -#: src/modules/FtpServer.rb:935 +#: src/modules/FtpServer.rb:858 msgid "Read settings from the config file" msgstr "从配置文件中读取设置" #. Progress stage 2/2 -#: src/modules/FtpServer.rb:937 +#: src/modules/FtpServer.rb:860 msgid "Read the previous settings" msgstr "读取以前的设置" #. Progress stage 1/2 -#: src/modules/FtpServer.rb:941 +#: src/modules/FtpServer.rb:864 msgid "Reading the settings..." msgstr "正在读取设置..." #. calling read function for reading settings form config file -#: src/modules/FtpServer.rb:951 +#: src/modules/FtpServer.rb:874 msgid "Cannot Read Current Settings." msgstr "不能读取当前设置。" #. FtpServer read dialog caption -#: src/modules/FtpServer.rb:968 +#: src/modules/FtpServer.rb:891 msgid "Saving FTP Configuration" msgstr "正在保存 FTP 配置" #. Progress stage 1/2 -#: src/modules/FtpServer.rb:978 +#: src/modules/FtpServer.rb:901 msgid "Write the settings to the config file" msgstr "写入设置到配置文件" #. Progress stage 2/2 -#: src/modules/FtpServer.rb:980 +#: src/modules/FtpServer.rb:903 msgid "Write the settings for starting daemon" msgstr "写入启动守护精灵的设置" #. Progress step 1/1 -#: src/modules/FtpServer.rb:984 +#: src/modules/FtpServer.rb:907 msgid "Writing the settings..." msgstr "正在写入设置..." #. write options to the config file -#: src/modules/FtpServer.rb:994 +#: src/modules/FtpServer.rb:917 msgid "Cannot write settings!" msgstr "无法写入设置！" #. write settings for starting daemon -#: src/modules/FtpServer.rb:1000 +#: src/modules/FtpServer.rb:923 msgid "Cannot write settings for xinetd!" msgstr "无法写入 xinetd 设置！" #. write settings for starting daemon -#: src/modules/FtpServer.rb:1008 +#: src/modules/FtpServer.rb:931 msgid "Cannot create upload directory for anonymous connections." msgstr "无法为匿名连接创建上传目录。" #. anonymous dir -#: src/modules/FtpServer.rb:1150 +#: src/modules/FtpServer.rb:1074 msgid "<p><ul><i>FTP daemon is not configured.</i></ul></p>" msgstr "<p><ul><i>FTP 守护精灵未配置。</i></ul></p>" #. Translators: Summary head, if nothing configured -#: src/modules/FtpServer.rb:1162 +#: src/modules/FtpServer.rb:1084 msgid "FTP daemon" msgstr "FTP 守护精灵" #. Translators: Summary head, if something configured -#: src/modules/FtpServer.rb:1167 +#: src/modules/FtpServer.rb:1089 msgid "FTP daemon %1" msgstr "FTP 守护精灵 %1" -#: src/modules/FtpServer.rb:1171 +#: src/modules/FtpServer.rb:1093 msgid "These options will be configured" msgstr "这些选项将被配置" Modified: trunk/yast/zh_CN/po/geo-cluster.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/geo-cluster.zh_CN.po 2014-10-29 15:59:29 UTC (rev 90431) +++ trunk/yast/zh_CN/po/geo-cluster.zh_CN.po 2014-10-29 16:00:17 UTC (rev 90432) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2014-10-29 16:20+0100\n" "PO-Revision-Date: 2014-07-05 15:41+0800\n" "Last-Translator: 玛格丽特 · 苏 <marguerite@opensuse.org>\n" "Language-Team: Chinese Simplified <kde-i18n-doc@kde.org>\n" @@ -34,16 +34,47 @@ #. GeoCluster summary dialog caption #. GeoCluster configure2 dialog caption +#. encoding: utf-8 +#. ------------------------------------------------------------------------------ +#. Copyright (c) 2006 Novell, Inc. All Rights Reserved. +#. +#. +#. This program is free software; you can redistribute it and/or modify it under +#. the terms of version 2 of the GNU General Public License as published by the +#. Free Software Foundation. +#. +#. This program is distributed in the hope that it will be useful, but WITHOUT +#. ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +#. FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +#. +#. You should have received a copy of the GNU General Public License along with +#. this program; if not, contact Novell, Inc. +#. +#. To contact Novell about this file by physical or electronic mail, you may find +#. current contact information at www.novell.com. +#. ------------------------------------------------------------------------------ +#. File: include/geo-cluster/wizards.ycp +#. Package: Configuration of geo-cluster +#. Summary: Wizards definitions +#. Authors: Dongmao Zhang <dmzhang@suse.com> +#. +#. $Id: wizards.ycp 27914 2006-02-13 14:32:08Z locilka $ #. Initialization dialog caption #: src/include/geo-cluster/complex.rb:83 -#: src/include/geo-cluster/dialogs.rb:430 +#: src/include/geo-cluster/dialogs.rb:416 +#: src/include/geo-cluster/dialogs.rb:689 +#: src/include/geo-cluster/wizards.rb:46 #: src/include/geo-cluster/wizards.rb:140 -msgid "GeoCluster Configuration" +#, fuzzy +#| msgid "GeoCluster Configuration" +msgid "Geo Cluster Configuration" msgstr "GeoCluster 配置" #. GeoCluster overview dialog caption #: src/include/geo-cluster/complex.rb:143 -msgid "GeoCluster Overview" +#, fuzzy +#| msgid "GeoCluster Overview" +msgid "Geo Cluster Overview" msgstr "GeoCluster 概览" #. encoding: utf-8 @@ -75,223 +106,207 @@ msgid "configuration file" msgstr "配置文件" -#: src/include/geo-cluster/dialogs.rb:59 -msgid "arbitrator ip" -msgstr "仲裁主机 IP" - -#: src/include/geo-cluster/dialogs.rb:65 +#: src/include/geo-cluster/dialogs.rb:58 msgid "transport" msgstr "传输" -#: src/include/geo-cluster/dialogs.rb:71 +#: src/include/geo-cluster/dialogs.rb:65 msgid "port" msgstr "端口" -#: src/include/geo-cluster/dialogs.rb:76 -msgid "site" -msgstr "站点" +#: src/include/geo-cluster/dialogs.rb:71 +#, fuzzy +#| msgid "arbitrator ip" +msgid "arbitrator" +msgstr "仲裁主机 IP" -#: src/include/geo-cluster/dialogs.rb:79 -#: src/include/geo-cluster/dialogs.rb:653 +#: src/include/geo-cluster/dialogs.rb:74 src/include/geo-cluster/dialogs.rb:85 +#: src/include/geo-cluster/dialogs.rb:679 msgid "Add" msgstr "添加" -#: src/include/geo-cluster/dialogs.rb:80 -#: src/include/geo-cluster/dialogs.rb:654 +#: src/include/geo-cluster/dialogs.rb:75 src/include/geo-cluster/dialogs.rb:86 +#: src/include/geo-cluster/dialogs.rb:680 msgid "Edit" msgstr "编辑" -#: src/include/geo-cluster/dialogs.rb:81 -#: src/include/geo-cluster/dialogs.rb:655 +#: src/include/geo-cluster/dialogs.rb:76 src/include/geo-cluster/dialogs.rb:87 +#: src/include/geo-cluster/dialogs.rb:681 msgid "Delete" msgstr "删除" -#: src/include/geo-cluster/dialogs.rb:87 -#: src/include/geo-cluster/dialogs.rb:178 +#: src/include/geo-cluster/dialogs.rb:82 +msgid "site" +msgstr "站点" + +#: src/include/geo-cluster/dialogs.rb:94 +#: src/include/geo-cluster/dialogs.rb:186 msgid "ticket" msgstr "票据" #. return `cacel or a string -#: src/include/geo-cluster/dialogs.rb:98 -#: src/include/geo-cluster/dialogs.rb:120 -#: src/include/geo-cluster/dialogs.rb:197 +#: src/include/geo-cluster/dialogs.rb:106 +#: src/include/geo-cluster/dialogs.rb:128 +#: src/include/geo-cluster/dialogs.rb:205 msgid "OK" msgstr "好" -#: src/include/geo-cluster/dialogs.rb:99 -#: src/include/geo-cluster/dialogs.rb:121 -#: src/include/geo-cluster/dialogs.rb:198 +#: src/include/geo-cluster/dialogs.rb:107 +#: src/include/geo-cluster/dialogs.rb:129 +#: src/include/geo-cluster/dialogs.rb:206 msgid "Cancel" msgstr "取消" -#: src/include/geo-cluster/dialogs.rb:135 -msgid "Please enter valid ip address" +#: src/include/geo-cluster/dialogs.rb:143 +#, fuzzy +#| msgid "Please enter valid ip address" +msgid "Please enter a valid ip address" msgstr "请输入有效的 IP 地址" -#: src/include/geo-cluster/dialogs.rb:176 +#: src/include/geo-cluster/dialogs.rb:184 msgid "Enter ticket and timeout" msgstr "请输入票据和超时" -#: src/include/geo-cluster/dialogs.rb:182 +#: src/include/geo-cluster/dialogs.rb:190 msgid "timeout" msgstr "超时" -#: src/include/geo-cluster/dialogs.rb:184 +#: src/include/geo-cluster/dialogs.rb:192 msgid "retries" msgstr "重试次数" -#: src/include/geo-cluster/dialogs.rb:186 +#: src/include/geo-cluster/dialogs.rb:194 msgid "weights" msgstr "权重" -#: src/include/geo-cluster/dialogs.rb:188 +#: src/include/geo-cluster/dialogs.rb:196 msgid "expire" msgstr "过期时间" -#: src/include/geo-cluster/dialogs.rb:190 +#: src/include/geo-cluster/dialogs.rb:198 msgid "acquire-after" msgstr "acquire-after" -#: src/include/geo-cluster/dialogs.rb:192 +#: src/include/geo-cluster/dialogs.rb:200 msgid "before-acquire-handler" msgstr "before-acquire-handler" -#: src/include/geo-cluster/dialogs.rb:229 -msgid "timeout is no valid" +#: src/include/geo-cluster/dialogs.rb:237 +#, fuzzy +#| msgid "timeout is no valid" +msgid "timeout is invalid" msgstr "超时无效" -#: src/include/geo-cluster/dialogs.rb:231 -msgid "expire is no valid" +#: src/include/geo-cluster/dialogs.rb:239 +#, fuzzy +#| msgid "expire is no valid" +msgid "expire is invalid" msgstr "过期时间无效" -#: src/include/geo-cluster/dialogs.rb:233 -msgid "acquireafter is no valid" +#: src/include/geo-cluster/dialogs.rb:241 +#, fuzzy +#| msgid "acquireafter is no valid" +msgid "acquireafter is invalid" msgstr "acquireafter 无效" -#: src/include/geo-cluster/dialogs.rb:235 -msgid "retries is no valid" +#: src/include/geo-cluster/dialogs.rb:243 +#, fuzzy +#| msgid "retries is no valid" +msgid "retries is invalid" msgstr "重试次数无效" -#: src/include/geo-cluster/dialogs.rb:237 +#: src/include/geo-cluster/dialogs.rb:245 msgid "retries values lower than 3 is illegal" msgstr "小于 3 的重试次数值是非法的" -#: src/include/geo-cluster/dialogs.rb:239 -msgid "weights is no valid" +#: src/include/geo-cluster/dialogs.rb:247 +#, fuzzy +#| msgid "weights is no valid" +msgid "weights is invalid" msgstr "权重无效" -#: src/include/geo-cluster/dialogs.rb:241 -msgid "ticket can not be null" +#: src/include/geo-cluster/dialogs.rb:249 +#, fuzzy +#| msgid "ticket can not be null" +msgid "ticket can not be empty" msgstr "票据不能为 null" #. fill confs with global_files -#: src/include/geo-cluster/dialogs.rb:332 -msgid "site have to be filled" -msgstr "必须填写「站点」" +#: src/include/geo-cluster/dialogs.rb:358 +#: src/include/geo-cluster/wizards.rb:47 +msgid "Firewall Configuration" +msgstr "防火墙配置" -#: src/include/geo-cluster/dialogs.rb:337 -msgid "ticket have to be filled" -msgstr "必须填写票据" - -#: src/include/geo-cluster/dialogs.rb:344 -#: src/include/geo-cluster/dialogs.rb:582 -msgid "arbitrator IP address is invalid!" -msgstr "仲裁主机 IP 地址是无效的！" - -#. servie:geo-cluster is the name of /etc/sysconfig/SuSEfirewall2.d/services/geo-cluster -#: src/include/geo-cluster/dialogs.rb:389 -msgid "Geo Cluster(geo-cluster) firewall configure" -msgstr "地理集群 (geo-cluster) 防火墙配置" - #. Wizard::SetContentsButtons(caption, contents, HELPS["c2"]:"", #. Label::BackButton(), Label::NextButton()); -#. FIXME ugly work. Better use alias and function, see yast2 drbd. -#: src/include/geo-cluster/dialogs.rb:439 -#: src/include/geo-cluster/dialogs.rb:669 -msgid "Geo Cluster configure" -msgstr "地理集群配置" +#: src/include/geo-cluster/dialogs.rb:494 +#, fuzzy +#| msgid "Enter an IP address of your site" +msgid "Enter an IP address of your arbitrator" +msgstr "请输入您站点的 IP 地址" -#: src/include/geo-cluster/dialogs.rb:494 +#: src/include/geo-cluster/dialogs.rb:505 +#, fuzzy +#| msgid "Edit IP address of your site" +msgid "Edit IP address of your arbitrator" +msgstr "编辑您站点的 IP 地址" + +#: src/include/geo-cluster/dialogs.rb:521 msgid "Enter an IP address of your site" msgstr "请输入您站点的 IP 地址" -#: src/include/geo-cluster/dialogs.rb:505 +#: src/include/geo-cluster/dialogs.rb:532 msgid "Edit IP address of your site" msgstr "编辑您站点的 IP 地址" -#: src/include/geo-cluster/dialogs.rb:527 +#: src/include/geo-cluster/dialogs.rb:554 msgid "Ticket name already exist!" msgstr "票据名称已存在！" #. abort? -#: src/include/geo-cluster/dialogs.rb:573 -msgid "Configuration name can not be null" -msgstr "配置名称不能为 null" +#: src/include/geo-cluster/dialogs.rb:600 +#, fuzzy +#| msgid "Configuration name cannot be empty." +msgid "Configuration name can not be empty." +msgstr "配置名称不能为空。" -#: src/include/geo-cluster/dialogs.rb:576 +#: src/include/geo-cluster/dialogs.rb:603 msgid "Configuration name can not be duplicated." msgstr "无法复制配置名称。" -#: src/include/geo-cluster/dialogs.rb:589 +#: src/include/geo-cluster/dialogs.rb:610 msgid "port is invalid!" msgstr "端口无效！" -#: src/include/geo-cluster/dialogs.rb:595 +#: src/include/geo-cluster/dialogs.rb:616 msgid "transport have to be filled!" msgstr "必须填写「传输」！" -#: src/include/geo-cluster/dialogs.rb:600 +#: src/include/geo-cluster/dialogs.rb:621 +#, fuzzy +#| msgid "transport have to be filled!" +msgid "arbitrator have to be filled!" +msgstr "必须填写「传输」！" + +#: src/include/geo-cluster/dialogs.rb:626 msgid "site have to be filled!" msgstr "必须填写「站点」！" -#: src/include/geo-cluster/dialogs.rb:605 +#: src/include/geo-cluster/dialogs.rb:631 msgid "ticket have to be filled!" msgstr "必须填写票据！" #. GeoCluster choose configure dialog caption -#: src/include/geo-cluster/dialogs.rb:644 +#: src/include/geo-cluster/dialogs.rb:670 msgid "GeoCluster Configuration Select" msgstr "GeoCluster 配置选择" #. Wizard::SetContentsButtons(caption, contents, HELPS["c2"]:"", #. Label::BackButton(), Label::NextButton()); -#: src/include/geo-cluster/dialogs.rb:650 +#: src/include/geo-cluster/dialogs.rb:676 msgid "Choose configuration file:" msgstr "请选择配置文件：" -#. encoding: utf-8 -#. ------------------------------------------------------------------------------ -#. Copyright (c) 2006 Novell, Inc. All Rights Reserved. -#. -#. -#. This program is free software; you can redistribute it and/or modify it under -#. the terms of version 2 of the GNU General Public License as published by the -#. Free Software Foundation. -#. -#. This program is distributed in the hope that it will be useful, but WITHOUT -#. ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -#. FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -#. -#. You should have received a copy of the GNU General Public License along with -#. this program; if not, contact Novell, Inc. -#. -#. To contact Novell about this file by physical or electronic mail, you may find -#. current contact information at www.novell.com. -#. ------------------------------------------------------------------------------ -#. File: include/geo-cluster/wizards.ycp -#. Package: Configuration of geo-cluster -#. Summary: Wizards definitions -#. Authors: Dongmao Zhang <dmzhang@suse.com> -#. -#. $Id: wizards.ycp 27914 2006-02-13 14:32:08Z locilka $ -#: src/include/geo-cluster/wizards.rb:46 -msgid "GeoCluster Configurations" -msgstr "GeoCluster 配置" - -#: src/include/geo-cluster/wizards.rb:47 -msgid "Firewall Configuration" -msgstr "防火墙配置" - #. Initialization dialog contents #: src/include/geo-cluster/wizards.rb:142 msgid "Initializing..." @@ -314,10 +329,16 @@ msgstr "无法写入全局票据设置。" #. GeoCluster read dialog caption -#: src/modules/GeoCluster.rb:273 src/modules/GeoCluster2.pm:129 -msgid "Initializing geo-cluster Configuration" +#: src/modules/GeoCluster.rb:273 +#, fuzzy +#| msgid "Initializing geo-cluster Configuration" +msgid "Initializing Geo Cluster Configuration" msgstr "正在初始化 geo-cluster 配置" +#: src/modules/GeoCluster.rb:286 src/modules/GeoCluster.rb:289 +msgid "Read SuSEFirewall Settings" +msgstr "读取 SuSEFirewall 设置" + #. #-#-#-#-# geo-cluster.rxgettext.pot (PACKAGE VERSION) #-#-#-#-# #. TODO FIXME Names of real stages #. We do not set help text here, because it was set outside @@ -327,10 +348,6 @@ msgid "Read the previous settings" msgstr "读取之前的设置" -#: src/modules/GeoCluster.rb:286 src/modules/GeoCluster.rb:289 -msgid "Read SuSEFirewall Settings" -msgstr "读取 SuSEFirewall 设置" - #. #-#-#-#-# geo-cluster.xgettext.pot #-#-#-#-# #. Progress step 2/3 #: src/modules/GeoCluster.rb:288 src/modules/GeoCluster2.pm:150 @@ -343,12 +360,11 @@ msgid "Finished" msgstr "已完成" -#. #-#-#-#-# geo-cluster.rxgettext.pot (PACKAGE VERSION) #-#-#-#-# #. GeoCluster write dialog caption -#. #-#-#-#-# geo-cluster.xgettext.pot #-#-#-#-# -#. GeoCluster read dialog caption -#: src/modules/GeoCluster.rb:332 src/modules/GeoCluster2.pm:211 -msgid "Saving geo-cluster Configuration" +#: src/modules/GeoCluster.rb:332 +#, fuzzy +#| msgid "Saving geo-cluster Configuration" +msgid "Saving Geo Cluster Configuration" msgstr "正在保存 geo-cluster 配置" #. Progress stage 1/2 @@ -383,6 +399,11 @@ msgid "Configuration summary..." msgstr "配置摘要..." +#. GeoCluster read dialog caption +#: src/modules/GeoCluster2.pm:129 +msgid "Initializing geo-cluster Configuration" +msgstr "正在初始化 geo-cluster 配置" + #. Progress stage 1/3 #: src/modules/GeoCluster2.pm:141 msgid "Read the database" @@ -415,6 +436,11 @@ msgid "Cannot detect devices." msgstr "无法检测设备。" +#. GeoCluster read dialog caption +#: src/modules/GeoCluster2.pm:211 +msgid "Saving geo-cluster Configuration" +msgstr "正在保存 geo-cluster 配置" + #. Progress stage 2/2 #: src/modules/GeoCluster2.pm:225 msgid "Run SuSEconfig" @@ -429,6 +455,27 @@ msgid "Configuration summary ..." msgstr "配置摘要 ..." +#~ msgid "site have to be filled" +#~ msgstr "必须填写「站点」" + +#~ msgid "ticket have to be filled" +#~ msgstr "必须填写票据" + +#~ msgid "arbitrator IP address is invalid!" +#~ msgstr "仲裁主机 IP 地址是无效的！" + +#~ msgid "Geo Cluster(geo-cluster) firewall configure" +#~ msgstr "地理集群 (geo-cluster) 防火墙配置" + +#~ msgid "Geo Cluster configure" +#~ msgstr "地理集群配置" + +#~ msgid "Configuration name can not be null" +#~ msgstr "配置名称不能为 null" + +#~ msgid "GeoCluster Configurations" +#~ msgstr "GeoCluster 配置" + #~ msgid "Cannot write sites settings." #~ msgstr "无法写入站点设置。" Modified: trunk/yast/zh_CN/po/inetd.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/inetd.zh_CN.po 2014-10-29 15:59:29 UTC (rev 90431) +++ trunk/yast/zh_CN/po/inetd.zh_CN.po 2014-10-29 16:00:17 UTC (rev 90432) @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: inetd\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2014-10-29 16:20+0100\n" "PO-Revision-Date: 2012-07-20 02:04+0800\n" "Last-Translator: Marguerite Su\n" "Language-Team: Chinese Simplified <kde-i18n-doc@kde.org>\n" @@ -107,11 +107,11 @@ msgid "The 'id' option cannot be combined with other options." msgstr "\"ID\"选项不能与其它选项结合使用。" -#: src/clients/inetd.rb:401 src/include/inetd/dialogs.rb:353 +#: src/clients/inetd.rb:401 src/include/inetd/dialogs.rb:356 msgid "Status" msgstr "状态" -#: src/clients/inetd.rb:402 src/include/inetd/dialogs.rb:354 +#: src/clients/inetd.rb:402 src/include/inetd/dialogs.rb:357 msgid "Service" msgstr "服务" @@ -123,15 +123,15 @@ msgid "Prot." msgstr "协议" -#: src/clients/inetd.rb:405 src/include/inetd/dialogs.rb:357 +#: src/clients/inetd.rb:405 src/include/inetd/dialogs.rb:360 msgid "Wait" msgstr "等待" -#: src/clients/inetd.rb:406 src/include/inetd/dialogs.rb:358 +#: src/clients/inetd.rb:406 src/include/inetd/dialogs.rb:361 msgid "User" msgstr "用户" -#: src/clients/inetd.rb:407 src/include/inetd/dialogs.rb:359 +#: src/clients/inetd.rb:407 src/include/inetd/dialogs.rb:362 msgid "Server" msgstr "服务器" @@ -146,12 +146,12 @@ msgstr "关" #. determine wait mode (convert to string) -#: src/clients/inetd.rb:442 src/include/inetd/dialogs.rb:851 +#: src/clients/inetd.rb:442 src/include/inetd/dialogs.rb:855 #: src/include/inetd/routines.rb:211 msgid "Yes" msgstr "是" -#: src/clients/inetd.rb:442 src/include/inetd/dialogs.rb:851 +#: src/clients/inetd.rb:442 src/include/inetd/dialogs.rb:855 #: src/include/inetd/routines.rb:213 msgid "No" msgstr "否" @@ -167,127 +167,127 @@ #. Translators: In autoinstallation mode: #. The package name is stored in %1. This is Popup::ContinueCancel. -#: src/include/inetd/dialogs.rb:160 +#: src/include/inetd/dialogs.rb:164 msgid "Package %1 will be installed during the write process." msgstr "在写入过程中将安装包 %1。" #. if (true) { // for debugging #. Translators: The package name is stored in %1. This is Popup::Message. -#: src/include/inetd/dialogs.rb:179 +#: src/include/inetd/dialogs.rb:183 msgid "Package %1 was not installed. The service cannot be edited." msgstr "未安装包 %1。无法编辑该服务。" #. Translators: The package name is stored in %1 -#: src/include/inetd/dialogs.rb:201 +#: src/include/inetd/dialogs.rb:205 msgid "Package %1 was successfully installed." msgstr "已成功安装包 %1。" #. This is main inetd module dialog. #. @return dialog result -#: src/include/inetd/dialogs.rb:299 +#: src/include/inetd/dialogs.rb:303 msgid "&Activate All Services" msgstr "激活所有服务(&A)" -#: src/include/inetd/dialogs.rb:300 +#: src/include/inetd/dialogs.rb:304 msgid "&Deactivate All Services" msgstr "取消激活所有服务(&D)" #. Translators: Initial and target state of xinetd (or inetd) -#: src/include/inetd/dialogs.rb:334 +#: src/include/inetd/dialogs.rb:339 msgid "D&isable" msgstr "禁用(&I)" -#: src/include/inetd/dialogs.rb:336 +#: src/include/inetd/dialogs.rb:340 msgid "Enab&le" msgstr "启用(&L)" #. Main dialog edit inetd.conf #. Translators: Name of table with services (echo, chargen, ...) -#: src/include/inetd/dialogs.rb:344 +#: src/include/inetd/dialogs.rb:347 msgid "Currently Available Services" msgstr "当前可用的服务" #. `opt(`notify), #. `opt(`keepSorting), -#: src/include/inetd/dialogs.rb:352 +#: src/include/inetd/dialogs.rb:355 msgid "Ch" msgstr "已更改" -#: src/include/inetd/dialogs.rb:355 +#: src/include/inetd/dialogs.rb:358 msgid "Type " msgstr "类型 " -#: src/include/inetd/dialogs.rb:356 +#: src/include/inetd/dialogs.rb:359 msgid "Protocol" msgstr "协议" -#: src/include/inetd/dialogs.rb:360 +#: src/include/inetd/dialogs.rb:363 msgid "Server / Args" msgstr "服务器/参数" #. Translators: Add service -#: src/include/inetd/dialogs.rb:370 +#: src/include/inetd/dialogs.rb:373 msgid "&Add" msgstr "添加(&A)" #. Translators: Edit service -#: src/include/inetd/dialogs.rb:373 +#: src/include/inetd/dialogs.rb:376 msgid "&Edit" msgstr "编辑(&E)" #. Translators: Delete service -#: src/include/inetd/dialogs.rb:376 +#: src/include/inetd/dialogs.rb:379 msgid "&Delete" msgstr "删除(&D)" #. Translators: Change service status -#: src/include/inetd/dialogs.rb:384 +#: src/include/inetd/dialogs.rb:387 msgid "&Toggle Status (On or Off)" msgstr "转换状态(开或关)(&T)" -#: src/include/inetd/dialogs.rb:396 +#: src/include/inetd/dialogs.rb:399 msgid "Status for All &Services" msgstr "所有服务的状态(&S)" #. Inetd configure dialog caption -#: src/include/inetd/dialogs.rb:410 +#: src/include/inetd/dialogs.rb:413 msgid "Network Service Configuration (xinetd)" msgstr "网络服务配置 (xinetd)" #. execute dialog #. Translators: Caption for EditOrCreateServiceDlg() -#: src/include/inetd/dialogs.rb:498 +#: src/include/inetd/dialogs.rb:504 msgid "Add a New Service Entry" msgstr "添加一个新的服务项" #. Translators: Popup::Error -#: src/include/inetd/dialogs.rb:528 +#: src/include/inetd/dialogs.rb:534 msgid "Cannot delete the service. It is not installed." msgstr "无法删除服务。没有安装该服务。" #. Translators: Popup::Message -#: src/include/inetd/dialogs.rb:552 +#: src/include/inetd/dialogs.rb:558 msgid "To delete a service, select one in the main dialog" msgstr "要删除服务，请在主对话框中选择一个服务。" #. Translators: Popup::Message -#: src/include/inetd/dialogs.rb:599 +#: src/include/inetd/dialogs.rb:605 msgid "To activate or deactivate a service, select one in the main dialog." msgstr "要激活或取消激活服务，请在主对话框中选择一个服务。" #. y2milestone("Current line %1", current_line); #. Translators: Caption of EditOrCreateServiceDlg() -#: src/include/inetd/dialogs.rb:736 +#: src/include/inetd/dialogs.rb:742 msgid "Edit a service entry" msgstr "编辑服务项" #. Translators: Popup::Message -#: src/include/inetd/dialogs.rb:751 +#: src/include/inetd/dialogs.rb:757 msgid "To edit a service, select one in the main dialog" msgstr "要编辑服务，请在主对话框中选择一个服务。" #. Translators: Popup::Warning -#: src/include/inetd/dialogs.rb:782 +#: src/include/inetd/dialogs.rb:788 msgid "" "All services are marked as disabled (locked).\n" "Internet super-server will be disabled." @@ -296,54 +296,54 @@ "将禁用因特网超级服务器。" #. service name -#: src/include/inetd/dialogs.rb:807 +#: src/include/inetd/dialogs.rb:811 msgid "&Service" msgstr "服务(&S)" -#: src/include/inetd/dialogs.rb:809 +#: src/include/inetd/dialogs.rb:813 msgid "RPC Versio&n" msgstr "RPC 版本(&N)" #. service status (running or stopped) -#: src/include/inetd/dialogs.rb:815 +#: src/include/inetd/dialogs.rb:819 msgid "Service is acti&ve." msgstr "服务处于活动状态。(&V)" #. service socket type -#: src/include/inetd/dialogs.rb:828 +#: src/include/inetd/dialogs.rb:832 msgid "Socket T&ype" msgstr "套接字类型(&Y)" #. for protocol option - ediatble ComboBox -#: src/include/inetd/dialogs.rb:839 +#: src/include/inetd/dialogs.rb:843 msgid "&Protocol" msgstr "协议(&P)" #. for flags (wait/nowait) - noneditable ComboBox -#: src/include/inetd/dialogs.rb:850 +#: src/include/inetd/dialogs.rb:854 msgid "&Wait" msgstr "等待(&W)" #. user and group ComboBoxes -#: src/include/inetd/dialogs.rb:860 +#: src/include/inetd/dialogs.rb:864 msgid "&User" msgstr "用户(&U)" -#: src/include/inetd/dialogs.rb:862 +#: src/include/inetd/dialogs.rb:866 msgid "&Group" msgstr "组(&G)" #. Server arguments -#: src/include/inetd/dialogs.rb:865 +#: src/include/inetd/dialogs.rb:869 msgid "S&erver" msgstr "服务器(&E)" -#: src/include/inetd/dialogs.rb:866 +#: src/include/inetd/dialogs.rb:870 msgid "Server Argumen&ts" msgstr "服务器参数(&T)" #. Comment above the service line in inetd.conf -#: src/include/inetd/dialogs.rb:868 +#: src/include/inetd/dialogs.rb:872 msgid "Co&mment" msgstr "注释(&M)" @@ -357,14 +357,14 @@ #. It does not get the NIS entries. #. "+" is filtered out. #. @return [Array] groups -#: src/include/inetd/dialogs.rb:914 src/include/inetd/dialogs.rb:952 -#: src/include/inetd/dialogs.rb:957 src/include/inetd/dialogs.rb:996 +#: src/include/inetd/dialogs.rb:918 src/include/inetd/dialogs.rb:956 +#: src/include/inetd/dialogs.rb:961 src/include/inetd/dialogs.rb:1000 #: src/include/inetd/routines.rb:333 src/include/inetd/routines.rb:353 msgid "--default--" msgstr "--默认值--" #. Translators: Popup::Message -#: src/include/inetd/dialogs.rb:942 +#: src/include/inetd/dialogs.rb:946 msgid "" "Service is empty.\n" "Enter valid values.\n" @@ -373,12 +373,12 @@ "请输入有效的值。\n" #. Error message -#: src/include/inetd/dialogs.rb:948 +#: src/include/inetd/dialogs.rb:952 msgid "Service name contains disallowed character \"/\"." msgstr "服务名称包含不允许的字符 \"/\"。" #. Translators: sformat-ed() 3 strings -#: src/include/inetd/dialogs.rb:956 +#: src/include/inetd/dialogs.rb:960 msgid "The user %1 is reserved for internal server processes only." msgstr "用户 %1 只能用于内部服务器进程。" @@ -657,57 +657,57 @@ msgstr "正在初始化..." #. Inetd read dialog caption -#: src/modules/Inetd.rb:185 +#: src/modules/Inetd.rb:188 msgid "Initializing inetd Configuration" msgstr "正在初始化 inetd 配置" -#: src/modules/Inetd.rb:193 +#: src/modules/Inetd.rb:196 msgid "Read the Configuration" msgstr "读取配置" -#: src/modules/Inetd.rb:194 +#: src/modules/Inetd.rb:197 msgid "Reading the configuration..." msgstr "正在读取配置..." #. read database -#: src/modules/Inetd.rb:194 src/modules/Inetd.rb:212 src/modules/Inetd.rb:276 -#: src/modules/Inetd.rb:340 +#: src/modules/Inetd.rb:197 src/modules/Inetd.rb:214 src/modules/Inetd.rb:278 +#: src/modules/Inetd.rb:306 msgid "Finished" msgstr "已完成" #. Inetd read dialog caption -#: src/modules/Inetd.rb:267 +#: src/modules/Inetd.rb:269 msgid "Saving inetd Configuration" msgstr "正在保存 inetd 配置" -#: src/modules/Inetd.rb:275 +#: src/modules/Inetd.rb:277 msgid "Write the settings" msgstr "写入设置" -#: src/modules/Inetd.rb:276 +#: src/modules/Inetd.rb:278 msgid "Writing the settings..." msgstr "正在写入设置..." #. in future: catch errors -#: src/modules/Inetd.rb:337 +#: src/modules/Inetd.rb:303 msgid "Cannot write settings!" msgstr "无法写入设置！" #. "enabled" defaults to true -#: src/modules/Inetd.rb:607 +#: src/modules/Inetd.rb:598 msgid "<p><ul><i>All services are marked as stopped.</i></ul></p>" msgstr "<p><ul><i>所有服务都被标记为停止。</i></ul></p>" #. Translators: Summary head, if nothing configured -#: src/modules/Inetd.rb:618 +#: src/modules/Inetd.rb:609 msgid "Network services" msgstr "网络服务" #. Translators: Summary head, if something configured -#: src/modules/Inetd.rb:623 +#: src/modules/Inetd.rb:613 msgid "Network services are managed via %1" msgstr "网络服务通过 %1 进行管理" -#: src/modules/Inetd.rb:627 +#: src/modules/Inetd.rb:616 msgid "These services will be enabled" msgstr "这些服务将被启用" Modified: trunk/yast/zh_CN/po/installation.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/installation.zh_CN.po 2014-10-29 15:59:29 UTC (rev 90431) +++ trunk/yast/zh_CN/po/installation.zh_CN.po 2014-10-29 16:00:17 UTC (rev 90432) @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: installation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-03 16:45+0200\n" +"POT-Creation-Date: 2014-10-29 16:20+0100\n" "PO-Revision-Date: 2014-09-04 14:04+0800\n" "Last-Translator: 玛格丽特 · 苏 <marguerite@opensuse.org>\n" "Language-Team: Chinese Simplified <opensuse-zh@opensuse.org>\n" Modified: trunk/yast/zh_CN/po/instserver.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/instserver.zh_CN.po 2014-10-29 15:59:29 UTC (rev 90431) +++ trunk/yast/zh_CN/po/instserver.zh_CN.po 2014-10-29 16:00:17 UTC (rev 90432) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2014-10-29 16:20+0100\n" "PO-Revision-Date: 2013-01-31 22:44+0800\n" "Last-Translator: \n" "Language-Team: Chinese Simplified <opensuse-zh@opensuse.org>\n" @@ -64,25 +64,25 @@ msgstr "变更介质" #. %1 is the current cd number -#: src/include/instserver/dialogs.rb:241 +#: src/include/instserver/dialogs.rb:230 msgid "Insert CD %1 then press continue." msgstr "插入 CD %1 然后按继续." -#: src/include/instserver/dialogs.rb:246 +#: src/include/instserver/dialogs.rb:235 msgid "Select ISO image %1 then press continue." msgstr "请选择 ISO 映像 %1，然后按继续." #. %2 is the product name and version -#: src/include/instserver/dialogs.rb:252 +#: src/include/instserver/dialogs.rb:241 msgid "Insert CD %1 of %2." msgstr "插入 CD %1(共 %2 张 CD)。" -#: src/include/instserver/dialogs.rb:253 +#: src/include/instserver/dialogs.rb:242 msgid "Select ISO image %1 of %2." msgstr "选择 ISO 映像 %1(共 %2 个映像)。" #. popup request, %1 is CD medium name -#: src/include/instserver/dialogs.rb:292 +#: src/include/instserver/dialogs.rb:281 msgid "" "Insert\n" "%1" @@ -91,12 +91,12 @@ "%1" #. popup request, %1 is ISO name -#: src/include/instserver/dialogs.rb:321 +#: src/include/instserver/dialogs.rb:310 msgid "Select %1" msgstr "选择 %1" #. add-on medium (e.g. service pack) doesn't match configured repository -#: src/include/instserver/dialogs.rb:573 +#: src/include/instserver/dialogs.rb:551 msgid "" "The medium requires product %1, which is not provided\n" "by the current repository.\n" @@ -109,63 +109,63 @@ "请先选择基本产品介质。" #. else, we create CD1, CD2, etc. (for code10 always) -#: src/include/instserver/dialogs.rb:697 +#: src/include/instserver/dialogs.rb:669 msgid "Copying CD contents to local directory" msgstr "增在将 CD 内容拷贝到本地目录" -#: src/include/instserver/dialogs.rb:698 +#: src/include/instserver/dialogs.rb:670 msgid "This may take a while..." msgstr "这或许需要一点时间..." #. TODO: report more details (stderr) #. rename the directory -#: src/include/instserver/dialogs.rb:755 src/modules/Instserver.rb:1361 +#: src/include/instserver/dialogs.rb:727 src/modules/Instserver.rb:1341 msgid "Error while moving repository content." msgstr "移动软件源内容时出错。" #. Instserver configuration dialog caption #. Instserver configuration dialog caption -#: src/include/instserver/dialogs.rb:978 -#: src/include/instserver/dialogs.rb:1191 +#: src/include/instserver/dialogs.rb:949 +#: src/include/instserver/dialogs.rb:1162 msgid "Repository Configuration" msgstr "软件源配置" #. Instserver configure1 dialog contents -#: src/include/instserver/dialogs.rb:994 +#: src/include/instserver/dialogs.rb:965 msgid "Read &CD or DVD Medium" msgstr "读取 CD 或 DVD 介质(&C)" -#: src/include/instserver/dialogs.rb:1000 +#: src/include/instserver/dialogs.rb:971 msgid "Data &Source" msgstr "数据源(&S)" -#: src/include/instserver/dialogs.rb:1008 +#: src/include/instserver/dialogs.rb:979 msgid "Use &ISO Images" msgstr "使用 ISO 映像(&I)" -#: src/include/instserver/dialogs.rb:1017 +#: src/include/instserver/dialogs.rb:988 msgid "Di&rectory with CD Images:" msgstr "存放 CD 映像的目录:(&R)" -#: src/include/instserver/dialogs.rb:1020 -#: src/include/instserver/dialogs.rb:1400 +#: src/include/instserver/dialogs.rb:991 +#: src/include/instserver/dialogs.rb:1371 msgid "Select &Directory" msgstr "选择目录(&D)" #. abort? #. abort? -#: src/include/instserver/dialogs.rb:1063 -#: src/include/instserver/dialogs.rb:1469 +#: src/include/instserver/dialogs.rb:1034 +#: src/include/instserver/dialogs.rb:1440 msgid "Select Directory" msgstr "选择目录" #. abort? -#: src/include/instserver/dialogs.rb:1080 -#: src/include/instserver/dialogs.rb:1244 +#: src/include/instserver/dialogs.rb:1051 +#: src/include/instserver/dialogs.rb:1215 msgid "Installation server name missing." msgstr "缺少安装服务器名称." -#: src/include/instserver/dialogs.rb:1095 +#: src/include/instserver/dialogs.rb:1066 msgid "" "Contents already exist in this directory.\n" "Not copying CDs." @@ -174,7 +174,7 @@ "不拷贝光盘." #. for translators: popup question (prefer more shorter lines than few long lines) -#: src/include/instserver/dialogs.rb:1123 +#: src/include/instserver/dialogs.rb:1094 msgid "" "Add an additional product (Service Pack, Additional\n" "Package CD, etc.) to the repository?" @@ -183,20 +183,20 @@ "到软件源？" #. Instserver configure1 dialog contents -#: src/include/instserver/dialogs.rb:1199 +#: src/include/instserver/dialogs.rb:1170 msgid "Repository &Name:" msgstr "软件源名称：(&N)" -#: src/include/instserver/dialogs.rb:1204 +#: src/include/instserver/dialogs.rb:1175 msgid "A&nnounce as Installation Service with SLP" msgstr "公布为带有 SLP 的安装服务(&N)" -#: src/include/instserver/dialogs.rb:1252 +#: src/include/instserver/dialogs.rb:1223 msgid "Invalid repository name." msgstr "无效软件源名称。" #. an error message - entered repository name already exists -#: src/include/instserver/dialogs.rb:1260 +#: src/include/instserver/dialogs.rb:1231 msgid "" "Repository '%1' already exists,\n" "enter another name." @@ -205,7 +205,7 @@ "请输入其它名称。" #. create directory only for a new repository -#: src/include/instserver/dialogs.rb:1273 +#: src/include/instserver/dialogs.rb:1244 msgid "" "Error while creating <tt>repository</tt> directory.\n" "Verify that the directory \n" @@ -218,7 +218,7 @@ "是否可写入，然后重试。\n" #. confirm removal of a repository, the action is done immediately and cannot be reverted -#: src/include/instserver/dialogs.rb:1292 +#: src/include/instserver/dialogs.rb:1263 msgid "" "Repository '%1' has been marked to delete.\n" "When adding a new repository with the same name\n" @@ -233,87 +233,87 @@ "是否确定删除旧的内容并从头新建软件源？" #. Instserver server dialog caption -#: src/include/instserver/dialogs.rb:1376 +#: src/include/instserver/dialogs.rb:1347 msgid "Initial Setup -- Initial Setup" msgstr "初始设置 -- 初始设置" -#: src/include/instserver/dialogs.rb:1392 +#: src/include/instserver/dialogs.rb:1363 msgid "Do Not Configure Any Net&work Services" msgstr "不配置任何网络服务(&W)" -#: src/include/instserver/dialogs.rb:1397 +#: src/include/instserver/dialogs.rb:1368 msgid "Di&rectory to Contain Repositories:" msgstr "包含软件源的目录(&R):" #. radio button label -#: src/include/instserver/dialogs.rb:1412 +#: src/include/instserver/dialogs.rb:1383 msgid "&Configure as HTTP Repository" msgstr "配置为 HTTP 软件源(&C)" #. radio button label -#: src/include/instserver/dialogs.rb:1420 +#: src/include/instserver/dialogs.rb:1391 msgid "&Configure as FTP Repository" msgstr "配置为 FTP 软件源(&C)" #. radio button label -#: src/include/instserver/dialogs.rb:1428 +#: src/include/instserver/dialogs.rb:1399 msgid "&Configure as NFS Repository" msgstr "配置为 NFS 软件源(&C)" -#: src/include/instserver/dialogs.rb:1480 +#: src/include/instserver/dialogs.rb:1451 msgid "Directory path for the installation server missing." msgstr "安装服务器的目录不存在." #. Instserver configure2 dialog caption -#: src/include/instserver/dialogs.rb:1507 +#: src/include/instserver/dialogs.rb:1478 msgid "Installation Server -- NFS" msgstr "安装服务器 -- NFS" #. Instserver nfs dialog contents -#: src/include/instserver/dialogs.rb:1525 +#: src/include/instserver/dialogs.rb:1496 msgid "&Host Wild Card" msgstr "主机通配符(&H)" -#: src/include/instserver/dialogs.rb:1527 +#: src/include/instserver/dialogs.rb:1498 msgid "&Options" msgstr "选项(&O)" #. store the firewall setting, (activation is in SetupNFS()) -#: src/include/instserver/dialogs.rb:1585 +#: src/include/instserver/dialogs.rb:1556 msgid "Error occurred while configuring NFS." msgstr "在配置 NFS 时出现错误." #. Instserver configure2 dialog caption -#: src/include/instserver/dialogs.rb:1617 +#: src/include/instserver/dialogs.rb:1588 msgid "Installation Server -- FTP" msgstr "安装服务器 -- FTP" #. Instserver nfs dialog contents -#: src/include/instserver/dialogs.rb:1625 +#: src/include/instserver/dialogs.rb:1596 msgid "&FTP Server Root Directory:" msgstr "FTP 服务器根目录(&F)：" -#: src/include/instserver/dialogs.rb:1627 +#: src/include/instserver/dialogs.rb:1598 msgid "&Directory Alias:" msgstr "目录别名(&D)：" #. store the firewall setting, (activation is in SetupFTP()) -#: src/include/instserver/dialogs.rb:1684 +#: src/include/instserver/dialogs.rb:1655 msgid "Error occurred while configuring FTP." msgstr "在配置 FTP 时出现错误." #. Instserver configure2 dialog caption -#: src/include/instserver/dialogs.rb:1704 +#: src/include/instserver/dialogs.rb:1675 msgid "Installation Server -- HTTP" msgstr "安装服务器 -- HTTP" #. Instserver nfs dialog contents -#: src/include/instserver/dialogs.rb:1720 +#: src/include/instserver/dialogs.rb:1691 msgid "&Directory Alias" msgstr "目录别名(&D)" #. store the firewall setting, (activation is in SetupHTTP()) -#: src/include/instserver/dialogs.rb:1777 +#: src/include/instserver/dialogs.rb:1748 msgid "Error creating HTTPD configuration." msgstr "创建 HTTPD 配置时出现错误." @@ -638,7 +638,7 @@ "然后根据需要按<b>编辑</b>或<b>删除</b>。</p>\n" #. Read service data using _auto -#: src/modules/Instserver.rb:308 +#: src/modules/Instserver.rb:306 msgid "" "The FTP installation server requires an FTP server package. The vsftpd package\n" "will now be installed.\n" @@ -661,7 +661,7 @@ #. @param string directory #. @param [String] options #. @return [Boolean] -#: src/modules/Instserver.rb:570 +#: src/modules/Instserver.rb:569 msgid "" "Directory is already exported via NFS.\n" "Leave NFS exports unmodified?\n" @@ -670,73 +670,73 @@ "是否保持 NFS 导出不变？\n" #. Instserver read dialog caption -#: src/modules/Instserver.rb:1152 +#: src/modules/Instserver.rb:1155 msgid "Initializing Configuration" msgstr "正在初始化配置" #. Progress stage 1/2 -#: src/modules/Instserver.rb:1166 +#: src/modules/Instserver.rb:1165 msgid "Read configuration file" msgstr "读取配置文件" #. Progress stage 2/2 -#: src/modules/Instserver.rb:1168 +#: src/modules/Instserver.rb:1167 msgid "Search for a new repository" msgstr "搜索新软件源" #. Progress step 1/2 -#: src/modules/Instserver.rb:1172 +#: src/modules/Instserver.rb:1171 msgid "Reading configuration file..." msgstr "正在读取配置文件..." #. Progress step 2/2 -#: src/modules/Instserver.rb:1174 +#: src/modules/Instserver.rb:1173 msgid "Searching for a new repository..." msgstr "正在搜索新软件源..." #. Progress finished #. Progress finished -#: src/modules/Instserver.rb:1176 src/modules/Instserver.rb:1278 +#: src/modules/Instserver.rb:1175 src/modules/Instserver.rb:1260 msgid "Finished" msgstr "已完成" -#. Error message -#: src/modules/Instserver.rb:1224 +#. TRANSLATORS: Error message +#: src/modules/Instserver.rb:1188 msgid "Cannot read current settings." msgstr "不能读取当前设置." #. Instserver read dialog caption -#: src/modules/Instserver.rb:1254 +#: src/modules/Instserver.rb:1240 msgid "Saving Installation Server Configuration" msgstr "正在保存安装服务器配置" #. Progress stage 1/2 -#: src/modules/Instserver.rb:1268 +#: src/modules/Instserver.rb:1250 msgid "Write the settings" msgstr "写入设置" #. Progress stage 2/2 -#: src/modules/Instserver.rb:1270 +#: src/modules/Instserver.rb:1252 msgid "Run SuSEconfig" msgstr "运行 SuSEconfig" #. Progress step 1/2 -#: src/modules/Instserver.rb:1274 +#: src/modules/Instserver.rb:1256 msgid "Writing the settings..." msgstr "正在写入设置..." #. Progress step 2/2 -#: src/modules/Instserver.rb:1276 +#: src/modules/Instserver.rb:1258 msgid "Running SuSEconfig..." msgstr "正在运行 SuSEconfig..." #. Error message -#: src/modules/Instserver.rb:1292 +#: src/modules/Instserver.rb:1274 msgid "Cannot write settings." msgstr "不能写入设置." #. Configuration summary text for autoyast -#: src/modules/Instserver.rb:1465 +#: src/modules/Instserver.rb:1441 msgid "Configured Repositories" msgstr "已配置软件源" Modified: trunk/yast/zh_CN/po/iscsi-lio-server.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/iscsi-lio-server.zh_CN.po 2014-10-29 15:59:29 UTC (rev 90431) +++ trunk/yast/zh_CN/po/iscsi-lio-server.zh_CN.po 2014-10-29 16:00:17 UTC (rev 90432) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2014-10-29 16:20+0100\n" "PO-Revision-Date: 2014-06-11 12:55+0800\n" "Last-Translator: 玛格丽特 · 苏 <marguerite@opensuse.org>\n" "Language-Team: Chinese Simplified <opensuse-zh@opensuse.org>\n" @@ -48,24 +48,24 @@ #. third tab - targets / luns #. targets dialog #: src/include/iscsi-lio-server/dialogs.rb:89 -#: src/include/iscsi-lio-server/dialogs.rb:318 +#: src/include/iscsi-lio-server/dialogs.rb:320 #: src/modules/IscsiLioServer.rb:443 msgid "Targets" msgstr "目标" #: src/include/iscsi-lio-server/dialogs.rb:115 -#: src/include/iscsi-lio-server/dialogs.rb:174 +#: src/include/iscsi-lio-server/dialogs.rb:176 msgid "Target" msgstr "目标" #: src/include/iscsi-lio-server/dialogs.rb:124 -#: src/include/iscsi-lio-server/dialogs.rb:183 +#: src/include/iscsi-lio-server/dialogs.rb:185 msgid "Identifier" msgstr "辨识符" #: src/include/iscsi-lio-server/dialogs.rb:128 -#: src/include/iscsi-lio-server/dialogs.rb:187 -#: src/include/iscsi-lio-server/dialogs.rb:318 +#: src/include/iscsi-lio-server/dialogs.rb:189 +#: src/include/iscsi-lio-server/dialogs.rb:320 msgid "Portal group" msgstr "门户组" @@ -78,170 +78,176 @@ msgstr "端口号" #: src/include/iscsi-lio-server/dialogs.rb:143 +#, fuzzy +#| msgid "Invalid IP address." +msgid "Bind all IP addresses" +msgstr "无效的 IP 地址。" + +#: src/include/iscsi-lio-server/dialogs.rb:145 msgid "Use Authentication" msgstr "使用认证" -#: src/include/iscsi-lio-server/dialogs.rb:147 +#: src/include/iscsi-lio-server/dialogs.rb:149 #: src/include/iscsi-lio-server/widgets.rb:301 msgid "LUN" msgstr "逻辑单元编号" -#: src/include/iscsi-lio-server/dialogs.rb:147 +#: src/include/iscsi-lio-server/dialogs.rb:149 msgid "Name" msgstr "名称" -#: src/include/iscsi-lio-server/dialogs.rb:147 +#: src/include/iscsi-lio-server/dialogs.rb:149 msgid "Path" msgstr "路径" -#: src/include/iscsi-lio-server/dialogs.rb:152 -#: src/include/iscsi-lio-server/dialogs.rb:196 -#: src/include/iscsi-lio-server/dialogs.rb:235 -#: src/include/iscsi-lio-server/dialogs.rb:323 -#: src/include/iscsi-lio-server/dialogs.rb:370 +#: src/include/iscsi-lio-server/dialogs.rb:154 +#: src/include/iscsi-lio-server/dialogs.rb:198 +#: src/include/iscsi-lio-server/dialogs.rb:237 +#: src/include/iscsi-lio-server/dialogs.rb:325 +#: src/include/iscsi-lio-server/dialogs.rb:372 #: src/include/iscsi-lio-server/widgets.rb:442 msgid "Add" msgstr "添加" -#: src/include/iscsi-lio-server/dialogs.rb:153 -#: src/include/iscsi-lio-server/dialogs.rb:236 -#: src/include/iscsi-lio-server/dialogs.rb:324 -#: src/include/iscsi-lio-server/dialogs.rb:371 +#: src/include/iscsi-lio-server/dialogs.rb:155 +#: src/include/iscsi-lio-server/dialogs.rb:238 +#: src/include/iscsi-lio-server/dialogs.rb:326 +#: src/include/iscsi-lio-server/dialogs.rb:373 msgid "Edit" msgstr "编辑" -#: src/include/iscsi-lio-server/dialogs.rb:154 -#: src/include/iscsi-lio-server/dialogs.rb:199 -#: src/include/iscsi-lio-server/dialogs.rb:237 -#: src/include/iscsi-lio-server/dialogs.rb:325 -#: src/include/iscsi-lio-server/dialogs.rb:372 +#: src/include/iscsi-lio-server/dialogs.rb:156 +#: src/include/iscsi-lio-server/dialogs.rb:201 +#: src/include/iscsi-lio-server/dialogs.rb:239 +#: src/include/iscsi-lio-server/dialogs.rb:327 +#: src/include/iscsi-lio-server/dialogs.rb:374 #: src/include/iscsi-lio-server/widgets.rb:443 msgid "Delete" msgstr "删除" -#: src/include/iscsi-lio-server/dialogs.rb:191 +#: src/include/iscsi-lio-server/dialogs.rb:193 msgid "Client" msgstr "客户端" -#: src/include/iscsi-lio-server/dialogs.rb:191 +#: src/include/iscsi-lio-server/dialogs.rb:193 msgid "Lun Mapping" msgstr "逻辑单元编号映射" -#: src/include/iscsi-lio-server/dialogs.rb:191 +#: src/include/iscsi-lio-server/dialogs.rb:193 msgid "Auth" msgstr "认证" -#: src/include/iscsi-lio-server/dialogs.rb:197 +#: src/include/iscsi-lio-server/dialogs.rb:199 msgid "Edit LUN" msgstr "编辑逻辑单元编号" -#: src/include/iscsi-lio-server/dialogs.rb:198 +#: src/include/iscsi-lio-server/dialogs.rb:200 msgid "Edit Auth" msgstr "编辑认证" -#: src/include/iscsi-lio-server/dialogs.rb:200 +#: src/include/iscsi-lio-server/dialogs.rb:202 msgid "Copy" msgstr "复制" #. enable/disable none/incoming/outgoing authentication -#: src/include/iscsi-lio-server/dialogs.rb:214 +#: src/include/iscsi-lio-server/dialogs.rb:216 #: src/include/iscsi-lio-server/widgets.rb:207 #: src/modules/IscsiLioServer.rb:434 msgid "No Authentication" msgstr "无认证" -#: src/include/iscsi-lio-server/dialogs.rb:223 +#: src/include/iscsi-lio-server/dialogs.rb:225 #: src/include/iscsi-lio-server/widgets.rb:218 #: src/modules/IscsiLioServer.rb:437 msgid "Incoming Authentication" msgstr "进站认证" #. dialog to add/modify user and password -#: src/include/iscsi-lio-server/dialogs.rb:230 -#: src/include/iscsi-lio-server/dialogs.rb:251 +#: src/include/iscsi-lio-server/dialogs.rb:232 +#: src/include/iscsi-lio-server/dialogs.rb:253 #: src/include/iscsi-lio-server/widgets.rb:223 #: src/include/iscsi-lio-server/widgets.rb:236 -#: src/include/iscsi-lio-server/widgets.rb:721 +#: src/include/iscsi-lio-server/widgets.rb:720 msgid "Username" msgstr "用户名" -#: src/include/iscsi-lio-server/dialogs.rb:230 -#: src/include/iscsi-lio-server/dialogs.rb:252 +#: src/include/iscsi-lio-server/dialogs.rb:232 +#: src/include/iscsi-lio-server/dialogs.rb:254 #: src/include/iscsi-lio-server/widgets.rb:224 #: src/include/iscsi-lio-server/widgets.rb:237 -#: src/include/iscsi-lio-server/widgets.rb:722 +#: src/include/iscsi-lio-server/widgets.rb:721 msgid "Password" msgstr "密码" -#: src/include/iscsi-lio-server/dialogs.rb:246 +#: src/include/iscsi-lio-server/dialogs.rb:248 #: src/include/iscsi-lio-server/widgets.rb:231 #: src/modules/IscsiLioServer.rb:440 msgid "Outgoing Authentication" msgstr "出站认证" #. radio button (starting LIO target service - option 1) -#: src/include/iscsi-lio-server/dialogs.rb:272 +#: src/include/iscsi-lio-server/dialogs.rb:274 msgid "When &Booting" msgstr "引导时(&B)" #. radio button (starting LIO target service - option 2) -#: src/include/iscsi-lio-server/dialogs.rb:276 +#: src/include/iscsi-lio-server/dialogs.rb:278 msgid "&Manually" msgstr "手动(&M)" #. part of help text, used to describe radiobuttons (matching starting LIO target service but without "&") -#: src/include/iscsi-lio-server/dialogs.rb:282 +#: src/include/iscsi-lio-server/dialogs.rb:284 #: src/modules/IscsiLioServer.rb:429 msgid "When Booting" msgstr "引导时" #. part of help text, used to describe radiobuttons (matching starting LIO target service but without "&") -#: src/include/iscsi-lio-server/dialogs.rb:284 +#: src/include/iscsi-lio-server/dialogs.rb:286 #: src/modules/IscsiLioServer.rb:431 msgid "Manually" msgstr "手动" #. dialog for expert settings -#: src/include/iscsi-lio-server/dialogs.rb:367 +#: src/include/iscsi-lio-server/dialogs.rb:369 msgid "Key" msgstr "键" -#: src/include/iscsi-lio-server/dialogs.rb:367 +#: src/include/iscsi-lio-server/dialogs.rb:369 msgid "Value" msgstr "值" #. Summary dialog #. @return dialog result #. Main dialog - tabbed -#: src/include/iscsi-lio-server/dialogs.rb:428 +#: src/include/iscsi-lio-server/dialogs.rb:430 msgid "iSCSI LIO Target Overview" msgstr "iSCSI LIO 目标概览" #. expert dialog #. LUN details -#: src/include/iscsi-lio-server/dialogs.rb:436 +#: src/include/iscsi-lio-server/dialogs.rb:438 #: src/include/iscsi-lio-server/helps.rb:178 #: src/include/iscsi-lio-server/helps.rb:183 msgid "<h1>iSCSI Target</h1>" msgstr "<h1>iSCSI 目标</h1>" #. dialog for add target -#: src/include/iscsi-lio-server/dialogs.rb:471 +#: src/include/iscsi-lio-server/dialogs.rb:473 msgid "Add iSCSI Target" msgstr "添加 iSCSI 目标" #. discovery authentication dialog -#: src/include/iscsi-lio-server/dialogs.rb:505 +#: src/include/iscsi-lio-server/dialogs.rb:507 msgid "Modify iSCSI Target Client Setup" msgstr "修改 iSCSI 目标客户端设置" #. edit target dialog -#: src/include/iscsi-lio-server/dialogs.rb:539 +#: src/include/iscsi-lio-server/dialogs.rb:541 msgid "Modify iSCSI Target Lun Setup" msgstr "修改 iSCSI 目标逻辑单元编号设置" #. expert target dialog -#: src/include/iscsi-lio-server/dialogs.rb:572 +#: src/include/iscsi-lio-server/dialogs.rb:574 msgid "iSCSI Target Expert Settings" msgstr "iSCSI 目标专家设置" @@ -541,119 +547,118 @@ msgid "Need to enable at least one Authentification!" msgstr "需要至少启用一个认证！" -#: src/include/iscsi-lio-server/widgets.rb:620 +#: src/include/iscsi-lio-server/widgets.rb:619 msgid "Client name:" msgstr "客户端名称：" -#: src/include/iscsi-lio-server/widgets.rb:623 +#: src/include/iscsi-lio-server/widgets.rb:622 msgid "Import LUNs from TPG" msgstr "从目标门户组导入逻辑单元编号" -#: src/include/iscsi-lio-server/widgets.rb:639 -#: src/include/iscsi-lio-server/widgets.rb:695 +#: src/include/iscsi-lio-server/widgets.rb:638 +#: src/include/iscsi-lio-server/widgets.rb:694 msgid "Client name must not be empty!" msgstr "客户端名称不能为空！" #. Don't check IscsiLioData.GetClntList(@curr_target, @curr_tpg) for existing #. client name. It's allowed to have several LUNs accessable for same client. #. TODO: verify whether it's necessary to check @changed_lun here? -#: src/include/iscsi-lio-server/widgets.rb:645 -#: src/include/iscsi-lio-server/widgets.rb:701 +#: src/include/iscsi-lio-server/widgets.rb:644 +#: src/include/iscsi-lio-server/widgets.rb:700 msgid "Client name already exists!" msgstr "客户端名称已存在！" #. Copy exisiting LUN, i.e. give additional client access to the LUN #. (which is allowed, makes sense e.g. with multipath) -#: src/include/iscsi-lio-server/widgets.rb:678 +#: src/include/iscsi-lio-server/widgets.rb:677 msgid "New client name:" msgstr "新客户端名称：" -#: src/include/iscsi-lio-server/widgets.rb:724 +#: src/include/iscsi-lio-server/widgets.rb:723 msgid "OK" msgstr "确定" -#: src/include/iscsi-lio-server/widgets.rb:725 +#: src/include/iscsi-lio-server/widgets.rb:724 msgid "Cancel" msgstr "取消" #. remove a item #. **************** Edit Dialog ***************************** #. init values for modifying target (read it from stored map) -#: src/include/iscsi-lio-server/widgets.rb:820 -#: src/include/iscsi-lio-server/widgets.rb:934 -#: src/include/iscsi-lio-server/widgets.rb:1292 +#: src/include/iscsi-lio-server/widgets.rb:819 +#: src/include/iscsi-lio-server/widgets.rb:933 +#: src/include/iscsi-lio-server/widgets.rb:1291 msgid "Really delete the selected item?" msgstr "真的删除所选项吗？" -#: src/include/iscsi-lio-server/widgets.rb:1002 +#: src/include/iscsi-lio-server/widgets.rb:1001 msgid "Problem creating target %1 with tpg %2" msgstr "使用目标门户组 %2 创建目标 %1 时出现问题" -#. brackets needed around IPv6 -#: src/include/iscsi-lio-server/widgets.rb:1024 +#: src/include/iscsi-lio-server/widgets.rb:1023 msgid "Problem setting network portal to %1" msgstr "设置网络门户为 %1 时出现问题" -#: src/include/iscsi-lio-server/widgets.rb:1045 +#: src/include/iscsi-lio-server/widgets.rb:1044 msgid "Problem removing lun %1" msgstr "移除逻辑单元编号 %1 时出现问题" -#: src/include/iscsi-lio-server/widgets.rb:1070 +#: src/include/iscsi-lio-server/widgets.rb:1069 msgid "Problem setting lun %1 (name:%2) to path %3" msgstr "设置逻辑单元编号 %1 (名称：%2) 到路径 %3 时出现问题" -#: src/include/iscsi-lio-server/widgets.rb:1084 +#: src/include/iscsi-lio-server/widgets.rb:1083 msgid "Problem setting auth on %1:%2 to %3" msgstr "设置 %1:%2 上的认证为 %3 时出现问题" #. validate function checks if target/tpg are unique and not empty -#: src/include/iscsi-lio-server/widgets.rb:1202 +#: src/include/iscsi-lio-server/widgets.rb:1201 msgid "The target cannot be empty." msgstr "目标不能为空。" -#: src/include/iscsi-lio-server/widgets.rb:1206 +#: src/include/iscsi-lio-server/widgets.rb:1205 msgid "The target portal group cannot be empty." msgstr "目标门户组不能为空。" -#: src/include/iscsi-lio-server/widgets.rb:1217 +#: src/include/iscsi-lio-server/widgets.rb:1216 msgid "The target already exists." msgstr "目标已存在。" -#: src/include/iscsi-lio-server/widgets.rb:1237 +#: src/include/iscsi-lio-server/widgets.rb:1236 msgid "Incoming" msgstr "进站" -#: src/include/iscsi-lio-server/widgets.rb:1240 +#: src/include/iscsi-lio-server/widgets.rb:1239 msgid "Outgoing" msgstr "出站" -#: src/include/iscsi-lio-server/widgets.rb:1242 +#: src/include/iscsi-lio-server/widgets.rb:1241 msgid "None" msgstr "无" -#: src/include/iscsi-lio-server/widgets.rb:1265 -#: src/include/iscsi-lio-server/widgets.rb:1368 -#: src/include/iscsi-lio-server/widgets.rb:1405 +#: src/include/iscsi-lio-server/widgets.rb:1264 +#: src/include/iscsi-lio-server/widgets.rb:1367 +#: src/include/iscsi-lio-server/widgets.rb:1404 msgid "Disabled" msgstr "已禁用" -#: src/include/iscsi-lio-server/widgets.rb:1457 +#: src/include/iscsi-lio-server/widgets.rb:1456 msgid "Problem removing lun %4 for client %3 in %1:%2" msgstr "在 %1:%2 中为客户端 %3 移除逻辑单元编号 %4 时出现问题" -#: src/include/iscsi-lio-server/widgets.rb:1472 +#: src/include/iscsi-lio-server/widgets.rb:1471 msgid "Problem adding lun %4:%5 for client %3 in %1:%2" msgstr "在 %1:%2 中为客户端 %3 添加逻辑单元编号 %4:%5 时出现问题" -#: src/include/iscsi-lio-server/widgets.rb:1493 +#: src/include/iscsi-lio-server/widgets.rb:1492 msgid "Problem removing client %3 from %1:%2" msgstr "从 %1:%2 中移除客户端 %3 时出现问题" -#: src/include/iscsi-lio-server/widgets.rb:1517 +#: src/include/iscsi-lio-server/widgets.rb:1516 msgid "Problem creating client %3 for %1:%2" msgstr "为 %1:%2 创建客户端 %3 时出现问题" -#: src/include/iscsi-lio-server/widgets.rb:1553 +#: src/include/iscsi-lio-server/widgets.rb:1551 msgid "Problem changing auth for client %3 in %1:%2" msgstr "在 %1:%2 中为客户端 %3 修改认证时出现问题" @@ -668,11 +673,11 @@ msgstr "正在初始化..." #. local IPv6 -#: src/modules/IscsiLioData.rb:1409 +#: src/modules/IscsiLioData.rb:1420 msgid "Cannot save lio setup" msgstr "无法保存 LIO 设置" -#: src/modules/IscsiLioData.rb:1413 +#: src/modules/IscsiLioData.rb:1424 msgid "Cannot save tcm setup" msgstr "无法保存 tcm 设置" Modified: trunk/yast/zh_CN/po/isns.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/isns.zh_CN.po 2014-10-29 15:59:29 UTC (rev 90431) +++ trunk/yast/zh_CN/po/isns.zh_CN.po 2014-10-29 16:00:17 UTC (rev 90432) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2014-10-29 16:20+0100\n" "PO-Revision-Date: 2013-02-03 16:26+0800\n" "Last-Translator: 玛格丽特 · 苏 <i@marguerite.su>\n" "Language-Team: Chinese Simplified <opensuse-zh@opensuse.org>\n" @@ -46,105 +46,78 @@ msgstr "服务" #. second tab - iSCSI Nodes -#: src/include/isns/dialogs.rb:57 src/include/isns/dialogs.rb:132 +#: src/include/isns/dialogs.rb:55 src/include/isns/dialogs.rb:102 msgid "iSCSI Nodes" msgstr "iSCSI 节点" #. third tab - Discovery Domains -#: src/include/isns/dialogs.rb:67 src/include/isns/dialogs.rb:150 +#: src/include/isns/dialogs.rb:65 src/include/isns/dialogs.rb:120 msgid "Discovery Domains" msgstr "发现域" -#. fourth tab - discovery domain sets -#: src/include/isns/dialogs.rb:77 src/include/isns/dialogs.rb:211 -msgid "Discovery Domains Sets" -msgstr "发现域集" - -#: src/include/isns/dialogs.rb:99 +#: src/include/isns/dialogs.rb:87 msgid "When &Booting" msgstr "引导时(&B)" -#: src/include/isns/dialogs.rb:100 +#: src/include/isns/dialogs.rb:88 msgid "&Manually" msgstr "手工(&M)" -#: src/include/isns/dialogs.rb:103 +#: src/include/isns/dialogs.rb:91 msgid "When Booting" msgstr "引导时" -#: src/include/isns/dialogs.rb:104 +#: src/include/isns/dialogs.rb:92 msgid "Manually" msgstr "手工" -#: src/include/isns/dialogs.rb:115 -msgid "Address of iSNS Server" -msgstr "iSNS 服务器地址" - -#: src/include/isns/dialogs.rb:135 src/include/isns/dialogs.rb:186 -#: src/include/isns/widgets.rb:164 +#: src/include/isns/dialogs.rb:105 src/include/isns/dialogs.rb:156 +#: src/include/isns/widgets.rb:66 msgid "iSCSI Node Name" msgstr "iSCSI 节点名称" -#: src/include/isns/dialogs.rb:135 src/include/isns/dialogs.rb:186 -#: src/include/isns/widgets.rb:206 +#: src/include/isns/dialogs.rb:105 src/include/isns/dialogs.rb:156 +#: src/include/isns/widgets.rb:108 msgid "Node Type" msgstr "节点类型" -#: src/include/isns/dialogs.rb:138 src/include/isns/dialogs.rb:163 -#: src/include/isns/dialogs.rb:224 +#: src/include/isns/dialogs.rb:108 src/include/isns/dialogs.rb:133 msgid "Delete" msgstr "删除" -#: src/include/isns/dialogs.rb:156 src/include/isns/dialogs.rb:247 -#: src/include/isns/widgets.rb:32 +#: src/include/isns/dialogs.rb:126 src/include/isns/widgets.rb:29 msgid "Discovery Domain Name" msgstr "发现域名称" -#: src/include/isns/dialogs.rb:162 +#: src/include/isns/dialogs.rb:132 msgid "Create Discovery Domain" msgstr "创建发现域" -#: src/include/isns/dialogs.rb:181 +#: src/include/isns/dialogs.rb:151 msgid "Discovery Domain Members" msgstr "发现域成员" -#: src/include/isns/dialogs.rb:192 +#: src/include/isns/dialogs.rb:162 msgid "Add Existing iSCSI Node" msgstr "添加现有的 iSCSI 节点" -#: src/include/isns/dialogs.rb:193 +#: src/include/isns/dialogs.rb:163 msgid "Create iSCSI Node Member" msgstr "创建 iSCSI 节点成员" -#: src/include/isns/dialogs.rb:194 src/include/isns/dialogs.rb:254 +#: src/include/isns/dialogs.rb:164 msgid "Remove" msgstr "移除" -#: src/include/isns/dialogs.rb:217 src/include/isns/widgets.rb:122 -msgid "Discovery Domain Set Name" -msgstr "发现域集名称" - -#: src/include/isns/dialogs.rb:223 -msgid "Create Discovery Domain Set" -msgstr "创建发现域集" - -#: src/include/isns/dialogs.rb:242 -msgid "Discovery Domain Set Members" -msgstr "发现域集成员" - -#: src/include/isns/dialogs.rb:253 src/include/isns/widgets.rb:252 -msgid "Add Discovery Domain" -msgstr "添加发现域" - #. Summary dialog #. @return dialog result #. Main dialog - tabbed -#: src/include/isns/dialogs.rb:275 +#: src/include/isns/dialogs.rb:185 msgid "iSNS Service" msgstr "iSNS 服务" #. curr_target = ""; -#: src/include/isns/dialogs.rb:289 +#: src/include/isns/dialogs.rb:198 msgid "<h1>iSNS Service</h1>" msgstr "<h1>iSNS 服务</h1>" @@ -198,89 +171,70 @@ "配置一个 iSNS 服务器。<br></p>\n" #: src/include/isns/helps.rb:39 -msgid "<b><big>iSNS Server location</big></b><br>The DNS name or the IP address of the iSNS service can be entered as the iSNS address.\n" -msgstr "<b><big>iSNS 服务器位置</big></b><br> iSNS 服务的 DNS 名称或 IP 地址可以作为 iSNS 地址输入。\n" - -#: src/include/isns/helps.rb:42 msgid "<p>The list of all available iSCSI nodes registered with the iSNS service are displayed.</p> <p>Nodes are registered by iSCSI initiators and iSCSI targets.</p> <p> It is only possible to <b>delete</b> them. Deleting a node removes it from the iSNS database.</p>" msgstr "<p>显示了全部与 iSNS 服务注册的可用 iSCSI 节点列表</p> <p>节点由 iSCSI 发起端和 iSCSI 目标端注册。</p> <p>只能<b>删除</b>它们。删除一个节点将从 iSNS 数据库移除它。</p>" #. discovery domains -#: src/include/isns/helps.rb:46 +#: src/include/isns/helps.rb:43 msgid "A list of all discovery domains is displayed. It is possible to <b>Create</b> a discovery domain or <b>Delete</b> one. <p>Deleting a domain removes the members from the domain but does not delete the iSCSI node members.</p>" msgstr "显示了全部发现域列表。可以<b>创建</b>或<b>删除</b>一个发现域。<p>删除一个发现域将从此域移除成员但不会删除 iSCSI 节点成员本身。</p>" -#: src/include/isns/helps.rb:49 +#: src/include/isns/helps.rb:46 msgid "A list of all iSCSI nodes are displayed by discovery domain. Selecting another discovery domain refreshes the list with members from that discovery domain. It is possible to <b>Add</b> an iSCSI node to a discovery domain or <b>Delete</b> the node. <p>Deleting a node removes it from the domain but does not delete the iSCSI node</p> <p>Creating an iSCSI node allows a not yet registered node to be added as a member of the discovery domain. When the initiator or target registers this node then it becomes part of this domain</p> <p>When an iSCSI initiator does a discovery request, the iSNS service returns all iSCSI node targets that are members of the same Discovery Domains.</p> " msgstr "发现域显示了全部 iSCSI 节点列表。选择另一个发现域将刷新那个发现域的成员列表。可以<b>添加</b>一个 iSCSI 节点到一个发现域，或从一个发现域<b>删除</b>一个 iSCSI 节点</p> <p>创建一个 iSCSI 节点允许添加一个尚未注册的节点为发现域的成员。当发起端或目标端注册了此节点时，此节点就变成了此域的一部分</p> <p>当一个 iSCSI 发起端做出域发现请求时，iSNS 服务将返回属于同一发现域的全部 iSCSI 节点目标。</p>" #. dds table dialog -#: src/include/isns/helps.rb:53 +#: src/include/isns/helps.rb:50 msgid "At the top a list of all Discovery Domain Sets are displayed. Discovery Domains belong to Discovery Domain Sets. <p>A Discovery Domain must be a member of a Discovery Domain Set in order to be active. </p><p>In an iSNS database, a Discovery Domain Set contains Discovery Domains and Discovery Domains contain iSCSI Node members.</p>" msgstr "在列表上部显示了全部发现域集。发现域属于发现域集。<p>一个发现域必须是一个发现域集的成员才能处于活动状态。</p><p>在一个 iSNS 数据库中，发现域集包含发现域，发现域包含 iSCSI 节点成员。</p>" -#: src/include/isns/helps.rb:56 +#: src/include/isns/helps.rb:53 msgid "<p>The discovery domain set members list is refreshed whenever a different discovery domain set is selected.</p>" msgstr "<p>当选择了不同的发现域集时，将刷新发现域集成员列表。</p>" #. **************** global funcions and variables ***** -#: src/include/isns/widgets.rb:28 +#: src/include/isns/widgets.rb:25 msgid "Create New Discovery Domain" msgstr "创建新发现域" -#: src/include/isns/widgets.rb:39 -msgid "Select discovery domain set to which discovery domain will be added." -msgstr "选择发现域将被添加到的发现域集" - -#: src/include/isns/widgets.rb:43 -msgid "Discovery Domain Name Set" -msgstr "发现域名称集" - -#: src/include/isns/widgets.rb:200 +#: src/include/isns/widgets.rb:102 msgid "Add iSCSI node to discovery domain" msgstr "添加 iSCSI 节点到发现域" -#: src/include/isns/widgets.rb:203 +#: src/include/isns/widgets.rb:105 msgid "Available Nodes to Add" msgstr "可供添加的节点" -#: src/include/isns/widgets.rb:206 src/include/isns/widgets.rb:249 +#: src/include/isns/widgets.rb:108 msgid "Name" msgstr "名称" -#: src/include/isns/widgets.rb:210 +#: src/include/isns/widgets.rb:112 msgid "Add Node" msgstr "添加节点" -#: src/include/isns/widgets.rb:211 src/include/isns/widgets.rb:253 +#: src/include/isns/widgets.rb:113 msgid "Done" msgstr "完毕" -#: src/include/isns/widgets.rb:245 -msgid "Add Discovery Domain to Set" -msgstr "添加发现域到集" - -#: src/include/isns/widgets.rb:248 -msgid "Available Discovery Domains" -msgstr "可用发现域" - -#: src/include/isns/widgets.rb:297 src/include/isns/widgets.rb:320 +#: src/include/isns/widgets.rb:145 src/include/isns/widgets.rb:168 msgid "Target or Initiator" msgstr "目标端或发起端" -#. IsnsServer::addDD(address, add_map["VALUE"]:""); -#: src/include/isns/widgets.rb:506 src/include/isns/widgets.rb:586 +#: src/include/isns/widgets.rb:241 msgid "Really delete the selected item?" msgstr "真的删除所选项吗？" -#: src/include/isns/widgets.rb:541 +#: src/include/isns/widgets.rb:270 msgid "Really delete this domain?" msgstr "真的删除此域吗？" #. boolean display = true; #. Report::DisplayErrors(display,10); -#: src/include/isns/widgets.rb:711 -msgid "Unable to connect to iSNS server. Check iSNS server address." +#: src/include/isns/widgets.rb:351 +#, fuzzy +#| msgid "Unable to connect to iSNS server. Check iSNS server address." +msgid "Unable to connect to iSNS server. Check if iSNS server is running." msgstr "无法连接到 iSNS 服务器。请检查 iSNS 服务器地址。" #. Initialization dialog caption @@ -294,85 +248,93 @@ msgstr "正在初始化..." #. test if required package ("open-isns") is installed -#: src/modules/IsnsServer.rb:172 +#: src/modules/IsnsServer.rb:149 msgid "<p>To configure the isns service, the <b>%1</b> package must be installed.</p>" msgstr "<p>必须安装 <b>%1</b> 软件包才能配置 iSNS 服务。</p>" -#: src/modules/IsnsServer.rb:175 +#: src/modules/IsnsServer.rb:152 msgid "<p>Install it now?</p>" msgstr "<p>现在安装它吗？</p>" #. IsnsServer read dialog caption -#: src/modules/IsnsServer.rb:569 +#: src/modules/IsnsServer.rb:277 msgid "Initializing isns daemon configuration" msgstr "正在初始化 iSNS 守护精灵配置" -#. Progress stage 1/3 -#: src/modules/IsnsServer.rb:585 -msgid "Read the database" -msgstr "读取数据库" +#. IsnsServer write dialog caption +#: src/modules/IsnsServer.rb:300 +msgid "Saving isns Configuration" +msgstr "正在保存 iSNS 配置" -#. Progress stage 2/3 -#: src/modules/IsnsServer.rb:587 -msgid "Read the previous settings" -msgstr "读取以前的设置" +#~ msgid "Discovery Domains Sets" +#~ msgstr "发现域集" -#. Progress stage 3/3 -#: src/modules/IsnsServer.rb:589 -msgid "Detect the devices" -msgstr "检测设备" +#~ msgid "Address of iSNS Server" +#~ msgstr "iSNS 服务器地址" -#. Progress step 1/3 -#: src/modules/IsnsServer.rb:593 -msgid "Reading the database..." -msgstr "正在读取数据库..." +#~ msgid "Discovery Domain Set Name" +#~ msgstr "发现域集名称" -#. Progress step 2/3 -#: src/modules/IsnsServer.rb:595 -msgid "Reading the previous settings..." -msgstr "正在读取以前的设置..." +#~ msgid "Create Discovery Domain Set" +#~ msgstr "创建发现域集" -#. Progress step 3/3 -#: src/modules/IsnsServer.rb:597 -msgid "Detecting the devices..." -msgstr "正在检测设备..." +#~ msgid "Discovery Domain Set Members" +#~ msgstr "发现域集成员" -#. Progress finished -#. Progress finished -#: src/modules/IsnsServer.rb:599 src/modules/IsnsServer.rb:677 -msgid "Finished" -msgstr "已完成" +#~ msgid "Add Discovery Domain" +#~ msgstr "添加发现域" -#. IsnsServer write dialog caption -#: src/modules/IsnsServer.rb:651 -msgid "Saving isns Configuration" -msgstr "正在保存 iSNS 配置" +#~ msgid "<b><big>iSNS Server location</big></b><br>The DNS name or the IP address of the iSNS service can be entered as the iSNS address.\n" +#~ msgstr "<b><big>iSNS 服务器位置</big></b><br> iSNS 服务的 DNS 名称或 IP 地址可以作为 iSNS 地址输入。\n" -#. Progress stage 1/2 -#: src/modules/IsnsServer.rb:667 -msgid "Write the settings" -msgstr "写入设置" +#~ msgid "Select discovery domain set to which discovery domain will be added." +#~ msgstr "选择发现域将被添加到的发现域集" -#. Progress stage 2/2 -#: src/modules/IsnsServer.rb:669 -msgid "Run SuSEconfig" -msgstr "运行 SuSEconfig" +#~ msgid "Discovery Domain Name Set" +#~ msgstr "发现域名称集" -#. Progress step 1/2 -#: src/modules/IsnsServer.rb:673 -msgid "Writing the settings..." -msgstr "正在写入设置..." +#~ msgid "Add Discovery Domain to Set" +#~ msgstr "添加发现域到集" -#. Progress step 2/2 -#: src/modules/IsnsServer.rb:675 -msgid "Running SuSEconfig..." -msgstr "正在运行 SuSEconfig..." +#~ msgid "Available Discovery Domains" +#~ msgstr "可用发现域" -#. write configuration (/etc/isns.conf) -#: src/modules/IsnsServer.rb:689 -msgid "Cannot write settings." -msgstr "无法写入设置。" +#~ msgid "Read the database" +#~ msgstr "读取数据库" +#~ msgid "Read the previous settings" +#~ msgstr "读取以前的设置" + +#~ msgid "Detect the devices" +#~ msgstr "检测设备" + +#~ msgid "Reading the database..." +#~ msgstr "正在读取数据库..." + +#~ msgid "Reading the previous settings..." +#~ msgstr "正在读取以前的设置..." + +#~ msgid "Detecting the devices..." +#~ msgstr "正在检测设备..." + +#~ msgid "Finished" +#~ msgstr "已完成" + +#~ msgid "Write the settings" +#~ msgstr "写入设置" + +#~ msgid "Run SuSEconfig" +#~ msgstr "运行 SuSEconfig" + +#~ msgid "Writing the settings..." +#~ msgstr "正在写入设置..." + +#~ msgid "Running SuSEconfig..." +#~ msgstr "正在运行 SuSEconfig..." + +#~ msgid "Cannot write settings." +#~ msgstr "无法写入设置。" + #, fuzzy #~ msgid "" #~ "<p><b><big>Saving iSNS Configuration</big></b><br>\n" Modified: trunk/yast/zh_CN/po/ldap.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/ldap.zh_CN.po 2014-10-29 15:59:29 UTC (rev 90431) +++ trunk/yast/zh_CN/po/ldap.zh_CN.po 2014-10-29 16:00:17 UTC (rev 90432) @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: opensuse-i 18n\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2014-10-29 16:20+0100\n" "PO-Revision-Date: 2014-04-17 10:22+0800\n" "Last-Translator: 玛格丽特 · 苏 <marguerite@opensuse.org>\n" "Language-Team: Chinese Simplified <opensuse-zh@opensuse.org>\n" @@ -179,8 +179,17 @@ "LDAP 目录中不存在判别名 '%1' 的直接父元素。\n" "无法创建所选判别名的对象。\n" +#. error message +#: src/Ldap.rb:1431 +msgid "" +"An object with the selected DN exists, but it is not a template object.\n" +"Select another one.\n" +msgstr "" +"已存在一个所选判别名的对象，但它不是一个模板对象。\n" +"请选择另一个对象。\n" + #. yes/no popup, %1 is value of DN -#: src/Ldap.rb:1634 +#: src/Ldap.rb:1717 msgid "" "No entry with DN '%1'\n" "exists on the LDAP server. Create it now?\n" @@ -416,10 +425,3 @@ #: src/ldap_browser.rb:693 msgid "Value" msgstr "值" - -#~ msgid "" -#~ "An object with the selected DN exists, but it is not a template object.\n" -#~ "Select another one.\n" -#~ msgstr "" -#~ "已存在一个所选判别名的对象，但它不是一个模板对象。\n" -#~ "请选择另一个对象。\n" Modified: trunk/yast/zh_CN/po/mail.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/mail.zh_CN.po 2014-10-29 15:59:29 UTC (rev 90431) +++ trunk/yast/zh_CN/po/mail.zh_CN.po 2014-10-29 16:00:17 UTC (rev 90432) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2014-10-29 16:21+0100\n" "PO-Revision-Date: 2014-04-16 15:18+0800\n" "Last-Translator: 玛格丽特 · 苏 <marguerite@opensuse.org>\n" "Language-Team: Chinese Simplified <opensuse-zh@opensuse.org>\n" @@ -352,6 +352,18 @@ msgid "Start &fetchmail" msgstr "启动 &fetchmail" +#: src/include/mail/ui.rb:523 +#, fuzzy +#| msgid "[manually set]" +msgid "manual" +msgstr "[手工设置]" + +#: src/include/mail/ui.rb:523 +#, fuzzy +#| msgid "FTP daemon" +msgid "daemon" +msgstr "FTP 守护程序" + #. frame label: mail downloading (fetchmail) #: src/include/mail/ui.rb:529 msgid "&Downloading" Modified: trunk/yast/zh_CN/po/network.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/network.zh_CN.po 2014-10-29 15:59:29 UTC (rev 90431) +++ trunk/yast/zh_CN/po/network.zh_CN.po 2014-10-29 16:00:17 UTC (rev 90432) @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: network\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-10 11:10+0200\n" +"POT-Creation-Date: 2014-10-29 16:21+0100\n" "PO-Revision-Date: 2014-10-16 11:02+0800\n" "Last-Translator: 玛格丽特 · 苏 <marguerite@opensuse.org>\n" "Language-Team: Chinese Simplified <kde-i18n-doc@kde.org>\n" @@ -2115,7 +2115,7 @@ "按<b>中止</b>可中止保存。</p>\n" #. Network setup method help -#. NetworkManager and wicked are programs +#. NetworkManager and ifup are programs #: src/include/network/lan/help.rb:51 msgid "" "<p><b><big>Network Setup Method</big></b></p>\n" @@ -2127,7 +2127,9 @@ "<p>使用 <b>NetworkManager</b> 桌面挂件管理全部接口的连接。\n" "它很适合于要在有线和无线网络间切换的场景。</p>\n" -#: src/include/network/lan/help.rb:57 +#. Network setup method help +#. NetworkManager and wicked are programs +#: src/include/network/lan/help.rb:59 msgid "" "<p>Use <b>wicked</b> if you do not run a desktop environment\n" "or need to use multiple interfaces at the same time.</p>\n" @@ -2135,20 +2137,8 @@ "<p>若您未运行桌面环境或需要同时使用多个接口，\n" "请使用<b>怪兽方法</b>。</p>\n" -#. For systems not including NetworkManager by default (bnc#892678) -#: src/include/network/lan/help.rb:62 +#: src/include/network/lan/help.rb:63 msgid "" -"<p><b>NetworkManager</b> is not part of every base\n" -"installation repository. For example, to enable it on SUSE\n" -"Linux Enterprise Server add the Workstation Extension\n" -"repository and install the 'NetworkManager' package.</p>\n" -msgstr "" -"<p>不是每个基础安装源都有 <b>NetworkManager</b> 的。\n" -"例如，要在 SUSE Linux Enterprise Server 上启用 NetworkManager，\n" -"请添加 Workstation Extension 源并安装 'NetworkManager' 软件包。</p>\n" - -#: src/include/network/lan/help.rb:68 -msgid "" "<p><b><big>Network Card Overview</big></b><br>\n" "Obtain an overview of installed network cards. Additionally,\n" "edit their configuration.<br></p>\n" @@ -2157,7 +2147,7 @@ "获得已安装网卡的概览。\n" "此外，还可编辑其配置。<br></p>\n" -#: src/include/network/lan/help.rb:73 +#: src/include/network/lan/help.rb:68 msgid "" "<p><b><big>Adding a Network Card:</big></b><br>\n" "Press <b>Add</b> to configure a new network card manually.</p>\n" @@ -2165,7 +2155,7 @@ "<p><b><big>添加网卡：</big></b><br>\n" "按<b>添加</b>手动配置新网卡。</p>\n" -#: src/include/network/lan/help.rb:76 +#: src/include/network/lan/help.rb:71 msgid "" "<p><b><big>Configuring or Deleting:</big></b><br>\n" "Choose a network card to change or remove.\n" @@ -2176,7 +2166,7 @@ "然后分别按<b>编辑</b>或<b>删除</b>。</p>\n" #. IPv6 help -#: src/include/network/lan/help.rb:83 +#: src/include/network/lan/help.rb:78 msgid "" "<p><b><big>IPv6 Protocol Settings</big></b></p>\n" "<p>Check <b>Enable IPv6</b> to enable the ipv6 module in the kernel.\n" @@ -2191,12 +2181,12 @@ "要禁用 IPv6，请反选此选项。这将屏蔽 ipv6 内核模块。\n" "若您的网络未使用 ipv6 协议，这样做响应时间会更短。</p>\n" -#: src/include/network/lan/help.rb:91 +#: src/include/network/lan/help.rb:86 msgid "<p>All changes will be applied after reboot.</p>" msgstr "<p>全部修改都将在重启后应用。</p>" #. Routing dialog help 1/2 -#: src/include/network/lan/help.rb:94 +#: src/include/network/lan/help.rb:89 msgid "" "<p>The routing can be set up in this dialog.\n" "The <b>Default Gateway</b> matches every possible destination, but poorly. \n" @@ -2209,7 +2199,7 @@ "若存在任何其它匹配要求地址的项，则将使用该项而不使用默认路由。\n" "设计默认路由的目的只是为了提供一个 \"万一没有目的地时的目的地\"。</p>\n" -#: src/include/network/lan/help.rb:101 +#: src/include/network/lan/help.rb:96 msgid "" "<p>For each route, enter destination network IP address, gateway address,\n" "and netmask. To omit any of these values, use a dash sign \"-\". Select\n" @@ -2221,13 +2211,13 @@ "\"-\" 表示任何接口。</p>\n" #. Routing dialog help 2/2 -#: src/include/network/lan/help.rb:107 +#: src/include/network/lan/help.rb:102 msgid "" "<p>Enable <b>IPv4 Forwarding</b> (forwarding packets from external networks\n" "to the internal one) if this system is a router.\n" msgstr "<p>若此系统是一个路由器则请启用<b>IPv4 转发</b> (转发外部网络的数据包到内部网络)。\n" -#: src/include/network/lan/help.rb:111 +#: src/include/network/lan/help.rb:106 msgid "" "<p>Enable <b>IPv6 Forwarding</b> (forwarding packets from external networks\n" "to the internal one) if this system is a router.\n" @@ -2237,7 +2227,7 @@ "<p>若此系统是一个路由器则请启用<b>IPv6 转发</b>(转发外部网络的数据包到内部网络)。\n" "<b>警告：</b>IPv6 转发将禁用自动配置 IPv6 无状态地址(SLAAC)。" -#: src/include/network/lan/help.rb:117 +#: src/include/network/lan/help.rb:112 msgid "" "<p><b>Important:</b> if the firewall is enabled, allowing forwarding alone is not enough. \n" "You should enable masquerading and/or set at least one redirect rule in the\n" @@ -2247,7 +2237,7 @@ "您应该启用伪装和/或在防火墙配置中设置至少一条重定向规则。\n" "请使用 YaST 防火墙模块。</p>\n" -#: src/include/network/lan/help.rb:122 +#: src/include/network/lan/help.rb:117 msgid "" "<p>If you are using DHCP to get an IP address, check whether you get\n" "also a hostname via DHCP. The hostname will be set automatically by the DHCP client.\n" @@ -2261,7 +2251,7 @@ "因此，若您要连接到指派了不同主机名的不同网络，请禁用此选项。\n" "</p>" -#: src/include/network/lan/help.rb:129 +#: src/include/network/lan/help.rb:124 msgid "" "<p><b>Assign Hostname to Loopback IP</b> associates your hostname with \n" "the IP address <tt>127.0.0.2</tt> (loopback) in <tt>/etc/hosts</tt>. This is a \n" @@ -2273,7 +2263,7 @@ "若您想要在任何情况下都能解析主机名，即使在没有活动网络的情况下也能，那么这是一个有用的选项。\n" "在其它任何情况下，请谨慎使用之，尤其是当此计算机提供了一些网络服务时。</p>\n" -#: src/include/network/lan/help.rb:136 +#: src/include/network/lan/help.rb:131 msgid "" "<p>Enter the name servers and domain search list for resolving \n" "hostnames. Usually they can be obtained by DHCP.</p>\n" @@ -2282,7 +2272,7 @@ "通常它们可由 DHCP 获得。</p>\n" #. resolver dialog help -#: src/include/network/lan/help.rb:140 +#: src/include/network/lan/help.rb:135 msgid "" "<p>A name server is a computer that translates hostnames into\n" "IP addresses. This value must be entered as an <b>IP address</b>\n" @@ -2293,7 +2283,7 @@ "(例如 192.168.0.42)，而不是主机名。</p>\n" #. resolver dialog help -#: src/include/network/lan/help.rb:146 +#: src/include/network/lan/help.rb:141 msgid "" "<p>Search domain is the domain name where hostname searching starts.\n" "The primary search domain is usually the same as the domain name of\n" @@ -2304,7 +2294,7 @@ "主搜索域通常与您计算机的域名称 (例如 suse.de) 相同。\n" "还可能有额外的搜索域 (诸如 suse.com)。请用逗号或空格分隔这些域。</p>\n" -#: src/include/network/lan/help.rb:152 +#: src/include/network/lan/help.rb:147 msgid "" "<p>Enter the short name for this computer (e.g. <i>mymachine</i>) and the DNS domain\n" "(e.g. <i>example.com</i>) that it belongs to. The domain is especially important if this \n" @@ -2314,7 +2304,7 @@ "<p>请输入此计算机的短名称 (例如 <i>甜软萌的壳酱</i>) 和它所属的 DNS 域 (例如 <i>marguerite.su</i>)。\n" "若此计算机是一个邮件服务器，那么域尤其关键。您可以使用 <i>hostname</i> 命令查看您计算机的主机名。</p>" -#: src/include/network/lan/help.rb:158 +#: src/include/network/lan/help.rb:153 msgid "" "<p>Select the way how the DNS configuration will be modified (name servers,\n" "search list, the content of <i>/etc/resolv.conf</i>). Normally, it is handled\n" @@ -2327,7 +2317,7 @@ "通常由 <i>netconfig</i> 脚本处理，该脚本会合并静态定义的数据和动态获得的数据 (例如，从 DHCP 客户端、NetworkManager 等)。\n" "这是默认设置。<b>使用默认策略</b>可以满足大多数配置的需要。</p>\n" -#: src/include/network/lan/help.rb:166 +#: src/include/network/lan/help.rb:161 msgid "" "<p>By choosing <b>Only Manually</b>, <i>netconfig</i> will no longer be\n" "allowed to modify <i>/etc/resolv.conf</i>. You can however edit the file\n" @@ -2345,7 +2335,7 @@ #. Address dialog help 1-6/8: dynamic address preferred #. Address dialog help 1/8 -#: src/include/network/lan/help.rb:179 +#: src/include/network/lan/help.rb:174 msgid "" "<p><b><big>Address Setup</big></b></p>\n" "<p>Select <b>No Address Setup</b> if you do not want to assign an IP address to this device.\n" @@ -2355,19 +2345,19 @@ "<p>若您不想为此设备指派一个 IP 地址，则请选择<b>无地址设置</b>。\n" "这在绑定以太网设备时特别有用。</p>\n" -#: src/include/network/lan/help.rb:184 +#: src/include/network/lan/help.rb:179 msgid "<p>Check <b>iBFT</b> if you want to keep the network configured in your BIOS.</p>\n" msgstr "<p>若您想要保留在 BIOS 中配置的网络，请勾选 <b>iBFT</b>。</p>\n" #. Address dialog help 2/8 -#: src/include/network/lan/help.rb:188 +#: src/include/network/lan/help.rb:183 msgid "" "<p>Select <b>Dynamic Address</b> if you do not have a static IP address \n" "assigned by the system administrator or your Internet provider.</p>\n" msgstr "<p>若您没有系统管理员或互联网服务提供商指派的静态 IP 地址，请选择<b>动态地址</b>。</p>\n" #. Address dialog help 3/8 -#: src/include/network/lan/help.rb:192 +#: src/include/network/lan/help.rb:187 msgid "" "<p>Choose one of the dynamic address assignment methods. Select <b>DHCP</b>\n" "if you have a DHCP server running on your local network. Network addresses \n" @@ -2378,7 +2368,7 @@ "之后将自动从服务器获得网络地址。</p>\n" #. Address dialog help 4/8 -#: src/include/network/lan/help.rb:198 +#: src/include/network/lan/help.rb:193 msgid "" "<p>To search for an IP address and assign it statically, select \n" "<b>Zeroconf</b>. To use DHCP and fall back to zeroconf, select <b>DHCP + Zeroconf\n" @@ -2389,7 +2379,7 @@ "否则，必须<b>静态</b>指派网络地址。</p>\n" #. Address dialog help 5/8 -#: src/include/network/lan/help.rb:204 +#: src/include/network/lan/help.rb:199 msgid "" "<p>Enter the <b>IP Address</b> (for example: <tt>192.168.100.99</tt>) for your computer, and the \n" " <b>Remote IP Address</b> (for example: <tt>192.168.100.254</tt>)\n" @@ -2399,7 +2389,7 @@ "和对等点的<b>远程 IP 地址</b> (例如，<tt>192.168.100.254</tt>)。</p>\n" #. Address dialog help 6/8 -#: src/include/network/lan/help.rb:210 +#: src/include/network/lan/help.rb:205 msgid "" "<p>For <b>Static Address Setup</b> enter the static IP address for your computer (for example: <tt>192.168.100.99</tt>) and\n" "the network mask (usually <tt>255.255.255.0</tt> or just length of prefix <tt>/24</tt>).Optionally, you can enter\n" @@ -2410,13 +2400,13 @@ "输入一个完全限定主机名。主机名将被写入<tt>/etc/hosts</tt>。</p>\n" #. Address dialog help 8/8 -#: src/include/network/lan/help.rb:216 +#: src/include/network/lan/help.rb:211 msgid "" "<p>Contact your <b>network administrator</b> for more information about\n" "the network configuration.</p>" msgstr "<p>有关网络配置的更多信息，请垂询您的<b>网络管理员</b>。</p>" -#: src/include/network/lan/help.rb:219 +#: src/include/network/lan/help.rb:214 msgid "" "<p>DHCP configuration is not recommended for this product.\n" "Components of this product might not work with DHCP.</p>" @@ -2424,7 +2414,7 @@ "<p>此产品不推荐 DHCP 配置。\n" "此产品的组件可能无法与 DHCP 协作。</p>" -#: src/include/network/lan/help.rb:222 +#: src/include/network/lan/help.rb:217 msgid "" "<p><b><big>Firewall Zone</big></b></p>\n" "<p>Select the firewall zone to put the interface into. If you\n" @@ -2442,11 +2432,11 @@ "若您未选择区域且不存在其它位于此防火墙中的接口，\n" "则将禁用防火墙。</p>" -#: src/include/network/lan/help.rb:231 +#: src/include/network/lan/help.rb:226 msgid "<p><b>Mandatory Interface</b> specifies whether the network service reports failure if the interface fails to start at boot time.</p>" msgstr "<p><b>必备接口</b>指定了若引导时接口未能启动，网络服务是否报告失败。</p>" -#: src/include/network/lan/help.rb:234 +#: src/include/network/lan/help.rb:229 msgid "" "<p><b><big>Maximum Transfer Unit</big></b></p>\n" "<p>Maximum transfer unit (<b>MTU</b>) is the maximum size of the packet,\n" @@ -2460,7 +2450,7 @@ "通常，您不需要设置 MTU，但使用较小的 MTU 或许会改善网络性能，尤其是在慢速拨号连接下。\n" "您可从推荐值中择一，或定义另一个值。</p>\n" -#: src/include/network/lan/help.rb:242 +#: src/include/network/lan/help.rb:237 msgid "" "<p>Select the slave devices for the bond device.\n" "Only devices with the device activation set to <b>Never</b> and with <b>No Address Setup</b> are available.</p>" @@ -2469,12 +2459,12 @@ "只有设备激活设为<b>从不</b>和设置了<b>无地址设置</b>的设备才可用。</p>" #. DHCP dialog help 1/7 -#: src/include/network/lan/help.rb:247 +#: src/include/network/lan/help.rb:242 msgid "<p><b><big>DHCP Client Options</big></b></p>" msgstr "<p><b><big>DHCP 客户端选项</big></b></p>" #. DHCP dialog help 2/7 -#: src/include/network/lan/help.rb:249 +#: src/include/network/lan/help.rb:244 msgid "" "<p>The <b>DHCP Client Identifier</b>, if left empty, defaults to\n" "the hardware address of the network interface. It must be different for each\n" @@ -2488,7 +2478,7 @@ "请在此指定一个唯一的格式自由的标识符。</p>" #. DHCP dialog help 3/7 -#: src/include/network/lan/help.rb:257 +#: src/include/network/lan/help.rb:252 msgid "" "<p>The <b>Hostname to Send</b> specifies a string used for the\n" "hostname option field when the DHCP client sends messages to the DHCP server. Some \n" @@ -2506,7 +2496,7 @@ "若您不想要发送主机名，请将该字段留空。</p>\n" #. Aliases dialog help 1/4 -#: src/include/network/lan/help.rb:269 +#: src/include/network/lan/help.rb:264 msgid "" "<p><b><big>Additional Addresses</big></b></p>\n" "<p>Configure additional addresses of an interface in this table.</p>\n" @@ -2515,14 +2505,14 @@ "<p>在此表中配置接口的附加地址。</p>\n" #. Aliases dialog help 2/4 -#: src/include/network/lan/help.rb:273 +#: src/include/network/lan/help.rb:268 msgid "" "<p>Enter an <b>IPv4 Address Label</b>, an <b>IP Address</b>, and\n" "the <b>Netmask</b>.</p>" msgstr "<p>请输入一个 <b>IPv4 地址标签</b>、一个 <b>IP 地址</b>和<b>网络掩码</b>。</p>" #. Aliases dialog help 3/4 -#: src/include/network/lan/help.rb:277 +#: src/include/network/lan/help.rb:272 msgid "" "<p><b>IPv4 Address Label</b>, formerly known as Alias Name, is optional and legacy. The total\n" " length of interface name (inclusive of the colon and label) is\n" @@ -2532,14 +2522,14 @@ "接口名全长 (包括冒号和标签) 的限制为 15 个字符，并且过时的 ifconfig 工具会把它截断为 9 个字符。</p>" #. Aliases dialog help 3/4, #83766 -#: src/include/network/lan/help.rb:283 +#: src/include/network/lan/help.rb:278 msgid "<p>Do not include the interface name in the alias name. For example, enter <b>foo</b> instead of <b>eth0:foo</b>.</p>" msgstr "<p>不要在别名中包含接口名称。例如，请输入 <b>foo</b> 而不是 <b>eth0:foo</b>。</p>" #. shared between WirelessDialog and WirelessKeyPopup #. this is suited to the button-switched key typing #. Translators: dialog help -#: src/include/network/lan/help.rb:289 +#: src/include/network/lan/help.rb:284 msgid "" "<p>Choose between three <b>Key Input Types</b> for your key.\n" "<br><b>Passphrase</b>: The key is generated from the phrase entered.\n" @@ -2566,14 +2556,14 @@ "</p>\n" #. Wireless dialog help -#: src/include/network/lan/help.rb:304 +#: src/include/network/lan/help.rb:299 msgid "" "<p>Here, set the most important settings\n" "for wireless networking.</p>" msgstr "<p>在此设置无线联网最重要的设置。</p>" #. Wireless dialog help -#: src/include/network/lan/help.rb:308 +#: src/include/network/lan/help.rb:303 msgid "" "<p>The <b>Operating Mode</b> depends on the network topology. The mode\n" "can be <b>Ad-Hoc</b> (peer-to-peer network without an access point),\n" @@ -2587,7 +2577,7 @@ "或<b>主控</b> (网卡作为访问点使用)。</p>\n" #. Wireless dialog help -#: src/include/network/lan/help.rb:316 +#: src/include/network/lan/help.rb:311 msgid "" "<p>Set the <b>Network Name (ESSID)</b> used to identify\n" "cells that are part of the same virtual network. All stations in a\n" @@ -2604,7 +2594,7 @@ "在此情况下，您的 WLAN 卡将关联到信号强度最好的访问点。</p>\n" #. Wireless dialog help -#: src/include/network/lan/help.rb:326 +#: src/include/network/lan/help.rb:321 msgid "" "<p>In some networks, you need to set an <b>Authentication Mode</b>.\n" "It depends on the protection technology used, WEP or WPA. <b>WEP</b>\n" @@ -2638,7 +2628,7 @@ "只有在运行模式为 <b>受管</b> 时才能这样做。</p>\n" #. Wireless dialog help -#: src/include/network/lan/help.rb:345 +#: src/include/network/lan/help.rb:340 msgid "" "<p>To use WEP, enter the\n" "WEP encryption key to use. It can have a key\n" @@ -2650,7 +2640,7 @@ "在这些密钥中，有 24 位是动态生成的，所以您只需输入 40 到 232 位。</p>\n" #. Wireless dialog help -#: src/include/network/lan/help.rb:353 +#: src/include/network/lan/help.rb:348 msgid "" "<p>To use WPA-PSK (sometimes referred to as WPA Home),\n" "enter the preshared key. This\n" @@ -2666,7 +2656,7 @@ "请不要使用易猜出的词作为密码短语。</p>\n" #. Wireless dialog help -#: src/include/network/lan/help.rb:362 +#: src/include/network/lan/help.rb:357 msgid "" "<p>To use WPA-EAP (sometimes referred to as WPA Enterprise),\n" "enter some additional parameters in the next dialog.</p>\n" @@ -2675,7 +2665,7 @@ "请在下一个对话框中输入一些额外参数。</p>\n" #. Wireless dialog help -#: src/include/network/lan/help.rb:366 +#: src/include/network/lan/help.rb:361 msgid "" "<p>These values will be written to the interface configuration file\n" "'ifcfg-*' in '/etc/sysconfig/network'. If you need additional settings,\n" @@ -4562,6 +4552,16 @@ msgstr "(无保护的)" #~ msgid "" +#~ "<p><b>NetworkManager</b> is not part of every base\n" +#~ "installation repository. For example, to enable it on SUSE\n" +#~ "Linux Enterprise Server add the Workstation Extension\n" +#~ "repository and install the 'NetworkManager' package.</p>\n" +#~ msgstr "" +#~ "<p>不是每个基础安装源都有 <b>NetworkManager</b> 的。\n" +#~ "例如，要在 SUSE Linux Enterprise Server 上启用 NetworkManager，\n" +#~ "请添加 Workstation Extension 源并安装 'NetworkManager' 软件包。</p>\n" + +#~ msgid "" #~ "Network is currently controlled by NetworkManager and its settings \n" #~ "cannot be edited by YaST.\n" #~ "\n" Modified: trunk/yast/zh_CN/po/packager.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/packager.zh_CN.po 2014-10-29 15:59:29 UTC (rev 90431) +++ trunk/yast/zh_CN/po/packager.zh_CN.po 2014-10-29 16:00:17 UTC (rev 90432) @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: packager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-15 15:57+0200\n" +"POT-Creation-Date: 2014-10-29 16:21+0100\n" "PO-Revision-Date: 2014-08-23 02:12+0800\n" "Last-Translator: 玛格丽特 · 苏 <marguerite@opensuse.org>\n" "Language-Team: Chinese Simplified <kde-i18n-doc@kde.org>\n" @@ -162,8 +162,8 @@ #. an error popup #. an error popup #. an error popup -#: src/clients/inst_kickoff.rb:490 src/clients/inst_kickoff.rb:573 -#: src/clients/inst_kickoff.rb:649 src/clients/inst_kickoff.rb:706 +#: src/clients/inst_kickoff.rb:461 src/clients/inst_kickoff.rb:544 +#: src/clients/inst_kickoff.rb:620 src/clients/inst_kickoff.rb:677 msgid "Backup of %1 failed. See %2 for details." msgstr "备份 %1 失败。细节请参考 %2。" @@ -814,7 +814,7 @@ #. popup message part 2 followed by other info #. popup message, after message header, header of details -#: src/clients/repositories.rb:1011 src/modules/Packages.rb:1326 +#: src/clients/repositories.rb:1011 src/modules/Packages.rb:1323 #: src/modules/SourceManager.rb:162 src/modules/SourceManager.rb:310 msgid "Details:" msgstr "细节：" @@ -822,7 +822,7 @@ #. popup message part 3 #. end of popup message, question #. end of popup message, question -#: src/clients/repositories.rb:1013 src/modules/Packages.rb:1334 +#: src/clients/repositories.rb:1013 src/modules/Packages.rb:1331 #: src/modules/SourceManager.rb:164 src/modules/SourceManager.rb:312 msgid "Try again?" msgstr "重试吗？" @@ -1416,7 +1416,7 @@ #. popup message part 1 #. Import GPG keys found in the inst-sys #: src/include/packager/repositories_include.rb:319 -#: src/modules/Packages.rb:1321 src/modules/SourceManager.rb:306 +#: src/modules/Packages.rb:1318 src/modules/SourceManager.rb:306 msgid "" "Unable to create repository\n" "from URL '%1'." @@ -1451,7 +1451,7 @@ #. popup error #. popup error #: src/modules/AddOnProduct.rb:517 src/modules/AddOnProduct.rb:619 -#: src/modules/ProductLicense.rb:538 src/modules/ProductLicense.rb:729 +#: src/modules/ProductLicense.rb:534 src/modules/ProductLicense.rb:725 msgid "An error occurred while preparing the installation system." msgstr "准备安装系统时出错。" @@ -1516,7 +1516,7 @@ #. adding the product to the list of products (BNC #269625) #. no such products #: src/modules/AddOnProduct.rb:1754 src/modules/AddOnProduct.rb:1760 -#: src/modules/Packages.rb:463 +#: src/modules/Packages.rb:469 msgid "Unknown Product" msgstr "未知产品" @@ -1650,23 +1650,23 @@ msgstr "正在应用增量 RPM：%1" #. warning text -#: src/modules/Packages.rb:303 +#: src/modules/Packages.rb:309 msgid "Your computer is a 64-bit x86-64 system, but you are trying to install a 32-bit distribution." msgstr "您的计算机是 64 位 x86-64 系统，但是您正试图安装 32 位发行版。" #. help text for software proposal -#: src/modules/Packages.rb:319 +#: src/modules/Packages.rb:325 msgid "<P>The pattern list states which functionality will be available after installing the system.</P>" msgstr "<P>该软件集列表说明了安装系统后可用的功能。</P>" #. (see bnc#178357 why these numbers) #. translators: help text for software proposal -#: src/modules/Packages.rb:331 +#: src/modules/Packages.rb:337 msgid "<P>The proposal reports the total size of files which will be installed to the system. However, the system will contain some other files (temporary and working files) so the used space will be slightly larger than the proposed value. Therefore it is a good idea to have at least 25% (or about 300MB) free space before starting the installation.</P>" msgstr "<P>该提案汇报了将安装到系统的文件总大小。然而，系统将包含一些其它文件 (缓存和工作文件) 所以所用空间将会比提案中的值稍微大一些。因此最好在启动安装前有至少 25% (或大约 300 MB) 的空闲空间。<P>" #. help text for software proposal -#: src/modules/Packages.rb:336 +#: src/modules/Packages.rb:342 msgid "" "<P>The total 'size to download' is the size of the packages which will be\n" "downloaded from remote (network) repositories. This value is important if the connection is slow or if there is a data limit for downloading.</P>\n" @@ -1675,107 +1675,107 @@ "若网速慢或有数据流量限制，该数值至关重要。</P>\n" #. help text for software proposal - header -#: src/modules/Packages.rb:345 +#: src/modules/Packages.rb:351 msgid "<P><B>Software Proposal</B></P>" msgstr "<P><B>软件提案</B></P>" #. installation proposal - SW summary, %1 is name of the installed product #. (e.g. openSUSE 10.3, SUSE Linux Enterprise ...) -#: src/modules/Packages.rb:362 +#: src/modules/Packages.rb:368 msgid "Product: %1" msgstr "产品：%1" #. installation proposal - SW summary, %1 is name of the selected desktop or system type (e.g. KDE) -#: src/modules/Packages.rb:376 +#: src/modules/Packages.rb:382 msgid "System Type: %1" msgstr "系统类型：%1" -#: src/modules/Packages.rb:387 +#: src/modules/Packages.rb:393 msgid "Patterns:<br>" msgstr "软件集：<br>" #. installation proposal - SW summary, %1 is size of the selected packages (in MB or GB) -#: src/modules/Packages.rb:397 +#: src/modules/Packages.rb:403 msgid "Size of Packages to Install: %1" msgstr "待安装软件包大小：%1" #. installation proposal - SW summary, %1 is download size of the selected packages #. which will be installed from an ftp or http repository (in MB or GB) -#: src/modules/Packages.rb:410 +#: src/modules/Packages.rb:416 msgid "Downloading from Remote Repositories: %1" msgstr "正在从远程软件源中下载：%1" -#: src/modules/Packages.rb:472 +#: src/modules/Packages.rb:478 msgid "These add-on products have been marked for auto-removal: %1" msgstr "这些附加产品已被标记为待自动移除：%1" #. Warning message when some add-ons are marked to be removed automatically -#: src/modules/Packages.rb:496 +#: src/modules/Packages.rb:502 msgid "Contact the vendors of these add-ons to provide you with new installation media." msgstr "请联系这些附加产品的厂商为您提供新的安装介质。" #. Warning message when some add-ons are marked to be removed automatically -#: src/modules/Packages.rb:500 +#: src/modules/Packages.rb:506 msgid "Contact the vendor of the add-on to provide you with a new installation media." msgstr "请联系这些附加产品的厂商为您提供新的安装介质。" #. error message: %1: e.g. "/usr", %2: "/dev/sda2" -#: src/modules/Packages.rb:541 +#: src/modules/Packages.rb:547 msgid "Error: Cannot check free space in basic directory %1 (device %2), cannot start installation." msgstr "错误：无法检查基础文件夹 %1 (设备 %2) 中的空闲空间，无法启动安装。" #. error message: %1: e.g. "/local", %2: "/dev/sda2" -#: src/modules/Packages.rb:561 +#: src/modules/Packages.rb:567 msgid "Warning: Cannot check free space in directory %1 (device %2)." msgstr "警告：无法检查文件夹 %1 (设备 %2) 中的空闲空间。" #. summary warning -#: src/modules/Packages.rb:604 +#: src/modules/Packages.rb:610 msgid "Not enough disk space." msgstr "磁盘空间不足。" #. summary warning -#: src/modules/Packages.rb:606 +#: src/modules/Packages.rb:612 msgid "Not enough disk space. Remove some packages in the single selection." msgstr "磁盘空间不足。请从孤立软件包选集中移除一些软件包。" #. add a backslash if it's missing -#: src/modules/Packages.rb:627 +#: src/modules/Packages.rb:633 msgid "Only %1 (%2%%) free space available on partition %3.<BR>" msgstr "分区 %3 上只有 %1 (%2%%) 的空闲空间。<BR>" #. newly installed products -#: src/modules/Packages.rb:696 +#: src/modules/Packages.rb:702 msgid "New product <b>%s</b> will be installed" msgstr "即将安装新产品 <b>%s</b>" #. product update: %s is a product name -#: src/modules/Packages.rb:706 +#: src/modules/Packages.rb:712 msgid "Product <b>%s</b> will be updated" msgstr "即将更新产品 <b>%s</b>" #. product update: %{old_product} is an old product, %{new_product} is the new one -#: src/modules/Packages.rb:708 +#: src/modules/Packages.rb:714 msgid "Product <b>%{old_product}</b> will be updated to <b>%{new_product}</b>" msgstr "产品 <b>%{old_product}</b> 将更新至 <b>%{new_product}</b>" -#: src/modules/Packages.rb:715 +#: src/modules/Packages.rb:721 msgid "Product <b>%s</b> will stay installed" msgstr "产品 <b>%s</b> 仍将保持安装状态" #. Removing another product might be an issue #. (just warn if removed by user or by YaST) -#: src/modules/Packages.rb:725 +#: src/modules/Packages.rb:731 msgid "<b>Warning:</b> Product <b>%s</b> will be removed." msgstr "<b>警告：</b>即将移除产品 <b>%s</b>。" -#: src/modules/Packages.rb:726 +#: src/modules/Packages.rb:732 msgid "<b>Error:</b> Product <b>%s</b> will be automatically removed.</font>" msgstr "<b>错误：</b>即将自动移除产品 <b>%s</b>。</font>" #. TRANSLATORS: update proposal warning, do NOT translate "-release", #. it is part of a package name (like "sles-release") -#: src/modules/Packages.rb:752 +#: src/modules/Packages.rb:758 msgid "" "<ul><li><b>Some products are marked for automatic removal.</b></li>\n" "<ul><li>Contact the vendor of the removed add-on to provide you with a new\n" @@ -1791,12 +1791,12 @@ "</ul></li></ul>" #. error in proposal, %1 is URL -#: src/modules/Packages.rb:1342 +#: src/modules/Packages.rb:1339 msgid "No repository found at '%1'." msgstr "在 '%1' 下找不到软件源。" #. TRANSLATORS: beginning of the rich text with the release notes -#: src/modules/Packages.rb:1615 +#: src/modules/Packages.rb:1612 msgid "" "<p><b>The release notes for the initial release are part of the installation\n" "media. If an Internet connection is available during configuration, you can\n" @@ -1806,31 +1806,31 @@ "安装期间若互联网连接可用，您可从 SUSE Linux 网络服务器下载更新的版本资讯。</b></p>\n" #. popup - information label -#: src/modules/Packages.rb:1642 +#: src/modules/Packages.rb:1639 msgid "Integrating booted media..." msgstr "正在集成已引导的介质..." #. close the popup in order to be able to ask about the license -#: src/modules/Packages.rb:1664 +#: src/modules/Packages.rb:1661 msgid "Failed to integrate the service pack repository." msgstr "集成服务包软件源失败。" #. popup - information label -#: src/modules/Packages.rb:1697 +#: src/modules/Packages.rb:1694 msgid "Initializing repositories..." msgstr "正在初始化软件源..." #. message popup, %1 is product name -#: src/modules/Packages.rb:1929 +#: src/modules/Packages.rb:1926 msgid "Insert %1 CD 1" msgstr "请插入 %1 CD 1" -#: src/modules/Packages.rb:1931 +#: src/modules/Packages.rb:1928 msgid "%1 CD 1 not found" msgstr "%1 未找到 CD 1" #. an error message -#: src/modules/Packages.rb:2041 +#: src/modules/Packages.rb:2038 msgid "" "Error while initializing package descriptions.\n" "Check the log file %1 for more details." @@ -1839,7 +1839,7 @@ "更多细节请检查日志文件 %1。" #. bnc #436925 -#: src/modules/Packages.rb:2302 +#: src/modules/Packages.rb:2299 msgid "" "The software selection has been changed externally.\n" "Software proposal will be called again." @@ -1848,12 +1848,12 @@ "将再次调出软件提案。" #. popup label -#: src/modules/Packages.rb:2320 +#: src/modules/Packages.rb:2317 msgid "Evaluating package selection..." msgstr "正在评估软件包选集..." #. Error message, %{pattern_name} is replaced with the missing pattern name in runtime -#: src/modules/Packages.rb:2595 +#: src/modules/Packages.rb:2615 msgid "" "Failed to select default product pattern %{pattern_name}.\n" "Pattern has not been found." @@ -1864,16 +1864,16 @@ #. Sets that the license (file) has been already accepted #. #. @param string filename -#: src/modules/ProductLicense.rb:148 src/modules/ProductLicense.rb:155 +#: src/modules/ProductLicense.rb:150 src/modules/ProductLicense.rb:157 msgid "Cannot read license file %1" msgstr "无法读取许可文件 %1" -#: src/modules/ProductLicense.rb:149 +#: src/modules/ProductLicense.rb:151 msgid "To show the product license properly, put the license.tar.gz file to the root of the live media when building the image." msgstr "要正确显示产品许可，请在构建映像时把 license.tar.gz 文件放到 live 介质的根目录。" #. combo box -#: src/modules/ProductLicense.rb:293 +#: src/modules/ProductLicense.rb:295 msgid "&Language" msgstr "语言(&L)" @@ -1882,23 +1882,16 @@ msgid "I &Agree to the License Terms." msgstr "是，我的大斧已经饥渴难耐了。(&A)" -#. %{license_url} is an URL where the displayed license can be found -#: src/modules/ProductLicense.rb:385 -msgid "" -"If you want to print this EULA, you can download it from\n" -"%{license_url}" -msgstr "若想打印此最终用户许可协议，您可从 %{license_url} 下载全文。" - #. TRANSLATORS: addition license information #. %1 is replaced with the filename -#: src/modules/ProductLicense.rb:391 +#: src/modules/ProductLicense.rb:383 msgid "" "If you want to print this EULA, you can find it\n" "on the first media in the file %1" msgstr "若想打印此最终用户许可协议，您可在第一个介质的 %1 文件中找到许可全文。" #. help text -#: src/modules/ProductLicense.rb:407 +#: src/modules/ProductLicense.rb:400 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" @@ -1911,17 +1904,17 @@ #. dialog title #. dialog caption -#: src/modules/ProductLicense.rb:417 src/modules/ProductLicense.rb:1212 +#: src/modules/ProductLicense.rb:410 src/modules/ProductLicense.rb:1211 msgid "License Agreement" msgstr "许可协议" #. popup question -#: src/modules/ProductLicense.rb:1017 +#: src/modules/ProductLicense.rb:1016 msgid "Really abort the add-on product installation?" msgstr "真的中止附加产品安装吗？" #. text asking whether to refuse a license (Yes-No popup) -#: src/modules/ProductLicense.rb:1041 +#: src/modules/ProductLicense.rb:1040 msgid "" "Refusing the license agreement cancels the installation.\n" "Really refuse the agreement?" @@ -1930,7 +1923,7 @@ "真的拒绝协议吗？你一定会后悔的！" #. text asking whether to refuse a license (Yes-No popup) -#: src/modules/ProductLicense.rb:1044 +#: src/modules/ProductLicense.rb:1043 msgid "" "Refusing the license agreement cancels the add-on\n" "product installation. Really refuse the agreement?" @@ -1939,10 +1932,17 @@ "真的拒绝协议吗？" #. timed ok/cancel popup -#: src/modules/ProductLicense.rb:1054 +#: src/modules/ProductLicense.rb:1053 msgid "The system is shutting down..." msgstr "系统正在关机..." +#. TRANSLATORS: %{license_url} is an URL where the displayed license can be found +#: src/modules/ProductLicense.rb:1577 +msgid "" +"If you want to print this EULA, you can download it from\n" +"%{license_url}" +msgstr "若想打印此最终用户许可协议，您可从 %{license_url} 下载全文。" + #. popup yes-no #: src/modules/SlideShowCallbacks.rb:59 msgid "" @@ -2013,181 +2013,181 @@ msgstr "下载补丁 RPM 失败：%1" #. radio button -#: src/modules/SourceDialogs.rb:30 +#: src/modules/SourceDialogs.rb:31 msgid "&Scan Using SLP..." msgstr "使用 SLP 扫描(&S)..." #. radio button -#: src/modules/SourceDialogs.rb:32 +#: src/modules/SourceDialogs.rb:33 msgid "Commun&ity Repositories" msgstr "社区软件源(&I)" #. radio button -#: src/modules/SourceDialogs.rb:34 +#: src/modules/SourceDialogs.rb:35 msgid "&Extensions and Modules from Registration Server..." msgstr "来自注册服务器的扩展和模块(&E)..." #. radio button -#: src/modules/SourceDialogs.rb:36 +#: src/modules/SourceDialogs.rb:37 msgid "Specify &URL..." msgstr "指定 &URL..." #. radio button -#: src/modules/SourceDialogs.rb:38 +#: src/modules/SourceDialogs.rb:39 msgid "&FTP..." msgstr "&FTP..." #. radio button -#: src/modules/SourceDialogs.rb:40 +#: src/modules/SourceDialogs.rb:41 msgid "&HTTP..." msgstr "&HTTP..." #. radio button -#: src/modules/SourceDialogs.rb:42 +#: src/modules/SourceDialogs.rb:43 msgid "HTT&PS..." msgstr "HTT&PS..." #. radio button #. radio button -#: src/modules/SourceDialogs.rb:44 src/modules/SourceDialogs.rb:1719 +#: src/modules/SourceDialogs.rb:45 src/modules/SourceDialogs.rb:1720 msgid "&SMB/CIFS" msgstr "&SMB/CIFS" #. radio button -#: src/modules/SourceDialogs.rb:46 +#: src/modules/SourceDialogs.rb:47 msgid "&NFS..." msgstr "&NFS..." #. radio button -#: src/modules/SourceDialogs.rb:48 +#: src/modules/SourceDialogs.rb:49 msgid "&CD..." msgstr "&CD..." #. radio button -#: src/modules/SourceDialogs.rb:50 +#: src/modules/SourceDialogs.rb:51 msgid "&DVD..." msgstr "&DVD..." #. radio button -#: src/modules/SourceDialogs.rb:52 +#: src/modules/SourceDialogs.rb:53 msgid "&Hard Disk..." msgstr "硬盘(&H)..." #. radio button -#: src/modules/SourceDialogs.rb:54 +#: src/modules/SourceDialogs.rb:55 msgid "&USB Mass Storage (USB Stick, Disk)..." msgstr "&USB 大容量存储 (USB 记忆棒、磁盘)..." #. radio button -#: src/modules/SourceDialogs.rb:56 +#: src/modules/SourceDialogs.rb:57 msgid "&Local Directory..." msgstr "本地文件夹(&L)..." #. radio button -#: src/modules/SourceDialogs.rb:58 +#: src/modules/SourceDialogs.rb:59 msgid "&Local ISO Image..." msgstr "本地 ISO 映像(&L)..." #. check box -#: src/modules/SourceDialogs.rb:60 +#: src/modules/SourceDialogs.rb:61 msgid "&Download repository description files" msgstr "下载软件源描述文件(&D)" #. Help text suffix for some types of the media -#: src/modules/SourceDialogs.rb:109 +#: src/modules/SourceDialogs.rb:110 msgid "" "<p>If the location is a file holding an ISO image\n" "of the media, set <b>ISO Image</b>.</p>" msgstr "<p>若该位置是保存介质 ISO 映像的文件，请设置 <b>ISO 映像</b>。</p>" #. Help text suffix for some types of the media -#: src/modules/SourceDialogs.rb:114 +#: src/modules/SourceDialogs.rb:115 msgid "" "<p>If the repository is on multiple media,\n" "set the location of the first media of the set.</p>\n" msgstr "<p>若该软件源位于多个介质上，请设置该组介质的第一个介质的位置。</p>\n" #. text entry -#: src/modules/SourceDialogs.rb:128 +#: src/modules/SourceDialogs.rb:129 msgid "&Server Name" msgstr "服务器名称(&S)" #. text entry #. text entry -#: src/modules/SourceDialogs.rb:136 src/modules/SourceDialogs.rb:1583 +#: src/modules/SourceDialogs.rb:137 src/modules/SourceDialogs.rb:1584 msgid "&Path to Directory or ISO Image" msgstr "文件夹或 ISO 映像路径(&P)" #. checkbox label -#: src/modules/SourceDialogs.rb:144 +#: src/modules/SourceDialogs.rb:145 msgid "&ISO Image" msgstr "&ISO 映像" #. checkbox label -#: src/modules/SourceDialogs.rb:146 +#: src/modules/SourceDialogs.rb:147 msgid "N&FS v4 Protocol" msgstr "N&FS v4 协议" -#: src/modules/SourceDialogs.rb:152 +#: src/modules/SourceDialogs.rb:153 msgid "Mount Options" msgstr "挂载选项" #. TRANSLATORS: "(default)" - is a combobox value and means default libzypp #. NFS mount option (users can change it to anything else, the field is editable) -#: src/modules/SourceDialogs.rb:156 +#: src/modules/SourceDialogs.rb:157 msgid "(default)" msgstr "(默认)" -#: src/modules/SourceDialogs.rb:167 +#: src/modules/SourceDialogs.rb:168 msgid "URL of the Repository" msgstr "软件源 URL" #. frame -#: src/modules/SourceDialogs.rb:176 +#: src/modules/SourceDialogs.rb:177 msgid "P&rotocol" msgstr "协议(&R)" #. input field label -#: src/modules/SourceDialogs.rb:186 +#: src/modules/SourceDialogs.rb:187 msgid "&URL of the Repository" msgstr "软件源 &URL" #. label / dialog caption #. bugzilla #219759 #. service label can be empty (not defined) -#: src/modules/SourceDialogs.rb:201 src/modules/SourceManagerSLP.rb:323 +#: src/modules/SourceDialogs.rb:202 src/modules/SourceManagerSLP.rb:323 msgid "Repository URL" msgstr "软件源 URL" #. label / dialog caption -#: src/modules/SourceDialogs.rb:203 +#: src/modules/SourceDialogs.rb:204 msgid "NFS Server" msgstr "NFS 服务器" #. label / dialog caption #. label / dialog caption -#: src/modules/SourceDialogs.rb:205 src/modules/SourceDialogs.rb:207 +#: src/modules/SourceDialogs.rb:206 src/modules/SourceDialogs.rb:208 msgid "CD or DVD Media" msgstr "CD 或 DVD 介质" #. label / dialog caption -#: src/modules/SourceDialogs.rb:209 +#: src/modules/SourceDialogs.rb:210 msgid "Hard Disk" msgstr "硬盘" #. label / dialog caption -#: src/modules/SourceDialogs.rb:211 +#: src/modules/SourceDialogs.rb:212 msgid "USB Stick or Disk" msgstr "USB 记忆棒或磁盘" #. label / dialog caption #. dialog caption -#: src/modules/SourceDialogs.rb:213 src/modules/SourceDialogs.rb:888 +#: src/modules/SourceDialogs.rb:214 src/modules/SourceDialogs.rb:889 msgid "Local Directory" msgstr "本地文件夹" #. label / dialog caption -#: src/modules/SourceDialogs.rb:215 +#: src/modules/SourceDialogs.rb:216 msgid "Local ISO Image" msgstr "本地 ISO 映像" @@ -2196,24 +2196,24 @@ #. label / dialog caption #. label / dialog caption #. label / dialog caption -#: src/modules/SourceDialogs.rb:217 src/modules/SourceDialogs.rb:219 -#: src/modules/SourceDialogs.rb:221 src/modules/SourceDialogs.rb:223 -#: src/modules/SourceDialogs.rb:225 +#: src/modules/SourceDialogs.rb:218 src/modules/SourceDialogs.rb:220 +#: src/modules/SourceDialogs.rb:222 src/modules/SourceDialogs.rb:224 +#: src/modules/SourceDialogs.rb:226 msgid "Server and Directory" msgstr "服务器和文件夹" #. popup message -#: src/modules/SourceDialogs.rb:440 +#: src/modules/SourceDialogs.rb:441 msgid "The name of the repository cannot be empty." msgstr "软件源名称不能为空。" #. text entry -#: src/modules/SourceDialogs.rb:452 +#: src/modules/SourceDialogs.rb:453 msgid "&Repository Name" msgstr "软件源名称(&R)" #. help text -#: src/modules/SourceDialogs.rb:467 +#: src/modules/SourceDialogs.rb:468 msgid "" "<p><big><b>Repository Name</b></big><br>\n" "Use <b>Repository Name</b> to specify the name of the repository. If it is empty, YaST will use the product name (if available) or the URL as the name.</p>\n" @@ -2222,12 +2222,12 @@ "使用<b>软件源名称</b>指定软件源名称。若留空，YaST 将使用产品名 (若有) 或 URL 作为其名称。</p>\n" #. text entry -#: src/modules/SourceDialogs.rb:481 +#: src/modules/SourceDialogs.rb:482 msgid "&Service Name" msgstr "服务名称(&S)" #. help text -#: src/modules/SourceDialogs.rb:489 +#: src/modules/SourceDialogs.rb:490 msgid "" "<p><big><b>Service Name</b></big><br>\n" "Use <b>Service Name</b> to specify the name of the service. If it is empty, YaST will use part of the service URL as the name.</p>\n" @@ -2236,17 +2236,17 @@ "使用<b>服务名称</b>指定服务名。若留空，YaST 将使用服务 URL 的一部分作为其名称。</p>\n" #. popup message -#: src/modules/SourceDialogs.rb:524 +#: src/modules/SourceDialogs.rb:525 msgid "URL cannot be empty." msgstr "URL 不能为空。" #. text entry -#: src/modules/SourceDialogs.rb:537 +#: src/modules/SourceDialogs.rb:538 msgid "&URL" msgstr "&URL" #. help text -#: src/modules/SourceDialogs.rb:551 +#: src/modules/SourceDialogs.rb:552 msgid "" "<p><big><b>Repository URL</b></big><br>\n" "Use <b>URL</b> to specify the URL of the repository.</p>" @@ -2258,16 +2258,16 @@ #. @return widget description map #. Get widget description map #. @return widget description map -#: src/modules/SourceDialogs.rb:724 src/modules/SourceDialogs.rb:1851 +#: src/modules/SourceDialogs.rb:725 src/modules/SourceDialogs.rb:1852 msgid "Edit Parts of the URL" msgstr "编辑部分 URL" -#: src/modules/SourceDialogs.rb:731 src/modules/SourceDialogs.rb:1858 +#: src/modules/SourceDialogs.rb:732 src/modules/SourceDialogs.rb:1859 msgid "Edit Complete URL" msgstr "编辑完整 URL" #. help text -#: src/modules/SourceDialogs.rb:743 +#: src/modules/SourceDialogs.rb:744 msgid "" "<p><big><b>NFS Server</b></big><br>\n" "Use <b>Server Name</b> and <b>Path to Directory or ISO Image</b>\n" @@ -2277,7 +2277,7 @@ "使用<b>服务器名称</b>和<b>文件夹或 ISO 映像路径</b>\n" "指定 NFS 服务器主机名和服务器上的路径。<p>" -#: src/modules/SourceDialogs.rb:750 +#: src/modules/SourceDialogs.rb:751 msgid "" "<p><big><b>Mount Options</b></big><br>\n" "You can specify extra options used for mounting the NFS volume.\n" @@ -2289,16 +2289,16 @@ "这是一个专家选项，推荐保持默认值。细节和支持选项列表请参考 <b>man 5 nfs</b>。" #. radio button -#: src/modules/SourceDialogs.rb:805 +#: src/modules/SourceDialogs.rb:806 msgid "&CD-ROM" msgstr "&CD-ROM" #. radio button -#: src/modules/SourceDialogs.rb:807 +#: src/modules/SourceDialogs.rb:808 msgid "&DVD-ROM" msgstr "&DVD-ROM" -#: src/modules/SourceDialogs.rb:812 +#: src/modules/SourceDialogs.rb:813 msgid "" "<p><big><b>CD or DVD Media</b></big><br>\n" "Set <b>CD-ROM</b> or <b>DVD-ROM</b> to specify the type of media.</p>" @@ -2307,26 +2307,26 @@ "设置 <b>CD-ROM</b> 或 <b>DVD-ROM</b> 以指定介质类型。</p>" #. dialog caption -#: src/modules/SourceDialogs.rb:903 +#: src/modules/SourceDialogs.rb:904 msgid "ISO Image File" msgstr "ISO 映像文件" #. error popup - the entered path is not a directory -#: src/modules/SourceDialogs.rb:926 +#: src/modules/SourceDialogs.rb:927 msgid "" "The entered path is not a directory\n" "or the directory does not exist.\n" msgstr "输入路径不是一个文件夹或该文件夹不存在。\n" #. error popup - the entered path is not a regular file -#: src/modules/SourceDialogs.rb:956 +#: src/modules/SourceDialogs.rb:957 msgid "" "The entered path is not a file\n" "or the file does not exist.\n" msgstr "输入路径不是一个文件或该文件不存在。\n" #. continue/cancel popup, %1 is a file name -#: src/modules/SourceDialogs.rb:980 +#: src/modules/SourceDialogs.rb:981 msgid "" "File '%1'\n" "does not seem to be an ISO image.\n" @@ -2337,17 +2337,17 @@ "仍然使用它吗？\n" #. text entry -#: src/modules/SourceDialogs.rb:1001 +#: src/modules/SourceDialogs.rb:1002 msgid "&Path to Directory" msgstr "文件夹路径(&P)" #. checkbox label -#: src/modules/SourceDialogs.rb:1009 src/modules/SourceDialogs.rb:1267 -#: src/modules/SourceDialogs.rb:1334 +#: src/modules/SourceDialogs.rb:1010 src/modules/SourceDialogs.rb:1268 +#: src/modules/SourceDialogs.rb:1335 msgid "&Plain RPM Directory" msgstr "纯 RPM 文件夹(&P)" -#: src/modules/SourceDialogs.rb:1024 +#: src/modules/SourceDialogs.rb:1025 msgid "" "<p><big><b>Local Directory</b></big><br>\n" "Use <b>Path to Directory</b> to specify the path to the\n" @@ -2362,20 +2362,20 @@ "<b>纯 RPM 文件夹</b>选项。</p>\n" #. `opt(`hstretch), -#: src/modules/SourceDialogs.rb:1260 +#: src/modules/SourceDialogs.rb:1261 msgid "&USB Mass Storage Device" msgstr "&USB 大容量存储设备" #. the spacing is added to make the widget wider -#: src/modules/SourceDialogs.rb:1265 src/modules/SourceDialogs.rb:1332 +#: src/modules/SourceDialogs.rb:1266 src/modules/SourceDialogs.rb:1333 msgid "&File System" msgstr "文件系统(&F)" -#: src/modules/SourceDialogs.rb:1266 src/modules/SourceDialogs.rb:1333 +#: src/modules/SourceDialogs.rb:1267 src/modules/SourceDialogs.rb:1334 msgid "Dire&ctory" msgstr "文件夹(&C)" -#: src/modules/SourceDialogs.rb:1271 +#: src/modules/SourceDialogs.rb:1272 msgid "" "<p><big><b>USB Stick or Disk</b></big><br>\n" "Select the USB device on which the repository is located.\n" @@ -2395,7 +2395,7 @@ #. 'auto' is a value in the combo box widget, do not translate it! #. 'auto' is a value in the combo box widget, do not translate it! -#: src/modules/SourceDialogs.rb:1281 src/modules/SourceDialogs.rb:1348 +#: src/modules/SourceDialogs.rb:1282 src/modules/SourceDialogs.rb:1349 msgid "" "<p>The file system used on the device will be detected automatically\n" "if you select file system 'auto'. If the detection fails or you\n" @@ -2405,11 +2405,11 @@ "若检测失败，或您想要使用特定文件系统，还可从列表中选择。</p>\n" #. combobox title -#: src/modules/SourceDialogs.rb:1331 +#: src/modules/SourceDialogs.rb:1332 msgid "&Disk Device" msgstr "磁盘设备(&D)" -#: src/modules/SourceDialogs.rb:1338 +#: src/modules/SourceDialogs.rb:1339 msgid "" "<p><big><b>Disk</b></big><br>\n" "Select the disk on which the repository is located.\n" @@ -2427,12 +2427,12 @@ "<b>纯 RPM 文件夹</b>选项。</p>\n" #. text entry -#: src/modules/SourceDialogs.rb:1364 +#: src/modules/SourceDialogs.rb:1365 msgid "&Path to ISO Image" msgstr "ISO 映像路径(&P)" #. push button -#: src/modules/SourceDialogs.rb:1384 +#: src/modules/SourceDialogs.rb:1385 msgid "" "<p><big><b>Local ISO Image</b></big><br>\n" "Use <b>Path to ISO Image</b> to specify the path to the\n" @@ -2442,71 +2442,71 @@ "使用<b>ISO 映像路径</b>指定 ISO 映像文件的路径。</p>" #. text entry -#: src/modules/SourceDialogs.rb:1565 +#: src/modules/SourceDialogs.rb:1566 msgid "Server &Name" msgstr "服务器名称(&N)" -#: src/modules/SourceDialogs.rb:1569 +#: src/modules/SourceDialogs.rb:1570 msgid "&Port" msgstr "端口(&P)" #. text entry -#: src/modules/SourceDialogs.rb:1574 +#: src/modules/SourceDialogs.rb:1575 msgid "&Share" msgstr "共享(&S)" #. checkbox label -#: src/modules/SourceDialogs.rb:1587 +#: src/modules/SourceDialogs.rb:1588 msgid "ISO &Image" msgstr "&ISO 映像" #. text entry -#: src/modules/SourceDialogs.rb:1590 +#: src/modules/SourceDialogs.rb:1591 msgid "&Directory on Server" msgstr "服务器上的文件夹(&D)" #. frame -#: src/modules/SourceDialogs.rb:1595 +#: src/modules/SourceDialogs.rb:1596 msgid "Au&thentication" msgstr "认证(&T)" #. check box -#: src/modules/SourceDialogs.rb:1602 +#: src/modules/SourceDialogs.rb:1603 msgid "&Anonymous" msgstr "匿名(&A)" #. text entry -#: src/modules/SourceDialogs.rb:1611 +#: src/modules/SourceDialogs.rb:1612 msgid "&Workgroup or Domain" msgstr "工作组或域(&W)" #. text entry -#: src/modules/SourceDialogs.rb:1620 +#: src/modules/SourceDialogs.rb:1621 msgid "&User Name" msgstr "用户名(&U)" #. password entry -#: src/modules/SourceDialogs.rb:1627 +#: src/modules/SourceDialogs.rb:1628 msgid "&Password" msgstr "密码(&P)" #. radio button -#: src/modules/SourceDialogs.rb:1702 +#: src/modules/SourceDialogs.rb:1703 msgid "&FTP" msgstr "&FTP" #. radio button -#: src/modules/SourceDialogs.rb:1705 +#: src/modules/SourceDialogs.rb:1706 msgid "H&TTP" msgstr "H&TTP" #. radio button -#: src/modules/SourceDialogs.rb:1712 +#: src/modules/SourceDialogs.rb:1713 msgid "HTT&PS" msgstr "HTT&PS" #. help text - server dialog -#: src/modules/SourceDialogs.rb:1882 +#: src/modules/SourceDialogs.rb:1883 msgid "" "<p><big><b>Server and Directory</b></big><br>\n" "Use <b>Server Name</b> and <b>Path to Directory or ISO Image</b>\n" @@ -2527,7 +2527,7 @@ "若该位置是保存介质 ISO 映像的文件，请设置 <b>ISO 映像</b>。</p>\n" #. help text - server dialog, there is a "Port" widget -#: src/modules/SourceDialogs.rb:1895 +#: src/modules/SourceDialogs.rb:1896 msgid "" "<p>It is possible to set the <b>Port</b> number for a HTTP/HTTPS repository.\n" "Leave it empty to use the default port.</p>\n" @@ -2538,12 +2538,12 @@ #. Returns whether Community Repositories are defined in the control file. #. #. @return [Boolean] whether defined -#: src/modules/SourceDialogs.rb:1957 +#: src/modules/SourceDialogs.rb:1958 msgid "I would like to install an additional Add On Product" msgstr "我想要安装一个额外的附加产品" #. help text -#: src/modules/SourceDialogs.rb:2076 +#: src/modules/SourceDialogs.rb:2085 msgid "" "<p><big><b>Media Type</b></big><br>\n" "The software repository can be located on CD, on a network server,\n" @@ -2553,7 +2553,7 @@ "软件源可位于 CD、网络服务器或硬盘上。</p>" #. help, continued -#: src/modules/SourceDialogs.rb:2085 +#: src/modules/SourceDialogs.rb:2094 msgid "" "<p>\n" "To add <b>CD</b> or <b>DVD</b>,\n" @@ -2564,7 +2564,7 @@ "请准备好产品 CD 集或 DVD。</p>" #. help, continued -#: src/modules/SourceDialogs.rb:2095 +#: src/modules/SourceDialogs.rb:2104 msgid "" "<p>\n" "The product CDs can be copied to the hard disk.\n" @@ -2578,7 +2578,7 @@ "若已将全部 CD 复制进了相同文件夹，则只需输入基本路径。</p>\n" #. help, continued -#: src/modules/SourceDialogs.rb:2107 +#: src/modules/SourceDialogs.rb:2116 msgid "" "<p>\n" "Network installation requires a working network connection.\n" @@ -2590,25 +2590,25 @@ "请指定第一张 CD 中的软件包所在的文件夹，诸如 /data1/CD1。</p>\n" #. error popup -#: src/modules/SourceDialogs.rb:2122 +#: src/modules/SourceDialogs.rb:2131 msgid "Select the media type" msgstr "选择介质类型" -#: src/modules/SourceDialogs.rb:2128 +#: src/modules/SourceDialogs.rb:2137 msgid "Insert the add-on product CD" msgstr "请插入附加产品 CD" -#: src/modules/SourceDialogs.rb:2129 +#: src/modules/SourceDialogs.rb:2138 msgid "Insert the add-on product DVD" msgstr "请插入附加产品 DVD" #. ask for a medium -#: src/modules/SourceDialogs.rb:2147 +#: src/modules/SourceDialogs.rb:2156 msgid "No USB disk was detected." msgstr "未检测到 USB 磁盘。" #. TODO: disable "download" option when CD or DVD source is selected -#: src/modules/SourceDialogs.rb:2344 +#: src/modules/SourceDialogs.rb:2359 msgid "" "<p><b>Download Files</b><br>\n" "Each repository has description files which describe the content of the\n" @@ -2622,12 +2622,12 @@ "若不选该选项，则 YaST 将在稍后需要这些文件时自动下载它们。</p>\n" #. dialog caption -#: src/modules/SourceDialogs.rb:2563 +#: src/modules/SourceDialogs.rb:2578 msgid "Media Type" msgstr "介质类型" #. dialog caption -#: src/modules/SourceDialogs.rb:2587 +#: src/modules/SourceDialogs.rb:2602 msgid "Add On Product" msgstr "附加产品" @@ -2819,19 +2819,19 @@ msgstr "没有在您的网络上发现 SLP 软件源。" #. Warning message, e.g.: Partition /usr needs 35 MB more disk space -#: src/modules/SpaceCalculation.rb:936 +#: src/modules/SpaceCalculation.rb:869 msgid "Partition \"%1\" needs %2 more disk space." msgstr "分区 \"%1\" 需要 %2 更多磁盘空间。" #. popup message -#: src/modules/SpaceCalculation.rb:956 +#: src/modules/SpaceCalculation.rb:889 msgid "" "Deselect packages or delete data or temporary files\n" "before updating the system.\n" msgstr "在更新系统前请反选一些软件包或者删除一些数据或临时文件。\n" #. popup message -#: src/modules/SpaceCalculation.rb:965 +#: src/modules/SpaceCalculation.rb:898 msgid "Deselect some packages." msgstr "请反选一些软件包。" Modified: trunk/yast/zh_CN/po/proxy.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/proxy.zh_CN.po 2014-10-29 15:59:29 UTC (rev 90431) +++ trunk/yast/zh_CN/po/proxy.zh_CN.po 2014-10-29 16:00:17 UTC (rev 90432) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2014-10-29 16:21+0100\n" "PO-Revision-Date: 2013-02-06 04:31+0800\n" "Last-Translator: 玛格丽特 · 苏 <i@marguerite.su>\n" "Language-Team: Chinese Simplified <opensuse-zh@opensuse.org>\n" @@ -21,9 +21,7 @@ #. Commandline help title #. Proxy dialog caption -#. Proxy dialog caption -#: src/clients/proxy.rb:32 src/clients/proxy_proposal.rb:448 -#: src/include/proxy/dialogs.rb:398 +#: src/clients/proxy.rb:32 src/include/proxy/dialogs.rb:399 msgid "Proxy Configuration" msgstr "代理配置" @@ -116,36 +114,30 @@ msgstr "FTP" #. Informative label -#. Informative label -#: src/clients/proxy_proposal.rb:100 src/include/proxy/dialogs.rb:101 +#: src/include/proxy/dialogs.rb:101 msgid "No details available." msgstr "无可用细节。" #. A push button -#. A push button -#: src/clients/proxy_proposal.rb:103 src/include/proxy/dialogs.rb:104 +#: src/include/proxy/dialogs.rb:104 msgid "&Details <<" msgstr "细节 <<(&D)" +#. avoid confusing Emacs #. A push button -#. A push button -#: src/clients/proxy_proposal.rb:105 src/include/proxy/dialogs.rb:106 +#: src/include/proxy/dialogs.rb:106 msgid "&Details >>" msgstr "细节 >>(&D)" #. The default error code, replaced with the current error code got from proxy if any code found -#. The default error code, replaced with the current error code got from proxy if any code found -#: src/clients/proxy_proposal.rb:220 src/include/proxy/dialogs.rb:172 +#: src/include/proxy/dialogs.rb:173 msgid "Unknown Error Code" msgstr "未知错误代码" #. Error message, #. %1 is a string "HTTP", "HTTPS" or "FTP" #. %2 is an error string such as "HTTP/1.0 403 Forbidden" -#. Error message, -#. %1 is a string "HTTP", "HTTPS" or "FTP" -#. %2 is an error string such as "HTTP/1.0 403 Forbidden" -#: src/clients/proxy_proposal.rb:238 src/include/proxy/dialogs.rb:190 +#: src/include/proxy/dialogs.rb:191 msgid "" "An error occurred during the %1 proxy test.\n" "Proxy return code: %2.\n" @@ -156,10 +148,7 @@ #. Unknown return code, #. %1 is the string HTTP, "HTTPS" or FTP, #. %2 is an error string such as "HTTP/1.0 403 Forbidden" -#. Unknown return code, -#. %1 is the string HTTP, "HTTPS" or FTP, -#. %2 is an error string such as "HTTP/1.0 403 Forbidden" -#: src/clients/proxy_proposal.rb:253 src/include/proxy/dialogs.rb:205 +#: src/include/proxy/dialogs.rb:206 msgid "" "An unknown error occurred during the %1 proxy test.\n" "Proxy return code: %2.\n" @@ -168,38 +157,32 @@ "代理返回代码：%2。\n" #. An informative popup label diring the proxy testings -#. An informative popup label diring the proxy testings -#: src/clients/proxy_proposal.rb:274 src/include/proxy/dialogs.rb:226 +#: src/include/proxy/dialogs.rb:227 msgid "Testing the current proxy settings..." msgstr "正在测试当前代理设置..." #. TRANSLATORS: Error popup message -#. TRANSLATORS: Error popup message -#: src/clients/proxy_proposal.rb:284 src/include/proxy/dialogs.rb:236 +#: src/include/proxy/dialogs.rb:237 msgid "An error occurred during the HTTP proxy test." msgstr "测试 HTTP 代理时出错。" #. TRANSLATORS: Error popup message -#. TRANSLATORS: Error popup message -#: src/clients/proxy_proposal.rb:306 src/include/proxy/dialogs.rb:258 +#: src/include/proxy/dialogs.rb:259 msgid "An error occurred during the HTTPS proxy test." msgstr "测试 HTTPS 代理时出错。" #. TRANSLATORS: Error popup message -#. TRANSLATORS: Error popup message -#: src/clients/proxy_proposal.rb:328 src/include/proxy/dialogs.rb:280 +#: src/include/proxy/dialogs.rb:281 msgid "An error occurred during the FTP proxy test." msgstr "测试 FTP 代理时出错。" #. Popup message -#. Popup message -#: src/clients/proxy_proposal.rb:346 src/include/proxy/dialogs.rb:298 +#: src/include/proxy/dialogs.rb:299 msgid "Proxy settings work correctly." msgstr "代理设置运行正确。" #. Proxy dialog help 1/8 -#. Proxy dialog help 1/8 -#: src/clients/proxy_proposal.rb:454 src/include/proxy/dialogs.rb:404 +#: src/include/proxy/dialogs.rb:405 msgid "" "<p>Configure your Internet proxy (caching) settings here.</p>\n" "<p><b>Note:</b> It is generally recommended to relogin for the settings to take effect, \n" @@ -212,8 +195,7 @@ "您的应用程序 (网络浏览器，FTP 客户端，...) 的支持情况。</p>" #. Proxy dialog help 2/8 -#. Proxy dialog help 2/8 -#: src/clients/proxy_proposal.rb:461 src/include/proxy/dialogs.rb:411 +#: src/include/proxy/dialogs.rb:412 msgid "" "<p><b>HTTP Proxy URL</b> is the name of the proxy server for your access\n" "to the World Wide Web (WWW).</p>\n" @@ -222,8 +204,7 @@ "互联网 (WWW) 的代理服务器的名称。</p>\n" #. Proxy dialog help 3/8 -#. Proxy dialog help 3/8 -#: src/clients/proxy_proposal.rb:465 src/include/proxy/dialogs.rb:415 +#: src/include/proxy/dialogs.rb:416 msgid "" "<p><b>HTTPS Proxy URL</b> is the name of the proxy server for your secured access\n" "to the World Wide Web (WWW).</p>\n" @@ -232,14 +213,12 @@ "互联网 (WWW) 的代理服务器的名称。</p>\n" #. Proxy dialog help 3.5/8 -#. Proxy dialog help 3.5/8 -#: src/clients/proxy_proposal.rb:469 src/include/proxy/dialogs.rb:419 +#: src/include/proxy/dialogs.rb:420 msgid "<p>Example: <i>http://proxy.example.com:3128/</i></p>" msgstr "<p>例如：<i>http://proxy.example.com:3128/</i></p>" #. Proxy dialog help 4/8 -#. Proxy dialog help 4/8 -#: src/clients/proxy_proposal.rb:471 src/include/proxy/dialogs.rb:421 +#: src/include/proxy/dialogs.rb:422 msgid "" "<p><b>FTP Proxy URL</b> is the name of the proxy server for your access\n" "to the file transfer services (FTP).</p>" @@ -248,8 +227,7 @@ "文件传输服务 (FTP) 的代理服务器的名称。</p>" #. Proxy dialog help 5/8 -#. Proxy dialog help 5/8 -#: src/clients/proxy_proposal.rb:475 src/include/proxy/dialogs.rb:425 +#: src/include/proxy/dialogs.rb:426 msgid "" "<p>If you check <b>Use the Same Proxy for All Protocols</b>, it is\n" "enough to fill in the HTTP proxy URL. It will be used for all protocols\n" @@ -260,8 +238,7 @@ "(HTTP、HTTPS 和 FTP)。\n" #. Proxy dialog help 6/8 -#. Proxy dialog help 6/8 -#: src/clients/proxy_proposal.rb:482 src/include/proxy/dialogs.rb:432 +#: src/include/proxy/dialogs.rb:433 msgid "" "<p><b>No Proxy Domains</b> is a comma-separated list of domains\n" "for which the requests should be made directly without caching,\n" @@ -272,8 +249,7 @@ "例如，<i>%1</i>。</p>\n" #. Proxy dialog help 7/8 -#. Proxy dialog help 7/8 -#: src/clients/proxy_proposal.rb:491 src/include/proxy/dialogs.rb:441 +#: src/include/proxy/dialogs.rb:442 msgid "" "<p>If you are using a proxy server with authorization, enter\n" "the <b>Proxy User Name</b> and <b>Proxy Password</b>. A valid username\n" @@ -284,8 +260,7 @@ "仅由可打印的 ASCII 字符组成 (引号除外)。</p>\n" #. Proxy dialog help 8/8 -#. Proxy dialog help 8/8 -#: src/clients/proxy_proposal.rb:499 src/include/proxy/dialogs.rb:449 +#: src/include/proxy/dialogs.rb:450 msgid "" "<p>Press <b>Test Proxy Settings</b> to test\n" "the current configuration for HTTP, HTTPS, and FTP proxy.</p> \n" @@ -294,70 +269,60 @@ "HTTP、HTTPS 和 FTP 代理的当前配置。</p> \n" #. CheckBox entry label -#. CheckBox entry label -#: src/clients/proxy_proposal.rb:519 src/include/proxy/dialogs.rb:466 +#: src/include/proxy/dialogs.rb:467 msgid "&Enable Proxy" msgstr "启用代理(&E)" #. Frame label -#. Frame label -#: src/clients/proxy_proposal.rb:527 src/include/proxy/dialogs.rb:472 +#: src/include/proxy/dialogs.rb:473 msgid "Proxy Settings" msgstr "代理设置" #. Text entry label -#. Text entry label -#: src/clients/proxy_proposal.rb:533 src/include/proxy/dialogs.rb:478 +#: src/include/proxy/dialogs.rb:479 msgid "&HTTP Proxy URL" msgstr "&HTTP 代理 URL" -#: src/clients/proxy_proposal.rb:535 src/include/proxy/dialogs.rb:480 +#: src/include/proxy/dialogs.rb:481 msgid "HTTP&S Proxy URL" msgstr "HTTP&S 代理 URL" #. Text entry label -#. Text entry label -#: src/clients/proxy_proposal.rb:538 src/include/proxy/dialogs.rb:483 +#: src/include/proxy/dialogs.rb:484 msgid "F&TP Proxy URL" msgstr "F&TP 代理 URL" -#: src/clients/proxy_proposal.rb:544 src/include/proxy/dialogs.rb:489 +#: src/include/proxy/dialogs.rb:490 msgid "Us&e the Same Proxy for All Protocols" msgstr "对全部协议使用相同代理(&E)" #. Text entry label #. domains without proxying -#. Text entry label -#. domains without proxying -#: src/clients/proxy_proposal.rb:549 src/include/proxy/dialogs.rb:494 +#: src/include/proxy/dialogs.rb:495 msgid "No Proxy &Domains" msgstr "无代理域(&D)" -#: src/clients/proxy_proposal.rb:558 src/include/proxy/dialogs.rb:503 +#: src/include/proxy/dialogs.rb:504 msgid "Proxy Authentication" msgstr "代理认证" #. Text entry label -#. Text entry label -#: src/clients/proxy_proposal.rb:567 src/include/proxy/dialogs.rb:512 +#: src/include/proxy/dialogs.rb:513 msgid "Proxy &User Name" msgstr "代理用户名(&U)" #. Password entry label -#. Password entry label -#: src/clients/proxy_proposal.rb:575 src/include/proxy/dialogs.rb:520 +#: src/include/proxy/dialogs.rb:521 msgid "Proxy &Password" msgstr "代理密码(&P)" #. Test Proxy Settings - push button -#. Test Proxy Settings - push button -#: src/clients/proxy_proposal.rb:587 src/include/proxy/dialogs.rb:532 +#: src/include/proxy/dialogs.rb:533 msgid "Test Pr&oxy Settings" msgstr "测试代理设置(&O)" #. Popup error text - http, https and ftp proxy URLs are blank -#. Popup error text - http, https and ftp proxy URLs are blank -#: src/clients/proxy_proposal.rb:673 src/include/proxy/dialogs.rb:618 +#: src/include/proxy/dialogs.rb:619 msgid "" "Proxy is enabled, but no proxy URL has been specified.\n" "Really use these settings?" @@ -365,7 +330,7 @@ "已启用代理，但未指定代理 URL。\n" "真的使用这些设置吗？" -#: src/clients/proxy_proposal.rb:686 src/include/proxy/dialogs.rb:631 +#: src/include/proxy/dialogs.rb:632 msgid "" "Security warning:\n" "Username and password will be stored unencrypted\n" @@ -377,50 +342,42 @@ "真的使用这些设置吗？" #. Popup::Error text -#. Popup::Error text -#: src/clients/proxy_proposal.rb:701 src/include/proxy/dialogs.rb:646 +#: src/include/proxy/dialogs.rb:647 msgid "You cannot enter a password and leave the user name empty." msgstr "不能只输入密码而留空用户名。" #. Popup::Error text -#. Popup::Error text -#: src/clients/proxy_proposal.rb:711 src/include/proxy/dialogs.rb:654 +#: src/include/proxy/dialogs.rb:655 msgid "HTTP proxy URL is invalid." msgstr "HTTP 代理 URL 无效。" #. Popup::Error text -#. Popup::Error text -#: src/clients/proxy_proposal.rb:719 src/include/proxy/dialogs.rb:662 +#: src/include/proxy/dialogs.rb:663 msgid "HTTP proxy URL must contain a scheme specification (http)." msgstr "HTTP 代理 URL 必须包含前缀 (http)。" #. Popup::Error text -#. Popup::Error text -#: src/clients/proxy_proposal.rb:730 src/include/proxy/dialogs.rb:671 +#: src/include/proxy/dialogs.rb:672 msgid "The HTTPS proxy URL is invalid." msgstr "HTTPS 代理 URL 无效。" #. Popup::Error text -#. Popup::Error text -#: src/clients/proxy_proposal.rb:738 src/include/proxy/dialogs.rb:679 +#: src/include/proxy/dialogs.rb:680 msgid "The HTTPS proxy URL must contain a scheme specification (http)." msgstr "HTTPS 代理 URL 必须包含前缀 (https)。" #. Popup::Error text -#. Popup::Error text -#: src/clients/proxy_proposal.rb:749 src/include/proxy/dialogs.rb:690 +#: src/include/proxy/dialogs.rb:691 msgid "FTP proxy URL is invalid." msgstr "FTP 代理 URL 无效。" #. Popup::Error text -#. Popup::Error text -#: src/clients/proxy_proposal.rb:757 src/include/proxy/dialogs.rb:698 +#: src/include/proxy/dialogs.rb:699 msgid "FTP proxy URL must contain a scheme specification (http)." msgstr "FTP 代理 URL 必须包含前缀 (ftp)。" #. Translators: no proxy domain is a domain that can be accessed without proxy -#. Translators: no proxy domain is a domain that can be accessed without proxy -#: src/clients/proxy_proposal.rb:769 src/include/proxy/dialogs.rb:708 +#: src/include/proxy/dialogs.rb:709 msgid "" "One or more no proxy domains are invalid. \n" "Check if all domains match one of the following:\n" @@ -436,16 +393,6 @@ "* 完全限定主机名\n" "* 以 '.' 开头的域名" -#. Rich text title -#: src/clients/proxy_proposal.rb:839 -msgid "Proxy" -msgstr "代理" - -#. MenuButton title -#: src/clients/proxy_proposal.rb:841 -msgid "&Proxy" -msgstr "代理(&P)" - #. Popup headline #: src/modules/Proxy.rb:45 msgid "Proxy Configuration Successfully Saved" @@ -495,3 +442,9 @@ #: src/modules/Proxy.rb:466 msgid "FTP Proxy: %1" msgstr "FTP 代理：%1" + +#~ msgid "Proxy" +#~ msgstr "代理" + +#~ msgid "&Proxy" +#~ msgstr "代理(&P)" Modified: trunk/yast/zh_CN/po/registration.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/registration.zh_CN.po 2014-10-29 15:59:29 UTC (rev 90431) +++ trunk/yast/zh_CN/po/registration.zh_CN.po 2014-10-29 16:00:17 UTC (rev 90432) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-15 15:56+0200\n" +"POT-Creation-Date: 2014-10-29 16:21+0100\n" "PO-Revision-Date: 2014-08-23 02:15+0800\n" "Last-Translator: 玛格丽特 · 苏 <marguerite@opensuse.org>\n" "Language-Team: Chinese Traditional <kde-i18n-doc@kde.org>\n" @@ -23,11 +23,11 @@ "X-Generator: Lokalize 1.5\n" #. popup heading (in bold) -#: src/clients/discover_registration_services.rb:35 +#: src/clients/discover_registration_services.rb:40 msgid "Local Registration Servers" msgstr "本地注册服务器" -#: src/clients/discover_registration_services.rb:37 +#: src/clients/discover_registration_services.rb:42 msgid "" "Select a detected registration server from the list\n" "or the default SUSE registration server." @@ -36,62 +36,43 @@ "或使用默认的 SUSE 注册服务器。" #. error popup -#: src/clients/discover_registration_services.rb:65 +#: src/clients/discover_registration_services.rb:66 msgid "No registration server selected." msgstr "未选择注册服务器。" #. %s is the default SCC URL -#: src/clients/discover_registration_services.rb:100 +#: src/clients/discover_registration_services.rb:112 msgid "SUSE Customer Center (%s)" msgstr "SUSE 客服中心(&s)" #. popup message #. popup message -#: src/clients/inst_scc.rb:52 src/clients/scc_auto.rb:48 +#. popup message +#: src/clients/inst_scc.rb:53 src/clients/scc_auto.rb:49 +#: src/lib/registration/registration_ui.rb:39 msgid "Contacting the Registration Server" msgstr "正在连接注册服务器" -#. reset the user input in case an exception is raised -#. nil = use the default URL -#: src/clients/inst_scc.rb:147 src/clients/scc_auto.rb:169 -msgid "Registering the System..." -msgstr "正在注册系统..." - -#. then register the product(s) -#. %s is name of given product -#. register the base product -#. %s is name of given product -#: src/clients/inst_scc.rb:156 src/clients/inst_scc.rb:427 -#: src/clients/scc_auto.rb:177 src/clients/scc_auto.rb:192 -msgid "Registering %s ..." -msgstr "正在注册 %s ..." - -#. updating base product registration, %s is a new base product name -#. updating registered addon/extension, %s is an extension name -#: src/clients/inst_scc.rb:206 src/clients/inst_scc.rb:236 -msgid "Updating to %s ..." -msgstr "正在更新到 %s ..." - #. display the registration update dialog #. dialog title #. dialog title #. Translators: Text for UI Label - capitalized -#: src/clients/inst_scc.rb:260 src/clients/inst_scc.rb:352 -#: src/clients/inst_scc.rb:504 src/clients/inst_scc.rb:552 +#: src/clients/inst_scc.rb:215 src/clients/inst_scc.rb:310 +#: src/clients/inst_scc.rb:467 src/clients/inst_scc.rb:515 #: src/lib/registration/ui/autoyast_config_dialog.rb:92 msgid "Registration" msgstr "注册" -#: src/clients/inst_scc.rb:261 +#: src/clients/inst_scc.rb:216 msgid "Registration is being updated..." msgstr "正在更新注册..." -#: src/clients/inst_scc.rb:262 +#: src/clients/inst_scc.rb:217 msgid "The previous registration is being updated." msgstr "正在更新之前的注册。" #. automatic registration refresh during system upgrade failed, register from scratch -#: src/clients/inst_scc.rb:275 +#: src/clients/inst_scc.rb:233 msgid "" "Automatic registration upgrade failed.\n" "You can manually register the system from scratch." @@ -101,7 +82,7 @@ #. label text describing the registration (1/2) #. use \n to split to more lines if needed (use max. 76 chars/line) -#: src/clients/inst_scc.rb:289 +#: src/clients/inst_scc.rb:247 msgid "" "Please enter a registration or evaluation code for this product and your\n" "User Name/E-mail address from the SUSE Customer Center in the fields below.\n" @@ -114,49 +95,49 @@ #. label text describing the registration (2/2), #. not displayed in installed system #. use \n to split to more lines if needed (use max. 76 chars/line) -#: src/clients/inst_scc.rb:301 +#: src/clients/inst_scc.rb:259 msgid "" "If you skip product registration now, remember to register after\n" "installation has completed." msgstr "若您现在跳过了注册，请记得在安装完成后注册呀。" -#: src/clients/inst_scc.rb:309 +#: src/clients/inst_scc.rb:267 msgid "Network Configuration..." msgstr "网络配置..." -#: src/clients/inst_scc.rb:318 src/clients/inst_scc.rb:491 +#: src/clients/inst_scc.rb:276 src/clients/inst_scc.rb:452 msgid "The system is already registered." msgstr "系统已注册。" -#: src/clients/inst_scc.rb:325 +#: src/clients/inst_scc.rb:283 #: src/lib/registration/ui/autoyast_config_dialog.rb:94 msgid "&E-mail Address" msgstr "电子邮件地址(&E)" #. handle nil specifically, it cannot be stored in XML profile -#: src/clients/inst_scc.rb:327 +#: src/clients/inst_scc.rb:285 #: src/lib/registration/ui/autoyast_addon_dialog.rb:167 #: src/lib/registration/ui/autoyast_config_dialog.rb:96 msgid "Registration &Code" msgstr "注册码(&C)" #. button label -#: src/clients/inst_scc.rb:332 +#: src/clients/inst_scc.rb:290 msgid "&Local Registration Server..." msgstr "本地注册服务器(&L)..." #. button label -#: src/clients/inst_scc.rb:335 +#: src/clients/inst_scc.rb:293 msgid "&Skip Registration" msgstr "跳过注册(&S)" #. help text -#: src/clients/inst_scc.rb:343 +#: src/clients/inst_scc.rb:301 msgid "Enter SUSE Customer Center credentials here to register the system to get updates and extensions." msgstr "在此输入 SUSE 客服中心账户信息来注册系统以获得更新和扩展。" #. not set yet? -#: src/clients/inst_scc.rb:377 +#: src/clients/inst_scc.rb:334 msgid "" "Registration added some update repositories.\n" "\n" @@ -167,25 +148,26 @@ "\n" "您想要在安装期间安装最新可用的在线更新吗？" -#. cache the available addons -#. create a new dialog for accepting and importing a SSL certificate and run it -#: src/clients/inst_scc.rb:406 -#: src/lib/registration/ui/autoyast_config_workflow.rb:101 -msgid "Loading Available Extensions and Modules..." -msgstr "正在加载可用扩展和模块..." +#. %s is name of given product +#. %s is name of given product +#. then register the product(s) +#: src/clients/inst_scc.rb:385 src/clients/scc_auto.rb:284 +#: src/lib/registration/registration_ui.rb:71 +msgid "Registering %s ..." +msgstr "正在注册 %s ..." #. dialog title -#: src/clients/inst_scc.rb:458 +#: src/clients/inst_scc.rb:419 msgid "Register Extensions and Modules" msgstr "注册扩展和模块" #. help text -#: src/clients/inst_scc.rb:462 +#: src/clients/inst_scc.rb:423 msgid "<p>Extensions and Modules are being registered.</p>" msgstr "<p>正在注册扩展和模块。</p>" #. Popup question: confirm skipping the registration -#: src/clients/inst_scc.rb:480 +#: src/clients/inst_scc.rb:441 msgid "" "If you do not register your system we will not be able\n" "to grant you access to the update repositories.\n" @@ -202,37 +184,37 @@ "现在真的要跳过注册吗？" #. button label -#: src/clients/inst_scc.rb:494 +#: src/clients/inst_scc.rb:455 msgid "Register Again" msgstr "再次注册" #. button label -#: src/clients/inst_scc.rb:497 +#: src/clients/inst_scc.rb:458 msgid "Select Extensions" msgstr "选择扩展" #. help text -#: src/clients/inst_scc.rb:507 +#: src/clients/inst_scc.rb:470 msgid "<p>The system is already registered.</p>" msgstr "<p>系统已注册。</p>" -#: src/clients/inst_scc.rb:508 +#: src/clients/inst_scc.rb:471 msgid "<p>You can re-register it again or you can register additional extension or modules to enhance the functionality of the system.</p>" msgstr "<p>您可以再次注册或注册额外扩展或模块以增强系统功能。</p>" -#: src/clients/inst_scc.rb:510 +#: src/clients/inst_scc.rb:473 msgid "<p>If you want to deregister your system you need to log into the SUSE Customer Center and remove the system manually there.</p>" msgstr "<p>若您想要反注册您的系统，您需要登入 SUSE 客服中心并在那里手动移除该系统。</p>" #. error message -#: src/clients/inst_scc.rb:534 +#: src/clients/inst_scc.rb:497 msgid "" "The base product was not found,\n" "check your system." msgstr "未找到基础产品，请检查您的系统。" #. TRANSLATORS: %s = bugzilla URL -#: src/clients/inst_scc.rb:538 +#: src/clients/inst_scc.rb:501 msgid "" "The installation medium or the installer itself is seriously broken.\n" "Report a bug at %s." @@ -240,7 +222,7 @@ "安装介质或安装器自身严重损坏。\n" "请于 %s 汇报故障。" -#: src/clients/inst_scc.rb:541 +#: src/clients/inst_scc.rb:504 msgid "" "Make sure a product is installed and /etc/products.d/baseproduct\n" "is a symlink pointing to the base product .prod file." @@ -252,23 +234,23 @@ msgstr "使用 '%s' 而不是这个 YaST 模块。" #. popup message: registration finished properly -#: src/clients/scc_auto.rb:208 +#: src/clients/scc_auto.rb:184 msgid "Registration was successfull." msgstr "注册成功。" #. remove possible duplicates -#: src/clients/scc_auto.rb:243 +#: src/clients/scc_auto.rb:212 msgid "SLP discovery failed, no server found" msgstr "SLP 探索失败，未找到服务器" #. more than one server found: let the user select, we cannot automatically #. decide which one to use, asking user in AutoYast mode is not nice #. but better than aborting the installation... -#: src/clients/scc_auto.rb:259 +#: src/clients/scc_auto.rb:228 msgid "Downloading SSL Certificate" msgstr "正在下载 SSL 证书" -#: src/clients/scc_auto.rb:263 +#: src/clients/scc_auto.rb:232 msgid "Importing SSL Certificate" msgstr "正在导入 SSL 证书" @@ -406,7 +388,7 @@ msgstr "SHA256 指纹: " #. Error popup -#: src/lib/registration/connect_helpers.rb:71 +#: src/lib/registration/connect_helpers.rb:72 msgid "" "Network is not configured, the registration server cannot be reached.\n" "Do you want to configure the network now?" @@ -414,22 +396,22 @@ "未配置网络，无法访问注册服务器。\n" "您想要现在配置网络吗？" -#: src/lib/registration/connect_helpers.rb:77 +#: src/lib/registration/connect_helpers.rb:78 msgid "Network error, check the network configuration." msgstr "网络错误，请检查网络配置。" #. Error popup -#: src/lib/registration/connect_helpers.rb:82 +#: src/lib/registration/connect_helpers.rb:83 msgid "Connection time out." msgstr "连接超时。" #. TRANSLATORS: additional hint for an error message -#: src/lib/registration/connect_helpers.rb:90 +#: src/lib/registration/connect_helpers.rb:91 msgid "Check that this system is known to the registration server." msgstr "检查本系统是否已在注册服务器上注册。" #. TRANSLATORS: additional hint for an error message -#: src/lib/registration/connect_helpers.rb:96 +#: src/lib/registration/connect_helpers.rb:97 msgid "" "If you are upgrading from SLE11 make sure the SCC server\n" "knows the old NCC registration. Synchronization from NCC to SCC\n" @@ -447,19 +429,23 @@ "登入后只需等待几分钟，即可重试进行升级。" #. add the hint to the error details +#. update the message when an old SMT server is found #. Error popup -#: src/lib/registration/connect_helpers.rb:110 -#: src/lib/registration/connect_helpers.rb:113 +#. update the message when an old SMT server is found +#: src/lib/registration/connect_helpers.rb:111 +#: src/lib/registration/connect_helpers.rb:116 #: src/lib/registration/connect_helpers.rb:119 -#: src/lib/registration/connect_helpers.rb:167 +#: src/lib/registration/connect_helpers.rb:125 +#: src/lib/registration/connect_helpers.rb:175 +#: src/lib/registration/connect_helpers.rb:178 msgid "Registration failed." msgstr "注册失败。" -#: src/lib/registration/connect_helpers.rb:115 +#: src/lib/registration/connect_helpers.rb:121 msgid "Registration client error." msgstr "注册客户端错误。" -#: src/lib/registration/connect_helpers.rb:117 +#: src/lib/registration/connect_helpers.rb:123 msgid "" "Registration server error.\n" "Retry registration later." @@ -468,46 +454,73 @@ "请稍候重新注册。" #. error message -#: src/lib/registration/connect_helpers.rb:158 +#: src/lib/registration/connect_helpers.rb:164 msgid "Received SSL Certificate does not match the expected certificate." msgstr "收到的 SSL 证书不匹配期望的证书。" #. %s are error details -#: src/lib/registration/connect_helpers.rb:184 +#: src/lib/registration/connect_helpers.rb:195 msgid "Details: %s" msgstr "细节：%s" #. progress label -#: src/lib/registration/connect_helpers.rb:209 +#: src/lib/registration/connect_helpers.rb:220 msgid "Importing the SSL certificate" msgstr "导入 SSL 证书" -#: src/lib/registration/connect_helpers.rb:210 +#: src/lib/registration/connect_helpers.rb:221 msgid "Importing '%s' certificate..." msgstr "正在导入 '%s' 证书..." #. try to use a translatable message first, if not found then use #. the original error message from openSSL -#: src/lib/registration/connect_helpers.rb:228 +#: src/lib/registration/connect_helpers.rb:241 msgid "Secure connection error: %s" msgstr "安全连接错误：%s" +#. TRANSLATORS: error message, %s is a server URL, +#. e.g. https://smt.example.com +#: src/lib/registration/connect_helpers.rb:260 +msgid "" +"An old registration server was detected at\n" +"%s.\n" +"Make sure the latest product supporting the new registration\n" +"protocol is installed at the server." +msgstr "" + #. progress step title -#: src/lib/registration/finish_dialog.rb:34 +#: src/lib/registration/finish_dialog.rb:35 msgid "Storing Registration Configuration..." msgstr "正在存储注册配置..." -#. this is just a placeholder for texts which will/might be needed after the text freeze -#. TODO FIXME: remove this file before GM! -#: src/lib/registration/new_messages.rb:8 -msgid "SSL Certificate" -msgstr "SSL 证书" +#. register the system and the base product +#. @return [Array<Boolean, SUSE::Connect::Remote::Service>] array with two +#. items: boolean (true on success), remote service (or nil) +#. TODO FIXME: split to two separate parts +#. TODO FIXME: reused an existing message due to text freeze +#. (later use a better text, it's system update actually...) +#: src/lib/registration/registration_ui.rb:62 +#: src/lib/registration/registration_ui.rb:95 +msgid "Registering the System..." +msgstr "正在注册系统..." -#. checkbox: use SLP discovery later again in the installed system -#: src/lib/registration/new_messages.rb:10 -msgid "Use SLP Discovery Also Later in Installed System" -msgstr "稍后在安装好的系统上也使用 SLP 发现" +#. updating base product registration, %s is a new base product name +#. updating registered addon/extension, %s is an extension name +#: src/lib/registration/registration_ui.rb:121 +#: src/lib/registration/registration_ui.rb:146 +msgid "Updating to %s ..." +msgstr "正在更新到 %s ..." +#. load available addons from SCC server +#. the result is cached to avoid reloading when going back and forth in the +#. installation workflow +#. @return [Array<Registration::Addon>] available addons +#. create a new dialog for accepting and importing a SSL certificate and run it +#: src/lib/registration/registration_ui.rb:174 +#: src/lib/registration/ui/autoyast_config_workflow.rb:101 +msgid "Loading Available Extensions and Modules..." +msgstr "正在加载可用扩展和模块..." + #. indent size used in summary text #: src/lib/registration/ssl_certificate_details.rb:35 msgid "Certificate:" @@ -516,33 +529,33 @@ #. create UI label for a base product #. @param [Hash] Product (hash from pkg-bindings) #. @return [String] UI Label -#: src/lib/registration/sw_mgmt.rb:119 +#: src/lib/registration/sw_mgmt.rb:120 msgid "Unknown product" msgstr "未知产品" #. error message -#: src/lib/registration/sw_mgmt.rb:152 +#: src/lib/registration/sw_mgmt.rb:153 msgid "Saving repository configuration failed." msgstr "保存软件源配置失败。" #. # error message #. error message -#: src/lib/registration/sw_mgmt.rb:190 src/lib/registration/sw_mgmt.rb:201 +#: src/lib/registration/sw_mgmt.rb:191 src/lib/registration/sw_mgmt.rb:202 msgid "Updating service '%s' failed." msgstr "更新服务 '%s' 失败。" #. error message -#: src/lib/registration/sw_mgmt.rb:196 +#: src/lib/registration/sw_mgmt.rb:197 msgid "Adding service '%s' failed." msgstr "添加服务 '%s' 失败。" #. error message -#: src/lib/registration/sw_mgmt.rb:208 +#: src/lib/registration/sw_mgmt.rb:209 msgid "Saving service '%s' failed." msgstr "保存服务 '%s' 失败。" #. error message -#: src/lib/registration/sw_mgmt.rb:213 +#: src/lib/registration/sw_mgmt.rb:214 msgid "Refreshing service '%s' failed." msgstr "刷新服务 '%s' 失败。" @@ -555,10 +568,10 @@ msgid "Downloading Licenses..." msgstr "正在下载许可证..." -#. ask user to accept an addon EULA -#. @param addon [SUSE::Connect::Product] the addon -#. @return [Symbol] :accepted, :back, :abort, :halt -#: src/lib/registration/ui/addon_eula_dialog.rb:73 +#. download the addon EULAs to a temp dir +#. @param [SUSE::Connect::Product] addon the addon +#. @param [String] tmpdir target where to download the files +#: src/lib/registration/ui/addon_eula_dialog.rb:72 msgid "Downloading License Agreement..." msgstr "正在下载许可协议..." @@ -574,7 +587,7 @@ "的许可证失败。" #. %s is an extension name, e.g. "SUSE Linux Enterprise Software Development Kit" -#: src/lib/registration/ui/addon_eula_dialog.rb:94 +#: src/lib/registration/ui/addon_eula_dialog.rb:100 msgid "%s License Agreement" msgstr "%s 许可协议" @@ -604,46 +617,46 @@ msgstr[0] "请将注册码输入到下面字段。" #. dialog title -#: src/lib/registration/ui/addon_selection_dialog.rb:39 +#: src/lib/registration/ui/addon_selection_dialog.rb:44 msgid "Extension and Module Selection" msgstr "扩展和模块选择" #. help text (1/3) -#: src/lib/registration/ui/addon_selection_dialog.rb:42 +#: src/lib/registration/ui/addon_selection_dialog.rb:47 msgid "<p>Here you can select available extensions and modules for yoursystem.</p>" msgstr "<p>在此您可为您的系统选择可用扩展和模块。</p>" #. help text (2/3) -#: src/lib/registration/ui/addon_selection_dialog.rb:45 +#: src/lib/registration/ui/addon_selection_dialog.rb:50 msgid "<p>Please note, that some extensions or modules might need specific registration code.</p>" msgstr "<p>请注意，某些扩展或模块可能需要指定的注册码。</p>" #. help text (3/3) -#: src/lib/registration/ui/addon_selection_dialog.rb:48 +#: src/lib/registration/ui/addon_selection_dialog.rb:53 msgid "<p>If you want to remove any extension or module you need to loginto the SUSE Customer Center and remove them manually there.</p>" msgstr "<p>若您想要移除扩展或模块，您需要登入 SUSE 客服中心并在那里手动移除它们。</p>" #. always enable Back/Next, the dialog cannot be the first in workflow -#: src/lib/registration/ui/addon_selection_dialog.rb:67 +#: src/lib/registration/ui/addon_selection_dialog.rb:72 msgid "Available Extensions and Modules" msgstr "可用扩展和模块" -#: src/lib/registration/ui/addon_selection_dialog.rb:69 +#: src/lib/registration/ui/addon_selection_dialog.rb:74 msgid "Details" msgstr "细节" -#: src/lib/registration/ui/addon_selection_dialog.rb:72 +#: src/lib/registration/ui/addon_selection_dialog.rb:77 msgid "Select an extension or a module to show details here" msgstr "选择一个扩展或模块并在此显示其细节" #. checkbox label for an unavailable extension #. (%s is an extension name) -#: src/lib/registration/ui/addon_selection_dialog.rb:131 +#: src/lib/registration/ui/addon_selection_dialog.rb:136 msgid "%s (not available)" msgstr "%s (不可用)" #. check the addons requiring a reg. code -#: src/lib/registration/ui/addon_selection_dialog.rb:212 +#: src/lib/registration/ui/addon_selection_dialog.rb:217 msgid "YaST allows to select at most %s extensions or modules." msgstr "YaST 允许选择最多 %s 个扩展或模块。" @@ -784,54 +797,60 @@ msgstr "证书链中自签名的证书" #. push button -#: src/lib/registration/ui/import_certificate_dialog.rb:90 +#: src/lib/registration/ui/import_certificate_dialog.rb:73 msgid "&Trust and Import" msgstr "信任和导入(&T)" #. help text (RichText) for importing a SSL certificate (1/5) -#: src/lib/registration/ui/import_certificate_dialog.rb:118 +#: src/lib/registration/ui/import_certificate_dialog.rb:119 msgid "<p>Secure connection (HTTPS) uses SSL certificates for verifying the authenticity of the server and for encrypting the transferred data.</p>" msgstr "<p>安全连接 (HTTPS) 使用 SSL 证书来校验服务器的权威性和加密所传输的数据。</p>" #. help text (RichText) for importing a SSL certificate (2/5) -#: src/lib/registration/ui/import_certificate_dialog.rb:122 +#: src/lib/registration/ui/import_certificate_dialog.rb:123 msgid "<p>You can choose to import the certificate it into the list of known certificate autohorities (CA), meaning that you trust the subject and the issuer of the unknown certificate.</p>" msgstr "<p>您可以选择导入该证书到已知证书签发机构 (CA) 列表中，这意味着您信任该未知证书的主体和签发人。</p>" #. help text (RichText) for importing a SSL certificate (3/5) -#: src/lib/registration/ui/import_certificate_dialog.rb:127 +#: src/lib/registration/ui/import_certificate_dialog.rb:128 msgid "<p>Importing a certificate will allow to use for example a self-signed certificate.</p>" msgstr "<p>导入证书将允许使用例如自签名的证书。</p>" #. help text (RichText) for importing a SSL certificate (4/5) -#: src/lib/registration/ui/import_certificate_dialog.rb:131 +#: src/lib/registration/ui/import_certificate_dialog.rb:132 msgid "<p><b>Important:</b> You should verify the fingerprint of the certificate to be sure you import the genuine certificate from the requested server.</p>" msgstr "<p><b>重要：</b>您应该校验该证书的指纹来确保您从所请求的服务器导入了真正的证书。</p>" #. help text (RichText) for importing a SSL certificate (5/5) -#: src/lib/registration/ui/import_certificate_dialog.rb:136 +#: src/lib/registration/ui/import_certificate_dialog.rb:137 msgid "<p><b>Importing an unknown certificate without verification is a big security risk.</b></p>" msgstr "<p><b>未校验即导入一个未知证书是一个巨大的安全风险。</b></p>" #. error message, the entered URL is not valid -#: src/lib/registration/ui/local_server_dialog.rb:51 +#: src/lib/registration/ui/local_server_dialog.rb:60 msgid "Invalid URL." msgstr "无效 URL。" #. input field label -#: src/lib/registration/ui/local_server_dialog.rb:78 +#: src/lib/registration/ui/local_server_dialog.rb:97 msgid "&Local Registration Server URL" msgstr "本地注册服务器 URL(&L)" -#. return the boot command line parameter -#: src/lib/registration/url_helpers.rb:205 +#. ignore SUSE manager registration servers (bnc#894470) +#: src/lib/registration/url_helpers.rb:213 msgid "Searching..." msgstr "搜索中..." -#: src/lib/registration/url_helpers.rb:205 +#: src/lib/registration/url_helpers.rb:213 msgid "Looking up local registration servers..." msgstr "正在查找本地注册服务器..." +#~ msgid "SSL Certificate" +#~ msgstr "SSL 证书" + +#~ msgid "Use SLP Discovery Also Later in Installed System" +#~ msgstr "稍后在安装好的系统上也使用 SLP 发现" + #~ msgid "Contacting the SUSE Customer Center server" #~ msgstr "正在联络 SUSE 客服中心服务器" Modified: trunk/yast/zh_CN/po/s390.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/s390.zh_CN.po 2014-10-29 15:59:29 UTC (rev 90431) +++ trunk/yast/zh_CN/po/s390.zh_CN.po 2014-10-29 16:00:17 UTC (rev 90432) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2014-10-29 16:21+0100\n" "PO-Revision-Date: 2014-06-10 11:46+0800\n" "Last-Translator: 玛格丽特 · 苏 <marguerite@opensuse.org>\n" "Language-Team: Chinese Simplified <opensuse-zh@opensuse.org>\n" @@ -144,46 +144,46 @@ msgid "Set Format Off" msgstr "关闭格式化" +#. integer field (count of disks formatted parallel) +#: src/include/s390/dasd/dialogs.rb:201 +msgid "&Parallel Formatted Disks" +msgstr "并行格式化的磁盘(&P)" + #. error popup message #. error popup message #. error popup message -#: src/include/s390/dasd/dialogs.rb:200 src/include/s390/dasd/dialogs.rb:677 +#: src/include/s390/dasd/dialogs.rb:225 src/include/s390/dasd/dialogs.rb:687 #: src/include/s390/zfcp/dialogs.rb:471 msgid "No disk selected." msgstr "未选择磁盘。" #. 8 means disk is not formatted #. unformtted disk, manual (not AutoYaS) -#: src/include/s390/dasd/dialogs.rb:229 src/modules/DASDController.rb:161 +#: src/include/s390/dasd/dialogs.rb:254 src/modules/DASDController.rb:161 msgid "Device %1 is not formatted. Format device now?" msgstr "设备 %1 未格式化。现在格式化设备吗？" -#: src/include/s390/dasd/dialogs.rb:231 src/modules/DASDController.rb:163 +#: src/include/s390/dasd/dialogs.rb:256 src/modules/DASDController.rb:163 msgid "There are %1 unformatted devices. Format them now?" msgstr "有 %1 个未格式化设备。现在格式化它们吗？" #. for autoinst, format unformatted disks later -#: src/include/s390/dasd/dialogs.rb:242 +#: src/include/s390/dasd/dialogs.rb:267 msgid "Couldn't find device for channel %1." msgstr "无法为频道 %1 找到设备。" #. error report, %1 is device identification -#: src/include/s390/dasd/dialogs.rb:294 +#: src/include/s390/dasd/dialogs.rb:321 msgid "Disk %1 is not active." msgstr "磁盘 %1 不是活动的。" #. error report, %1 is device identification -#: src/include/s390/dasd/dialogs.rb:300 +#: src/include/s390/dasd/dialogs.rb:327 msgid "Disk %1 is not accessible for writing." msgstr "磁盘 %1 不可写入。" -#. integer field (count of disks formatted at parallely) -#: src/include/s390/dasd/dialogs.rb:318 -msgid "&Parallel Formatted Disks" -msgstr "并行格式化的磁盘(&P)" - #. popup question -#: src/include/s390/dasd/dialogs.rb:343 +#: src/include/s390/dasd/dialogs.rb:353 msgid "" "Formatting these disks destroys all data on them.<br>\n" "Really format the following disks?<br>\n" @@ -194,7 +194,7 @@ "%1" #. Dialog caption -#: src/include/s390/dasd/dialogs.rb:406 +#: src/include/s390/dasd/dialogs.rb:416 msgid "DASD Disk Management" msgstr "可直接访问存储设备 (DASD) 磁盘管理" @@ -202,111 +202,111 @@ #. table header #. table header #. table header -#: src/include/s390/dasd/dialogs.rb:413 src/include/s390/dasd/dialogs.rb:422 +#: src/include/s390/dasd/dialogs.rb:423 src/include/s390/dasd/dialogs.rb:432 #: src/include/s390/zfcp/dialogs.rb:120 src/include/s390/zfcp/dialogs.rb:129 msgid "Channel ID" msgstr "通道 ID" #. table header -#: src/include/s390/dasd/dialogs.rb:415 +#: src/include/s390/dasd/dialogs.rb:425 msgid "Format" msgstr "格式化" #. table header #. table header -#: src/include/s390/dasd/dialogs.rb:417 src/include/s390/dasd/dialogs.rb:430 +#: src/include/s390/dasd/dialogs.rb:427 src/include/s390/dasd/dialogs.rb:440 msgid "Use DIAG" msgstr "使用诊断 (DIAG)" #. table header #. table header -#: src/include/s390/dasd/dialogs.rb:424 src/include/s390/zfcp/dialogs.rb:135 +#: src/include/s390/dasd/dialogs.rb:434 src/include/s390/zfcp/dialogs.rb:135 msgid "Device" msgstr "设备" #. table header #. table header -#: src/include/s390/dasd/dialogs.rb:426 +#: src/include/s390/dasd/dialogs.rb:436 #: src/include/s390/iucvterminal-server/ui.rb:242 msgid "Type" msgstr "类型" #. table header -#: src/include/s390/dasd/dialogs.rb:428 +#: src/include/s390/dasd/dialogs.rb:438 msgid "Access Type" msgstr "访问类型" #. table header -#: src/include/s390/dasd/dialogs.rb:432 +#: src/include/s390/dasd/dialogs.rb:442 msgid "Formatted" msgstr "已格式化" #. table header -#: src/include/s390/dasd/dialogs.rb:434 +#: src/include/s390/dasd/dialogs.rb:444 msgid "Partition Information" msgstr "分区信息" #. text entry #. text entry -#: src/include/s390/dasd/dialogs.rb:445 src/include/s390/zfcp/dialogs.rb:146 +#: src/include/s390/dasd/dialogs.rb:455 src/include/s390/zfcp/dialogs.rb:146 msgid "Mi&nimum Channel ID" msgstr "最小通道 ID(&N)" #. text entry #. text entry -#: src/include/s390/dasd/dialogs.rb:452 src/include/s390/zfcp/dialogs.rb:153 +#: src/include/s390/dasd/dialogs.rb:462 src/include/s390/zfcp/dialogs.rb:153 msgid "Ma&ximum Channel ID" msgstr "最大通道 ID(&X)" #. push button #. push button -#: src/include/s390/dasd/dialogs.rb:458 src/include/s390/zfcp/dialogs.rb:159 +#: src/include/s390/dasd/dialogs.rb:468 src/include/s390/zfcp/dialogs.rb:159 msgid "&Filter" msgstr "过滤器(&F)" #. menu button #. menu button -#: src/include/s390/dasd/dialogs.rb:468 src/include/s390/dasd/dialogs.rb:475 +#: src/include/s390/dasd/dialogs.rb:478 src/include/s390/dasd/dialogs.rb:485 msgid "Perform &Action" msgstr "执行动作(&A)" -#: src/include/s390/dasd/dialogs.rb:471 +#: src/include/s390/dasd/dialogs.rb:481 msgid "&Select All" msgstr "全部选中(&S)" -#: src/include/s390/dasd/dialogs.rb:472 +#: src/include/s390/dasd/dialogs.rb:482 msgid "&Deselect All" msgstr "全部反选(&D)" #. error popup #. error popup -#: src/include/s390/dasd/dialogs.rb:543 src/include/s390/zfcp/dialogs.rb:221 +#: src/include/s390/dasd/dialogs.rb:553 src/include/s390/zfcp/dialogs.rb:221 msgid "Invalid filter channel IDs." msgstr "无效的过滤器通道 ID。" #. Dialog caption -#: src/include/s390/dasd/dialogs.rb:587 +#: src/include/s390/dasd/dialogs.rb:597 msgid "Add New DASD Disk" msgstr "添加新的可直接访问存储设备 (DASD) 磁盘" #. text entry #. combo box -#: src/include/s390/dasd/dialogs.rb:598 src/include/s390/zfcp/dialogs.rb:301 +#: src/include/s390/dasd/dialogs.rb:608 src/include/s390/zfcp/dialogs.rb:301 msgid "&Channel ID" msgstr "通道 ID(&C)" #. check box -#: src/include/s390/dasd/dialogs.rb:602 +#: src/include/s390/dasd/dialogs.rb:612 msgid "Format the Disk" msgstr "格式化磁盘" #. check box -#: src/include/s390/dasd/dialogs.rb:605 +#: src/include/s390/dasd/dialogs.rb:615 msgid "Use &DIAG" msgstr "使用诊断 (&DIAG)" #. yes-no popup -#: src/include/s390/dasd/dialogs.rb:627 +#: src/include/s390/dasd/dialogs.rb:637 msgid "" "Really leave the DASD disk configuration without saving?\n" "All changes will be lost." @@ -318,14 +318,14 @@ #. error popup #. error popup #. error popup -#: src/include/s390/dasd/dialogs.rb:638 src/include/s390/zfcp/dialogs.rb:347 +#: src/include/s390/dasd/dialogs.rb:648 src/include/s390/zfcp/dialogs.rb:347 #: src/include/s390/zfcp/dialogs.rb:364 src/include/s390/zfcp/dialogs.rb:400 msgid "Not a valid channel ID." msgstr "不是一个有效的通道 ID。" #. error popup #. error popup -#: src/include/s390/dasd/dialogs.rb:648 src/include/s390/zfcp/dialogs.rb:428 +#: src/include/s390/dasd/dialogs.rb:658 src/include/s390/zfcp/dialogs.rb:428 msgid "Device already exists." msgstr "设备已存在。" @@ -1305,23 +1305,23 @@ #. Create a textual summary and a list of configured devices #. @return summary of the current configuration -#: src/modules/DASDController.rb:318 +#: src/modules/DASDController.rb:334 msgid "Channel ID: %1, Format: %2, DIAG: %3" msgstr "通道 ID：%1，格式：%2，诊断 (DIAG)：%3" -#: src/modules/DASDController.rb:331 +#: src/modules/DASDController.rb:347 msgid "Channel ID: %1, Device: %2, DIAG: %3" msgstr "通道 ID：%1，设备：%2，诊断 (DIAG)：%3" #. popup label -#: src/modules/DASDController.rb:366 +#: src/modules/DASDController.rb:382 msgid "Reading Configured DASD Disks" msgstr "正在读取已配置的可直接访问存储设备 (DASD) 磁盘" #. error report, %1 is device identification #. error report, %1 is device identification #. error report, %1 is device identification -#: src/modules/DASDController.rb:457 src/modules/ZFCPController.rb:422 +#: src/modules/DASDController.rb:473 src/modules/ZFCPController.rb:422 #: src/modules/ZFCPController.rb:516 msgid "%1: sysfs not mounted." msgstr "%1：sysfs 未挂载。" @@ -1329,65 +1329,65 @@ #. error report, %1 is device identification #. error report, %1 is device identification #. error report, %1 is device identification -#: src/modules/DASDController.rb:465 src/modules/ZFCPController.rb:430 +#: src/modules/DASDController.rb:481 src/modules/ZFCPController.rb:430 #: src/modules/ZFCPController.rb:524 msgid "%1: Invalid status for <online>." msgstr "%1：无效的<在线>状态。" #. error report, %1 is device identification #. error report, %1 is device identification -#: src/modules/DASDController.rb:473 src/modules/ZFCPController.rb:438 +#: src/modules/DASDController.rb:489 src/modules/ZFCPController.rb:438 msgid "%1: No device found for <ccwid>." msgstr "%1：未找到 <ccwid> 设备。" #. error report, %1 is device identification -#: src/modules/DASDController.rb:481 +#: src/modules/DASDController.rb:497 msgid "%1: Could not change state of the device." msgstr "%1：无法修改设备状态。" #. error report, %1 is device identification -#: src/modules/DASDController.rb:490 +#: src/modules/DASDController.rb:506 msgid "%1: Device is not a DASD." msgstr "%1：设备不是可直接访问存储设备 (DASD)。" #. error report, %1 is device identification -#: src/modules/DASDController.rb:499 +#: src/modules/DASDController.rb:515 msgid "%1: Could not load module." msgstr "%1：无法挂载模块。" #. error report, %1 is device identification -#: src/modules/DASDController.rb:508 +#: src/modules/DASDController.rb:524 msgid "%1: Failed to activate DASD." msgstr "%1：激活可直接访问存储设备 (DASD) 失败。" #. error report, %1 is device identification -#: src/modules/DASDController.rb:517 +#: src/modules/DASDController.rb:533 msgid "%1: DASD is not formatted." msgstr "%1：可直接访问存储设备 (DASD) 未格式化。" #. error report, %1 is device identification, %2 is integer code #. error report, %1 is device identification, %2 is integer code #. error report, %1 is device identification, %2 is integer code -#: src/modules/DASDController.rb:525 src/modules/ZFCPController.rb:494 +#: src/modules/DASDController.rb:541 src/modules/ZFCPController.rb:494 #: src/modules/ZFCPController.rb:564 msgid "%1: Unknown error %2." msgstr "%1：未知错误 %2。" #. progress bar -#: src/modules/DASDController.rb:638 +#: src/modules/DASDController.rb:654 msgid "Formatting %1:" msgstr "正在格式化 %1：" #. error report, %1 is exit code of the command (integer) #. error report, %1 is exit code of the command (integer) -#: src/modules/DASDController.rb:667 src/modules/DASDController.rb:764 +#: src/modules/DASDController.rb:683 src/modules/DASDController.rb:780 msgid "Disks formatting failed. Exit code: %1." msgstr "磁盘格式化失败。退出代码：%1。" #. progress bar, %1 is device name, %2 and %3 #. integers, #. eg. Formatting /dev/dasda: cylinder 123 of 12334 done -#: src/modules/DASDController.rb:735 +#: src/modules/DASDController.rb:751 msgid "Formatting %1: cylinder %2 of %3 done" msgstr "正在格式化 %1：柱面 %2 已完成共 %3" Modified: trunk/yast/zh_CN/po/samba-server.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/samba-server.zh_CN.po 2014-10-29 15:59:29 UTC (rev 90431) +++ trunk/yast/zh_CN/po/samba-server.zh_CN.po 2014-10-29 16:00:17 UTC (rev 90432) @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: Samba Server\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2014-10-29 16:21+0100\n" "PO-Revision-Date: 2014-06-18 19:43+0800\n" "Last-Translator: 玛格丽特 · 苏 <marguerite@opensuse.org>\n" "Language-Team: Chinese Simplified <opensuse-zh@opensuse.org>\n" @@ -730,10 +730,6 @@ msgid "Start-&Up" msgstr "启动(&U)" -#: src/include/samba-server/dialogs.rb:1250 -msgid "Firewall Settings" -msgstr "防火墙设置" - #: src/include/samba-server/dialogs.rb:1259 msgid "&Shares" msgstr "共享(&S)" @@ -1574,187 +1570,190 @@ msgstr "域成员服务器" #. Samba-server read dialog caption -#: src/modules/SambaServer.pm:120 +#: src/modules/SambaServer.pm:138 msgid "Initializing Samba Server Configuration" msgstr "正在初始化 Samba 服务器配置" #. translators: progress stage -#: src/modules/SambaServer.pm:125 +#: src/modules/SambaServer.pm:143 msgid "Read global Samba settings" msgstr "读取全局 Samba 设置" #. translators: progress stage -#: src/modules/SambaServer.pm:127 +#: src/modules/SambaServer.pm:145 msgid "Read Samba secrets" msgstr "读取 Samba 机密" #. translators: progress stage -#: src/modules/SambaServer.pm:129 +#: src/modules/SambaServer.pm:147 msgid "Read Samba service settings" msgstr "读取 Samba 服务设置" #. translators: progress stage -#: src/modules/SambaServer.pm:131 +#: src/modules/SambaServer.pm:149 msgid "Read Samba accounts" msgstr "读取 Samba 帐户" #. translators: progress stage -#: src/modules/SambaServer.pm:133 +#: src/modules/SambaServer.pm:151 msgid "Read the back-end settings" msgstr "读取后端设置" #. translators: progress stage -#: src/modules/SambaServer.pm:135 +#: src/modules/SambaServer.pm:153 msgid "Read the firewall settings" msgstr "读取防火墙设置" #. translators: progress stage -#: src/modules/SambaServer.pm:137 +#: src/modules/SambaServer.pm:155 msgid "Read Samba service role settings" msgstr "读取 Samba 服务角色设置" #. translators: progress step -#: src/modules/SambaServer.pm:140 +#: src/modules/SambaServer.pm:158 msgid "Reading global Samba settings..." msgstr "正在读取全局 Samba 设置..." #. translators: progress step -#: src/modules/SambaServer.pm:142 +#: src/modules/SambaServer.pm:160 msgid "Reading Samba secrets..." msgstr "正在读取 Samba 机密..." #. translators: progress step -#: src/modules/SambaServer.pm:144 +#: src/modules/SambaServer.pm:162 msgid "Reading Samba service settings..." msgstr "正在读取 Samba 服务设置..." #. translators: progress step -#: src/modules/SambaServer.pm:146 +#: src/modules/SambaServer.pm:164 msgid "Reading Samba accounts..." msgstr "正在读取 Samba 帐户..." #. translators: progress step -#: src/modules/SambaServer.pm:148 +#: src/modules/SambaServer.pm:166 msgid "Reading the back-end settings..." msgstr "正在读取后端设置..." #. translators: progress step -#: src/modules/SambaServer.pm:150 +#: src/modules/SambaServer.pm:168 msgid "Reading the firewall settings..." msgstr "正在读取防火墙设置..." #. translators: progress stage -#: src/modules/SambaServer.pm:152 +#: src/modules/SambaServer.pm:170 msgid "Reading Samba service role settings..." msgstr "正在读取 Samba 服务角色设置..." #. translators: progress finished #. translators: write progress step -#: src/modules/SambaServer.pm:154 src/modules/SambaServer.pm:264 +#: src/modules/SambaServer.pm:172 src/modules/SambaServer.pm:285 msgid "Finished" msgstr "已完成" #. Samba-server read dialog caption -#: src/modules/SambaServer.pm:234 +#: src/modules/SambaServer.pm:255 msgid "Saving Samba Server Configuration" msgstr "正在保存 Samba 服务器配置" #. translators: write progress stage -#: src/modules/SambaServer.pm:239 +#: src/modules/SambaServer.pm:260 msgid "Write global settings" msgstr "写入全局设置" #. translators: write progress stage -#: src/modules/SambaServer.pm:241 +#: src/modules/SambaServer.pm:262 msgid "Disable Samba services" msgstr "禁用 Samba 服务" #. translators: write progress stage -#: src/modules/SambaServer.pm:243 +#: src/modules/SambaServer.pm:264 msgid "Enable Samba services" msgstr "启用 Samba 服务" #. translators: write progress stage -#: src/modules/SambaServer.pm:245 +#: src/modules/SambaServer.pm:266 msgid "Write back-end settings" msgstr "写入后端设置" #. translators: write progress stage -#: src/modules/SambaServer.pm:247 +#: src/modules/SambaServer.pm:268 msgid "Write Samba accounts" msgstr "写入 Samba 帐户" #. translators: write progress stage -#: src/modules/SambaServer.pm:249 +#: src/modules/SambaServer.pm:270 msgid "Save firewall settings" msgstr "保存防火墙设置" #. translators: write progress step -#: src/modules/SambaServer.pm:252 +#: src/modules/SambaServer.pm:273 msgid "Writing global settings..." msgstr "正在写入全局设置..." #. translators: write progress step -#: src/modules/SambaServer.pm:254 +#: src/modules/SambaServer.pm:275 msgid "Disabling Samba services..." msgstr "正在禁用 Samba 服务..." #. translators: write progress step -#: src/modules/SambaServer.pm:256 +#: src/modules/SambaServer.pm:277 msgid "Enabling Samba services..." msgstr "正在启用 Samba 服务..." #. translators: write progress step -#: src/modules/SambaServer.pm:258 +#: src/modules/SambaServer.pm:279 msgid "Writing back-end settings..." msgstr "正在写入后端设置..." #. translators: write progress step -#: src/modules/SambaServer.pm:260 +#: src/modules/SambaServer.pm:281 msgid "Writing Samba accounts..." msgstr "正在写入 Samba 帐户..." #. translators: write progress step -#: src/modules/SambaServer.pm:262 +#: src/modules/SambaServer.pm:283 msgid "Saving firewall settings..." msgstr "正在保存防火墙设置..." #. /etc/samba/smb.conf is filename -#: src/modules/SambaServer.pm:288 +#: src/modules/SambaServer.pm:309 msgid "Cannot write settings to /etc/samba/smb.conf." msgstr "无法将设置写入到 /etc/samba/smb.conf。" #. summary item: configured workgroup/domain -#: src/modules/SambaServer.pm:385 +#: src/modules/SambaServer.pm:406 msgid "Global Configuration:" msgstr "全局配置：" -#: src/modules/SambaServer.pm:387 +#: src/modules/SambaServer.pm:408 #, perl-format msgid "Workgroup or Domain: %s" msgstr "工作组或域：%s" #. summary item: selected role for the samba server -#: src/modules/SambaServer.pm:391 +#: src/modules/SambaServer.pm:412 #, perl-format msgid "Role: %s" msgstr "角色：%s" #. summary item: status of the samba service -#: src/modules/SambaServer.pm:394 +#: src/modules/SambaServer.pm:415 msgid "Samba server is disabled" msgstr "Samba 服务器已禁用" #. summary heading: configured shares -#: src/modules/SambaServer.pm:398 +#: src/modules/SambaServer.pm:419 msgid "Share Configuration:" msgstr "共享配置：" #. summary item: no configured shares -#: src/modules/SambaServer.pm:404 +#: src/modules/SambaServer.pm:425 msgid "None" msgstr "无" +#~ msgid "Firewall Settings" +#~ msgstr "防火墙设置" + #~ msgid "Snapper Support" #~ msgstr "Snapper 支持" Modified: trunk/yast/zh_CN/po/security.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/security.zh_CN.po 2014-10-29 15:59:29 UTC (rev 90431) +++ trunk/yast/zh_CN/po/security.zh_CN.po 2014-10-29 16:00:17 UTC (rev 90432) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: security\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2014-10-29 16:21+0100\n" "PO-Revision-Date: 2013-02-01 00:31+0800\n" "Last-Translator: \n" "Language-Team: Chinese Simplified <opensuse-zh@opensuse.org>\n" @@ -225,109 +225,110 @@ #. table header #. table header -#: src/include/security/dialogs.rb:186 src/include/security/dialogs.rb:476 +#: src/include/security/dialogs.rb:186 src/include/security/dialogs.rb:470 msgid "Security Setting" msgstr "安全设置" -#: src/include/security/dialogs.rb:187 src/include/security/dialogs.rb:477 +#: src/include/security/dialogs.rb:187 src/include/security/dialogs.rb:471 msgid "Status" msgstr "状态" -#: src/include/security/dialogs.rb:188 src/include/security/dialogs.rb:478 +#: src/include/security/dialogs.rb:188 src/include/security/dialogs.rb:472 msgid "Security Status" msgstr "安全状态" #. add one line for each security setting -#: src/include/security/dialogs.rb:356 +#: src/include/security/dialogs.rb:348 msgid "Help" msgstr "帮助" #. this is a separator between service names #. e.g.: "postfix" + " or " + "sendmail" -#: src/include/security/dialogs.rb:402 +#: src/include/security/dialogs.rb:395 msgid " or " msgstr " 或 " #. richtext message: %1 = runlevel ("3" or "5"), %2 = list of services -#: src/include/security/dialogs.rb:411 +#: src/include/security/dialogs.rb:404 msgid "<P>These basic system services are not enabled in runlevel %1:<BR><B>%2</B></P>" msgstr "<P>这些基础系统服务没有在运行级别 %1 中启用：<BR><B>%2</B></P>" -#: src/include/security/dialogs.rb:419 +#: src/include/security/dialogs.rb:412 msgid "<P>All basic services are enabled.</P>" msgstr "<P>所有基础服务都已经启用。</P>" -#: src/include/security/dialogs.rb:431 +#. TODO: runlevel is not longer needed (read above) +#: src/include/security/dialogs.rb:425 msgid "<P>These extra services are enabled in runlevel %1:<BR><B>%2</B></P>" msgstr "<P>在运行级别 %1 中启用了这些额外的服务：<BR><B>%2</B></P>" -#: src/include/security/dialogs.rb:440 +#: src/include/security/dialogs.rb:434 msgid "<P>Check the list of services and disable all unused services.</P>" msgstr "<P>检查服务列表并禁用所有没有使用的服务。</P>" -#: src/include/security/dialogs.rb:447 +#: src/include/security/dialogs.rb:441 msgid "<P>Only basic system services are enabled.</P>" msgstr "<P>仅启用了基础系统服务。</P>" -#: src/include/security/dialogs.rb:454 +#: src/include/security/dialogs.rb:448 msgid "Description" msgstr "描述" #. Overview dialog caption #. params: input tree, parent, label, id -#: src/include/security/dialogs.rb:466 src/include/security/wizards.rb:49 +#: src/include/security/dialogs.rb:460 src/include/security/wizards.rb:49 msgid "Security Overview" msgstr "安全概览" #. push button label -#: src/include/security/dialogs.rb:491 +#: src/include/security/dialogs.rb:485 msgid "Change &Status" msgstr "变更状态 (&S)" #. push button label -#: src/include/security/dialogs.rb:494 +#: src/include/security/dialogs.rb:488 msgid "&Description" msgstr "描述 (&D)" #. Boot dialog caption -#: src/include/security/dialogs.rb:640 src/include/security/wizards.rb:57 +#: src/include/security/dialogs.rb:634 src/include/security/wizards.rb:57 msgid "Boot Settings" msgstr "引导设置" #. Frame label -#: src/include/security/dialogs.rb:652 +#: src/include/security/dialogs.rb:646 msgid "Boot Permissions" msgstr "引导权限" #. Misc dialog caption -#: src/include/security/dialogs.rb:729 src/include/security/wizards.rb:60 +#: src/include/security/dialogs.rb:723 src/include/security/wizards.rb:60 msgid "Miscellaneous Settings" msgstr "杂项设置" #. Password dialog caption -#: src/include/security/dialogs.rb:815 src/include/security/wizards.rb:56 +#: src/include/security/dialogs.rb:803 src/include/security/wizards.rb:56 msgid "Password Settings" msgstr "密码设置" #. Frame label -#: src/include/security/dialogs.rb:824 +#: src/include/security/dialogs.rb:812 msgid "Checks" msgstr "检查" #. Frame label -#: src/include/security/dialogs.rb:839 +#: src/include/security/dialogs.rb:827 msgid "Password Age" msgstr "密码有效期" #. Popup text -#: src/include/security/dialogs.rb:917 +#: src/include/security/dialogs.rb:905 msgid "" "The minimum number of days cannot be larger\n" "than the maximum." msgstr "最小天数不能大于最大天数。" #. Popup text, %1 is number -#: src/include/security/dialogs.rb:934 +#: src/include/security/dialogs.rb:922 msgid "" "The minimum password length cannot be larger than the maximum.\n" "The maximum password length for the selected encryption method is %1." @@ -336,12 +337,12 @@ "所选加密方法的最大密码长度是 %1。" #. Login dialog caption -#: src/include/security/dialogs.rb:966 src/include/security/wizards.rb:58 +#: src/include/security/dialogs.rb:954 src/include/security/wizards.rb:58 msgid "Login Settings" msgstr "登录设置" #. Frame label -#: src/include/security/dialogs.rb:975 +#: src/include/security/dialogs.rb:963 msgid "Login" msgstr "登录" @@ -971,155 +972,145 @@ #. CheckBox label #: src/include/security/widgets.rb:116 -msgid "&Current Directory in root's Path" -msgstr "root 用户路径中的当前目录 (&C)" - -#. CheckBox label -#: src/include/security/widgets.rb:122 -msgid "Curr&ent Directory in Path of Regular Users" -msgstr "普通用户路径中的当前目录 (&E)" - -#. CheckBox label -#: src/include/security/widgets.rb:130 msgid "Allow Remote &Graphical Login" msgstr "允许远程图形登录 (&G)" #. CheckBox label -#: src/include/security/widgets.rb:136 +#: src/include/security/widgets.rb:122 msgid "&Magic SysRq Keys" msgstr "Magic SysRq 键 (&M)" #. ComboBox value -#: src/include/security/widgets.rb:139 +#: src/include/security/widgets.rb:125 msgid "Disable" msgstr "禁用" #. ComboBox value -#: src/include/security/widgets.rb:141 +#: src/include/security/widgets.rb:127 msgid "Enable All Functions" msgstr "启用所有功能" #. IntField label -#: src/include/security/widgets.rb:148 +#: src/include/security/widgets.rb:134 msgid "&Delay after Incorrect Login Attempt" msgstr "不正确登录尝试后的延迟 (&D)" #. IntField label #. IntField label -#: src/include/security/widgets.rb:156 src/include/security/widgets.rb:223 +#: src/include/security/widgets.rb:142 src/include/security/widgets.rb:209 msgid "Maxim&um" msgstr "最大值 (&U)" #. IntField label #. IntField label -#: src/include/security/widgets.rb:162 src/include/security/widgets.rb:236 +#: src/include/security/widgets.rb:148 src/include/security/widgets.rb:222 msgid "M&inimum" msgstr "最小值 (&I)" #. ComboBox label -#: src/include/security/widgets.rb:168 +#: src/include/security/widgets.rb:154 msgid "&Shutdown Behaviour of KDM Login Manager:" msgstr "KDM 登录管理器的关机行为 (&S)：" #. ComboBox value -#: src/include/security/widgets.rb:173 +#: src/include/security/widgets.rb:159 msgid "Only root" msgstr "仅 root 用户" #. ComboBox value -#: src/include/security/widgets.rb:175 +#: src/include/security/widgets.rb:161 msgid "All Users" msgstr "所有用户" #. ComboBox value -#: src/include/security/widgets.rb:177 +#: src/include/security/widgets.rb:163 msgid "Nobody" msgstr "没有人" #. ComboBox value #. ["local",_("Local Users")], #. ComboBox value -#: src/include/security/widgets.rb:181 +#: src/include/security/widgets.rb:167 msgid "Automatic" msgstr "自动" #. ComboBox label -#: src/include/security/widgets.rb:188 +#: src/include/security/widgets.rb:174 msgid "System Hybernation" msgstr "系统休眠" #. ComboBox value -#: src/include/security/widgets.rb:191 +#: src/include/security/widgets.rb:177 msgid "User on the active console" msgstr "活动控制台的用户" #. ComboBox value -#: src/include/security/widgets.rb:193 +#: src/include/security/widgets.rb:179 msgid "Anyone can hibernate" msgstr "任何人都可以休眠" #. ComboBox value -#: src/include/security/widgets.rb:195 +#: src/include/security/widgets.rb:181 msgid "Authentication always required" msgstr "总是需要认证" #. ComboBox label -#: src/include/security/widgets.rb:202 +#: src/include/security/widgets.rb:188 msgid "P&assword Encryption Method" msgstr "密码加密方法 (&A)" #. CheckBox label -#: src/include/security/widgets.rb:216 +#: src/include/security/widgets.rb:202 msgid "&Check New Passwords" msgstr "检查新密码 (&C)" #. IntField label -#: src/include/security/widgets.rb:229 +#: src/include/security/widgets.rb:215 msgid "Numb&er of Passwords to Remember" msgstr "要记忆的密码的数目 (&E)" #. IntField label -#: src/include/security/widgets.rb:242 +#: src/include/security/widgets.rb:228 msgid "&Minimum Acceptable Password Length" msgstr "最小可接受密码长度 (&M)" #. IntField label -#: src/include/security/widgets.rb:250 +#: src/include/security/widgets.rb:236 msgid "&Days before Password Expires Warning" msgstr "提前发出密码失效警告的天数 (&D)" #. ComboBox label -#: src/include/security/widgets.rb:258 +#: src/include/security/widgets.rb:244 msgid "&File Permissions" msgstr "文件权限 (&F)" #. ComboBox value -#: src/include/security/widgets.rb:261 +#: src/include/security/widgets.rb:247 msgid "Easy" msgstr "简单" #. ComboBox value -#: src/include/security/widgets.rb:263 +#: src/include/security/widgets.rb:249 msgid "Secure" msgstr "安全" #. ComboBox value -#: src/include/security/widgets.rb:265 +#: src/include/security/widgets.rb:251 msgid "Paranoid" msgstr "极致" #. ComboBox label -#: src/include/security/widgets.rb:272 +#: src/include/security/widgets.rb:258 msgid "&User Launching updatedb" msgstr "启动 updatedb 的用户 (&U)" #. IntField label -#: src/include/security/widgets.rb:279 +#: src/include/security/widgets.rb:265 msgid "Ma&ximum" msgstr "最大值 (&X)" #. IntField label -#: src/include/security/widgets.rb:285 +#: src/include/security/widgets.rb:271 msgid "&Minimum" msgstr "最小值 (&M)" @@ -1138,65 +1129,71 @@ msgstr "正在初始化..." #. Security read dialog caption -#: src/modules/Security.rb:640 +#: src/modules/Security.rb:608 msgid "Saving Security Configuration" msgstr "正在保存安全配置" #. Progress stage 1/4 -#: src/modules/Security.rb:649 +#: src/modules/Security.rb:617 msgid "Write security settings" msgstr "写入安全设置" #. Progress stage 2/4 -#: src/modules/Security.rb:651 +#: src/modules/Security.rb:619 msgid "Write inittab settings" msgstr "写入 inittab 设置" #. Progress stage 3/4 -#: src/modules/Security.rb:653 +#: src/modules/Security.rb:621 msgid "Write PAM settings" msgstr "写入 PAM 设置" #. Progress stage 4/4 -#: src/modules/Security.rb:655 +#: src/modules/Security.rb:623 msgid "Update system settings" msgstr "更新系统设置" #. Progress step 1/5 -#: src/modules/Security.rb:659 +#: src/modules/Security.rb:627 msgid "Writing security settings..." msgstr "正在写入安全设置..." #. Progress step 2/5 -#: src/modules/Security.rb:661 +#: src/modules/Security.rb:629 msgid "Writing inittab settings..." msgstr "正在写入 inittab 设置..." #. Progress step 3/5 -#: src/modules/Security.rb:663 +#: src/modules/Security.rb:631 msgid "Writing PAM settings..." msgstr "正在写入 PAM 设置..." #. Progress step 4/5 -#: src/modules/Security.rb:665 +#: src/modules/Security.rb:633 msgid "Updating system settings..." msgstr "正在更新系统设置..." #. Progress step 5/5 -#: src/modules/Security.rb:667 +#: src/modules/Security.rb:635 msgid "Finished" msgstr "已完成" #. Summary text -#: src/modules/Security.rb:901 +#: src/modules/Security.rb:869 msgid "Current Security Level: Custom settings" msgstr "当前安全级别：自定义设置" #. Summary text -#: src/modules/Security.rb:905 +#: src/modules/Security.rb:873 msgid "Current Security Level: %1" msgstr "当前安全级别：%1" +#~ msgid "&Current Directory in root's Path" +#~ msgstr "root 用户路径中的当前目录 (&C)" + +#~ msgid "Curr&ent Directory in Path of Regular Users" +#~ msgstr "普通用户路径中的当前目录 (&E)" + #~ msgid "Use current directory in root's path" #~ msgstr "在 root 用户的路径中使用当前文件夹" Modified: trunk/yast/zh_CN/po/services-manager.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/services-manager.zh_CN.po 2014-10-29 15:59:29 UTC (rev 90431) +++ trunk/yast/zh_CN/po/services-manager.zh_CN.po 2014-10-29 16:00:17 UTC (rev 90432) @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: opensuse-i 18n\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-18 16:19+0200\n" +"POT-Creation-Date: 2014-10-29 16:21+0100\n" "PO-Revision-Date: 2014-08-23 02:16+0800\n" "Last-Translator: 玛格丽特 · 苏 <marguerite@opensuse.org>\n" "Language-Team: Chinese Simplified <kde-i18n-doc@kde.org>\n" @@ -14,186 +14,7 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" -#: src/clients/default_target_finish.rb:33 -msgid "Saving default systemd target..." -msgstr "正在保存默认 systemd 对象..." - -#: src/clients/default_target_proposal.rb:26 -msgid "VNC needs graphical system to be available" -msgstr "VNC 需要可用的图形系统" - #. TODO implement behaviour if force_reset parameter provided -#: src/clients/default_target_proposal.rb:51 -msgid "&Default systemd target" -msgstr "默认 systemd 对象(&D)" - -#: src/clients/default_target_proposal.rb:52 -msgid "Default systemd target" -msgstr "默认 systemd 对象" - -#. create the proposal dialog and get the sequence symbol from block -#: src/clients/default_target_proposal.rb:116 -msgid "Set Default Systemd Target" -msgstr "设置默认 Systemd 对象" - -#: src/clients/default_target_proposal.rb:134 -msgid "Selecting the Default Systemd Target" -msgstr "选择默认 Systemd 对象" - -#: src/clients/default_target_proposal.rb:136 -msgid "Systemd is a system and service manager for Linux. It consists of units whose job is to activate services and other units." -msgstr "Systemd 是一个 Linux 的系统和服务管理器。它由单元 (unit) 组成，单元的任务是激活服务和其它单元。" - -#: src/clients/default_target_proposal.rb:139 -msgid "Default target unit is activated on boot by default. Usually it is a symlink located in path/etc/systemd/system/default.target . See more on systemd man page." -msgstr "默认对象单元在引导时是默认激活的。通常它是一个位于 path/etc/systemd/system/default.target 的系统链接。更多请参考 systemd 手册页。" - -#: src/clients/default_target_proposal.rb:143 -msgid "Multi-User target is for setting up a non-graphical multi-user system with network suitable for server (similar to runlevel 3)." -msgstr "多用户对象用于设置非图形多用户系统和适合服务器的网络 (与运行级别 3 相似)。" - -#: src/clients/default_target_proposal.rb:146 -msgid "Graphical target for setting up a graphical login screen with network which is typical for workstations (similar to runlevel 5)." -msgstr "图形对象用于设置图形登录屏幕和工作站典型网络 (与运行级别 5 相似)。" - -#: src/clients/default_target_proposal.rb:149 -msgid "When you are not sure what would be the best option for you then go with graphical target." -msgstr "当您不确定何种选项于您最佳时请使用图形对象。" - -#: src/clients/default_target_proposal.rb:160 -msgid "Available Targets" -msgstr "可用对象" - -#. Check if the user forced a particular target before; if he did and the -#. autodetection recommends a different one now, warn the user about this -#. and keep the default target unchanged. -#: src/clients/default_target_proposal.rb:219 -msgid "The installer is recommending you the default target '%s' " -msgstr "安装器为您推荐了默认对象 '%s'" - -#: src/clients/default_target_proposal.rb:231 -msgid "X11 packages have been selected for installation" -msgstr "已选择安装 X11 软件包" - -#: src/clients/default_target_proposal.rb:234 -msgid "Live Installation is typically used for full GUI in target system" -msgstr "Live 安装典型地用于在目标系统上全图形界面安装" - -#: src/clients/default_target_proposal.rb:237 -msgid "Serial connection does typically not support GUI" -msgstr "串口连接典型地不支持图形界面" - -#: src/clients/default_target_proposal.rb:241 -msgid "Text mode installation assumes no GUI on the target system" -msgstr "文本模式安装假设目标系统上没有图形界面" - -#: src/clients/default_target_proposal.rb:244 -#: src/clients/default_target_proposal.rb:248 -msgid "Using VNC assumes a GUI on the target system" -msgstr "使用 VNC 就假设了目标系统上有图形界面" - -#: src/clients/default_target_proposal.rb:251 -msgid "SSH installation mode assumes no GUI on the target system" -msgstr "SSH 安装模式假设目标系统上没有图形界面" - -#: src/clients/default_target_proposal.rb:254 -msgid "X11 packages have not been selected for installation" -msgstr "未选择安装 X11 软件包" - -#: src/clients/default_target_proposal.rb:257 -msgid "This recommendation is based on the analysis of other installation settings" -msgstr "此推荐设置基于对其它安装设置的分析" - -#. Default for double-click in the table -#. Default for double-click in the table -#: src/clients/services-manager.rb:71 src/clients/services.rb:71 -msgid "Writing configuration..." -msgstr "正在写入配置..." - -#: src/clients/services-manager.rb:76 src/clients/services.rb:76 -msgid "Writing the configuration failed:\n" -msgstr "写入配置失败：\n" - -#. Fills the dialog contents -#. Fills the dialog contents -#: src/clients/services-manager.rb:91 src/clients/services.rb:91 -msgid "Default System &Target" -msgstr "默认系统对象(&T)" - -#: src/clients/services-manager.rb:99 src/clients/services.rb:99 -msgid "Service" -msgstr "服务" - -#: src/clients/services-manager.rb:100 src/clients/services-manager.rb:130 -#: src/clients/services-manager.rb:146 src/clients/services.rb:100 -#: src/clients/services.rb:130 src/clients/services.rb:146 -#: src/data/services-manager/autoyast_summary.erb:16 -msgid "Enabled" -msgstr "已启用" - -#. The current state matches the futural state -#. The current state matches the futural state -#: src/clients/services-manager.rb:101 src/clients/services-manager.rb:131 -#: src/clients/services-manager.rb:156 src/clients/services.rb:101 -#: src/clients/services.rb:131 src/clients/services.rb:156 -msgid "Active" -msgstr "活动" - -#: src/clients/services-manager.rb:102 src/clients/services.rb:102 -msgid "Description" -msgstr "描述" - -#: src/clients/services-manager.rb:107 src/clients/services.rb:107 -msgid "&Start/Stop" -msgstr "启动/停止(&S)" - -#: src/clients/services-manager.rb:109 src/clients/services.rb:109 -msgid "&Enable/Disable" -msgstr "启用/禁用(&E)" - -#: src/clients/services-manager.rb:111 src/clients/services.rb:111 -msgid "Show &Details" -msgstr "显示细节(&D)" - -#: src/clients/services-manager.rb:114 src/clients/services.rb:114 -#: src/data/services-manager/autoyast_summary.erb:5 -msgid "Services Manager" -msgstr "服务管理器" - -#. Redraws the services dialog -#. Redraws the services dialog -#: src/clients/services-manager.rb:126 src/clients/services.rb:126 -msgid "Reading services status..." -msgstr "正在读取服务状态..." - -#: src/clients/services-manager.rb:130 src/clients/services-manager.rb:146 -#: src/clients/services.rb:130 src/clients/services.rb:146 -#: src/data/services-manager/autoyast_summary.erb:23 -msgid "Disabled" -msgstr "已禁用" - -#: src/clients/services-manager.rb:131 src/clients/services-manager.rb:156 -#: src/clients/services.rb:131 src/clients/services.rb:156 -msgid "Inactive" -msgstr "非活动" - -#. The current state differs the the futural state -#. The current state differs the the futural state -#: src/clients/services-manager.rb:163 src/clients/services.rb:163 -msgid "Active (will start)" -msgstr "活动 (将启动之)" - -#: src/clients/services-manager.rb:163 src/clients/services.rb:163 -msgid "Inactive (will stop)" -msgstr "非活动 (将停止之)" - -#. Opens up a popup with details about the currently selected service -#. Opens up a popup with details about the currently selected service -#: src/clients/services-manager.rb:190 src/clients/services.rb:190 -msgid "Service %{service} Full Info" -msgstr "服务 %{service} 完整信息" - -#. TODO implement behaviour if force_reset parameter provided #: src/clients/services_proposal.rb:52 msgid "&Services" msgstr "服务(&S)" @@ -247,65 +68,165 @@ msgid "Cannot enable service %1" msgstr "无法启用服务 %1" +#: src/data/services-manager/autoyast_summary.erb:5 +msgid "Services Manager" +msgstr "服务管理器" + #: src/data/services-manager/autoyast_summary.erb:6 msgid "Default Target" msgstr "默认对象" +#: src/data/services-manager/autoyast_summary.erb:16 +msgid "Enabled" +msgstr "已启用" + +#: src/data/services-manager/autoyast_summary.erb:23 +msgid "Disabled" +msgstr "已禁用" + #. Name of the systemd default target unit. Suffix '.target' is optional. #. @return [String] if the target has been specified in the profile. Can be nil. #: src/lib/services-manager/services_manager_profile.rb:104 msgid "Unknown autoyast services profile schema for 'services-manager'" msgstr "未知的用于 'services-manager' 的 autoyast 服务方案样板" -#. AutoYast summary -#: src/modules/services_manager.rb:29 -msgid "Not configured yet." -msgstr "尚未配置。" +#~ msgid "Saving default systemd target..." +#~ msgstr "正在保存默认 systemd 对象..." -#. Do not start or stop services that are already in the desired state -#. they might be coming from AutoYast import and thus they are :modified. -#: src/modules/services_manager_service.rb:407 -msgid "Could not %{change} %{service} which is currently %{status}. " -msgstr "无法 %{change} %{service}，其当前处于 %{status} 状态。" +#~ msgid "VNC needs graphical system to be available" +#~ msgstr "VNC 需要可用的图形系统" -#: src/modules/services_manager_service.rb:426 -msgid "Could not %{change} %{service}. " -msgstr "无法 %{change} %{service}。" +#~ msgid "&Default systemd target" +#~ msgstr "默认 systemd 对象(&D)" -#. Default systemd target (previously: runlevel 5) option #1 -#: src/modules/services_manager_target.rb:22 -msgid "Graphical mode" -msgstr "图形模式" +#~ msgid "Default systemd target" +#~ msgstr "默认 systemd 对象" -#. Default systemd target (previously: runlevel 3) option #2 -#: src/modules/services_manager_target.rb:24 -msgid "Text mode" -msgstr "文本模式" +#~ msgid "Set Default Systemd Target" +#~ msgstr "设置默认 Systemd 对象" -#. Systemd targets -#: src/modules/services_manager_target.rb:27 -msgid "Graphical Interface" -msgstr "图形界面" +#~ msgid "Selecting the Default Systemd Target" +#~ msgstr "选择默认 Systemd 对象" -#: src/modules/services_manager_target.rb:28 -msgid "Emergency Mode" -msgstr "紧急模式" +#~ msgid "Systemd is a system and service manager for Linux. It consists of units whose job is to activate services and other units." +#~ msgstr "Systemd 是一个 Linux 的系统和服务管理器。它由单元 (unit) 组成，单元的任务是激活服务和其它单元。" -#: src/modules/services_manager_target.rb:29 -msgid "Switch Root" -msgstr "切换 Root" +#~ msgid "Default target unit is activated on boot by default. Usually it is a symlink located in path/etc/systemd/system/default.target . See more on systemd man page." +#~ msgstr "默认对象单元在引导时是默认激活的。通常它是一个位于 path/etc/systemd/system/default.target 的系统链接。更多请参考 systemd 手册页。" -#: src/modules/services_manager_target.rb:30 -msgid "Initrd Default Target" -msgstr "Initrd 默认对象" +#~ msgid "Multi-User target is for setting up a non-graphical multi-user system with network suitable for server (similar to runlevel 3)." +#~ msgstr "多用户对象用于设置非图形多用户系统和适合服务器的网络 (与运行级别 3 相似)。" -#: src/modules/services_manager_target.rb:31 -msgid "Multi-User System" -msgstr "多用户系统" +#~ msgid "Graphical target for setting up a graphical login screen with network which is typical for workstations (similar to runlevel 5)." +#~ msgstr "图形对象用于设置图形登录屏幕和工作站典型网络 (与运行级别 5 相似)。" -#: src/modules/services_manager_target.rb:32 -msgid "Rescue Mode" -msgstr "救援模式" +#~ msgid "When you are not sure what would be the best option for you then go with graphical target." +#~ msgstr "当您不确定何种选项于您最佳时请使用图形对象。" +#~ msgid "Available Targets" +#~ msgstr "可用对象" + +#~ msgid "The installer is recommending you the default target '%s' " +#~ msgstr "安装器为您推荐了默认对象 '%s'" + +#~ msgid "X11 packages have been selected for installation" +#~ msgstr "已选择安装 X11 软件包" + +#~ msgid "Live Installation is typically used for full GUI in target system" +#~ msgstr "Live 安装典型地用于在目标系统上全图形界面安装" + +#~ msgid "Serial connection does typically not support GUI" +#~ msgstr "串口连接典型地不支持图形界面" + +#~ msgid "Text mode installation assumes no GUI on the target system" +#~ msgstr "文本模式安装假设目标系统上没有图形界面" + +#~ msgid "Using VNC assumes a GUI on the target system" +#~ msgstr "使用 VNC 就假设了目标系统上有图形界面" + +#~ msgid "SSH installation mode assumes no GUI on the target system" +#~ msgstr "SSH 安装模式假设目标系统上没有图形界面" + +#~ msgid "X11 packages have not been selected for installation" +#~ msgstr "未选择安装 X11 软件包" + +#~ msgid "This recommendation is based on the analysis of other installation settings" +#~ msgstr "此推荐设置基于对其它安装设置的分析" + +#~ msgid "Writing configuration..." +#~ msgstr "正在写入配置..." + +#~ msgid "Writing the configuration failed:\n" +#~ msgstr "写入配置失败：\n" + +#~ msgid "Default System &Target" +#~ msgstr "默认系统对象(&T)" + +#~ msgid "Service" +#~ msgstr "服务" + +#~ msgid "Active" +#~ msgstr "活动" + +#~ msgid "Description" +#~ msgstr "描述" + +#~ msgid "&Start/Stop" +#~ msgstr "启动/停止(&S)" + +#~ msgid "&Enable/Disable" +#~ msgstr "启用/禁用(&E)" + +#~ msgid "Show &Details" +#~ msgstr "显示细节(&D)" + +#~ msgid "Reading services status..." +#~ msgstr "正在读取服务状态..." + +#~ msgid "Inactive" +#~ msgstr "非活动" + +#~ msgid "Active (will start)" +#~ msgstr "活动 (将启动之)" + +#~ msgid "Inactive (will stop)" +#~ msgstr "非活动 (将停止之)" + +#~ msgid "Service %{service} Full Info" +#~ msgstr "服务 %{service} 完整信息" + +#~ msgid "Not configured yet." +#~ msgstr "尚未配置。" + +#~ msgid "Could not %{change} %{service} which is currently %{status}. " +#~ msgstr "无法 %{change} %{service}，其当前处于 %{status} 状态。" + +#~ msgid "Could not %{change} %{service}. " +#~ msgstr "无法 %{change} %{service}。" + +#~ msgid "Graphical mode" +#~ msgstr "图形模式" + +#~ msgid "Text mode" +#~ msgstr "文本模式" + +#~ msgid "Graphical Interface" +#~ msgstr "图形界面" + +#~ msgid "Emergency Mode" +#~ msgstr "紧急模式" + +#~ msgid "Switch Root" +#~ msgstr "切换 Root" + +#~ msgid "Initrd Default Target" +#~ msgstr "Initrd 默认对象" + +#~ msgid "Multi-User System" +#~ msgstr "多用户系统" + +#~ msgid "Rescue Mode" +#~ msgstr "救援模式" + #~ msgid "Enabled Services" #~ msgstr "已启用服务" Modified: trunk/yast/zh_CN/po/storage.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/storage.zh_CN.po 2014-10-29 15:59:29 UTC (rev 90431) +++ trunk/yast/zh_CN/po/storage.zh_CN.po 2014-10-29 16:00:17 UTC (rev 90432) @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: storage\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-29 18:07+0200\n" +"POT-Creation-Date: 2014-10-29 16:21+0100\n" "PO-Revision-Date: 2014-08-01 02:14+0800\n" "Last-Translator: 玛格丽特 · 苏 <marguerite@opensuse.org>\n" "Language-Team: Chinese Simplified <kde-i18n-doc@kde.org>\n" @@ -1504,6 +1504,13 @@ msgstr "卷标(&L)" #. label text +#: src/include/partitioning/custom_part_dialogs.rb:516 +#, fuzzy +#| msgid "UUID" +msgid "&UUID" +msgstr "UUID" + +#. label text #: src/include/partitioning/custom_part_dialogs.rb:526 msgid "Device &ID" msgstr "设备 &ID" @@ -1693,28 +1700,8 @@ "推荐备份您的数据。\n" "现在就收缩该文件系统吗？" -#. popup text -#: src/include/partitioning/custom_part_dialogs.rb:1410 -msgid "No unsaved changes exist." -msgstr "没有未保存的修改。" - -#. label text -#: src/include/partitioning/custom_part_dialogs.rb:1417 -msgid "Changes:" -msgstr "修改：" - -#. popup text -#: src/include/partitioning/custom_part_dialogs.rb:1429 -msgid " Do you really want to execute these changes?" -msgstr "您真的想要进行这些修改哇？" - -#. button text -#: src/include/partitioning/custom_part_dialogs.rb:1435 -msgid "&Apply" -msgstr "应用(&A)" - #. popup text, %1 is replaced by device name -#: src/include/partitioning/custom_part_dialogs.rb:1495 +#: src/include/partitioning/custom_part_dialogs.rb:1441 msgid "" "The selected device contains partitions that are currently mounted:\n" "%1\n" @@ -1727,7 +1714,7 @@ "除非您完全明白您在做什么，否则请选择\"取消\"。\n" #. popup text, Do not translate LVM. -#: src/include/partitioning/custom_part_dialogs.rb:1518 +#: src/include/partitioning/custom_part_dialogs.rb:1464 msgid "" "\n" "The selected device contains at least one LVM partition\n" @@ -1740,7 +1727,7 @@ "删除该设备前请先从相关卷组中移除全部位于它上面的分区。\n" #. popup text, Do not translate RAID. -#: src/include/partitioning/custom_part_dialogs.rb:1529 +#: src/include/partitioning/custom_part_dialogs.rb:1475 msgid "" "\n" "The selected device contains at least one partition\n" @@ -1753,7 +1740,7 @@ "删除该设备前请先从相关 RAID 系统中取消指派位于它上面的分区。\n" #. popup text -#: src/include/partitioning/custom_part_dialogs.rb:1540 +#: src/include/partitioning/custom_part_dialogs.rb:1486 msgid "" "\n" "The selected device contains at least one partition\n" @@ -1765,55 +1752,55 @@ "删除该设备前请先删除使用它的卷。\n" #. help text, richtext format -#: src/include/partitioning/custom_part_dialogs.rb:1601 +#: src/include/partitioning/custom_part_dialogs.rb:1547 msgid "<p>Create and remove subvolumes from a Btrfs filesystem.</p>\n" msgstr "<p>在 Btrfs 文件系统中创建和移除子卷。</p>\n" -#: src/include/partitioning/custom_part_dialogs.rb:1606 +#: src/include/partitioning/custom_part_dialogs.rb:1552 msgid "<p>Enable automatic snapshots for a Btrfs filesystem with snapper.</p>" msgstr "<p>启用 snapper 对 Btrfs 文件系统的自动快照。</p>" #. label text -#: src/include/partitioning/custom_part_dialogs.rb:1620 +#: src/include/partitioning/custom_part_dialogs.rb:1566 msgid "Existing Subvolumes:" msgstr "现有子卷：" #. label text -#: src/include/partitioning/custom_part_dialogs.rb:1626 +#: src/include/partitioning/custom_part_dialogs.rb:1572 msgid "New Subvolume" msgstr "新子卷" #. button text -#: src/include/partitioning/custom_part_dialogs.rb:1632 +#: src/include/partitioning/custom_part_dialogs.rb:1578 msgid "Add new" msgstr "添加新子卷" #. button text #. push button text -#: src/include/partitioning/custom_part_dialogs.rb:1638 +#: src/include/partitioning/custom_part_dialogs.rb:1584 #: src/modules/DualMultiSelectionBox.rb:147 msgid "Remove" msgstr "移除" #. TRANSLATOR: checkbox text #. TRANSLATORS: checkbox text -#: src/include/partitioning/custom_part_dialogs.rb:1650 +#: src/include/partitioning/custom_part_dialogs.rb:1596 #: src/modules/StorageProposal.rb:6211 msgid "Enable Snapshots" msgstr "启用快照" #. heading text #. button text -#: src/include/partitioning/custom_part_dialogs.rb:1661 +#: src/include/partitioning/custom_part_dialogs.rb:1607 #: src/include/partitioning/custom_part_lib.rb:420 msgid "Subvolume Handling" msgstr "子卷处理中" -#: src/include/partitioning/custom_part_dialogs.rb:1724 +#: src/include/partitioning/custom_part_dialogs.rb:1670 msgid "Empty subvolume name not allowed." msgstr "子卷名不允许为空。" -#: src/include/partitioning/custom_part_dialogs.rb:1728 +#: src/include/partitioning/custom_part_dialogs.rb:1674 msgid "" "Only subvolume names starting with \"%1\" currently allowed!\n" "Automatically prepending \"%1\" to name of subvolume." @@ -1821,11 +1808,11 @@ "目前只允许以 \"%1\" 开头的子卷名！\n" "正在自动给子卷名加 \"%1\" 前缀。" -#: src/include/partitioning/custom_part_dialogs.rb:1738 +#: src/include/partitioning/custom_part_dialogs.rb:1684 msgid "Subvolume name %1 already exists." msgstr "子卷名 %1 已存在。" -#: src/include/partitioning/custom_part_dialogs.rb:1767 +#: src/include/partitioning/custom_part_dialogs.rb:1713 msgid "Modifications done so far in this dialog will be lost." msgstr "目前为止在此对话框中所做的修改都将不复存在。" @@ -2163,12 +2150,12 @@ #. ////////////////////////////////////////////// #. modify map new -#: src/include/partitioning/custom_part_lib.rb:954 -#: src/include/partitioning/custom_part_lib.rb:981 +#: src/include/partitioning/custom_part_lib.rb:948 +#: src/include/partitioning/custom_part_lib.rb:975 msgid "The file system is currently mounted on %1." msgstr "文件系统当前挂载在 %1 上。" -#: src/include/partitioning/custom_part_lib.rb:959 +#: src/include/partitioning/custom_part_lib.rb:953 msgid "" "You can try to unmount it now, continue without unmounting or cancel.\n" "Click Cancel unless you know exactly what you are doing." @@ -2178,12 +2165,12 @@ #. button text #. button text -#: src/include/partitioning/custom_part_lib.rb:970 -#: src/include/partitioning/custom_part_lib.rb:995 +#: src/include/partitioning/custom_part_lib.rb:964 +#: src/include/partitioning/custom_part_lib.rb:989 msgid "Unmount" msgstr "卸载" -#: src/include/partitioning/custom_part_lib.rb:986 +#: src/include/partitioning/custom_part_lib.rb:980 msgid "" "You can try to unmount it now or cancel.\n" "Click Cancel unless you know exactly what you are doing." @@ -2191,15 +2178,15 @@ "您可以尝试立即卸载或取消。\n" "除非您知道您在干什么，否则请点击取消。" -#: src/include/partitioning/custom_part_lib.rb:1032 +#: src/include/partitioning/custom_part_lib.rb:1026 msgid "It is not possible to shrink the file system while it is mounted." msgstr "挂载时无法收缩文件系统。" -#: src/include/partitioning/custom_part_lib.rb:1045 +#: src/include/partitioning/custom_part_lib.rb:1039 msgid "It is not possible to extend the file system while it is mounted." msgstr "挂载时无法扩展文件系统。" -#: src/include/partitioning/custom_part_lib.rb:1056 +#: src/include/partitioning/custom_part_lib.rb:1050 msgid "It is not possible to resize the file system while it is mounted." msgstr "挂载时无法调整文件系统。" @@ -3124,7 +3111,7 @@ #. error popup #. TRANSLATORS: error popup -#: src/include/partitioning/ep-hd-lib.rb:51 src/modules/Storage.rb:5164 +#: src/include/partitioning/ep-hd-lib.rb:51 src/modules/Storage.rb:5165 msgid "The disk is in use and cannot be modified." msgstr "磁盘使用中，无法修改。" @@ -5062,12 +5049,12 @@ msgstr "模式文件" #. label text -#: src/modules/FileSystems.rb:276 +#: src/modules/FileSystems.rb:278 msgid "Tmpfs &Size" msgstr "缓存文件系统尺寸(&S)" #. popup text -#: src/modules/FileSystems.rb:285 +#: src/modules/FileSystems.rb:287 msgid "" "Invalid Size specified. Use number followed by K, M, G or %.\n" "Value must be above 100k or between 1% and 200%. Try again." @@ -5075,12 +5062,12 @@ "指派了无效的尺寸。使用数字，以 K，M，G 或 % 结尾。\n" "值必须大于 100k 或介于 1% 和 200% 之间。请重试。" -#: src/modules/FileSystems.rb:288 +#: src/modules/FileSystems.rb:290 msgid "Value must be between 1% and 200%. Try again." msgstr "值须在 1% 和 200% 之间。请重试。" #. help text, richtext format -#: src/modules/FileSystems.rb:295 +#: src/modules/FileSystems.rb:297 msgid "" "<p><b>Tmpfs Size:</b>\n" "Size may be either entered as a number followed by K,M,G for Kilo-, Mega- or Gigabyte or\n" @@ -5091,17 +5078,17 @@ "以百分号结尾，表示内存的百分比。</p>" #. label text -#: src/modules/FileSystems.rb:309 +#: src/modules/FileSystems.rb:311 msgid "Swap &Priority" msgstr "交换优先级(&P)" #. popup text -#: src/modules/FileSystems.rb:317 +#: src/modules/FileSystems.rb:319 msgid "Value must be between 0 and 32767. Try again." msgstr "值须在 0 和 32767 之间。请重试。" #. help text, richtext format -#: src/modules/FileSystems.rb:324 +#: src/modules/FileSystems.rb:326 msgid "" "<p><b>Swap Priority:</b>\n" "Enter the swap priority. Higher numbers mean higher priority.</p>\n" @@ -5110,12 +5097,12 @@ "输入交换优先级。较高的值代表较高优先级。</p>\n" #. button text -#: src/modules/FileSystems.rb:479 +#: src/modules/FileSystems.rb:481 msgid "Mount &Read-Only" msgstr "只读挂载(&R)" #. help text, richtext format -#: src/modules/FileSystems.rb:483 +#: src/modules/FileSystems.rb:485 msgid "" "<p><b>Mount Read-Only:</b>\n" "Writing to the file system is not possible. Default is false. During installation\n" @@ -5126,12 +5113,12 @@ "但安装期间文件系统总是以读写模式挂载的。</p>" #. button text -#: src/modules/FileSystems.rb:495 +#: src/modules/FileSystems.rb:497 msgid "No &Access Time" msgstr "不更新访问时间(&A)" #. help text, richtext format -#: src/modules/FileSystems.rb:499 +#: src/modules/FileSystems.rb:501 msgid "" "<p><b>No Access Time:</b>\n" "Access times are not updated when a file is read. Default is false.</p>\n" @@ -5140,12 +5127,14 @@ "读取文件时不更新访问时间。默认为否。</p>\n" #. button text -#: src/modules/FileSystems.rb:509 -msgid "Mountable by &User" +#: src/modules/FileSystems.rb:511 +#, fuzzy +#| msgid "Mountable by &User" +msgid "Mountable by User" msgstr "可由用户挂载(&U)" #. help text, richtext format -#: src/modules/FileSystems.rb:513 +#: src/modules/FileSystems.rb:515 msgid "" "<p><b>Mountable by User:</b>\n" "The file system may be mounted by an ordinary user. Default is false.</p>\n" @@ -5154,12 +5143,12 @@ "普通用户可挂载文件系统。默认为否。</p>\n" #. button text -#: src/modules/FileSystems.rb:526 +#: src/modules/FileSystems.rb:528 msgid "Do Not Mount at System &Start-up" msgstr "不在系统启动时挂载(&S)" #. help text, richtext format -#: src/modules/FileSystems.rb:532 +#: src/modules/FileSystems.rb:534 msgid "" "<p><b>Do Not Mount at System Start-up:</b>\n" "The file system is not automatically mounted when the system starts.\n" @@ -5175,12 +5164,12 @@ "默认为否。</p>\n" #. button text -#: src/modules/FileSystems.rb:549 +#: src/modules/FileSystems.rb:551 msgid "Enable &Quota Support" msgstr "启用配额支持(&Q)" #. help text, richtext format -#: src/modules/FileSystems.rb:555 +#: src/modules/FileSystems.rb:557 msgid "" "<p><b>Enable Quota Support:</b>\n" "The file system is mounted with user quotas enabled.\n" @@ -5191,12 +5180,12 @@ "默认为关闭。</p>\n" #. label text -#: src/modules/FileSystems.rb:574 +#: src/modules/FileSystems.rb:576 msgid "Data &Journaling Mode" msgstr "数据日志模式(&J)" #. help text, richtext format -#: src/modules/FileSystems.rb:583 +#: src/modules/FileSystems.rb:585 msgid "" "<p><b>Data Journaling Mode:</b>\n" "Specifies the journaling mode for file data.\n" @@ -5215,12 +5204,12 @@ "<tt>回写</tt> -- 不保全数据顺序。不影响性能。</p>\n" #. button text -#: src/modules/FileSystems.rb:604 +#: src/modules/FileSystems.rb:606 msgid "&Access Control Lists (ACL)" msgstr "访问控制列表 (ACL)(&A)" #. help text, richtext format -#: src/modules/FileSystems.rb:608 +#: src/modules/FileSystems.rb:610 msgid "" "<p><b>Access Control Lists (ACL):</b>\n" "Enable access control lists on the file system.</p>\n" @@ -5229,12 +5218,12 @@ "在文件系统上启用访问控制列表。</p>\n" #. button text -#: src/modules/FileSystems.rb:619 +#: src/modules/FileSystems.rb:621 msgid "&Extended User Attributes" msgstr "扩展用户属性(&E)" #. help text, richtext format -#: src/modules/FileSystems.rb:623 +#: src/modules/FileSystems.rb:625 msgid "" "<p><b>Extended User Attributes:</b>\n" "Allow extended user attributes on the file system.</p>\n" @@ -5243,16 +5232,16 @@ "允许在文件系统中使用扩展用户属性。</p>\n" #. label text -#: src/modules/FileSystems.rb:640 +#: src/modules/FileSystems.rb:642 msgid "Arbitrary Option &Value" msgstr "任意选项值(&V)" -#: src/modules/FileSystems.rb:645 +#: src/modules/FileSystems.rb:647 msgid "Invalid characters in arbitrary option value. Do not use spaces or tabs. Try again." msgstr "自由选项值中有无效字符。不要使用空格或 Tab。请重试。" #. help text, richtext format -#: src/modules/FileSystems.rb:649 +#: src/modules/FileSystems.rb:651 msgid "" "<p><b>Arbitrary Option Value:</b>\n" "In this field, type any legal mount option allowed in the fourth field of /etc/fstab.\n" @@ -5263,12 +5252,12 @@ "多个选项用逗号隔开。</p>\n" #. label text -#: src/modules/FileSystems.rb:666 +#: src/modules/FileSystems.rb:668 msgid "Char&set for file names" msgstr "文件名所用字符集(&S)" #. help text, richtext format -#: src/modules/FileSystems.rb:687 +#: src/modules/FileSystems.rb:689 msgid "" "<p><b>Charset for File Names:</b>\n" "Set the charset used for display of file names in Windows partitions.</p>\n" @@ -5277,12 +5266,12 @@ "设置在 Windows 分区中显示文件名所用的字符集。</p>\n" #. label text -#: src/modules/FileSystems.rb:698 +#: src/modules/FileSystems.rb:700 msgid "Code&page for short FAT names" msgstr "文件配置表短名称的代码页(&P)" #. help text, richtext format -#: src/modules/FileSystems.rb:704 +#: src/modules/FileSystems.rb:706 msgid "" "<p><b>Codepage for Short FAT Names:</b>\n" "This codepage is used for converting to shortname characters on FAT file systems.</p>\n" @@ -5291,12 +5280,12 @@ "此代码页用于 FAT 文件系统上的短名称字符转换。</p>\n" #. label text -#: src/modules/FileSystems.rb:718 +#: src/modules/FileSystems.rb:720 msgid "Number of &FATs" msgstr "文件配置表数量(&F)" #. help text, richtext format -#: src/modules/FileSystems.rb:724 +#: src/modules/FileSystems.rb:726 msgid "" "<p><b>Number of FATs:</b>\n" "Specify the number of file allocation tables in the file system. The default is 2.</p>" @@ -5305,12 +5294,12 @@ "指定文件系统中的文件配置表的数量。默认值是 2。</p>" #. label text -#: src/modules/FileSystems.rb:733 +#: src/modules/FileSystems.rb:735 msgid "FAT &Size" msgstr "文件配置表尺寸(&S)" #. help text, richtext format -#: src/modules/FileSystems.rb:744 +#: src/modules/FileSystems.rb:746 msgid "" "<p><b>FAT Size:</b>\n" "Specifies the type of file allocation tables used (12, 16, or 32-bit). If auto is specified, YaST will automatically select the value most suitable for the file system size.</p>\n" @@ -5319,17 +5308,17 @@ "指定所用文件配置表的类型(12 位、16 位或 32 位)。如果指定自动选项，YaST2 将为文件系统尺寸自动选择最适合的值。</p>\n" #. label text -#: src/modules/FileSystems.rb:753 +#: src/modules/FileSystems.rb:755 msgid "Root &Dir Entries" msgstr "根目录项(&D)" #. popup text -#: src/modules/FileSystems.rb:761 +#: src/modules/FileSystems.rb:763 msgid "The minimum size for \"Root Dir Entries\" is 112. Try again." msgstr "\"根目录项\"最小为 112。请重试。" #. help text, richtext format -#: src/modules/FileSystems.rb:765 +#: src/modules/FileSystems.rb:767 msgid "" "<p><b>Root Dir Entries:</b>\n" "Select the number of entries available in the root directory.</p>\n" @@ -5338,12 +5327,12 @@ "选择根目录中可用的项数。</p>\n" #. label text -#: src/modules/FileSystems.rb:778 +#: src/modules/FileSystems.rb:780 msgid "Hash &Function" msgstr "哈希函数(&F)" #. help text, richtext format -#: src/modules/FileSystems.rb:785 +#: src/modules/FileSystems.rb:787 msgid "" "<p><b>Hash Function:</b>\n" "This specifies the name of the hash function to use to sort the file names in directories.</p>\n" @@ -5352,12 +5341,12 @@ "此选项指定对文件夹中的文件名进行排序所用的哈希函数的名称。</p>\n" #. label text -#: src/modules/FileSystems.rb:794 +#: src/modules/FileSystems.rb:796 msgid "FS &Revision" msgstr "文件系统修订版本(&R)" #. help text, richtext format -#: src/modules/FileSystems.rb:801 +#: src/modules/FileSystems.rb:803 msgid "" "<p><b>FS Revision:</b>\n" "This option defines the reiserfs format revision to use. '3.5' is for backwards compatibility with kernels of the 2.2.x series. '3.6' is more recent, but can only be used with kernel versions greater than or equal to 2.4.</p>\n" @@ -5367,12 +5356,12 @@ #. label text #. label text -#: src/modules/FileSystems.rb:814 src/modules/FileSystems.rb:978 +#: src/modules/FileSystems.rb:816 src/modules/FileSystems.rb:980 msgid "Block &Size in Bytes" msgstr "以字节计的块尺寸(&S)" #. help text, richtext format -#: src/modules/FileSystems.rb:821 +#: src/modules/FileSystems.rb:823 msgid "" "<p><b>Block Size:</b>\n" "Specify the size of blocks in bytes. Valid block size values are 512, 1024, 2048 and 4096 bytes per block. If auto is selected, the standard block size of 4096 is used.</p>\n" @@ -5382,13 +5371,13 @@ #. label text #. label text -#: src/modules/FileSystems.rb:830 src/modules/FileSystems.rb:1060 +#: src/modules/FileSystems.rb:832 src/modules/FileSystems.rb:1062 msgid "&Inode Size" msgstr "索引节点 (Inode) 尺寸(&I)" #. help text, richtext format #. help text, richtext format -#: src/modules/FileSystems.rb:836 src/modules/FileSystems.rb:1066 +#: src/modules/FileSystems.rb:838 src/modules/FileSystems.rb:1068 msgid "" "<p><b>Inode Size:</b>\n" "This option specifies the inode size of the file system.</p>\n" @@ -5397,12 +5386,12 @@ "此选项指定文件系统的索引节点尺寸。</p>\n" #. label text -#: src/modules/FileSystems.rb:845 +#: src/modules/FileSystems.rb:847 msgid "&Percentage of Inode Space" msgstr "索引节点空间百分比(&P)" #. help text, richtext format -#: src/modules/FileSystems.rb:873 +#: src/modules/FileSystems.rb:875 msgid "" "<p><b>Percentage of Inode Space:</b>\n" "The option \"Percentage of Inode Space\" specifies the maximum percentage of space in the file system that can be allocated to inodes.</p>\n" @@ -5411,12 +5400,12 @@ "\"索引节点空间百分比\"选项指定文件系统中可分配给索引节点的最大空间百分比。</p>\n" #. label text -#: src/modules/FileSystems.rb:882 +#: src/modules/FileSystems.rb:884 msgid "Inode &Aligned" msgstr "索引节点对齐(&A)" #. help text, richtext format -#: src/modules/FileSystems.rb:888 +#: src/modules/FileSystems.rb:890 msgid "" "<p><b>Inode Aligned:</b>\n" "The option \"Inode Aligned\" is used to specify whether inode allocation is or\n" @@ -5429,12 +5418,12 @@ "通常比未对齐的效率高。</p>\n" #. label text -#: src/modules/FileSystems.rb:918 +#: src/modules/FileSystems.rb:920 msgid "&Log Size in Megabytes" msgstr "以 MB 计的日志尺寸(&L)" #. popup text -#: src/modules/FileSystems.rb:927 +#: src/modules/FileSystems.rb:929 msgid "" "The \"Log Size\" value is incorrect.\n" "Enter a value greater than zero.\n" @@ -5444,7 +5433,7 @@ #. xgettext: no-c-format #. help text, richtext format -#: src/modules/FileSystems.rb:932 +#: src/modules/FileSystems.rb:934 msgid "" "<p><b>Log Size</b>\n" "Set the log size (in megabytes). If auto, the default is 40% of the aggregate size.</p>\n" @@ -5453,17 +5442,17 @@ "设置日志尺寸(以 MB 计)。如果选择自动选项，默认值为总尺寸的 40%。</p>\n" #. label text -#: src/modules/FileSystems.rb:940 +#: src/modules/FileSystems.rb:942 msgid "Invoke Bad Blocks List &Utility" msgstr "调用坏块列表工具(&U)" #. label text -#: src/modules/FileSystems.rb:954 +#: src/modules/FileSystems.rb:956 msgid "Stride &Length in Blocks" msgstr "块中的步幅(&L)" #. popup text -#: src/modules/FileSystems.rb:962 +#: src/modules/FileSystems.rb:964 msgid "" "The \"Stride Length in Blocks\" value is invalid.\n" "Select a value greater than 1.\n" @@ -5472,7 +5461,7 @@ "请选择大于 1 的值。\n" #. help text, richtext format -#: src/modules/FileSystems.rb:966 +#: src/modules/FileSystems.rb:968 msgid "" "<p><b>Stride Length in Blocks:</b>\n" "Set RAID-related options for the file system. Currently, the only supported\n" @@ -5485,7 +5474,7 @@ "作为自己的参数。</p>\n" #. help text, richtext format -#: src/modules/FileSystems.rb:985 +#: src/modules/FileSystems.rb:987 msgid "" "<p><b>Block Size:</b>\n" "Specify the size of blocks in bytes. Valid block size values are 1024, 2048, and 4096 bytes per block. If auto is selected, the block size is determined by the file system size and the expected use of the file system.</p>\n" @@ -5494,12 +5483,12 @@ "指定以字节计的块尺寸。有效的块尺寸值为每个块 1024、2048 和 4096 字节。如果选中自动选项，块尺寸将由文件系统的尺寸和预期使用量来决定。</p>\n" #. label text -#: src/modules/FileSystems.rb:994 +#: src/modules/FileSystems.rb:996 msgid "Bytes per &Inode" msgstr "每索引节点的字节数(&I)" #. help text, richtext format -#: src/modules/FileSystems.rb:1000 +#: src/modules/FileSystems.rb:1002 msgid "" "<p><b>Bytes per Inode:</b> \n" "Specify the bytes to inode ratio. YaST creates an inode for every\n" @@ -5516,12 +5505,12 @@ "因此务必为此参数输入一个合理值。</p>\n" #. label text -#: src/modules/FileSystems.rb:1016 +#: src/modules/FileSystems.rb:1018 msgid "Percentage of Blocks &Reserved for root" msgstr "为 root 保留的块的百分比(&R)" #. popup text -#: src/modules/FileSystems.rb:1026 +#: src/modules/FileSystems.rb:1028 msgid "" "The \"Percentage of Blocks Reserved for root\" value is incorrect.\n" "Allowed are float numbers no larger than 99 (e.g. 0.5).\n" @@ -5531,17 +5520,17 @@ #. xgettext: no-c-format #. help text, richtext format -#: src/modules/FileSystems.rb:1031 +#: src/modules/FileSystems.rb:1033 msgid "<p><b>Percentage of Blocks Reserved for root:</b> Specify the percentage of blocks reserved for the super user. The default is computed so that normally 1 Gig is reserved. Upper limit for reserved default is 5.0, lowest reserved default is 0.1.</p>" msgstr "<p><b>为 root 保留的块的百分比：</b>指定为超级用户保留的块的百分比。该值默认会自动计算，通常保留 1G。默认保留的上限是 5.0, 下限是 0.1。</p>" #. checkbox text -#: src/modules/FileSystems.rb:1040 +#: src/modules/FileSystems.rb:1042 msgid "Disable Regular Checks" msgstr "禁用常规检查" #. help text, richtext format -#: src/modules/FileSystems.rb:1048 +#: src/modules/FileSystems.rb:1050 msgid "" "<p><b>Disable Regular Checks:</b>\n" "Disable regular file system check at booting.</p>\n" @@ -5550,12 +5539,12 @@ "开机时禁用常规文件系统检查。</p>\n" #. label text -#: src/modules/FileSystems.rb:1075 +#: src/modules/FileSystems.rb:1077 msgid "&Directory Index Feature" msgstr "文件夹索引功能(&D)" #. help text, richtext format -#: src/modules/FileSystems.rb:1082 +#: src/modules/FileSystems.rb:1084 msgid "" "<p><b>Directory Index:</b>\n" "Enables use of hashed b-trees to speed up lookups in large directories.</p>\n" @@ -5564,12 +5553,12 @@ "允许使用哈希 b-trees 加速在大文件夹中的查找。</p>\n" #. label text -#: src/modules/FileSystems.rb:1094 +#: src/modules/FileSystems.rb:1096 msgid "&No Journal" msgstr "禁用日志 (&N)" #. help text, richtext format -#: src/modules/FileSystems.rb:1101 +#: src/modules/FileSystems.rb:1103 msgid "" "<p><b>No Journal:</b>\n" "Suppressed use of journaling on filesystem. Only activate this when you really\n" @@ -5797,11 +5786,11 @@ msgstr "多设备独立磁盘冗余阵列 (MD RAID)" #. TRANSLATORS: error popup -#: src/modules/Storage.rb:5176 +#: src/modules/Storage.rb:5177 msgid "Partitions cannot be created since other partitions on the disk are used." msgstr "无法创建分区因为磁盘上的其它分区正在使用中。" -#: src/modules/Storage.rb:5202 +#: src/modules/Storage.rb:5203 msgid "" "\n" "Device %1 cannot be modified because it contains activated swap\n" @@ -5810,7 +5799,7 @@ "\n" "无法修改设备 %1 因为其含有激活的 swap，那是运行安装所需要的。\n" -#: src/modules/Storage.rb:5216 +#: src/modules/Storage.rb:5217 msgid "" "\n" "Device %1 cannot be modified because it contains the installation\n" @@ -5819,7 +5808,7 @@ "\n" "无法修改设备 %1 因为其含有执行安装所需的安装数据。\n" -#: src/modules/Storage.rb:5245 +#: src/modules/Storage.rb:5246 msgid "" "\n" "Device %1 cannot be removed because it contains activated swap\n" @@ -5828,7 +5817,7 @@ "\n" "无法移除设备 %1 因为其含有激活的 swap，那是运行安装所需要的。\n" -#: src/modules/Storage.rb:5254 +#: src/modules/Storage.rb:5255 msgid "" "\n" "Device %1 cannot be removed because it contains the installation\n" @@ -5837,7 +5826,7 @@ "\n" "无法移除设备 %1 因为其含有执行安装所需的安装数据。\n" -#: src/modules/Storage.rb:5283 +#: src/modules/Storage.rb:5284 msgid "" "\n" "Device %1 cannot be removed because this would indirectly change\n" @@ -5847,7 +5836,7 @@ "\n" "无法移除设备 %1 因为这将间接地修改设备 %2，后者含有激活的 swap，那是运行安装所需要的。\n" -#: src/modules/Storage.rb:5294 +#: src/modules/Storage.rb:5295 msgid "" "\n" "Device %1 cannot be removed because this would indirectly change\n" @@ -5857,7 +5846,7 @@ "无法移除设备 %1 因为这将间接地修改设备 %2，后者含有执行安装所需的数据。\n" #. the check for verbose is needed for calls from StorageProposal (see bnc#871779) -#: src/modules/Storage.rb:5316 +#: src/modules/Storage.rb:5317 msgid "" "\n" "Partition %1 cannot be removed since other partitions on the\n" @@ -5867,18 +5856,18 @@ "无法移除分区 %1 因为磁盘 %2 上的其它分区已经被用掉了。\n" #. FIXME: please, add description of the list that is returned by this function. -#: src/modules/Storage.rb:5405 +#: src/modules/Storage.rb:5406 msgid "Nothing assigned as root filesystem!" msgstr "未指派根文件系统！" -#: src/modules/Storage.rb:5406 +#: src/modules/Storage.rb:5407 msgid "Installation will most certainly fail fatally!" msgstr "安装多半肯定会致命失败！" #. Set rather than Add, there might be some packs left over #. from previous 'MakeProposal' we don't need now #. This also covers the case when AddPackagesList returns [] or nil -#: src/modules/Storage.rb:6008 +#: src/modules/Storage.rb:6009 msgid "Adding the following resolvables failed: %1" msgstr "添加以下解析项失败：%1" @@ -6611,6 +6600,18 @@ msgid "Visible Information on Storage Devices:" msgstr "存储设备上的可视信息：" +#~ msgid "No unsaved changes exist." +#~ msgstr "没有未保存的修改。" + +#~ msgid "Changes:" +#~ msgstr "修改：" + +#~ msgid " Do you really want to execute these changes?" +#~ msgstr "您真的想要进行这些修改哇？" + +#~ msgid "&Apply" +#~ msgstr "应用(&A)" + #~ msgid "" #~ "Warning: With your current setup, your %1 installation\n" #~ "will encounter problems when booting, because you have no \"boot\"\n" Modified: trunk/yast/zh_CN/po/vm.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/vm.zh_CN.po 2014-10-29 15:59:29 UTC (rev 90431) +++ trunk/yast/zh_CN/po/vm.zh_CN.po 2014-10-29 16:00:17 UTC (rev 90432) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2014-10-29 16:22+0100\n" "PO-Revision-Date: 2014-06-10 12:17+0800\n" "Last-Translator: 玛格丽特 · 苏 <marguerite@opensuse.org>\n" "Language-Team: Chinese Simplified <opensuse-zh@opensuse.org>\n" @@ -20,24 +20,24 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Lokalize 1.5\n" +#. Main +#. Definition of command line mode options +#: src/clients/virtualization.rb:54 +msgid "Install Hypervisor and Tools" +msgstr "安装管理程序和工具" + #. progress step title #: src/clients/vm_finish.rb:69 msgid "Configuring the virtual machine..." msgstr "正在配置虚拟机..." -#. Main -#. Definition of command line mode options -#: src/clients/xen.rb:54 -msgid "Install Hypervisor and Tools" -msgstr "安装管理程序和工具" - #. check for kernel-bigsmp -#: src/modules/VM_XEN.rb:157 +#: src/modules/VirtConfig.rb:158 msgid "x86_64 is the only supported architecture for hosting virtual machines. Your architecture is " msgstr "x86_64 是唯一支持搭建虚拟机的架构。您的架构是 " #. we are already in UML, nested virtual machine is not supported -#: src/modules/VM_XEN.rb:176 +#: src/modules/VirtConfig.rb:177 msgid "" "Virtual machine installation cannot be started inside the UML machine.\n" "Start installation in the host system.\n" @@ -47,151 +47,151 @@ #. progress stage 1/2 #. Generate a pop dialog to allow user selection of Xen or KVM -#: src/modules/VM_XEN.rb:193 src/modules/VM_XEN.rb:281 +#: src/modules/VirtConfig.rb:194 src/modules/VirtConfig.rb:282 msgid "Verify Installed Packages" msgstr "校验已安装的软件包" #. progress stage 2/2 -#: src/modules/VM_XEN.rb:195 +#: src/modules/VirtConfig.rb:196 msgid "Network Bridge Configuration" msgstr "网桥配置" #. Headline for management domain installation -#: src/modules/VM_XEN.rb:210 +#: src/modules/VirtConfig.rb:211 msgid "Configuring the VM Server (domain 0)" msgstr "正在配置虚拟机服务器 (域 0)" #. xen domain0 installation help text - 1/4 -#: src/modules/VM_XEN.rb:213 +#: src/modules/VirtConfig.rb:214 msgid "<p><big><b>VM Server Configuration</b></big></p><p>Configuration of the VM Server (domain 0) has two parts.</p>" msgstr "<p><big><b>虚拟机服务器配置</b></big></p><p>虚拟机服务器 (域 0) 的配置有两部分。</p>" #. xen domain0 installation help text - 2/4 -#: src/modules/VM_XEN.rb:217 +#: src/modules/VirtConfig.rb:218 msgid "<p>The required packages are installed into the system first. Then the boot loader is switched to GRUB (if not already used) and the Xen section is added to the boot loader menu if it is missing.</p>" msgstr "<p>首先将安装必需的软件包，然后将把引导加载器切换为 GRUB (若尚未使用) 并把 Xen 启动项添加到引导菜单(若菜单中尚无)。</p>" #. xen domain0 installation help text - 3/4 -#: src/modules/VM_XEN.rb:221 +#: src/modules/VirtConfig.rb:222 msgid "<p>GRUB is needed because it supports the multiboot standard required to boot Xen and the Linux kernel.</p>" msgstr "<p>需要 GRUB 是因为它支持引导 Xen 和 Linux 内核所需的多重引导标准。</p>" #. xen domain0 installation help text - 4/4 -#: src/modules/VM_XEN.rb:225 +#: src/modules/VirtConfig.rb:226 msgid "<p>When the configuration has finished successfully, you can boot the VM Server from the boot loader menu.</p>" msgstr "<p>配置成功后，您就可以从引导加载器菜单来启动虚拟机服务器了。</p>" #. error popup -#: src/modules/VM_XEN.rb:230 +#: src/modules/VirtConfig.rb:231 msgid "The installation will be aborted." msgstr "安装将中止。" -#: src/modules/VM_XEN.rb:233 +#: src/modules/VirtConfig.rb:234 msgid "Choose Hypervisor(s) to install" msgstr "选择要安装的虚拟机管理程序" -#: src/modules/VM_XEN.rb:236 +#: src/modules/VirtConfig.rb:237 msgid "Server: Minimal system to get a running Hypervisor" msgstr "服务器：运行虚拟机管理程序的最小化系统" -#: src/modules/VM_XEN.rb:237 +#: src/modules/VirtConfig.rb:238 msgid "Tools: Configure, manage and monitor virtual machines" msgstr "工具：配置、管理和监视虚拟机" -#: src/modules/VM_XEN.rb:250 +#: src/modules/VirtConfig.rb:251 msgid "KVM Hypervisor" msgstr "KVM 管理程序" -#: src/modules/VM_XEN.rb:252 +#: src/modules/VirtConfig.rb:253 msgid "KVM server" msgstr "KVM 服务器" -#: src/modules/VM_XEN.rb:253 +#: src/modules/VirtConfig.rb:254 msgid "KVM tools" msgstr "KVM 工具" -#: src/modules/VM_XEN.rb:258 +#: src/modules/VirtConfig.rb:259 msgid "libvirt LXC containers" msgstr "libvirt LXC 容器" -#: src/modules/VM_XEN.rb:260 +#: src/modules/VirtConfig.rb:261 msgid "libvirt LXC daemon" msgstr "libvirt LXC 守护进程" -#: src/modules/VM_XEN.rb:288 +#: src/modules/VirtConfig.rb:289 msgid "Software to connect to Virtualization server" msgstr "连接虚拟化服务器的软件" -#: src/modules/VM_XEN.rb:290 +#: src/modules/VirtConfig.rb:291 msgid "Virtualization client tools" msgstr "虚拟化客户端工具" -#: src/modules/VM_XEN.rb:306 +#: src/modules/VirtConfig.rb:307 msgid "Xen Hypervisor" msgstr "Xen 管理程序" -#: src/modules/VM_XEN.rb:308 +#: src/modules/VirtConfig.rb:309 msgid "Xen server" msgstr "Xen 服务器" -#: src/modules/VM_XEN.rb:309 +#: src/modules/VirtConfig.rb:310 msgid "Xen tools" msgstr "Xen 工具" #. SLED doesn't have any installation capabilities (L3 support) -#: src/modules/VM_XEN.rb:384 +#: src/modules/VirtConfig.rb:388 msgid "Package installation failed\n" msgstr "软件包安装失败\n" -#: src/modules/VM_XEN.rb:392 +#: src/modules/VirtConfig.rb:396 msgid "Package installation failed for lxc\n" msgstr "lxc 的软件包安装失败\n" -#: src/modules/VM_XEN.rb:399 +#: src/modules/VirtConfig.rb:403 msgid "Package installation failed for sled client pattern\n" msgstr "SLED 客户端软件集的软件包安装失败\n" -#: src/modules/VM_XEN.rb:410 +#: src/modules/VirtConfig.rb:413 msgid "Package installation failed for sles patterns\n" msgstr "SLES 软件集的软件包安装失败\n" #. Assume python gtk is installed. If in text mode we don't care -#: src/modules/VM_XEN.rb:423 +#: src/modules/VirtConfig.rb:426 msgid "Running in text mode. Install graphical components anyway?" msgstr "正以文本模式运行。强行安装图形部件吗？" #. progressbar title - check whether Xen packages are installed -#: src/modules/VM_XEN.rb:436 +#: src/modules/VirtConfig.rb:439 msgid "Checking packages..." msgstr "正在检查软件包..." #. progressbar title - install the required packages -#: src/modules/VM_XEN.rb:439 +#: src/modules/VirtConfig.rb:442 msgid "Installing packages..." msgstr "正在安装软件包..." #. error popup #. Now see if they really were installed (bnc#508347) -#: src/modules/VM_XEN.rb:444 src/modules/VM_XEN.rb:451 +#: src/modules/VirtConfig.rb:447 src/modules/VirtConfig.rb:454 msgid "Cannot install required packages." msgstr "无法安装必需的软件包。" #. If grub2 is the bootloader and we succesfully installed Xen, update the grub2 files -#: src/modules/VM_XEN.rb:461 +#: src/modules/VirtConfig.rb:464 msgid "Updating grub2 configuration files..." msgstr "正在更新 grub2 配置文件..." #. Default Bridge stage -#: src/modules/VM_XEN.rb:474 +#: src/modules/VirtConfig.rb:484 msgid "Configuring Default Network Bridge..." msgstr "正在配置默认网桥..." #. Popup yes/no dialog -#: src/modules/VM_XEN.rb:495 +#: src/modules/VirtConfig.rb:505 msgid "Network Bridge." msgstr "网桥。" -#: src/modules/VM_XEN.rb:496 +#: src/modules/VirtConfig.rb:506 msgid "<p>For normal network configurations hosting virtual machines, a network bridge is recommended.</p><p>Configure a default network bridge?</p>" msgstr "<p>要搭建正常的虚拟机网络配置，推荐使用网桥。</p><p>配置一个默认网桥吗？</p>" @@ -204,27 +204,27 @@ #. Report::Error(_("Failed to configure the firewall to allow the Xen bridge") + "\n" + abortmsg); #. return false; #. } -#: src/modules/VM_XEN.rb:557 +#: src/modules/VirtConfig.rb:567 msgid "KVM components are installed. Your host is ready to install KVM guests." msgstr "KVM 部件已安装。您的宿主机已准备好安装 KVM 访客机了。" -#: src/modules/VM_XEN.rb:560 +#: src/modules/VirtConfig.rb:570 msgid "KVM components are installed. Reboot the machine and select the native kernel in the boot loader menu to install KVM guests." msgstr "KVM 部件已安装。请重新引导计算机并在引导加载器菜单中选择原生内核来安装 KVM 访客机。" -#: src/modules/VM_XEN.rb:563 +#: src/modules/VirtConfig.rb:573 msgid "For installing Xen guests, reboot the machine and select the Xen section in the boot loader menu." msgstr "要安装 Xen 客户机，需重启计算机并在引导加载器菜单中选择 Xen 启动项。" -#: src/modules/VM_XEN.rb:566 +#: src/modules/VirtConfig.rb:576 msgid "Xen Hypervisor and tools are installed." msgstr "Xen 管理程序和工具已安装。" -#: src/modules/VM_XEN.rb:567 +#: src/modules/VirtConfig.rb:577 msgid "Virtualization client tools are installed." msgstr "已安装虚拟化客户端工具。" -#: src/modules/VM_XEN.rb:568 +#: src/modules/VirtConfig.rb:578 msgid "Libvirt LXC components are installed." msgstr "已安装 Libvirt LXC 部件。" -- To unsubscribe, e-mail: opensuse-translation-commit+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-translation-commit+owner@opensuse.org