Author: marguerite Date: 2016-03-03 16:48:11 +0100 (Thu, 03 Mar 2016) New Revision: 95707 Modified: trunk/yast/zh_CN/po/auth-client.zh_CN.po trunk/yast/zh_CN/po/cluster.zh_CN.po trunk/yast/zh_CN/po/dns-server.zh_CN.po trunk/yast/zh_CN/po/drbd.zh_CN.po trunk/yast/zh_CN/po/iscsi-client.zh_CN.po trunk/yast/zh_CN/po/snapper.zh_CN.po Log: [cn]update Modified: trunk/yast/zh_CN/po/auth-client.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/auth-client.zh_CN.po 2016-03-02 14:28:39 UTC (rev 95706) +++ trunk/yast/zh_CN/po/auth-client.zh_CN.po 2016-03-03 15:48:11 UTC (rev 95707) @@ -1,10 +1,10 @@ -# 玛格丽特 · 苏 <marguerite@opensuse.org>, 2014, 2015. +# 玛格丽特 · 苏 <marguerite@opensuse.org>, 2014, 2015, 2016. msgid "" msgstr "" "Project-Id-Version: opensuse-i 18n\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-30 10:04+0100\n" -"PO-Revision-Date: 2015-10-21 15:01+0800\n" +"PO-Revision-Date: 2016-03-03 23:17+0800\n" "Last-Translator: marguerite <marguerite@opensuse.org>\n" "Language-Team: Chinese <kde-i18n-doc@kde.org>\n" "Language: zh_CN\n" @@ -50,9 +50,8 @@ #. Render overview and edit buttons on left side, config editor on right side. #: src/lib/yauthclient/main_dialog.rb:55 -#, fuzzy msgid "Authentication Client Configuration" -msgstr "认证客户端配置 (sssd)" +msgstr "认证客户端配置" #. Overview of all config sections #: src/lib/yauthclient/main_dialog.rb:62 @@ -274,8 +273,7 @@ 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) 元组为完全限定名称。" +msgstr "默认的 printf(3) 兼容格式，描述了如何转义 (name, domain) 元组为完全限定名称。" #: src/lib/yauthclient/params.rb:138 msgid "" @@ -469,8 +467,7 @@ msgid "" "Whether or not to evaluate the sudoNotBefore and sudoNotAfter attributes " "that implement time-dependent sudoers entries." -msgstr "" -"是否评骘实现了随时间变化的 sudoer 项的 sudoNotBefore 和 sudoNotAfter 属性。" +msgstr "是否评骘实现了随时间变化的 sudoer 项的 sudoNotBefore 和 sudoNotAfter 属性。" #. AUTOFS configuration options #: src/lib/yauthclient/params.rb:317 @@ -613,8 +610,7 @@ msgid "" "Regular expression for this domain that describes how to parse the string " "containing user name and domain into these components." -msgstr "" -"用于此域的正则表达式，描述了如何解析包含用户名和域的字符串到这些组件中。" +msgstr "用于此域的正则表达式，描述了如何解析包含用户名和域的字符串到这些组件中。" #: src/lib/yauthclient/params.rb:471 msgid "" @@ -899,8 +895,7 @@ 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 或等价物时，此参数确定了是否允许访问。" +msgstr "当使用 ldap_account_expire_policy=rhds 或等价物时，此参数确定了是否允许访问。" #: src/lib/yauthclient/params.rb:728 msgid "" @@ -912,8 +907,7 @@ msgid "" "When using ldap_account_expire_policy=nds, this attribute determines until " "which date access is granted." -msgstr "" -"当使用 ldap_account_expire_policy=nds 时，此属性确定了准予访问至的日期。" +msgstr "当使用 ldap_account_expire_policy=nds 时，此属性确定了准予访问至的日期。" #: src/lib/yauthclient/params.rb:738 msgid "" @@ -1089,16 +1083,14 @@ msgid "" "An optional base DN, search scope and LDAP filter to restrict LDAP searches " "for this attribute type." -msgstr "" -"一个可选的基本判别名/搜索范围/LDAP 过滤器，可限制 LDAP 搜索只搜索此属性类型。" +msgstr "一个可选的基本判别名/搜索范围/LDAP 过滤器，可限制 LDAP 搜索只搜索此属性类型。" #: src/lib/yauthclient/params.rb:904 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 搜索允许运行的以秒计超时。" +msgstr "指定了取消并返回缓存结果 (并进入离线模式) 前 LDAP 搜索允许运行的以秒计超时。" #: src/lib/yauthclient/params.rb:909 msgid "" @@ -1131,8 +1123,7 @@ 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 服务器强制单一请求最大限制。" +msgstr "指定了单一请求从 LDAP 撷取的记录数。某些 LDAP 服务器强制单一请求最大限制。" #: src/lib/yauthclient/params.rb:934 msgid "Disable the LDAP paging control." Modified: trunk/yast/zh_CN/po/cluster.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/cluster.zh_CN.po 2016-03-02 14:28:39 UTC (rev 95706) +++ trunk/yast/zh_CN/po/cluster.zh_CN.po 2016-03-03 15:48:11 UTC (rev 95707) @@ -3,13 +3,13 @@ # Copyright (C) 2002 SuSE Linux AG. # Copyright (C) 2001 SuSE GmbH. # -# 玛格丽特 · 苏 <i@marguerite.su>, 2013, 2014, 2015. +# 玛格丽特 · 苏 <i@marguerite.su>, 2013, 2014, 2015, 2016. msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-08-25 18:36+0200\n" -"PO-Revision-Date: 2015-10-27 20:19+0800\n" +"PO-Revision-Date: 2016-03-03 23:16+0800\n" "Last-Translator: marguerite <marguerite@opensuse.org>\n" "Language-Team: Chinese <kde-i18n-doc@kde.org>\n" "Language: zh_CN\n" @@ -125,10 +125,10 @@ #. BNC#880242, expected_votes must have value when "udp" #: src/include/cluster/dialogs.rb:222 -#, fuzzy #| msgid "The Expected Votes has to be fulfilled when udp is configured" -msgid "The Expected Votes has to be fulfilled when multicast transport is configured" -msgstr "当配置了 udp 时必须填写期望票数" +msgid "" +"The Expected Votes has to be fulfilled when multicast transport is configured" +msgstr "当配置了多播传输时必须填写期望票数" #: src/include/cluster/dialogs.rb:228 src/include/cluster/dialogs.rb:256 #: src/include/cluster/dialogs.rb:1427 @@ -140,7 +140,9 @@ msgstr "多播端口必须为正整数" #: src/include/cluster/dialogs.rb:272 -msgid "Only passive or active can be chosen if multiple interface used. Set to passive." +msgid "" +"Only passive or active can be chosen if multiple interface used. Set to" +" passive." msgstr "若使用了多个接口则只能选择主动或被动。设置为被动。" #. BNC#871970, change member address struct to memberaddr @@ -212,11 +214,15 @@ msgstr "启用安全认证" #: src/include/cluster/dialogs.rb:719 -msgid "For a newly created cluster, push the button below to generate /etc/corosync/authkey." +msgid "" +"For a newly created cluster, push the button below to generate" +" /etc/corosync/authkey." msgstr "新创建的集群，请按下面按钮生成 /etc/corosync/authkey。" #: src/include/cluster/dialogs.rb:724 -msgid "To join an existing cluster, please copy /etc/corosync/authkey from other nodes manually." +msgid "" +"To join an existing cluster, please copy /etc/corosync/authkey from other" +" nodes manually." msgstr "要加入一个已有集群，请从其他节点手动复制 /etc/corosync/authkey。" #: src/include/cluster/dialogs.rb:750 @@ -352,7 +358,8 @@ #. SaveCsync2(); #: src/include/cluster/dialogs.rb:1347 msgid "" -"Conntrackd is a daemon which helps to duplicate firewall status between cluster nodes.\n" +"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" "You need to start it with the ocf:heartbeat:conntrackd." msgstr "" @@ -393,43 +400,113 @@ #| "<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(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 (the list will be generated when using unicast transport) or can be specified in the quorum {} section (Expect votes should use the total node numble of the cluster). If Expected votes presents in unicast transport, the value will override the one automatically calculated.<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" +"<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(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 (the list will be generated when using unicast transport) or" +" can be specified in the quorum {} section (Expect votes should use the total" +" node numble of the cluster). If Expected votes presents in unicast" +" transport, the value will override the one automatically calculated.<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" msgstr "" -"<p><b><big>绑定网络地址</big></b><br>这指定了 openais 执行文件应绑定的地址。该地址应总以 0 结尾。若 totem 流量应通过 192.168.5.92 中转，则设置 bindnetaddr 为 192.168.5.0。<br>这里也可以为 IPV6 地址，那样将会使用 IPV6 网络。这种情况下，必须指定完整地址且无法像 IPV4 那样在特定子网中自动选择网络接口。若使用了 IPV6 网络，则必须指定节点 ID 字段。<br></p>\n" -"<p><b><big>多播地址</big></b><br>这是 openais 执行文件使用的多播地址。默认值应可用于多数网络，但也应询问网络管理员要使用的多播地址。请避免 224.x.x.x 因为这是一个 \"配置\" 多播地址。<br>这里也可以为 IPV6 多播地址，那样将会使用 IPV6 网络。若使用了 IPV6 网络，则必须指定节点 ID 字段。</p>\n" -"<p><b><big>端口</big></b><br>这指定了 UDP 端口号。可以在同一网络中为配置了不同的 UDP 端口的 openais 服务使用相同的多播地址。<br></p>\n" -"<p><b><big>成员地址</big></b><br>这个列表通过 IP 地址指定了集群中的全部节点。当使用 udpu (Unicast) 时这里是可以配置的。<br></p>\n" -"<p><b><big>节点 ID</big></b><br>该配置选项使用 IPv4 时为可选，IPv6 时为必选。这是一个 32 位值，指定了将传送给集群成员服务的节点标识符。若 IPv4 下该选项未指定，将使用该系统以环标识符 0 绑定到的 32 位 IP 地址。节点标识符值 0 是预留的，不应该使用。<br></p>\n" -"<p><b><big>rrp 模式</big></b><br>这指定了冗余环的模式，可以为无，主动或被动。主动复制在故障网络环境中从发送到送达的延迟相对较低，但性能较差。被动复制在 totem 协议未绑定 CPU 前可达到它的两倍速度。最后一个选项是无，仅使用一个网络接口来运行 TOTEM 协议。若只指定了一个接口指令，则将自动选无。若指定了多个接口指令，则只能选择主动或被动。<br></p>\n" -"<p><b><big>期望票数</big></b><br>参与表决的法定节点数的期望票数。当 corosync.conf 中存在 nodelist{} 部分时将自动计算，也可以在 quorum{} 部分指定。<br></p>\n" -"<p><b><big>自动生成节点 ID</big></b><br>当使用 IPv6 时需要节点 ID。启用自动生成节点 ID 将自动生成节点 ID。<br></p>\n" +"<p><b><big>绑定网络地址</big></b><br>这指定了 openais 执行文件应绑定的地址。该地址应总以 0 结尾。若 totem" +" 流量应通过 192.168.5.92 中转，则设置 bindnetaddr 为 192.168.5.0。<br>这里也可以为 IPV6" +" 地址，那样将会使用 IPV6 网络。这种情况下，必须指定完整地址且无法像 IPV4 那样在特定子网中自动选择网络接口。若使用了 IPV6" +" 网络，则必须指定节点 ID 字段。<br></p>\n" +"<p><b><big>多播地址</big></b><br>这是 openais 执行文件使用的多播地址。默认值应可用于多数网络，但也应询问网络管理员要使用的" +"多播地址。请避免 224.x.x.x 因为这是一个 \"配置\" 多播地址。<br>这里也可以为 IPV6 多播地址，那样将会使用 IPV6" +" 网络。若使用了 IPV6 网络，则必须指定节点 ID 字段。</p>\n" +"<p><b><big>端口</big></b><br>这指定了 UDP 端口号。可以在同一网络中为配置了不同的 UDP 端口的 openais" +" 服务使用相同的多播地址。<br></p>\n" +"<p><b><big>成员地址</big></b><br>这个列表通过 IP 地址指定了集群中的全部节点。当使用 udpu (Unicast)" +" 时这里是可以配置的。<br></p>\n" +"<p><b><big>节点 ID</big></b><br>该配置选项使用 IPv4 时为可选，IPv6 时为必选。这是一个 32" +" 位值，指定了将传送给集群成员服务的节点标识符。若 IPv4 下该选项未指定，将使用该系统以环标识符 0 绑定到的 32 位 IP 地址。节点标识符值 0" +" 是预留的，不应该使用。<br></p>\n" +"<p><b><big>rrp 模式</big></b><br>这指定了冗余环的模式，可以为无，主动或被动。主动复制在故障网络环境中从发送到送达的延迟相对较低" +"，但性能较差。被动复制在 totem 协议未绑定 CPU 前可达到它的两倍速度。最后一个选项是无，仅使用一个网络接口来运行 TOTEM" +" 协议。若只指定了一个接口指令，则将自动选无。若指定了多个接口指令，则只能选择主动或被动。<br></p>\n" +"<p><b><big>期望票数</big></b><br>参与表决的法定节点数的期望票数。当 corosync.conf 中存在 nodelist{}" +" 部分时将自动计算，也可以在 quorum{} 部分指定。<br></p>\n" +"<p><b><big>自动生成节点 ID</big></b><br>当使用 IPv6 时需要节点 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/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. <br></p>\n" msgid "" "\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" +"<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. <br></p>\n" msgstr "" "\n" -"<p><b><big>线程</big></b><br>该指令控制用于加密和发送多播消息的线程数。若安全认证为关，则协议永不使用多线程发送。若安全认证为开，此指令允许系统配置使用多线程来加密和发送多播消息。线程指令为 0 表明不使用多线程发送。此模式为非 SMP 系统提供了最大性能。默认为 0。</br></p>\n" -"<p><b><big>启用安全认证</big></b><br>这指定了是否应该使用 HMAC/SHA1 认证来认证全部消息。它进一步指定了是否应该使用 sober128 加密算法加密全部数据来保护数据不受窃听。启用此选项将添加一个 36 字节的头部到每条 TOTEM 发送的消息，这将降低总吞吐量。启用后，据 gprof 测量显示加密和认证在 aisexec 中消耗了 75% 的 CPU 周期。对于 1500 MTU 帧传输的 100mbit 网络来说，在开启了此选项的 3ghz CPU 上，100% CPU 使用率可达到 9mb/秒的吞吐量; 在关闭了此选项的 3ghz CPU 上，20% 的 CPU 使用率可以达到 10mb/sec 的吞吐量。对于帧传输很大的 gig-e 网络来说：在启用了此选项的 3ghz CPU 上可以达到 20mb/秒的吞吐量; 在禁用了此选项的 3ghz CPU 上可以达到 60mb/秒的吞吐量。默认为开。<br></p>\n" +"<p><b><big>启用安全认证</big></b><br>这指定了是否应该使用 HMAC/SHA1 认证来认证全部消息。它进一步指定了是否应该使用" +" sober128 加密算法加密全部数据来保护数据不受窃听。启用此选项将添加一个 36 字节的头部到每条 totem" +" 发送的消息，这将降低总吞吐量。启用后，据 gprof 测量显示加密和认证在 aisexec 中消耗了 75% 的 CPU 周期。对于 1500 MTU" +" 帧传输的 100mbit 网络来说，在开启了此选项的 3ghz CPU 上，100% CPU 使用率可达到 9mb/秒的吞吐量; 在关闭了此选项的" +" 3ghz CPU 上，20% 的 CPU 使用率可以达到 10mb/秒的吞吐量。对于帧传输很大的 gig-e 网络来说：在启用了此选项的 3ghz" +" CPU 上可以达到 20mb/秒的吞吐量; 在禁用了此选项的 3ghz CPU 上可以达到 60mb/秒的吞吐量。默认为开。<br></p>\n" #: src/include/cluster/helps.rb:49 msgid "" "\n" -"\t\t\t<p><b><big>Booting</big></b><br>Starting corosync service during boot or not</p>\n" -"\t\t\t<p><b><big>Firewall Settings</big></b><br>Enable the port when Firewall is enabled</p>\n" +"\t\t\t<p><b><big>Booting</big></b><br>Starting corosync service during boot" +" or not</p>\n" +"\t\t\t<p><b><big>Firewall Settings</big></b><br>Enable the port when Firewall" +" is enabled</p>\n" "\t\t\t" msgstr "" "\n" @@ -440,28 +517,42 @@ #: src/include/cluster/helps.rb:55 msgid "" "\n" -"\t\t<p><b><big>Sync Host</big></b><br>The hostnames used here must be the local hostnames of the cluster nodes. That means you must use exactly the same string as printed out by the hostname command.</p>\n" -"\t\t<p><b><big>Sync File</big></b><br>The full absolute filename to be synced.</p>\n" -"\t\t<p><b><big>Pre-Shared-Keys</big></b><br>Authentication is performed using the IP addresses and pre-shared-keys in Csync2. The key file is generated with csync2 -k /etc/csync2/key_hagroup. The file key_hagroup should be copied to all members of the cluster manually after it's created.</p>\n" +"\t\t<p><b><big>Sync Host</big></b><br>The hostnames used here must be the" +" local hostnames of the cluster nodes. That means you must use exactly the" +" same string as printed out by the hostname command.</p>\n" +"\t\t<p><b><big>Sync File</big></b><br>The full absolute filename to be" +" synced.</p>\n" +"\t\t<p><b><big>Pre-Shared-Keys</big></b><br>Authentication is performed using" +" the IP addresses and pre-shared-keys in Csync2. The key file is generated" +" with csync2 -k /etc/csync2/key_hagroup. The file key_hagroup should be" +" copied to all members of the cluster manually after it's created.</p>\n" "\t" msgstr "" "\n" -"\t\t<p><b><big>同步主机</big></b><br>这里使用的主机名必须是集群节点的本地主机名。这意味着您必须输入与 hostname 命令的打印输出完全相同的内容。</p>\n" +"\t\t<p><b><big>同步主机</big></b><br>这里使用的主机名必须是集群节点的本地主机名。这意味着您必须输入与 hostname" +" 命令的打印输出完全相同的内容。</p>\n" "\t\t<p><b><big>同步文件</big></b><br>要同步的完整绝对文件名。</p>\n" -"\t\t<p><b><big>预共享密钥</big></b><br>在 Csync2 中使用 IP 地址和预共享密钥进行认证。可使用 csync2 -k /etc/csync2/key_hagroup 生成密钥文件。创建之后应将 key_hagroup 文件手动复制到所有集群成员中去。</p>\n" +"\t\t<p><b><big>预共享密钥</big></b><br>在 Csync2 中使用 IP 地址和预共享密钥进行认证。可使用 csync2 -k" +" /etc/csync2/key_hagroup 生成密钥文件。创建之后应将 key_hagroup 文件手动复制到所有集群成员中去。</p>\n" "\t" #: src/include/cluster/helps.rb:62 msgid "" "\n" -"\t\t<p><b><big>Dedicated Interface</big></b><br>A dedicated network interface for syncing. The interface must support multicast, and is UP for using. You may have to have it pre-configured. </p>\n" -"\t\t<p><b><big>IP</big></b><br>The IPv4 address assigned to the dedicated network interface. This is detected automatically.</p>\n" -"\t\t<p><b><big>Multicast Address</big></b><br>The multicast address to be used for syncing.</p>\n" -"\t\t<p><b><big>Group Number</big></b><br>A numeric ID indicate the group for syncing.</p>\n" +"\t\t<p><b><big>Dedicated Interface</big></b><br>A dedicated network interface" +" for syncing. The interface must support multicast, and is UP for using. You" +" may have to have it pre-configured. </p>\n" +"\t\t<p><b><big>IP</big></b><br>The IPv4 address assigned to the dedicated" +" network interface. This is detected automatically.</p>\n" +"\t\t<p><b><big>Multicast Address</big></b><br>The multicast address to be" +" used for syncing.</p>\n" +"\t\t<p><b><big>Group Number</big></b><br>A numeric ID indicate the group for" +" syncing.</p>\n" "\t" msgstr "" "\n" -"\t\t<p><b><big>专用接口</big></b><br>一个用于同步的专用网络接口。接口必须支持多播，并且是在线可使用的。您或许需要预先配置它。</p>\n" +"\t\t<p><b><big>专用接口</big></b><br>一个用于同步的专用网络接口。接口必须支持多播，并且是在线可使用的。您或许需要预先配置它。<" +"/p>\n" "\t\t<p><b><big>IP</big></b><br>指派给专用网络接口的 IPv4 地址。这是自动检测的。</p>\n" "\t\t<p><b><big>多播地址</big></b><br>用于同步的多播地址。</p>\n" "\t\t<p><b><big>组编号</big></b><br>同步时表示组的一个数字 ID。</p>\n" Modified: trunk/yast/zh_CN/po/dns-server.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/dns-server.zh_CN.po 2016-03-02 14:28:39 UTC (rev 95706) +++ trunk/yast/zh_CN/po/dns-server.zh_CN.po 2016-03-03 15:48:11 UTC (rev 95707) @@ -6,21 +6,21 @@ # Xinwei Hu <xwhu@novell.com>, 2004. # James Su <suzhe@tsinghua.org.cn>, 2004. # Novell Language <language@novell.com>, 2004, 2005, 2012. -# 玛格丽特 · 苏 <marguerite@opensuse.org>, 2013, 2014. +# 玛格丽特 · 苏 <marguerite@opensuse.org>, 2013, 2014, 2016. msgid "" msgstr "" "Project-Id-Version: dns server\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-08-25 18:36+0200\n" -"PO-Revision-Date: 2014-04-16 15:26+0800\n" -"Last-Translator: 玛格丽特 · 苏 <marguerite@opensuse.org>\n" -"Language-Team: Chinese Simplified <opensuse-zh@opensuse.org>\n" +"PO-Revision-Date: 2016-03-03 23:17+0800\n" +"Last-Translator: marguerite <marguerite@opensuse.org>\n" +"Language-Team: Chinese <kde-i18n-doc@kde.org>\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 2.0\n" #. TRANSLATORS: commandline general name of the module in help #: src/include/dns-server/cmdline.rb:24 @@ -164,12 +164,14 @@ #. TRANSLATORS: commandline short help for command #: src/include/dns-server/cmdline.rb:294 -msgid "Name server (in fully qualified format finished with a dot or relative name)" +msgid "" +"Name server (in fully qualified format finished with a dot or relative name)" msgstr "名称服务器 (使用以一个点结尾的完全限定格式或相对名称)" #. TRANSLATORS: commandline short help for command #: src/include/dns-server/cmdline.rb:301 -msgid "Mail server (in fully qualified format finished with a dot or relative name)" +msgid "" +"Mail server (in fully qualified format finished with a dot or relative name)" msgstr "邮件服务器 (使用以一个点结尾的完全限定格式或相对名称)" #. TRANSLATORS: commandline short help for command @@ -219,7 +221,8 @@ #. TRANSLATORS: commandline short help for command #: src/include/dns-server/cmdline.rb:371 -msgid "DNS resource record value, such as 192.0.34.166 for example.org's A record" +msgid "" +"DNS resource record value, such as 192.0.34.166 for example.org's A record" msgstr "DNS 资源记录值，诸如表示 example.org 的 A 记录的 192.0.34.166" #. TRANSLATORS: commandline short help for command @@ -611,10 +614,9 @@ #. FIXME: new startup #: src/include/dns-server/dialog-main.rb:419 -#, fuzzy #| msgid "Apply Changes to Dialog" msgid "Apply Changes" -msgstr "对对话应用更改" +msgstr "应用修改" #. Dialog Label - DNS - expert settings #. Tree Menu Item - DNS - expert settings @@ -981,10 +983,9 @@ #. Writes settings and restores the dialog without exiting #: src/include/dns-server/dialog-main.rb:2169 -#, fuzzy #| msgid "Save configuration files" msgid "Saving the configuration failed" -msgstr "保存配置文件" +msgstr "保存配置失败" #. Yes-No popup #: src/include/dns-server/dialog-main.rb:2182 @@ -1310,7 +1311,8 @@ #. %{type} replaced with record type (TXT or SPF) #: src/include/dns-server/dialog-masterzone.rb:1916 msgid "" -"Invalid %{type} record key. It should consist of printable US-ASCII characters excluding '='\n" +"Invalid %{type} record key. It should consist of printable US-ASCII" +" characters excluding '='\n" "and must be at least one character long." msgstr "无效的 %{type} 记录键。它应由可打印的除 '=' 外的 US-ASCII 字符组成并且必须至少有一个字符的长度。" @@ -1403,7 +1405,8 @@ #: src/include/dns-server/dialog-masterzone.rb:2612 msgid "" "Current zone records are automatically generated from %1 zone.\n" -"To change records manually disable the Automatically Generate Records From feature." +"To change records manually disable the Automatically Generate Records From" +" feature." msgstr "" "当前区域记录自动生成自 %1 区域。\n" "要手动修改记录，请禁用自动生成记录自这一功能。" @@ -1626,8 +1629,10 @@ #: src/include/dns-server/helps.rb:99 msgid "" "<p><b><big>Master Servers</big></b><br>\n" -"Set the IP addresses of the master name servers for this zone. Use <b>Add</b>\n" -"to add a new master name server. Select an existing one then click <b>Delete</b>\n" +"Set the IP addresses of the master name servers for this zone. Use <b>Add</b" +">\n" +"to add a new master name server. Select an existing one then click <b>Delete<" +"/b>\n" "to remove an existing one.</p>" msgstr "" "<p><b><big>主服务器</big></b><br>\n" @@ -1641,7 +1646,8 @@ msgid "" "<p><b><big>Zone Type</big></b><br>\n" "To make this name server the primary source of the data of the zone,\n" -"select <b>Master</b>. To make it the secondary name server, select <b>Slave</b>\n" +"select <b>Master</b>. To make it the secondary name server, select <b>Slave<" +"/b>\n" "or <b>Stub</b>, so the data of the zone will be mirrored from the master\n" "server.</p>" msgstr "" @@ -1721,7 +1727,8 @@ #: src/include/dns-server/helps.rb:153 msgid "" "<p><b>Serial</b> number is used for determining if the zone has changed on\n" -"the master servers (so that slave servers do not always need to synchronize the\n" +"the master servers (so that slave servers do not always need to synchronize" +" the\n" "entire zone).</p>\n" msgstr "" "<p><b>序列号</b>用于确定该区域在主服务器上是否有所修改\n" @@ -1769,8 +1776,10 @@ "<p><b><big>TSIG Key Management</big></b><br>\n" "Define TSIG keys used for dynamic zone updates.\n" "To add a new TSIG key, use the \n" -"<b>File Name</b> text field or the <b>Browse</b> button then click <b>Add</b>.\n" -"To delete an existing TSIG key, select it in the list and click <b>Delete</b>.\n" +"<b>File Name</b> text field or the <b>Browse</b> button then click <b>Add</b" +">.\n" +"To delete an existing TSIG key, select it in the list and click <b>Delete</b" +">.\n" "</p>" msgstr "" "<p><b><big>TSIG 密钥管理</big></b><br>\n" @@ -1879,11 +1888,13 @@ #: src/include/dns-server/helps.rb:242 msgid "" "<p>\n" -"Select <b>Log to System Log</b> to save DNS server log messages to the system log. \n" +"Select <b>Log to System Log</b> to save DNS server log messages to the system" +" log. \n" "To save the DNS server log messages to a separate file, select \n" "<b>Log to File</b> and set the <b>Filename</b> to which to save the log and \n" "the <b>Maximum Size</b> of the log file.\n" -"The DNS server automatically rotates the log files. Use <b>Maximum Versions</b>\n" +"The DNS server automatically rotates the log files. Use <b>Maximum Versions<" +"/b>\n" "to specify how many log files should be saved.</p>\n" msgstr "" "<p>\n" @@ -1946,7 +1957,8 @@ "<p>To add an already created key, set the <b>Filename</b>\n" "(or use the <b>Browse</b> button to select it) and click <b>Add</b>.\n" "To generate a new key, enter the <b>Filename</b> and the <b>Key ID</b>\n" -"then click <b>Generate</b>. The new key will be generated and also added.</p>\n" +"then click <b>Generate</b>. The new key will be generated and also added.</p" +">\n" msgstr "" "<p>要添加已创建的密钥，请设置<b>文件名</b>\n" "(或使用<b>浏览</b>按钮来选择文件名)并点击<b>添加</b>。\n" @@ -1972,27 +1984,32 @@ #. Expert Mode Configuration - Zones #2 #: src/include/dns-server/helps.rb:298 msgid "" -"<p>To add a new zone, enter its <b>Zone Name</b>, select the <b>Zone Type</b>,\n" +"<p>To add a new zone, enter its <b>Zone Name</b>, select the <b>Zone Type</b" +">,\n" "and click <b>Add</b>.</p>\n" msgstr "<p>要添加新的区域，请输入它的<b>区域名称</b>，选择<b>区域类型</b>，并点击<b>添加</b>。</p>\n" #. Expert Mode Configuration - Zones #3 #: src/include/dns-server/helps.rb:302 msgid "" -"<p>To add a new IPv4 reverse zone, enter a part of the reverse IPv4 address followed by\n" +"<p>To add a new IPv4 reverse zone, enter a part of the reverse IPv4 address" +" followed by\n" "<tt>.in-addr.arpa</tt> as its <b>Zone Name</b> (for example, zone name\n" "<tt>0.168.192.in-addr.arpa</tt> for network <tt>192.168.0.0/24</tt>), select\n" "the <b>Zone Type</b>, and click <b>Add</b>.</p>\n" msgstr "" "<p>要添加新 IPv4 反向区域，请输入一部分反向 IPv4 地址，加上 <tt>.in-addr.arpa</tt> 作为它的<b>区域名称</b>\n" -"(例如，网络 <tt>192.168.0.0/24</tt> 的区域名称为 <tt>0.168.192.in-addr.arpa</tt>)，选择<b>区域类型</t>，并点击 <b>添加</b>。</p>\n" +"(例如，网络 <tt>192.168.0.0/24</tt> 的区域名称为 <tt>0.168.192.in-addr.arpa</tt>)，选择<b" +">区域类型</t>，并点击 <b>添加</b>。</p>\n" #. Expert Mode Configuration - Zones #4 #. %1, %2, %3, and %4 are replaced with examples #: src/include/dns-server/helps.rb:311 msgid "" -"<p>To add a new IPv6 reverse zone, enter a part of the reverse IPv6 address followed by\n" -"<tt>%1</tt> as its <b>Zone Name</b>. Several formats for entering the zone name are\n" +"<p>To add a new IPv6 reverse zone, enter a part of the reverse IPv6 address" +" followed by\n" +"<tt>%1</tt> as its <b>Zone Name</b>. Several formats for entering the zone" +" name are\n" "supported: Standard form: <tt>%2</tt>;\n" "Forward form: <tt>%3</tt>;\n" "Forward form without netmask bits: <tt>%4</tt>\n" @@ -2020,7 +2037,8 @@ #: src/include/dns-server/helps.rb:334 msgid "" "<p><b><big>DDNS and Zone Transport</big></b><br>\n" -"Use this dialog to change dynamic DNS settings of the zone and control access\n" +"Use this dialog to change dynamic DNS settings of the zone and control" +" access\n" "to the zone.</p>\n" msgstr "" "<p><b><big>DDNS 和区域传输</big></b><br>\n" @@ -2079,7 +2097,8 @@ #: src/include/dns-server/helps.rb:371 msgid "" "<p><b><big>NS Records</big></b><br>\n" -"To add a new name server, enter the name server address and click <b>Add</b>.\n" +"To add a new name server, enter the name server address and click <b>Add</b" +">.\n" "To remove one of the listed name servers, select it and click\n" "<b>Delete</b>.</p>\n" msgstr "" @@ -2220,7 +2239,8 @@ "<p><b>PTR: Reverse Translation</b>:\n" "<b>Record Key</b> is a full reverse zone name (derived from the IP address)\n" "followed by a dot\n" -"(such as <tt>1.0.168.192.in-addr.arpa.</tt> for IP address <tt>192.168.0.1</tt>)\n" +"(such as <tt>1.0.168.192.in-addr.arpa.</tt> for IP address <tt>192.168.0.1<" +"/tt>)\n" " or a part of reverse zone name relative to the current zone\n" "(such as <tt>1</tt> for IP address <tt>192.168.0.1</tt> in zone\n" "<tt>0.168.192.in-addr.arpa.</tt>).\n" @@ -2230,7 +2250,8 @@ "<b>记录键</b>是完整反向区域名称 (派生自 IP 地址) 后跟一个点\n" "(例如，IP 地址为 <tt>192.168.0.1</tt>，则记录键为 </tt>1.0.168.192.in-addr.arpa.<tt>)\n" "或者是相对于当前区域的反向区域名称的一部分\n" -"(例如，区域 <tt>0.168.192.in-addr.arpa.</tt> 中 IP 地址 <tt>192.168.0.1</tt> 的记录键为 <tt>1</tt>)。\n" +"(例如，区域 <tt>0.168.192.in-addr.arpa.</tt> 中 IP 地址 <tt>192.168.0.1</tt> 的记录键为 <" +"tt>1</tt>)。\n" "<b>值</b>是完全限定主机名后跟一个点。</p>\n" #. Final step of the installation wizard - 1/5 Modified: trunk/yast/zh_CN/po/drbd.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/drbd.zh_CN.po 2016-03-02 14:28:39 UTC (rev 95706) +++ trunk/yast/zh_CN/po/drbd.zh_CN.po 2016-03-03 15:48:11 UTC (rev 95707) @@ -4,21 +4,21 @@ # Copyright (C) 2001 SuSE GmbH. # # Marguerite Su, 2012. -# 玛格丽特 · 苏 <i@marguerite.su>, 2013, 2014. +# 玛格丽特 · 苏 <i@marguerite.su>, 2013, 2014, 2016. msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-08-25 18:36+0200\n" -"PO-Revision-Date: 2014-10-30 17:29+0800\n" -"Last-Translator: 玛格丽特 · 苏 <marguerite@opensuse.org>\n" -"Language-Team: Chinese Simplified <kde-i18n-doc@kde.org>\n" +"PO-Revision-Date: 2016-03-03 22:37+0800\n" +"Last-Translator: marguerite <marguerite@opensuse.org>\n" +"Language-Team: Chinese <kde-i18n-doc@kde.org>\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 2.0\n" #. Command line help text for the Xdrbd module #: src/clients/drbd.rb:54 @@ -235,14 +235,14 @@ #: src/include/drbd/helps.rb:69 msgid "" -"<p>Clicking \"Add\", \"Edit\", \"Delete\" button to add, edit or delete a resource</p>\n" +"<p>Clicking \"Add\", \"Edit\", \"Delete\" button to add, edit or delete a" +" resource</p>\n" "\t\t" msgstr "" "<p>点击 \"添加\"、\"编辑\"、\"删除\" 按钮来添加、编辑或删除一个资源</p>\n" "\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. Should not include \".\" in hostname.</p>\n" @@ -254,106 +254,197 @@ #| "\t\t" msgid "" "\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. Otherwise, you may omit the name, or the word minor and its number. If you omit the name a default of /dev/drbd'minor number' 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<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. Otherwise, you may omit the name, or" +" the word minor and its number. If you omit the name a default of" +" /dev/drbd'minor number' 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" msgstr "" "\n" "\t\t<p>\"名称\" 是必需的并且必须匹配其中某个节点的 Linux 主机名 (uname -n)。主机名中不应包含 \".\"。</p>\n" -"\t\t<p>\"地址:端口\"：一个资源针对每个设备都需要一个 IP 地址，用于等待来自父设备的进站连接以访问设备。每个分布式复制块设备资源都需要一个 TCP 端口，用于连接到节点的父设备。</p>\n" -"\t\t<p>\"设备\"：所描述的资源的块设备节点的名称。在您的应用程序 (文件系统) 中您必须使用此设备，而不能使用由磁盘参数及其 minor 编号指定的底层块设备。或者要么省略名称，要么省略 minor 及 minor 编号。若您省略了名称则将使用默认的 /dev/drbdminor。</p>\n" -"\t\t如： '/dev/drbd{service} minor {minor drbd number [0...255]}' 或 '/dev/drbd{minor drbd number [0...255]}'</p>\n" +"\t\t<p>\"地址:端口\"：一个资源针对每个设备都需要一个 IP 地址，用于等待来自父设备的进站连接以访问设备。每个分布式复制块设备资源都需要一个" +" TCP 端口，用于连接到节点的父设备。</p>\n" +"\t\t<p>\"设备\"：所描述的资源的块设备节点的名称。在您的应用程序 (文件系统) 中您必须使用此设备，而不能使用由磁盘参数及其 minor" +" 编号指定的底层块设备。或者要么省略名称，要么省略 minor 关键字及其编号。若您省略了名称则将使用默认的 /dev/drbd'minor 编号'。<" +"/p>\n" +"\t\t如：'/dev/drbd{service} minor {minor drbd number [0...255]}' 或" +" '/dev/drbd{minor drbd number [0...255]}'</p>\n" "\t\t<p>\"磁盘\"：分布式复制块设备使用此块设备来真正存储和撷取数据。当其上正在运行分布式复制块设备时请永远不要访问这样的设备。</p>\n" -"\t\t<p>\"元磁盘\"：内部使用。内部使用意味着备份设备的最后一部分用于存储元数据。</p>\n" +"\t\t<p>\"元磁盘\"：内部使用。内部使用意味着后备设备的最后一部分用于存储元数据。</p>\n" "\t\t" #: src/include/drbd/helps.rb:88 msgid "" "\n" "\t\t<p><b>Protocol</b></p>\n" -"\t\t<p>Protocol A: write IO is reported as completed, if it has reached local disk and local TCP send buffer.</p>\n" -"\t\t<p>Protocol B: write IO is reported as completed, if it has reached local disk and remote buffer cache.</p>\n" -"\t\t<p>Protocol C: write IO is reported as completed, if it has reached both local and remote disk.</p>\n" +"\t\t<p>Protocol A: write IO is reported as completed, if it has reached local" +" disk and local TCP send buffer.</p>\n" +"\t\t<p>Protocol B: write IO is reported as completed, if it has reached local" +" disk and remote buffer cache.</p>\n" +"\t\t<p>Protocol C: write IO is reported as completed, if it has reached both" +" local and remote disk.</p>\n" "\t\t\t\t\t\t\t\t\t\t \n" "\t\t<p><b>wfc-timeout</b>: Wait for connection timeout</p>\n" -"\t\t<p><b>degr-wfc-timeout</b>: Wait for connection timeout, if this node was a degraded cluster</p>\n" +"\t\t<p><b>degr-wfc-timeout</b>: Wait for connection timeout, if this node was" +" a degraded cluster</p>\n" "\n" -"\t\t<p><b>on-io-error</b>: What to do when the lower level device reports io-error to the upper layers</p>\n" +"\t\t<p><b>on-io-error</b>: What to do when the lower level device reports" +" io-error to the upper layers</p>\n" "\t\t<p><b>sndbuf-size</b>: The size of the TCP socket send buffer</p>\n" -"\t\t<p><b>max-buffers</b>: Maximum number of requests to be allocated by DRBD</p>\n" +"\t\t<p><b>max-buffers</b>: Maximum number of requests to be allocated by" +" DRBD</p>\n" "\n" -"\t\t<p><b>timeout</b>: If the partner node fails to send an expected response packet within time 10ths of a second, the partner node is considered dead and therefore the TCP/IP connection is abandoned. This must be lower than connect-int and ping-int. The default value is 60 = 6 seconds, the unit 0.1 seconds.</p>\n" -"\t\t<p><b>connect-int</b>: The time the peer has time to answer to a keep-alive packet. In case the peer's reply is not received within this time period, it is considered as dead. The default value is 500ms, the default unit is 100ms</p>\n" -"\t\t<p><b>ping-int</b>: The time the peer has time to answer to a keep-alive packet</p>\n" +"\t\t<p><b>timeout</b>: If the partner node fails to send an expected response" +" packet within time 10ths of a second, the partner node is considered dead" +" and therefore the TCP/IP connection is abandoned. This must be lower than" +" connect-int and ping-int. The default value is 60 = 6 seconds, the unit 0.1" +" seconds.</p>\n" +"\t\t<p><b>connect-int</b>: The time the peer has time to answer to a" +" keep-alive packet. In case the peer's reply is not received within this time" +" period, it is considered as dead. The default value is 500ms, the default" +" unit is 100ms</p>\n" +"\t\t<p><b>ping-int</b>: The time the peer has time to answer to a keep-alive" +" packet</p>\n" "\n" -"\t\t<p><b>max-epoch-size</b>: The highest number of data blocks between two write barriers</p>\n" -"\t\t<p><b>ko-count</b>: the secondary node fails to complete a single write request for count times the timeout, it is expelled from the cluster. The default value is 0, which disables this feature.</p>\n" -"\t\t<p><b>rate</b>: To ensure a smooth operation of the application on top of DRBD, it is possible to limit the bandwidth which may be used by background synchronizations. The default is 250 KB/sec, the default unit is KB/sec.</p>\n" -"\t\t<p><b>al-extents</b>: parameter you control how big the hot area (= active set) can get. The default number of extents is 127. (Minimum: 7, Maximum: 3843)</p>\n" +"\t\t<p><b>max-epoch-size</b>: The highest number of data blocks between two" +" write barriers</p>\n" +"\t\t<p><b>ko-count</b>: the secondary node fails to complete a single write" +" request for count times the timeout, it is expelled from the cluster. The" +" default value is 0, which disables this feature.</p>\n" +"\t\t<p><b>rate</b>: To ensure a smooth operation of the application on top" +" of DRBD, it is possible to limit the bandwidth which may be used by" +" background synchronizations. The default is 250 KB/sec, the default unit is" +" KB/sec.</p>\n" +"\t\t<p><b>al-extents</b>: parameter you control how big the hot area (=" +" active set) can get. The default number of extents is 127. (Minimum: 7," +" Maximum: 3843)</p>\n" "\t\t" msgstr "" "\n" "\t\t<p><b>协议</b></p>\n" -"\t\t<p>Protocol A: write IO is reported as completed, if it has reached local disk and local TCP send buffer.</p>\n" -"\t\t<p>Protocol B: write IO is reported as completed, if it has reached local disk and remote buffer cache.</p>\n" -"\t\t<p>Protocol C: write IO is reported as completed, if it has reached both local and remote disk.</p>\n" +"\t\t<p>Protocol A: write IO is reported as completed, if it has reached local" +" disk and local TCP send buffer.</p>\n" +"\t\t<p>Protocol B: write IO is reported as completed, if it has reached local" +" disk and remote buffer cache.</p>\n" +"\t\t<p>Protocol C: write IO is reported as completed, if it has reached both" +" local and remote disk.</p>\n" "\t\t\t\t\t\t\t\t\t\t \n" "\t\t<p><b>wfc-timeout</b>: Wait for connection timeout</p>\n" -"\t\t<p><b>degr-wfc-timeout</b>: Wait for connection timeout, if this node was a degraded cluster</p>\n" +"\t\t<p><b>degr-wfc-timeout</b>: Wait for connection timeout, if this node was" +" a degraded cluster</p>\n" "\n" -"\t\t<p><b>on-io-error</b>: What to do when the lower level device reports io-error to the upper layers</p>\n" +"\t\t<p><b>on-io-error</b>: What to do when the lower level device reports" +" io-error to the upper layers</p>\n" "\t\t<p><b>sndbuf-size</b>: The size of the TCP socket send buffer</p>\n" -"\t\t<p><b>max-buffers</b>: Maximum number of requests to be allocated by DRBD</p>\n" +"\t\t<p><b>max-buffers</b>: Maximum number of requests to be allocated by" +" DRBD</p>\n" "\n" -"\t\t<p><b>timeout</b>: If the partner node fails to send an expected response packet within time 10ths of a second, the partner node is considered dead and therefore the TCP/IP connection is abandoned. This must be lower than connect-int and ping-int. The default value is 60 = 6 seconds, the unit 0.1 seconds.</p>\n" -"\t\t<p><b>connect-int</b>: The time the peer has time to answer to a keep-alive packet. In case the peer's reply is not received within this time period, it is considered as dead. The default value is 500ms, the default unit is 100ms</p>\n" -"\t\t<p><b>ping-int</b>: The time the peer has time to answer to a keep-alive packet</p>\n" +"\t\t<p><b>timeout</b>: If the partner node fails to send an expected response" +" packet within time 10ths of a second, the partner node is considered dead" +" and therefore the TCP/IP connection is abandoned. This must be lower than" +" connect-int and ping-int. The default value is 60 = 6 seconds, the unit 0.1" +" seconds.</p>\n" +"\t\t<p><b>connect-int</b>: The time the peer has time to answer to a" +" keep-alive packet. In case the peer's reply is not received within this time" +" period, it is considered as dead. The default value is 500ms, the default" +" unit is 100ms</p>\n" +"\t\t<p><b>ping-int</b>: The time the peer has time to answer to a keep-alive" +" packet</p>\n" "\n" -"\t\t<p><b>max-epoch-size</b>: The highest number of data blocks between two write barriers</p>\n" -"\t\t<p><b>ko-count</b>: the secondary node fails to complete a single write request for count times the timeout, it is expelled from the cluster. The default value is 0, which disables this feature.</p>\n" -"\t\t<p><b>rate</b>: To ensure a smooth operation of the application on top of DRBD, it is possible to limit the bandwidth which may be used by background synchronizations. The default is 250 KB/sec, the default unit is KB/sec.</p>\n" -"\t\t<p><b>al-extents</b>: parameter you control how big the hot area (= active set) can get. The default number of extents is 127. (Minimum: 7, Maximum: 3843)</p>\n" +"\t\t<p><b>max-epoch-size</b>: The highest number of data blocks between two" +" write barriers</p>\n" +"\t\t<p><b>ko-count</b>: the secondary node fails to complete a single write" +" request for count times the timeout, it is expelled from the cluster. The" +" default value is 0, which disables this feature.</p>\n" +"\t\t<p><b>rate</b>: To ensure a smooth operation of the application on top" +" of DRBD, it is possible to limit the bandwidth which may be used by" +" background synchronizations. The default is 250 KB/sec, the default unit is" +" KB/sec.</p>\n" +"\t\t<p><b>al-extents</b>: parameter you control how big the hot area (=" +" active set) can get. The default number of extents is 127. (Minimum: 7," +" Maximum: 3843)</p>\n" "\t\t" #: src/include/drbd/helps.rb:112 -#, fuzzy #| msgid "<p><b><big>Connection Configuration</big></b></p>" msgid "<p><b><big>LVM Configuration</big></b></p>" -msgstr "<p><b><big>连接配置</big></b></p>" +msgstr "<p><b><big>LVM 配置</big></b></p>" #: src/include/drbd/helps.rb:115 msgid "" "\n" "\t\t<p><b>LVM configuration file /etc/lvm/lvm.conf</b></p>\n" -"\t\t<p>To use LVM with DRBD, it is necessary to change some options in the LVM configuration file and to remove stale cache entries on the nodes.</p>\t\t<p>Refer to 'man lvm.conf' for further information including the file layout.</p>\n" +"\t\t<p>To use LVM with DRBD, it is necessary to change some options in the" +" LVM configuration file and to remove stale cache entries on the nodes.</p" +">\t\t<p>Refer to 'man lvm.conf' for further information including the file" +" layout.</p>\n" "\t\t\t\t\t\t\t\t\t\t \n" -"\t\t<p><b>Device Filter</b>: This masks the underlying block device from the list of devices LVM scans for Physical Volume signatures. This way, LVM is instructed to read Physical Volume signatures from DRBD devices, rather than from the underlying backing block devices.</p>\t\t<p><b>AutoFilter</b>: According to the configuration of drbd, LVM filter will always be changed automatically. To change it manually, disable the checkbox of AutoFilter.</p>\n" -"\t\t<p>The filter consists of an array of regular expressions. These expressions can be delimited by a character of your choice, and prefixed with either an 'a' (for accept) or 'r' (for reject).</p>\t\t<p>For example, setting filter as [\"r|/dev/sda.*|\"]</p>\n" +"\t\t<p><b>Device Filter</b>: This masks the underlying block device from the" +" list of devices LVM scans for Physical Volume signatures. This way, LVM is" +" instructed to read Physical Volume signatures from DRBD devices, rather than" +" from the underlying backing block devices.</p>\t\t<p><b>AutoFilter</b>:" +" According to the configuration of drbd, LVM filter will always be changed" +" automatically. To change it manually, disable the checkbox of AutoFilter.</p" +">\n" +"\t\t<p>The filter consists of an array of regular expressions. These" +" expressions can be delimited by a character of your choice, and prefixed" +" with either an 'a' (for accept) or 'r' (for reject).</p>\t\t<p>For example," +" setting filter as [\"r|/dev/sda.*|\"]</p>\n" "\n" -"\t\t<p><b>LVM cache</b>: Enable/turn on writing the LVM cache is default. Disable cache when for network storage, like nfs. </p>\n" +"\t\t<p><b>LVM cache</b>: Enable/turn on writing the LVM cache is default." +" Disable cache when for network storage, like nfs. </p>\n" "\n" "\t\t" msgstr "" +"\n" +"\t\t<p><b>LVM 配置文件 /etc/lvm/lvm.conf</b></p>\n" +"\t\t<p>要在 DRBD 中使用 LVM，必须修改 LVM 配置文件中的一些选项并移除结点上的旧缓存项。</p>\t\t<p" +">更多消息，包括文件布局，请参考 'man lvm.conf'。</p>\n" +"\t\t\t\t\t\t\t\t\t\t \n" +"\t\t<p><b>设备过滤器</b>：这标记了来自 LVM 扫描物理卷签名得到的设备列表的底层块设备。通过这种方式，引导 LVM 从 DRBD" +" 设备读取物理卷，而不是从底层后备块设备读取。</p>\t\t<p><b>自动过滤器</b>：根据 DRBD 的配置，LVM" +" 过滤器将总是自动修改的。要手动修改，请禁用自动过滤器复选框。</p>\n" +"\t\t<p>过滤器由一个正则表达式列表组成。这些表达式可由您选择的一个字符分隔，并带有 'a' (接受) 或 'r' (拒绝) 前缀。</p>\t\t<" +"p>例如，这样设置过滤器 [\"r|/dev/sda.*|\"]</p>\n" +"\n" +"\t\t<p><b>LVM 缓存</b>：启用/开启写入 LVM 缓存是默认的。当使用网络存储如 NFS 时请禁用缓存。</p>\n" +"\n" +"\t\t" #: src/include/drbd/helps.rb:130 msgid "<p><b><big>Global Configuration of DRBD</big></b></p>" msgstr "<p><b><big>分布式复制块设备 (DRBD) 全局配置</big></b></p>" #: src/include/drbd/helps.rb:133 -msgid "<p>Check <b>\"Disable IP Verification\"</b> to disable one of drbdadm's sanity check</p>" +msgid "" +"<p>Check <b>\"Disable IP Verification\"</b> to disable one of drbdadm's" +" sanity check</p>" msgstr "<p>勾选<b>\"禁用 IP 验证\"</b>来禁用 drbdadm 的一个合理性检查</p>" #: src/include/drbd/helps.rb:136 msgid "" -"<p><b>Dialog Refresh:</b> The user dialog counts and displays the seconds it waited so\n" +"<p><b>Dialog Refresh:</b> The user dialog counts and displays the seconds it" +" waited so\n" " far. You might want to disable this if you have the console\n" " of your server connected to a serial terminal server with\n" " limited logging capacity.\n" -" The Dialog will print the count each 'dialog-refresh' seconds,\n" +" The Dialog will print the count each 'dialog-refresh'" +" seconds,\n" " set it to 0 to disable redrawing completely. </p>" msgstr "" "<p><b>对话框刷新：</b> 用户对话框计数并显示当前等待的秒数。\n" @@ -471,32 +562,28 @@ #. Default is always true (auto) #: src/include/drbd/lvm_conf.rb:36 -#, fuzzy #| msgid "Configuration of DRBD" msgid "LVM Filter Configuration of DRBD" -msgstr "分布式复制块设备 (DRBD) 配置" +msgstr "DRBD 的 LVM 过滤器配置" #: src/include/drbd/lvm_conf.rb:44 msgid "Modify LVM Device filter Automatically" -msgstr "" +msgstr "自动修改 LVM 设备过滤器" #: src/include/drbd/lvm_conf.rb:54 -#, fuzzy #| msgid "Device type" msgid "Device Filter" -msgstr "设备类型" +msgstr "设备过滤器" #: src/include/drbd/lvm_conf.rb:64 -#, fuzzy #| msgid "Writing the SCPM database..." msgid "Writing the LVM cache" -msgstr "正在写入 SCPM 数据库..." +msgstr "正在写入 LVM 缓存..." #: src/include/drbd/lvm_conf.rb:73 -#, fuzzy #| msgid "Enable Microphone." msgid "Enable LVM Cache" -msgstr "启用麦克风。" +msgstr "启用 LVM 缓存" #. encoding: utf-8 #: src/include/drbd/resource_conf.rb:134 @@ -532,10 +619,9 @@ msgstr "引导时" #: src/include/drbd/startup_conf.rb:37 -#, fuzzy #| msgid "On -- Start DRBD Server Now and when Booting" msgid "On -- Start DRBD Server when Booting" -msgstr "开 -- 立即以及在系统引导时启动分布式复制块设备 (DRBD) 服务器" +msgstr "开 -- 引导时启动 DRBD" #: src/include/drbd/startup_conf.rb:41 msgid "Off -- Server Only Starts Manually" @@ -648,20 +734,18 @@ msgstr "读取资源" #: src/modules/Drbd.rb:195 -#, fuzzy #| msgid "LVM configuration" msgid "Read LVM configurations" -msgstr "LVM 配置" +msgstr "读取 LVM 配置" #: src/modules/Drbd.rb:196 msgid "Read daemon status" msgstr "读取守护程序状态" #: src/modules/Drbd.rb:197 src/modules/Drbd.rb:204 -#, fuzzy #| msgid "Read Firewall Settings." msgid "Read SuSEFirewall Settings" -msgstr "读取防火墙设置。" +msgstr "读取 SuSEFirewall 设置。" #: src/modules/Drbd.rb:200 msgid "Reading global settings..." @@ -672,10 +756,9 @@ msgstr "正在读取资源..." #: src/modules/Drbd.rb:202 -#, fuzzy #| msgid "Reading the configuration..." msgid "Reading LVM configurations..." -msgstr "正在读取配置..." +msgstr "正在读取 LVM 配置..." #: src/modules/Drbd.rb:203 msgid "Reading daemon status..." @@ -724,20 +807,18 @@ msgstr "写入资源" #: src/modules/Drbd.rb:619 -#, fuzzy #| msgid "Write configuration" msgid "Write LVM configurations" -msgstr "写入配置" +msgstr "写入 LVM 配置" #: src/modules/Drbd.rb:620 msgid "Set daemon status" msgstr "设置守护程序状态" #: src/modules/Drbd.rb:621 -#, fuzzy #| msgid "Write the firewall settings" msgid "Write the SuSEfirewall settings" -msgstr "写入防火墙设置" +msgstr "写入 SuSEfirewall 设置" #: src/modules/Drbd.rb:624 msgid "Writing global settings..." @@ -748,20 +829,18 @@ msgstr "正在写入资源..." #: src/modules/Drbd.rb:626 -#, fuzzy #| msgid "Writing configuration..." msgid "Writing LVM configurations..." -msgstr "正在写入配置..." +msgstr "正在写入 LVM 配置..." #: src/modules/Drbd.rb:627 msgid "Setting daemon status..." msgstr "正在设置守护程序状态..." #: src/modules/Drbd.rb:628 -#, fuzzy #| msgid "Writing the firewall settings..." msgid "Writing the SuSEFirewall settings" -msgstr "正在写入防火墙设置..." +msgstr "正在写入 SuSEFirewall 设置..." #: src/modules/Drbd.rb:639 msgid "Failed to make directory /etc/drbd.d" Modified: trunk/yast/zh_CN/po/iscsi-client.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/iscsi-client.zh_CN.po 2016-03-02 14:28:39 UTC (rev 95706) +++ trunk/yast/zh_CN/po/iscsi-client.zh_CN.po 2016-03-03 15:48:11 UTC (rev 95707) @@ -10,7 +10,7 @@ "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-08-25 18:36+0200\n" -"PO-Revision-Date: 2016-03-02 22:23+0800\n" +"PO-Revision-Date: 2016-03-03 22:40+0800\n" "Last-Translator: marguerite <marguerite@opensuse.org>\n" "Language-Team: Chinese <kde-i18n-doc@kde.org>\n" "Language: zh_CN\n" @@ -116,10 +116,9 @@ msgstr "编辑" #: src/include/iscsi-client/dialogs.rb:161 -#, fuzzy #| msgid "Disconnected" msgid "Disconnect" -msgstr "已断开" +msgstr "断开" #: src/include/iscsi-client/dialogs.rb:186 msgid "Connected" @@ -354,7 +353,6 @@ msgstr "<p>当<b>读</b>/<b>写</b>访问一个 iSCSI 设备时，请确保此访问是排它的。否则会有潜在的数据损坏风险。</p>\n" #: src/include/iscsi-client/helps.rb:103 -#, fuzzy #| msgid "" #| "<p><b>InitiatorName</b> is a value from <tt>/etc/iscsi/initiatorname.iscsi</tt>. \n" #| "In case you have iBFT, this value will be added from there and you are only able to change it in the BIOS setup.</p>" @@ -364,7 +362,7 @@ "In case you have iBFT, this value will be added from there and you are only" " able to change it in the BIOS setup.</p>" msgstr "" -"<p><b>发起端名称</b> 是 <tt>/etc/initiatorname.iscsi</tt> 中的一个值。\n" +"<p><b>发起端名称</b> 是 <tt>/etc/iscsi/initiatorname.iscsi</tt> 中的一个值。\n" "若您有 iBFT，此值将从那里添加，并且您只能在 BIOS 设置中修改它。</p>" #: src/include/iscsi-client/helps.rb:106 @@ -417,10 +415,9 @@ "<p><b>自动</b>用于当 iSCSI 服务启动时自动连接的 iSCSI 目标。</p>\n" #: src/include/iscsi-client/helps.rb:141 -#, fuzzy #| msgid "Authentication" msgid "<h1>Authentication</h1>" -msgstr "身份验证" +msgstr "<h1>认证</h1>" #: src/include/iscsi-client/helps.rb:142 msgid "" @@ -508,13 +505,11 @@ #. regexp for "cz.suse" or just "suse", "cz.su-se" #: src/include/iscsi-client/widgets.rb:428 -#, fuzzy #| msgid "Initiator Name" msgid "Incorrect Initiator Name" -msgstr "发起人名称" +msgstr "不正确的发起端名称" #: src/include/iscsi-client/widgets.rb:429 -#, fuzzy #| msgid "" #| "Incorrect InitiatorName.\n" #| "The correct syntax is\n" @@ -534,13 +529,15 @@ "\n" "Do you want to use the name?\n" msgstr "" -"错误的发起端名称。\n" -"正确语法为\n" -"iqn.yyyy-mm.reversed domain name[:identifier]\n" +"\n" +"正确的语法为\n" +"iqn.yyyy-mm.reversed.domain.name[:identifier]\n" "或 eui:yyyy-mm.reversed.domain.name[:identifier]\n" "\n" "例如：\n" "iqn.2007-04.cz.server:storage.disk.sdb\n" +"\n" +"您想要使用该名称吗？\n" #. brackets needed around IPv6 #: src/include/iscsi-client/widgets.rb:635 Modified: trunk/yast/zh_CN/po/snapper.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/snapper.zh_CN.po 2016-03-02 14:28:39 UTC (rev 95706) +++ trunk/yast/zh_CN/po/snapper.zh_CN.po 2016-03-03 15:48:11 UTC (rev 95707) @@ -4,13 +4,13 @@ # Copyright (C) 2001 SuSE GmbH. # # Marguerite Su, 2012. -# 玛格丽特 · 苏 <i@marguerite.su>, 2013, 2014, 2015. +# 玛格丽特 · 苏 <i@marguerite.su>, 2013, 2014, 2015, 2016. msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-08-25 18:37+0200\n" -"PO-Revision-Date: 2015-10-18 12:24+0800\n" +"PO-Revision-Date: 2016-03-03 23:25+0800\n" "Last-Translator: marguerite <marguerite@opensuse.org>\n" "Language-Team: Chinese <kde-i18n-doc@kde.org>\n" "Language: zh_CN\n" @@ -96,7 +96,7 @@ #. radio button label #: src/include/snapper/dialogs.rb:255 msgid "Single snapshot" -msgstr "单一快照" +msgstr "单个快照" #. radio button label #. 0 means there's no post @@ -127,7 +127,7 @@ #. generate list of snapshot table items #: src/include/snapper/dialogs.rb:401 msgid "Single" -msgstr "单一快照" +msgstr "单个" #. pre canot be 0 #: src/include/snapper/dialogs.rb:426 @@ -168,7 +168,7 @@ #. button label #: src/include/snapper/dialogs.rb:503 msgid "Show Changes" -msgstr "显示修改" +msgstr "显示变化" #. button label #: src/include/snapper/dialogs.rb:506 @@ -217,7 +217,7 @@ #. label #: src/include/snapper/dialogs.rb:712 msgid "File content was not changed." -msgstr "未变动文件内容。" +msgstr "文件内容无变化。" #. label #: src/include/snapper/dialogs.rb:718 @@ -377,7 +377,6 @@ #. Summary dialog help: #: src/include/snapper/helps.rb:39 -#, fuzzy #| msgid "" #| "<p><b><big>Snapshots Configuration</big></b><p>\n" #| "<p>The table shows a list of root filesystem snapshots. There are three types\n" @@ -387,23 +386,27 @@ #| "new file system changes in the specified snapshot.</p>\n" msgid "" "<p><b><big>Snapshots Configuration</big></b><p>\n" -"<p>The table shows a list of root filesystem snapshots. There are three types\n" -"of snapshots, <b>single</b>, <b>pre</b> and <b>post</b>. Single snapshots are\n" -"used for storing the file system state in a certain time, while Pre and Post are used to define the changes done by special operation performed between taking those two snapshots. Pre and Post snapshots are paired together in the table.</p>\n" -"<p>Select a snapshot or snapshot pair and click <b>Show Changes</b> to see the\n" +"<p>The table shows a list of root filesystem snapshots. There are three" +" types\n" +"of snapshots, <b>single</b>, <b>pre</b> and <b>post</b>. Single snapshots" +" are\n" +"used for storing the file system state in a certain time, while Pre and Post" +" are used to define the changes done by special operation performed between" +" taking those two snapshots. Pre and Post snapshots are paired together in" +" the table.</p>\n" +"<p>Select a snapshot or snapshot pair and click <b>Show Changes</b> to see" +" the\n" "new file system changes in the specified snapshot.</p>\n" msgstr "" "<p><b><big>快照配置</big></b></p>\n" "<p>该表格显示了一份根文件系统快照列表。\n" -"有三种类型的快照，<b>单一</b>，<b>前期</b>和<b>后期</b>。\n" -"\"单一\" 类型的快照用于存储某一特定时间点的文件系统状态，\n" -"而 \"前期\" 和 \"后期\" 类型的快照用于定位在两次快照期间执行的某特殊操作造成的修改。\n" -"\"前期\" 和 \"后期\" 类型的快照在表格中是成对显示的。</p>\n" -"<p>选择一个快照或快照对，点击<b>显示修改</b>来查看指定快照中新的文件系统修改。</p>\n" +"有三种类型的快照，<b>单个</b>，<b>前期</b>和<b>后期</b>。\n" +"\"单个\" 快照用于存储某一特定时间点的文件系统状态，而 \"前期\" 和 \"后期\" 快照用于确定在两次快照期间执行的某特殊操作造成的修改。\n" +"\"前期\" 和 \"后期\" 快照在表格中是成对显示的。</p>\n" +"<p>选择一个快照或快照对，点击<b>显示变化</b>来查看指定快照中新的文件系统变化。</p>\n" #. Show snapshot dialog help #: src/include/snapper/helps.rb:48 -#, fuzzy #| msgid "" #| "<p><b><big>Snapshot Overview</big></b><p>\n" #| "<p>\n" @@ -415,25 +418,34 @@ msgid "" "<p><b><big>Snapshot Overview</big></b><p>\n" "<p>\n" -"The tree shows all the files that were modified between creating the first ('pre') and second ('post') snapshot. On the right side, you see the description generated when the first snapshot was created and the time of creation for both snapshots.\n" +"The tree shows all the files that were modified between creating the first" +" ('pre') and second ('post') snapshot. On the right side, you see the" +" description generated when the first snapshot was created and the time of" +" creation for both snapshots.\n" "</p>\n" "<p>\n" -"When a file is selected in the tree, you see the changes done to it. By default, changes between selected paired snapshots are shown, but it is possible to compare the file with different versions.\n" +"When a file is selected in the tree, you see the changes done to it. By" +" default, changes between selected paired snapshots are shown, but it is" +" possible to compare the file with different versions.\n" "</p>\n" msgstr "" "<p><b><big>快照概览</big></b></p>\n" -"<p>该树形结构显示了创建第一个 ('前期') 和第二个 ('后期') 快照期间被修改的全部文件。在右侧，您可以看到第一个快照创建时生成的描述和两个快照的创建时间。</p>\n" -"<p>当选中该树形结构中的某个文件时，您可以看到其修改。默认显示了所选快照对之间的差异，但也可以比较该文件的不同版本。</p>\n" +"<p>该树形结构显示了创建第一个 ('前期') 和第二个 ('后期') 快照期间被修改的全部文件。在右侧，您可以看到第一个快照创建时生成的描述和两个快照的创" +"建时间。</p>\n" +"<p>当选中该树形结构中的某个文件时，您可以看到其修订历史。默认显示了所选快照对之间的差异，但也可以比较该文件的不同版本。</p>\n" #. Show snapshot dialog help, alternative for single snapshots #: src/include/snapper/helps.rb:58 msgid "" "<p><b><big>Snapshot Overview</big></b><p>\n" "<p>\n" -"The tree shows all the files that differ in a selected snapshot and the current system. On the right side, you see the snapshot description and time of its creation.\n" +"The tree shows all the files that differ in a selected snapshot and the" +" current system. On the right side, you see the snapshot description and time" +" of its creation.\n" "</p>\n" "<p>\n" -"When a file is selected in the tree, you can see the its difference between snapshot version and current system.\n" +"When a file is selected in the tree, you can see the its difference between" +" snapshot version and current system.\n" "</p>\n" msgstr "" "<p><b><big>快照概览</big></b></p>\n"