Binary files /tmp/KTVAV8DzDF/language-pack-zh-hans-base-12.04+20130128/data/extra.tar and /tmp/6919_9sRnK/language-pack-zh-hans-base-12.04+20140106/data/extra.tar differ diff -Nru language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/FontForge.po language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/FontForge.po --- language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/FontForge.po 2013-01-29 09:37:12.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/FontForge.po 2014-01-07 07:01:18.000000000 +0000 @@ -18,8 +18,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2013-01-28 11:12+0000\n" -"X-Generator: Launchpad (build 16451)\n" +"X-Launchpad-Export-Date: 2014-01-06 11:14+0000\n" +"X-Generator: Launchpad (build 16877)\n" # #: alignment.c:297 anchorsaway.c:1274 combinations.c:1115 cvhints.c:483 diff -Nru language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/JabberBot.po language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/JabberBot.po --- language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/JabberBot.po 2013-01-29 09:37:09.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/JabberBot.po 2014-01-07 07:01:24.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-01-28 12:04+0000\n" -"X-Generator: Launchpad (build 16451)\n" +"X-Launchpad-Export-Date: 2014-01-06 12:17+0000\n" +"X-Generator: Launchpad (build 16877)\n" #, python-format msgid "" diff -Nru language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/Linux-PAM.po language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/Linux-PAM.po --- language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/Linux-PAM.po 2013-01-29 09:37:11.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/Linux-PAM.po 2014-01-07 07:01:23.000000000 +0000 @@ -17,8 +17,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2013-01-28 11:58+0000\n" -"X-Generator: Launchpad (build 16451)\n" +"X-Launchpad-Export-Date: 2014-01-06 12:09+0000\n" +"X-Generator: Launchpad (build 16877)\n" #: libpam_misc/misc_conv.c:33 msgid "...Time is running out...\n" diff -Nru language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/MoinMoin.po language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/MoinMoin.po --- language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/MoinMoin.po 2013-01-29 09:37:09.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/MoinMoin.po 2014-01-07 07:01:24.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-01-28 12:04+0000\n" -"X-Generator: Launchpad (build 16451)\n" +"X-Launchpad-Export-Date: 2014-01-06 12:17+0000\n" +"X-Generator: Launchpad (build 16877)\n" msgid "The wiki is currently not reachable." msgstr "此 wiki 目前无法访问。" diff -Nru language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/NetworkManager.po language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/NetworkManager.po --- language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/NetworkManager.po 2013-01-29 09:37:08.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/NetworkManager.po 2014-01-07 07:01:39.000000000 +0000 @@ -13,15 +13,15 @@ "Report-Msgid-Bugs-To: " "http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager&component=gene" "ral\n" -"POT-Creation-Date: 2012-10-16 23:04+0000\n" +"POT-Creation-Date: 2013-10-17 21:31+0000\n" "PO-Revision-Date: 2011-06-01 00:01+0000\n" -"Last-Translator: Aron Xu \n" +"Last-Translator: Aron Xu \n" "Language-Team: Chinese (simplified) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-01-28 13:56+0000\n" -"X-Generator: Launchpad (build 16451)\n" +"X-Launchpad-Export-Date: 2014-01-06 14:23+0000\n" +"X-Generator: Launchpad (build 16877)\n" #: ../cli/src/common.c:32 ../cli/src/common.c:44 ../cli/src/common.c:52 #: ../cli/src/common.c:63 ../cli/src/connections.c:133 @@ -62,9 +62,10 @@ #. 0 #. used only for 'GENERAL' group listing #: ../cli/src/connections.c:60 ../cli/src/connections.c:134 -#: ../cli/src/devices.c:108 ../cli/src/devices.c:132 ../cli/src/devices.c:142 -#: ../cli/src/devices.c:152 ../cli/src/devices.c:166 ../cli/src/devices.c:180 -#: ../cli/src/devices.c:202 ../cli/src/devices.c:218 ../cli/src/devices.c:227 +#: ../cli/src/devices.c:109 ../cli/src/devices.c:134 ../cli/src/devices.c:144 +#: ../cli/src/devices.c:154 ../cli/src/devices.c:164 ../cli/src/devices.c:180 +#: ../cli/src/devices.c:194 ../cli/src/devices.c:216 ../cli/src/devices.c:232 +#: ../cli/src/devices.c:241 msgid "NAME" msgstr "名称" @@ -79,7 +80,7 @@ #. 1 #. 2 #: ../cli/src/connections.c:62 ../cli/src/connections.c:168 -#: ../cli/src/devices.c:72 ../cli/src/devices.c:110 ../cli/src/devices.c:205 +#: ../cli/src/devices.c:72 ../cli/src/devices.c:111 ../cli/src/devices.c:219 msgid "TYPE" msgstr "类型" @@ -95,7 +96,7 @@ #. 4 #. 13 -#: ../cli/src/connections.c:65 ../cli/src/devices.c:122 +#: ../cli/src/connections.c:65 ../cli/src/devices.c:123 msgid "AUTOCONNECT" msgstr "自动连接" @@ -110,7 +111,7 @@ #. 11 #. 5 #: ../cli/src/connections.c:67 ../cli/src/connections.c:142 -#: ../cli/src/devices.c:74 ../cli/src/devices.c:192 ../cli/src/devices.c:208 +#: ../cli/src/devices.c:74 ../cli/src/devices.c:206 ../cli/src/devices.c:222 msgid "DBUS-PATH" msgstr "" @@ -124,7 +125,7 @@ #. 8 #. 1 #: ../cli/src/connections.c:137 ../cli/src/devices.c:73 -#: ../cli/src/devices.c:117 ../cli/src/network-manager.c:39 +#: ../cli/src/devices.c:118 ../cli/src/network-manager.c:39 msgid "STATE" msgstr "状态" @@ -198,7 +199,7 @@ msgid "CFG" msgstr "" -#: ../cli/src/connections.c:190 +#: ../cli/src/connections.c:186 #, c-format msgid "" "Usage: nmcli con { COMMAND | help }\n" @@ -214,12 +215,12 @@ " delete id | uuid \n" msgstr "" -#: ../cli/src/connections.c:256 ../cli/src/connections.c:634 +#: ../cli/src/connections.c:256 ../cli/src/connections.c:442 #, c-format msgid "Error: 'con list': %s" msgstr "错误：'con list': %s" -#: ../cli/src/connections.c:258 ../cli/src/connections.c:636 +#: ../cli/src/connections.c:258 ../cli/src/connections.c:444 #, c-format msgid "Error: 'con list': %s; allowed fields: %s" msgstr "错误：'con list': %s；允许的字段：%s" @@ -228,271 +229,273 @@ msgid "Connection details" msgstr "连接详情" -#: ../cli/src/connections.c:509 +#: ../cli/src/connections.c:317 msgid "never" msgstr "从不" #. "CAPABILITIES" #. Print header #. "WIFI-PROPERTIES" -#: ../cli/src/connections.c:510 ../cli/src/connections.c:511 -#: ../cli/src/connections.c:739 ../cli/src/connections.c:740 -#: ../cli/src/connections.c:742 ../cli/src/devices.c:444 -#: ../cli/src/devices.c:497 ../cli/src/devices.c:615 ../cli/src/devices.c:616 -#: ../cli/src/devices.c:617 ../cli/src/devices.c:649 ../cli/src/devices.c:676 -#: ../cli/src/devices.c:677 ../cli/src/devices.c:678 ../cli/src/devices.c:679 -#: ../cli/src/devices.c:680 ../cli/src/network-manager.c:267 -#: ../cli/src/settings.c:748 ../cli/src/settings.c:823 -#: ../cli/src/settings.c:943 ../cli/src/settings.c:1226 -#: ../cli/src/settings.c:1227 ../cli/src/settings.c:1229 -#: ../cli/src/settings.c:1231 ../cli/src/settings.c:1232 -#: ../cli/src/settings.c:1363 ../cli/src/settings.c:1364 -#: ../cli/src/settings.c:1365 ../cli/src/settings.c:1366 -#: ../cli/src/settings.c:1443 ../cli/src/settings.c:1444 -#: ../cli/src/settings.c:1445 ../cli/src/settings.c:1446 -#: ../cli/src/settings.c:1447 ../cli/src/settings.c:1448 -#: ../cli/src/settings.c:1449 ../cli/src/settings.c:1450 -#: ../cli/src/settings.c:1451 ../cli/src/settings.c:1452 -#: ../cli/src/settings.c:1453 ../cli/src/settings.c:1454 -#: ../cli/src/settings.c:1455 ../cli/src/settings.c:1526 -#: ../cli/src/settings.c:1869 ../cli/src/settings.c:1906 +#: ../cli/src/connections.c:318 ../cli/src/connections.c:319 +#: ../cli/src/connections.c:552 ../cli/src/connections.c:553 +#: ../cli/src/connections.c:555 ../cli/src/devices.c:458 +#: ../cli/src/devices.c:511 ../cli/src/devices.c:629 ../cli/src/devices.c:630 +#: ../cli/src/devices.c:631 ../cli/src/devices.c:663 ../cli/src/devices.c:690 +#: ../cli/src/devices.c:691 ../cli/src/devices.c:692 ../cli/src/devices.c:693 +#: ../cli/src/devices.c:694 ../cli/src/devices.c:695 ../cli/src/devices.c:696 +#: ../cli/src/network-manager.c:267 ../cli/src/settings.c:866 +#: ../cli/src/settings.c:941 ../cli/src/settings.c:1076 +#: ../cli/src/settings.c:1166 ../cli/src/settings.c:1376 +#: ../cli/src/settings.c:1377 ../cli/src/settings.c:1379 +#: ../cli/src/settings.c:1381 ../cli/src/settings.c:1382 +#: ../cli/src/settings.c:1513 ../cli/src/settings.c:1514 +#: ../cli/src/settings.c:1515 ../cli/src/settings.c:1516 +#: ../cli/src/settings.c:1594 ../cli/src/settings.c:1595 +#: ../cli/src/settings.c:1596 ../cli/src/settings.c:1597 +#: ../cli/src/settings.c:1598 ../cli/src/settings.c:1599 +#: ../cli/src/settings.c:1600 ../cli/src/settings.c:1601 +#: ../cli/src/settings.c:1602 ../cli/src/settings.c:1603 +#: ../cli/src/settings.c:1604 ../cli/src/settings.c:1605 +#: ../cli/src/settings.c:1606 ../cli/src/settings.c:1688 +#: ../cli/src/settings.c:2044 ../cli/src/settings.c:2081 msgid "yes" msgstr "是" -#: ../cli/src/connections.c:510 ../cli/src/connections.c:511 -#: ../cli/src/connections.c:739 ../cli/src/connections.c:740 -#: ../cli/src/connections.c:742 ../cli/src/devices.c:444 -#: ../cli/src/devices.c:497 ../cli/src/devices.c:615 ../cli/src/devices.c:616 -#: ../cli/src/devices.c:617 ../cli/src/devices.c:649 ../cli/src/devices.c:676 -#: ../cli/src/devices.c:677 ../cli/src/devices.c:678 ../cli/src/devices.c:679 -#: ../cli/src/devices.c:680 ../cli/src/network-manager.c:269 -#: ../cli/src/settings.c:748 ../cli/src/settings.c:750 -#: ../cli/src/settings.c:823 ../cli/src/settings.c:943 -#: ../cli/src/settings.c:1226 ../cli/src/settings.c:1227 -#: ../cli/src/settings.c:1229 ../cli/src/settings.c:1231 -#: ../cli/src/settings.c:1232 ../cli/src/settings.c:1363 -#: ../cli/src/settings.c:1364 ../cli/src/settings.c:1365 -#: ../cli/src/settings.c:1366 ../cli/src/settings.c:1443 -#: ../cli/src/settings.c:1444 ../cli/src/settings.c:1445 -#: ../cli/src/settings.c:1446 ../cli/src/settings.c:1447 -#: ../cli/src/settings.c:1448 ../cli/src/settings.c:1449 -#: ../cli/src/settings.c:1450 ../cli/src/settings.c:1451 -#: ../cli/src/settings.c:1452 ../cli/src/settings.c:1453 -#: ../cli/src/settings.c:1454 ../cli/src/settings.c:1455 -#: ../cli/src/settings.c:1526 ../cli/src/settings.c:1869 -#: ../cli/src/settings.c:1906 +#: ../cli/src/connections.c:318 ../cli/src/connections.c:319 +#: ../cli/src/connections.c:552 ../cli/src/connections.c:553 +#: ../cli/src/connections.c:555 ../cli/src/devices.c:458 +#: ../cli/src/devices.c:511 ../cli/src/devices.c:629 ../cli/src/devices.c:630 +#: ../cli/src/devices.c:631 ../cli/src/devices.c:663 ../cli/src/devices.c:690 +#: ../cli/src/devices.c:691 ../cli/src/devices.c:692 ../cli/src/devices.c:693 +#: ../cli/src/devices.c:694 ../cli/src/devices.c:695 ../cli/src/devices.c:696 +#: ../cli/src/network-manager.c:269 ../cli/src/settings.c:866 +#: ../cli/src/settings.c:868 ../cli/src/settings.c:941 +#: ../cli/src/settings.c:1076 ../cli/src/settings.c:1166 +#: ../cli/src/settings.c:1376 ../cli/src/settings.c:1377 +#: ../cli/src/settings.c:1379 ../cli/src/settings.c:1381 +#: ../cli/src/settings.c:1382 ../cli/src/settings.c:1513 +#: ../cli/src/settings.c:1514 ../cli/src/settings.c:1515 +#: ../cli/src/settings.c:1516 ../cli/src/settings.c:1594 +#: ../cli/src/settings.c:1595 ../cli/src/settings.c:1596 +#: ../cli/src/settings.c:1597 ../cli/src/settings.c:1598 +#: ../cli/src/settings.c:1599 ../cli/src/settings.c:1600 +#: ../cli/src/settings.c:1601 ../cli/src/settings.c:1602 +#: ../cli/src/settings.c:1603 ../cli/src/settings.c:1604 +#: ../cli/src/settings.c:1605 ../cli/src/settings.c:1606 +#: ../cli/src/settings.c:1688 ../cli/src/settings.c:2044 +#: ../cli/src/settings.c:2081 msgid "no" msgstr "否" -#: ../cli/src/connections.c:585 +#: ../cli/src/connections.c:393 msgid "Connection list" msgstr "" -#: ../cli/src/connections.c:598 ../cli/src/connections.c:1135 -#: ../cli/src/connections.c:1673 ../cli/src/connections.c:1688 -#: ../cli/src/connections.c:1697 ../cli/src/connections.c:1707 -#: ../cli/src/connections.c:1719 ../cli/src/connections.c:1828 -#: ../cli/src/connections.c:1930 ../cli/src/devices.c:1127 -#: ../cli/src/devices.c:1137 ../cli/src/devices.c:1255 -#: ../cli/src/devices.c:1263 ../cli/src/devices.c:1627 -#: ../cli/src/devices.c:1634 ../cli/src/devices.c:1648 -#: ../cli/src/devices.c:1655 ../cli/src/devices.c:1672 -#: ../cli/src/devices.c:1683 ../cli/src/devices.c:1904 -#: ../cli/src/devices.c:1911 +#: ../cli/src/connections.c:406 ../cli/src/connections.c:948 +#: ../cli/src/connections.c:1486 ../cli/src/connections.c:1501 +#: ../cli/src/connections.c:1510 ../cli/src/connections.c:1520 +#: ../cli/src/connections.c:1532 ../cli/src/connections.c:1641 +#: ../cli/src/connections.c:1743 ../cli/src/devices.c:1192 +#: ../cli/src/devices.c:1202 ../cli/src/devices.c:1320 +#: ../cli/src/devices.c:1328 ../cli/src/devices.c:1692 +#: ../cli/src/devices.c:1699 ../cli/src/devices.c:1713 +#: ../cli/src/devices.c:1720 ../cli/src/devices.c:1737 +#: ../cli/src/devices.c:1748 ../cli/src/devices.c:1969 +#: ../cli/src/devices.c:1976 #, c-format msgid "Error: %s argument is missing." msgstr "错误：缺少 %s 参数。" -#: ../cli/src/connections.c:611 +#: ../cli/src/connections.c:419 #, c-format msgid "Error: %s - no such connection." msgstr "错误：%s - 没有这个连接。" -#: ../cli/src/connections.c:617 ../cli/src/connections.c:1732 -#: ../cli/src/connections.c:1845 ../cli/src/connections.c:1937 -#: ../cli/src/devices.c:911 ../cli/src/devices.c:991 ../cli/src/devices.c:1151 -#: ../cli/src/devices.c:1269 ../cli/src/devices.c:1696 -#: ../cli/src/devices.c:1917 +#: ../cli/src/connections.c:425 ../cli/src/connections.c:1545 +#: ../cli/src/connections.c:1658 ../cli/src/connections.c:1750 +#: ../cli/src/devices.c:976 ../cli/src/devices.c:1056 +#: ../cli/src/devices.c:1216 ../cli/src/devices.c:1334 +#: ../cli/src/devices.c:1761 ../cli/src/devices.c:1982 #, c-format msgid "Unknown parameter: %s\n" msgstr "未知参数：%s\n" -#: ../cli/src/connections.c:626 +#: ../cli/src/connections.c:434 #, c-format msgid "Error: no valid parameter specified." msgstr "错误：没有指定有效参数。" -#: ../cli/src/connections.c:641 ../cli/src/connections.c:2033 -#: ../cli/src/devices.c:2128 ../cli/src/network-manager.c:599 +#: ../cli/src/connections.c:449 ../cli/src/connections.c:1846 +#: ../cli/src/devices.c:2193 ../cli/src/network-manager.c:599 #, c-format msgid "Error: %s." msgstr "错误：%s。" -#: ../cli/src/connections.c:654 +#: ../cli/src/connections.c:462 msgid "activating" msgstr "激活中" -#: ../cli/src/connections.c:656 +#: ../cli/src/connections.c:464 msgid "activated" msgstr "已激活" -#: ../cli/src/common.c:386 ../cli/src/connections.c:658 +#: ../cli/src/common.c:386 ../cli/src/connections.c:466 msgid "deactivating" msgstr "" -#: ../cli/src/common.c:390 ../cli/src/connections.c:661 -#: ../cli/src/connections.c:684 ../cli/src/connections.c:1376 -#: ../cli/src/devices.c:650 ../cli/src/network-manager.c:123 +#: ../cli/src/common.c:390 ../cli/src/connections.c:471 +#: ../cli/src/connections.c:494 ../cli/src/connections.c:1189 +#: ../cli/src/devices.c:664 ../cli/src/network-manager.c:123 #: ../cli/src/network-manager.c:185 ../cli/src/network-manager.c:188 #: ../cli/src/network-manager.c:197 ../cli/src/network-manager.c:257 #: ../cli/src/network-manager.c:273 ../cli/src/network-manager.c:431 #: ../cli/src/network-manager.c:486 ../cli/src/network-manager.c:524 -#: ../cli/src/network-manager.c:563 ../cli/src/settings.c:629 -#: ../cli/src/settings.c:657 ../cli/src/utils.c:533 ../src/main.c:434 -#: ../src/main.c:453 +#: ../cli/src/network-manager.c:563 ../cli/src/settings.c:661 +#: ../cli/src/settings.c:689 ../cli/src/settings.c:751 ../cli/src/utils.c:533 +#: ../src/main.c:435 ../src/main.c:454 msgid "unknown" msgstr "未知" -#: ../cli/src/connections.c:670 +#: ../cli/src/connections.c:480 msgid "VPN connecting (prepare)" msgstr "VPN 连接(准备)" -#: ../cli/src/connections.c:672 +#: ../cli/src/connections.c:482 msgid "VPN connecting (need authentication)" msgstr "VPN 连接中(需要验证)" -#: ../cli/src/connections.c:674 +#: ../cli/src/connections.c:484 msgid "VPN connecting" msgstr "VPN 连接中" -#: ../cli/src/connections.c:676 +#: ../cli/src/connections.c:486 msgid "VPN connecting (getting IP configuration)" msgstr "VPN 连接中(获取 IP 配置)" -#: ../cli/src/connections.c:678 +#: ../cli/src/connections.c:488 msgid "VPN connected" msgstr "VPN 连接" -#: ../cli/src/connections.c:680 +#: ../cli/src/connections.c:490 msgid "VPN connection failed" msgstr "VPN 连接失败" -#: ../cli/src/connections.c:682 +#: ../cli/src/connections.c:492 msgid "VPN disconnected" msgstr "断开 VPN 连接" -#: ../cli/src/connections.c:939 ../cli/src/connections.c:1163 +#: ../cli/src/connections.c:752 ../cli/src/connections.c:976 #, c-format msgid "Error: 'con status': %s" msgstr "错误：'con status': %s" -#: ../cli/src/connections.c:941 ../cli/src/connections.c:1165 +#: ../cli/src/connections.c:754 ../cli/src/connections.c:978 #, c-format msgid "Error: 'con status': %s; allowed fields: %s" msgstr "错误：'con status': %s；允许的字段：%s" -#: ../cli/src/connections.c:949 +#: ../cli/src/connections.c:762 msgid "Active connection details" msgstr "" -#: ../cli/src/connections.c:1085 ../cli/src/connections.c:1747 -#: ../cli/src/connections.c:1860 ../cli/src/connections.c:1951 -#: ../cli/src/devices.c:938 ../cli/src/devices.c:1000 -#: ../cli/src/devices.c:1166 ../cli/src/devices.c:1299 -#: ../cli/src/devices.c:1718 ../cli/src/devices.c:1946 +#: ../cli/src/connections.c:898 ../cli/src/connections.c:1560 +#: ../cli/src/connections.c:1673 ../cli/src/connections.c:1764 +#: ../cli/src/devices.c:1003 ../cli/src/devices.c:1065 +#: ../cli/src/devices.c:1231 ../cli/src/devices.c:1364 +#: ../cli/src/devices.c:1783 ../cli/src/devices.c:2011 #: ../cli/src/network-manager.c:311 #, c-format msgid "Error: Can't find out if NetworkManager is running: %s." msgstr "" -#: ../cli/src/connections.c:1089 ../cli/src/connections.c:1751 -#: ../cli/src/connections.c:1864 ../cli/src/connections.c:1955 -#: ../cli/src/devices.c:942 ../cli/src/devices.c:1004 -#: ../cli/src/devices.c:1170 ../cli/src/devices.c:1303 -#: ../cli/src/devices.c:1722 ../cli/src/devices.c:1950 +#: ../cli/src/connections.c:902 ../cli/src/connections.c:1564 +#: ../cli/src/connections.c:1677 ../cli/src/connections.c:1768 +#: ../cli/src/devices.c:1007 ../cli/src/devices.c:1069 +#: ../cli/src/devices.c:1235 ../cli/src/devices.c:1368 +#: ../cli/src/devices.c:1787 ../cli/src/devices.c:2015 #: ../cli/src/network-manager.c:315 #, c-format msgid "Error: NetworkManager is not running." msgstr "" -#: ../cli/src/connections.c:1121 +#: ../cli/src/connections.c:934 msgid "Active connections" msgstr "活跃连接" -#: ../cli/src/connections.c:1146 +#: ../cli/src/connections.c:959 #, c-format msgid "Error: '%s' is not an active connection." msgstr "" -#: ../cli/src/connections.c:1151 +#: ../cli/src/connections.c:964 #, c-format msgid "Error: unknown parameter: %s" msgstr "" -#: ../cli/src/connections.c:1258 +#: ../cli/src/connections.c:1071 #, c-format msgid "no active connection on device '%s'" msgstr "设备 '%s' 中没有活跃连接" -#: ../cli/src/connections.c:1266 +#: ../cli/src/connections.c:1079 msgid "no active connection or device" msgstr "没有活跃连接或者设备" -#: ../cli/src/connections.c:1337 +#: ../cli/src/connections.c:1150 #, c-format msgid "device '%s' not compatible with connection '%s'" msgstr "设备 '%s' 不兼容连接 '%s'" -#: ../cli/src/connections.c:1340 +#: ../cli/src/connections.c:1153 #, c-format msgid "no device found for connection '%s'" msgstr "没有找到可用于连接 '%s' 的设备" -#: ../cli/src/connections.c:1352 +#: ../cli/src/connections.c:1165 msgid "unknown reason" msgstr "未知原因" -#: ../cli/src/connections.c:1354 +#: ../cli/src/connections.c:1167 msgid "none" msgstr "无" -#: ../cli/src/connections.c:1356 +#: ../cli/src/connections.c:1169 msgid "the user was disconnected" msgstr "用户已断开连接" -#: ../cli/src/connections.c:1358 +#: ../cli/src/connections.c:1171 msgid "the base network connection was interrupted" msgstr "基点网络连接中断" -#: ../cli/src/connections.c:1360 +#: ../cli/src/connections.c:1173 msgid "the VPN service stopped unexpectedly" msgstr "VPN 服务意外停止" -#: ../cli/src/connections.c:1362 +#: ../cli/src/connections.c:1175 msgid "the VPN service returned invalid configuration" msgstr "VPN 服务返回无效配置" -#: ../cli/src/connections.c:1364 +#: ../cli/src/connections.c:1177 msgid "the connection attempt timed out" msgstr "连接尝试超时" -#: ../cli/src/connections.c:1366 +#: ../cli/src/connections.c:1179 msgid "the VPN service did not start in time" msgstr "VPN 连接没有按时启动" -#: ../cli/src/connections.c:1368 +#: ../cli/src/connections.c:1181 msgid "the VPN service failed to start" msgstr "VPN 服务启动失败" -#: ../cli/src/connections.c:1370 +#: ../cli/src/connections.c:1183 msgid "no valid VPN secrets" msgstr "没有有效的 VPN 加密" -#: ../cli/src/connections.c:1372 +#: ../cli/src/connections.c:1185 msgid "invalid VPN secrets" msgstr "无效 VPN 加密" -#: ../cli/src/connections.c:1374 +#: ../cli/src/connections.c:1187 msgid "the connection was removed" msgstr "连接被删除" @@ -507,7 +510,7 @@ msgstr "连接已激活\n" #. Active connection failed and dissapeared, quit. -#: ../cli/src/connections.c:1396 ../cli/src/connections.c:1497 +#: ../cli/src/connections.c:1209 ../cli/src/connections.c:1310 #, c-format msgid "Error: Connection activation failed." msgstr "错误：激活连接失败。" @@ -517,17 +520,17 @@ msgid "state: %s (%d)\n" msgstr "状态：%s (%d)\n" -#: ../cli/src/connections.c:1429 +#: ../cli/src/connections.c:1242 #, c-format msgid "Error: Connection activation failed: %s." msgstr "错误：激活连接失败：%s。" -#: ../cli/src/connections.c:1526 ../cli/src/devices.c:1060 +#: ../cli/src/connections.c:1339 ../cli/src/devices.c:1125 #, c-format msgid "Error: Timeout %d sec expired." msgstr "错误：超时 %d 秒过期。" -#: ../cli/src/connections.c:1587 +#: ../cli/src/connections.c:1400 #, c-format msgid "Error: Connection activation failed: %s" msgstr "错误：激活连接失败：%s" @@ -542,60 +545,60 @@ msgid "Active connection path: %s\n" msgstr "活跃连接路径：%s\n" -#: ../cli/src/connections.c:1681 ../cli/src/connections.c:1836 -#: ../cli/src/connections.c:1964 +#: ../cli/src/connections.c:1494 ../cli/src/connections.c:1649 +#: ../cli/src/connections.c:1777 #, c-format msgid "Error: Unknown connection: %s." msgstr "错误：未知连接：%s" -#: ../cli/src/connections.c:1727 ../cli/src/devices.c:1145 -#: ../cli/src/devices.c:1691 +#: ../cli/src/connections.c:1540 ../cli/src/devices.c:1210 +#: ../cli/src/devices.c:1756 #, c-format msgid "Error: timeout value '%s' is not valid." msgstr "错误：超时值 '%s' 无效。" -#: ../cli/src/connections.c:1740 ../cli/src/connections.c:1853 -#: ../cli/src/connections.c:1944 +#: ../cli/src/connections.c:1553 ../cli/src/connections.c:1666 +#: ../cli/src/connections.c:1757 #, c-format msgid "Error: id or uuid has to be specified." msgstr "错误：必须指定 ID 或者 UUID。" -#: ../cli/src/connections.c:1773 +#: ../cli/src/connections.c:1586 #, c-format msgid "Error: No suitable device found: %s." msgstr "错误：没有找到合适的设备：%s。" -#: ../cli/src/connections.c:1775 +#: ../cli/src/connections.c:1588 #, c-format msgid "Error: No suitable device found." msgstr "错误：没有找到合适的设备。" -#: ../cli/src/connections.c:1889 +#: ../cli/src/connections.c:1702 #, c-format msgid "Warning: Connection not active\n" msgstr "警告：连接没有激活\n" -#: ../cli/src/connections.c:1903 +#: ../cli/src/connections.c:1716 #, c-format msgid "Error: Connection deletion failed: %s" msgstr "" -#: ../cli/src/connections.c:2024 +#: ../cli/src/connections.c:1837 #, c-format msgid "Error: 'con' command '%s' is not valid." msgstr "错误：'con' 命令 '%s' 无效。" -#: ../cli/src/connections.c:2092 +#: ../cli/src/connections.c:1905 #, c-format msgid "Error: could not connect to D-Bus." msgstr "错误：无法连接到 D-Bus。" -#: ../cli/src/connections.c:2100 +#: ../cli/src/connections.c:1913 #, c-format msgid "Error: Could not get system settings." msgstr "错误：无法获得系统设置。" -#: ../cli/src/connections.c:2110 +#: ../cli/src/connections.c:1923 #, c-format msgid "Error: Can't obtain connections: settings service is not running." msgstr "" @@ -603,8 +606,8 @@ #. 0 #. 9 #. 3 -#: ../cli/src/devices.c:71 ../cli/src/devices.c:109 ../cli/src/devices.c:190 -#: ../cli/src/devices.c:206 +#: ../cli/src/devices.c:71 ../cli/src/devices.c:110 ../cli/src/devices.c:204 +#: ../cli/src/devices.c:220 msgid "DEVICE" msgstr "设备" @@ -619,7 +622,8 @@ msgstr "WIFI 属性" #. 2 -#: ../cli/src/devices.c:86 +#. 5 +#: ../cli/src/devices.c:86 ../cli/src/devices.c:170 msgid "AP" msgstr "AP" @@ -635,7 +639,7 @@ #. 5 #. 0 -#: ../cli/src/devices.c:89 ../cli/src/devices.c:203 +#: ../cli/src/devices.c:89 ../cli/src/devices.c:217 msgid "NSP" msgstr "" @@ -660,169 +664,169 @@ msgstr "" #. 2 -#: ../cli/src/devices.c:111 +#: ../cli/src/devices.c:112 msgid "VENDOR" msgstr "" #. 3 -#: ../cli/src/devices.c:112 +#: ../cli/src/devices.c:113 msgid "PRODUCT" msgstr "" #. 4 -#: ../cli/src/devices.c:113 +#: ../cli/src/devices.c:114 msgid "DRIVER" msgstr "驱动程序" #. 7 -#: ../cli/src/devices.c:116 +#: ../cli/src/devices.c:117 msgid "HWADDR" msgstr "硬盘" #. 9 -#: ../cli/src/devices.c:118 +#: ../cli/src/devices.c:119 msgid "REASON" msgstr "" #. 10 -#: ../cli/src/devices.c:119 +#: ../cli/src/devices.c:120 msgid "UDI" msgstr "" #. 11 -#: ../cli/src/devices.c:120 +#: ../cli/src/devices.c:121 msgid "IP-IFACE" msgstr "" #. 12 -#: ../cli/src/devices.c:121 +#: ../cli/src/devices.c:122 msgid "NM-MANAGED" msgstr "" #. 14 -#: ../cli/src/devices.c:123 +#: ../cli/src/devices.c:124 msgid "FIRMWARE-MISSING" msgstr "" #. 15 -#: ../cli/src/devices.c:124 +#: ../cli/src/devices.c:125 msgid "CONNECTION" msgstr "" #. 0 -#: ../cli/src/devices.c:133 +#: ../cli/src/devices.c:145 msgid "CARRIER-DETECT" msgstr "容器探测" #. 1 -#: ../cli/src/devices.c:134 +#: ../cli/src/devices.c:146 msgid "SPEED" msgstr "速度" #. 0 -#: ../cli/src/devices.c:143 +#: ../cli/src/devices.c:155 msgid "CARRIER" msgstr "容器" #. 0 -#: ../cli/src/devices.c:153 +#: ../cli/src/devices.c:165 msgid "WEP" msgstr "WEP" #. 1 -#: ../cli/src/devices.c:154 +#: ../cli/src/devices.c:166 msgid "WPA" msgstr "WPA" #. 2 -#: ../cli/src/devices.c:155 +#: ../cli/src/devices.c:167 msgid "WPA2" msgstr "WPA2" #. 3 -#: ../cli/src/devices.c:156 +#: ../cli/src/devices.c:168 msgid "TKIP" msgstr "TKIP" #. 4 -#: ../cli/src/devices.c:157 +#: ../cli/src/devices.c:169 msgid "CCMP" msgstr "CCMP" #. 0 -#: ../cli/src/devices.c:167 +#: ../cli/src/devices.c:181 msgid "CTR-FREQ" msgstr "" #. 1 -#: ../cli/src/devices.c:168 +#: ../cli/src/devices.c:182 msgid "RSSI" msgstr "" #. 2 -#: ../cli/src/devices.c:169 +#: ../cli/src/devices.c:183 msgid "CINR" msgstr "" #. 3 -#: ../cli/src/devices.c:170 +#: ../cli/src/devices.c:184 msgid "TX-POW" msgstr "" #. 4 -#: ../cli/src/devices.c:171 +#: ../cli/src/devices.c:185 msgid "BSID" msgstr "" #. 0 -#: ../cli/src/devices.c:181 +#: ../cli/src/devices.c:195 msgid "SSID" msgstr "SSID" #. 1 -#: ../cli/src/devices.c:182 +#: ../cli/src/devices.c:196 msgid "BSSID" msgstr "BSSID" #. 2 -#: ../cli/src/devices.c:183 +#: ../cli/src/devices.c:197 msgid "MODE" msgstr "型号" #. 3 -#: ../cli/src/devices.c:184 +#: ../cli/src/devices.c:198 msgid "FREQ" msgstr "FREQ" #. 4 -#: ../cli/src/devices.c:185 +#: ../cli/src/devices.c:199 msgid "RATE" msgstr "频率" #. 5 #. 1 -#: ../cli/src/devices.c:186 ../cli/src/devices.c:204 +#: ../cli/src/devices.c:200 ../cli/src/devices.c:218 msgid "SIGNAL" msgstr "信号" #. 6 -#: ../cli/src/devices.c:187 +#: ../cli/src/devices.c:201 msgid "SECURITY" msgstr "安全性" #. 7 -#: ../cli/src/devices.c:188 +#: ../cli/src/devices.c:202 msgid "WPA-FLAGS" msgstr "WPA-标志" #. 8 -#: ../cli/src/devices.c:189 +#: ../cli/src/devices.c:203 msgid "RSN-FLAGS" msgstr "RSN-标志" #. 10 #. 4 -#: ../cli/src/devices.c:191 ../cli/src/devices.c:207 +#: ../cli/src/devices.c:205 ../cli/src/devices.c:221 msgid "ACTIVE" msgstr "活跃" @@ -1092,134 +1096,134 @@ msgid "A dependency of the connection failed" msgstr "" -#: ../cli/src/common.c:564 ../cli/src/devices.c:296 ../cli/src/devices.c:314 -#: ../cli/src/devices.c:436 ../cli/src/devices.c:480 +#: ../cli/src/common.c:564 ../cli/src/devices.c:310 ../cli/src/devices.c:328 +#: ../cli/src/devices.c:450 ../cli/src/devices.c:494 msgid "Unknown" msgstr "未知" -#: ../cli/src/devices.c:347 +#: ../cli/src/devices.c:361 msgid "(none)" msgstr "(无)" -#: ../cli/src/devices.c:403 +#: ../cli/src/devices.c:417 #, c-format msgid "%u MHz" msgstr "%u MHz" -#: ../cli/src/devices.c:404 +#: ../cli/src/devices.c:418 #, c-format msgid "%u MB/s" msgstr "%u MB/s" -#: ../cli/src/devices.c:413 +#: ../cli/src/devices.c:427 msgid "Encrypted: " msgstr "加密： " -#: ../cli/src/devices.c:418 +#: ../cli/src/devices.c:432 msgid "WEP " msgstr "WEP " -#: ../cli/src/devices.c:420 +#: ../cli/src/devices.c:434 msgid "WPA " msgstr "WPA " -#: ../cli/src/devices.c:422 +#: ../cli/src/devices.c:436 msgid "WPA2 " msgstr "WPA2 " -#: ../cli/src/devices.c:425 +#: ../cli/src/devices.c:439 msgid "Enterprise " msgstr "企业级 " -#: ../cli/src/devices.c:434 +#: ../cli/src/devices.c:448 msgid "Ad-Hoc" msgstr "Ad-Hoc" -#: ../cli/src/devices.c:435 +#: ../cli/src/devices.c:449 msgid "Infrastructure" msgstr "基础构架" -#: ../cli/src/devices.c:471 +#: ../cli/src/devices.c:485 msgid "Home" msgstr "" -#: ../cli/src/devices.c:474 +#: ../cli/src/devices.c:488 msgid "Partner" msgstr "" -#: ../cli/src/devices.c:477 +#: ../cli/src/devices.c:491 msgid "Roaming" msgstr "" -#: ../cli/src/devices.c:549 +#: ../cli/src/devices.c:563 #, c-format msgid "Error: 'dev list': %s" msgstr "错误：'dev list': %s" -#: ../cli/src/devices.c:551 +#: ../cli/src/devices.c:565 #, c-format msgid "Error: 'dev list': %s; allowed fields: %s" msgstr "错误：'dev list': %s；允许的字段：%s" -#: ../cli/src/devices.c:560 +#: ../cli/src/devices.c:574 msgid "Device details" msgstr "设备详情" -#: ../cli/src/devices.c:607 ../cli/src/devices.c:610 ../cli/src/devices.c:1086 +#: ../cli/src/devices.c:621 ../cli/src/devices.c:624 ../cli/src/devices.c:1151 #: ../cli/src/utils.c:479 msgid "(unknown)" msgstr "(未知)" -#: ../cli/src/devices.c:619 +#: ../cli/src/devices.c:633 msgid "not connected" msgstr "" -#: ../cli/src/devices.c:646 +#: ../cli/src/devices.c:660 #, c-format msgid "%u Mb/s" msgstr "%u Mb/s" #. Print header #. "WIRED-PROPERTIES" -#: ../cli/src/devices.c:720 +#: ../cli/src/devices.c:736 msgid "on" msgstr "开" -#: ../cli/src/devices.c:720 +#: ../cli/src/devices.c:736 msgid "off" msgstr "关" -#: ../cli/src/devices.c:928 +#: ../cli/src/devices.c:993 #, c-format msgid "Error: 'dev status': %s" msgstr "错误：'dev status': %s" -#: ../cli/src/devices.c:930 +#: ../cli/src/devices.c:995 #, c-format msgid "Error: 'dev status': %s; allowed fields: %s" msgstr "错误：'dev status': %s；允许的字段：%s" -#: ../cli/src/devices.c:953 +#: ../cli/src/devices.c:1018 msgid "Status of devices" msgstr "设备状态" -#: ../cli/src/devices.c:984 +#: ../cli/src/devices.c:1049 #, c-format msgid "Error: '%s' argument is missing." msgstr "错误：缺少 '%s' 参数。" -#: ../cli/src/devices.c:1025 ../cli/src/devices.c:1190 -#: ../cli/src/devices.c:1331 ../cli/src/devices.c:1978 +#: ../cli/src/devices.c:1090 ../cli/src/devices.c:1255 +#: ../cli/src/devices.c:1396 ../cli/src/devices.c:2043 #, c-format msgid "Error: Device '%s' not found." msgstr "错误：没有找到设备 '%s'。" -#: ../cli/src/devices.c:1048 +#: ../cli/src/devices.c:1113 #, c-format msgid "Success: Device '%s' successfully disconnected." msgstr "成功：成功断开设备 '%s'。" -#: ../cli/src/devices.c:1083 +#: ../cli/src/devices.c:1148 #, c-format msgid "Error: Device '%s' (%s) disconnecting failed: %s" msgstr "错误：断开设备 '%s'(%s)失败：%s" @@ -1229,75 +1233,75 @@ msgid "Device state: %d (%s)\n" msgstr "设备状态：%d (%s)\n" -#: ../cli/src/devices.c:1159 +#: ../cli/src/devices.c:1224 #, c-format msgid "Error: iface has to be specified." msgstr "错误：没有指定 iface。" -#: ../cli/src/devices.c:1289 +#: ../cli/src/devices.c:1354 #, c-format msgid "Error: 'dev wifi': %s" msgstr "错误：'dev wifi'：%s" -#: ../cli/src/devices.c:1291 +#: ../cli/src/devices.c:1356 #, c-format msgid "Error: 'dev wifi': %s; allowed fields: %s" msgstr "错误：'dev wifi': %s；允许的字段：%s" -#: ../cli/src/devices.c:1314 +#: ../cli/src/devices.c:1379 msgid "WiFi scan list" msgstr "WiFi 扫描列表" -#: ../cli/src/devices.c:1351 ../cli/src/devices.c:1405 +#: ../cli/src/devices.c:1416 ../cli/src/devices.c:1470 #, c-format msgid "Error: Access point with bssid '%s' not found." msgstr "" -#: ../cli/src/devices.c:1368 +#: ../cli/src/devices.c:1433 #, c-format msgid "Error: Device '%s' is not a WiFi device." msgstr "错误：设备 '%s' 不是 WiFi 设备。" -#: ../cli/src/devices.c:1860 +#: ../cli/src/devices.c:1925 #, c-format msgid "Error: 'dev wifi' command '%s' is not valid." msgstr "错误：'dev wifi' 命令 '%s' 无效。" -#: ../cli/src/devices.c:1936 +#: ../cli/src/devices.c:2001 #, c-format msgid "Error: 'dev wimax': %s" msgstr "" -#: ../cli/src/devices.c:1938 +#: ../cli/src/devices.c:2003 #, c-format msgid "Error: 'dev wimax': %s; allowed fields: %s" msgstr "" -#: ../cli/src/devices.c:1961 +#: ../cli/src/devices.c:2026 msgid "WiMAX NSP list" msgstr "" -#: ../cli/src/devices.c:1998 +#: ../cli/src/devices.c:2063 #, c-format msgid "Error: NSP with name '%s' not found." msgstr "" -#: ../cli/src/devices.c:2009 +#: ../cli/src/devices.c:2074 #, c-format msgid "Error: Device '%s' is not a WiMAX device." msgstr "" -#: ../cli/src/devices.c:2040 +#: ../cli/src/devices.c:2105 #, c-format msgid "Error: Access point with nsp '%s' not found." msgstr "" -#: ../cli/src/devices.c:2067 +#: ../cli/src/devices.c:2132 #, c-format msgid "Error: 'dev wimax' command '%s' is not valid." msgstr "" -#: ../cli/src/devices.c:2120 +#: ../cli/src/devices.c:2185 #, c-format msgid "Error: 'dev' command '%s' is not valid." msgstr "错误：'dev' 命令 '%s' 无效。" @@ -1498,7 +1502,7 @@ msgid "Error: 'nm' command '%s' is not valid." msgstr "错误：'nm' 命令 '%s' 无效。" -#: ../cli/src/nmcli.c:76 +#: ../cli/src/nmcli.c:64 #, c-format msgid "" "Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n" @@ -1585,99 +1589,99 @@ msgid "Success" msgstr "成功" -#: ../cli/src/settings.c:563 +#: ../cli/src/settings.c:595 #, c-format msgid "%d (hex-ascii-key)" msgstr "%d (hex-ascii-key)" -#: ../cli/src/settings.c:565 +#: ../cli/src/settings.c:597 #, c-format msgid "%d (104/128-bit passphrase)" msgstr "%d (104/128 位密码短语)" -#: ../cli/src/settings.c:568 ../cli/src/settings.c:696 +#: ../cli/src/settings.c:600 ../cli/src/settings.c:728 #, c-format msgid "%d (unknown)" msgstr "%d (未知)" -#: ../cli/src/settings.c:594 +#: ../cli/src/settings.c:626 msgid "0 (unknown)" msgstr "0 (未知)" -#: ../cli/src/settings.c:600 +#: ../cli/src/settings.c:632 msgid "any, " msgstr "任意， " -#: ../cli/src/settings.c:602 +#: ../cli/src/settings.c:634 msgid "900 MHz, " msgstr "900 MHz， " -#: ../cli/src/settings.c:604 +#: ../cli/src/settings.c:636 msgid "1800 MHz, " msgstr "1800 MHz， " -#: ../cli/src/settings.c:606 +#: ../cli/src/settings.c:638 msgid "1900 MHz, " msgstr "1900 MHz， " -#: ../cli/src/settings.c:608 +#: ../cli/src/settings.c:640 msgid "850 MHz, " msgstr "850 MHz， " -#: ../cli/src/settings.c:610 +#: ../cli/src/settings.c:642 msgid "WCDMA 3GPP UMTS 2100 MHz, " msgstr "WCDMA 3GPP UMTS 2100 MHz， " -#: ../cli/src/settings.c:612 +#: ../cli/src/settings.c:644 msgid "WCDMA 3GPP UMTS 1800 MHz, " msgstr "WCDMA 3GPP UMTS 1800 MHz， " -#: ../cli/src/settings.c:614 +#: ../cli/src/settings.c:646 msgid "WCDMA 3GPP UMTS 1700/2100 MHz, " msgstr "WCDMA 3GPP UMTS 1700/2100 MHz， " -#: ../cli/src/settings.c:616 +#: ../cli/src/settings.c:648 msgid "WCDMA 3GPP UMTS 800 MHz, " msgstr "WCDMA 3GPP UMTS 800 MHz， " -#: ../cli/src/settings.c:618 +#: ../cli/src/settings.c:650 msgid "WCDMA 3GPP UMTS 850 MHz, " msgstr "WCDMA 3GPP UMTS 850 MHz， " -#: ../cli/src/settings.c:620 +#: ../cli/src/settings.c:652 msgid "WCDMA 3GPP UMTS 900 MHz, " msgstr "WCDMA 3GPP UMTS 900 MHz， " -#: ../cli/src/settings.c:622 +#: ../cli/src/settings.c:654 msgid "WCDMA 3GPP UMTS 1700 MHz, " msgstr "WCDMA 3GPP UMTS 1700 MHz， " -#: ../cli/src/settings.c:624 +#: ../cli/src/settings.c:656 msgid "WCDMA 3GPP UMTS 1900 MHz, " msgstr "" -#: ../cli/src/settings.c:626 +#: ../cli/src/settings.c:658 msgid "WCDMA 3GPP UMTS 2600 MHz, " msgstr "" -#: ../cli/src/settings.c:644 +#: ../cli/src/settings.c:676 msgid "0 (NONE)" msgstr "" -#: ../cli/src/settings.c:650 +#: ../cli/src/settings.c:682 msgid "REORDER_HEADERS, " msgstr "" -#: ../cli/src/settings.c:652 +#: ../cli/src/settings.c:684 msgid "GVRP, " msgstr "" -#: ../cli/src/settings.c:654 +#: ../cli/src/settings.c:686 msgid "LOOSE_BINDING, " msgstr "" -#: ../cli/src/settings.c:827 ../cli/src/settings.c:1024 -#: ../cli/src/settings.c:1734 +#: ../cli/src/settings.c:945 ../cli/src/settings.c:1163 +#: ../cli/src/settings.c:1904 msgid "auto" msgstr "自动" @@ -1790,76 +1794,76 @@ msgid "Could not decode private key." msgstr "无法解码私钥。" -#: ../libnm-util/crypto.c:284 +#: ../libnm-util/crypto.c:290 msgid "Failed to find expected PKCS#8 start tag." msgstr "" -#: ../libnm-util/crypto.c:292 +#: ../libnm-util/crypto.c:298 #, c-format msgid "Failed to find expected PKCS#8 end tag '%s'." msgstr "" -#: ../libnm-util/crypto.c:312 +#: ../libnm-util/crypto.c:318 msgid "Not enough memory to store private key data." msgstr "" -#: ../libnm-util/crypto.c:317 +#: ../libnm-util/crypto.c:323 msgid "Failed to decode PKCS#8 private key." msgstr "" -#: ../libnm-util/crypto.c:339 ../libnm-util/crypto.c:625 +#: ../libnm-util/crypto.c:345 ../libnm-util/crypto.c:631 #, c-format msgid "Not enough memory to store certificate data." msgstr "没有足够的空间存储证书数据。" -#: ../libnm-util/crypto.c:365 +#: ../libnm-util/crypto.c:371 #, c-format msgid "IV must be an even number of bytes in length." msgstr "初始向量长度必须是偶数字节。" -#: ../libnm-util/crypto.c:374 +#: ../libnm-util/crypto.c:380 #, c-format msgid "Not enough memory to store the IV." msgstr "没有足够的空间储存初始向量。" -#: ../libnm-util/crypto.c:385 +#: ../libnm-util/crypto.c:391 #, c-format msgid "IV contains non-hexadecimal digits." msgstr "初始向量中包含非十六进制数字。" -#: ../libnm-util/crypto.c:423 ../libnm-util/crypto_gnutls.c:147 +#: ../libnm-util/crypto.c:429 ../libnm-util/crypto_gnutls.c:147 #: ../libnm-util/crypto_gnutls.c:265 ../libnm-util/crypto_nss.c:167 #: ../libnm-util/crypto_nss.c:332 #, c-format msgid "Private key cipher '%s' was unknown." msgstr "未知专用密钥密码 '%s'。" -#: ../libnm-util/crypto.c:432 +#: ../libnm-util/crypto.c:438 #, c-format msgid "Not enough memory to decrypt private key." msgstr "没有足够的空间解密私钥。" -#: ../libnm-util/crypto.c:497 +#: ../libnm-util/crypto.c:503 #, c-format msgid "Not enough memory to store decrypted private key." msgstr "没有足够的空间储存解密后的私钥。" -#: ../libnm-util/crypto.c:542 +#: ../libnm-util/crypto.c:548 #, c-format msgid "Unable to determine private key type." msgstr "无法确定私钥类型。" -#: ../libnm-util/crypto.c:597 +#: ../libnm-util/crypto.c:603 #, c-format msgid "PEM certificate had no start tag '%s'." msgstr "" -#: ../libnm-util/crypto.c:606 +#: ../libnm-util/crypto.c:612 #, c-format msgid "PEM certificate had no end tag '%s'." msgstr "" -#: ../libnm-util/crypto.c:630 +#: ../libnm-util/crypto.c:636 #, c-format msgid "Failed to decode certificate." msgstr "无法解码证书。" @@ -2082,26 +2086,26 @@ msgid "Could not generate random data." msgstr "无法生成随机数据。" -#: ../libnm-util/nm-utils.c:2078 +#: ../libnm-util/nm-utils.c:2145 #, c-format msgid "Not enough memory to make encryption key." msgstr "没有足够的空间生成加密密钥。" -#: ../libnm-util/nm-utils.c:2188 +#: ../libnm-util/nm-utils.c:2255 msgid "Could not allocate memory for PEM file creation." msgstr "无法为创建 PEM 文件分配内存。" -#: ../libnm-util/nm-utils.c:2200 +#: ../libnm-util/nm-utils.c:2267 #, c-format msgid "Could not allocate memory for writing IV to PEM file." msgstr "无法为在 PEM 文件中写入 IV 分配内存。" -#: ../libnm-util/nm-utils.c:2212 +#: ../libnm-util/nm-utils.c:2279 #, c-format msgid "Could not allocate memory for writing encrypted key to PEM file." msgstr "无法为在 PEM 文件中写入加密密钥分配内存。" -#: ../libnm-util/nm-utils.c:2231 +#: ../libnm-util/nm-utils.c:2298 #, c-format msgid "Could not allocate memory for PEM file data." msgstr "无法为 PEM 文件数据分配内存。" @@ -2212,72 +2216,72 @@ msgid "Failed to initialize SIGTERM pipe: %d" msgstr "" -#: ../src/main.c:159 +#: ../src/main.c:153 #, c-format msgid "Opening %s failed: %s\n" msgstr "" -#: ../src/main.c:165 +#: ../src/main.c:159 #, c-format msgid "Writing to %s failed: %s\n" msgstr "" -#: ../src/main.c:170 +#: ../src/main.c:164 #, c-format msgid "Closing %s failed: %s\n" msgstr "" -#: ../src/main.c:213 +#: ../src/main.c:207 #, c-format msgid "NetworkManager is already running (pid %ld)\n" msgstr "" -#: ../src/main.c:340 +#: ../src/main.c:333 msgid "Print NetworkManager version and exit" msgstr "" -#: ../src/main.c:341 +#: ../src/main.c:334 msgid "Don't become a daemon" msgstr "" -#: ../src/main.c:342 +#: ../src/main.c:335 msgid "Make all warnings fatal" msgstr "" -#: ../src/main.c:343 +#: ../src/main.c:336 msgid "Specify the location of a PID file" msgstr "" -#: ../src/main.c:343 +#: ../src/main.c:336 msgid "filename" msgstr "" -#: ../src/main.c:344 +#: ../src/main.c:337 msgid "State file location" msgstr "" -#: ../src/main.c:344 +#: ../src/main.c:337 msgid "/path/to/state.file" msgstr "" -#: ../src/main.c:345 +#: ../src/main.c:338 msgid "Config file location" msgstr "" -#: ../src/main.c:345 +#: ../src/main.c:338 msgid "/path/to/config.file" msgstr "" -#: ../src/main.c:346 +#: ../src/main.c:339 msgid "List of plugins separated by ','" msgstr "" -#: ../src/main.c:346 +#: ../src/main.c:339 msgid "plugin1,plugin2" msgstr "" #. Translators: Do not translate the values in the square brackets -#: ../src/main.c:348 +#: ../src/main.c:341 msgid "Log level: one of [ERR, WARN, INFO, DEBUG]" msgstr "" @@ -2294,12 +2298,12 @@ " INFINIBAND,FIREWALL]" msgstr "" -#: ../src/main.c:364 +#: ../src/main.c:370 #, c-format msgid "GModules are not supported on your platform!\n" msgstr "" -#: ../src/main.c:383 +#: ../src/main.c:389 msgid "" "NetworkManager monitors all network connections and automatically\n" "chooses the best connection to use. It also allows the user to\n" @@ -2307,41 +2311,41 @@ "should associate with." msgstr "" -#: ../src/main.c:389 +#: ../src/main.c:395 #, c-format msgid "Invalid option. Please use --help to see a list of valid options.\n" msgstr "无效选项。请使用 --help 查看有效选项列表。\n" -#: ../src/main.c:399 +#: ../src/main.c:405 #, c-format msgid "You must be root to run NetworkManager!\n" msgstr "" -#: ../src/main.c:432 +#: ../src/main.c:433 #, c-format msgid "Failed to read configuration: (%d) %s\n" msgstr "" -#: ../src/main.c:443 +#: ../src/main.c:444 #, c-format msgid "%s. Please use --help to see a list of valid options.\n" msgstr "%s。请使用 --help 查看有效选项列表。\n" -#: ../src/main.c:450 +#: ../src/main.c:451 #, c-format msgid "State file %s parsing failed: (%d) %s\n" msgstr "" -#: ../src/main.c:467 +#: ../src/main.c:468 #, c-format msgid "Could not daemonize: %s [error %u]\n" msgstr "" -#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:138 +#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:139 msgid "# Created by NetworkManager\n" msgstr "# 由 NetworkManger 创建\n" -#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:145 +#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:146 #, c-format msgid "" "# Merged from %s\n" @@ -2367,32 +2371,32 @@ msgid "unsupported DHCP client '%s'" msgstr "不支持的 DHCP 客户端 '%s'" -#: ../src/dns-manager/nm-dns-manager.c:375 +#: ../src/dns-manager/nm-dns-manager.c:376 msgid "NOTE: the libc resolver may not support more than 3 nameservers." msgstr "注意：libc 解析器可能不支持超过三个名字服务器。" -#: ../src/dns-manager/nm-dns-manager.c:377 +#: ../src/dns-manager/nm-dns-manager.c:378 msgid "The nameservers listed below may not be recognized." msgstr "以下列出的名字服务器可能无法被识别。" -#: ../src/logging/nm-logging.c:141 +#: ../src/logging/nm-logging.c:143 #, c-format msgid "Unknown log level '%s'" msgstr "未知日志等级 '%s'" -#: ../src/logging/nm-logging.c:187 +#: ../src/logging/nm-logging.c:189 #, c-format msgid "Unknown log domain '%s'" msgstr "未知日志域 '%s'" -#: ../src/modem-manager/nm-modem-cdma.c:280 -#: ../src/modem-manager/nm-modem-broadband.c:553 ../src/nm-device-bt.c:345 +#: ../src/modem-manager/nm-modem-cdma.c:271 +#: ../src/modem-manager/nm-modem-broadband.c:533 ../src/nm-device-bt.c:338 #, c-format msgid "CDMA connection %d" msgstr "" -#: ../src/modem-manager/nm-modem-gsm.c:558 -#: ../src/modem-manager/nm-modem-broadband.c:531 ../src/nm-device-bt.c:341 +#: ../src/modem-manager/nm-modem-gsm.c:549 +#: ../src/modem-manager/nm-modem-broadband.c:511 ../src/nm-device-bt.c:334 #, c-format msgid "GSM connection %d" msgstr "" @@ -2402,12 +2406,12 @@ msgid "Bond connection %d" msgstr "" -#: ../src/nm-device-bt.c:316 +#: ../src/nm-device-bt.c:309 #, c-format msgid "PAN connection %d" msgstr "" -#: ../src/nm-device-bt.c:349 +#: ../src/nm-device-bt.c:342 #, c-format msgid "DUN connection %d" msgstr "" @@ -2422,7 +2426,7 @@ msgid "Wired connection %d" msgstr "" -#: ../src/nm-device-infiniband.c:305 +#: ../src/nm-device-infiniband.c:299 #, c-format msgid "InfiniBand connection %d" msgstr "" @@ -2432,52 +2436,52 @@ msgid "Mesh %d" msgstr "" -#: ../src/nm-device-vlan.c:335 +#: ../src/nm-device-vlan.c:331 #, c-format msgid "VLAN connection %d" msgstr "" -#: ../src/nm-manager.c:746 +#: ../src/nm-manager.c:821 #, c-format msgid "VPN connection %d" msgstr "" -#: ../src/nm-netlink-monitor.c:152 ../src/nm-netlink-monitor.c:276 -#: ../src/nm-netlink-monitor.c:699 +#: ../src/nm-netlink-monitor.c:149 ../src/nm-netlink-monitor.c:273 +#: ../src/nm-netlink-monitor.c:714 #, c-format msgid "error processing netlink message: %s" msgstr "处理网路信息出错：%s" -#: ../src/nm-netlink-monitor.c:255 +#: ../src/nm-netlink-monitor.c:252 msgid "error occurred while waiting for data on socket" msgstr "等候套接字上的数据时发生了错误" -#: ../src/nm-netlink-monitor.c:300 +#: ../src/nm-netlink-monitor.c:297 #, c-format msgid "unable to connect to netlink for monitoring link status: %s" msgstr "无法为监视连接状态连接到网路：%s" -#: ../src/nm-netlink-monitor.c:311 +#: ../src/nm-netlink-monitor.c:308 #, c-format msgid "unable to enable netlink handle credential passing: %s" msgstr "无法启用网络链接句柄证书通过：%s" -#: ../src/nm-netlink-monitor.c:334 ../src/nm-netlink-monitor.c:394 +#: ../src/nm-netlink-monitor.c:331 ../src/nm-netlink-monitor.c:391 #, c-format msgid "unable to allocate netlink handle for monitoring link status: %s" msgstr "无法为监视连接状态分配网路句柄：%s" -#: ../src/nm-netlink-monitor.c:419 +#: ../src/nm-netlink-monitor.c:416 #, c-format msgid "unable to allocate netlink link cache for monitoring link status: %s" msgstr "无法为监视连接状态分配网路连接：%s" -#: ../src/nm-netlink-monitor.c:546 +#: ../src/nm-netlink-monitor.c:543 #, c-format msgid "unable to join netlink group: %s" msgstr "无法加入网络链接组群：%s" -#: ../src/nm-netlink-monitor.c:675 ../src/nm-netlink-monitor.c:688 +#: ../src/nm-netlink-monitor.c:690 ../src/nm-netlink-monitor.c:703 #, c-format msgid "error updating link cache: %s" msgstr "更新链接缓存出错：%s" diff -Nru language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/Parse-DebianChangelog-Pod.po language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/Parse-DebianChangelog-Pod.po --- language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/Parse-DebianChangelog-Pod.po 2013-01-29 09:37:14.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/Parse-DebianChangelog-Pod.po 2014-01-07 07:01:40.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-01-28 14:11+0000\n" -"X-Generator: Launchpad (build 16451)\n" +"X-Launchpad-Export-Date: 2014-01-06 14:41+0000\n" +"X-Generator: Launchpad (build 16877)\n" #: ../bin/parsechangelog:20 ../lib/Parse/DebianChangelog.pm:22 #: ../lib/Parse/DebianChangelog/ChangesFilters.pm:21 diff -Nru language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/Parse-DebianChangelog.po language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/Parse-DebianChangelog.po --- language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/Parse-DebianChangelog.po 2013-01-29 09:37:09.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/Parse-DebianChangelog.po 2014-01-07 07:01:40.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-01-28 14:11+0000\n" -"X-Generator: Launchpad (build 16451)\n" +"X-Launchpad-Export-Date: 2014-01-06 14:40+0000\n" +"X-Generator: Launchpad (build 16877)\n" #: ../bin/parsechangelog:146 #, perl-format diff -Nru language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/acl.po language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/acl.po --- language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/acl.po 2013-01-29 09:37:16.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/acl.po 2014-01-07 07:01:22.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-01-28 11:47+0000\n" -"X-Generator: Launchpad (build 16451)\n" +"X-Launchpad-Export-Date: 2014-01-06 11:56+0000\n" +"X-Generator: Launchpad (build 16877)\n" #: ../chacl/chacl.c:46 #, c-format @@ -162,7 +162,7 @@ msgid "%s %s -- set file access control lists\n" msgstr "%s %s -- 设定文件访问控制列表\n" -#: ../setfacl/setfacl.c:269 ../setfacl/setfacl.c:655 +#: ../setfacl/setfacl.c:269 ../setfacl/setfacl.c:654 #, c-format msgid "Usage: %s %s\n" msgstr "用法: %s %s\n" @@ -253,7 +253,7 @@ msgid "%s: %s in line %d of standard input\n" msgstr "%s: %s 在 %d 行于标准输出\n" -#: ../setfacl/setfacl.c:657 ../getfacl/getfacl.c:744 +#: ../setfacl/setfacl.c:656 ../getfacl/getfacl.c:744 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "尝试 “%s --help” 命令获取更多信息。\n" diff -Nru language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/adduser.po language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/adduser.po --- language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/adduser.po 2013-01-29 09:37:03.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/adduser.po 2014-01-07 07:01:13.000000000 +0000 @@ -12,13 +12,13 @@ "Report-Msgid-Bugs-To: adduser-devel@lists.alioth.debian.org\n" "POT-Creation-Date: 2011-10-19 12:50-0700\n" "PO-Revision-Date: 2011-12-06 09:11+0000\n" -"Last-Translator: Aron Xu \n" +"Last-Translator: Aron Xu \n" "Language-Team: Chinese (simplified) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-01-28 10:32+0000\n" -"X-Generator: Launchpad (build 16451)\n" +"X-Launchpad-Export-Date: 2014-01-06 10:32+0000\n" +"X-Generator: Launchpad (build 16877)\n" "Language: zh_CN\n" #. everyone can issue "--help" and "--version", but only root can go on diff -Nru language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/alsa-utils.po language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/alsa-utils.po --- language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/alsa-utils.po 2013-01-29 09:37:11.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/alsa-utils.po 2014-01-07 07:01:13.000000000 +0000 @@ -9,13 +9,13 @@ "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-01-25 10:44+0100\n" "PO-Revision-Date: 2009-09-16 03:39+0000\n" -"Last-Translator: Aron Xu \n" +"Last-Translator: Aron Xu \n" "Language-Team: Chinese (Taiwan) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-01-28 10:33+0000\n" -"X-Generator: Launchpad (build 16451)\n" +"X-Launchpad-Export-Date: 2014-01-06 10:32+0000\n" +"X-Generator: Launchpad (build 16877)\n" #: alsamixer/card_select.c:126 alsamixer/device_name.c:126 msgid "Sound Card" @@ -204,7 +204,7 @@ msgid "Rear" msgstr "" -#: alsamixer/mixer_display.c:598 speaker-test/speaker-test.c:108 +#: alsamixer/mixer_display.c:598 speaker-test/speaker-test.c:120 msgid "Center" msgstr "中间" @@ -216,131 +216,131 @@ msgid "Side" msgstr "" -#: alsamixer/mixer_widget.c:95 alsamixer/mixer_widget.c:100 +#: alsamixer/mixer_widget.c:91 alsamixer/mixer_widget.c:96 msgid "cannot open mixer" msgstr "" -#: alsamixer/mixer_widget.c:106 alsamixer/mixer_widget.c:183 +#: alsamixer/mixer_widget.c:102 alsamixer/mixer_widget.c:179 msgid "cannot load mixer controls" msgstr "" -#: alsamixer/mixer_widget.c:173 +#: alsamixer/mixer_widget.c:169 #, c-format msgid "Cannot open mixer device '%s'." msgstr "" -#: alsamixer/mixer_widget.c:194 +#: alsamixer/mixer_widget.c:190 msgid "Esc Exit" msgstr "" -#: alsamixer/mixer_widget.c:195 +#: alsamixer/mixer_widget.c:191 msgid "F1 ? H Help" msgstr "" -#: alsamixer/mixer_widget.c:196 +#: alsamixer/mixer_widget.c:192 msgid "F2 / System information" msgstr "" -#: alsamixer/mixer_widget.c:197 +#: alsamixer/mixer_widget.c:193 msgid "F3 Show playback controls" msgstr "" -#: alsamixer/mixer_widget.c:198 +#: alsamixer/mixer_widget.c:194 msgid "F4 Show capture controls" msgstr "" -#: alsamixer/mixer_widget.c:199 +#: alsamixer/mixer_widget.c:195 msgid "F5 Show all controls" msgstr "" -#: alsamixer/mixer_widget.c:200 +#: alsamixer/mixer_widget.c:196 msgid "Tab Toggle view mode (F3/F4/F5)" msgstr "" -#: alsamixer/mixer_widget.c:201 +#: alsamixer/mixer_widget.c:197 msgid "F6 S Select sound card" msgstr "" -#: alsamixer/mixer_widget.c:202 +#: alsamixer/mixer_widget.c:198 msgid "L Redraw screen" msgstr "" -#: alsamixer/mixer_widget.c:204 +#: alsamixer/mixer_widget.c:200 msgid "Left Move to the previous control" msgstr "" -#: alsamixer/mixer_widget.c:205 +#: alsamixer/mixer_widget.c:201 msgid "Right Move to the next control" msgstr "" -#: alsamixer/mixer_widget.c:207 +#: alsamixer/mixer_widget.c:203 msgid "Up/Down Change volume" msgstr "" -#: alsamixer/mixer_widget.c:208 +#: alsamixer/mixer_widget.c:204 msgid "+ - Change volume" msgstr "" -#: alsamixer/mixer_widget.c:209 +#: alsamixer/mixer_widget.c:205 msgid "Page Up/Dn Change volume in big steps" msgstr "" -#: alsamixer/mixer_widget.c:210 +#: alsamixer/mixer_widget.c:206 msgid "End Set volume to 0%" msgstr "" -#: alsamixer/mixer_widget.c:211 +#: alsamixer/mixer_widget.c:207 msgid "0-9 Set volume to 0%-90%" msgstr "" -#: alsamixer/mixer_widget.c:212 +#: alsamixer/mixer_widget.c:208 msgid "Q W E Increase left/both/right volumes" msgstr "" #. TRANSLATORS: or Y instead of Z -#: alsamixer/mixer_widget.c:214 +#: alsamixer/mixer_widget.c:210 msgid "Z X C Decrease left/both/right volumes" msgstr "" -#: alsamixer/mixer_widget.c:215 +#: alsamixer/mixer_widget.c:211 msgid "B Balance left and right volumes" msgstr "" -#: alsamixer/mixer_widget.c:217 +#: alsamixer/mixer_widget.c:213 msgid "M Toggle mute" msgstr "" #. TRANSLATORS: or , . -#: alsamixer/mixer_widget.c:219 +#: alsamixer/mixer_widget.c:215 msgid "< > Toggle left/right mute" msgstr "" -#: alsamixer/mixer_widget.c:221 +#: alsamixer/mixer_widget.c:217 msgid "Space Toggle capture" msgstr "" #. TRANSLATORS: or Insert Delete -#: alsamixer/mixer_widget.c:223 +#: alsamixer/mixer_widget.c:219 msgid "; ' Toggle left/right capture" msgstr "" -#: alsamixer/mixer_widget.c:225 +#: alsamixer/mixer_widget.c:221 msgid "Authors:" msgstr "" -#: alsamixer/mixer_widget.c:226 +#: alsamixer/mixer_widget.c:222 msgid " Tim Janik" msgstr "" -#: alsamixer/mixer_widget.c:227 +#: alsamixer/mixer_widget.c:223 msgid " Jaroslav Kysela " msgstr "" -#: alsamixer/mixer_widget.c:228 +#: alsamixer/mixer_widget.c:224 msgid " Clemens Ladisch " msgstr "" -#: alsamixer/mixer_widget.c:230 +#: alsamixer/mixer_widget.c:226 msgid "Help" msgstr "" @@ -357,19 +357,19 @@ msgid "Cannot open file \"%s\"." msgstr "" -#: aplay/aplay.c:163 +#: aplay/aplay.c:175 msgid "raw data" msgstr "原始資料" -#: aplay/aplay.c:164 +#: aplay/aplay.c:176 msgid "VOC" msgstr "VOC" -#: aplay/aplay.c:166 +#: aplay/aplay.c:178 msgid "WAVE" msgstr "WAVE" -#: aplay/aplay.c:167 +#: aplay/aplay.c:179 msgid "Sparc Audio" msgstr "Sparc Audio" @@ -421,12 +421,12 @@ " --use-strftime apply the strftime facility to the output file name\n" msgstr "" -#: aplay/aplay.c:228 speaker-test/speaker-test.c:819 +#: aplay/aplay.c:244 speaker-test/speaker-test.c:943 #, c-format msgid "Recognized sample formats are:" msgstr "認可的取樣格式是︰" -#: aplay/aplay.c:234 +#: aplay/aplay.c:250 #, c-format msgid "" "\n" @@ -440,134 +440,135 @@ msgid "The availabled format shortcuts are:\n" msgstr "可用的快捷键格式是：\n" -#: aplay/aplay.c:236 +#: aplay/aplay.c:252 #, c-format msgid "-f cd (16 bit little endian, 44100, stereo)\n" msgstr "-f cd (16 bit little endian, 44100, stereo)\n" -#: aplay/aplay.c:237 +#: aplay/aplay.c:253 #, c-format msgid "-f cdr (16 bit big endian, 44100, stereo)\n" msgstr "-f cdr (16 bit big endian, 44100, stereo)\n" -#: aplay/aplay.c:238 +#: aplay/aplay.c:254 #, c-format msgid "-f dat (16 bit little endian, 48000, stereo)\n" msgstr "-f dat (16 bit little endian, 48000, stereo)\n" -#: aplay/aplay.c:252 +#: aplay/aplay.c:268 msgid "no soundcards found..." msgstr "找不到音效卡…" -#: aplay/aplay.c:255 +#: aplay/aplay.c:271 #, c-format msgid "**** List of %s Hardware Devices ****\n" msgstr "**** %s 硬體裝置清單 ****\n" -#: aplay/aplay.c:284 +#: aplay/aplay.c:300 #, c-format msgid "card %i: %s [%s], device %i: %s [%s]\n" msgstr "card %i: %s [%s], device %i: %s [%s]\n" -#: aplay/aplay.c:290 +#: aplay/aplay.c:306 #, c-format msgid " Subdevices: %i/%i\n" msgstr " 子设备: %i/%i\n" -#: aplay/aplay.c:297 +#: aplay/aplay.c:313 #, c-format msgid " Subdevice #%i: %s\n" msgstr " 子设备 #%i: %s\n" -#: aplay/aplay.c:380 +#: aplay/aplay.c:394 #, c-format msgid "Aborted by signal %s...\n" msgstr "被信号 %s...退出\n" -#: aplay/aplay.c:492 +#: aplay/aplay.c:512 msgid "command should be named either arecord or aplay" msgstr "无论是录音还是播放，命令应该被命名" -#: aplay/aplay.c:531 +#: aplay/aplay.c:556 #, c-format msgid "unrecognized file format %s" msgstr "未認可的檔案格式 %s" -#: aplay/aplay.c:538 +#: aplay/aplay.c:563 #, c-format msgid "value %i for channels is invalid" msgstr "频道的值%i 是无效的" -#: aplay/aplay.c:557 +#: aplay/aplay.c:582 #, c-format msgid "wrong extended format '%s'" msgstr "错误的拓展形式 '%s'" -#: aplay/aplay.c:568 +#: aplay/aplay.c:593 #, c-format msgid "bad speed value %i" msgstr "错误的速度值： %i" -#: aplay/aplay.c:666 +#: aplay/aplay.c:706 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "请尝试执行\"%s --help\"来获取更多信息。\n" -#: aplay/aplay.c:682 +#: aplay/aplay.c:722 #, c-format msgid "audio open error: %s" msgstr "音乐打开错误： %s" -#: aplay/aplay.c:687 +#: aplay/aplay.c:727 #, c-format msgid "info error: %s" msgstr "資訊錯誤︰%s" -#: aplay/aplay.c:694 +#: aplay/aplay.c:734 #, c-format msgid "nonblock setting error: %s" msgstr "未设置块错误： %s" -#: aplay/aplay.c:704 aplay/aplay.c:828 aplay/aplay.c:1196 +#: aplay/aplay.c:744 aplay/aplay.c:868 aplay/aplay.c:1158 aplay/aplay.c:1351 +#: aplay/aplay.c:1867 aplay/aplay.c:1897 msgid "not enough memory" msgstr "記憶體不足" -#: aplay/aplay.c:728 +#: aplay/aplay.c:768 #, c-format msgid "Cannot create process ID file %s: %s" msgstr "" -#: aplay/aplay.c:818 +#: aplay/aplay.c:858 #, c-format msgid "read error (called from line %i)" msgstr "讀取錯誤（第 %i 行）" -#: aplay/aplay.c:876 +#: aplay/aplay.c:925 #, c-format msgid "unknown length of 'fmt ' chunk (read %u, should be %u at least)" msgstr "未知'fmt'块的长度（读 %u，至少应该是%u）" -#: aplay/aplay.c:886 +#: aplay/aplay.c:936 #, c-format msgid "" "unknown length of extensible 'fmt ' chunk (read %u, should be %u at least)" msgstr "可拓展'fmt'块的长度未知（读%u，应该至少%u）" -#: aplay/aplay.c:891 +#: aplay/aplay.c:941 msgid "wrong format tag in extensible 'fmt ' chunk" msgstr "在'fmt'块中的错误格式标签" -#: aplay/aplay.c:898 +#: aplay/aplay.c:948 #, c-format msgid "can't play WAVE-file format 0x%04x which is not PCM or FLOAT encoded" msgstr "不能播放不是PCM或者FLOAT编码的0x%04x格式的波形文件" -#: aplay/aplay.c:902 +#: aplay/aplay.c:953 #, c-format msgid "can't play WAVE-files with %d tracks" msgstr "不能播放%d声道的波形文件" -#: aplay/aplay.c:910 aplay/aplay.c:1010 +#: aplay/aplay.c:961 aplay/aplay.c:1087 #, c-format msgid "Warning: format is changed to U8\n" msgstr "警告：格式已變更至 U8\n" @@ -587,298 +588,298 @@ msgid "Warning: format is changed to S24_LE\n" msgstr "警告：格式已變更至 S24_LE\n" -#: aplay/aplay.c:934 +#: aplay/aplay.c:1000 #, c-format msgid "" " can't play WAVE-files with sample %d bits in %d bytes wide (%d channels)" msgstr " 不能播放有着%d比特样本在%d比特宽度（%d个频道）的波形文件" -#: aplay/aplay.c:946 +#: aplay/aplay.c:1023 #, c-format msgid " can't play WAVE-files with sample %d bits wide" msgstr " 不能播放有着样本文件%d宽度样本文件的波形文件" -#: aplay/aplay.c:1004 +#: aplay/aplay.c:1081 #, c-format msgid "Warning: format is changed to MU_LAW\n" msgstr "警告：格式已變更至 MU_LAW\n" -#: aplay/aplay.c:1016 +#: aplay/aplay.c:1093 #, c-format msgid "Warning: format is changed to S16_BE\n" msgstr "警告：格式已變更至 S16_BE\n" -#: aplay/aplay.c:1029 aplay/aplay.c:1953 aplay/aplay.c:1960 aplay/aplay.c:2483 -#: aplay/aplay.c:2495 +#: aplay/aplay.c:1106 aplay/aplay.c:2182 aplay/aplay.c:2189 aplay/aplay.c:2715 +#: aplay/aplay.c:2727 msgid "read error" msgstr "讀取錯誤" -#: aplay/aplay.c:1059 +#: aplay/aplay.c:1204 msgid "Broken configuration for this PCM: no configurations available" msgstr "被破坏的PCM配置：没有可用的配置文件" -#: aplay/aplay.c:1076 +#: aplay/aplay.c:1228 msgid "Access type not available" msgstr "类型不可用" -#: aplay/aplay.c:1081 +#: aplay/aplay.c:1233 msgid "Sample format non available" msgstr "样本格式不可用" -#: aplay/aplay.c:1087 +#: aplay/aplay.c:1239 msgid "Channels count non available" msgstr "频道计数不可用" -#: aplay/aplay.c:1102 +#: aplay/aplay.c:1254 #, c-format msgid "Warning: rate is not accurate (requested = %iHz, got = %iHz)\n" msgstr "警告：频率不精确（要求=%iHz，收到=%iHz）\n" -#: aplay/aplay.c:1108 +#: aplay/aplay.c:1260 #, c-format msgid " please, try the plug plugin %s\n" msgstr " 请尝试plug插件%s\n" -#: aplay/aplay.c:1145 +#: aplay/aplay.c:1297 msgid "Unable to install hw params:" msgstr "无法安装hw参数：" -#: aplay/aplay.c:1152 +#: aplay/aplay.c:1304 #, c-format msgid "Can't use period equal to buffer size (%lu == %lu)" msgstr "无法使用和缓冲区大小（%lu==%lu）一样的时间段" -#: aplay/aplay.c:1183 +#: aplay/aplay.c:1335 msgid "unable to install sw params:" msgstr "无法安装sw参数：" -#: aplay/aplay.c:1214 +#: aplay/aplay.c:1369 #, c-format msgid "snd_pcm_mmap_begin problem: %s" msgstr "" -#: aplay/aplay.c:1239 +#: aplay/aplay.c:1398 #, c-format msgid "stdin O_NONBLOCK flag setup failed\n" msgstr "" -#: aplay/aplay.c:1263 +#: aplay/aplay.c:1422 #, c-format msgid "\rPAUSE command ignored (no hw support)\n" msgstr "" -#: aplay/aplay.c:1268 +#: aplay/aplay.c:1427 #, c-format msgid "pause push error: %s" msgstr "" -#: aplay/aplay.c:1277 +#: aplay/aplay.c:1436 #, c-format msgid "pause release error: %s" msgstr "" -#: aplay/aplay.c:1293 +#: aplay/aplay.c:1452 #, c-format msgid "" "\r=== PAUSE === " msgstr "" -#: aplay/aplay.c:1335 +#: aplay/aplay.c:1494 #, c-format msgid "status error: %s" msgstr "状态错误：%s" -#: aplay/aplay.c:1345 aplay/aplay.c:1356 +#: aplay/aplay.c:1510 aplay/aplay.c:1521 #, c-format msgid "%s!!! (at least %.3f ms long)\n" msgstr "%s（至少%.3f ms长）\n" -#: aplay/aplay.c:1346 aplay/aplay.c:1349 aplay/aplay.c:1357 +#: aplay/aplay.c:1500 aplay/aplay.c:1511 aplay/aplay.c:1514 aplay/aplay.c:1522 msgid "underrun" msgstr "后台运行" -#: aplay/aplay.c:1346 aplay/aplay.c:1357 +#: aplay/aplay.c:1500 aplay/aplay.c:1511 aplay/aplay.c:1522 msgid "overrun" msgstr "前台运行" -#: aplay/aplay.c:1361 +#: aplay/aplay.c:1526 #, c-format msgid "Status:\n" msgstr "状态：\n" -#: aplay/aplay.c:1365 +#: aplay/aplay.c:1530 #, c-format msgid "xrun: prepare error: %s" msgstr "xrun:准备错误：%s" -#: aplay/aplay.c:1371 +#: aplay/aplay.c:1536 #, c-format msgid "Status(DRAINING):\n" msgstr "状态（DRAINING）:\n" -#: aplay/aplay.c:1375 +#: aplay/aplay.c:1540 #, c-format msgid "capture stream format change? attempting recover...\n" msgstr "捕捉流格式变化？尝试恢复...\n" -#: aplay/aplay.c:1377 +#: aplay/aplay.c:1542 #, c-format msgid "xrun(DRAINING): prepare error: %s" msgstr "xrun(DRAINING):准备错误：%s" -#: aplay/aplay.c:1384 +#: aplay/aplay.c:1549 #, c-format msgid "Status(R/W):\n" msgstr "状态（R/W）：\n" -#: aplay/aplay.c:1387 +#: aplay/aplay.c:1552 #, c-format msgid "read/write error, state = %s" msgstr "读/写错误，状态=%s" -#: aplay/aplay.c:1397 +#: aplay/aplay.c:1562 #, c-format msgid "Suspended. Trying resume. " msgstr "停止了，正尝试恢复 " -#: aplay/aplay.c:1402 +#: aplay/aplay.c:1567 #, c-format msgid "Failed. Restarting stream. " msgstr "失败，正重新开始流 " -#: aplay/aplay.c:1404 +#: aplay/aplay.c:1569 #, c-format msgid "suspend: prepare error: %s" msgstr "停止：准备错误：%s" -#: aplay/aplay.c:1409 +#: aplay/aplay.c:1574 #, c-format msgid "Done.\n" msgstr "完成。\n" -#: aplay/aplay.c:1431 +#: aplay/aplay.c:1596 #, c-format msgid " !clip " msgstr " !clip " -#: aplay/aplay.c:1578 +#: aplay/aplay.c:1743 #, c-format msgid "Unsupported bit size %d.\n" msgstr "不支持的比特大小%d。\n" -#: aplay/aplay.c:1612 +#: aplay/aplay.c:1777 #, c-format msgid "Max peak (%li samples): 0x%08x " msgstr "最大峰值（%li 样本）：0x%08x " -#: aplay/aplay.c:1646 +#: aplay/aplay.c:1811 #, c-format msgid "" "Suspicious buffer position (%li total): avail = %li, delay = %li, buffer = " "%li\n" msgstr "可疑的缓冲位置（总共 %li）：作用=%li，延迟=%li，缓冲=%li\n" -#: aplay/aplay.c:1710 +#: aplay/aplay.c:1939 #, c-format msgid "write error: %s" msgstr "写入错误：%s" -#: aplay/aplay.c:1757 +#: aplay/aplay.c:1987 #, c-format msgid "writev error: %s" msgstr "writev 错误: %s" -#: aplay/aplay.c:1801 +#: aplay/aplay.c:2031 #, c-format msgid "read error: %s" msgstr "读取错误：%s" -#: aplay/aplay.c:1845 +#: aplay/aplay.c:2075 #, c-format msgid "readv error: %s" msgstr "readv 错误: %s" -#: aplay/aplay.c:1893 +#: aplay/aplay.c:2123 msgid "can't allocate buffer for silence" msgstr "不能为无声分配缓冲" -#: aplay/aplay.c:1902 aplay/aplay.c:2128 aplay/aplay.c:2133 aplay/aplay.c:2180 -#: aplay/aplay.c:2189 aplay/aplay.c:2196 aplay/aplay.c:2206 aplay/aplay.c:2212 -#: aplay/aplay.c:2284 aplay/aplay.c:2314 aplay/aplay.c:2328 +#: aplay/aplay.c:2132 aplay/aplay.c:2360 aplay/aplay.c:2365 aplay/aplay.c:2412 +#: aplay/aplay.c:2421 aplay/aplay.c:2428 aplay/aplay.c:2438 aplay/aplay.c:2444 +#: aplay/aplay.c:2516 aplay/aplay.c:2546 aplay/aplay.c:2560 msgid "write error" msgstr "写入错误" -#: aplay/aplay.c:1915 +#: aplay/aplay.c:2145 #, c-format msgid "voc_pcm_flush - silence error" msgstr "voc_pcm_flush - 无声错误" -#: aplay/aplay.c:1918 +#: aplay/aplay.c:2148 msgid "voc_pcm_flush error" msgstr "voc_pcm_flush 错误" -#: aplay/aplay.c:1944 +#: aplay/aplay.c:2173 msgid "malloc error" msgstr "分配错误" -#: aplay/aplay.c:1948 +#: aplay/aplay.c:2177 #, c-format msgid "Playing Creative Labs Channel file '%s'...\n" msgstr "正在播放Creative Labs Channel 文件 '%s'...\n" -#: aplay/aplay.c:2016 aplay/aplay.c:2108 +#: aplay/aplay.c:2245 aplay/aplay.c:2340 msgid "can't play packed .voc files" msgstr "无法播放打包的.voc文件" -#: aplay/aplay.c:2068 +#: aplay/aplay.c:2300 #, c-format msgid "can't play loops; %s isn't seekable\n" msgstr "无法播放循环;%s不可取\n" -#: aplay/aplay.c:2117 +#: aplay/aplay.c:2349 #, c-format msgid "unknown blocktype %d. terminate." msgstr "未知块类型 %d。结束。" -#: aplay/aplay.c:2248 +#: aplay/aplay.c:2480 #, c-format msgid "Wave doesn't support %s format..." msgstr "波不支持%s格式..." -#: aplay/aplay.c:2308 +#: aplay/aplay.c:2540 #, c-format msgid "Sparc Audio doesn't support %s format..." msgstr "Sparc Audio不支持%s格式..." -#: aplay/aplay.c:2389 +#: aplay/aplay.c:2621 msgid "Playing" msgstr "正在播放" -#: aplay/aplay.c:2389 +#: aplay/aplay.c:2621 msgid "Recording" msgstr "正在录音" -#: aplay/aplay.c:2393 +#: aplay/aplay.c:2625 #, c-format msgid "Rate %d Hz, " msgstr "频率%dHz， " -#: aplay/aplay.c:2395 +#: aplay/aplay.c:2627 #, c-format msgid "Mono" msgstr "Mono" -#: aplay/aplay.c:2397 +#: aplay/aplay.c:2629 #, c-format msgid "Stereo" msgstr "Stereo" -#: aplay/aplay.c:2399 +#: aplay/aplay.c:2631 #, c-format msgid "Channels %i" msgstr "频道 %i" -#: aplay/aplay.c:2910 aplay/aplay.c:2963 +#: aplay/aplay.c:3145 aplay/aplay.c:3198 #, c-format msgid "You need to specify %d files" msgstr "你需要指定%d个文件" @@ -1159,252 +1160,252 @@ msgid "disconnected\n" msgstr "未连接\n" -#: speaker-test/speaker-test.c:104 +#: speaker-test/speaker-test.c:116 msgid "Front Left" msgstr "左前方" -#: speaker-test/speaker-test.c:105 +#: speaker-test/speaker-test.c:117 msgid "Front Right" msgstr "右前方" -#: speaker-test/speaker-test.c:106 +#: speaker-test/speaker-test.c:118 msgid "Rear Left" msgstr "左后方" -#: speaker-test/speaker-test.c:107 +#: speaker-test/speaker-test.c:119 msgid "Rear Right" msgstr "右后方" -#: speaker-test/speaker-test.c:109 +#: speaker-test/speaker-test.c:121 msgid "LFE" msgstr "LEF" -#: speaker-test/speaker-test.c:110 +#: speaker-test/speaker-test.c:122 msgid "Side Left" msgstr "左边" -#: speaker-test/speaker-test.c:111 +#: speaker-test/speaker-test.c:123 msgid "Side Right" msgstr "右边" -#: speaker-test/speaker-test.c:112 +#: speaker-test/speaker-test.c:124 msgid "Channel 9" msgstr "频道 9" -#: speaker-test/speaker-test.c:113 +#: speaker-test/speaker-test.c:125 msgid "Channel 10" msgstr "频道 10" -#: speaker-test/speaker-test.c:114 +#: speaker-test/speaker-test.c:126 msgid "Channel 11" msgstr "频道 11" -#: speaker-test/speaker-test.c:115 +#: speaker-test/speaker-test.c:127 msgid "Channel 12" msgstr "频道 12" -#: speaker-test/speaker-test.c:116 +#: speaker-test/speaker-test.c:128 msgid "Channel 13" msgstr "频道 13" -#: speaker-test/speaker-test.c:117 +#: speaker-test/speaker-test.c:129 msgid "Channel 14" msgstr "频道 14" -#: speaker-test/speaker-test.c:118 +#: speaker-test/speaker-test.c:130 msgid "Channel 15" msgstr "频道 15" -#: speaker-test/speaker-test.c:119 +#: speaker-test/speaker-test.c:131 msgid "Channel 16" msgstr "频道 16" -#: speaker-test/speaker-test.c:383 +#: speaker-test/speaker-test.c:454 #, c-format msgid "Broken configuration for playback: no configurations available: %s\n" msgstr "被破坏的重播配置：没有可用的配置文件：%s\n" -#: speaker-test/speaker-test.c:390 +#: speaker-test/speaker-test.c:461 #, c-format msgid "Access type not available for playback: %s\n" msgstr "重播类型不可用:%s\n" -#: speaker-test/speaker-test.c:397 +#: speaker-test/speaker-test.c:468 #, c-format msgid "Sample format not available for playback: %s\n" msgstr "样本格式无法被重播：%s\n" -#: speaker-test/speaker-test.c:404 +#: speaker-test/speaker-test.c:475 #, c-format msgid "Channels count (%i) not available for playbacks: %s\n" msgstr "频道计数（%i）无法被重播：%s\n" -#: speaker-test/speaker-test.c:412 +#: speaker-test/speaker-test.c:483 #, c-format msgid "Rate %iHz not available for playback: %s\n" msgstr "频率 %iHz无法被重播：%s\n" -#: speaker-test/speaker-test.c:417 +#: speaker-test/speaker-test.c:488 #, c-format msgid "Rate doesn't match (requested %iHz, get %iHz, err %d)\n" msgstr "频率不匹配（要求 %iHz，收到 %iHz，错误 %d）\n" -#: speaker-test/speaker-test.c:421 +#: speaker-test/speaker-test.c:492 #, c-format msgid "Rate set to %iHz (requested %iHz)\n" msgstr "频率被设为 %iHz（被要求为%iHz）\n" -#: speaker-test/speaker-test.c:427 +#: speaker-test/speaker-test.c:498 #, c-format msgid "Buffer size range from %lu to %lu\n" msgstr "缓冲大小在范围%lu到%lu\n" -#: speaker-test/speaker-test.c:428 +#: speaker-test/speaker-test.c:499 #, c-format msgid "Period size range from %lu to %lu\n" msgstr "时间段大小从%lu到%lu\n" -#: speaker-test/speaker-test.c:430 +#: speaker-test/speaker-test.c:501 #, c-format msgid "Requested period time %u us\n" msgstr "要求时间段%u us\n" -#: speaker-test/speaker-test.c:433 +#: speaker-test/speaker-test.c:504 #, c-format msgid "Unable to set period time %u us for playback: %s\n" msgstr "无法设置重播时间段%u us：%s\n" -#: speaker-test/speaker-test.c:439 +#: speaker-test/speaker-test.c:510 #, c-format msgid "Requested buffer time %u us\n" msgstr "要求的缓冲时间 %u us\n" -#: speaker-test/speaker-test.c:442 +#: speaker-test/speaker-test.c:513 #, c-format msgid "Unable to set buffer time %u us for playback: %s\n" msgstr "无法设置重播的缓冲时间 %u us:%s\n" -#: speaker-test/speaker-test.c:451 +#: speaker-test/speaker-test.c:522 #, c-format msgid "Using max buffer size %lu\n" msgstr "使用最大缓冲大小 %lu\n" -#: speaker-test/speaker-test.c:454 +#: speaker-test/speaker-test.c:525 #, c-format msgid "Unable to set buffer size %lu for playback: %s\n" msgstr "无法设置重播的缓冲大小 %lu：%s\n" -#: speaker-test/speaker-test.c:460 +#: speaker-test/speaker-test.c:531 #, c-format msgid "Periods = %u\n" msgstr "时间段=%u\n" -#: speaker-test/speaker-test.c:463 +#: speaker-test/speaker-test.c:534 #, c-format msgid "Unable to set nperiods %u for playback: %s\n" msgstr "无法设置重播的n时间段%u: %s\n" -#: speaker-test/speaker-test.c:472 +#: speaker-test/speaker-test.c:543 #, c-format msgid "Unable to set hw params for playback: %s\n" msgstr "无法设置重播的hw参数：%s\n" -#: speaker-test/speaker-test.c:478 +#: speaker-test/speaker-test.c:549 #, c-format msgid "was set period_size = %lu\n" msgstr "时间段大小被设为=%lu\n" -#: speaker-test/speaker-test.c:479 +#: speaker-test/speaker-test.c:550 #, c-format msgid "was set buffer_size = %lu\n" msgstr "缓冲大小被设为=%lu\n" -#: speaker-test/speaker-test.c:481 +#: speaker-test/speaker-test.c:552 #, c-format msgid "buffer to small, could not use\n" msgstr "缓冲太小，不能用\n" -#: speaker-test/speaker-test.c:494 +#: speaker-test/speaker-test.c:565 #, c-format msgid "Unable to determine current swparams for playback: %s\n" msgstr "不能判定当前重播的sw参数：%s\n" -#: speaker-test/speaker-test.c:501 +#: speaker-test/speaker-test.c:572 #, c-format msgid "Unable to set start threshold mode for playback: %s\n" msgstr "不能设置重播的起点模式：%s\n" -#: speaker-test/speaker-test.c:508 +#: speaker-test/speaker-test.c:579 #, c-format msgid "Unable to set avail min for playback: %s\n" msgstr "无法设置重播的无用的分钟数：%s\n" -#: speaker-test/speaker-test.c:515 +#: speaker-test/speaker-test.c:586 #, c-format msgid "Unable to set sw params for playback: %s\n" msgstr "无法设置重播的sw参数：%s\n" -#: speaker-test/speaker-test.c:530 +#: speaker-test/speaker-test.c:626 #, c-format msgid "Can't recovery from underrun, prepare failed: %s\n" msgstr "无法从后台恢复，修复失败：%s\n" -#: speaker-test/speaker-test.c:541 +#: speaker-test/speaker-test.c:637 #, c-format msgid "Can't recovery from suspend, prepare failed: %s\n" msgstr "无法从休眠中恢复，修复失败:%s\n" -#: speaker-test/speaker-test.c:605 speaker-test/speaker-test.c:1025 +#: speaker-test/speaker-test.c:701 speaker-test/speaker-test.c:1174 #, c-format msgid "No enough memory\n" msgstr "内存不足\n" -#: speaker-test/speaker-test.c:610 +#: speaker-test/speaker-test.c:706 #, c-format msgid "Cannot open WAV file %s\n" msgstr "无法打开WAV文件 %s\n" -#: speaker-test/speaker-test.c:614 speaker-test/speaker-test.c:643 +#: speaker-test/speaker-test.c:710 speaker-test/speaker-test.c:739 #, c-format msgid "Invalid WAV file %s\n" msgstr "无效的WAV文件 %s\n" -#: speaker-test/speaker-test.c:619 +#: speaker-test/speaker-test.c:715 #, c-format msgid "Not a WAV file: %s\n" msgstr "不是WAV 文件: %s\n" -#: speaker-test/speaker-test.c:623 +#: speaker-test/speaker-test.c:719 #, c-format msgid "Unsupported WAV format %d for %s\n" msgstr "不支持WAV格式 %d对于%s\n" -#: speaker-test/speaker-test.c:628 +#: speaker-test/speaker-test.c:724 #, c-format msgid "%s is not a mono stream (%d channels)\n" msgstr "%s不是一个单声道流（%d 频道）\n" -#: speaker-test/speaker-test.c:633 +#: speaker-test/speaker-test.c:729 #, c-format msgid "Sample rate doesn't match (%d) for %s\n" msgstr "样本频率不符（%d）对于%s\n" -#: speaker-test/speaker-test.c:638 +#: speaker-test/speaker-test.c:734 #, c-format msgid "Unsupported sample format bits %d for %s\n" msgstr "不支持的样本格式比特%d对于%s\n" -#: speaker-test/speaker-test.c:688 +#: speaker-test/speaker-test.c:787 #, c-format msgid "Undefined channel %d\n" msgstr "为定义的频道 %d\n" -#: speaker-test/speaker-test.c:739 +#: speaker-test/speaker-test.c:838 #, c-format msgid "Write error: %d,%s\n" msgstr "写入错误：%d,%s\n" -#: speaker-test/speaker-test.c:741 +#: speaker-test/speaker-test.c:840 #, c-format msgid "xrun_recovery failed: %d,%s\n" msgstr "xrun_recovery失败：%d,%s\n" @@ -1446,72 +1447,72 @@ "-W,--wavdir\t指定包含WAV文件的文件夹\n" "\n" -#: speaker-test/speaker-test.c:921 +#: speaker-test/speaker-test.c:1055 #, c-format msgid "Invalid number of periods %d\n" msgstr "无效的时间间隔个数 %d\n" -#: speaker-test/speaker-test.c:937 speaker-test/speaker-test.c:941 +#: speaker-test/speaker-test.c:1071 speaker-test/speaker-test.c:1075 #, c-format msgid "Invalid test type %s\n" msgstr "无效的测试类型 %s\n" -#: speaker-test/speaker-test.c:953 +#: speaker-test/speaker-test.c:1087 #, c-format msgid "Invalid parameter for -s option.\n" msgstr "-s选项的无效参数。\n" -#: speaker-test/speaker-test.c:967 +#: speaker-test/speaker-test.c:1106 #, c-format msgid "Unknown option '%c'\n" msgstr "未知参数 '%c'\n" -#: speaker-test/speaker-test.c:981 +#: speaker-test/speaker-test.c:1120 #, c-format msgid "Playback device is %s\n" msgstr "重播设备是%s\n" -#: speaker-test/speaker-test.c:982 +#: speaker-test/speaker-test.c:1121 #, c-format msgid "Stream parameters are %iHz, %s, %i channels\n" msgstr "流参数是 %iHz，%s，%i 频道\n" -#: speaker-test/speaker-test.c:985 +#: speaker-test/speaker-test.c:1124 #, c-format msgid "Using 16 octaves of pink noise\n" msgstr "正使用朋克噪声16个8音度\n" -#: speaker-test/speaker-test.c:988 +#: speaker-test/speaker-test.c:1127 #, c-format msgid "Sine wave rate is %.4fHz\n" msgstr "Sine波形频率是%.4fHz\n" -#: speaker-test/speaker-test.c:991 +#: speaker-test/speaker-test.c:1130 #, c-format msgid "WAV file(s)\n" msgstr "WAV文件\n" -#: speaker-test/speaker-test.c:997 +#: speaker-test/speaker-test.c:1140 #, c-format msgid "Playback open error: %d,%s\n" msgstr "重播打开错误: %d,%s\n" -#: speaker-test/speaker-test.c:1002 +#: speaker-test/speaker-test.c:1146 #, c-format msgid "Setting of hwparams failed: %s\n" msgstr "对hw参数的设置失败：%s\n" -#: speaker-test/speaker-test.c:1007 +#: speaker-test/speaker-test.c:1150 #, c-format msgid "Setting of swparams failed: %s\n" msgstr "设置sw参数失败:%s\n" -#: speaker-test/speaker-test.c:1056 speaker-test/speaker-test.c:1078 +#: speaker-test/speaker-test.c:1197 speaker-test/speaker-test.c:1219 #, c-format msgid "Transfer failed: %s\n" msgstr "转变失败:%s\n" -#: speaker-test/speaker-test.c:1066 +#: speaker-test/speaker-test.c:1205 #, c-format msgid "Time per period = %lf\n" msgstr "每时间段时间=%lf\n" diff -Nru language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/app-install-data.po language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/app-install-data.po --- language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/app-install-data.po 2013-01-29 09:37:02.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/app-install-data.po 2014-01-07 07:01:46.000000000 +0000 @@ -10,8 +10,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-01-28 15:03+0000\n" -"X-Generator: Launchpad (build 16451)\n" +"X-Launchpad-Export-Date: 2014-01-06 15:42+0000\n" +"X-Generator: Launchpad (build 16877)\n" "Language: \n" #: ../menu-data-additional/7zip.desktop.in.h:1 @@ -499,7 +499,7 @@ msgid "Privacy" msgstr "隐私" -#: ../menu-data/activity-log-manager-control-center:activity-log-manager-ccpanel.desktop.in.h:2 +#: ../menu-data/activity-log-manager:gnome-activity-log-manager-panel.desktop.in.h:2 msgid "Privacy and Activity Manager" msgstr "隐私和活动管理器" @@ -719,12 +719,10 @@ msgstr "查看和记录 Altus Metrum 产品的下行数据" #: ../menu-data/amarok:kde4__amarok.desktop.in.h:1 -#: ../menu-data/amarok:kde4__amarok_containers.desktop.in.h:1 msgid "Amarok" msgstr "Amarok" #: ../menu-data/amarok:kde4__amarok.desktop.in.h:2 -#: ../menu-data/amarok:kde4__amarok_containers.desktop.in.h:2 msgid "Amarok - Rediscover Your Music!" msgstr "Amarok - 重新发现您的音乐！" @@ -1034,6 +1032,7 @@ #: ../menu-data/firefox:firefox.desktop.in.h:2 #: ../menu-data/hv3:hv3.desktop.in.h:2 #: ../menu-data/netsurf-gtk:netsurf-gtk.desktop.in.h:2 +#: ../menu-data/webbrowser-app:webbrowser-app.desktop.in.h:2 msgid "Browse the World Wide Web" msgstr "浏览互联网" @@ -1103,11 +1102,11 @@ msgid "surreal platform shooting game" msgstr "超现实平台射击游戏" -#: ../menu-data/atanks-data:atanks.desktop.in.h:1 +#: ../menu-data/atanks:atanks.desktop.in.h:1 msgid "Atomic Tanks" msgstr "核子坦克" -#: ../menu-data/atanks-data:atanks.desktop.in.h:2 +#: ../menu-data/atanks:atanks.desktop.in.h:2 msgid "Destroy your opponents' tanks." msgstr "消灭对方的坦克。" @@ -1132,7 +1131,6 @@ msgstr "Attal" #: ../menu-data/attal:attal.desktop.in.h:2 -#: ../menu-data/triplea:triplea.desktop.in.h:2 msgid "Turn based strategy game" msgstr "回合制策略游戏" @@ -1305,7 +1303,6 @@ msgid "Back In Time" msgstr "Back In Time" -#: ../menu-data/backintime-gnome:backintime-gnome-root.desktop.in.h:2 #: ../menu-data/backintime-gnome:backintime-gnome.desktop.in.h:2 #: ../menu-data/backintime-kde:kde4__backintime-kde4.desktop.in.h:2 msgid "Simple backup system" @@ -1368,17 +1365,14 @@ #: ../menu-data/bangarang:kde4__bangarang.desktop.in.h:2 #: ../menu-data/kaffeine:kde4__kaffeine.desktop.in.h:2 #: ../menu-data/kplayer:kde4__kplayer.desktop.in.h:1 +#: ../menu-data/mediaplayer-app:mediaplayer-app.desktop.in.h:1 msgid "Media Player" msgstr "媒体播放器" -#: ../menu-data/banshee:banshee-audiocd.desktop.in.h:1 -#: ../menu-data/banshee:banshee-media-player.desktop.in.h:1 #: ../menu-data/banshee:banshee.desktop.in.h:1 msgid "Banshee Media Player" msgstr "Banshee 媒体播放器" -#: ../menu-data/banshee:banshee-audiocd.desktop.in.h:2 -#: ../menu-data/banshee:banshee-media-player.desktop.in.h:2 #: ../menu-data/banshee:banshee.desktop.in.h:2 msgid "Play and organize your media collection" msgstr "播放、管理媒体文件" @@ -1675,7 +1669,6 @@ msgid "BleachBit" msgstr "BleachBit" -#: ../menu-data/bleachbit:bleachbit-root.desktop.in.h:2 #: ../menu-data/bleachbit:bleachbit.desktop.in.h:2 msgid "Free space and maintain privacy" msgstr "释放空间及保护隐私" @@ -2029,7 +2022,6 @@ msgid "sioc:Forum browser" msgstr "sioc:论坛浏览器" -#: ../menu-data/buzztard-bsl:buzztard-songio-buzz.desktop.in.h:1 #: ../menu-data/buzztard:buzztard-edit.desktop.in.h:1 msgid "Buzztard Music Editor" msgstr "Buzztard 音乐编辑器" @@ -2144,7 +2136,6 @@ #: ../menu-data/calligraplan:kde4__plan.desktop.in.h:2 #: ../menu-data/calligraplan:kde4__planwork.desktop.in.h:2 -#: ../menu-data/planner:planner.desktop.in.h:1 msgid "Project Management" msgstr "项目管理" @@ -2160,11 +2151,11 @@ msgid "Write spreadsheet documents" msgstr "编辑电子表格文档" -#: ../menu-data/calligrastage:kde4__stage.desktop.in.h:1 +#: ../menu-data/calligrastage-data:kde4__stage.desktop.in.h:1 msgid "Calligra Stage" msgstr "Calligra 演示文稿" -#: ../menu-data/calligrastage:kde4__stage.desktop.in.h:2 +#: ../menu-data/calligrastage-data:kde4__stage.desktop.in.h:2 msgid "Write presentation documents" msgstr "编辑演示文稿" @@ -2184,6 +2175,7 @@ msgid "Visual environment to develop OCaml application" msgstr "开发 OCaml 应用程序的可视化环境" +#: ../menu-data/camera-app:camera-app.desktop.in.h:1 #: ../menu-data/camera.app:Camera.desktop.in.h:1 msgid "Camera" msgstr "照相机" @@ -2453,8 +2445,6 @@ #: ../menu-data/chromium-browser:chromium-browser.desktop.in.h:3 #: ../menu-data/firefox:firefox.desktop.in.h:3 #: ../menu-data/latexila-data:latexila.desktop.in.h:3 -#: ../menu-data/nautilus:nautilus-home.desktop.in.h:3 -#: ../menu-data/nautilus:nautilus.desktop.in.h:3 #: ../menu-data/terminator:terminator.desktop.in.h:3 msgid "Open a New Window" msgstr "打开一个新窗口" @@ -2553,21 +2543,25 @@ msgstr "播放音乐和 last.fm 流" #: ../menu-data/clementine:clementine.desktop.in.h:3 +#: ../menu-data/qmmp:qmmp.desktop.in.h:3 msgid "Play" msgstr "播放" #: ../menu-data/clementine:clementine.desktop.in.h:4 +#: ../menu-data/qmmp:qmmp.desktop.in.h:4 #: ../menu-data/wallch:wallch.desktop.in.h:4 msgid "Pause" msgstr "暂停" #: ../menu-data/clementine:clementine.desktop.in.h:5 +#: ../menu-data/qmmp:qmmp.desktop.in.h:5 #: ../menu-data/wallch:wallch.desktop.in.h:5 msgid "Stop" msgstr "停止" #: ../menu-data/clementine:clementine.desktop.in.h:6 #: ../menu-data/minitube:minitube.desktop.in.h:5 +#: ../menu-data/qmmp:qmmp.desktop.in.h:6 #: ../menu-data/totem:totem.desktop.in.h:5 #: ../menu-data/wallch:wallch.desktop.in.h:7 msgid "Previous" @@ -2575,6 +2569,7 @@ #: ../menu-data/clementine:clementine.desktop.in.h:7 #: ../menu-data/minitube:minitube.desktop.in.h:4 +#: ../menu-data/qmmp:qmmp.desktop.in.h:7 #: ../menu-data/totem:totem.desktop.in.h:4 #: ../menu-data/wallch:wallch.desktop.in.h:6 msgid "Next" @@ -2737,9 +2732,7 @@ msgstr "Connectagram" #: ../menu-data/gnome-contacts:gnome-contacts.desktop.in.h:1 -#: ../menu-data/gpe-contacts:gpe-contacts.desktop.in.h:1 #: ../menu-data/kaddressbook-mobile:kde4__kaddressbook-mobile.desktop.in.h:1 -#: ../menu-data/phoneui-apps:phoneui-contacts.desktop.in.h:1 #: ../menu-data/thunderbird:thunderbird.desktop.in.h:4 msgid "Contacts" msgstr "联系人" @@ -2912,11 +2905,11 @@ msgid "old-school first person shooter" msgstr "传统第一人称射击游戏" -#: ../menu-data/d-feet:dfeet.desktop.in.h:1 +#: ../menu-data/d-feet:d-feet.desktop.in.h:1 msgid "D-Feet" msgstr "D-Feet" -#: ../menu-data/d-feet:dfeet.desktop.in.h:2 +#: ../menu-data/d-feet:d-feet.desktop.in.h:2 msgid "Debug D-Bus applications" msgstr "调试 D-Bus 应用程序" @@ -2992,11 +2985,11 @@ msgid "GUI for Direct Connect Protocol" msgstr "直连协议(DCP)的图形用户界面" -#: ../menu-data/dconf-tools:dconf-editor.desktop.in.h:1 +#: ../menu-data/dconf-editor:dconf-editor.desktop.in.h:1 msgid "dconf Editor" msgstr "dconf 编辑器" -#: ../menu-data/dconf-tools:dconf-editor.desktop.in.h:2 +#: ../menu-data/dconf-editor:dconf-editor.desktop.in.h:2 #: ../menu-data/gconf-editor:gconf-editor.desktop.in.h:2 msgid "Directly edit your entire configuration database" msgstr "直接编辑您的整个配置数据库" @@ -3049,19 +3042,16 @@ msgid "Save the Penguins" msgstr "拯救企鹅" -#: ../menu-data/deja-dup:deja-dup-ccpanel.desktop.in.h:1 -#: ../menu-data/deja-dup:deja-dup-preferences.desktop.in.h:1 #: ../menu-data/deja-dup:deja-dup.desktop.in.h:1 +#: ../menu-data/deja-dup:gnome-deja-dup-panel.desktop.in.h:1 msgid "Backup" msgstr "备份" -#: ../menu-data/deja-dup:deja-dup-ccpanel.desktop.in.h:2 -#: ../menu-data/deja-dup:deja-dup-preferences.desktop.in.h:2 +#: ../menu-data/deja-dup:gnome-deja-dup-panel.desktop.in.h:2 msgid "Change your backup settings" msgstr "更改备份设置" -#: ../menu-data/deja-dup:deja-dup-ccpanel.desktop.in.h:3 -#: ../menu-data/deja-dup:deja-dup-preferences.desktop.in.h:3 +#: ../menu-data/deja-dup:gnome-deja-dup-panel.desktop.in.h:3 msgid "Back Up Now" msgstr "立即备份" @@ -3138,7 +3128,6 @@ msgid "DeSmuME (Gtk)" msgstr "DeSmuME (Gtk)" -#: ../menu-data/desmume:desmume-glade.desktop.in.h:2 #: ../menu-data/desmume:desmume.desktop.in.h:2 msgid "Nintento DS emulator" msgstr "NDS 模拟器" @@ -3321,8 +3310,6 @@ #: ../menu-data/dolphin:kde4__dolphin.desktop.in.h:2 #: ../menu-data/exo-utils:exo-file-manager.desktop.in.h:1 -#: ../menu-data/gpe-filemanager:gpe-filemanager.desktop.in.h:1 -#: ../menu-data/thunar:thunar-settings.desktop.in.h:1 msgid "File Manager" msgstr "文件管理器" @@ -3562,10 +3549,12 @@ msgstr "一个图形 GNUstep diff 工具" #: ../menu-data/easymp3gain-gtk:easymp3gain-gnome.desktop.in.h:1 +#: ../menu-data/easymp3gain-qt:easymp3gain-kde.desktop.in.h:1 msgid "easyMP3Gain" msgstr "easyMP3Gain" #: ../menu-data/easymp3gain-gtk:easymp3gain-gnome.desktop.in.h:2 +#: ../menu-data/easymp3gain-qt:easymp3gain-kde.desktop.in.h:2 msgid "A GUI for mp3gain, vorbisgain and aacgain" msgstr "一个 mp3gain, vorbisgain 和 aacgain 的图形用户界面" @@ -3751,15 +3740,14 @@ msgid "Elmer FEA software" msgstr "Elmer FEA 软件" -#: ../menu-data/emacs23-lucid:emacs23-lucid.desktop.in.h:1 #: ../menu-data/emacs23:emacs23.desktop.in.h:1 msgid "GNU Emacs 23" msgstr "GNU Emacs 23" -#: ../menu-data/emacs23-lucid:emacs23-lucid.desktop.in.h:2 #: ../menu-data/emacs23:emacs23.desktop.in.h:2 #: ../menu-data/emacs24-lucid:emacs24-lucid.desktop.in.h:2 #: ../menu-data/emacs24:emacs24.desktop.in.h:2 +#: ../menu-data/yudit:yudit.desktop.in.h:2 msgid "View and edit files" msgstr "查看和编辑文件" @@ -3905,12 +3893,10 @@ msgstr "疫情模拟器" #: ../menu-data/epiphany-browser-data:epiphany-browser.desktop.in.h:1 -#: ../menu-data/epiphany-browser-data:epiphany-newtab.desktop.in.h:1 msgid "Epiphany Web Browser" msgstr "Epiphany 网页浏览器" #: ../menu-data/epiphany-browser-data:epiphany-browser.desktop.in.h:2 -#: ../menu-data/epiphany-browser-data:epiphany-newtab.desktop.in.h:2 #: ../menu-data/exo-utils:exo-web-browser.desktop.in.h:2 msgid "Browse the web" msgstr "浏览网页" @@ -3970,7 +3956,6 @@ msgid "EtherApe" msgstr "EtherApe" -#: ../menu-data/etherape:etherape-root.desktop.in.h:2 #: ../menu-data/etherape:etherape.desktop.in.h:2 msgid "Graphical Network Monitor" msgstr "图形化网络监视器" @@ -4013,8 +3998,6 @@ #: ../menu-data/evilvte:evilvte.desktop.in.h:2 #: ../menu-data/exo-utils:exo-terminal-emulator.desktop.in.h:1 -#: ../menu-data/lxpanel:lxde-x-terminal-emulator.desktop.in.h:2 -#: ../menu-data/xfce4-terminal:xfce4-terminal.desktop.in.h:2 msgid "Terminal Emulator" msgstr "终端模拟器" @@ -4022,10 +4005,9 @@ #: ../menu-data/kdegraphics-mobipocket:kde4__okularApplication_mobi.desktop.in.h:2 #: ../menu-data/okular-backend-odp:kde4__okularApplication_odp.desktop.in.h:2 #: ../menu-data/okular-extra-backends:kde4__okularApplication_chm.desktop.in.h:2 -#: ../menu-data/okular-extra-backends:kde4__okularApplication_djvu.desktop.in.h:2 -#: ../menu-data/okular-extra-backends:kde4__okularApplication_epub.desktop.in.h:2 -#: ../menu-data/okular-extra-backends:kde4__okularApplication_tiff.desktop.in.h:2 #: ../menu-data/okular:kde4__okular.desktop.in.h:2 +#: ../menu-data/okular:kde4__okularApplication_plucker.desktop.in.h:2 +#: ../menu-data/okular:kde4__okularApplication_txt.desktop.in.h:2 msgid "Document Viewer" msgstr "文档查看器" @@ -4079,7 +4061,6 @@ #: ../menu-data/exo-utils:exo-terminal-emulator.desktop.in.h:2 #: ../menu-data/gnome-terminal:gnome-terminal.desktop.in.h:2 -#: ../menu-data/lxterminal:lxterminal.desktop.in.h:2 #: ../menu-data/roxterm-gtk2:roxterm.desktop.in.h:2 #: ../menu-data/roxterm-gtk3:roxterm.desktop.in.h:2 #: ../menu-data/sakura:sakura.desktop.in.h:2 @@ -4087,8 +4068,6 @@ msgstr "使用命令行" #: ../menu-data/exo-utils:exo-web-browser.desktop.in.h:1 -#: ../menu-data/konqueror:kde4__konqbrowser.desktop.in.h:2 -#: ../menu-data/lxpanel:lxde-x-www-browser.desktop.in.h:1 #: ../menu-data/rekonq:kde4__rekonq.desktop.in.h:2 msgid "Web Browser" msgstr "网络浏览器" @@ -4133,7 +4112,6 @@ msgid "Exult Ultima 7 Engine" msgstr "Ultima 7 引擎终极版" -#: ../menu-data/f-spot:f-spot-import.desktop.in.h:1 #: ../menu-data/f-spot:f-spot.desktop.in.h:1 msgid "F-Spot Photo Manager" msgstr "F-Spot 照片管理器" @@ -4567,8 +4545,6 @@ msgid "3D billiards game using OpenGL" msgstr "使用 OpenGL 的三维台球游戏" -#: ../menu-data/foomatic-gui:foomatic-gui.desktop.in.h:1 -#: ../menu-data/gnome-control-center:gnome-printers-panel.desktop.in.h:1 #: ../menu-data/system-config-printer-gnome:system-config-printer.desktop.in.h:1 msgid "Printers" msgstr "打印机" @@ -4684,14 +4660,10 @@ msgstr "下载和安装 Freeciv 的插件" #: ../menu-data/freeciv-client-gtk:freeciv-gtk.desktop.in.h:1 -#: ../menu-data/freeciv-client-sdl:freeciv-sdl.desktop.in.h:1 -#: ../menu-data/freeciv-client-xaw3d:freeciv-xaw3d.desktop.in.h:1 msgid "Freeciv" msgstr "Freeciv" #: ../menu-data/freeciv-client-gtk:freeciv-gtk.desktop.in.h:2 -#: ../menu-data/freeciv-client-sdl:freeciv-sdl.desktop.in.h:2 -#: ../menu-data/freeciv-client-xaw3d:freeciv-xaw3d.desktop.in.h:2 #: ../menu-data/freeciv-server:freeciv-server.desktop.in.h:2 msgid "" "Turn-based strategy game inspired by the history of human civilization" @@ -5269,19 +5241,19 @@ "abilities" msgstr "挑战逻辑、语言、计算和记忆能力的游戏" -#: ../menu-data/gcalctool:gcalctool.desktop.in.h:1 +#: ../menu-data/gnome-calculator:gcalctool.desktop.in.h:1 msgid "Calculator" msgstr "计算器" -#: ../menu-data/gcalctool:gcalctool.desktop.in.h:2 +#: ../menu-data/gnome-calculator:gcalctool.desktop.in.h:2 msgid "Perform arithmetic, scientific or financial calculations" msgstr "进行算术、科学和财务计算" -#: ../menu-data/gchempaint:gchempaint-0.12.desktop.in.h:1 +#: ../menu-data/gchempaint:gchempaint-0.14.desktop.in.h:1 msgid "GChemPaint Chemical Structures Editor" msgstr "GChemPaint 化学结构编辑器" -#: ../menu-data/gchempaint:gchempaint-0.12.desktop.in.h:2 +#: ../menu-data/gchempaint:gchempaint-0.14.desktop.in.h:2 msgid "Edit chemical 2D structures" msgstr "编辑二维化学结构" @@ -5345,11 +5317,11 @@ msgid "Conjugates Portuguese verbs" msgstr "葡萄牙语同源动词学习器" -#: ../menu-data/gcrystal:gcrystal-0.12.desktop.in.h:1 +#: ../menu-data/gcrystal:gcrystal-0.14.desktop.in.h:1 msgid "Gnome Crystal Crystalline Structures Viewer" msgstr "Gnome Crystal 晶体结构查看器" -#: ../menu-data/gcrystal:gcrystal-0.12.desktop.in.h:2 +#: ../menu-data/gcrystal:gcrystal-0.14.desktop.in.h:2 msgid "Edit and display crystalline structures" msgstr "编辑和显示晶体结构" @@ -5361,35 +5333,35 @@ msgid "Manage your collections of movies, games, books, music and more" msgstr "管理您的电影、游戏、图书、音乐等收藏" -#: ../menu-data/gcu-bin:gchem3d-0.12.desktop.in.h:1 +#: ../menu-data/gcu-bin:gchem3d-0.14.desktop.in.h:1 msgid "Molecules Viewer" msgstr "分子结构查看器" -#: ../menu-data/gcu-bin:gchem3d-0.12.desktop.in.h:2 +#: ../menu-data/gcu-bin:gchem3d-0.14.desktop.in.h:2 msgid "Display chemical 3D structures" msgstr "显示三维化学结构" -#: ../menu-data/gcu-bin:gchemcalc-0.12.desktop.in.h:1 +#: ../menu-data/gcu-bin:gchemcalc-0.14.desktop.in.h:1 msgid "Chemical calculator" msgstr "化学计算器" -#: ../menu-data/gcu-bin:gchemcalc-0.12.desktop.in.h:2 +#: ../menu-data/gcu-bin:gchemcalc-0.14.desktop.in.h:2 msgid "A simple calculator for chemistry" msgstr "简单的化学计算器" -#: ../menu-data/gcu-bin:gchemtable-0.12.desktop.in.h:1 +#: ../menu-data/gcu-bin:gchemtable-0.14.desktop.in.h:1 msgid "Periodic table of the elements" msgstr "元素周期表" -#: ../menu-data/gcu-bin:gchemtable-0.12.desktop.in.h:2 +#: ../menu-data/gcu-bin:gchemtable-0.14.desktop.in.h:2 msgid "A Mendeleiev table of the chemical elements" msgstr "门捷列夫化学元素表" -#: ../menu-data/gcu-bin:gspectrum-0.12.desktop.in.h:1 +#: ../menu-data/gcu-bin:gspectrum-0.14.desktop.in.h:1 msgid "Spectrum viewer" msgstr "频谱查看器" -#: ../menu-data/gcu-bin:gspectrum-0.12.desktop.in.h:2 +#: ../menu-data/gcu-bin:gspectrum-0.14.desktop.in.h:2 msgid "A spectrum viewer for the GNOME desktop" msgstr "GNOME 桌面的一个频谱查看器" @@ -5529,16 +5501,15 @@ msgstr "编辑文本文件" #: ../menu-data/gedit:gedit.desktop.in.h:2 -#: ../menu-data/gpe-edit:gpe-edit.desktop.in.h:1 #: ../menu-data/kwrite:kde4__kwrite.desktop.in.h:1 msgid "Text Editor" msgstr "文本编辑器" -#: ../menu-data/geeqie:geeqie-standard.desktop.in.h:1 +#: ../menu-data/geeqie:geeqie.desktop.in.h:1 msgid "Geeqie" msgstr "Geeqie" -#: ../menu-data/geeqie:geeqie-standard.desktop.in.h:2 +#: ../menu-data/geeqie:geeqie.desktop.in.h:2 msgid "View and manage images" msgstr "查看和管理图像" @@ -5839,7 +5810,6 @@ msgstr "英语 - 印度尼西亚语字典" #: ../menu-data/gkbd-capplet:gkbd-keyboard-display.desktop.in.h:1 -#: ../menu-data/gnome-control-center:ubuntu-region-panel.desktop.in.h:1 msgid "Keyboard Layout" msgstr "键盘布局" @@ -5897,11 +5867,11 @@ msgid "LADI Session Handler" msgstr "LADI 会话处理程序" -#: ../menu-data/glchess:glchess.desktop.in.h:1 +#: ../menu-data/gnome-chess:glchess.desktop.in.h:1 msgid "Chess" msgstr "国际象棋" -#: ../menu-data/glchess:glchess.desktop.in.h:2 +#: ../menu-data/gnome-chess:glchess.desktop.in.h:2 msgid "Play the classic two-player boardgame of chess" msgstr "玩经典的双人国际象棋游戏" @@ -5913,11 +5883,11 @@ msgid "slow CW (QRSS) / dual-frequency CW (DFCW)" msgstr "缓慢 CW (QRSS)/双频 CW (DFCW)" -#: ../menu-data/glines:glines.desktop.in.h:1 +#: ../menu-data/five-or-more:glines.desktop.in.h:1 msgid "Five or More" msgstr "五球连珠" -#: ../menu-data/glines:glines.desktop.in.h:2 +#: ../menu-data/five-or-more:glines.desktop.in.h:2 msgid "Remove colored balls from the board by forming lines" msgstr "将彩球连成线来消去它们" @@ -6191,27 +6161,27 @@ msgid "View SWF Files" msgstr "查看 SWF 文件" -#: ../menu-data/gnect:gnect.desktop.in.h:1 +#: ../menu-data/four-in-a-row:gnect.desktop.in.h:1 msgid "Four-in-a-Row" msgstr "四子棋" -#: ../menu-data/gnect:gnect.desktop.in.h:2 +#: ../menu-data/four-in-a-row:gnect.desktop.in.h:2 msgid "Make lines of the same color to win" msgstr "相同颜色连成一线即为该方赢" -#: ../menu-data/gnibbles:gnibbles.desktop.in.h:1 +#: ../menu-data/gnome-nibbles:gnibbles.desktop.in.h:1 msgid "Nibbles" msgstr "Nibbles" -#: ../menu-data/gnibbles:gnibbles.desktop.in.h:2 +#: ../menu-data/gnome-nibbles:gnibbles.desktop.in.h:2 msgid "Guide a worm around a maze" msgstr "类似于百战天虫的迷宫游戏" -#: ../menu-data/gnobots2:gnobots2.desktop.in.h:1 +#: ../menu-data/gnome-robots:gnobots2.desktop.in.h:1 msgid "Robots" msgstr "机器人" -#: ../menu-data/gnobots2:gnobots2.desktop.in.h:2 +#: ../menu-data/gnome-robots:gnobots2.desktop.in.h:2 msgid "Avoid the robots and make them crash into each other" msgstr "躲避机器人并让它们自相残杀" @@ -6306,7 +6276,6 @@ msgstr "自定义您的 GNOME 桌面" #: ../menu-data/gnome-color-manager:gcm-calibrate.desktop.in.h:1 -#: ../menu-data/gnome-control-center:gnome-color-panel.desktop.in.h:1 msgid "Color" msgstr "颜色" @@ -6314,10 +6283,12 @@ msgid "Color Calibration" msgstr "色彩校准" +#: ../menu-data/colord-kde:kde4__colordkdeiccimporter.desktop.in.h:1 #: ../menu-data/gnome-color-manager:gcm-import.desktop.in.h:1 msgid "ICC Profile Installer" msgstr "ICC 颜色特性描述文件安装程序" +#: ../menu-data/colord-kde:kde4__colordkdeiccimporter.desktop.in.h:2 #: ../menu-data/gnome-color-manager:gcm-import.desktop.in.h:2 msgid "Install ICC profiles" msgstr "安装 ICC 颜色特性描述文件" @@ -6486,6 +6457,7 @@ msgstr "GNOME MPlayer" #: ../menu-data/gnome-mplayer:gnome-mplayer.desktop.in.h:2 +#: ../menu-data/parole:parole.desktop.in.h:2 msgid "Play your media" msgstr "播放媒体文件" @@ -6505,11 +6477,10 @@ msgid "View information about your network" msgstr "查看网络信息" -#: ../menu-data/gnome-control-center:gnome-network-panel.desktop.in.h:1 #: ../menu-data/gnome-network-admin:network.desktop.in.h:1 #: ../menu-data/network-manager-gnome:nm-applet.desktop.in.h:1 msgid "Network" -msgstr "Network" +msgstr "网络" #: ../menu-data/gnome-network-admin:network.desktop.in.h:2 msgid "Configure network devices and connections" @@ -6595,6 +6566,7 @@ #: ../menu-data/cinnamon:cinnamon.desktop.in.h:2 #: ../menu-data/cinnamon:cinnamon2d.desktop.in.h:2 +#: ../menu-data/gnome-shell-extensions:gnome-shell-classic.desktop.in.h:2 #: ../menu-data/gnome-shell:gnome-shell.desktop.in.h:2 msgid "Window management and application launching" msgstr "管理窗口、启动应用程序" @@ -6635,7 +6607,6 @@ #: ../menu-data/konsole:kde4__konsole.desktop.in.h:2 #: ../menu-data/terminal.app:Terminal.desktop.in.h:1 #: ../menu-data/vala-terminal:vala-terminal.desktop.in.h:1 -#: ../menu-data/xfce4-terminal:xfce4-terminal.desktop.in.h:1 msgid "Terminal" msgstr "Terminal" @@ -6664,6 +6635,7 @@ msgstr "高级设置" #: ../menu-data/gnome-tweak-tool:gnome-tweak-tool.desktop.in.h:2 +#: ../menu-data/ubuntukylin-default-settings:theme-tool.desktop.in.h:2 msgid "Tweak advanced GNOME 3 settings" msgstr "调整高级 GNOME 3 设置" @@ -6707,13 +6679,13 @@ msgid "Listen to FM-radio" msgstr "收听 FM 电台" -#: ../menu-data/gnomine:gnomine.desktop.in.h:1 -#: ../menu-data/sgt-puzzles:mines.desktop.in.h:1 +#: ../menu-data/gnome-mines:gnomine.desktop.in.h:1 +#: ../menu-data/sgt-puzzles:sgt-mines.desktop.in.h:1 msgid "Mines" msgstr "扫雷" -#: ../menu-data/gnomine:gnomine.desktop.in.h:2 -#: ../menu-data/sgt-puzzles:mines.desktop.in.h:2 +#: ../menu-data/gnome-mines:gnomine.desktop.in.h:2 +#: ../menu-data/sgt-puzzles:sgt-mines.desktop.in.h:2 msgid "Clear hidden mines from a minefield" msgstr "扫除雷区里的雷" @@ -6742,19 +6714,19 @@ msgid "To-Do List Organizer, Diary and Billing System" msgstr "待办事项列表组织、日志记录和计费系统" -#: ../menu-data/gnotravex:gnotravex.desktop.in.h:1 +#: ../menu-data/gnome-tetravex:gnome-tetravex.desktop.in.h:1 msgid "Tetravex" msgstr "Tetravex" -#: ../menu-data/gnotravex:gnotravex.desktop.in.h:2 +#: ../menu-data/gnome-tetravex:gnome-tetravex.desktop.in.h:2 msgid "Complete the puzzle by matching numbered tiles" msgstr "匹配编号的牌片来完成谜题" -#: ../menu-data/gnotski:gnotski.desktop.in.h:1 +#: ../menu-data/gnome-klotski:gnotski.desktop.in.h:1 msgid "Klotski" msgstr "华容道" -#: ../menu-data/gnotski:gnotski.desktop.in.h:2 +#: ../menu-data/gnome-klotski:gnotski.desktop.in.h:2 msgid "Slide blocks to solve the puzzle" msgstr "滑动方块以解决谜题" @@ -6787,6 +6759,7 @@ msgstr "GNUbik" #: ../menu-data/gnubik:gnubik.desktop.in.h:2 +#: ../menu-data/pybik:pybik.desktop.in.h:2 msgid "3D Rubik's cube game" msgstr "3D 魔方游戏" @@ -6830,11 +6803,11 @@ msgid "Paperless Medical Record and Practice Management" msgstr "无纸化的医疗记录和操作管理套件" -#: ../menu-data/gnumeric-common:gnumeric.desktop.in.h:1 +#: ../menu-data/gnumeric:gnumeric.desktop.in.h:1 msgid "Gnumeric Spreadsheet" msgstr "Gnumeric 电子表格" -#: ../menu-data/gnumeric-common:gnumeric.desktop.in.h:2 +#: ../menu-data/gnumeric:gnumeric.desktop.in.h:2 msgid "Calculation, Analysis, and Visualization of Information" msgstr "计算，分析和信息可视化" @@ -6904,7 +6877,6 @@ msgstr "Goggles 音乐管理器" #: ../menu-data/gogglesmm:gogglesmm.desktop.in.h:2 -#: ../menu-data/rhythmbox:rhythmbox-device.desktop.in.h:2 #: ../menu-data/rhythmbox:rhythmbox.desktop.in.h:2 msgid "Play and organize your music collection" msgstr "播放和组织您的音乐收藏" @@ -7076,7 +7048,6 @@ msgid "Pointing devices" msgstr "定点设备" -#: ../menu-data/gnome-control-center:gnome-mouse-panel.desktop.in.h:2 #: ../menu-data/gpointing-device-settings:gpointing-device-settings.desktop.in.h:2 msgid "Set your mouse and touchpad preferences" msgstr "设置您的鼠标和触摸板的偏好设置" @@ -7434,11 +7405,11 @@ msgid "Generate highschool timetables using a GUI for Tablix." msgstr "使用 Tablix 的图形用户界面生成高中时间表。" -#: ../menu-data/gtali:gtali.desktop.in.h:1 +#: ../menu-data/tali:gtali.desktop.in.h:1 msgid "Tali" msgstr "掷骰子" -#: ../menu-data/gtali:gtali.desktop.in.h:2 +#: ../menu-data/tali:gtali.desktop.in.h:2 msgid "Beat the odds in a poker-style dice game" msgstr "一种类似扑克的的骰子游戏" @@ -7699,7 +7670,7 @@ msgid "Insert special characters into documents" msgstr "在文档中插入特殊字符" -#: ../menu-data/gufw:gufw.desktop.in.h:1 +#: ../menu-data/firewall-applet:firewall-config.desktop.in.h:2 msgid "Firewall Configuration" msgstr "防火墙配置" @@ -7900,7 +7871,6 @@ #: ../menu-data/gwrite:gwrite.desktop.in.h:2 #: ../menu-data/leafpad:leafpad.desktop.in.h:2 -#: ../menu-data/mousepad:mousepad.desktop.in.h:2 #: ../menu-data/x2:x2.desktop.in.h:2 msgid "Simple text editor" msgstr "简单的文本编辑器" @@ -7962,10 +7932,12 @@ msgstr "发送和接收无线电传真" #: ../menu-data/hamster-applet:hamster-time-tracker.desktop.in.h:1 +#: ../menu-data/hamster-applet:hamster-windows-service.desktop.in.h:1 msgid "Time Tracker" msgstr "时间跟踪器" #: ../menu-data/hamster-applet:hamster-time-tracker.desktop.in.h:2 +#: ../menu-data/hamster-applet:hamster-windows-service.desktop.in.h:2 #: ../menu-data/hamster-indicator:hamster-indicator.desktop.in.h:2 msgid "Project Hamster - track your time" msgstr "Project Hamster - 时间跟踪与管理工具" @@ -8190,12 +8162,10 @@ msgid "Execute text commands" msgstr "执行文本命令" -#: ../menu-data/hplip-gui:hplip-kubuntu.desktop.in.h:1 #: ../menu-data/hplip-gui:hplip.desktop.in.h:1 msgid "HPLIP Toolbox" msgstr "HPLIP 工具箱" -#: ../menu-data/hplip-gui:hplip-kubuntu.desktop.in.h:2 #: ../menu-data/hplip-gui:hplip.desktop.in.h:2 msgid "HP Printing System Control Center" msgstr "惠普打印系统控制中心" @@ -8256,11 +8226,11 @@ msgid "Melt an iceberg into small pieces, in order to trap the penguins" msgstr "将冰山融化成小块以捕获企鹅" -#: ../menu-data/icecc-monitor:kde4__icemon.desktop.in.h:1 +#: ../menu-data/icecc-monitor:icemon.desktop.in.h:1 msgid "Icemon" msgstr "Icemon" -#: ../menu-data/icecc-monitor:kde4__icemon.desktop.in.h:2 +#: ../menu-data/icecc-monitor:icemon.desktop.in.h:2 msgid "A monitor for an Icecream compilation network" msgstr "Icecream 编译网络监视器" @@ -8464,6 +8434,7 @@ msgstr "局域网通信软件" #: ../menu-data/ipython-qtconsole:ipython-qtconsole.desktop.in.h:1 +#: ../menu-data/ipython3-qtconsole:ipython3-qtconsole.desktop.in.h:1 msgid "Enhanced interactive Python qtconsole" msgstr "增强互动式 Python qtconsole" @@ -8472,13 +8443,16 @@ msgstr "IPython Qt 控制台" #: ../menu-data/ipython-qtconsole:ipython-qtconsole.desktop.in.h:3 +#: ../menu-data/ipython3-qtconsole:ipython3-qtconsole.desktop.in.h:3 msgid "Pylab" msgstr "Pylab" #: ../menu-data/ipython-qtconsole:ipython-qtconsole.desktop.in.h:4 +#: ../menu-data/ipython3-qtconsole:ipython3-qtconsole.desktop.in.h:4 msgid "Pylab (inline plots)" msgstr "Pylab（内嵌测绘图）" +#: ../menu-data/ipython3:ipython3.desktop.in.h:1 #: ../menu-data/ipython:ipython.desktop.in.h:1 msgid "Enhanced interactive Python shell" msgstr "增强互动式 Python shell" @@ -9025,8 +8999,8 @@ msgid "KDE Periodic Table of Elements" msgstr "KDE 元素周期表" -#: ../menu-data/kalzium-data:kde4__kalzium_cml.desktop.in.h:1 #: ../menu-data/kalzium:kde4__kalzium.desktop.in.h:2 +#: ../menu-data/kalzium:kde4__kalzium_cml.desktop.in.h:1 msgid "Kalzium" msgstr "Kalzium" @@ -9154,11 +9128,11 @@ msgid "Find the exit" msgstr "找到出口" -#: ../menu-data/kbattleship:kde4__kbattleship.desktop.in.h:1 +#: ../menu-data/knavalbattle:kde4__kbattleship.desktop.in.h:1 msgid "Naval Battle" msgstr "海战" -#: ../menu-data/kbattleship:kde4__kbattleship.desktop.in.h:2 +#: ../menu-data/knavalbattle:kde4__kbattleship.desktop.in.h:2 msgid "Ship Sinking Game" msgstr "沉船游戏" @@ -9340,20 +9314,19 @@ msgid "KFontView" msgstr "KDE 字体查看器" -#: ../menu-data/kde-workspace-bin:kde4__krandrtray.desktop.in.h:1 +#: ../menu-data/kde-workspace-randr:kde4__krandrtray.desktop.in.h:1 msgid "KRandRTray" msgstr "KRandRTray" -#: ../menu-data/kde-workspace-bin:kde4__krandrtray.desktop.in.h:2 +#: ../menu-data/kde-workspace-randr:kde4__krandrtray.desktop.in.h:2 msgid "A panel applet for resizing and reorientating X screens." msgstr "用于改变 X 屏幕尺寸和方向的面板小程序。" #: ../menu-data/kdegraphics-mobipocket:kde4__okularApplication_mobi.desktop.in.h:1 #: ../menu-data/okular-extra-backends:kde4__okularApplication_chm.desktop.in.h:1 -#: ../menu-data/okular-extra-backends:kde4__okularApplication_djvu.desktop.in.h:1 -#: ../menu-data/okular-extra-backends:kde4__okularApplication_epub.desktop.in.h:1 -#: ../menu-data/okular-extra-backends:kde4__okularApplication_tiff.desktop.in.h:1 #: ../menu-data/okular:kde4__okular.desktop.in.h:1 +#: ../menu-data/okular:kde4__okularApplication_plucker.desktop.in.h:1 +#: ../menu-data/okular:kde4__okularApplication_txt.desktop.in.h:1 msgid "Okular" msgstr "Okular" @@ -9414,6 +9387,7 @@ #: ../menu-data/kdevelop:kde4__kdevelop.desktop.in.h:2 #: ../menu-data/netbeans:netbeans.desktop.in.h:2 +#: ../menu-data/qtcreator-plugin-ubuntu:ubuntusdk.desktop.in.h:2 #: ../menu-data/qtcreator:qtcreator.desktop.in.h:2 msgid "Integrated Development Environment" msgstr "集成开发环境" @@ -9786,27 +9760,27 @@ msgid "ExpoBlending" msgstr "ExpoBlending" -#: ../menu-data/kipi-plugins-common:kde4__kipiplugins.desktop.in.h:1 +#: ../menu-data/kipi-plugins:kde4__kipiplugins.desktop.in.h:1 msgid "KIPI Plugins" msgstr "KIPI 插件" -#: ../menu-data/kipi-plugins-common:kde4__kipiplugins.desktop.in.h:2 +#: ../menu-data/kipi-plugins:kde4__kipiplugins.desktop.in.h:2 msgid "KDE Image Plugins Interface" msgstr "KDE 图像插件接口" -#: ../menu-data/kipi-plugins-common:kde4__panoramagui.desktop.in.h:1 +#: ../menu-data/kipi-plugins:kde4__panoramagui.desktop.in.h:1 msgid "A tool to assemble images as a panorama" msgstr "全景图像拼接工具" -#: ../menu-data/kipi-plugins-common:kde4__panoramagui.desktop.in.h:2 +#: ../menu-data/kipi-plugins:kde4__panoramagui.desktop.in.h:2 msgid "Panorama" msgstr "全景图" -#: ../menu-data/kipi-plugins-common:kde4__photolayoutseditor.desktop.in.h:1 +#: ../menu-data/kipi-plugins:kde4__photolayoutseditor.desktop.in.h:1 msgid "Photo Layouts Editor" msgstr "照片布局编辑器" -#: ../menu-data/kipi-plugins-common:kde4__photolayoutseditor.desktop.in.h:2 +#: ../menu-data/kipi-plugins:kde4__photolayoutseditor.desktop.in.h:2 msgid "Create beautiful and professional photo layouts from your photos" msgstr "从您的照片中创建美观和专业的照片布局" @@ -10112,12 +10086,14 @@ msgid "KNode" msgstr "KNode" +#: ../menu-data/declarative-plasmoids:kde4__active-news-reader.desktop.in.h:1 #: ../menu-data/knode:kde4__KNode.desktop.in.h:2 msgid "News Reader" msgstr "新闻阅读器" -#: ../menu-data/knotes-mobile:kde4__notes-mobile.desktop.in.h:1 -#: ../menu-data/xfce4-notes:xfce4-notes.desktop.in.h:1 +#: ../menu-data/bijiben:bijiben.desktop.in.h:1 +#: ../menu-data/notes-app:notes-app.desktop.in.h:1 +#: ../menu-data/notes-mobile:kde4__notes-mobile.desktop.in.h:1 msgid "Notes" msgstr "注释" @@ -10243,17 +10219,14 @@ msgid "Instant Messenger" msgstr "即时通讯程序" -#: ../menu-data/gpe-calendar:gpe-calendar.desktop.in.h:1 #: ../menu-data/korganizer-mobile:kde4__korganizer-mobile.desktop.in.h:1 msgid "Calendar" msgstr "日历" -#: ../menu-data/korganizer:kde4__korganizer-import.desktop.in.h:1 #: ../menu-data/korganizer:kde4__korganizer.desktop.in.h:1 msgid "Calendar and Scheduling Program" msgstr "日历和日程安排程序" -#: ../menu-data/korganizer:kde4__korganizer-import.desktop.in.h:2 #: ../menu-data/korganizer:kde4__korganizer.desktop.in.h:2 msgid "KOrganizer" msgstr "KOrganizer" @@ -10282,12 +10255,10 @@ msgid "Patience Card Game" msgstr "考验耐心的牌类游戏" -#: ../menu-data/kphotoalbum:kde4__kphotoalbum-import.desktop.in.h:1 #: ../menu-data/kphotoalbum:kde4__kphotoalbum.desktop.in.h:1 msgid "KPhotoAlbum" msgstr "KPhotoAlbum" -#: ../menu-data/kphotoalbum:kde4__kphotoalbum-import.desktop.in.h:2 #: ../menu-data/kphotoalbum:kde4__kphotoalbum.desktop.in.h:2 msgid "Photo Album" msgstr "相册" @@ -10386,6 +10357,10 @@ msgstr "桌面共享" #: ../menu-data/krita:kde4__krita.desktop.in.h:1 +#: ../menu-data/krita:kde4__krita_flipbook.desktop.in.h:1 +#: ../menu-data/krita:kde4__krita_jp2.desktop.in.h:2 +#: ../menu-data/krita:kde4__krita_odg.desktop.in.h:1 +#: ../menu-data/krita:kde4__krita_psd.desktop.in.h:1 msgid "Krita" msgstr "Krita" @@ -10510,7 +10485,6 @@ msgid "KSudoku, Sudoku game & more for KDE" msgstr "KSudoku、数独游戏及更多 KDE 游戏" -#: ../menu-data/gnome-system-monitor:gnome-system-monitor.desktop.in.h:1 #: ../menu-data/ksysguard:kde4__ksysguard.desktop.in.h:2 msgid "System Monitor" msgstr "系统监视器" @@ -10580,15 +10554,15 @@ msgid "KTouch" msgstr "KTouch" -#: ../menu-data/ktron:kde4__kdesnake.desktop.in.h:1 +#: ../menu-data/ksnakeduel:kde4__kdesnake.desktop.in.h:1 msgid "Snake-like Game" msgstr "类似贪吃蛇的游戏" -#: ../menu-data/ktron:kde4__kdesnake.desktop.in.h:2 +#: ../menu-data/ksnakeduel:kde4__kdesnake.desktop.in.h:2 msgid "KSnake" msgstr "KSnake" -#: ../menu-data/ktron:kde4__ktron.desktop.in.h:1 +#: ../menu-data/ksnakeduel:kde4__ktron.desktop.in.h:1 msgid "KSnakeDuel" msgstr "KSnakeDuel" @@ -10676,7 +10650,6 @@ msgid "KWalletManager" msgstr "KWalletManager" -#: ../menu-data/kwalletmanager:kde4__kwalletmanager-kwalletd.desktop.in.h:1 #: ../menu-data/kwalletmanager:kde4__kwalletmanager.desktop.in.h:2 msgid "Wallet Management Tool" msgstr "钱包管理工具" @@ -10885,7 +10858,6 @@ msgid "Panzer General clone" msgstr "装甲元帅游戏的克隆版本" -#: ../menu-data/exo-utils:exo-preferred-applications.desktop.in.h:1 #: ../menu-data/libfm-gtk-bin:libfm-pref-apps.desktop.in.h:1 msgid "Preferred Applications" msgstr "首选应用程序" @@ -11350,8 +11322,6 @@ msgid "luckyBackup" msgstr "luckyBackup" -#: ../menu-data/luckybackup:luckybackup-gnome-su.desktop.in.h:2 -#: ../menu-data/luckybackup:luckybackup-kde-su.desktop.in.h:2 #: ../menu-data/luckybackup:luckybackup.desktop.in.h:2 msgid "Backup & sync your data with the power of rsync" msgstr "通过强大的 rsync 备份和同步您的数据" @@ -11399,7 +11369,6 @@ msgstr "Lxkeymap 应用程序" #: ../menu-data/lxtask:lxtask.desktop.in.h:1 -#: ../menu-data/xfce4-taskmanager:xfce4-taskmanager.desktop.in.h:1 msgid "Task Manager" msgstr "任务管理器" @@ -11503,15 +11472,14 @@ msgid "Play classic Mahjong puzzle game" msgstr "玩经典的麻将益智游戏" -#: ../menu-data/gnome-mahjongg:gnome-mahjongg.desktop.in.h:1 +#: ../menu-data/gnome-mahjongg:mahjongg.desktop.in.h:1 msgid "Mahjongg" msgstr "Mahjongg" -#: ../menu-data/gnome-mahjongg:gnome-mahjongg.desktop.in.h:2 +#: ../menu-data/gnome-mahjongg:mahjongg.desktop.in.h:2 msgid "Disassemble a pile of tiles by removing matching pairs" msgstr "配对和消除麻将牌" -#: ../menu-data/mail-notification:mail-notification-properties.desktop.in.h:1 #: ../menu-data/mail-notification:mail-notification.desktop.in.h:1 msgid "Mail Notification" msgstr "邮件通知" @@ -11525,6 +11493,7 @@ msgstr "Mana" #: ../menu-data/mana:mana.desktop.in.h:2 +#: ../menu-data/manaplus:manaplus.desktop.in.h:2 msgid "A 2D MMORPG client" msgstr "一个 2D MMORPG 客户端" @@ -11553,10 +11522,18 @@ msgstr "与其他计算机共享鼠标和指针" #: ../menu-data/marble:kde4__marble.desktop.in.h:1 +#: ../menu-data/marble:kde4__marble_gpx.desktop.in.h:1 +#: ../menu-data/marble:kde4__marble_kml.desktop.in.h:1 +#: ../menu-data/marble:kde4__marble_kmz.desktop.in.h:1 +#: ../menu-data/marble:kde4__marble_osm.desktop.in.h:1 +#: ../menu-data/marble:kde4__marble_shp.desktop.in.h:1 msgid "Marble" msgstr "弹珠" #: ../menu-data/marble:kde4__marble.desktop.in.h:2 +#: ../menu-data/marble:kde4__marble_gpx.desktop.in.h:2 +#: ../menu-data/marble:kde4__marble_kml.desktop.in.h:2 +#: ../menu-data/marble:kde4__marble_osm.desktop.in.h:2 msgid "Desktop Globe" msgstr "桌面地球仪" @@ -11576,7 +11553,6 @@ msgid "Bio-polymer mass spectrometry software" msgstr "生物聚合物质谱分析法软件" -#: ../menu-data/gnome-control-center:gnome-keyboard-panel.desktop.in.h:1 #: ../menu-data/matchbox-keyboard:inputmethods__matchbox-keyboard.desktop.in.h:1 msgid "Keyboard" msgstr "键盘" @@ -12131,7 +12107,6 @@ msgstr "MPlayer 媒体播放器" #: ../menu-data/mplayer-gui:mplayer.desktop.in.h:2 -#: ../menu-data/totem:totem.desktop.in.h:2 msgid "Play movies and songs" msgstr "播放影片和歌曲" @@ -12180,7 +12155,6 @@ msgstr "Mtink" #: ../menu-data/mtink:mtink.desktop.in.h:2 -#: ../menu-data/mtink:mtinkc.desktop.in.h:2 msgid "Status monitor for Epson inkjet printers" msgstr "Epson 喷墨打印机的状态监视器" @@ -12385,7 +12359,6 @@ msgid "MythTV Frontend" msgstr "MythTV 前端" -#: ../menu-data/mythbuntu-live-autostart:mythbuntu-live-frontend.desktop.in.h:2 #: ../menu-data/mythtv-frontend:mythtv.desktop.in.h:2 msgid "A frontend for all content on a mythtv-backend" msgstr "可用于 mythtv 后端上所有内容的前端" @@ -12510,12 +12483,10 @@ msgid "NCurses Music Player Client" msgstr "NCurses 音乐播放器客户端" -#: ../menu-data/ndisgtk:ndisgtk-kde.desktop.in.h:1 #: ../menu-data/ndisgtk:ndisgtk.desktop.in.h:1 msgid "Windows Wireless Drivers" msgstr "Windows 无线驱动程序" -#: ../menu-data/ndisgtk:ndisgtk-kde.desktop.in.h:2 #: ../menu-data/ndisgtk:ndisgtk.desktop.in.h:2 msgid "Ndiswrapper driver installation tool" msgstr "Ndiswrapper 驱动程序安装工具" @@ -13701,10 +13672,11 @@ "systems" msgstr "简单的行星运行模拟器程序" -#: ../menu-data/planner:planner.desktop.in.h:2 +#: ../menu-data/planner:planner.desktop.in.h:1 msgid "Planner Project Management" msgstr "Planner 项目管理" +#: ../menu-data/easystroke:easystroke.desktop.in.h:3 #: ../menu-data/plasma-active-data:kde4__active-about.desktop.in.h:1 msgid "About" msgstr "关于" @@ -13742,6 +13714,7 @@ msgstr "Plasma Active 桌面设置" #: ../menu-data/plasma-active-webbrowser:kde4__active-web-browser.desktop.in.h:1 +#: ../menu-data/webbrowser-app:webbrowser-app.desktop.in.h:1 msgid "Browser" msgstr "浏览器" @@ -15188,7 +15161,6 @@ msgid "RasMol (GTK version)" msgstr "RasMol (GTK 版本)" -#: ../menu-data/rasmol:rasmol-classic.desktop.in.h:2 #: ../menu-data/rasmol:rasmol-gtk.desktop.in.h:2 msgid "View macro-molecules and prepare publication-quality images of them" msgstr "查看大分子并制作打印质量的分子图像" @@ -15310,11 +15282,11 @@ msgid "A port of FlashBack game engine" msgstr "FlashBack 游戏引擎移植" -#: ../menu-data/remmina-common:remmina.desktop.in.h:1 +#: ../menu-data/remmina:remmina.desktop.in.h:1 msgid "Remmina Remote Desktop Client" msgstr "Remmina 远程桌面客户端" -#: ../menu-data/remmina-common:remmina.desktop.in.h:2 +#: ../menu-data/remmina:remmina.desktop.in.h:2 msgid "Connect to remote desktops" msgstr "连接到远程桌面" @@ -15406,7 +15378,6 @@ msgid "Purchase music on Ubuntu One in Rhythmbox" msgstr "" -#: ../menu-data/rhythmbox:rhythmbox-device.desktop.in.h:1 #: ../menu-data/rhythmbox:rhythmbox.desktop.in.h:1 msgid "Rhythmbox Music Player" msgstr "Rhythmbox 音乐播放器" @@ -15736,11 +15707,11 @@ msgid "Page Layout and Publication" msgstr "页面布局和出版" -#: ../menu-data/scummvm-data:scummvm.desktop.in.h:1 +#: ../menu-data/scummvm:scummvm.desktop.in.h:1 msgid "ScummVM" msgstr "ScummVM" -#: ../menu-data/scummvm-data:scummvm.desktop.in.h:2 +#: ../menu-data/scummvm:scummvm.desktop.in.h:2 msgid "Interpreter for several adventure games" msgstr "多个冒险游戏的解释器程序" @@ -15857,282 +15828,282 @@ msgid "Call and receive calls with SIP or IAX protocols" msgstr "使用 SIP 或 IAX 协议拨打和接听电话" -#: ../menu-data/sgt-puzzles:blackboxgame.desktop.in.h:1 +#: ../menu-data/sgt-puzzles:sgt-blackbox.desktop.in.h:1 msgid "Black Box" msgstr "黑盒" -#: ../menu-data/sgt-puzzles:blackboxgame.desktop.in.h:2 +#: ../menu-data/sgt-puzzles:sgt-blackbox.desktop.in.h:2 msgid "Deduce the positions of the balls by firing lasers" msgstr "通过激光扫描推断出球的位置" -#: ../menu-data/sgt-puzzles:bridges.desktop.in.h:1 +#: ../menu-data/sgt-puzzles:sgt-bridges.desktop.in.h:1 msgid "Bridges" msgstr "网桥" -#: ../menu-data/sgt-puzzles:bridges.desktop.in.h:2 +#: ../menu-data/sgt-puzzles:sgt-bridges.desktop.in.h:2 msgid "Connect the islands together with bridges" msgstr "用桥连接岛屿" -#: ../menu-data/sgt-puzzles:cube.desktop.in.h:1 +#: ../menu-data/sgt-puzzles:sgt-cube.desktop.in.h:1 msgid "Cube" msgstr "Cube" -#: ../menu-data/sgt-puzzles:cube.desktop.in.h:2 +#: ../menu-data/sgt-puzzles:sgt-cube.desktop.in.h:2 msgid "" "Get all six blue squares on to the six faces of the cube at the same time" msgstr "同时将6个蓝色方块放到正方体的6个面上" -#: ../menu-data/sgt-puzzles:dominosa.desktop.in.h:1 +#: ../menu-data/sgt-puzzles:sgt-dominosa.desktop.in.h:1 msgid "Dominosa" msgstr "Dominosa" -#: ../menu-data/sgt-puzzles:dominosa.desktop.in.h:2 +#: ../menu-data/sgt-puzzles:sgt-dominosa.desktop.in.h:2 msgid "" "Reconstruct the pattern by arranging the set of dominoes to match the " "provided array of numbers" msgstr "以给定的数字阵列来排列一系列多米诺骨牌实现重建图样" -#: ../menu-data/sgt-puzzles:fifteen.desktop.in.h:1 +#: ../menu-data/sgt-puzzles:sgt-fifteen.desktop.in.h:1 msgid "Fifteen" msgstr "Fifteen" -#: ../menu-data/sgt-puzzles:fifteen.desktop.in.h:2 +#: ../menu-data/sgt-puzzles:sgt-fifteen.desktop.in.h:2 msgid "" "Try to end up with the tiles in numerical order, with the space in the " "bottom right" msgstr "将砖块按照数字顺序排列，并在右下角空出空间" -#: ../menu-data/sgt-puzzles:filling.desktop.in.h:1 +#: ../menu-data/sgt-puzzles:sgt-filling.desktop.in.h:1 msgid "Filling" msgstr "Filling" -#: ../menu-data/sgt-puzzles:filling.desktop.in.h:2 +#: ../menu-data/sgt-puzzles:sgt-filling.desktop.in.h:2 msgid "" "Fill in digits so that each connected region of squares containing the same " "digit has an area equal to that digit" msgstr "填写数字，使包含相同数字的每个相连的方形区域其面积等于该数字。" -#: ../menu-data/sgt-puzzles:flipgame.desktop.in.h:1 +#: ../menu-data/sgt-puzzles:sgt-flip.desktop.in.h:1 msgid "Flip" msgstr "Flip" -#: ../menu-data/sgt-puzzles:flipgame.desktop.in.h:2 +#: ../menu-data/sgt-puzzles:sgt-flip.desktop.in.h:2 msgid "Light all the squares up at the same time" msgstr "点亮所有的方块" -#: ../menu-data/sgt-puzzles:galaxies.desktop.in.h:1 +#: ../menu-data/sgt-puzzles:sgt-galaxies.desktop.in.h:1 msgid "Galaxies" msgstr "Galaxies" -#: ../menu-data/sgt-puzzles:galaxies.desktop.in.h:2 +#: ../menu-data/sgt-puzzles:sgt-galaxies.desktop.in.h:2 msgid "" "Draw edges along the grid lines which divide the rectangle under certain " "rules" msgstr "沿网格线画出边线，根据规则划分长方形。" -#: ../menu-data/sgt-puzzles:guess.desktop.in.h:1 +#: ../menu-data/sgt-puzzles:sgt-guess.desktop.in.h:1 msgid "Guess" msgstr "Guess" -#: ../menu-data/sgt-puzzles:guess.desktop.in.h:2 +#: ../menu-data/sgt-puzzles:sgt-guess.desktop.in.h:2 msgid "Game similar to the famous 'Mastermind'" msgstr "类似于 Mastermind 的解谜游戏" -#: ../menu-data/sgt-puzzles:inertia.desktop.in.h:1 +#: ../menu-data/sgt-puzzles:sgt-inertia.desktop.in.h:1 msgid "Inertia" msgstr "Inertia" -#: ../menu-data/sgt-puzzles:inertia.desktop.in.h:2 +#: ../menu-data/sgt-puzzles:sgt-inertia.desktop.in.h:2 msgid "Collect all the gems without running into any mines" msgstr "避开地雷，收集到所有的宝石" -#: ../menu-data/sgt-puzzles:keen.desktop.in.h:1 +#: ../menu-data/sgt-puzzles:sgt-keen.desktop.in.h:1 msgid "Keen" msgstr "Keen" -#: ../menu-data/sgt-puzzles:keen.desktop.in.h:2 +#: ../menu-data/sgt-puzzles:sgt-keen.desktop.in.h:2 msgid "Game based on KenKen" msgstr "一个基于 KenKen 的游戏" -#: ../menu-data/sgt-puzzles:lightup.desktop.in.h:1 +#: ../menu-data/sgt-puzzles:sgt-lightup.desktop.in.h:1 msgid "Light Up" msgstr "Light Up" -#: ../menu-data/sgt-puzzles:lightup.desktop.in.h:2 +#: ../menu-data/sgt-puzzles:sgt-lightup.desktop.in.h:2 msgid "Light up all the empty squares by placing light bulbs in some of them" msgstr "通过放置灯泡来点亮所有空白区域" -#: ../menu-data/sgt-puzzles:loopy.desktop.in.h:1 +#: ../menu-data/sgt-puzzles:sgt-loopy.desktop.in.h:1 msgid "Loopy" msgstr "Loopy" -#: ../menu-data/sgt-puzzles:loopy.desktop.in.h:2 +#: ../menu-data/sgt-puzzles:sgt-loopy.desktop.in.h:2 msgid "Draw lines around a digit according to the number in it" msgstr "根据数字编号绕该数字划线" -#: ../menu-data/sgt-puzzles:magnets.desktop.in.h:1 +#: ../menu-data/sgt-puzzles:sgt-magnets.desktop.in.h:1 msgid "Magnets" msgstr "Magnets" -#: ../menu-data/sgt-puzzles:magnets.desktop.in.h:2 +#: ../menu-data/sgt-puzzles:sgt-magnets.desktop.in.h:2 msgid "Magnets puzzle game" msgstr "磁石引路益智游戏" -#: ../menu-data/sgt-puzzles:map.desktop.in.h:1 +#: ../menu-data/sgt-puzzles:sgt-map.desktop.in.h:1 msgid "Map" msgstr "Map" -#: ../menu-data/sgt-puzzles:map.desktop.in.h:2 +#: ../menu-data/sgt-puzzles:sgt-map.desktop.in.h:2 msgid "" "Colour each region with one of four colours so that no two regions sharing a " "boundary have the same colour" msgstr "使用四种颜色中的其中一种对每个区域进行着色，以使具有共同边界的两个区域其颜色均不相同" -#: ../menu-data/sgt-puzzles:netgame.desktop.in.h:1 +#: ../menu-data/sgt-puzzles:sgt-net.desktop.in.h:1 msgid "Net" msgstr "Net" -#: ../menu-data/sgt-puzzles:netgame.desktop.in.h:2 +#: ../menu-data/sgt-puzzles:sgt-net.desktop.in.h:2 msgid "Rotate every tile to fix the network" msgstr "旋转瓦片，以修复网络" -#: ../menu-data/sgt-puzzles:netslide.desktop.in.h:1 +#: ../menu-data/sgt-puzzles:sgt-netslide.desktop.in.h:1 msgid "Netslide" msgstr "Netslide" -#: ../menu-data/sgt-puzzles:netslide.desktop.in.h:2 +#: ../menu-data/sgt-puzzles:sgt-netslide.desktop.in.h:2 msgid "" "Game combining the grid generation of Net with the movement of Sixteen" msgstr "将 Net 和 Sixteen 两个游戏结合起来的新游戏" -#: ../menu-data/sgt-puzzles:pattern.desktop.in.h:1 +#: ../menu-data/sgt-puzzles:sgt-pattern.desktop.in.h:1 msgid "Pattern" msgstr "Pattern" -#: ../menu-data/sgt-puzzles:pattern.desktop.in.h:2 +#: ../menu-data/sgt-puzzles:sgt-pattern.desktop.in.h:2 msgid "Fill in the entire grid black or white" msgstr "将整个网格区域填充为黑色或白色" -#: ../menu-data/sgt-puzzles:pearl.desktop.in.h:1 +#: ../menu-data/sgt-puzzles:sgt-pearl.desktop.in.h:1 msgid "Pearl" msgstr "" -#: ../menu-data/sgt-puzzles:pearl.desktop.in.h:2 +#: ../menu-data/sgt-puzzles:sgt-pearl.desktop.in.h:2 msgid "Game based on Masyu" msgstr "" -#: ../menu-data/sgt-puzzles:pegs.desktop.in.h:1 +#: ../menu-data/sgt-puzzles:sgt-pegs.desktop.in.h:1 msgid "Pegs" msgstr "Pegs" -#: ../menu-data/sgt-puzzles:pegs.desktop.in.h:2 +#: ../menu-data/sgt-puzzles:sgt-pegs.desktop.in.h:2 msgid "Remove all but one of the pegs by jumping an adjacent peg over it" msgstr "一个简单的叠加和消除游戏。" -#: ../menu-data/sgt-puzzles:range.desktop.in.h:1 +#: ../menu-data/sgt-puzzles:sgt-range.desktop.in.h:1 msgid "Range" msgstr "Range" -#: ../menu-data/sgt-puzzles:range.desktop.in.h:2 +#: ../menu-data/sgt-puzzles:sgt-range.desktop.in.h:2 msgid "Fill the grid so the range of each numbered square matches the number" msgstr "填充方格，使每个已编号的方块范围与数字相匹配" -#: ../menu-data/sgt-puzzles:rect.desktop.in.h:1 +#: ../menu-data/sgt-puzzles:sgt-rect.desktop.in.h:1 msgid "Rectangles" msgstr "Rectangles" -#: ../menu-data/sgt-puzzles:rect.desktop.in.h:2 +#: ../menu-data/sgt-puzzles:sgt-rect.desktop.in.h:2 msgid "" "Subdivide the grid into rectangles of various sizes following certain rules" msgstr "按照特定规则将方格划分为各种尺寸的矩形" -#: ../menu-data/sgt-puzzles:samegame.desktop.in.h:1 +#: ../menu-data/sgt-puzzles:sgt-samegame.desktop.in.h:1 msgid "Same Game" msgstr "Same Game" -#: ../menu-data/sgt-puzzles:samegame.desktop.in.h:2 +#: ../menu-data/sgt-puzzles:sgt-samegame.desktop.in.h:2 msgid "" "Clear the grid of coloured squares by highlighting contiguous regions of " "more than one coloured square" msgstr "通过突出显示多个彩色方块的相邻区域来消除彩色方格" -#: ../menu-data/sgt-puzzles:signpost.desktop.in.h:1 +#: ../menu-data/sgt-puzzles:sgt-signpost.desktop.in.h:1 msgid "Signpost" msgstr "Signpost" -#: ../menu-data/sgt-puzzles:signpost.desktop.in.h:2 +#: ../menu-data/sgt-puzzles:sgt-signpost.desktop.in.h:2 msgid "Link the squares of a grid according to the arrows on them" msgstr "根据方格上的箭头连接方格" -#: ../menu-data/sgt-puzzles:singles.desktop.in.h:1 +#: ../menu-data/sgt-puzzles:sgt-singles.desktop.in.h:1 msgid "Singles" msgstr "Singles" -#: ../menu-data/sgt-puzzles:singles.desktop.in.h:2 +#: ../menu-data/sgt-puzzles:sgt-singles.desktop.in.h:2 msgid "Puzzle game based on Hitori" msgstr "基于 Hitori 的益智游戏" -#: ../menu-data/sgt-puzzles:sixteen.desktop.in.h:1 +#: ../menu-data/sgt-puzzles:sgt-sixteen.desktop.in.h:1 msgid "Sixteen" msgstr "Sixteen" -#: ../menu-data/sgt-puzzles:sixteen.desktop.in.h:2 +#: ../menu-data/sgt-puzzles:sgt-sixteen.desktop.in.h:2 msgid "Game similar to Fifteen, but with a different type of move" msgstr "与 Fifteen 游戏类似，但移动方式不同" -#: ../menu-data/sgt-puzzles:slant.desktop.in.h:1 +#: ../menu-data/sgt-puzzles:sgt-slant.desktop.in.h:1 msgid "Slant" msgstr "Slant" -#: ../menu-data/sgt-puzzles:slant.desktop.in.h:2 +#: ../menu-data/sgt-puzzles:sgt-slant.desktop.in.h:2 msgid "Draw a diagonal line and choose which way each line slants" msgstr "画一条对角线，并选择每条线倾斜的方式" -#: ../menu-data/sgt-puzzles:solo.desktop.in.h:1 +#: ../menu-data/sgt-puzzles:sgt-solo.desktop.in.h:1 msgid "Solo" msgstr "Solo" -#: ../menu-data/sgt-puzzles:solo.desktop.in.h:2 +#: ../menu-data/sgt-puzzles:sgt-solo.desktop.in.h:2 msgid "Sudoku game" msgstr "数独游戏" -#: ../menu-data/sgt-puzzles:tents.desktop.in.h:1 +#: ../menu-data/sgt-puzzles:sgt-tents.desktop.in.h:1 msgid "Tents" msgstr "Tents" -#: ../menu-data/sgt-puzzles:tents.desktop.in.h:2 +#: ../menu-data/sgt-puzzles:sgt-tents.desktop.in.h:2 msgid "Place tents in some of the remaining squares, under some conditions" msgstr "根据条件在剩余方格中放置帐篷" -#: ../menu-data/sgt-puzzles:towers.desktop.in.h:1 +#: ../menu-data/sgt-puzzles:sgt-towers.desktop.in.h:1 msgid "Towers" msgstr "Towers" -#: ../menu-data/sgt-puzzles:towers.desktop.in.h:2 +#: ../menu-data/sgt-puzzles:sgt-towers.desktop.in.h:2 msgid "Puzzle game based on Skyscrapers" msgstr "基于 Skyscrapers 的益智游戏" -#: ../menu-data/sgt-puzzles:twiddle.desktop.in.h:1 +#: ../menu-data/sgt-puzzles:sgt-twiddle.desktop.in.h:1 msgid "Twiddle" msgstr "Twiddle" -#: ../menu-data/sgt-puzzles:twiddle.desktop.in.h:2 +#: ../menu-data/sgt-puzzles:sgt-twiddle.desktop.in.h:2 msgid "Arrange the numbers into ascending order " msgstr "将数字升序排列 " -#: ../menu-data/sgt-puzzles:unequal.desktop.in.h:1 +#: ../menu-data/sgt-puzzles:sgt-unequal.desktop.in.h:1 msgid "Unequal" msgstr "Unequal" -#: ../menu-data/sgt-puzzles:unequal.desktop.in.h:2 +#: ../menu-data/sgt-puzzles:sgt-unequal.desktop.in.h:2 msgid "Fully populate the grid with numbers under some conditions" msgstr "根据条件用数字完全填充方格" -#: ../menu-data/sgt-puzzles:untangle.desktop.in.h:1 +#: ../menu-data/sgt-puzzles:sgt-untangle.desktop.in.h:1 msgid "Untangle" msgstr "Untangle" -#: ../menu-data/sgt-puzzles:untangle.desktop.in.h:2 +#: ../menu-data/sgt-puzzles:sgt-untangle.desktop.in.h:2 msgid "Position the points so that no line crosses another" msgstr "用合适的方式防止点，使所有线段均不相交" @@ -16148,11 +16119,11 @@ msgid "Interpreter for Shoes programs" msgstr "Shoes 图形界面工具箱解释器" -#: ../menu-data/shotwell:shotwell.desktop.in.h:1 +#: ../menu-data/shotwell-common:shotwell.desktop.in.h:1 msgid "Organize your photos" msgstr "管理您的照片" -#: ../menu-data/shotwell:shotwell.desktop.in.h:2 +#: ../menu-data/shotwell-common:shotwell.desktop.in.h:2 msgid "Shotwell Photo Manager" msgstr "Shotwell 照片管理器" @@ -16457,8 +16428,6 @@ msgid "Ubuntu Software Center" msgstr "Ubuntu 软件中心" -#: ../menu-data/software-properties-gtk:software-properties-gnome.desktop.in.h:1 -#: ../menu-data/software-properties-gtk:software-properties-gtk.desktop.in.h:1 #: ../menu-data/software-properties-kde:software-properties-kde.desktop.in.h:1 msgid "Software Sources" msgstr "软件源" @@ -16995,12 +16964,10 @@ msgid "Search everything you do." msgstr "搜索你所做的一切。" -#: ../menu-data/synaptic:synaptic-kde.desktop.in.h:1 #: ../menu-data/synaptic:synaptic.desktop.in.h:1 msgid "Synaptic Package Manager" msgstr "新立得软件包管理器" -#: ../menu-data/synaptic:synaptic-kde.desktop.in.h:2 #: ../menu-data/synaptic:synaptic.desktop.in.h:2 msgid "Install, remove and upgrade software packages" msgstr "安装、删除和升级软件包" @@ -17022,6 +16989,7 @@ msgstr "GNOME 的 SynCE 掌上电脑控制" #: ../menu-data/syncmaildir-applet:smd-applet-configure.desktop.in.h:1 +#: ../menu-data/syncmaildir-applet:smd-applet.desktop.in.h:1 msgid "Sync Mail Dir" msgstr "同步邮件目录" @@ -17061,7 +17029,6 @@ msgid "Configure and manage clusters in a graphical setting" msgstr "使用图形界面配置并管理群集" -#: ../menu-data/gnome-control-center:gnome-datetime-panel.desktop.in.h:1 #: ../menu-data/system-config-date:system-config-date.desktop.in.h:1 msgid "Date & Time" msgstr "日期和时间" @@ -17106,8 +17073,9 @@ msgid "KDE System Settings" msgstr "KDE 系统设置" -#: ../menu-data/gnome-control-center:gnome-control-center.desktop.in.h:1 +#: ../menu-data/cinnamon:cinnamon-settings.desktop.in.h:1 #: ../menu-data/systemsettings:kde4__systemsettings.desktop.in.h:1 +#: ../menu-data/ubuntu-system-settings:ubuntu-system-settings.desktop.in.h:1 msgid "System Settings" msgstr "系统设置" @@ -17658,6 +17626,7 @@ msgstr "电影播放器" #: ../menu-data/minitube:minitube.desktop.in.h:3 +#: ../menu-data/parole:parole.desktop.in.h:3 #: ../menu-data/totem:totem.desktop.in.h:3 msgid "Play/Pause" msgstr "播放 / 暂停" @@ -18023,10 +17992,12 @@ msgid "UAE Amiga emulator" msgstr "UAE Amiga 模拟器" +#: ../menu-data/ubuntuone-control-panel-qt:ubuntuone-control-panel-qt-gnome.desktop.in.h:1 #: ../menu-data/ubuntuone-control-panel-qt:ubuntuone-installer.desktop.in.h:1 msgid "Ubuntu One" msgstr "Ubuntu One" +#: ../menu-data/ubuntuone-control-panel-qt:ubuntuone-control-panel-qt-gnome.desktop.in.h:2 #: ../menu-data/ubuntuone-control-panel-qt:ubuntuone-installer.desktop.in.h:2 msgid "Configure and manage your Ubuntu One account" msgstr "配置和管理您的 Ubuntu One 账户" @@ -18148,7 +18119,6 @@ msgstr "创建自启动 U 盘的工具" #: ../menu-data/unison-gtk:unison-gtk.desktop.in.h:1 -#: ../menu-data/unison2.27.57-gtk:unison2.27.57-gtk.desktop.in.h:1 #: ../menu-data/unison2.32.52-gtk:unison2.32.52-gtk.desktop.in.h:1 msgid "Unison" msgstr "Unison" @@ -18439,13 +18409,12 @@ msgid "GVim" msgstr "GVim" -#: ../menu-data/vinagre:vinagre-file.desktop.in.h:1 #: ../menu-data/vinagre:vinagre.desktop.in.h:1 msgid "Remote Desktop Viewer" msgstr "远程桌面查看器" -#: ../menu-data/vinagre:vinagre-file.desktop.in.h:2 #: ../menu-data/vinagre:vinagre.desktop.in.h:2 +#: ../menu-data/virt-viewer:remote-viewer.desktop.in.h:2 msgid "Access remote desktops" msgstr "访问远程桌面" @@ -18829,7 +18798,6 @@ msgid "Winefish LaTeX Editor" msgstr "Winefish LaTeX 编辑器" -#: ../menu-data/winefish:winefish-project.desktop.in.h:2 #: ../menu-data/winefish:winefish.desktop.in.h:2 msgid "LaTeX Editor based on Bluefish" msgstr "基于 Bluefish 的 LaTeX 编辑器" @@ -19660,7 +19628,6 @@ msgid "XTerm" msgstr "XTerm" -#: ../menu-data/xterm:debian-uxterm.desktop.in.h:2 #: ../menu-data/xterm:debian-xterm.desktop.in.h:2 msgid "standard terminal emulator for the X window system" msgstr "用于 X 窗口系统的标准终端仿真器" @@ -19783,7 +19750,6 @@ msgid "Place phone calls over the Internet" msgstr "在互联网上进行电话呼叫" -#: ../menu-data/khelpcenter4:kde4__Help.desktop.in.h:1 #: ../menu-data/yelp:yelp.desktop.in.h:1 msgid "Help" msgstr "帮助" @@ -19872,6 +19838,10 @@ msgid "Arcade multiplayer game for 2-6 players" msgstr "2-6 个人玩的街机多人游戏" +#: ../menu-data/zathura-cb:zathura-cb.desktop.in.h:1 +#: ../menu-data/zathura-djvu:zathura-djvu.desktop.in.h:1 +#: ../menu-data/zathura-ps:zathura-ps.desktop.in.h:1 +#: ../menu-data/zathura:zathura-pdf-poppler.desktop.in.h:1 #: ../menu-data/zathura:zathura.desktop.in.h:1 msgid "Zathura" msgstr "Zathura" @@ -19900,7 +19870,6 @@ msgid "Zenmap" msgstr "Zenmap" -#: ../menu-data/zenmap:zenmap-root.desktop.in.h:2 #: ../menu-data/zenmap:zenmap.desktop.in.h:2 msgid "A cross-platform GUI for the Nmap Security Scanner." msgstr "一个跨平台的 Nmap 安全扫描仪的 GUI。" diff -Nru language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/apparmor-parser.po language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/apparmor-parser.po --- language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/apparmor-parser.po 1970-01-01 00:00:00.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/apparmor-parser.po 2014-01-07 07:01:46.000000000 +0000 @@ -0,0 +1,555 @@ +# Chinese (Simplified) translation for apparmor +# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 +# This file is distributed under the same license as the apparmor package. +# FIRST AUTHOR , 2013. +# +msgid "" +msgstr "" +"Project-Id-Version: apparmor\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-02-22 03:25-0800\n" +"PO-Revision-Date: 2013-11-14 22:32+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Chinese (Simplified) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2014-01-06 15:34+0000\n" +"X-Generator: Launchpad (build 16877)\n" + +#: ../parser_include.c:113 +msgid "Error: Out of memory.\n" +msgstr "错误：内存不足。\n" + +#: ../parser_include.c:123 +#, c-format +msgid "Error: basedir %s is not a directory, skipping.\n" +msgstr "错误：basedir %s 不是目录，正在跳过。\n" + +#: ../parser_include.c:137 +#, c-format +msgid "Error: Could not add directory %s to search path.\n" +msgstr "错误：无法将目录 %s 添加到搜索路径。\n" + +#: ../parser_include.c:147 +msgid "Error: Could not allocate memory.\n" +msgstr "错误：无法分配内存。\n" + +#: ../parser_interface.c:69 +msgid "Bad write position\n" +msgstr "写入位置无效\n" + +#: ../parser_interface.c:72 +msgid "Permission denied\n" +msgstr "拒绝许可权限\n" + +#: ../parser_interface.c:75 +msgid "Out of memory\n" +msgstr "内存不足\n" + +#: ../parser_interface.c:78 +msgid "Couldn't copy profile: Bad memory address\n" +msgstr "" + +#: ../parser_interface.c:81 +msgid "Profile doesn't conform to protocol\n" +msgstr "配置文件未遵守协议\n" + +#: ../parser_interface.c:84 +msgid "Profile does not match signature\n" +msgstr "配置文件和签名不匹配\n" + +#: ../parser_interface.c:87 +msgid "Profile version not supported by Apparmor module\n" +msgstr "配置文件版本不受 Apparmor 模块支持\n" + +#: ../parser_interface.c:90 +msgid "Profile already exists\n" +msgstr "配置文件已存在\n" + +#: ../parser_interface.c:93 +msgid "Profile doesn't exist\n" +msgstr "配置文件不存在\n" + +#: ../parser_interface.c:96 +msgid "Permission denied; attempted to load a profile while confined?\n" +msgstr "" + +#: ../parser_interface.c:99 +#, c-format +msgid "Unknown error (%d): %s\n" +msgstr "" + +#: ../parser_interface.c:116 +#, c-format +msgid "%s: Unable to add \"%s\". " +msgstr "%s: 无法添加\"%s\"。 " + +#: ../parser_interface.c:121 +#, c-format +msgid "%s: Unable to replace \"%s\". " +msgstr "%s: 无法替换\"%s\"。 " + +#: ../parser_interface.c:126 +#, c-format +msgid "%s: Unable to remove \"%s\". " +msgstr "%s: 无法去除\"%s\"。 " + +#: ../parser_interface.c:131 +#, c-format +msgid "%s: Unable to write to stdout\n" +msgstr "%s: 无法写入 stdout\n" + +#: ../parser_interface.c:135 +#, c-format +msgid "%s: Unable to write to output file\n" +msgstr "" + +#: ../parser_interface.c:138 ../parser_interface.c:162 +#, c-format +msgid "%s: ASSERT: Invalid option: %d\n" +msgstr "%s: 声明：无效选项： %d\n" + +#: ../parser_interface.c:147 +#, c-format +msgid "Addition succeeded for \"%s\".\n" +msgstr "添加\"%s\"成功。\n" + +#: ../parser_interface.c:151 +#, c-format +msgid "Replacement succeeded for \"%s\".\n" +msgstr "替换\"%s\"成功。\n" + +#: ../parser_interface.c:155 +#, c-format +msgid "Removal succeeded for \"%s\".\n" +msgstr "去除\"%s\"成功。\n" + +#: ../parser_interface.c:251 +#, c-format +msgid "PANIC bad increment buffer %p pos %p ext %p size %d res %p\n" +msgstr "PANIC 无效的递增缓冲区：%p pos %p ext %p size %d res %p\n" + +#: ../parser_interface.c:656 +#, c-format +msgid "profile %s network rules not enforced\n" +msgstr "" + +#: ../parser_interface.c:666 +msgid "Unknown pattern type\n" +msgstr "" + +#: ../parser_interface.c:750 ../parser_interface.c:902 +#, c-format +msgid "Unable to open %s - %s\n" +msgstr "无法打开 %s － %s\n" + +#: ../parser_interface.c:776 +#, c-format +msgid "Memory Allocation Error: Unable to remove ^%s\n" +msgstr "内存分配错误：无法去除 ^%s\n" + +#: ../parser_interface.c:789 +#, c-format +msgid "Memory Allocation Error: Unable to remove %s:%s." +msgstr "内存分配错误：无法去除 %s:%s。" + +#: ../parser_interface.c:810 +msgid "unable to create work area\n" +msgstr "无法创建工作区域\n" + +#: ../parser_interface.c:818 +#, c-format +msgid "unable to serialize profile %s\n" +msgstr "无法序列化配置文件 %s\n" + +#: ../parser_interface.c:829 ../parser_interface.c:916 +#, c-format +msgid "%s: Unable to write entire profile entry\n" +msgstr "%s: 无法写入整个配置文件项\n" + +#: ../parser_interface.c:839 +#, c-format +msgid "%s: Unable to write entire profile entry to cache\n" +msgstr "" + +#: parser_lex.l:100 +#, c-format +msgid "Could not open '%s'" +msgstr "" + +#: parser_lex.l:104 +#, c-format +msgid "fstat failed for '%s'" +msgstr "" + +#: parser_lex.l:121 +#, c-format +msgid "opendir failed '%s'" +msgstr "" + +#: parser_lex.l:152 +#, c-format +msgid "stat failed for '%s'" +msgstr "" + +#: parser_lex.l:155 +#, c-format +msgid "Could not open '%s' in '%s'" +msgstr "" + +#: parser_lex.l:284 parser_lex.l:322 parser_lex.l:362 parser_lex.l:399 +#: parser_lex.l:469 parser_lex.l:655 +#, c-format +msgid "Found unexpected character: '%s'" +msgstr "发现意外字符： '%s'" + +#: parser_lex.l:386 +msgid "Variable declarations do not accept trailing commas" +msgstr "" + +#: parser_lex.l:420 +#, c-format +msgid "(network_mode) Found unexpected character: '%s'" +msgstr "(network_mode) 发现意外字符：“%s”" + +#: ../parser_main.c:333 +#, c-format +msgid "Warning from %s (%s%sline %d): %s" +msgstr "" + +#: ../parser_main.c:531 +#, c-format +msgid "%s: Could not allocate memory for subdomainbase mount point\n" +msgstr "%s: 无法为子域基底装入点分配内存\n" + +#: ../parser_main.c:577 +#, c-format +msgid "" +"Warning: unable to find a suitable fs in %s, is it mounted?\n" +"Use --subdomainfs to override.\n" +msgstr "" +"警告：无法在 %s 中找到合适的 fs，是否已装入？\n" +"使用 --subdomainfs 覆盖。\n" + +#: ../parser_main.c:597 +#, c-format +msgid "" +"%s: Sorry. You need root privileges to run this program.\n" +"\n" +msgstr "" +"%s：对不起。您需要 root 特权才能运行此程序。\n" +"\n" + +#: ../parser_main.c:604 +#, c-format +msgid "" +"%s: Warning! You've set this program setuid root.\n" +"Anybody who can run this program can update your AppArmor profiles.\n" +"\n" +msgstr "" +"%s：警告！您已将此程序设置为 setuid root。\n" +"任何可以运行此程序的人都可以更新 AppArmor 配置文件。\n" +"\n" + +#: ../parser_main.c:704 ../parser_main.c:813 +#, c-format +msgid "Error: Could not read profile %s: %s.\n" +msgstr "错误：无法读取配置文件 %s: %s。\n" + +#: ../parser_main.c:718 ../parser_misc.c:270 parser_yacc.y:227 +#: parser_yacc.y:374 parser_yacc.y:386 parser_yacc.y:484 parser_yacc.y:586 +#: parser_yacc.y:624 parser_yacc.y:939 parser_yacc.y:948 parser_yacc.y:960 +#: parser_yacc.y:1008 parser_yacc.y:1019 parser_yacc.y:1101 parser_yacc.y:1119 +#: parser_yacc.y:1126 +msgid "Memory allocation error." +msgstr "内存分配错误。" + +#: ../parser_main.c:740 +#, c-format +msgid "Cached load succeeded for \"%s\".\n" +msgstr "" + +#: ../parser_main.c:744 +#, c-format +msgid "Cached reload succeeded for \"%s\".\n" +msgstr "" + +#: ../parser_main.c:910 +#, c-format +msgid "%s: Errors found in file. Aborting.\n" +msgstr "%s: 文件中发现错误。正在中止。\n" + +#: ../parser_misc.c:426 +msgid "" +"Uppercase qualifiers \"RWLIMX\" are deprecated, please convert to lowercase\n" +"See the apparmor.d(5) manpage for details.\n" +msgstr "" +"不允许使用大写限定符 “RWLIMX”，请转换为小写\n" +"有关细节，请参见 apparmor.d(5) 手册页。\n" + +#: ../parser_misc.c:467 ../parser_misc.c:474 +msgid "Conflict 'a' and 'w' perms are mutually exclusive." +msgstr "冲突的“a”和“w”许可权限互相排斥。" + +#: ../parser_misc.c:491 +msgid "Exec qualifier 'i' invalid, conflicting qualifier already specified" +msgstr "Exec 限定符'i'无效，已指定了和其冲突的限定符" + +#: ../parser_misc.c:502 +#, c-format +msgid "" +"Unconfined exec qualifier (%c%c) allows some dangerous environment variables " +"to be passed to the unconfined process; 'man 5 apparmor.d' for details.\n" +msgstr "" +"无限制 exec 限定符 (%c%c) 允许将一些危险的环境变量传递到无限制的进程；有关细节，请参见“man 5 apparmor.d”。\n" + +#: ../parser_misc.c:510 ../parser_misc.c:551 +#, c-format +msgid "Exec qualifier '%c' invalid, conflicting qualifier already specified" +msgstr "Exec 限定符“%c”无效，已指定了与其冲突的限定符" + +#: ../parser_misc.c:537 ../parser_misc.c:545 +#, c-format +msgid "" +"Exec qualifier '%c%c' invalid, conflicting qualifier already specified" +msgstr "执行限定符“%c%c”无效，与已经指定的限定符冲突" + +#: ../parser_misc.c:593 +#, c-format +msgid "Internal: unexpected mode character '%c' in input" +msgstr "内部：输入中有意外方式字符“%c”" + +#: ../parser_misc.c:615 +#, c-format +msgid "Internal error generated invalid perm 0x%llx\n" +msgstr "内部错误产生无效的权限 0x%llx\n" + +#: ../parser_misc.c:865 ../parser_symtab.c:561 ../parser_regex.c:626 +#: ../parser_variable.c:229 +#, c-format +msgid "AppArmor parser error: %s\n" +msgstr "AppArmor 语法分析器错误：%s\n" + +#: ../parser_merge.c:92 +msgid "Couldn't merge entries. Out of Memory\n" +msgstr "无法合并项。内存不足\n" + +#: ../parser_merge.c:111 +#, c-format +msgid "profile %s: has merged rule %s with conflicting x modifiers\n" +msgstr "" + +#: parser_yacc.y:236 +msgid "Profile attachment must begin with a '/'." +msgstr "" + +#: parser_yacc.y:260 +msgid "" +"Profile names must begin with a '/', namespace or keyword 'profile' or 'hat'." +msgstr "" + +#: parser_yacc.y:296 +#, c-format +msgid "Failed to create alias %s -> %s\n" +msgstr "无法创建别名 %s -> %s\n" + +#: parser_yacc.y:417 +msgid "Profile flag chroot_relative conflicts with namespace_relative" +msgstr "" + +#: parser_yacc.y:421 +msgid "Profile flag mediate_deleted conflicts with delegate_deleted" +msgstr "" + +#: parser_yacc.y:424 +msgid "" +"Profile flag attach_disconnected conflicts with no_attach_disconnected" +msgstr "" + +#: parser_yacc.y:427 +msgid "Profile flag chroot_attach conflicts with chroot_no_attach" +msgstr "" + +#: parser_yacc.y:441 +msgid "Profile flag 'debug' is no longer valid." +msgstr "配置文件标志“debug”不再有效。" + +#: parser_yacc.y:463 +#, c-format +msgid "Invalid profile flag: %s." +msgstr "无效的配置文件标志：%s。" + +#: parser_yacc.y:498 parser_yacc.y:520 +msgid "Assert: `rule' returned NULL." +msgstr "声明：`rule'返回 NULL。" + +#: parser_yacc.y:501 parser_yacc.y:546 +msgid "" +"Invalid mode, in deny rules 'x' must not be preceded by exec qualifier 'i', " +"'p', or 'u'" +msgstr "模式无效，在拒绝规则中，“x”不能在执行限定符“i”、“p”或“u”之后" + +#: parser_yacc.y:524 +msgid "" +"Invalid mode, 'x' must be preceded by exec qualifier 'i', 'p', 'c', or 'u'" +msgstr "模式无效，“x”必须在执行限定符“i”、“p”、“c”或“u”之后" + +#: parser_yacc.y:549 +msgid "Invalid mode, 'x' must be preceded by exec qualifier 'i', 'p', or 'u'" +msgstr "方式无效，“x”前面必须带有 exec 限定符“i”、“p”或“u”" + +#: parser_yacc.y:574 parser_yacc.y:612 +msgid "Assert: `network_rule' return invalid protocol." +msgstr "声明：“network_rule”返回无效协议。" + +#: parser_yacc.y:649 +msgid "Assert: `change_profile' returned NULL." +msgstr "声明：“change_profile”返回 NULL。" + +#: parser_yacc.y:680 +msgid "Assert: 'hat rule' returned NULL." +msgstr "声明：'hat rule'返回 NULL。" + +#: parser_yacc.y:689 +msgid "Assert: 'local_profile rule' returned NULL." +msgstr "声明：“local_profile rule”返回 NULL。" + +#: parser_yacc.y:824 +#, c-format +msgid "Unset boolean variable %s used in if-expression" +msgstr "取消设置 if 表达式中使用的布尔变量 %s" + +#: parser_yacc.y:882 +msgid "unsafe rule missing exec permissions" +msgstr "不安全规则缺少 exec 许可权限" + +#: parser_yacc.y:901 +msgid "subset can only be used with link rules." +msgstr "子集只能使用链接规则。" + +#: parser_yacc.y:903 +msgid "link and exec perms conflict on a file rule using ->" +msgstr "链接和执行权限冲突，由于一个文件规则使用 ->" + +#: parser_yacc.y:905 +msgid "link perms are not allowed on a named profile transition.\n" +msgstr "在命名的配置文件转换中，链接权限不受允许。\n" + +#: parser_yacc.y:921 +#, c-format +msgid "missing an end of line character? (entry: %s)" +msgstr "是否缺少行结束字符？（项：%s）" + +#: parser_yacc.y:975 parser_yacc.y:985 +msgid "Invalid network entry." +msgstr "无效网络项。" + +#: parser_yacc.y:1039 parser_yacc.y:1048 +#, c-format +msgid "Invalid capability %s." +msgstr "功能 %s 无效。" + +#: parser_yacc.y:1066 +#, c-format +msgid "AppArmor parser error for %s%s%s at line %d: %s\n" +msgstr "" + +#: parser_yacc.y:1072 +#, c-format +msgid "AppArmor parser error,%s%s line %d: %s\n" +msgstr "" + +#: ../parser_regex.c:244 +#, c-format +msgid "%s: Illegal open {, nesting groupings not allowed\n" +msgstr "%s: 不合法的左侧大括号 {，不允许嵌套分组\n" + +#: ../parser_regex.c:265 +#, c-format +msgid "%s: Regex grouping error: Invalid number of items between {}\n" +msgstr "%s: Regex 分组错误：{} 内的项目数无效\n" + +#: ../parser_regex.c:271 +#, c-format +msgid "" +"%s: Regex grouping error: Invalid close }, no matching open { detected\n" +msgstr "%s: Regex 分组错误：无效的右侧花括号 }，未检测到匹配的左侧花括号 {\n" + +#: ../parser_regex.c:337 +#, c-format +msgid "" +"%s: Regex grouping error: Unclosed grouping or character class, expecting " +"close }\n" +msgstr "%s: Regex 分组错误：组或字符类未关闭，需要右侧花括号 }\n" + +#: ../parser_regex.c:351 +#, c-format +msgid "%s: Internal buffer overflow detected, %d characters exceeded\n" +msgstr "%s: 检测到内部缓冲区溢出，超过 %d 个字符\n" + +#: ../parser_regex.c:355 +#, c-format +msgid "%s: Unable to parse input line '%s'\n" +msgstr "%s: 无法对输入行'%s'进行语法分析\n" + +#: ../parser_regex.c:397 +#, c-format +msgid "%s: Invalid profile name '%s' - bad regular expression\n" +msgstr "" + +#: ../parser_policy.c:202 +#, c-format +msgid "ERROR merging rules for profile %s, failed to load\n" +msgstr "合并配置文件 %s 的规则时出错，无法装载\n" + +#: ../parser_policy.c:234 +#, c-format +msgid "" +"ERROR profile %s contains policy elements not usable with this kernel:\n" +"\t'*', '?', character ranges, and alternations are not allowed.\n" +"\t'**' may only be used at the end of a rule.\n" +msgstr "" +"错误 配置文件 %s 包含不能与此内核一起使用的策略元素：\n" +"\t不允许“*”、“?”、字符范围，也不允许“或”操作。\n" +"\t“**”只能在规则结尾处使用。\n" + +#: ../parser_policy.c:279 +#, c-format +msgid "ERROR processing regexs for profile %s, failed to load\n" +msgstr "处理配置文件 %s 的 regex 时出错，无法装载\n" + +#: ../parser_policy.c:306 +#, c-format +msgid "ERROR expanding variables for profile %s, failed to load\n" +msgstr "扩展配置文件 %s 的变量时出错，无法装载\n" + +#: ../parser_policy.c:390 +#, c-format +msgid "ERROR adding hat access rule for profile %s\n" +msgstr "为配置文件 %s 添加 hat 访问规则时出错\n" + +#: ../parser_policy.c:490 +#, c-format +msgid "ERROR in profile %s, failed to load\n" +msgstr "配置文件 %s 中存在错误，未能装载\n" + +#: ../parser_policy.c:675 +#, c-format +msgid "%s: Errors found during postprocessing. Aborting.\n" +msgstr "%s：在后处理中发现错误。正在中止。\n" + +#: ../parser_policy.c:682 ../parser_policy.c:704 +#, c-format +msgid "%s: Errors found during regex postprocess. Aborting.\n" +msgstr "%s：在 Regex 后处理中发现错误。正在中止。\n" + +#: ../parser_policy.c:689 +#, c-format +msgid "%s: Errors found during postprocess. Aborting.\n" +msgstr "%s：在后处理中发现错误。正在中止。\n" + +#: ../parser_policy.c:696 +#, c-format +msgid "%s: Errors found in combining rules postprocessing. Aborting.\n" +msgstr "%s: 在组合规则后处理中发现错误。正在中止。\n" diff -Nru language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/apparmorapplet.po language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/apparmorapplet.po --- language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/apparmorapplet.po 2013-01-29 09:37:00.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/apparmorapplet.po 2014-01-07 07:01:46.000000000 +0000 @@ -12,8 +12,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-01-28 14:57+0000\n" -"X-Generator: Launchpad (build 16451)\n" +"X-Launchpad-Export-Date: 2014-01-06 15:34+0000\n" +"X-Generator: Launchpad (build 16877)\n" #: src/apparmor-applet.c:244 msgid "" diff -Nru language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/apport.po language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/apport.po --- language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/apport.po 2013-01-29 09:37:09.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/apport.po 2014-01-07 07:01:41.000000000 +0000 @@ -7,32 +7,35 @@ msgstr "" "Project-Id-Version: apport\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-02 20:40+0000\n" +"POT-Creation-Date: 2013-09-26 19:18+0000\n" "PO-Revision-Date: 2012-04-06 17:06+0000\n" -"Last-Translator: Aron Xu \n" +"Last-Translator: Aron Xu \n" "Language-Team: Chinese (China) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-01-28 14:19+0000\n" -"X-Generator: Launchpad (build 16451)\n" +"X-Launchpad-Export-Date: 2014-01-06 14:51+0000\n" +"X-Generator: Launchpad (build 16877)\n" "Language: \n" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:122 -#: ../apport/ui.py:122 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:124 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:124 +#: ../apport/ui.py:124 msgid "This package does not seem to be installed correctly" msgstr "该软件包似乎没有被正确安装" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:126 -#: ../apport/ui.py:126 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:128 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:128 +#: ../apport/ui.py:128 #, python-format msgid "" "This is not an official %s package. Please remove any third party package " "and try again." msgstr "这不是官方的 %s 软件包。请删除所有第三方软件包，然后重试。" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:143 -#: ../apport/ui.py:143 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:145 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:145 +#: ../apport/ui.py:145 #, python-format msgid "" "You have some obsolete package versions installed. Please upgrade the " @@ -44,135 +47,162 @@ "\n" "%s" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:249 -#: ../apport/ui.py:249 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:251 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:251 +#: ../apport/ui.py:251 msgid "unknown program" msgstr "未知程序" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:250 -#: ../apport/ui.py:250 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:252 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:252 +#: ../apport/ui.py:252 #, python-format msgid "Sorry, the program \"%s\" closed unexpectedly" msgstr "对不起，%s 程序异常退出" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:252 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1254 -#: ../apport/ui.py:252 ../apport/ui.py:1254 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:254 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1263 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:254 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1263 +#: ../apport/ui.py:254 ../apport/ui.py:1263 #, python-format msgid "Problem in %s" msgstr "%s 中的问题" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:253 -#: ../apport/ui.py:253 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:255 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:255 +#: ../apport/ui.py:255 msgid "" "Your computer does not have enough free memory to automatically analyze the " "problem and send a report to the developers." msgstr "您的计算机剩余空间不足，程序无法自动诊断问题并向开发者发送问题报告。" #. package does not exist -#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:268 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:285 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:1052 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:1072 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:1083 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:1094 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:268 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:274 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:280 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:323 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:331 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:270 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:276 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:282 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:325 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:333 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:460 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:463 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:664 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1094 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1235 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1239 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:270 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:276 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:282 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:325 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:333 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:460 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:463 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:664 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1067 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1208 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1212 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1231 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1237 -#: ../apport/ui.py:268 ../apport/ui.py:274 ../apport/ui.py:280 -#: ../apport/ui.py:323 ../apport/ui.py:331 ../apport/ui.py:460 -#: ../apport/ui.py:463 ../apport/ui.py:664 ../apport/ui.py:1067 -#: ../apport/ui.py:1208 ../apport/ui.py:1212 ../apport/ui.py:1231 -#: ../apport/ui.py:1237 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1094 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1235 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1239 +#: ../apport/ui.py:270 ../apport/ui.py:276 ../apport/ui.py:282 +#: ../apport/ui.py:325 ../apport/ui.py:333 ../apport/ui.py:460 +#: ../apport/ui.py:463 ../apport/ui.py:664 ../apport/ui.py:1094 +#: ../apport/ui.py:1235 ../apport/ui.py:1239 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:274 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:1046 msgid "Invalid problem report" msgstr "无效的问题报告" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:269 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1214 -#: ../apport/ui.py:269 ../apport/ui.py:1214 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:271 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1241 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:271 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1241 +#: ../apport/ui.py:271 ../apport/ui.py:1241 msgid "This problem report is damaged and cannot be processed." msgstr "该问题报告已损坏，无法处理。" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:275 -#: ../apport/ui.py:275 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:277 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:277 +#: ../apport/ui.py:277 msgid "The report belongs to a package that is not installed." msgstr "该报告属于一个未安装的软件包。" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:281 -#: ../apport/ui.py:281 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:283 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:283 +#: ../apport/ui.py:283 msgid "An error occurred while attempting to process this problem report:" msgstr "尝试处理此问题报告时出现错误：" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:324 -#: ../apport/ui.py:324 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:326 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:326 +#: ../apport/ui.py:326 msgid "You are not allowed to access this problem report." msgstr "您没有访问这个问题报告的权限。" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:327 -#: ../apport/ui.py:327 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:329 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:329 +#: ../apport/ui.py:329 msgid "Error" msgstr "错误" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:328 -#: ../apport/ui.py:328 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:330 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:330 +#: ../apport/ui.py:330 msgid "There is not enough disk space available to process this report." msgstr "没有足够的空间来执行报告。" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:412 -#: ../apport/ui.py:412 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:414 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:414 +#: ../apport/ui.py:414 msgid "No package specified" msgstr "没有指定软件包" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:413 -#: ../apport/ui.py:413 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:415 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:415 +#: ../apport/ui.py:415 msgid "" "You need to specify a package or a PID. See --help for more information." msgstr "您需要指定一个软件包或者 PID。使用 --help 选项来获取更多信息。" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:430 -#: ../apport/ui.py:430 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:441 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:441 +#: ../apport/ui.py:441 msgid "Invalid PID" msgstr "无效的 PID" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:431 -#: ../apport/ui.py:431 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:442 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:442 +#: ../apport/ui.py:442 msgid "The specified process ID does not belong to a program." msgstr "指定的进程 ID 不属于一个程序。" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:439 -#: ../apport/ui.py:439 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:438 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:438 +#: ../apport/ui.py:438 msgid "Permission denied" msgstr "拒绝访问" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:440 -#: ../apport/ui.py:440 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:439 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:439 +#: ../apport/ui.py:439 msgid "" "The specified process does not belong to you. Please run this program as the " "process owner or as root." msgstr "指定的进程不属于您。请作为进程的所有者或 root 运行这个进程。" +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:461 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:461 #: ../apport/ui.py:461 #, python-format msgid "Symptom script %s did not determine an affected package" msgstr "症状脚本 %s 没有划定受影响的包" +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:464 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:464 #: ../apport/ui.py:464 #, python-format msgid "Package %s does not exist" msgstr "软件包 %s 不存在" +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:488 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:676 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:681 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:488 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:676 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:681 @@ -180,6 +210,9 @@ msgid "Cannot create report" msgstr "不能创建报告" +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:503 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:549 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:566 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:503 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:549 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:566 @@ -187,6 +220,7 @@ msgid "Updating problem report" msgstr "更新问题报告" +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:504 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:504 #: ../apport/ui.py:504 msgid "" @@ -198,6 +232,7 @@ "您不是该问题报告的报告者或订阅者，或者该报告被视为重复或已经关闭。\n" "请使用 apport-bug 新建一份报告。" +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:513 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:513 #: ../apport/ui.py:513 msgid "" @@ -214,28 +249,34 @@ "因此，我们建议您使用 apport-bug 来提交新的错误报告，并在当前报告中对您新提交的报告进行评论。\n" "您确定要继续么？" +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:550 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:567 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:550 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:567 #: ../apport/ui.py:550 ../apport/ui.py:567 msgid "No additional information collected." msgstr "未收集更多信息。" +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:618 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:618 #: ../apport/ui.py:618 msgid "What kind of problem do you want to report?" msgstr "您想报告什么类型的问题？" +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:635 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:635 #: ../apport/ui.py:635 msgid "Unknown symptom" msgstr "未知症状" +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:636 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:636 #: ../apport/ui.py:636 #, python-format msgid "The symptom \"%s\" is not known." msgstr "症状 %s 未知。" +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:667 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:667 #: ../apport/ui.py:667 msgid "" @@ -243,34 +284,42 @@ "problem about it." msgstr "在关闭这个消息只后，请点击要报告问题的程序窗口。" +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:677 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:682 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:677 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:682 #: ../apport/ui.py:677 ../apport/ui.py:682 msgid "xprop failed to determine process ID of the window" msgstr "xprop 无法确定窗口的进程 ID" +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:696 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:696 #: ../apport/ui.py:696 msgid "%prog " msgstr "%prog <报告号>" +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:698 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:698 #: ../apport/ui.py:698 msgid "Specify package name." msgstr "请指定包的名称。" +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:700 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:751 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:700 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:751 #: ../apport/ui.py:700 ../apport/ui.py:751 msgid "Add an extra tag to the report. Can be specified multiple times." msgstr "向报告中添加额外的标记，可多次指定。" +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:730 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:730 #: ../apport/ui.py:730 msgid "" "%prog [options] [symptom|pid|package|program path|.apport/.crash file]" msgstr "%prog [选项] [症状|PID|软件包|程序目录|.apport/.crash file]" +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:733 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:733 #: ../apport/ui.py:733 msgid "" @@ -280,16 +329,19 @@ msgstr "" "以填写 bug 模式启动。需要 --package 和可选的 --pid 参数，或单独使用 --pid 参数。如果二者均未给出，将显示一系列症状供选择。" +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:735 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:735 #: ../apport/ui.py:735 msgid "Click a window as a target for filing a problem report." msgstr "点击一个窗口作为提交问题报告的目标。" +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:737 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:737 #: ../apport/ui.py:737 msgid "Start in bug updating mode. Can take an optional --package." msgstr "启动错误更新模式。可以使用选项 --package 来指定软件包。" +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:739 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:739 #: ../apport/ui.py:739 msgid "" @@ -297,6 +349,7 @@ "argument.)" msgstr "针对某个症状报告 bug。" +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:741 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:741 #: ../apport/ui.py:741 msgid "" @@ -304,6 +357,7 @@ "specified. (Implied if package name is given as only argument.)" msgstr "--file-bug 模式中指定软件包名。如果指定了 --pid，则是可选的。(如果只给定软件包名这一个参数则为必需。)" +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:743 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:743 #: ../apport/ui.py:743 msgid "" @@ -312,6 +366,7 @@ "argument.)" msgstr "在 --file-bug 模式中指定运行的程序。如果指定，该问题报告将包含更多的信息。(默认指定 pid 作为唯一参数。)" +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:747 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:747 #: ../apport/ui.py:747 #, python-format @@ -320,6 +375,7 @@ "ones in %s. (Implied if file is given as only argument.)" msgstr "从给定的 .apport 或者 .crash 文件，而不是从正在处理的 %s 中汇报崩溃。(如果文件只给定了参数时实现。)" +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:749 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:749 #: ../apport/ui.py:749 msgid "" @@ -328,94 +384,111 @@ "machine." msgstr "在提交报告过程中，将收集到的信息保存到要报告的文件中。该文件可用于稍后在另一台机器上提交。" +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:753 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:753 #: ../apport/ui.py:753 msgid "Print the Apport version number." msgstr "输出 Apport 版本号" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:887 -#: ../apport/ui.py:887 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:893 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:893 +#: ../apport/ui.py:893 msgid "" "This will launch apport-retrace in a terminal window to examine the crash." msgstr "这将在终端窗口中启动 apport-retrace，以检查此崩溃。" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:888 -#: ../apport/ui.py:888 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:894 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:894 +#: ../apport/ui.py:894 msgid "Run gdb session" msgstr "运行 gdb 会话" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:889 -#: ../apport/ui.py:889 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:895 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:895 +#: ../apport/ui.py:895 msgid "Run gdb session without downloading debug symbols" msgstr "不下载调试符号的情况下运行 gdb 会话" #. TRANSLATORS: %s contains the crash report file name -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:891 -#: ../apport/ui.py:891 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:897 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:897 +#: ../apport/ui.py:897 #, python-format msgid "Update %s with fully symbolic stack trace" msgstr "利用全符号化堆栈轨迹更新 %s" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:964 -#: ../apport/ui.py:964 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:997 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:997 +#: ../apport/ui.py:997 #, python-format msgid "" "The problem happened with the program %s which changed since the crash " "occurred." msgstr "自崩溃发生起已更改的程序 %s 出现问题。" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1068 -#: ../apport/ui.py:1068 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1095 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1095 +#: ../apport/ui.py:1095 msgid "Could not determine the package or source package name." msgstr "无法检测包或者源码包的名称。" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1086 -#: ../apport/ui.py:1086 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1113 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1113 +#: ../apport/ui.py:1113 msgid "Unable to start web browser" msgstr "无法打开浏览器" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1087 -#: ../apport/ui.py:1087 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1114 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1114 +#: ../apport/ui.py:1114 #, python-format msgid "Unable to start web browser to open %s." msgstr "无法用浏览器打开网页 %s" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1162 -#: ../apport/ui.py:1162 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1189 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1189 +#: ../apport/ui.py:1189 #, python-format msgid "Please enter your account information for the %s bug tracking system" msgstr "请为 %s 错误追踪系统输入您的帐户信息" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1174 -#: ../apport/ui.py:1174 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1201 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1201 +#: ../apport/ui.py:1201 msgid "Network problem" msgstr "网络问题" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1176 -#: ../apport/ui.py:1176 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1203 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1203 +#: ../apport/ui.py:1203 msgid "" "Cannot connect to crash database, please check your Internet connection." msgstr "无法连接到崩溃数据库，请检查您的 Internet 连接。" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1203 -#: ../apport/ui.py:1203 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1230 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1230 +#: ../apport/ui.py:1230 msgid "Memory exhaustion" msgstr "内存耗尽" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1204 -#: ../apport/ui.py:1204 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1231 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1231 +#: ../apport/ui.py:1231 msgid "Your system does not have enough memory to process this crash report." msgstr "你的系统没有足够的内存来处理这一次崩溃报告。" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1227 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1236 -#: ../apport/ui.py:1227 ../apport/ui.py:1236 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:972 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:982 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:972 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:982 +#: ../apport/ui.py:972 ../apport/ui.py:982 msgid "" "This problem report applies to a program which is not installed any more." msgstr "这一问题报告适用于不再安装的程序。" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1257 -#: ../apport/ui.py:1257 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1266 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1266 +#: ../apport/ui.py:1266 #, python-format msgid "" "The problem cannot be reported:\n" @@ -426,22 +499,26 @@ "\n" "%s" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1308 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1315 -#: ../apport/ui.py:1308 ../apport/ui.py:1315 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1322 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1329 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1322 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1329 +#: ../apport/ui.py:1322 ../apport/ui.py:1329 msgid "Problem already known" msgstr "该问题为已知问题" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1309 -#: ../apport/ui.py:1309 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1323 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1323 +#: ../apport/ui.py:1323 msgid "" "This problem was already reported in the bug report displayed in the web " "browser. Please check if you can add any further information that might be " "helpful for the developers." msgstr "关于这个问题，之前已经有如网页所示的报告。您是否有所补充？" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1316 -#: ../apport/ui.py:1316 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1330 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1330 +#: ../apport/ui.py:1330 msgid "This problem was already reported to developers. Thank you!" msgstr "已将此问题报告给开发人员。谢谢！" @@ -465,17 +542,17 @@ #: ../debian/tmp/usr/bin/apport-cli.py:147 #: ../debian/tmp/usr/share/apport/apport-kde.py:338 ../gtk/apport-gtk.py:138 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:138 ../bin/apport-cli.py:147 +#: ../bin/apport-cli.py:147 ../debian/tmp/usr/share/apport/apport-gtk.py:138 #: ../kde/apport-kde.py:338 msgid "(binary data)" msgstr "(二进制数据)" #: ../debian/tmp/usr/bin/apport-cli.py:175 -#: ../debian/tmp/usr/share/apport/apport-kde.py:162 #: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:404 -#: ../gtk/apport-gtk.py:173 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:282 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:173 ../bin/apport-cli.py:175 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:429 +#: ../debian/tmp/usr/share/apport/apport-kde.py:162 ../gtk/apport-gtk.py:173 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:286 +#: ../bin/apport-cli.py:175 ../debian/tmp/usr/share/apport/apport-gtk.py:173 #: ../kde/apport-kde.py:162 msgid "Send problem report to the developers?" msgstr "向开发者发送问题报告？" @@ -546,10 +623,9 @@ "收集到的信息将会传送到开发人员处以改进软件。\n" "这可能会花费几分钟时间，" -#: ../debian/tmp/usr/bin/apport-cli.py:248 -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:13 -#: ../debian/tmp/usr/share/apport/apport-kde.py:411 ../gtk/apport-gtk.ui.h:13 -#: ../bin/apport-cli.py:248 ../kde/apport-kde.py:411 +#: ../gtk/apport-gtk.ui.h:13 ../debian/tmp/usr/bin/apport-cli.py:248 +#: ../debian/tmp/usr/share/apport/apport-kde.py:411 ../bin/apport-cli.py:248 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:13 ../kde/apport-kde.py:411 msgid "Uploading problem information" msgstr "上传问题信息" @@ -629,145 +705,143 @@ "completed normally." msgstr "这个恢复过程已经非常接近尾声，将正常结束。" -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:1 -#: ../debian/tmp/usr/share/apport/apport-kde.py:446 -#: ../debian/tmp/usr/share/apport/apport-kde.py:482 ../gtk/apport-gtk.ui.h:1 -#: ../kde/apport-kde.py:446 ../kde/apport-kde.py:482 +#: ../gtk/apport-gtk.ui.h:1 ../debian/tmp/usr/share/apport/apport-kde.py:446 +#: ../debian/tmp/usr/share/apport/apport-kde.py:482 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:1 ../kde/apport-kde.py:446 +#: ../kde/apport-kde.py:482 msgid "Apport" msgstr "Apport" -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:2 ../gtk/apport-gtk.ui.h:2 +#: ../gtk/apport-gtk.ui.h:2 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:2 msgid "Crash report" msgstr "崩溃报告" -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:3 ../gtk/apport-gtk.ui.h:3 +#: ../gtk/apport-gtk.ui.h:3 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:3 msgid "Sorry, an internal error happened." msgstr "对不起，发生内部错误。" -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:4 -#: ../debian/tmp/usr/share/apport/apport-kde.py:220 +#: ../gtk/apport-gtk.ui.h:4 #: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:302 #: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:342 -#: ../gtk/apport-gtk.ui.h:4 ../gtk/apport-gtk.py:296 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:252 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:296 ../kde/apport-kde.py:220 +#: ../debian/tmp/usr/share/apport/apport-kde.py:220 ../gtk/apport-gtk.py:296 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:256 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:296 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:4 ../kde/apport-kde.py:220 msgid "If you notice further problems, try restarting the computer." msgstr "如果您注意到更多问题，请尝试重新启动计算机。" -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:5 ../gtk/apport-gtk.ui.h:5 +#: ../gtk/apport-gtk.ui.h:5 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:5 msgid "Send an error report to help fix this problem" msgstr "请发送错误报告，以帮助修复此问题" -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:6 ../gtk/apport-gtk.ui.h:6 +#: ../gtk/apport-gtk.ui.h:6 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:6 msgid "Ignore future problems of this program version" msgstr "以后忽略此版本程序的问题" -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:7 -#: ../debian/tmp/usr/share/apport/apport-kde.py:271 ../gtk/apport-gtk.ui.h:7 +#: ../gtk/apport-gtk.ui.h:7 ../debian/tmp/usr/share/apport/apport-kde.py:271 #: ../gtk/apport-gtk.py:200 ../gtk/apport-gtk.py:569 #: ../debian/tmp/usr/share/apport/apport-gtk.py:200 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:569 ../kde/apport-kde.py:271 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:569 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:7 ../kde/apport-kde.py:271 msgid "Show Details" msgstr "显示详细信息" -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:8 ../gtk/apport-gtk.ui.h:8 +#: ../gtk/apport-gtk.ui.h:8 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:8 msgid "_Examine locally" msgstr "本地检查(&E)" -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:9 -#: ../debian/tmp/usr/share/apport/apport-kde.py:213 ../gtk/apport-gtk.ui.h:9 +#: ../gtk/apport-gtk.ui.h:9 ../debian/tmp/usr/share/apport/apport-kde.py:213 #: ../gtk/apport-gtk.py:283 ../debian/tmp/usr/share/apport/apport-gtk.py:283 -#: ../kde/apport-kde.py:213 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:9 ../kde/apport-kde.py:213 msgid "Leave Closed" msgstr "保持关闭状态" -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:10 -#: ../debian/tmp/usr/share/apport/apport-kde.py:210 -#: ../debian/tmp/usr/share/apport/apport-kde.py:223 +#: ../gtk/apport-gtk.ui.h:10 #: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:115 #: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:144 #: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:157 #: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:192 #: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:310 #: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:350 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:454 -#: ../gtk/apport-gtk.ui.h:10 ../gtk/apport-gtk.py:212 ../gtk/apport-gtk.py:280 -#: ../gtk/apport-gtk.py:299 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:111 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:137 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:149 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:182 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:258 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:328 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:479 +#: ../debian/tmp/usr/share/apport/apport-kde.py:210 +#: ../debian/tmp/usr/share/apport/apport-kde.py:223 ../gtk/apport-gtk.py:212 +#: ../gtk/apport-gtk.py:280 ../gtk/apport-gtk.py:299 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:115 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:141 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:153 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:186 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:262 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:332 #: ../debian/tmp/usr/share/apport/apport-gtk.py:212 #: ../debian/tmp/usr/share/apport/apport-gtk.py:280 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:299 ../kde/apport-kde.py:210 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:299 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:10 ../kde/apport-kde.py:210 #: ../kde/apport-kde.py:223 msgid "Continue" msgstr "继续" -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:11 ../gtk/apport-gtk.ui.h:11 +#: ../gtk/apport-gtk.ui.h:11 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:11 msgid "Collecting problem information" msgstr "正在收集问题信息" -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:12 ../gtk/apport-gtk.ui.h:12 +#: ../gtk/apport-gtk.ui.h:12 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:12 msgid "" "Information is being collected that may help the developers fix the problem " "you report." msgstr "正在收集信息，这些信息将会帮助开发人员修复您报告的问题。" -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:14 ../gtk/apport-gtk.ui.h:14 +#: ../gtk/apport-gtk.ui.h:14 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:14 msgid "Uploading problem information" msgstr "正在上传问题信息" -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:15 -#: ../debian/tmp/usr/share/apport/apport-kde.py:412 ../gtk/apport-gtk.ui.h:15 -#: ../kde/apport-kde.py:412 +#: ../gtk/apport-gtk.ui.h:15 ../debian/tmp/usr/share/apport/apport-kde.py:412 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:15 ../kde/apport-kde.py:412 msgid "" "The collected information is being sent to the bug tracking system. This " "might take a few minutes." msgstr "正在将收集的信息到缺陷跟踪系统。可能需要几分钟时间。" -#: ../debian/tmp/usr/bin/apport-retrace.py:31 ../bin/apport-retrace.py:31 +#: ../bin/apport-retrace.py:31 ../debian/tmp/usr/bin/apport-retrace.py:31 msgid "%prog [options] " msgstr "%prog [选项] " -#: ../debian/tmp/usr/bin/apport-retrace.py:33 ../bin/apport-retrace.py:33 +#: ../bin/apport-retrace.py:33 ../debian/tmp/usr/bin/apport-retrace.py:33 msgid "Do not put the new traces into the report, but write them to stdout." msgstr "不把新的痕迹写入到报告，但是把它们写入到标准输出。" -#: ../debian/tmp/usr/bin/apport-retrace.py:35 ../bin/apport-retrace.py:35 +#: ../bin/apport-retrace.py:35 ../debian/tmp/usr/bin/apport-retrace.py:35 msgid "" "Start an interactive gdb session with the report's core dump (-o ignored; " "does not rewrite report)" msgstr "启动一个交互式的 gdb 进程并载入提交的崩溃信息 (-o 不重新生成报告)" -#: ../debian/tmp/usr/bin/apport-retrace.py:37 ../bin/apport-retrace.py:37 +#: ../bin/apport-retrace.py:37 ../debian/tmp/usr/bin/apport-retrace.py:37 msgid "" "Write modified report to given file instead of changing the original report" msgstr "将更改过的报告写入指定文件而非改变原始报告" -#: ../debian/tmp/usr/bin/apport-retrace.py:39 ../bin/apport-retrace.py:39 +#: ../bin/apport-retrace.py:39 ../debian/tmp/usr/bin/apport-retrace.py:39 msgid "Remove the core dump from the report after stack trace regeneration" msgstr "生成栈回溯后将内核转储从报告中删除" -#: ../debian/tmp/usr/bin/apport-retrace.py:41 ../bin/apport-retrace.py:41 +#: ../bin/apport-retrace.py:41 ../debian/tmp/usr/bin/apport-retrace.py:41 msgid "Override report's CoreFile" msgstr "覆盖报告核心文件" -#: ../debian/tmp/usr/bin/apport-retrace.py:43 ../bin/apport-retrace.py:43 +#: ../bin/apport-retrace.py:43 ../debian/tmp/usr/bin/apport-retrace.py:43 msgid "Override report's ExecutablePath" msgstr "覆盖报告执行路径" -#: ../debian/tmp/usr/bin/apport-retrace.py:45 ../bin/apport-retrace.py:45 +#: ../bin/apport-retrace.py:45 ../debian/tmp/usr/bin/apport-retrace.py:45 msgid "Override report's ProcMaps" msgstr "覆盖报告的进程表" -#: ../debian/tmp/usr/bin/apport-retrace.py:47 ../bin/apport-retrace.py:47 +#: ../bin/apport-retrace.py:47 ../debian/tmp/usr/bin/apport-retrace.py:47 msgid "Rebuild report's Package information" msgstr "重建报告的包信息" -#: ../debian/tmp/usr/bin/apport-retrace.py:49 ../bin/apport-retrace.py:49 +#: ../bin/apport-retrace.py:49 ../debian/tmp/usr/bin/apport-retrace.py:49 msgid "" "Build a temporary sandbox and download/install the necessary packages and " "debug symbols in there; without this option it assumes that the necessary " @@ -779,66 +853,65 @@ "构建临时沙盒，以及下载/安装必要的软件包和调试符号；如果没有该选项，则会假设该系统中已安装了必要的软件包和调试符号。此参数指向该打包系统配置库目录；如果指" "定 \"system\"，则其将使用系统配置文件，但之后，其将只能够追溯当前正在运行的版本上发生的崩溃。" -#: ../debian/tmp/usr/bin/apport-retrace.py:51 ../bin/apport-retrace.py:51 +#: ../bin/apport-retrace.py:51 ../debian/tmp/usr/bin/apport-retrace.py:51 msgid "" "Report download/install progress when installing packages into sandbox" msgstr "在将软件包安装到沙盒中时，报告下载和安装的进度" -#: ../debian/tmp/usr/bin/apport-retrace.py:53 ../bin/apport-retrace.py:53 +#: ../bin/apport-retrace.py:53 ../debian/tmp/usr/bin/apport-retrace.py:53 msgid "Prepend timestamps to log messages, for batch operation" msgstr "为进行批量操作，请预先设置时间戳，以记录消息" -#: ../debian/tmp/usr/bin/apport-retrace.py:55 ../bin/apport-retrace.py:55 +#: ../bin/apport-retrace.py:55 ../debian/tmp/usr/bin/apport-retrace.py:55 msgid "Cache directory for packages downloaded in the sandbox" msgstr "缓存下载到沙盒中的软件包的目录" -#: ../debian/tmp/usr/bin/apport-valgrind.py:66 -#: ../debian/tmp/usr/bin/apport-retrace.py:59 ../bin/apport-valgrind.py:66 -#: ../bin/apport-retrace.py:59 +#: ../bin/apport-retrace.py:59 ../debian/tmp/usr/bin/apport-retrace.py:59 +#: ../debian/tmp/usr/bin/apport-valgrind.py:66 ../bin/apport-valgrind.py:66 msgid "" "Install an extra package into the sandbox (can be specified multiple times)" msgstr "将其他软件包安装到沙盒(可多次加以指定)中" -#: ../debian/tmp/usr/bin/apport-retrace.py:61 ../bin/apport-retrace.py:61 +#: ../bin/apport-retrace.py:61 ../debian/tmp/usr/bin/apport-retrace.py:61 msgid "" "Path to a file with the crash database authentication information. This is " "used when specifying a crash ID to upload the retraced stack traces (only if " "neither -g, -o, nor -s are specified)" msgstr "包含崩溃数据库访问信息文件之路径。此项将用于为特定崩溃代码上传堆栈的回溯调试信息(除非用户指定 -g, -o 或 -s)" -#: ../debian/tmp/usr/bin/apport-retrace.py:63 ../bin/apport-retrace.py:63 +#: ../bin/apport-retrace.py:63 ../debian/tmp/usr/bin/apport-retrace.py:63 msgid "" "Display retraced stack traces and ask for confirmation before sending them " "to the crash database." msgstr "显示返回的堆栈信息，并询求确认是否将其发送至崩溃数据库。" -#: ../debian/tmp/usr/bin/apport-retrace.py:65 ../bin/apport-retrace.py:65 +#: ../bin/apport-retrace.py:65 ../debian/tmp/usr/bin/apport-retrace.py:65 msgid "" "Path to the duplicate sqlite database (default: no duplicate checking)" msgstr "SQLite 数据库路径重复(默认：不重复检查)" -#: ../debian/tmp/usr/bin/apport-retrace.py:70 ../bin/apport-retrace.py:70 +#: ../bin/apport-retrace.py:70 ../debian/tmp/usr/bin/apport-retrace.py:70 msgid "incorrect number of arguments; use --help for a short help" msgstr "参数数量错误；使用 --help 获取简略帮助" -#: ../debian/tmp/usr/bin/apport-retrace.py:80 ../bin/apport-retrace.py:80 +#: ../bin/apport-retrace.py:80 ../debian/tmp/usr/bin/apport-retrace.py:80 msgid "" "you either need to do a local operation (-s, -g, -o) or supply an " "authentication file (--auth); see --help for a short help" msgstr "您或需要进行一项本地操作(-s, -g, -o) 或提供一个认证文件(--auth)；参见 --help 以获取简单帮助。" #. translators: don't translate y/n, apport currently only checks for "y" -#: ../debian/tmp/usr/bin/apport-retrace.py:114 ../bin/apport-retrace.py:114 +#: ../bin/apport-retrace.py:114 ../debian/tmp/usr/bin/apport-retrace.py:114 msgid "OK to send these as attachments? [y/n]" msgstr "确定以附件形式发送这些？[y/n]" -#: ../kde/apport-kde.desktop.in.h:1 ../gtk/apport-gtk-mime.desktop.in.h:1 -#: ../kde/apport-kde-mime.desktop.in.h:1 ../gtk/apport-gtk.desktop.in.h:1 +#: ../kde/apport-kde.desktop.in.h:1 ../gtk/apport-gtk.desktop.in.h:1 +#: ../kde/apport-kde-mime.desktop.in.h:1 msgid "Report a problem..." msgstr "提交一份问题报告…" -#: ../kde/apport-kde.desktop.in.h:2 ../gtk/apport-gtk-mime.desktop.in.h:2 -#: ../kde/apport-kde-mime.desktop.in.h:2 ../gtk/apport-gtk.desktop.in.h:2 +#: ../kde/apport-kde.desktop.in.h:2 ../gtk/apport-gtk.desktop.in.h:2 +#: ../kde/apport-kde-mime.desktop.in.h:2 msgid "Report a malfunction to the developers" msgstr "向开发者报告一个故障" @@ -856,23 +929,22 @@ msgid "Sorry, %s has closed unexpectedly." msgstr "对不起，%s 已意外关闭。" -#: ../debian/tmp/usr/share/apport/apport-kde.py:176 -#: ../debian/tmp/usr/share/apport/apport-kde.py:217 #: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:108 #: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:300 -#: ../gtk/apport-gtk.py:161 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:106 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:250 +#: ../debian/tmp/usr/share/apport/apport-kde.py:176 +#: ../debian/tmp/usr/share/apport/apport-kde.py:217 ../gtk/apport-gtk.py:161 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:110 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:254 #: ../debian/tmp/usr/share/apport/apport-gtk.py:161 ../kde/apport-kde.py:176 #: ../kde/apport-kde.py:217 #, python-format msgid "Sorry, %s has experienced an internal error." msgstr "对不起，%s 出现了内部错误。" -#: ../debian/tmp/usr/share/apport/apport-kde.py:170 #: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:412 -#: ../gtk/apport-gtk.py:182 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:288 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:437 +#: ../debian/tmp/usr/share/apport/apport-kde.py:170 ../gtk/apport-gtk.py:182 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:292 #: ../debian/tmp/usr/share/apport/apport-gtk.py:182 ../kde/apport-kde.py:170 msgid "Send" msgstr "发送" @@ -883,10 +955,9 @@ msgid "Package: %s" msgstr "软件包：%s" -#: ../debian/tmp/usr/share/apport/apport-kde.py:190 #: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:137 -#: ../gtk/apport-gtk.py:260 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:132 +#: ../debian/tmp/usr/share/apport/apport-kde.py:190 ../gtk/apport-gtk.py:260 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:136 #: ../debian/tmp/usr/share/apport/apport-gtk.py:260 ../kde/apport-kde.py:190 msgid "Sorry, a problem occurred while installing software." msgstr "对不起，安装软件时出现问题。" @@ -897,12 +968,12 @@ msgid "The application %s has closed unexpectedly." msgstr "应用程序 %s 已意外关闭。" -#: ../debian/tmp/usr/share/apport/apport-kde.py:214 -#: ../debian/tmp/usr/share/apport/apport-kde.py:357 #: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:232 #: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:273 -#: ../gtk/apport-gtk.py:225 ../gtk/apport-gtk.py:284 -#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:222 +#: ../debian/tmp/usr/share/apport/apport-kde.py:214 +#: ../debian/tmp/usr/share/apport/apport-kde.py:357 ../gtk/apport-gtk.py:225 +#: ../gtk/apport-gtk.py:284 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:226 #: ../debian/tmp/usr/share/apport/apport-gtk.py:225 #: ../debian/tmp/usr/share/apport/apport-gtk.py:284 ../kde/apport-kde.py:214 #: ../kde/apport-kde.py:357 @@ -967,14 +1038,13 @@ "legacy。为了保证在安装新内核后您的启动引导程序能够同步更新，请打开终端并运行：\n" " sudo apt-get install grub-pc\n" -#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:135 -#: ../data/general-hooks/ubuntu.py:135 +#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:130 +#: ../data/general-hooks/ubuntu.py:130 msgid "" "An Ubuntu package has a file conflict with a package that is not a genuine " "Ubuntu package" msgstr "Ubuntu 软件包与非原生 Ubuntu 软件包发生文件冲突" -#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:143 -#: ../data/general-hooks/ubuntu.py:143 +#: ../data/general-hooks/ubuntu.py:131 msgid "You have already encountered this package installation failure." msgstr "" diff -Nru language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/apt-listchanges.po language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/apt-listchanges.po --- language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/apt-listchanges.po 2013-01-29 09:37:17.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/apt-listchanges.po 2014-01-07 07:01:14.000000000 +0000 @@ -8,13 +8,13 @@ "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-12-17 18:09+0000\n" "PO-Revision-Date: 2011-12-17 18:09+0000\n" -"Last-Translator: Deng Xiyue \n" +"Last-Translator: Xiyue Deng \n" "Language-Team: Debian Chinese GB \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-01-28 10:34+0000\n" -"X-Generator: Launchpad (build 16451)\n" +"X-Launchpad-Export-Date: 2014-01-06 10:33+0000\n" +"X-Generator: Launchpad (build 16877)\n" "Generated-By: pygettext.py 1.4\n" #: ../apt-listchanges.py:80 diff -Nru language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/apt.po language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/apt.po --- language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/apt.po 2013-01-29 09:37:17.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/apt.po 2014-01-07 07:01:13.000000000 +0000 @@ -8,17 +8,17 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.0~pre1\n" -"Report-Msgid-Bugs-To: \n" +"Report-Msgid-Bugs-To: deity@lists.debian.org\n" "POT-Creation-Date: 2012-03-15 19:05+0000\n" -"PO-Revision-Date: 2012-11-20 00:28+0000\n" -"Last-Translator: Aron Xu \n" +"PO-Revision-Date: 2013-11-27 07:17+0000\n" +"Last-Translator: Aron Xu \n" "Language-Team: Chinese (simplified) \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-Launchpad-Export-Date: 2013-01-28 10:34+0000\n" -"X-Generator: Launchpad (build 16451)\n" +"X-Launchpad-Export-Date: 2014-01-06 10:33+0000\n" +"X-Generator: Launchpad (build 16877)\n" "Language: \n" #: cmdline/apt-cache.cc:141 diff -Nru language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/aptitude.po language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/aptitude.po --- language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/aptitude.po 2013-01-29 09:37:09.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/aptitude.po 2014-01-07 07:01:14.000000000 +0000 @@ -14,15 +14,15 @@ "Project-Id-Version: aptitude\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" "POT-Creation-Date: 2012-03-27 16:51+0800\n" -"PO-Revision-Date: 2012-10-05 03:19+0000\n" -"Last-Translator: Aron Xu \n" +"PO-Revision-Date: 2013-04-19 10:49+0000\n" +"Last-Translator: Aron Xu \n" "Language-Team: Chinese (simplified) \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-Launchpad-Export-Date: 2013-01-28 10:37+0000\n" -"X-Generator: Launchpad (build 16451)\n" +"X-Launchpad-Export-Date: 2014-01-06 10:36+0000\n" +"X-Generator: Launchpad (build 16877)\n" "Language: zh_CN\n" #: src/apt_config_treeitems.cc:99 src/apt_config_treeitems.cc:210 @@ -37,11 +37,11 @@ #: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "True" -msgstr "True" +msgstr "真" #: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "False" -msgstr "False" +msgstr "假" #: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:214 #: src/apt_config_treeitems.cc:398 @@ -679,24 +679,24 @@ msgid "Package %s is not upgradable, cannot forbid an upgrade\n" msgstr "软件包 %s 是不可升级的，不能设为禁止升级\n" -#: src/cmdline/cmdline_action.cc:477 +#: src/cmdline/cmdline_action.cc:480 #, c-format msgid "Note: selecting the task \"%s: %s\" for installation\n" msgstr "注意：选择软件集“%s：%s”安装\n" -#: src/cmdline/cmdline_action.cc:512 +#: src/cmdline/cmdline_action.cc:510 #, c-format msgid "" "You can only specify a package version with an 'install' command or a " "'forbid-version' command.\n" msgstr "您只能在“install”或“forbid-version”命令中指定一个软件包的版本。\n" -#: src/cmdline/cmdline_action.cc:521 +#: src/cmdline/cmdline_action.cc:519 #, c-format msgid "You can only specify a package archive with an 'install' command.\n" msgstr "在“install”命令中您只能指定一个软件包的存档\n" -#: src/cmdline/cmdline_action.cc:559 +#: src/cmdline/cmdline_action.cc:557 #, c-format msgid "" "Couldn't find package \"%s\", and more than 40\n" @@ -705,7 +705,7 @@ "无法找到软件包“%s”，同时有超过 40 个软件包\n" "名称中包含“%s”。\n" -#: src/cmdline/cmdline_action.cc:562 +#: src/cmdline/cmdline_action.cc:560 #, c-format msgid "" "Couldn't find package \"%s\". However, the following\n" @@ -714,12 +714,12 @@ "无法找到软件包“%s”。然而下列软件包名称中\n" "包含“%s”。\n" -#: src/cmdline/cmdline_action.cc:584 +#: src/cmdline/cmdline_action.cc:582 #, c-format msgid "Couldn't find any package whose name or description matched \"%s\"\n" msgstr "无法找到任何名称或者描述中匹配“%s”的软件包\n" -#: src/cmdline/cmdline_action.cc:586 +#: src/cmdline/cmdline_action.cc:584 #, c-format msgid "" "Couldn't find any package matching \"%s\", and more than 40\n" @@ -728,7 +728,7 @@ "无法找到任何软件包匹配“%s”，同时有超过40个软件包\n" "其描述中包含“%s”。\n" -#: src/cmdline/cmdline_action.cc:589 +#: src/cmdline/cmdline_action.cc:587 #, c-format msgid "" "Couldn't find any package matching \"%s\". However, the following\n" @@ -737,7 +737,7 @@ "无法找到任何软件包匹配“%s”。然而下列软件包的描述中\n" "包含“%s”：\n" -#: src/cmdline/cmdline_action.cc:731 +#: src/cmdline/cmdline_action.cc:729 #, c-format msgid "Bad action character '%c'\n" msgstr "非法的动作字符“%c”\n" @@ -760,17 +760,17 @@ msgid "Can't execute sensible-pager, is this a working Debian system?" msgstr "无法执行 sensible-pager，这是一个正常运行的 Debian 系统吗？" -#: src/cmdline/cmdline_changelog.cc:341 +#: src/cmdline/cmdline_changelog.cc:333 #, c-format msgid "%s is not an official Debian package, cannot display its changelog." msgstr "%s 不是官方 Debian 软件包，无法显示其变更日志。" -#: src/cmdline/cmdline_changelog.cc:425 +#: src/cmdline/cmdline_changelog.cc:394 #, c-format msgid "Couldn't find a changelog for %s" msgstr "无法找到 %s 的变更日志" -#: src/cmdline/cmdline_changelog.cc:429 +#: src/cmdline/cmdline_changelog.cc:398 #, c-format msgid "Couldn't run pager %s" msgstr "" @@ -786,7 +786,7 @@ msgstr "删除 %s* %s 部分 /*\n" #: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:146 -#: src/ui.cc:1781 src/ui.cc:1869 +#: src/ui.cc:1787 src/ui.cc:1875 msgid "Unable to lock the download directory" msgstr "" @@ -826,7 +826,7 @@ msgstr "无法安全解决依赖关系，请尝试使用 --full-resolver 来运行。\n" #: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60 -#: src/main.cc:1221 +#: src/main.cc:1223 #, c-format msgid "Abort.\n" msgstr "放弃。\n" @@ -836,17 +836,17 @@ msgid "download: you must specify at least one package to download\n" msgstr "下载：您必须指定至少一个要下载的软件包\n" -#: src/cmdline/cmdline_download.cc:57 -#: src/generic/apt/download_install_manager.cc:87 +#: src/cmdline/cmdline_download.cc:63 +#: src/generic/apt/download_install_manager.cc:83 msgid "Couldn't read source list" msgstr "无法读取源列表文件" -#: src/cmdline/cmdline_download.cc:91 +#: src/cmdline/cmdline_download.cc:90 #, c-format msgid "Can't find a package named \"%s\"" msgstr "无法找到名称为“%s”的软件包" -#: src/cmdline/cmdline_download.cc:135 +#: src/cmdline/cmdline_download.cc:134 #, c-format msgid "" "No downloadable files for %s version %s; perhaps it is a local or obsolete " @@ -865,6 +865,7 @@ #. ForTranslators: this stands for "error" and should be the #. same width as the translation of "Ign". +#: src/cmdline/cmdline_changelog.cc:146 #: src/cmdline/cmdline_download_progress_display.cc:185 msgid "Err" msgstr "错误" @@ -885,7 +886,7 @@ msgid "[Working]" msgstr "[正在工作]" -#: src/cmdline/cmdline_extract_cache_subset.cc:56 +#: src/cmdline/cmdline_extract_cache_subset.cc:57 #, c-format msgid "" "extract-cache-entries: at least one argument is required (the directory\n" @@ -898,7 +899,7 @@ msgid "No such package \"%s\".\n" msgstr "没有这个软件包“%s”。\n" -#: src/cmdline/cmdline_extract_cache_subset.cc:132 +#: src/cmdline/cmdline_extract_cache_subset.cc:133 #, c-format msgid "" "No packages were selected by the given search pattern; nothing to do.\n" @@ -1016,17 +1017,17 @@ msgid "The following partially installed packages will be configured:" msgstr "下列仅部分安装的软件包将被配置：" -#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1568 +#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1574 #, c-format msgid "The following ESSENTIAL packages will be REMOVED!\n" msgstr "下列“基本”软件包将被“删除”！\n" -#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1583 +#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1589 #, c-format msgid "The following ESSENTIAL packages will be BROKEN by this action:\n" msgstr "该动作将使下列“基本”软件包“破损”：\n" -#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1596 +#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1602 #, c-format msgid "" "WARNING: Performing this action will probably cause your system to break!\n" @@ -1039,7 +1040,7 @@ msgid "I am aware that this is a very bad idea" msgstr "我知道这是一个非常糟糕的主意" -#: src/cmdline/cmdline_prompt.cc:484 src/ui.cc:1597 +#: src/cmdline/cmdline_prompt.cc:484 src/ui.cc:1603 #, c-format msgid "To continue, type the phrase \"%s\":\n" msgstr "要继续的话，键入词组“%s”：\n" @@ -1075,7 +1076,7 @@ " Apt::Get::AllowUnauthenticated is 'true'!\n" msgstr "" "*** 警告 *** 忽略这些违反信任机制的问题，因为\n" -" Apt::Get::AllowUnauthenticated 的值为“true”！\n" +" Apt::Get::AllowUnauthenticated 的值为“真”！\n" #. ForTranslators: This string is a confirmation message, which #. users (especially CJK users) should be able to input without @@ -1084,7 +1085,7 @@ #. can be removed from your translation. #: src/cmdline/cmdline_prompt.cc:558 msgid "Go ahead and ignore the warning|Yes" -msgstr "Go ahead and ignore the warning|Yes" +msgstr "Shi" #. ForTranslators: This string is a confirmation message, which #. users (especially CJK users) should be able to input without @@ -1093,7 +1094,7 @@ #. can be removed from your translation. #: src/cmdline/cmdline_prompt.cc:564 msgid "Abort instead of overriding the warning|No" -msgstr "Abort instead of overriding the warning|No" +msgstr "Fou" #: src/cmdline/cmdline_prompt.cc:575 #, c-format @@ -1172,6 +1173,7 @@ msgstr "无可显示的软件包 -- 请在“i”之后的那一行输入软件包名称。\n" #: src/cmdline/cmdline_prompt.cc:777 src/cmdline/cmdline_prompt.cc:792 +#: src/pkg_item.cc:411 src/ui.cc:1219 msgid "Press Return to continue." msgstr "按回车继续。" @@ -1564,7 +1566,9 @@ msgid "Expected a version or \"%s\" after \"%s\"" msgstr "预期在“%2$s”之后得到版本或“%1$s”" -#: src/cmdline/cmdline_resolver.cc:361 +#: src/cmdline/cmdline_extract_cache_subset.cc:93 +#: src/cmdline/cmdline_resolver.cc:361 src/cmdline/cmdline_user_tag.cc:131 +#: src/cmdline/cmdline_versions.cc:295 #, c-format msgid "No such package \"%s\"" msgstr "没有这个软件包“%s”" @@ -1637,7 +1641,7 @@ #: src/cmdline/cmdline_resolver.cc:576 #, c-format msgid "Action \"%s\"" -msgstr "动作 \"%s\"" +msgstr "动作“%s”" #. ForTranslators: the substitution is #. replaced in English with something @@ -1748,7 +1752,7 @@ msgid "The following commands are available:" msgstr "下列命令可选：" -#: src/cmdline/cmdline_resolver.cc:999 +#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2316 msgid "File to write resolver state to: " msgstr "将依赖关系解决状态写入文件： " @@ -2017,11 +2021,11 @@ msgid "Architecture: " msgstr "体系： " -#: src/cmdline/cmdline_show.cc:433 +#: src/cmdline/cmdline_show.cc:433 src/pkg_info_screen.cc:139 msgid "Uncompressed Size: " msgstr "未压缩尺寸： " -#: src/cmdline/cmdline_show.cc:437 +#: src/cmdline/cmdline_show.cc:437 src/pkg_info_screen.cc:138 msgid "Compressed Size: " msgstr "压缩后尺寸： " @@ -2089,12 +2093,12 @@ msgid "Homepage: " msgstr "主页： " -#: src/cmdline/cmdline_show.cc:582 +#: src/cmdline/cmdline_show.cc:575 #, c-format msgid "Unable to locate package %s" msgstr "无法定位软件包 %s" -#: src/cmdline/cmdline_show.cc:603 +#: src/cmdline/cmdline_show.cc:596 #, c-format msgid "Unable to parse pattern %s" msgstr "无法分析模式 %s" @@ -2118,17 +2122,17 @@ msgid "E: The update command takes no arguments\n" msgstr "E: update 命令不接受任何参数\n" -#: src/cmdline/cmdline_user_tag.cc:64 +#: src/cmdline/cmdline_user_tag.cc:65 #, c-format msgid "Adding user tag \"%s\" to the package \"%s\".\n" msgstr "添加用户标签“%s”到软件包“%s”。\n" -#: src/cmdline/cmdline_user_tag.cc:71 +#: src/cmdline/cmdline_user_tag.cc:72 #, c-format msgid "Removing user tag \"%s\" from the package \"%s\".\n" msgstr "将用户标签“%s”移除出软件包“%s”。\n" -#: src/cmdline/cmdline_user_tag.cc:103 +#: src/cmdline/cmdline_user_tag.cc:104 #, c-format msgid "%s: too few arguments; expected at least a tag name and a package.\n" msgstr "%s: 参数太少；期待至少一个标签名称和一个软件包名称。\n" @@ -2163,36 +2167,36 @@ msgid "You cannot specify both an archive and a version for a package\n" msgstr "您不能为一个软件包同时指定存档和版本号\n" -#: src/cmdline/cmdline_util.cc:338 +#: src/cmdline/cmdline_util.cc:361 #, c-format msgid "%d broken [%+d]" msgid_plural "%d broken [%+d]" msgstr[0] "%d 个被破坏 [%+d]" -#: src/cmdline/cmdline_util.cc:352 +#: src/cmdline/cmdline_util.cc:375 #, c-format msgid "%d update [%+d]" msgid_plural "%d updates [%+d]" msgstr[0] "%d 个被更新 [%+d]" -#: src/cmdline/cmdline_util.cc:366 +#: src/cmdline/cmdline_util.cc:389 #, c-format msgid "%d new [%+d]" msgid_plural "%d new [%+d]" msgstr[0] "%d 个新软件包 [%+d]" -#: src/cmdline/cmdline_util.cc:377 +#: src/cmdline/cmdline_util.cc:400 #, c-format msgid "Current status: %F." msgstr "当前状态：%F。" -#: src/cmdline/cmdline_util.cc:388 +#: src/cmdline/cmdline_util.cc:411 #, c-format msgid "There is %d newly obsolete package." msgid_plural "There are %d newly obsolete packages." msgstr[0] "有 %d 个新被废弃的软件包。" -#: src/cmdline/cmdline_util.cc:400 +#: src/cmdline/cmdline_util.cc:423 #, c-format msgid "There is %d newly obsolete package: " msgid_plural "There are %d newly obsolete packages: " @@ -2258,7 +2262,7 @@ #: src/cmdline/cmdline_why.cc:290 msgid "dep_level" -msgstr "依赖级(_L)" +msgstr "依赖级" #: src/cmdline/cmdline_why.cc:296 msgid "DependsOnly" @@ -2430,11 +2434,11 @@ msgid " [Working]" msgstr " [正在工作]" -#: src/download_item.cc:110 src/download_list.cc:361 +#: src/download_item.cc:110 src/download_list.cc:362 msgid "[Hit]" msgstr "[命中]" -#: src/download_item.cc:110 src/download_list.cc:383 +#: src/download_item.cc:110 src/download_list.cc:384 msgid "[Downloaded]" msgstr "[已下载]" @@ -2448,7 +2452,7 @@ msgid "%n%nSome files were not downloaded successfully." msgstr "%n%n某些文件无法下载。" -#: src/download_list.cc:98 src/download_list.cc:345 src/gtk/download.cc:444 +#: src/download_list.cc:98 src/download_list.cc:346 src/gtk/download.cc:444 msgid "Continue" msgstr "继续" @@ -2460,39 +2464,39 @@ msgid "Total Progress: " msgstr "总进度： " -#: src/download_list.cc:242 +#: src/download_list.cc:243 #, c-format msgid " [ %i%% ] (%sB/s, %s remaining)" msgstr " [ %i%% ] (%sB/s, 剩下 %s)" -#: src/download_list.cc:244 +#: src/download_list.cc:245 #, c-format msgid " [ %i%% ] (stalled)" msgstr " [ %i%% ] (已停顿)" -#: src/download_list.cc:246 +#: src/download_list.cc:247 #, c-format msgid " [ %i%% ]" msgstr " [ %i%% ]" -#: src/download_list.cc:264 +#: src/download_list.cc:265 msgid "Downloading... " msgstr "正在下载... " -#: src/download_list.cc:340 src/gtk/download.cc:441 +#: src/download_list.cc:341 src/gtk/download.cc:441 #, c-format msgid "Please insert the disc labeled \"%s\" into the drive \"%s\"" msgstr "请将标号为“%s”的磁盘插入驱动器“%s”" -#: src/download_list.cc:347 src/gtk/download.cc:445 +#: src/download_list.cc:348 src/gtk/download.cc:445 msgid "Abort" msgstr "放弃" -#: src/download_list.cc:405 +#: src/download_list.cc:406 msgid "[IGNORED]" msgstr "[忽略]" -#: src/download_list.cc:411 +#: src/download_list.cc:412 msgid "[ERROR]" msgstr "[错误]" @@ -2571,19 +2575,19 @@ msgid "couldn't replace %s with %s" msgstr "无法用 %s 代替 %s" -#: src/generic/apt/aptcache.cc:1528 +#: src/generic/apt/aptcache.cc:1525 msgid "Unable to correct dependencies, some packages cannot be installed" msgstr "无法修正依赖关系，一些包无法安装" -#: src/generic/apt/aptcache.cc:2175 +#: src/generic/apt/aptcache.cc:2172 msgid "The list of sources could not be read." msgstr "无法读取软件源列表。" -#: src/generic/apt/aptcache.cc:2182 +#: src/generic/apt/aptcache.cc:2179 msgid "The package lists or status file could not be parsed or opened." msgstr "无法解析或打开软件包列表文件或状态文件。" -#: src/generic/apt/aptcache.cc:2185 +#: src/generic/apt/aptcache.cc:2182 msgid "" "You may want to update the package lists to correct these missing files" msgstr "您可能需要更新软件包列表来解决缺少这些文件的问题" @@ -2658,7 +2662,7 @@ msgid "" "Invalid hint \"%s\": expected a component name and a number, but found " "nothing." -msgstr "无效的线索 \"%s\"：期望得到一个组件名和一个数字，但是没有找到。" +msgstr "无效的线索 %s：期望得到一个组件名和一个数字，但是没有找到。" #: src/generic/apt/aptitude_resolver.cc:485 #, c-format @@ -2704,7 +2708,7 @@ msgid "Conflicting types for the cost component %s." msgstr "" -#: src/generic/apt/aptitude_resolver_universe.cc:828 +#: src/generic/apt/aptitude_resolver_universe.cc:838 #, c-format msgid "" "Invalid safety level \"%s\" (not \"discard\", \"maximum\", \"minimum\", or " @@ -2721,29 +2725,30 @@ msgid "Couldn't lock list directory..are you root?" msgstr "无法锁定列表目录..您是 root 吗？" -#: src/generic/apt/download_install_manager.cc:98 +#: src/generic/apt/download_install_manager.cc:93 msgid "Internal error: couldn't generate list of packages to download" msgstr "内部错误：无法生成下载软件包列表" -#: src/generic/apt/download_install_manager.cc:127 +#: src/generic/apt/download_install_manager.cc:120 +#: src/generic/apt/download_update_manager.cc:130 #, c-format msgid "Failed to fetch %s: %s" msgstr "无法下载 %s：%s" -#: src/generic/apt/download_install_manager.cc:133 +#: src/generic/apt/download_install_manager.cc:140 msgid "Unable to correct for unavailable packages" msgstr "无法修正因软件包不可用而造成的错误" -#: src/generic/apt/download_install_manager.cc:168 +#: src/generic/apt/download_install_manager.cc:175 msgid "A package failed to install. Trying to recover:" msgstr "软件包安装失败。正在试图恢复：" -#: src/generic/apt/download_install_manager.cc:212 +#: src/generic/apt/download_install_manager.cc:219 msgid "" "Could not regain the system lock! (Perhaps another apt or dpkg is running?)" msgstr "无法重新获得系统锁！(也许另一个 apt 或 dpkg 正在运行？)" -#: src/generic/apt/download_update_manager.cc:78 +#: src/generic/apt/download_update_manager.cc:70 msgid "Couldn't read list of package sources" msgstr "无法读取软件包源列表" @@ -2815,7 +2820,7 @@ #: src/generic/apt/dump_packages.cc:539 src/generic/apt/dump_packages.cc:629 #, c-format msgid "Unable to stat %s." -msgstr "无法获取 “%s” 的状态。" +msgstr "无法获取 %s 的状态。" #: src/generic/apt/dump_packages.cc:674 #, c-format @@ -2938,13 +2943,13 @@ "\n" "日志完成。\n" -#: src/generic/apt/matching/match.cc:3093 -#: src/generic/apt/matching/match.cc:3210 +#: src/generic/apt/matching/match.cc:3095 +#: src/generic/apt/matching/match.cc:3212 msgid "Accessing index" msgstr "正在访问索引" -#: src/generic/apt/matching/match.cc:3103 -#: src/generic/apt/matching/match.cc:3217 +#: src/generic/apt/matching/match.cc:3105 +#: src/generic/apt/matching/match.cc:3219 msgid "Filtering packages" msgstr "分类软件包" @@ -3048,23 +3053,24 @@ #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." -msgstr "软件包索引文件被损坏。软件包 %s 无 Filename: 域。" +msgstr "软件包索引文件被损坏。软件包 %s 无 Filename：域。" #: src/generic/apt/pkg_changelog.cc:441 src/view_changelog.cc:272 #, c-format msgid "ChangeLog of %s" msgstr "%s 的变更日志" -#: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570 +#: src/generic/apt/pkg_changelog.cc:572 src/generic/apt/pkg_changelog.cc:577 #, c-format msgid "Failed to download changelogs: %s" msgstr "下载变更日志失败：%s" -#: src/generic/apt/pkg_changelog.cc:575 +#: src/generic/apt/pkg_changelog.cc:582 msgid "Failed to download changelogs: unexpected exception." msgstr "下载变更日志失败：预期之外的异常。" -#: src/generic/apt/pkg_changelog.cc:589 +#: src/generic/apt/pkg_changelog.cc:442 src/generic/apt/pkg_changelog.cc:596 +#: src/view_changelog.cc:272 #, c-format msgid "Changelog of %s" msgstr "%s 的变更日志" @@ -3136,8 +3142,7 @@ msgid "Unable to open /usr/share/tasksel/debian-tasks.desc" msgstr "无法打开 /usr/share/tasksel/debian-tasks.desc" -#: src/generic/apt/tasks.cc:285 src/generic/apt/tasks.cc:327 -#: src/generic/apt/tasks.cc:329 +#: src/generic/apt/tasks.cc:484 msgid "Reading task descriptions" msgstr "正在读取软件集说明档" @@ -3274,35 +3279,35 @@ msgid "_File" msgstr "文件(_F)" -#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2341 +#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2347 msgid "Perform all pending installs and removals" msgstr "执行所有等待执行的安装和卸载任务" -#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2344 +#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2350 msgid "Check for new versions of packages" msgstr "正在检查新版本的软件包" -#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2349 +#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2355 msgid "Mark all upgradable packages which are not held for upgrade" msgstr "为所有未被保持现状的软件包加上升级标记" -#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2354 +#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2360 msgid "Forget which packages are \"new\"" msgstr "忘记哪些软件包是“新”的" -#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2358 +#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2364 msgid "Cancel all pending installations, removals, holds, and upgrades." msgstr "执行所有等待执行的安装、卸载、保持和升级任务" -#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2362 +#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2368 msgid "Delete package files which were previously downloaded" msgstr "删除以前下载的软件包文件" -#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2366 +#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2372 msgid "Delete package files which can no longer be downloaded" msgstr "删除无法再下载的软件包文件" -#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2373 +#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2379 msgid "Reload the package cache" msgstr "重新载入软件包缓存" @@ -3312,7 +3317,7 @@ "will be preserved" msgstr "运行“su”成为 root。这将重新启动程序，但是您的设置将会被保存下来。" -#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2386 +#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2392 msgid "Exit the program" msgstr "退出此程序" @@ -3320,7 +3325,7 @@ msgid "E_dit" msgstr "退出(_D)" -#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2393 +#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2399 msgid "Undo the last package operation or group of operations" msgstr "撤销最近一次或者一组软件包操作" @@ -3366,12 +3371,12 @@ msgstr "软件包" #: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1033 -#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1394 +#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1395 msgid "Preview" msgstr "预览" #: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1028 -#: src/qt/tabs_manager.cc:263 src/ui.cc:2777 +#: src/qt/tabs_manager.cc:263 src/ui.cc:2783 msgid "Resolver" msgstr "解决手段" @@ -4085,7 +4090,7 @@ msgid "Download already running." msgstr "下载已经在进行。" -#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1520 src/ui.cc:1759 +#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1526 src/ui.cc:1765 msgid "A package-list update or install run is already taking place." msgstr "已经开始了一个软件包列表更新或者安装的动作。" @@ -4135,7 +4140,7 @@ #: src/gtk/gui.cc:875 #, c-format msgid "%s: %s" -msgstr "%s： %s" +msgstr "%s：%s" #: src/gtk/gui.cc:878 #, c-format @@ -4147,17 +4152,17 @@ msgid "Asking whether to replace the configuration file %s" msgstr "询问是否替换配置文件 %s" -#: src/gtk/gui.cc:962 src/ui.cc:1264 +#: src/gtk/gui.cc:962 src/ui.cc:1266 msgid "Downloading packages" msgstr "正在下载软件包" #: src/gtk/gui.cc:1038 msgid "Broken packages" -msgstr "破损的软件包。" +msgstr "破损的软件包" #: src/gtk/gui.cc:1071 msgid "Show broken packages" -msgstr "显示破损的软件包。" +msgstr "显示破损的软件包" #: src/gtk/gui.cc:1075 msgid "Resolve dependencies" @@ -4658,6 +4663,7 @@ msgstr "降级下列软件包：" #: src/gtk/resolver.cc:1442 src/gtk/resolver.cc:1903 +#: src/solution_fragment.cc:513 msgid "Leave the following dependencies unresolved:" msgstr "保留下列未解决的依赖关系：" @@ -5556,33 +5562,33 @@ "无效的 \"why\" 总结模式 \"%s\"：期望 \"no-summary\"，\"first-package\"，\"first-package-" "and-type\"，\"all-packages\" 或 \"all-packages-with-dep-versions\"。" -#: src/main.cc:1077 +#: src/main.cc:1079 msgid "" "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be " "specified\n" msgstr "选项 --auto-clean-on-startup，--clean-on-startup，-i 和 -u 只能指定一个\n" -#: src/main.cc:1086 +#: src/main.cc:1088 msgid "" "-u, -i, and --clean-on-startup may not be specified in command-line mode " "(eg, with 'install')" msgstr "选项 -u，-i 和 --clean-on-startup 不能在命令行模式中指定 (例如，和“install”一起)" -#: src/main.cc:1103 +#: src/main.cc:1105 msgid "-u, -i, and --clean-on-startup may not be specified with a command" msgstr "选项 -u，-i 和 --clean-on-startup 不能在和一个命令一起指定" -#: src/main.cc:1214 +#: src/main.cc:1216 #, c-format msgid "Unknown command \"%s\"\n" msgstr "未知的命令“%s”\n" -#: src/main.cc:1226 src/main.cc:1311 +#: src/main.cc:1228 src/main.cc:1313 #, c-format msgid "Uncaught exception: %s\n" msgstr "未知的例外：%s\n" -#: src/main.cc:1230 src/main.cc:1315 +#: src/main.cc:1232 src/main.cc:1317 #, c-format msgid "" "Backtrace:\n" @@ -5600,7 +5606,7 @@ msgid "Search backwards for: " msgstr "向前搜索： " -#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1764 +#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1770 msgid "Minesweeper" msgstr "扫雷" @@ -5808,7 +5814,7 @@ msgid "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 17 15" msgstr "" -#: src/pkg_columnizer.cc:89 src/ui.cc:2776 +#: src/pkg_columnizer.cc:89 src/ui.cc:2782 msgid "Package" msgstr "软件包" @@ -5890,7 +5896,7 @@ msgstr "<无>" #: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:269 -#: src/pkg_grouppolicy.cc:1807 src/qt/package.cc:234 +#: src/pkg_grouppolicy.cc:1815 src/qt/package.cc:234 #: src/qt/widgets/packages_tab.cc:73 msgid "virtual" msgstr "虚拟" @@ -6024,7 +6030,7 @@ msgid "Internal error: Default column string is unparsable" msgstr "内部错误：默认栏字符串无法解析" -#: src/pkg_grouppolicy.cc:264 src/pkg_grouppolicy.cc:1116 +#: src/pkg_grouppolicy.cc:264 src/pkg_grouppolicy.cc:1127 msgid "Tasks" msgstr "软件集" @@ -6146,7 +6152,7 @@ msgid "Unrecognized tasks" msgstr "无法识别的软件集" -#: src/pkg_grouppolicy.cc:1117 +#: src/pkg_grouppolicy.cc:1128 msgid "" "\n" " Tasks are groups of packages which provide an easy way to select a " @@ -6155,26 +6161,26 @@ "\n" " 软件集是一组软件包，它们提供了一种简单的方法来选择一组预定义的完成特定任务的软件包。" -#: src/pkg_grouppolicy.cc:1249 +#: src/pkg_grouppolicy.cc:1257 #, c-format msgid "Bad number in format string: %ls" msgstr "格式字符串里有错误的号码：%ls" -#: src/pkg_grouppolicy.cc:1258 +#: src/pkg_grouppolicy.cc:1266 #, c-format msgid "Match indices must be 1 or greater, not \"%s\"" msgstr "匹配索引必须大于等于 1，而不是“%s”" -#: src/pkg_grouppolicy.cc:1276 +#: src/pkg_grouppolicy.cc:1284 #, c-format msgid "Match index %ls is too large; available groups are (%s)" msgstr "匹配索引 %ls 太大了；可用的组为 (%s)" -#: src/pkg_grouppolicy.cc:1552 +#: src/pkg_grouppolicy.cc:1560 msgid "TAGLESS PACKAGES" msgstr "没有标签的软件包" -#: src/pkg_grouppolicy.cc:1553 +#: src/pkg_grouppolicy.cc:1561 msgid "" "\n" " These packages have not yet been classified in debtags, or the debtags " @@ -6183,7 +6189,7 @@ "\n" " 这些软件包还没有在 debtags 中文类，或者 debtags 数据库不存在(安装 debtags 也许能修正这个问题)。" -#: src/pkg_grouppolicy.cc:1593 +#: src/pkg_grouppolicy.cc:1601 msgid "MISSING TAG" msgstr "标签缺失" @@ -6214,19 +6220,19 @@ msgid "Versions of %s" msgstr "%s 的版本号" -#: src/pkg_item.cc:87 +#: src/pkg_item.cc:88 #, c-format msgid "" "%s is an essential package!%n%nAre you sure you want to remove it?%nType " "'%s' if you are." msgstr "%s 是一个基本软件包！%n%n 您确定您要卸载它吗？%n 如果您确定的话输入“%s”。" -#: src/pkg_item.cc:372 src/pkg_ver_item.cc:748 +#: src/pkg_item.cc:373 src/pkg_ver_item.cc:748 #, c-format msgid "Reporting a bug in %s:\n" msgstr "报告 %s 中的错误\n" -#: src/pkg_item.cc:392 +#: src/pkg_item.cc:393 msgid "" "You are not root and I cannot find any way to become root. To reconfigure " "this package, install the menu package, the login package, or run aptitude " @@ -6235,7 +6241,7 @@ "您不是 root，而且我没有发现任何方法来变成 root。要重新配置这个软件包，请安装 menu 软件包，login 软件包，或者以 root 身份运行 " "aptitude 。" -#: src/pkg_item.cc:400 +#: src/pkg_item.cc:401 #, c-format msgid "Reconfiguring %s\n" msgstr "重新配置 %s\n" @@ -6248,7 +6254,7 @@ msgid "Hierarchy editor" msgstr "层次编辑器" -#: src/pkg_item.cc:427 src/pkg_view.cc:673 +#: src/pkg_item.cc:428 src/pkg_view.cc:673 msgid "Hierarchy Editor" msgstr "层次编辑器" @@ -6775,7 +6781,7 @@ msgid "Really quit Aptitude?" msgstr "真的要退出 Aptitude 吗？" -#: src/ui.cc:714 src/ui.cc:2539 +#: src/ui.cc:714 src/ui.cc:2545 msgid "Change the behavior of aptitude" msgstr "修改 aptitude 的行为" @@ -6853,7 +6859,7 @@ msgid "License" msgstr "许可证" -#: src/ui.cc:1086 src/ui.cc:2631 +#: src/ui.cc:1086 src/ui.cc:2637 msgid "View the terms under which you may copy and distribute aptitude" msgstr "查看您可以在何种条款下拷贝和分发 aptitude" @@ -6861,19 +6867,19 @@ msgid "help.txt" msgstr "help-zh_CN.txt" -#: src/ui.cc:1102 +#: src/ui.cc:1103 msgid "Encoding of help.txt|UTF-8" msgstr "UTF-8" -#: src/ui.cc:1113 +#: src/ui.cc:1114 msgid "Online Help" msgstr "在线帮助" -#: src/ui.cc:1114 +#: src/ui.cc:1115 msgid "View a brief introduction to aptitude" msgstr "观看 aptitude 的简要介绍" -#: src/ui.cc:1115 src/ui.cc:2781 +#: src/ui.cc:1116 src/ui.cc:2787 msgid "Help" msgstr "帮助" @@ -6882,53 +6888,53 @@ msgstr "README" # I think we don't have a Chinese README file yet, so leave this alone -#: src/ui.cc:1124 +#: src/ui.cc:1126 msgid "Encoding of README|ISO_8859-1" msgstr "ISO_8859-1" -#: src/ui.cc:1135 +#: src/ui.cc:1137 msgid "User's Manual" msgstr "用户手册" -#: src/ui.cc:1136 +#: src/ui.cc:1138 msgid "Read the full user's manual of aptitude" msgstr "阅读 aptitude 的完整的用户手册" -#: src/ui.cc:1137 +#: src/ui.cc:1139 msgid "Manual" msgstr "手册" -#: src/ui.cc:1144 src/ui.cc:1146 +#: src/ui.cc:1146 src/ui.cc:1148 msgid "FAQ" msgstr "常见问题回答" -#: src/ui.cc:1145 src/ui.cc:2623 +#: src/ui.cc:1147 src/ui.cc:2629 msgid "View a list of frequently asked questions" msgstr "查看常见问题列表" -#: src/ui.cc:1154 src/ui.cc:1156 +#: src/ui.cc:1156 src/ui.cc:1158 msgid "News" msgstr "新闻" -#: src/ui.cc:1155 +#: src/ui.cc:1157 #, c-format msgid "View the important changes made in each version of %s" msgstr "查看 %s 每一版本中所做的重大修改" -#: src/ui.cc:1162 +#: src/ui.cc:1164 #, c-format msgid "" "Unable to remove the old temporary directory; you should remove %s by hand." msgstr "无法删除旧的临时文件夹；您需要手动删除 %s。" -#: src/ui.cc:1167 +#: src/ui.cc:1169 #, c-format msgid "" "Will not remove %s; you should examine the files in it and remove them by " "hand." msgstr "不会删除 %s；您需要坚持该文件夹内的文件，然后手动删除。" -#: src/ui.cc:1193 +#: src/ui.cc:1195 #, c-format msgid "" "It appears that a previous version of aptitude left files behind in %s. " @@ -6939,15 +6945,15 @@ "好像上一个版本的 aptitude 在 %s " "中留了一些文件。这些文件基本上没什么用处了，可以安装的删除。%n%n您要删除这些目录和里面的内容吗？如果您选择“不”，您将不会再看到这条信息。" -#: src/ui.cc:1265 +#: src/ui.cc:1267 msgid "View the progress of the package download" msgstr "查看软件包下载的进程" -#: src/ui.cc:1266 +#: src/ui.cc:1268 msgid "Package Download" msgstr "软件包下载" -#: src/ui.cc:1313 +#: src/ui.cc:1315 msgid "" "%BWARNING%b: untrusted versions of the following packages will be " "installed!%n%nUntrusted packages could %Bcompromise your system's " @@ -6957,153 +6963,153 @@ "%B警告%b：以下软件包的不可信版本将被安装！%n%n不可信的软件包可能会%B危害您的系统安全%b。只有当您非常清楚地了解这就是您所要执行的操作时，才应该" "进行安装操作。%n%n" -#: src/ui.cc:1319 +#: src/ui.cc:1321 msgid " %S*%N %s [version %s]%n" msgstr " %S*%N %s [版本号 %s]%n" -#: src/ui.cc:1325 +#: src/ui.cc:1327 msgid "Really Continue" msgstr "真的继续" -#: src/ui.cc:1327 +#: src/ui.cc:1329 msgid "Abort Installation" msgstr "中止安装" -#: src/ui.cc:1392 +#: src/ui.cc:1393 msgid "Preview of package installation" msgstr "预览软件包安装" -#: src/ui.cc:1393 +#: src/ui.cc:1394 msgid "View and/or adjust the actions that will be performed" msgstr "查看以及/或者调整将要被执行的动作" -#: src/ui.cc:1450 +#: src/ui.cc:1456 msgid "Some packages were broken and have been fixed:" msgstr "某些破损的包已经被修补:" -#: src/ui.cc:1458 +#: src/ui.cc:1464 msgid "No solution to these dependency problems exists!" msgstr "这些依赖关系没有解决方案！" -#: src/ui.cc:1464 +#: src/ui.cc:1470 #, c-format msgid "" "Ran out of time while trying to resolve dependencies (press \"%s\" to try " "harder)" msgstr "试图搜寻解决方案时用时已尽 (按“%s”加把劲儿再试试)" -#: src/ui.cc:1510 +#: src/ui.cc:1516 msgid "" "Installing/removing packages requires administrative privileges, which you " "currently do not have. Would you like to change to the root account?" msgstr "安装/删除软件包需要管理员权限，而您现在没有这种权限。您想要进入 root 帐号吗？" -#: src/ui.cc:1513 src/ui.cc:1752 src/ui.cc:1813 src/ui.cc:1908 +#: src/ui.cc:1519 src/ui.cc:1758 src/ui.cc:1819 src/ui.cc:1914 msgid "Become root" msgstr "变成 root" -#: src/ui.cc:1515 src/ui.cc:1754 src/ui.cc:1815 src/ui.cc:1910 +#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916 msgid "Don't become root" msgstr "不变成 root" -#: src/ui.cc:1636 +#: src/ui.cc:1642 msgid "No packages are scheduled to be installed, removed, or upgraded." msgstr "没有任何软件包被设定为安装，删除或者升级。" -#: src/ui.cc:1642 +#: src/ui.cc:1648 msgid "" "No packages will be installed, removed or upgraded. Some packages could be " "upgraded, but you have not chosen to upgrade them. Type \"U\" to prepare an " "upgrade." msgstr "没有任何软件包将被安装，删除或者升级。某些软件包可以升级，但是您没有选择将它们升级。输入“U”以准备升级。" -#: src/ui.cc:1705 src/ui.cc:1874 +#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1711 src/ui.cc:1880 msgid "Deleting obsolete downloaded files" msgstr "删除过期的下载文件" -#: src/ui.cc:1722 +#: src/ui.cc:1728 msgid "Updating package lists" msgstr "正在更新软件包列表" -#: src/ui.cc:1723 +#: src/ui.cc:1729 msgid "View the progress of the package list update" msgstr "查看软件包列表更新的进程" -#: src/ui.cc:1724 +#: src/ui.cc:1730 msgid "List Update" msgstr "列表更新" -#: src/ui.cc:1749 +#: src/ui.cc:1755 msgid "" "Updating the package lists requires administrative privileges, which you " "currently do not have. Would you like to change to the root account?" msgstr "更新软件包列表需要管理员权限，而您现在没有这种权限。您想要进入 root 帐号吗？" -#: src/ui.cc:1764 src/ui.cc:2378 +#: src/ui.cc:1770 src/ui.cc:2384 msgid "Waste time trying to find mines" msgstr "通过扫雷来消磨时间" -#: src/ui.cc:1771 src/ui.cc:1859 +#: src/ui.cc:1777 src/ui.cc:1865 msgid "Cleaning while a download is in progress is not allowed" msgstr "在下载进行过程中不允许执行清除" -#: src/ui.cc:1786 +#: src/ui.cc:1792 msgid "Deleting downloaded files" msgstr "删除下载的文件" -#: src/ui.cc:1800 +#: src/ui.cc:1806 msgid "Downloaded package files have been deleted" msgstr "下载的文件已经被删除" -#: src/ui.cc:1810 +#: src/ui.cc:1816 msgid "" "Cleaning the package cache requires administrative privileges, which you " "currently do not have. Would you like to change to the root account?" msgstr "清理软件包缓存需要管理员权限，而您现在没有这种权限。您想要进入 root 帐号吗？" -#: src/ui.cc:1856 +#: src/ui.cc:1862 msgid "The apt cache file is not available; cannot auto-clean." msgstr "软件包缓存不可用：无法 auto-clean 。" -#: src/ui.cc:1894 +#: src/ui.cc:1900 #, c-format msgid "" "Obsolete downloaded package files have been deleted, freeing %sB of disk " "space." msgstr "过期的下载文件已经被删除，正在释放 %sB 的磁盘空间。" -#: src/ui.cc:1905 +#: src/ui.cc:1911 msgid "" "Deleting obsolete files requires administrative privileges, which you " "currently do not have. Would you like to change to the root account?" msgstr "删除废弃文件需要管理员权限，而您现在没有这种权限。您想要进入 root 帐号吗？" -#: src/ui.cc:2007 +#: src/ui.cc:2013 msgid "No more solutions." msgstr "没有更多的解决方案了。" -#: src/ui.cc:2215 +#: src/ui.cc:2221 msgid "Unable to find a solution to apply." msgstr "未能找到解决方案以实施。" -#: src/ui.cc:2221 +#: src/ui.cc:2227 msgid "Ran out of time while trying to find a solution." msgstr "寻求解决方案时耗尽了时限。" -#: src/ui.cc:2281 src/ui.cc:2283 +#: src/ui.cc:2287 src/ui.cc:2289 msgid "Resolve Dependencies" msgstr "解决依赖关系" -#: src/ui.cc:2282 +#: src/ui.cc:2288 msgid "Search for solutions to unsatisfied dependencies" msgstr "为未满足的依赖关系寻找解决方案" -#: src/ui.cc:2294 +#: src/ui.cc:2300 #, c-format msgid "Unable to open %ls" msgstr "无法打开 %ls" -#: src/ui.cc:2300 +#: src/ui.cc:2306 msgid "Error while dumping resolver state" msgstr "存储依赖关系解决状态时出错" @@ -7111,464 +7117,464 @@ msgid "File to which the resolver state should be dumped: " msgstr "" -#: src/ui.cc:2340 +#: src/ui.cc:2346 msgid "^Install/remove packages" msgstr "安装/卸载软件包(^I)" -#: src/ui.cc:2343 +#: src/ui.cc:2349 msgid "^Update package list" msgstr "更新软件包列表(^U)" -#: src/ui.cc:2348 +#: src/ui.cc:2354 msgid "Mark Up^gradable" msgstr "标记可升级的(^g)" -#: src/ui.cc:2353 +#: src/ui.cc:2359 msgid "^Forget new packages" msgstr "忘记新软件包(^F)" -#: src/ui.cc:2357 +#: src/ui.cc:2363 msgid "Canc^el pending actions" msgstr "取消待执行的动作(^E)" -#: src/ui.cc:2361 +#: src/ui.cc:2367 msgid "^Clean package cache" msgstr "清除软件包缓存(^C)" -#: src/ui.cc:2365 +#: src/ui.cc:2371 msgid "Clean ^obsolete files" msgstr "关闭过期文件(^O)" -#: src/ui.cc:2372 +#: src/ui.cc:2378 msgid "^Reload package cache" msgstr "重新载入软件包缓存(^R)" -#: src/ui.cc:2377 +#: src/ui.cc:2383 msgid "^Play Minesweeper" msgstr "玩扫雷游戏(^P)" -#: src/ui.cc:2382 +#: src/ui.cc:2388 msgid "^Become root" msgstr "变成 root (^B)" -#: src/ui.cc:2385 +#: src/ui.cc:2391 msgid "^Quit" msgstr "退出(^Q)" -#: src/ui.cc:2392 src/ui.cc:2775 +#: src/ui.cc:2398 src/ui.cc:2781 msgid "Undo" msgstr "撤消" -#: src/ui.cc:2401 +#: src/ui.cc:2407 msgid "^Install" msgstr "安装(^I)" -#: src/ui.cc:2402 +#: src/ui.cc:2408 msgid "Flag the currently selected package for installation or upgrade" msgstr "标记当前选择的软件包以安装或者升级" -#: src/ui.cc:2405 +#: src/ui.cc:2411 msgid "^Remove" msgstr "删除(^R)" -#: src/ui.cc:2406 +#: src/ui.cc:2412 msgid "Flag the currently selected package for removal" msgstr "标记当前选择的软件包以删除" -#: src/ui.cc:2409 +#: src/ui.cc:2415 msgid "^Purge" msgstr "清除(^P)" -#: src/ui.cc:2410 +#: src/ui.cc:2416 msgid "" "Flag the currently selected package and its configuration files for removal" msgstr "标记当前选择的软件包和它的配置文件以删除" -#: src/ui.cc:2413 +#: src/ui.cc:2419 msgid "^Keep" msgstr "保持(^K)" -#: src/ui.cc:2414 +#: src/ui.cc:2420 msgid "Cancel any action on the selected package" msgstr "取消选定软件包上的任何动作" -#: src/ui.cc:2417 +#: src/ui.cc:2423 msgid "^Hold" msgstr "保持(^H)" -#: src/ui.cc:2418 +#: src/ui.cc:2424 msgid "" "Cancel any action on the selected package, and protect it from future " "upgrades" msgstr "取消选定软件包上的任何动作，并且保护它免于以后被升级" -#: src/ui.cc:2421 +#: src/ui.cc:2427 msgid "Mark ^Auto" msgstr "标记为自动安装(^A)" -#: src/ui.cc:2422 +#: src/ui.cc:2428 msgid "" "Mark the selected package as having been automatically installed; it will " "automatically be removed if no other packages depend on it" msgstr "将所选定的软件包标记为自动安装；如果没有其它软件包依赖于它，它将会被自动删除" -#: src/ui.cc:2425 +#: src/ui.cc:2431 msgid "Mark ^Manual" msgstr "标记为手动安装(^M)" -#: src/ui.cc:2426 +#: src/ui.cc:2432 msgid "" "Mark the selected package as having been manually installed; it will not be " "removed unless you manually remove it" msgstr "将所选定的软件包标记为手动安装；除非您手动删除该软件包，否则它将不会被删除" -#: src/ui.cc:2429 +#: src/ui.cc:2435 msgid "^Forbid Version" msgstr "禁止版本(^F)" -#: src/ui.cc:2430 +#: src/ui.cc:2436 msgid "" "Forbid the candidate version of the selected package from being installed; " "newer versions of the package will be installed as usual" msgstr "禁止安装选定软件包的候选版本；该软件包的新版本将可以正常安装" -#: src/ui.cc:2434 +#: src/ui.cc:2440 msgid "I^nformation" msgstr "信息(^N)" -#: src/ui.cc:2435 +#: src/ui.cc:2441 msgid "Display more information about the selected package" msgstr "显示关于选定软件包上的更多信息" -#: src/ui.cc:2438 +#: src/ui.cc:2444 msgid "C^ycle Package Information" msgstr "循环软件包信息" -#: src/ui.cc:2439 +#: src/ui.cc:2445 msgid "" "Cycle through the modes of the package information area: it can show the " "package's long description, a summary of its dependency status, or an " "analysis of why the package is required." msgstr "在软件包信息区域模式中循环：它可以显示软件包的长篇说明，依赖状态的概要，或者分析为什么该软件包是必须的。" -#: src/ui.cc:2442 +#: src/ui.cc:2448 msgid "^Changelog" msgstr "变更日志(^C)" -#: src/ui.cc:2443 +#: src/ui.cc:2449 msgid "Display the Debian changelog of the selected package" msgstr "显示选定软件包上的变更日志" -#: src/ui.cc:2450 +#: src/ui.cc:2456 msgid "^Examine Solution" msgstr "检查解决方案(^E)" -#: src/ui.cc:2451 +#: src/ui.cc:2457 msgid "Examine the currently selected solution to the dependency problems." msgstr "检查当前选择的处理依赖问题的解决方案" -#: src/ui.cc:2454 +#: src/ui.cc:2460 msgid "Apply ^Solution" msgstr "应用解决方案(^S)" -#: src/ui.cc:2455 +#: src/ui.cc:2461 msgid "Perform the actions contained in the currently selected solution." msgstr "确认当前选择的解决方案中包含的动作。" -#: src/ui.cc:2458 +#: src/ui.cc:2464 msgid "^Next Solution" msgstr "下一个解决方案(^N)" -#: src/ui.cc:2459 +#: src/ui.cc:2465 msgid "Select the next solution to the dependency problems." msgstr "选择解决此依赖问题的下一个方案。" -#: src/ui.cc:2462 +#: src/ui.cc:2468 msgid "^Previous Solution" msgstr "前一个解决方案(^P)" -#: src/ui.cc:2463 +#: src/ui.cc:2469 msgid "Select the previous solution to the dependency problems." msgstr "选择解决此依赖问题的前一个方案。" -#: src/ui.cc:2466 +#: src/ui.cc:2472 msgid "^First Solution" msgstr "第一个解决方案(^F)" -#: src/ui.cc:2467 +#: src/ui.cc:2473 msgid "Select the first solution to the dependency problems." msgstr "选择解决此依赖问题的第一个方案。" -#: src/ui.cc:2470 +#: src/ui.cc:2476 msgid "^Last Solution" msgstr "最后一个解决方案(^L)" -#: src/ui.cc:2471 +#: src/ui.cc:2477 msgid "" "Select the last solution to the dependency problems that has been generated " "so far." msgstr "选择当前已经生成的解决此依赖问题的最后一个方案。" -#: src/ui.cc:2477 +#: src/ui.cc:2483 msgid "Toggle ^Rejected" msgstr "放弃(^R)" -#: src/ui.cc:2478 +#: src/ui.cc:2484 msgid "Toggle whether the currently selected action is rejected." msgstr "切换是否放弃当前选择的动作。" -#: src/ui.cc:2482 +#: src/ui.cc:2488 msgid "Toggle ^Approved" msgstr "确认(^A)" -#: src/ui.cc:2483 +#: src/ui.cc:2489 msgid "Toggle whether the currently selected action is approved." msgstr "切换当前选择的动作是否被允许。" -#: src/ui.cc:2487 +#: src/ui.cc:2493 msgid "^View Target" msgstr "查看目标(^V)" -#: src/ui.cc:2488 +#: src/ui.cc:2494 msgid "View the package which will be affected by the selected action" msgstr "查看会被所选的动作影响的软件包" -#: src/ui.cc:2494 +#: src/ui.cc:2500 msgid "Reject Breaking ^Holds" msgstr "拒绝破坏 ^Holds" -#: src/ui.cc:2496 +#: src/ui.cc:2502 msgid "" "Reject all actions that would change the state of held packages or install " "forbidden versions" msgstr "拒绝所有会改变保持软件包或安装禁止版本的动作。" -#: src/ui.cc:2504 +#: src/ui.cc:2510 msgid "^Find" msgstr "查找(^F)" -#: src/ui.cc:2505 +#: src/ui.cc:2511 msgid "Search forwards" msgstr "向前搜索" -#: src/ui.cc:2508 +#: src/ui.cc:2514 msgid "^Find Backwards" msgstr "向后查找(^F)" -#: src/ui.cc:2509 +#: src/ui.cc:2515 msgid "Search backwards" msgstr "向后搜索" -#: src/ui.cc:2512 +#: src/ui.cc:2518 msgid "Find ^Again" msgstr "继续查找(^A)" -#: src/ui.cc:2513 +#: src/ui.cc:2519 msgid "Repeat the last search" msgstr "重复上一次查找" -#: src/ui.cc:2516 +#: src/ui.cc:2522 msgid "Find Again ^Backwards" msgstr "向后继续查找(^B)" -#: src/ui.cc:2517 +#: src/ui.cc:2523 msgid "Repeat the last search in the opposite direction" msgstr "反向重复上一次查找" -#: src/ui.cc:2521 +#: src/ui.cc:2527 msgid "^Limit Display" msgstr "限制显示(^L)" -#: src/ui.cc:2522 +#: src/ui.cc:2528 msgid "Apply a filter to the package list" msgstr "使用过滤器过滤软件包列表" -#: src/ui.cc:2525 +#: src/ui.cc:2531 msgid "^Un-Limit Display" msgstr "取消显示限制(^U)" -#: src/ui.cc:2526 +#: src/ui.cc:2532 msgid "Remove the filter from the package list" msgstr "取消软件包列表中过滤器的效果" -#: src/ui.cc:2530 +#: src/ui.cc:2536 msgid "Find ^Broken" msgstr "搜寻损坏(^F)" -#: src/ui.cc:2531 +#: src/ui.cc:2537 msgid "Find the next package with unsatisfied dependencies" msgstr "下列软件包存在未满足的依赖关系：" -#: src/ui.cc:2538 +#: src/ui.cc:2544 msgid "^Preferences" msgstr "首选项(^P)" -#: src/ui.cc:2543 +#: src/ui.cc:2549 msgid "^UI options" msgstr "用户界面选项(^U)" -#: src/ui.cc:2544 +#: src/ui.cc:2550 msgid "Change the settings which affect the user interface" msgstr "修改影响用户界面的设置" -#: src/ui.cc:2547 +#: src/ui.cc:2553 msgid "^Dependency handling" msgstr "处理依赖关系(^D)" -#: src/ui.cc:2548 +#: src/ui.cc:2554 msgid "Change the settings which affect how package dependencies are handled" msgstr "改变影响处理依赖关系的设置" -#: src/ui.cc:2551 +#: src/ui.cc:2557 msgid "^Miscellaneous" msgstr "杂项(^M)" -#: src/ui.cc:2552 +#: src/ui.cc:2558 msgid "Change miscellaneous program settings" msgstr "改变程序的杂项设置" -#: src/ui.cc:2558 +#: src/ui.cc:2564 msgid "^Revert options" msgstr "还原选项(^R)" -#: src/ui.cc:2559 +#: src/ui.cc:2565 msgid "Reset all settings to the system defaults" msgstr "把所有项目重设为它们的默认值" -#: src/ui.cc:2570 +#: src/ui.cc:2576 msgid "^Next" msgstr "下一个(^N)" -#: src/ui.cc:2571 +#: src/ui.cc:2577 msgid "View next display" msgstr "查看下一个画面" -#: src/ui.cc:2574 +#: src/ui.cc:2580 msgid "^Prev" msgstr "上一个(^P)" -#: src/ui.cc:2575 +#: src/ui.cc:2581 msgid "View previous display" msgstr "查看上一画面" -#: src/ui.cc:2578 +#: src/ui.cc:2584 msgid "^Close" msgstr "关闭(^C)" -#: src/ui.cc:2579 +#: src/ui.cc:2585 msgid "Close this display" msgstr "关闭此画面" -#: src/ui.cc:2584 +#: src/ui.cc:2590 msgid "New Package ^View" msgstr "新建软件包视图(^V)" -#: src/ui.cc:2585 +#: src/ui.cc:2591 msgid "Create a new default package view" msgstr "创建新的默认软件包视图" -#: src/ui.cc:2588 +#: src/ui.cc:2594 msgid "Audit ^Recommendations" msgstr "检查推荐结果(^R)" -#: src/ui.cc:2589 +#: src/ui.cc:2595 msgid "" "View packages which it is recommended that you install, but which are not " "currently installed." msgstr "查看推荐您安装，但是现在尚未安装的软件包。" -#: src/ui.cc:2592 +#: src/ui.cc:2598 msgid "New ^Flat Package List" msgstr "新建平面软件包列表(^F)" -#: src/ui.cc:2593 +#: src/ui.cc:2599 msgid "View all the packages on the system in a single uncategorized list" msgstr "在一个未分类的列表中查看系统中的所有的软件包" -#: src/ui.cc:2596 +#: src/ui.cc:2602 msgid "New ^Debtags Browser" msgstr "新建 Debtags 浏览器(^D)" -#: src/ui.cc:2598 +#: src/ui.cc:2604 msgid "Browse packages using Debtags data" msgstr "用 Debtags 的信息来浏览软件包" -#: src/ui.cc:2601 +#: src/ui.cc:2607 msgid "New Categorical ^Browser" msgstr "新建分类浏览器(^B)" -#: src/ui.cc:2603 +#: src/ui.cc:2609 msgid "Browse packages by category" msgstr "分类浏览软件包" -#: src/ui.cc:2611 +#: src/ui.cc:2617 msgid "^About" msgstr "关于(^A)" -#: src/ui.cc:2612 +#: src/ui.cc:2618 msgid "View information about this program" msgstr "查看关于此程序的信息" -#: src/ui.cc:2615 +#: src/ui.cc:2621 msgid "^Help" msgstr "帮助(^H)" -#: src/ui.cc:2616 +#: src/ui.cc:2622 msgid "View the on-line help" msgstr "查看在线帮助" -#: src/ui.cc:2618 +#: src/ui.cc:2624 msgid "User's ^Manual" msgstr "用户手册(^M)" -#: src/ui.cc:2619 +#: src/ui.cc:2625 msgid "View the detailed program manual" msgstr "查看详细的程序使用手册" -#: src/ui.cc:2622 +#: src/ui.cc:2628 msgid "^FAQ" msgstr "常见问题回答(^F)" -#: src/ui.cc:2626 +#: src/ui.cc:2632 msgid "^News" msgstr "新闻(^N)" -#: src/ui.cc:2627 +#: src/ui.cc:2633 msgid "View the important changes made in each version of " msgstr "查看其每一版本中所做的重大修改： " -#: src/ui.cc:2630 +#: src/ui.cc:2636 msgid "^License" msgstr "许可证(^L)" -#: src/ui.cc:2774 +#: src/ui.cc:2780 msgid "Actions" msgstr "动作" -#: src/ui.cc:2778 +#: src/ui.cc:2784 msgid "Search" msgstr "搜索" -#: src/ui.cc:2779 +#: src/ui.cc:2785 msgid "Options" msgstr "选项" -#: src/ui.cc:2780 +#: src/ui.cc:2786 msgid "Views" msgstr "视图" -#: src/ui.cc:2846 +#: src/ui.cc:2852 #, c-format msgid "" "%ls: Menu %ls: Help %ls: Quit %ls: Update %ls: Download/Install/Remove " "Pkgs" msgstr "%ls：菜单 %ls：帮助 %ls：退出 %ls：更新 %ls：下载/安装/删除软件包" -#: src/ui.cc:3205 +#: src/ui.cc:3211 msgid "yes_key" msgstr "" -#: src/ui.cc:3206 +#: src/ui.cc:3212 msgid "no_key" msgstr "n" diff -Nru language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/apturl.po language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/apturl.po --- language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/apturl.po 2013-01-29 09:37:10.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/apturl.po 2014-01-07 07:01:47.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-01-28 15:15+0000\n" -"X-Generator: Launchpad (build 16451)\n" +"X-Launchpad-Export-Date: 2014-01-06 15:54+0000\n" +"X-Generator: Launchpad (build 16877)\n" #: ../apturl-gtk:49 ../apturl-kde:52 msgid "User requested interrupt." @@ -125,20 +125,20 @@ msgid "Enable additional components" msgstr "使用附加组件" -#: ../AptUrl/UI.py:24 ../AptUrl/gtk/GtkUI.py:83 ../AptUrl/kde/KdeUI.py:80 +#: ../AptUrl/UI.py:24 ../AptUrl/gtk/GtkUI.py:85 ../AptUrl/kde/KdeUI.py:80 msgid "Enable additional software channel" msgstr "启用附加软件频道" -#: ../AptUrl/UI.py:25 ../AptUrl/gtk/GtkUI.py:84 ../AptUrl/kde/KdeUI.py:81 +#: ../AptUrl/UI.py:25 ../AptUrl/gtk/GtkUI.py:86 ../AptUrl/kde/KdeUI.py:81 #, python-format msgid "Do you want to enable the following software channel: '%s'?" msgstr "您想启用“%s”软件频道吗？" -#: ../AptUrl/gtk/GtkUI.py:152 ../AptUrl/kde/KdeUI.py:133 +#: ../AptUrl/gtk/GtkUI.py:154 ../AptUrl/kde/KdeUI.py:133 msgid "Install additional software?" msgstr "安装附加软件？" -#: ../AptUrl/gtk/GtkUI.py:153 ../AptUrl/kde/KdeUI.py:134 +#: ../AptUrl/gtk/GtkUI.py:155 ../AptUrl/kde/KdeUI.py:134 #, python-format msgid "Do you want to install package '%s'?" msgstr "您确定要安装软件包“%s”？" diff -Nru language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/aspell.po language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/aspell.po --- language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/aspell.po 2013-01-29 09:37:02.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/aspell.po 2014-01-07 07:01:14.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-01-28 10:37+0000\n" -"X-Generator: Launchpad (build 16451)\n" +"X-Launchpad-Export-Date: 2014-01-06 10:36+0000\n" +"X-Generator: Launchpad (build 16877)\n" "Language: zh_CN\n" #: common/info.cpp:232 diff -Nru language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/attr.po language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/attr.po --- language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/attr.po 2013-01-29 09:37:14.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/attr.po 2014-01-07 07:01:14.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-01-28 10:37+0000\n" -"X-Generator: Launchpad (build 16451)\n" +"X-Launchpad-Export-Date: 2014-01-06 10:37+0000\n" +"X-Generator: Launchpad (build 16877)\n" #: ../attr/attr.c:46 #, c-format @@ -92,26 +92,26 @@ msgid "At least one of -s, -g, -r, or -l is required\n" msgstr "至少要 -s、-g、-r、-l中的一个\n" -#: ../getfattr/getfattr.c:97 ../setfattr/setfattr.c:70 +#: ../getfattr/getfattr.c:98 ../setfattr/setfattr.c:71 msgid "No such attribute" msgstr "无此属性" -#: ../getfattr/getfattr.c:258 +#: ../getfattr/getfattr.c:259 #, c-format msgid "%s: Removing leading '/' from absolute path names\n" msgstr "%s：删去绝对路径名最前面的'/'\n" -#: ../getfattr/getfattr.c:375 +#: ../getfattr/getfattr.c:377 #, c-format msgid "%s %s -- get extended attributes\n" msgstr "%s %s --获取扩展属性\n" -#: ../getfattr/getfattr.c:377 ../setfattr/setfattr.c:176 +#: ../getfattr/getfattr.c:379 ../setfattr/setfattr.c:177 #, c-format msgid "Usage: %s %s\n" msgstr "用法: %s %s\n" -#: ../getfattr/getfattr.c:380 +#: ../getfattr/getfattr.c:382 #, c-format msgid "" " -n, --name=name get the named extended attribute value\n" @@ -140,12 +140,12 @@ " --version 打印版本并退出\n" " --help 本帮助文本\n" -#: ../getfattr/getfattr.c:476 +#: ../getfattr/getfattr.c:478 #, c-format msgid "%s: invalid regular expression \"%s\"\n" msgstr "%s:无效的正则表达式 \"%s\"\n" -#: ../getfattr/getfattr.c:490 +#: ../getfattr/getfattr.c:492 #, c-format msgid "" "Usage: %s %s\n" @@ -154,27 +154,27 @@ "用法： %s %s\n" "'%s --help'以获取更多信息。\n" -#: ../setfattr/setfattr.c:124 +#: ../setfattr/setfattr.c:125 #, c-format msgid "%s: %s: No filename found in line %d, aborting\n" msgstr "%s: %s:没有在%d 中找到文件名，中止\n" -#: ../setfattr/setfattr.c:128 +#: ../setfattr/setfattr.c:129 #, c-format msgid "%s: No filename found in line %d of standard input, aborting\n" msgstr "%s: 在标准输入的第%d行没有发现文件名，中止\n" -#: ../setfattr/setfattr.c:175 +#: ../setfattr/setfattr.c:176 #, c-format msgid "%s %s -- set extended attributes\n" msgstr "%s %s --设置扩展属性\n" -#: ../setfattr/setfattr.c:177 +#: ../setfattr/setfattr.c:178 #, c-format msgid " %s %s\n" msgstr " %s %s\n" -#: ../setfattr/setfattr.c:179 +#: ../setfattr/setfattr.c:180 #, c-format msgid "" " -n, --name=name set the value of the named extended attribute\n" @@ -193,7 +193,7 @@ " --version 打印版本并退出\n" " --help 本帮助文本\n" -#: ../setfattr/setfattr.c:254 +#: ../setfattr/setfattr.c:255 #, c-format msgid "" "Usage: %s %s\n" diff -Nru language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/avahi.po language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/avahi.po --- language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/avahi.po 2013-01-29 09:36:56.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/avahi.po 2014-01-07 07:01:38.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: zh_CN\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-12-17 15:40+0000\n" -"PO-Revision-Date: 2011-12-17 17:56+0000\n" +"POT-Creation-Date: 2013-12-12 22:04+0000\n" +"PO-Revision-Date: 2013-12-23 20:04+0000\n" "Last-Translator: Launchpad Translations Administrators \n" "Language-Team: 简体中文 \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-01-28 13:50+0000\n" -"X-Generator: Launchpad (build 16451)\n" +"X-Launchpad-Export-Date: 2014-01-06 14:17+0000\n" +"X-Generator: Launchpad (build 16877)\n" "Language: \n" #: ../avahi-common/error.c:30 diff -Nru language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/bacula.po language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/bacula.po --- language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/bacula.po 2013-01-29 09:37:15.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/bacula.po 2014-01-07 07:01:27.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-01-28 12:26+0000\n" -"X-Generator: Launchpad (build 16451)\n" +"X-Launchpad-Export-Date: 2014-01-06 12:43+0000\n" +"X-Generator: Launchpad (build 16877)\n" #: src/dird/jobq.c:74 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/bash.po language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/bash.po --- language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/bash.po 2013-01-29 09:37:14.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/bash.po 2014-01-07 07:01:14.000000000 +0000 @@ -9,14 +9,14 @@ "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-01-28 22:09-0500\n" "PO-Revision-Date: 2011-03-26 18:26+0000\n" -"Last-Translator: Aron Xu \n" +"Last-Translator: Aron Xu \n" "Language-Team: Chinese (simplified) \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-Launchpad-Export-Date: 2013-01-28 10:38+0000\n" -"X-Generator: Launchpad (build 16451)\n" +"X-Launchpad-Export-Date: 2014-01-06 10:37+0000\n" +"X-Generator: Launchpad (build 16877)\n" #: arrayfunc.c:50 msgid "bad array subscript" diff -Nru language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/bfd.po language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/bfd.po --- language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/bfd.po 2013-01-29 09:37:00.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/bfd.po 2014-01-07 07:01:14.000000000 +0000 @@ -13,8 +13,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-01-28 10:39+0000\n" -"X-Generator: Launchpad (build 16451)\n" +"X-Launchpad-Export-Date: 2014-01-06 10:38+0000\n" +"X-Generator: Launchpad (build 16877)\n" #: aout-adobe.c:127 msgid "%B: Unknown section type in a.out.adobe file: %x\n" diff -Nru language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/binutils.po language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/binutils.po --- language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/binutils.po 2013-01-29 09:36:58.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/binutils.po 2014-01-07 07:01:14.000000000 +0000 @@ -13,8 +13,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-01-28 10:39+0000\n" -"X-Generator: Launchpad (build 16451)\n" +"X-Launchpad-Export-Date: 2014-01-06 10:39+0000\n" +"X-Generator: Launchpad (build 16877)\n" #: addr2line.c:81 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/bison-runtime.po language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/bison-runtime.po --- language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/bison-runtime.po 2013-01-29 09:37:17.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/bison-runtime.po 2014-01-07 07:01:15.000000000 +0000 @@ -14,50 +14,50 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-01-28 10:43+0000\n" -"X-Generator: Launchpad (build 16451)\n" +"X-Launchpad-Export-Date: 2014-01-06 10:43+0000\n" +"X-Generator: Launchpad (build 16877)\n" "Language: zh_CN\n" -#: data/glr.c:923 data/yacc.c:727 +#: data/glr.c:770 data/yacc.c:643 msgid "syntax error: cannot back up" msgstr "语法错误：不能备份" -#: data/glr.c:1803 +#: data/glr.c:1654 msgid "syntax is ambiguous" msgstr "语法有歧义" -#: data/glr.c:2094 data/glr.c:2172 data/glr.c:2210 data/glr.c:2480 -#: data/lalr1.cc:941 data/lalr1.cc:961 data/yacc.c:1346 data/yacc.c:1870 -#: data/yacc.c:1876 +#: data/glr.c:1975 data/glr.c:2055 data/glr.c:2095 data/glr.c:2359 +#: data/lalr1.cc:1083 data/lalr1.cc:1103 data/yacc.c:1210 data/yacc.c:1710 +#: data/yacc.c:1716 msgid "syntax error" msgstr "语法错误" -#: data/glr.c:2173 data/lalr1.cc:942 data/yacc.c:1347 +#: data/glr.c:2056 data/lalr1.cc:1084 data/yacc.c:1211 #, c-format msgid "syntax error, unexpected %s" msgstr "语法错误，非预期的 %s" -#: data/glr.c:2174 data/lalr1.cc:943 data/yacc.c:1348 +#: data/glr.c:2057 data/lalr1.cc:1085 data/yacc.c:1212 #, c-format msgid "syntax error, unexpected %s, expecting %s" msgstr "语法错误，非预期的 %s，需要 %s" -#: data/glr.c:2175 data/lalr1.cc:944 data/yacc.c:1349 +#: data/glr.c:2058 data/lalr1.cc:1086 data/yacc.c:1213 #, c-format msgid "syntax error, unexpected %s, expecting %s or %s" msgstr "语法错误，非预期的 %s，需要 %s 或 %s" -#: data/glr.c:2176 data/lalr1.cc:945 data/yacc.c:1350 +#: data/glr.c:2059 data/lalr1.cc:1087 data/yacc.c:1214 #, c-format msgid "syntax error, unexpected %s, expecting %s or %s or %s" msgstr "语法错误，非预期的 %s，需要 %s，%s 或 %s" -#: data/glr.c:2177 data/lalr1.cc:946 data/yacc.c:1351 +#: data/glr.c:2060 data/lalr1.cc:1088 data/yacc.c:1215 #, c-format msgid "syntax error, unexpected %s, expecting %s or %s or %s or %s" msgstr "语法错误，非预期的 %s，需要 %s，%s，%s 或 %s" -#: data/glr.c:2540 data/yacc.c:1434 data/yacc.c:1436 data/yacc.c:1632 -#: data/yacc.c:2025 +#: data/glr.c:2419 data/yacc.c:1295 data/yacc.c:1297 data/yacc.c:1470 +#: data/yacc.c:1867 msgid "memory exhausted" msgstr "内存耗尽" diff -Nru language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/bison.po language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/bison.po --- language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/bison.po 2013-01-29 09:37:08.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/bison.po 2014-01-07 07:01:15.000000000 +0000 @@ -15,15 +15,14 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2013-01-28 10:43+0000\n" -"X-Generator: Launchpad (build 16451)\n" +"X-Launchpad-Export-Date: 2014-01-06 10:43+0000\n" +"X-Generator: Launchpad (build 16877)\n" -#: src/complain.c:115 src/complain.c:126 src/complain.c:135 src/complain.c:183 -#: src/complain.c:193 +#: src/complain.c:324 msgid "warning" msgstr "警告" -#: src/complain.c:203 src/complain.c:210 +#: src/complain.c:322 msgid "fatal error" msgstr "致命错误" @@ -42,30 +41,30 @@ msgid " Conflict between rule %d and token %s resolved as an error" msgstr "" -#: src/conflicts.c:492 +#: src/conflicts.c:533 #, c-format msgid "conflicts: %d shift/reduce, %d reduce/reduce\n" msgstr "" -#: src/conflicts.c:495 +#: src/conflicts.c:536 #, c-format msgid "conflicts: %d shift/reduce\n" msgstr "" -#: src/conflicts.c:497 +#: src/conflicts.c:538 #, c-format msgid "conflicts: %d reduce/reduce\n" msgstr "" -#: src/conflicts.c:515 +#: src/conflicts.c:530 #, c-format msgid "State %d " msgstr "状态 %d " -#: src/conflicts.c:582 +#: src/conflicts.c:569 #, c-format msgid "%%expect-rr applies only to GLR parsers" -msgstr "" +msgstr "%%expect-rr 只应用于 GLR 解析器" #: src/conflicts.c:616 #, c-format @@ -91,32 +90,32 @@ msgid "I/O error" msgstr "I/O 错误" -#: src/files.c:131 +#: src/files.c:142 #, c-format msgid "cannot close file" msgstr "无法关闭文件" -#: src/files.c:350 +#: src/files.c:372 #, c-format msgid "refusing to overwrite the input file %s" -msgstr "" +msgstr "拒绝覆盖输入文件 %s" -#: src/files.c:360 +#: src/files.c:382 #, c-format msgid "conflicting outputs to file %s" -msgstr "到文件%s的输出冲突" +msgstr "到文件 %s 的输出冲突" #: src/getargs.c:271 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "尝试 “%s --help” 命令获取更多信息。\n" -#: src/getargs.c:280 +#: src/getargs.c:261 #, c-format msgid "Usage: %s [OPTION]... FILE\n" msgstr "用法：%s [选项]... 文件\n" -#: src/getargs.c:281 +#: src/getargs.c:262 msgid "" "Generate a deterministic LR or generalized LR (GLR) parser employing\n" "LALR(1), IELR(1), or canonical LR(1) parser tables. IELR(1) and\n" @@ -124,14 +123,14 @@ "\n" msgstr "" -#: src/getargs.c:288 +#: src/getargs.c:269 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" -msgstr "" +msgstr "长选项的强制参数对短选项也是强制的。\n" -#: src/getargs.c:291 +#: src/getargs.c:272 msgid "The same is true for optional arguments.\n" -msgstr "" +msgstr "可选项也是如此。\n" #: src/getargs.c:295 msgid "" @@ -216,21 +215,21 @@ "\n" "请向 <%s> 报告错误。\n" -#: src/getargs.c:379 +#: src/getargs.c:391 #, c-format msgid "bison (GNU Bison) %s" msgstr "bison (GNU Bison) %s" -#: src/getargs.c:381 +#: src/getargs.c:393 msgid "Written by Robert Corbett and Richard Stallman.\n" msgstr "由 Robert Corbett 和 Richard Stallman 编写。\n" -#: src/getargs.c:385 +#: src/getargs.c:397 #, c-format msgid "Copyright (C) %d Free Software Foundation, Inc.\n" -msgstr "版权所有 (C) %d 自由软件基金会。\n" +msgstr "版权所有 (C) %d Free Software Foundation, Inc.\n" -#: src/getargs.c:388 +#: src/getargs.c:400 msgid "" "This is free software; see the source for copying conditions. There is NO\n" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" @@ -238,7 +237,7 @@ "本程序是自由软件；请参看源代码的版权声明。本软件不提供任何担保；\n" "包括没有适销性和某一专用目的下的适用性担保。\n" -#: src/getargs.c:409 +#: src/getargs.c:422 #, c-format msgid "multiple skeleton declarations are invalid" msgstr "" @@ -248,9 +247,9 @@ msgid "invalid language `%s'" msgstr "无效语言 `%s'" -#: src/getargs.c:430 +#: src/getargs.c:443 msgid "multiple language declarations are invalid" -msgstr "" +msgstr "多语言声明是无效的" #: src/getargs.c:682 #, c-format @@ -266,11 +265,11 @@ msgid "empty" msgstr "空" -#: src/gram.c:203 +#: src/gram.c:185 msgid "Grammar" msgstr "语法" -#: src/graphviz.c:43 +#: src/graphviz.c:45 #, c-format msgid "" "// Generated by %s.\n" @@ -278,8 +277,12 @@ "// Home page: <%s>.\n" "\n" msgstr "" +"// 由 %s 生成。\n" +"// 向 <%s> 报告问题。\n" +"// 主页：<%s>。\n" +"\n" -#: src/location.c:93 src/scan-gram.l:855 +#: src/location.c:93 src/scan-gram.l:926 #, c-format msgid "line number overflow" msgstr "行号溢出" @@ -289,31 +292,31 @@ msgid "column number overflow" msgstr "列号溢出" -#: src/main.c:134 +#: src/main.c:146 msgid "rule useless in parser due to conflicts" -msgstr "" +msgstr "由于冲突，解析器中的规则不起作用" #: src/muscle-tab.c:428 #, c-format msgid "%%define variable `%s' redefined" msgstr "" -#: src/muscle-tab.c:431 +#: src/muscle-tab.c:518 #, c-format msgid "previous definition" -msgstr "" +msgstr "上次定义" #: src/muscle-tab.c:470 #, c-format msgid "" "undefined %%define variable `%s' passed to muscle_percent_define_get_loc" -msgstr "" +msgstr "将未定义的 %%define 变量“%s” 传递给了 muscle_percent_define_get_loc" #: src/muscle-tab.c:484 #, c-format msgid "" "undefined %%define variable `%s' passed to muscle_percent_define_get_syncline" -msgstr "" +msgstr "将未定义的 %%define 变量“%s”传递给了 muscle_percent_define_get_syncline" #: src/muscle-tab.c:530 #, c-format @@ -324,7 +327,7 @@ #, c-format msgid "" "undefined %%define variable `%s' passed to muscle_percent_define_flag_if" -msgstr "" +msgstr "将未定义的 %%define 变量 “%s” 传递给了 muscle_percent_define_flag_if" #: src/muscle-tab.c:588 #, c-format @@ -340,43 +343,43 @@ #, c-format msgid "" "undefined %%define variable `%s' passed to muscle_percent_define_check_values" -msgstr "" +msgstr "将未定义的 %%define 变量 “%s” 传递给了 muscle_percent_define_check_values" -#: src/parse-gram.y:733 +#: src/parse-gram.y:809 #, c-format msgid "missing identifier in parameter declaration" -msgstr "" +msgstr "参数声明中缺少识别符" -#: src/print.c:48 +#: src/print.c:47 #, c-format msgid " type %d is %s\n" -msgstr " 类型 %d 是 %s\n" +msgstr " 类型 %d 为 %s\n" -#: src/print.c:165 +#: src/print.c:167 #, c-format msgid "shift, and go to state %d\n" msgstr "" -#: src/print.c:167 +#: src/print.c:169 #, c-format msgid "go to state %d\n" -msgstr "转到状态%d\n" +msgstr "转到状态 %d\n" -#: src/print.c:204 +#: src/print.c:206 msgid "error (nonassociative)\n" msgstr "" -#: src/print.c:227 +#: src/print.c:229 #, c-format msgid "reduce using rule %d (%s)" msgstr "" -#: src/print.c:229 +#: src/print.c:231 #, c-format msgid "accept" msgstr "接受" -#: src/print.c:265 src/print.c:339 +#: src/print.c:267 src/print.c:341 msgid "$default" msgstr "$default" @@ -385,106 +388,106 @@ msgid "state %d" msgstr "状态 %d" -#: src/print.c:410 +#: src/print.c:412 msgid "Terminals, with rules where they appear" msgstr "" -#: src/print.c:437 +#: src/print.c:439 msgid "Nonterminals, with rules where they appear" msgstr "" -#: src/print.c:466 +#: src/print.c:468 #, c-format msgid " on left:" msgstr " 左：" -#: src/print.c:483 +#: src/print.c:485 #, c-format msgid " on right:" msgstr " 右：" -#: src/print.c:511 +#: src/print.c:513 msgid "Rules useless in parser due to conflicts" -msgstr "" +msgstr "由于冲突，解析器中的规则不起作用" -#: src/reader.c:63 +#: src/reader.c:62 #, c-format msgid "multiple %s declarations" -msgstr "" +msgstr "多次 %s 定义" #: src/reader.c:133 #, c-format msgid "result type clash on merge function `%s': <%s> != <%s>" msgstr "" -#: src/reader.c:136 src/symtab.c:155 src/symtab.c:163 src/symtab.c:930 -#: src/symtab.c:943 src/symtab.c:956 src/symtab.c:969 +#: src/complain.c:402 src/reader.c:140 src/symtab.c:217 src/symtab.c:229 #, c-format msgid "previous declaration" -msgstr "先前的声明" +msgstr "上次声明" -#: src/reader.c:202 +#: src/reader.c:206 #, c-format msgid "duplicated symbol name for %s ignored" msgstr "" -#: src/reader.c:246 +#: src/reader.c:250 #, c-format msgid "rule given for %s, which is a token" msgstr "" -#: src/reader.c:301 +#: src/reader.c:306 #, c-format msgid "type clash on default action: <%s> != <%s>" msgstr "" -#: src/reader.c:307 +#: src/reader.c:312 #, c-format msgid "empty rule for typed nonterminal, and no action" msgstr "" -#: src/reader.c:325 +#: src/reader.c:329 #, c-format msgid "unused value: $%d" -msgstr "unused value: $%d" +msgstr "未使用的值：$%d" -#: src/reader.c:327 +#: src/reader.c:331 +#, c-format msgid "unset value: $$" -msgstr "未设置值 : $$" +msgstr "未设置的值：$$" -#: src/reader.c:338 +#: src/reader.c:355 #, c-format msgid "token for %%prec is not defined: %s" msgstr "" -#: src/reader.c:428 src/reader.c:442 src/reader.c:455 +#: src/complain.c:400 #, c-format msgid "only one %s allowed per rule" msgstr "" -#: src/reader.c:438 src/reader.c:453 +#: src/reader.c:473 src/reader.c:495 #, c-format msgid "%s affects only GLR parsers" -msgstr "" +msgstr "%s 只影响 GLR 解析器" -#: src/reader.c:440 +#: src/reader.c:476 #, c-format msgid "%s must be followed by positive number" -msgstr "%s 后必须跟正数" +msgstr "%s 后面只能跟正数" -#: src/reader.c:551 +#: src/reader.c:602 #, c-format msgid "rule is too long" -msgstr "规则太长" +msgstr "规则过长" -#: src/reader.c:669 +#: src/reader.c:718 #, c-format msgid "no rules in the input grammar" -msgstr "输入中没有语法" +msgstr "输入语法中没有规则" -#: src/reduce.c:242 +#: src/reduce.c:241 msgid "rule useless in grammar" -msgstr "" +msgstr "语法中的规则无效" #: src/reduce.c:303 #, c-format @@ -501,7 +504,7 @@ #: src/reduce.c:373 msgid "Rules useless in grammar" -msgstr "" +msgstr "语法中的规则无效" #: src/reduce.c:386 #, c-format @@ -545,69 +548,69 @@ #: src/scan-code.l:253 #, c-format msgid "use of YYFAIL, which is deprecated and will be removed" -msgstr "" +msgstr "使用了 YYFAIL，它已经废弃并将被移除" -#: src/scan-code.l:438 src/scan-code.l:441 +#: src/scan-code.l:339 #, c-format msgid "refers to: %c%s at %s" msgstr "" -#: src/scan-code.l:457 +#: src/scan-code.l:362 #, c-format msgid "possibly meant: %c" -msgstr "" +msgstr "可能指：%c" -#: src/scan-code.l:466 +#: src/scan-code.l:371 #, c-format msgid ", hiding %c" msgstr "" -#: src/scan-code.l:474 +#: src/scan-code.l:379 #, c-format msgid " at %s" -msgstr "" +msgstr " 位于 %s" -#: src/scan-code.l:479 +#: src/scan-code.l:383 #, c-format msgid ", cannot be accessed from mid-rule action at $%d" msgstr "" -#: src/scan-code.l:531 src/scan-gram.l:777 +#: src/scan-code.l:440 src/scan-gram.l:849 #, c-format msgid "integer out of range: %s" -msgstr "整型数据超出范围: %s" +msgstr "整数超出范围：%s" -#: src/scan-code.l:620 +#: src/scan-code.l:530 #, c-format msgid "invalid reference: %s" -msgstr "" +msgstr "无效引用：%s" #: src/scan-code.l:629 #, c-format msgid "syntax error after `%c', expecting integer, letter, `_', `[', or `$'" msgstr "" -#: src/scan-code.l:636 +#: src/scan-code.l:544 #, c-format msgid "symbol not found in production before $%d: %.*s" msgstr "" -#: src/scan-code.l:643 +#: src/scan-code.l:549 #, c-format msgid "symbol not found in production: %.*s" msgstr "" -#: src/scan-code.l:658 +#: src/scan-code.l:564 #, c-format msgid "misleading reference: %s" msgstr "" -#: src/scan-code.l:673 +#: src/scan-code.l:580 #, c-format msgid "ambiguous reference: %s" msgstr "" -#: src/scan-code.l:732 +#: src/scan-code.l:616 #, c-format msgid "explicit type given in untyped grammar" msgstr "" @@ -632,57 +635,57 @@ msgid "stray `,' treated as white space" msgstr "" -#: src/scan-gram.l:222 +#: src/scan-gram.l:270 #, c-format msgid "invalid directive: %s" msgstr "" -#: src/scan-gram.l:250 +#: src/scan-gram.l:296 #, c-format msgid "invalid identifier: %s" -msgstr "" +msgstr "无效标识符：%s" #: src/scan-gram.l:294 #, c-format msgid "invalid character: %s" msgstr "无效字符: %s" -#: src/scan-gram.l:352 +#: src/scan-gram.l:419 #, c-format msgid "unexpected identifier in bracketed name: %s" msgstr "" -#: src/scan-gram.l:374 +#: src/scan-gram.l:441 #, c-format msgid "an identifier expected" -msgstr "" +msgstr "应有一个标识符" #: src/scan-gram.l:377 #, c-format msgid "invalid character in bracketed name: %s" msgstr "" -#: src/scan-gram.l:475 src/scan-gram.l:496 +#: src/scan-gram.l:538 #, c-format msgid "empty character literal" msgstr "" -#: src/scan-gram.l:480 src/scan-gram.l:501 +#: src/scan-gram.l:544 #, c-format msgid "extra characters in character literal" msgstr "" -#: src/scan-gram.l:512 +#: src/scan-gram.l:366 #, c-format msgid "invalid null character" msgstr "无效的空字符" -#: src/scan-gram.l:525 src/scan-gram.l:535 src/scan-gram.l:555 +#: src/scan-gram.l:590 src/scan-gram.l:600 src/scan-gram.l:620 #, c-format msgid "invalid number after \\-escape: %s" msgstr "" -#: src/scan-gram.l:567 +#: src/scan-gram.l:632 #, c-format msgid "invalid character after \\-escape: %s" msgstr "" @@ -697,62 +700,62 @@ msgid "missing `%s' at end of line" msgstr "在文件结尾缺少`%s'" -#: src/scan-skel.l:145 +#: src/scan-skel.l:139 #, c-format msgid "unclosed %s directive in skeleton" msgstr "" -#: src/scan-skel.l:290 +#: src/scan-skel.l:256 #, c-format msgid "too few arguments for %s directive in skeleton" msgstr "" -#: src/scan-skel.l:297 +#: src/scan-skel.l:263 #, c-format msgid "too many arguments for %s directive in skeleton" msgstr "" -#: src/symlist.c:211 +#: src/symlist.c:204 #, c-format msgid "invalid $ value: $%d" -msgstr "无效 $ 值: $%d" +msgstr "无效的 $ 值：$%d" -#: src/symtab.c:72 +#: src/symtab.c:75 #, c-format msgid "POSIX Yacc forbids dashes in symbol names: %s" -msgstr "" +msgstr "POSIX Yacc 禁止符号名中有破折号：%s" -#: src/symtab.c:92 +#: src/symtab.c:97 #, c-format msgid "too many symbols in input grammar (limit is %d)" -msgstr "" +msgstr "输入语法中的符号过多(限制为 %d)" -#: src/symtab.c:154 +#: src/symtab.c:214 #, c-format msgid "%s redeclaration for %s" msgstr "" -#: src/symtab.c:162 +#: src/symtab.c:226 #, c-format msgid "%s redeclaration for <%s>" msgstr "" -#: src/symtab.c:329 +#: src/symtab.c:355 #, c-format msgid "symbol %s redefined" -msgstr "" +msgstr "符号 %s 重复定义" -#: src/symtab.c:343 +#: src/symtab.c:370 #, c-format msgid "symbol %s redeclared" -msgstr "" +msgstr "符号 %s 重复声明" -#: src/symtab.c:364 +#: src/symtab.c:392 #, c-format msgid "redefining user token number of %s" msgstr "" -#: src/symtab.c:392 +#: src/symtab.c:422 #, c-format msgid "symbol %s is used, but is not defined as a token and has no rules" msgstr "" @@ -767,22 +770,22 @@ msgid "symbol `%s' given more than one literal string" msgstr "" -#: src/symtab.c:531 +#: src/symtab.c:602 #, c-format msgid "user token number %d redeclaration for %s" msgstr "" -#: src/symtab.c:533 +#: src/symtab.c:606 #, c-format msgid "previous declaration for %s" msgstr "" -#: src/symtab.c:909 +#: src/symtab.c:987 #, c-format msgid "the start symbol %s is undefined" -msgstr "" +msgstr "起始符号 %s 未定义" -#: src/symtab.c:913 +#: src/symtab.c:991 #, c-format msgid "the start symbol %s is a token" msgstr "" @@ -810,7 +813,7 @@ #: lib/argmatch.c:133 #, c-format msgid "invalid argument %s for %s" -msgstr "" +msgstr "%2$s 的参数 %1$s 无效" #: lib/argmatch.c:134 #, c-format @@ -818,9 +821,8 @@ msgstr "" #: lib/argmatch.c:153 -#, c-format msgid "Valid arguments are:" -msgstr "" +msgstr "有效参数为：" #: lib/bitset_stats.c:177 #, c-format @@ -857,7 +859,7 @@ #: lib/bitset_stats.c:198 msgid "density histogram\n" -msgstr "" +msgstr "密度直方图\n" #: lib/bitset_stats.c:212 #, c-format @@ -869,7 +871,7 @@ #: lib/bitset_stats.c:215 #, c-format msgid "Accumulated runs = %u\n" -msgstr "" +msgstr "累计运行 = %u\n" #: lib/bitset_stats.c:259 lib/bitset_stats.c:264 msgid "Could not read stats file." @@ -888,139 +890,143 @@ msgid "Could not open stats file for writing." msgstr "" -#: lib/error.c:181 +#: lib/error.c:188 msgid "Unknown system error" -msgstr "" +msgstr "未知系统错误" #: lib/getopt.c:527 lib/getopt.c:543 #, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "" -#: lib/getopt.c:576 lib/getopt.c:580 +#: lib/getopt.c:624 lib/getopt.c:628 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "" +msgstr "%s：“--%s”选项不允许有参数\n" -#: lib/getopt.c:589 lib/getopt.c:594 +#: lib/getopt.c:637 lib/getopt.c:642 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" -msgstr "" +msgstr "%s：“%c%s”选项不允许有参数\n" -#: lib/getopt.c:637 lib/getopt.c:656 +#: lib/getopt.c:685 lib/getopt.c:704 #, c-format msgid "%s: option '--%s' requires an argument\n" -msgstr "" +msgstr "%s：“--%s”选项需要一个参数\n" -#: lib/getopt.c:694 lib/getopt.c:697 +#: lib/getopt.c:742 lib/getopt.c:745 #, c-format msgid "%s: unrecognized option '--%s'\n" -msgstr "" +msgstr "%s：无法识别的选项“--%s”\n" -#: lib/getopt.c:705 lib/getopt.c:708 +#: lib/getopt.c:753 lib/getopt.c:756 #, c-format msgid "%s: unrecognized option '%c%s'\n" -msgstr "" +msgstr "%s：无法识别的选项“%c%s”\n" -#: lib/getopt.c:757 lib/getopt.c:760 +#: lib/getopt.c:805 lib/getopt.c:808 #, c-format msgid "%s: invalid option -- '%c'\n" -msgstr "" +msgstr "%s：无效选项 -- “%c”\n" -#: lib/getopt.c:810 lib/getopt.c:827 lib/getopt.c:1035 lib/getopt.c:1053 +#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 #, c-format msgid "%s: option requires an argument -- '%c'\n" -msgstr "" +msgstr "%s：选项需要一个参数 -- “%c”\n" -#: lib/getopt.c:883 lib/getopt.c:899 +#: lib/getopt.c:934 lib/getopt.c:950 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "" -#: lib/getopt.c:923 lib/getopt.c:941 +#: lib/getopt.c:974 lib/getopt.c:992 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "" +msgstr "%s：“-W %s”选项不允许有参数\n" -#: lib/getopt.c:962 lib/getopt.c:980 +#: lib/getopt.c:1013 lib/getopt.c:1031 #, c-format msgid "%s: option '-W %s' requires an argument\n" -msgstr "" +msgstr "%s：“-W %s”选项需要一个参数\n" -#: lib/obstack.c:421 lib/obstack.c:423 lib/xalloc-die.c:34 +#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 msgid "memory exhausted" -msgstr "" +msgstr "内存耗尽" -#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262 -#: lib/spawn-pipe.c:265 +#: lib/spawn-pipe.c:140 lib/spawn-pipe.c:143 lib/spawn-pipe.c:264 +#: lib/spawn-pipe.c:267 #, c-format msgid "cannot create pipe" -msgstr "" +msgstr "无法创建管道" -#: lib/spawn-pipe.c:232 lib/spawn-pipe.c:346 lib/wait-process.c:282 +#: lib/spawn-pipe.c:234 lib/spawn-pipe.c:348 lib/wait-process.c:282 #: lib/wait-process.c:356 #, c-format msgid "%s subprocess failed" -msgstr "" +msgstr "%s 子进程失败" #. TRANSLATORS: #. Get translations for open and closing quotation marks. -#. #. The message catalog should translate "`" to a left #. quotation mark suitable for the locale, and similarly for -#. "'". If the catalog has no translation, -#. locale_quoting_style quotes `like this', and -#. clocale_quoting_style quotes "like this". +#. "'". For example, a French Unicode local should translate +#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), respectively. #. -#. For example, an American English Unicode locale should -#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and -#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION -#. MARK). A British English Unicode locale should instead -#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) -#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively. +#. If the catalog has no translation, we will try to +#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and +#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK). If the +#. current locale is not Unicode, locale_quoting_style +#. will quote 'like this', and clocale_quoting_style will +#. quote "like this". You should always include translations +#. for "`" and "'" even if U+2018 and U+2019 are appropriate +#. for your locale. #. #. If you don't know what to put here, please see -#. +#. #. and use glyphs suitable for your language. -#: lib/quotearg.c:271 +#: lib/quotearg.c:312 msgid "`" -msgstr "" +msgstr "“" -#: lib/quotearg.c:272 +#: lib/quotearg.c:313 msgid "'" -msgstr "" +msgstr "”" #: lib/timevar.c:475 msgid "" "\n" "Execution times (seconds)\n" msgstr "" +"\n" +"执行时间(秒)\n" #: lib/timevar.c:525 msgid " TOTAL :" -msgstr "" +msgstr " 总计 ：" #: lib/timevar.c:561 #, c-format msgid "time in %s: %ld.%06ld (%ld%%)\n" msgstr "" -#: lib/w32spawn.h:40 +#: lib/w32spawn.h:43 #, c-format msgid "_open_osfhandle failed" -msgstr "" +msgstr "_open_osfhandle 失败" -#: lib/w32spawn.h:81 +#: lib/w32spawn.h:84 #, c-format msgid "cannot restore fd %d: dup2 failed" -msgstr "" +msgstr "无法恢复文件描述符 %d：dup2 失败" #: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317 #, c-format msgid "%s subprocess" -msgstr "" +msgstr "%s 子进程" #: lib/wait-process.c:274 lib/wait-process.c:346 #, c-format msgid "%s subprocess got fatal signal %d" -msgstr "" +msgstr "%s 子进程收到致命信号 %d" diff -Nru language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/byobu.po language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/byobu.po --- language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/byobu.po 2013-01-29 09:37:05.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/byobu.po 2014-01-07 07:01:52.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-01-28 15:56+0000\n" -"X-Generator: Launchpad (build 16451)\n" +"X-Launchpad-Export-Date: 2014-01-06 16:44+0000\n" +"X-Generator: Launchpad (build 16877)\n" #: bin/menu:34 byobu-config:129 byobu-config:401 byobu-config:409 msgid "Menu" diff -Nru language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/bzr.po language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/bzr.po --- language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/bzr.po 2013-01-29 09:36:58.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/bzr.po 2014-01-07 07:02:11.000000000 +0000 @@ -15,47 +15,47 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2013-01-28 19:34+0000\n" -"X-Generator: Launchpad (build 16451)\n" +"X-Launchpad-Export-Date: 2014-01-06 21:03+0000\n" +"X-Generator: Launchpad (build 16877)\n" #: bzrlib/add.py:93 msgid "skipping {0} (larger than {1} of {2} bytes)" msgstr "" -#: bzrlib/branch.py:854 +#: bzrlib/branch.py:872 msgid "Unstacking" msgstr "" -#: bzrlib/branch.py:2955 +#: bzrlib/branch.py:3012 #, python-format msgid "Pushed up to revision %d." msgstr "" -#: bzrlib/branch.py:2957 +#: bzrlib/branch.py:3014 #, python-format msgid "%d tag updated." msgid_plural "%d tags updated." msgstr[0] "" msgstr[1] "" -#: bzrlib/branch.py:2960 +#: bzrlib/branch.py:3017 msgid "No new revisions or tags to push." msgstr "" -#: bzrlib/branch.py:2962 +#: bzrlib/branch.py:3019 msgid "No new revisions to push." msgstr "没有新的修改可以上传。" -#: bzrlib/branch.py:2982 +#: bzrlib/branch.py:3039 msgid "checked branch {0} format {1}" msgstr "" -#: bzrlib/branch.py:2985 +#: bzrlib/branch.py:3042 #, python-format msgid "found error:%s" msgstr "" -#: bzrlib/builtins.py:251 bzrlib/builtins.py:3045 bzrlib/workingtree.py:323 +#: bzrlib/builtins.py:251 bzrlib/builtins.py:3043 bzrlib/workingtree.py:324 #, python-format msgid "Ignoring files outside view. View is %s" msgstr "" @@ -184,11 +184,11 @@ msgid "bzr status --revision takes exactly one or two revision specifiers" msgstr "" -#: bzrlib/builtins.py:441 bzrlib/builtins.py:5230 +#: bzrlib/builtins.py:441 bzrlib/builtins.py:5229 msgid "You can only supply one of revision_id or --revision" msgstr "" -#: bzrlib/builtins.py:444 bzrlib/builtins.py:5232 +#: bzrlib/builtins.py:444 bzrlib/builtins.py:5231 msgid "You must supply either --revision or a revision_id" msgstr "" @@ -264,7 +264,7 @@ msgid "--tree and --revision can not be used together" msgstr "" -#: bzrlib/builtins.py:688 bzrlib/builtins.py:5986 +#: bzrlib/builtins.py:5985 msgid "Tags can only be placed on a single revision, not on a range" msgstr "" @@ -511,56 +511,56 @@ msgid "Need working tree for --show-base." msgstr "" -#: bzrlib/builtins.py:1205 +#: bzrlib/builtins.py:1204 msgid "No pull location known or specified." msgstr "" -#: bzrlib/builtins.py:1211 +#: bzrlib/builtins.py:1210 #, python-format msgid "Using saved parent location: %s\n" msgstr "" -#: bzrlib/builtins.py:1218 bzrlib/builtins.py:4425 +#: bzrlib/builtins.py:1217 bzrlib/builtins.py:4423 msgid "Cannot use -r with merge directives or bundles" msgstr "" -#: bzrlib/builtins.py:1261 +#: bzrlib/builtins.py:1260 msgid "Update a mirror of this branch." msgstr "" -#: bzrlib/builtins.py:1263 +#: bzrlib/builtins.py:1262 msgid "" "The target branch will not have its working tree populated because this\n" "is both expensive, and is not supported on remote file systems." msgstr "" -#: bzrlib/builtins.py:1266 +#: bzrlib/builtins.py:1265 msgid "" "Some smart servers or protocols *may* put the working tree in place in\n" "the future." msgstr "" -#: bzrlib/builtins.py:1269 +#: bzrlib/builtins.py:1268 msgid "" "This command only works on branches that have not diverged. Branches are\n" "considered diverged if the destination branch's most recent commit is one\n" "that has not been merged (directly or indirectly) by the source branch." msgstr "" -#: bzrlib/builtins.py:1273 +#: bzrlib/builtins.py:1272 msgid "" "If branches have diverged, you can use 'bzr push --overwrite' to replace\n" "the other branch completely, discarding its unmerged changes." msgstr "" -#: bzrlib/builtins.py:1276 +#: bzrlib/builtins.py:1275 msgid "" "If you want to ensure you have the different changes in the other branch,\n" "do a merge (see bzr help merge) from the other branch, and commit that.\n" "After that you will be able to do a push without '--overwrite'." msgstr "" -#: bzrlib/builtins.py:1280 +#: bzrlib/builtins.py:1279 msgid "" "If there is no default push location set, the first push will set it (use\n" "--no-remember to avoid setting it). After that, you can omit the\n" @@ -568,72 +568,72 @@ "value will only be saved if the remote location can be accessed." msgstr "" -#: bzrlib/builtins.py:1285 +#: bzrlib/builtins.py:1284 msgid "" "The --verbose option will display the revisions pushed using the log_format\n" "configuration option. You can use a different format by overriding it with\n" "-Olog_format=." msgstr "" -#: bzrlib/builtins.py:1296 bzrlib/foreign.py:272 +#: bzrlib/builtins.py:1295 bzrlib/foreign.py:272 msgid "" "Branch to push from, rather than the one containing the working directory." msgstr "" -#: bzrlib/builtins.py:1299 +#: bzrlib/builtins.py:1298 msgid "" "By default push will fail if the target directory exists, but does not " "already have a control directory. This flag will allow push to proceed." msgstr "" -#: bzrlib/builtins.py:1304 +#: bzrlib/builtins.py:1303 msgid "" "Create a stacked branch that references the public location of the parent " "branch." msgstr "" -#: bzrlib/builtins.py:1307 +#: bzrlib/builtins.py:1306 msgid "" "Create a stacked branch that refers to another branch for the commit " "history. Only the work not present in the referenced branch is included in " "the branch created." msgstr "" -#: bzrlib/builtins.py:1312 bzrlib/foreign.py:279 +#: bzrlib/builtins.py:1311 bzrlib/foreign.py:279 msgid "" "Refuse to push if there are uncommitted changes in the working tree, --no-" "strict disables the check." msgstr "" -#: bzrlib/builtins.py:1315 +#: bzrlib/builtins.py:1314 msgid "Don't populate the working tree, even for protocols that support it." msgstr "" -#: bzrlib/builtins.py:1369 +#: bzrlib/builtins.py:1368 msgid "Could not determine branch to refer to." msgstr "" -#: bzrlib/builtins.py:1378 +#: bzrlib/builtins.py:1377 #, python-format msgid "" "No push location known or specified. To push to the parent branch (at %s), " "use 'bzr push :parent'." msgstr "" -#: bzrlib/builtins.py:1384 bzrlib/foreign.py:306 +#: bzrlib/builtins.py:1383 bzrlib/foreign.py:306 msgid "No push location known or specified." msgstr "" -#: bzrlib/builtins.py:1388 +#: bzrlib/builtins.py:1387 #, python-format msgid "Using saved push location: %s" msgstr "" -#: bzrlib/builtins.py:1398 +#: bzrlib/builtins.py:1397 msgid "Create a new branch that is a copy of an existing branch." msgstr "" -#: bzrlib/builtins.py:1400 +#: bzrlib/builtins.py:1399 msgid "" "If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n" "be used. In other words, \"branch ../foo/bar\" will attempt to create " @@ -644,105 +644,105 @@ "create ./foo-bar." msgstr "" -#: bzrlib/builtins.py:1407 +#: bzrlib/builtins.py:1406 msgid "" "To retrieve the branch as of a particular revision, supply the --revision\n" "parameter, as in \"branch foo/bar -r 5\"." msgstr "" -#: bzrlib/builtins.py:1410 +#: bzrlib/builtins.py:1409 msgid "The synonyms 'clone' and 'get' for this command are deprecated." msgstr "" -#: bzrlib/builtins.py:1420 +#: bzrlib/builtins.py:1419 msgid "Create a branch without a working-tree." msgstr "" -#: bzrlib/builtins.py:1422 +#: bzrlib/builtins.py:1421 msgid "Switch the checkout in the current directory to the new branch." msgstr "" -#: bzrlib/builtins.py:1425 +#: bzrlib/builtins.py:1424 msgid "" "Create a stacked branch referring to the source branch. The new branch will " "depend on the availability of the source branch for all operations." msgstr "" -#: bzrlib/builtins.py:1429 +#: bzrlib/builtins.py:1428 msgid "Do not use a shared repository, even if available." msgstr "" -#: bzrlib/builtins.py:1431 +#: bzrlib/builtins.py:1430 msgid "" "By default branch will fail if the target directory exists, but does not " "already have a control directory. This flag will allow branch to proceed." msgstr "" -#: bzrlib/builtins.py:1436 +#: bzrlib/builtins.py:1435 msgid "Bind new branch to from location." msgstr "" -#: bzrlib/builtins.py:1483 +#: bzrlib/builtins.py:1482 #, python-format msgid "Target directory \"%s\" already exists." msgstr "" -#: bzrlib/builtins.py:1495 +#: bzrlib/builtins.py:1494 #, python-format msgid "Parent of \"%s\" does not exist." msgstr "" -#: bzrlib/builtins.py:1514 +#: bzrlib/builtins.py:1513 msgid "The branch {0} has no revision {1}." msgstr "" -#: bzrlib/builtins.py:1529 bzrlib/push.py:53 +#: bzrlib/builtins.py:1528 bzrlib/push.py:53 #, python-format msgid "Created new stacked branch referring to %s." msgstr "" -#: bzrlib/builtins.py:1533 +#: bzrlib/builtins.py:1532 #, python-format msgid "Branched %d revision." msgid_plural "Branched %d revisions." msgstr[0] "" msgstr[1] "" -#: bzrlib/builtins.py:1538 +#: bzrlib/builtins.py:1537 #, python-format msgid "New branch bound to %s" msgstr "" -#: bzrlib/builtins.py:1543 bzrlib/builtins.py:6280 +#: bzrlib/builtins.py:1542 bzrlib/builtins.py:6283 #, python-format msgid "Switched to branch: %s" msgstr "" -#: bzrlib/builtins.py:1548 +#: bzrlib/builtins.py:1547 msgid "List the branches available at the current location." msgstr "" -#: bzrlib/builtins.py:1550 +#: bzrlib/builtins.py:1549 msgid "" "This command will print the names of all the branches at the current\n" "location." msgstr "" -#: bzrlib/builtins.py:1557 +#: bzrlib/builtins.py:1556 msgid "" "Recursively scan for branches rather than just looking in the specified " "location." msgstr "" -#: bzrlib/builtins.py:1586 +#: bzrlib/builtins.py:1585 msgid "(default)" msgstr "" -#: bzrlib/builtins.py:1598 +#: bzrlib/builtins.py:1597 msgid "Create a new checkout of an existing branch." msgstr "" -#: bzrlib/builtins.py:1600 +#: bzrlib/builtins.py:1599 msgid "" "If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree " "for\n" @@ -752,7 +752,7 @@ "location using SFTP." msgstr "" -#: bzrlib/builtins.py:1605 +#: bzrlib/builtins.py:1604 msgid "" "If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION " "will\n" @@ -764,7 +764,7 @@ "create ./foo-bar." msgstr "" -#: bzrlib/builtins.py:1612 +#: bzrlib/builtins.py:1611 msgid "" "To retrieve the branch as of a particular revision, supply the --revision\n" "parameter, as in \"checkout foo/bar -r 5\". Note that this will be " @@ -774,7 +774,7 @@ "code.)" msgstr "" -#: bzrlib/builtins.py:1622 +#: bzrlib/builtins.py:1621 msgid "" "Perform a lightweight checkout. Lightweight checkouts depend on access to " "the branch for every operation. Normal checkouts can perform common " @@ -782,38 +782,38 @@ "commits." msgstr "" -#: bzrlib/builtins.py:1629 +#: bzrlib/builtins.py:1628 msgid "Get file contents from this tree." msgstr "" -#: bzrlib/builtins.py:1631 +#: bzrlib/builtins.py:1630 msgid "Hard-link working tree files where possible." msgstr "" -#: bzrlib/builtins.py:1672 +#: bzrlib/builtins.py:1671 msgid "" "Show list of renamed files.\n" " " msgstr "" -#: bzrlib/builtins.py:1700 +#: bzrlib/builtins.py:1699 msgid "Update a working tree to a new revision." msgstr "" -#: bzrlib/builtins.py:1702 +#: bzrlib/builtins.py:1701 msgid "" "This will perform a merge of the destination revision (the tip of the\n" "branch, or the specified revision) into the working tree, and then make\n" "that revision the basis revision for the working tree. " msgstr "" -#: bzrlib/builtins.py:1706 +#: bzrlib/builtins.py:1705 msgid "" "You can use this to visit an older revision, or to update a working tree\n" "that is out of date from its branch." msgstr "" -#: bzrlib/builtins.py:1709 +#: bzrlib/builtins.py:1708 msgid "" "If there are any uncommitted changes in the tree, they will be carried\n" "across and remain as uncommitted changes after the update. To discard\n" @@ -821,13 +821,13 @@ "with the changes brought in by the change in basis revision." msgstr "" -#: bzrlib/builtins.py:1714 +#: bzrlib/builtins.py:1713 msgid "" "If the tree's branch is bound to a master branch, bzr will also update\n" "the branch from the master." msgstr "" -#: bzrlib/builtins.py:1717 +#: bzrlib/builtins.py:1716 msgid "" "You cannot update just a single file or directory, because each Bazaar\n" "working tree has just a single basis revision. If you want to restore a\n" @@ -837,96 +837,96 @@ "out the old content of that file to a new location." msgstr "" -#: bzrlib/builtins.py:1724 +#: bzrlib/builtins.py:1723 msgid "" "The 'dir' argument, if given, must be the location of the root of a\n" "working tree to update. By default, the working tree that contains the \n" "current working directory is used." msgstr "" -#: bzrlib/builtins.py:1740 +#: bzrlib/builtins.py:1739 msgid "bzr update --revision takes exactly one revision" msgstr "" -#: bzrlib/builtins.py:1748 +#: bzrlib/builtins.py:1747 msgid "bzr update can only update a whole tree, not a file or subdirectory" msgstr "" -#: bzrlib/builtins.py:1779 +#: bzrlib/builtins.py:1778 msgid "Tree is up to date at revision {0} of branch {1}" msgstr "" -#: bzrlib/builtins.py:1795 +#: bzrlib/builtins.py:1794 #, python-format msgid "" "branch has no revision %s\n" "bzr update --revision only works for a revision in the branch history" msgstr "" -#: bzrlib/builtins.py:1801 +#: bzrlib/builtins.py:1800 msgid "Updated to revision {0} of branch {1}" msgstr "" -#: bzrlib/builtins.py:1805 +#: bzrlib/builtins.py:1804 msgid "" "Your local commits will now show as pending merges with 'bzr status', and " "can be committed with 'bzr commit'." msgstr "" -#: bzrlib/builtins.py:1814 +#: bzrlib/builtins.py:1813 msgid "Show information about a working tree, branch or repository." msgstr "" -#: bzrlib/builtins.py:1816 +#: bzrlib/builtins.py:1815 msgid "" "This command will show all known locations and formats associated to the\n" "tree, branch or repository." msgstr "" -#: bzrlib/builtins.py:1819 +#: bzrlib/builtins.py:1818 msgid "" "In verbose mode, statistical information is included with each report.\n" "To see extended statistic information, use a verbosity level of 2 or\n" "higher by specifying the verbose option multiple times, e.g. -vv." msgstr "" -#: bzrlib/builtins.py:1823 +#: bzrlib/builtins.py:1822 msgid "Branches and working trees will also report any missing revisions." msgstr "" -#: bzrlib/builtins.py:1825 bzrlib/builtins.py:3744 bzrlib/builtins.py:4885 -#: bzrlib/builtins.py:6466 +#: bzrlib/builtins.py:1824 bzrlib/builtins.py:3742 bzrlib/builtins.py:4883 +#: bzrlib/builtins.py:6469 msgid ":Examples:" msgstr "" -#: bzrlib/builtins.py:1827 +#: bzrlib/builtins.py:1826 msgid " Display information on the format and related locations:" msgstr "" -#: bzrlib/builtins.py:1829 +#: bzrlib/builtins.py:1828 msgid " bzr info" msgstr "" -#: bzrlib/builtins.py:1831 +#: bzrlib/builtins.py:1830 msgid "" " Display the above together with extended format information and\n" " basic statistics (like the number of files in the working tree and\n" " number of revisions in the branch and repository):" msgstr "" -#: bzrlib/builtins.py:1835 +#: bzrlib/builtins.py:1834 msgid " bzr info -v" msgstr "" -#: bzrlib/builtins.py:1837 +#: bzrlib/builtins.py:1836 msgid " Display the above together with number of committers to the branch:" msgstr "" -#: bzrlib/builtins.py:1839 +#: bzrlib/builtins.py:1838 msgid " bzr info -vv" msgstr "" -#: bzrlib/builtins.py:1858 +#: bzrlib/builtins.py:1857 msgid "Remove files or directories." msgstr "" @@ -939,27 +939,27 @@ "Bazaar but missing in your tree and stop tracking them for you." msgstr "" -#: bzrlib/builtins.py:1868 +#: bzrlib/builtins.py:1867 msgid "Only remove files that have never been committed." msgstr "" -#: bzrlib/builtins.py:1870 +#: bzrlib/builtins.py:1869 msgid "The file deletion mode to be used." msgstr "" -#: bzrlib/builtins.py:1871 +#: bzrlib/builtins.py:1870 msgid "Deletion Strategy" msgstr "" -#: bzrlib/builtins.py:1872 +#: bzrlib/builtins.py:1871 msgid "Backup changed files (default)." msgstr "" -#: bzrlib/builtins.py:1873 +#: bzrlib/builtins.py:1872 msgid "Delete from bzr but leave the working copy." msgstr "" -#: bzrlib/builtins.py:1874 +#: bzrlib/builtins.py:1873 msgid "Don't backup changed files." msgstr "" @@ -973,15 +973,15 @@ msgid "(The --force option is deprecated, rather use --no-backup in future.)" msgstr "" -#: bzrlib/builtins.py:1901 +#: bzrlib/builtins.py:1894 msgid "No matching files." msgstr "" -#: bzrlib/builtins.py:1962 +#: bzrlib/builtins.py:1955 msgid "Reconcile bzr metadata in a branch." msgstr "" -#: bzrlib/builtins.py:1964 +#: bzrlib/builtins.py:1957 msgid "" "This can correct data mismatches that may have been caused by\n" "previous ghost operations or bzr upgrades. You should only\n" @@ -989,7 +989,7 @@ "advises you to run it." msgstr "" -#: bzrlib/builtins.py:1969 +#: bzrlib/builtins.py:1962 msgid "" "If a second branch is provided, cross-branch reconciliation is\n" "also attempted, which will check that data like the tree root\n" @@ -997,44 +997,44 @@ "correctly in both branches." msgstr "" -#: bzrlib/builtins.py:1974 +#: bzrlib/builtins.py:1967 msgid "" "At the same time it is run it may recompress data resulting in\n" "a potential saving in disk space or performance gain." msgstr "" -#: bzrlib/builtins.py:1977 +#: bzrlib/builtins.py:1970 msgid "The branch *MUST* be on a listable system such as local disk or sftp." msgstr "" -#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779 +#: bzrlib/builtins.py:2037 bzrlib/builtins.py:2155 bzrlib/builtins.py:3777 msgid "" "Format for the bzr 2.0 series.\n" "Uses group-compress storage.\n" "Provides rich roots which are a one-way transition.\n" msgstr "" -#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779 +#: bzrlib/builtins.py:2037 bzrlib/builtins.py:2155 bzrlib/builtins.py:3777 msgid "" "Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with " "bzr repositories before 0.92 but cannot be read by bzr < 0.92. " msgstr "" -#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779 +#: bzrlib/builtins.py:2037 bzrlib/builtins.py:2155 bzrlib/builtins.py:3777 msgid "The 2a format with experimental support for colocated branches.\n" msgstr "" -#: bzrlib/builtins.py:2045 +#: bzrlib/builtins.py:2038 msgid "Make a directory into a versioned branch." msgstr "" -#: bzrlib/builtins.py:2047 +#: bzrlib/builtins.py:2040 msgid "" "Use this to create an empty branch, or before importing an\n" "existing project." msgstr "" -#: bzrlib/builtins.py:2050 +#: bzrlib/builtins.py:2043 msgid "" "If there is a repository in a parent directory of the location, then\n" "the history of the branch will be stored in the repository. Otherwise\n" @@ -1042,17 +1042,17 @@ "in the .bzr directory." msgstr "" -#: bzrlib/builtins.py:2055 +#: bzrlib/builtins.py:2048 msgid "" "If there is already a branch at the location but it has no working tree,\n" "the tree can be populated with 'bzr checkout'." msgstr "" -#: bzrlib/builtins.py:2058 +#: bzrlib/builtins.py:2051 msgid "Recipe for importing a tree of files::" msgstr "" -#: bzrlib/builtins.py:2060 +#: bzrlib/builtins.py:2053 msgid "" " cd ~/project\n" " bzr init\n" @@ -1061,50 +1061,50 @@ " bzr commit -m \"imported project\"" msgstr "" -#: bzrlib/builtins.py:2071 +#: bzrlib/builtins.py:2064 msgid "" "Create the path leading up to the branch if it does not already exist." msgstr "" -#: bzrlib/builtins.py:2074 +#: bzrlib/builtins.py:2067 msgid "Specify a format for this branch. See \"help formats\"." msgstr "" -#: bzrlib/builtins.py:2082 +#: bzrlib/builtins.py:2075 msgid "" "Never change revnos or the existing log. Append revisions to it only." msgstr "" -#: bzrlib/builtins.py:2085 +#: bzrlib/builtins.py:2078 msgid "Create a branch without a working tree." msgstr "" -#: bzrlib/builtins.py:2105 bzrlib/push.py:110 +#: bzrlib/builtins.py:2098 bzrlib/push.py:110 #, python-format msgid "" "Parent directory of %s does not exist.\n" "You may supply --create-prefix to create all leading parent directories." msgstr "" -#: bzrlib/builtins.py:2139 +#: bzrlib/builtins.py:2132 msgid "" "This branch format cannot be set to append-revisions-only. Try --default." msgstr "" -#: bzrlib/builtins.py:2150 +#: bzrlib/builtins.py:2143 msgid "Created a {0} (format: {1})\n" msgstr "" -#: bzrlib/builtins.py:2159 +#: bzrlib/builtins.py:2152 #, python-format msgid "Using shared repository: %s\n" msgstr "" -#: bzrlib/builtins.py:2163 +#: bzrlib/builtins.py:2156 msgid "Create a shared repository for branches to share storage space." msgstr "" -#: bzrlib/builtins.py:2165 +#: bzrlib/builtins.py:2158 msgid "" "New branches created under the repository directory will store their\n" "revisions in the repository, not in the branch directory. For branches\n" @@ -1112,7 +1112,7 @@ "speeds up the creation of new branches." msgstr "" -#: bzrlib/builtins.py:2170 +#: bzrlib/builtins.py:2163 msgid "" "If the --no-trees option is given then the branches in the repository\n" "will not have working trees by default. They will still exist as \n" @@ -1122,47 +1122,47 @@ "branches, such as on a server." msgstr "" -#: bzrlib/builtins.py:2177 +#: bzrlib/builtins.py:2170 msgid "" ":Examples:\n" " Create a shared repository holding just branches::" msgstr "" -#: bzrlib/builtins.py:2180 +#: bzrlib/builtins.py:2173 msgid "" " bzr init-repo --no-trees repo\n" " bzr init repo/trunk" msgstr "" -#: bzrlib/builtins.py:2183 +#: bzrlib/builtins.py:2176 msgid " Make a lightweight checkout elsewhere::" msgstr "" -#: bzrlib/builtins.py:2185 +#: bzrlib/builtins.py:2178 msgid "" " bzr checkout --lightweight repo/trunk trunk-checkout\n" " cd trunk-checkout\n" " (add files here)" msgstr "" -#: bzrlib/builtins.py:2193 +#: bzrlib/builtins.py:2186 msgid "" "Specify a format for this repository. See \"bzr help formats\" for details." msgstr "" -#: bzrlib/builtins.py:2197 +#: bzrlib/builtins.py:2190 msgid "Repository format" msgstr "" -#: bzrlib/builtins.py:2199 +#: bzrlib/builtins.py:2192 msgid "Branches in the repository will default to not having a working tree." msgstr "" -#: bzrlib/builtins.py:2225 +#: bzrlib/builtins.py:2218 msgid "Show differences in the working tree, between revisions or branches." msgstr "" -#: bzrlib/builtins.py:2227 +#: bzrlib/builtins.py:2220 msgid "" "If no arguments are given, all changes for the current tree are listed.\n" "If files are given, only the changes in those files are listed.\n" @@ -1172,13 +1172,13 @@ "given." msgstr "" -#: bzrlib/builtins.py:2234 +#: bzrlib/builtins.py:2227 msgid "" "\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n" "produces patches suitable for \"patch -p1\"." msgstr "" -#: bzrlib/builtins.py:2237 +#: bzrlib/builtins.py:2230 msgid "" "Note that when using the -r argument with a range of revisions, the\n" "differences are computed between the two specified revisions. That\n" @@ -1188,7 +1188,7 @@ "in the range." msgstr "" -#: bzrlib/builtins.py:2244 +#: bzrlib/builtins.py:2237 msgid "" ":Exit values:\n" " 1 - changed\n" @@ -1197,113 +1197,113 @@ " 0 - no change" msgstr "" -#: bzrlib/builtins.py:2250 +#: bzrlib/builtins.py:2243 msgid "" ":Examples:\n" " Shows the difference in the working tree versus the last commit::" msgstr "" -#: bzrlib/builtins.py:2253 +#: bzrlib/builtins.py:2246 msgid " bzr diff" msgstr "" -#: bzrlib/builtins.py:2255 +#: bzrlib/builtins.py:2248 msgid " Difference between the working tree and revision 1::" msgstr "" -#: bzrlib/builtins.py:2257 +#: bzrlib/builtins.py:2250 msgid " bzr diff -r1" msgstr "" -#: bzrlib/builtins.py:2259 +#: bzrlib/builtins.py:2252 msgid " Difference between revision 3 and revision 1::" msgstr "" -#: bzrlib/builtins.py:2261 +#: bzrlib/builtins.py:2254 msgid " bzr diff -r1..3" msgstr "" -#: bzrlib/builtins.py:2263 +#: bzrlib/builtins.py:2256 msgid " Difference between revision 3 and revision 1 for branch xxx::" msgstr "" -#: bzrlib/builtins.py:2265 +#: bzrlib/builtins.py:2258 msgid " bzr diff -r1..3 xxx" msgstr "" -#: bzrlib/builtins.py:2267 +#: bzrlib/builtins.py:2260 msgid " The changes introduced by revision 2 (equivalent to -r1..2)::" msgstr "" -#: bzrlib/builtins.py:2269 +#: bzrlib/builtins.py:2262 msgid " bzr diff -c2" msgstr "" -#: bzrlib/builtins.py:2271 +#: bzrlib/builtins.py:2264 msgid "" " To see the changes introduced by revision X::\n" " \n" " bzr diff -cX" msgstr "" -#: bzrlib/builtins.py:2275 +#: bzrlib/builtins.py:2268 msgid "" " Note that in the case of a merge, the -c option shows the changes\n" " compared to the left hand parent. To see the changes against\n" " another parent, use::" msgstr "" -#: bzrlib/builtins.py:2279 +#: bzrlib/builtins.py:2272 msgid " bzr diff -r..X" msgstr "" -#: bzrlib/builtins.py:2281 +#: bzrlib/builtins.py:2274 msgid "" " The changes between the current revision and the previous revision\n" " (equivalent to -c-1 and -r-2..-1)" msgstr "" -#: bzrlib/builtins.py:2284 +#: bzrlib/builtins.py:2277 msgid " bzr diff -r-2.." msgstr "" -#: bzrlib/builtins.py:2286 +#: bzrlib/builtins.py:2279 msgid " Show just the differences for file NEWS::" msgstr "" -#: bzrlib/builtins.py:2288 +#: bzrlib/builtins.py:2281 msgid " bzr diff NEWS" msgstr "" -#: bzrlib/builtins.py:2290 +#: bzrlib/builtins.py:2283 msgid " Show the differences in working tree xxx for file NEWS::" msgstr "" -#: bzrlib/builtins.py:2292 +#: bzrlib/builtins.py:2285 msgid " bzr diff xxx/NEWS" msgstr "" -#: bzrlib/builtins.py:2294 +#: bzrlib/builtins.py:2287 msgid " Show the differences from branch xxx to this working tree:" msgstr "" -#: bzrlib/builtins.py:2296 +#: bzrlib/builtins.py:2289 msgid " bzr diff --old xxx" msgstr "" -#: bzrlib/builtins.py:2298 +#: bzrlib/builtins.py:2291 msgid " Show the differences between two branches for file NEWS::" msgstr "" -#: bzrlib/builtins.py:2300 +#: bzrlib/builtins.py:2293 msgid " bzr diff --old xxx --new yyy NEWS" msgstr "" -#: bzrlib/builtins.py:2302 +#: bzrlib/builtins.py:2295 msgid " Same as 'bzr diff' but prefix paths with old/ and new/::" msgstr "" -#: bzrlib/builtins.py:2304 +#: bzrlib/builtins.py:2297 msgid "" " bzr diff --prefix old/:new/\n" " \n" @@ -1312,78 +1312,78 @@ " bzr diff --using /usr/bin/diff --diff-options -wu" msgstr "" -#: bzrlib/builtins.py:2314 +#: bzrlib/builtins.py:2307 msgid "Pass these options to the external diff program." msgstr "" -#: bzrlib/builtins.py:2317 +#: bzrlib/builtins.py:2310 msgid "" "Set prefixes added to old and new filenames, as two values separated by a " "colon. (eg \"old/:new/\")." msgstr "" -#: bzrlib/builtins.py:2320 +#: bzrlib/builtins.py:2313 msgid "Branch/tree to compare from." msgstr "" -#: bzrlib/builtins.py:2324 +#: bzrlib/builtins.py:2317 msgid "Branch/tree to compare to." msgstr "" -#: bzrlib/builtins.py:2330 +#: bzrlib/builtins.py:2323 msgid "Use this command to compare files." msgstr "" -#: bzrlib/builtins.py:2335 +#: bzrlib/builtins.py:2328 msgid "Diff format to use." msgstr "" -#: bzrlib/builtins.py:2337 +#: bzrlib/builtins.py:2330 msgid "Diff format" msgstr "" -#: bzrlib/builtins.py:2359 +#: bzrlib/builtins.py:2357 msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")" msgstr "" -#: bzrlib/builtins.py:2363 +#: bzrlib/builtins.py:2361 msgid "bzr diff --revision takes exactly one or two revision specifiers" msgstr "" -#: bzrlib/builtins.py:2368 bzrlib/builtins.py:2765 bzrlib/builtins.py:2778 -#: bzrlib/builtins.py:2786 bzrlib/builtins.py:4959 +#: bzrlib/builtins.py:2366 bzrlib/builtins.py:2763 bzrlib/builtins.py:2776 +#: bzrlib/builtins.py:2784 bzrlib/builtins.py:4957 msgid "{0} and {1} are mutually exclusive" msgstr "" -#: bzrlib/builtins.py:2388 +#: bzrlib/builtins.py:2386 msgid "" "List files deleted in the working tree.\n" " " msgstr "" -#: bzrlib/builtins.py:2465 +#: bzrlib/builtins.py:2463 msgid "Show the tree root directory." msgstr "" -#: bzrlib/builtins.py:2467 +#: bzrlib/builtins.py:2465 msgid "" "The root is the nearest enclosing directory with a .bzr control\n" "directory." msgstr "" -#: bzrlib/builtins.py:2482 +#: bzrlib/builtins.py:2480 msgid "The limit argument must be an integer." msgstr "" -#: bzrlib/builtins.py:2490 +#: bzrlib/builtins.py:2488 msgid "The levels argument must be an integer." msgstr "" -#: bzrlib/builtins.py:2495 +#: bzrlib/builtins.py:2493 msgid "Show historical log for a branch or subset of a branch." msgstr "" -#: bzrlib/builtins.py:2497 +#: bzrlib/builtins.py:2495 msgid "" "log is bzr's default tool for exploring the history of a branch.\n" "The branch to use is taken from the first parameter. If no parameters\n" @@ -1391,14 +1391,14 @@ "Here are some simple examples::" msgstr "" -#: bzrlib/builtins.py:2502 +#: bzrlib/builtins.py:2500 msgid "" " bzr log log the current branch\n" " bzr log foo.py log a file in its branch\n" " bzr log http://server/branch log a branch on a server" msgstr "" -#: bzrlib/builtins.py:2506 +#: bzrlib/builtins.py:2504 msgid "" "The filtering, ordering and information shown for each revision can\n" "be controlled as explained below. By default, all revisions are\n" @@ -1408,11 +1408,11 @@ "were merged." msgstr "" -#: bzrlib/builtins.py:2513 +#: bzrlib/builtins.py:2511 msgid ":Output control:" msgstr "" -#: bzrlib/builtins.py:2515 +#: bzrlib/builtins.py:2513 msgid "" " The log format controls how information about each revision is\n" " displayed. The standard log formats are called ``long``, ``short``\n" @@ -1420,13 +1420,13 @@ " for more details on log formats." msgstr "" -#: bzrlib/builtins.py:2520 +#: bzrlib/builtins.py:2518 msgid "" " The following options can be used to control what information is\n" " displayed::" msgstr "" -#: bzrlib/builtins.py:2523 +#: bzrlib/builtins.py:2521 msgid "" " -l N display a maximum of N revisions\n" " -n N display N levels of revisions (0 for all, 1 for collapsed)\n" @@ -1435,25 +1435,25 @@ " --show-ids display revision-ids (and file-ids), not just revnos" msgstr "" -#: bzrlib/builtins.py:2529 +#: bzrlib/builtins.py:2527 msgid "" " Note that the default number of levels to display is a function of the\n" " log format. If the -n option is not used, the standard log formats show\n" " just the top level (mainline)." msgstr "" -#: bzrlib/builtins.py:2533 +#: bzrlib/builtins.py:2531 msgid "" " Status summaries are shown using status flags like A, M, etc. To see\n" " the changes explained using words like ``added`` and ``modified``\n" " instead, use the -vv option." msgstr "" -#: bzrlib/builtins.py:2537 +#: bzrlib/builtins.py:2535 msgid ":Ordering control:" msgstr "" -#: bzrlib/builtins.py:2539 +#: bzrlib/builtins.py:2537 msgid "" " To display revisions from oldest to newest, use the --forward option.\n" " In most cases, using this option will have little impact on the total\n" @@ -1461,17 +1461,17 @@ " display revisions like --reverse does when it can." msgstr "" -#: bzrlib/builtins.py:2544 +#: bzrlib/builtins.py:2542 msgid ":Revision filtering:" msgstr "" -#: bzrlib/builtins.py:2546 +#: bzrlib/builtins.py:2544 msgid "" " The -r option can be used to specify what revision or range of revisions\n" " to filter against. The various forms are shown below::" msgstr "" -#: bzrlib/builtins.py:2549 +#: bzrlib/builtins.py:2547 msgid "" " -rX display revision X\n" " -rX.. display revision X and later\n" @@ -1479,13 +1479,13 @@ " -rX..Y display from X to Y inclusive" msgstr "" -#: bzrlib/builtins.py:2554 +#: bzrlib/builtins.py:2552 msgid "" " See ``bzr help revisionspec`` for details on how to specify X and Y.\n" " Some common examples are given below::" msgstr "" -#: bzrlib/builtins.py:2557 +#: bzrlib/builtins.py:2555 msgid "" " -r-1 show just the tip\n" " -r-10.. show the last 10 mainline revisions\n" @@ -1495,7 +1495,7 @@ " -rdate:yesterday.. show changes since yesterday" msgstr "" -#: bzrlib/builtins.py:2564 +#: bzrlib/builtins.py:2562 msgid "" " When logging a range of revisions using -rX..Y, log starts at\n" " revision Y and searches back in history through the primary\n" @@ -1505,74 +1505,74 @@ " a nested merge revision and the log will be truncated accordingly." msgstr "" -#: bzrlib/builtins.py:2571 +#: bzrlib/builtins.py:2569 msgid ":Path filtering:" msgstr "" -#: bzrlib/builtins.py:2573 +#: bzrlib/builtins.py:2571 msgid "" " If parameters are given and the first one is not a branch, the log\n" " will be filtered to show only those revisions that changed the\n" " nominated files or directories." msgstr "" -#: bzrlib/builtins.py:2577 +#: bzrlib/builtins.py:2575 msgid "" " Filenames are interpreted within their historical context. To log a\n" " deleted file, specify a revision range so that the file existed at\n" " the end or start of the range." msgstr "" -#: bzrlib/builtins.py:2581 +#: bzrlib/builtins.py:2579 msgid "" " Historical context is also important when interpreting pathnames of\n" " renamed files/directories. Consider the following example:" msgstr "" -#: bzrlib/builtins.py:2584 +#: bzrlib/builtins.py:2582 msgid "" " * revision 1: add tutorial.txt\n" " * revision 2: modify tutorial.txt\n" " * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt" msgstr "" -#: bzrlib/builtins.py:2588 +#: bzrlib/builtins.py:2586 msgid " In this case:" msgstr "" -#: bzrlib/builtins.py:2590 +#: bzrlib/builtins.py:2588 msgid " * ``bzr log guide.txt`` will log the file added in revision 1" msgstr "" -#: bzrlib/builtins.py:2592 +#: bzrlib/builtins.py:2590 msgid "" " * ``bzr log tutorial.txt`` will log the new file added in revision 3" msgstr "" -#: bzrlib/builtins.py:2594 +#: bzrlib/builtins.py:2592 msgid "" " * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n" " the original file in revision 2." msgstr "" -#: bzrlib/builtins.py:2597 +#: bzrlib/builtins.py:2595 msgid "" " * ``bzr log -r2 -p guide.txt`` will display an error message as there\n" " was no file called guide.txt in revision 2." msgstr "" -#: bzrlib/builtins.py:2600 +#: bzrlib/builtins.py:2598 msgid "" " Renames are always followed by log. By design, there is no need to\n" " explicitly ask for this (and no way to stop logging a file back\n" " until it was last renamed)." msgstr "" -#: bzrlib/builtins.py:2604 +#: bzrlib/builtins.py:2602 msgid ":Other filtering:" msgstr "" -#: bzrlib/builtins.py:2606 +#: bzrlib/builtins.py:2604 msgid "" " The --match option can be used for finding revisions that match a\n" " regular expression in a commit message, committer, author or bug.\n" @@ -1581,11 +1581,11 @@ " --match-message can be used to only match a specific field." msgstr "" -#: bzrlib/builtins.py:2612 +#: bzrlib/builtins.py:2610 msgid ":Tips & tricks:" msgstr "" -#: bzrlib/builtins.py:2614 +#: bzrlib/builtins.py:2612 msgid "" " GUI tools and IDEs are often better at exploring history than command\n" " line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n" @@ -1594,12 +1594,12 @@ " . " msgstr "" -#: bzrlib/builtins.py:2620 +#: bzrlib/builtins.py:2618 msgid "" " You may find it useful to add the aliases below to ``bazaar.conf``::" msgstr "" -#: bzrlib/builtins.py:2622 +#: bzrlib/builtins.py:2620 msgid "" " [ALIASES]\n" " tip = log -r-1\n" @@ -1607,20 +1607,20 @@ " show = log -v -p" msgstr "" -#: bzrlib/builtins.py:2627 +#: bzrlib/builtins.py:2625 msgid "" " ``bzr tip`` will then show the latest revision while ``bzr top``\n" " will show the last 10 mainline revisions. To see the details of a\n" " particular revision X, ``bzr show -rX``." msgstr "" -#: bzrlib/builtins.py:2631 +#: bzrlib/builtins.py:2629 msgid "" " If you are interested in looking deeper into a particular merge X,\n" " use ``bzr log -n0 -rX``." msgstr "" -#: bzrlib/builtins.py:2634 +#: bzrlib/builtins.py:2632 msgid "" " ``bzr log -v`` on a branch with lots of history is currently\n" " very slow. A fix for this issue is currently under development.\n" @@ -1628,7 +1628,7 @@ " be given when using the -v option." msgstr "" -#: bzrlib/builtins.py:2639 +#: bzrlib/builtins.py:2637 msgid "" " bzr has a generic full-text matching plugin, bzr-search, that can be\n" " used to find revisions matching user names, commit messages, etc.\n" @@ -1636,7 +1636,7 @@ " a list of words but not others." msgstr "" -#: bzrlib/builtins.py:2644 +#: bzrlib/builtins.py:2642 msgid "" " When exploring non-mainline history on large projects with deep\n" " history, the performance of log can be greatly improved by installing\n" @@ -1644,146 +1644,146 @@ " trading disk space for faster speed." msgstr "" -#: bzrlib/builtins.py:2653 +#: bzrlib/builtins.py:2651 msgid "Show from oldest to newest." msgstr "" -#: bzrlib/builtins.py:2656 +#: bzrlib/builtins.py:2654 msgid "Show files changed in each revision." msgstr "" -#: bzrlib/builtins.py:2662 +#: bzrlib/builtins.py:2660 msgid "Show just the specified revision. See also \"help revisionspec\"." msgstr "" -#: bzrlib/builtins.py:2666 +#: bzrlib/builtins.py:2664 msgid "What names to list as authors - first, all or committer." msgstr "" -#: bzrlib/builtins.py:2667 +#: bzrlib/builtins.py:2665 msgid "Authors" msgstr "" -#: bzrlib/builtins.py:2672 +#: bzrlib/builtins.py:2670 msgid "Number of levels to display - 0 for all, 1 for flat." msgstr "" -#: bzrlib/builtins.py:2682 +#: bzrlib/builtins.py:2680 msgid "Limit the output to the first N revisions." msgstr "" -#: bzrlib/builtins.py:2687 +#: bzrlib/builtins.py:2685 msgid "Show changes made in each revision as a patch." msgstr "" -#: bzrlib/builtins.py:2689 +#: bzrlib/builtins.py:2687 msgid "Show merged revisions like --levels 0 does." msgstr "" -#: bzrlib/builtins.py:2693 +#: bzrlib/builtins.py:2691 msgid "Do not report commits with more than one parent." msgstr "" -#: bzrlib/builtins.py:2695 +#: bzrlib/builtins.py:2693 msgid "" "Display only the revisions that are not part of both ancestries (require -" "rX..Y)." msgstr "" -#: bzrlib/builtins.py:2699 +#: bzrlib/builtins.py:2697 msgid "Show digital signature validity." msgstr "" -#: bzrlib/builtins.py:2702 +#: bzrlib/builtins.py:2700 msgid "Show revisions whose properties match this expression." msgstr "" -#: bzrlib/builtins.py:2706 +#: bzrlib/builtins.py:2704 msgid "Show revisions whose message matches this expression." msgstr "" -#: bzrlib/builtins.py:2710 +#: bzrlib/builtins.py:2708 msgid "Show revisions whose committer matches this expression." msgstr "" -#: bzrlib/builtins.py:2714 +#: bzrlib/builtins.py:2712 msgid "Show revisions whose authors match this expression." msgstr "" -#: bzrlib/builtins.py:2718 +#: bzrlib/builtins.py:2716 msgid "Show revisions whose bugs match this expression." msgstr "" -#: bzrlib/builtins.py:2772 +#: bzrlib/builtins.py:2770 msgid "--exclude-common-ancestry requires -r with two revisions" msgstr "" -#: bzrlib/builtins.py:2800 +#: bzrlib/builtins.py:2798 #, python-format msgid "Path unknown at end or start of revision range: %s" msgstr "" -#: bzrlib/builtins.py:2917 +#: bzrlib/builtins.py:2915 #, python-format msgid "bzr %s doesn't accept two revisions in different branches." msgstr "" -#: bzrlib/builtins.py:2933 +#: bzrlib/builtins.py:2931 #, python-format msgid "bzr %s --revision takes one or two values." msgstr "" -#: bzrlib/builtins.py:2978 +#: bzrlib/builtins.py:2976 msgid "" "List files in a tree.\n" " " msgstr "" -#: bzrlib/builtins.py:2987 +#: bzrlib/builtins.py:2985 msgid "Recurse into subdirectories." msgstr "" -#: bzrlib/builtins.py:2989 +#: bzrlib/builtins.py:2987 msgid "Print paths relative to the root of the branch." msgstr "" -#: bzrlib/builtins.py:2991 +#: bzrlib/builtins.py:2989 msgid "Print unknown files." msgstr "" -#: bzrlib/builtins.py:2992 +#: bzrlib/builtins.py:2990 msgid "Print versioned files." msgstr "" -#: bzrlib/builtins.py:2995 +#: bzrlib/builtins.py:2993 msgid "Print ignored files." msgstr "" -#: bzrlib/builtins.py:2997 +#: bzrlib/builtins.py:2995 msgid "List entries of a particular kind: file, directory, symlink." msgstr "" -#: bzrlib/builtins.py:3010 +#: bzrlib/builtins.py:3008 msgid "invalid kind specified" msgstr "" -#: bzrlib/builtins.py:3013 +#: bzrlib/builtins.py:3011 msgid "Cannot set both --verbose and --null" msgstr "" -#: bzrlib/builtins.py:3022 +#: bzrlib/builtins.py:3020 msgid "cannot specify both --from-root and PATH" msgstr "" -#: bzrlib/builtins.py:3109 +#: bzrlib/builtins.py:3107 msgid "Ignore specified files or patterns." msgstr "" -#: bzrlib/builtins.py:3111 +#: bzrlib/builtins.py:3109 msgid "See ``bzr help patterns`` for details on the syntax of patterns." msgstr "" -#: bzrlib/builtins.py:3113 +#: bzrlib/builtins.py:3111 msgid "" "If a .bzrignore file does not exist, the ignore command\n" "will create one and add the specified files or patterns to the newly\n" @@ -1792,7 +1792,7 @@ "the use of the ignore command will require an explicit add command." msgstr "" -#: bzrlib/builtins.py:3119 +#: bzrlib/builtins.py:3117 msgid "" "To remove patterns from the ignore list, edit the .bzrignore file.\n" "After adding, editing or deleting that file either indirectly by\n" @@ -1800,7 +1800,7 @@ "it." msgstr "" -#: bzrlib/builtins.py:3124 +#: bzrlib/builtins.py:3122 msgid "" "Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n" "the global ignore file can be found in the application data directory as\n" @@ -1809,20 +1809,20 @@ "can be edited directly using an editor." msgstr "" -#: bzrlib/builtins.py:3130 +#: bzrlib/builtins.py:3128 msgid "" "Patterns prefixed with '!' are exceptions to ignore patterns and take\n" "precedence over regular ignores. Such exceptions are used to specify\n" "files that should be versioned which would otherwise be ignored." msgstr "" -#: bzrlib/builtins.py:3134 +#: bzrlib/builtins.py:3132 msgid "" "Patterns prefixed with '!!' act as regular ignore patterns, but have\n" "precedence over the '!' exception patterns." msgstr "" -#: bzrlib/builtins.py:3137 +#: bzrlib/builtins.py:3135 msgid "" ":Notes: \n" " \n" @@ -1830,63 +1830,63 @@ " the shell on Unix." msgstr "" -#: bzrlib/builtins.py:3142 +#: bzrlib/builtins.py:3140 msgid "" "* Ignore patterns starting with \"#\" act as comments in the ignore file.\n" " To ignore patterns that begin with that character, use the \"RE:\" prefix." msgstr "" -#: bzrlib/builtins.py:3145 +#: bzrlib/builtins.py:3143 msgid "" ":Examples:\n" " Ignore the top level Makefile::" msgstr "" -#: bzrlib/builtins.py:3148 +#: bzrlib/builtins.py:3146 msgid " bzr ignore ./Makefile" msgstr "" -#: bzrlib/builtins.py:3150 +#: bzrlib/builtins.py:3148 msgid " Ignore .class files in all directories...::" msgstr "" -#: bzrlib/builtins.py:3152 +#: bzrlib/builtins.py:3150 msgid " bzr ignore \"*.class\"" msgstr "" -#: bzrlib/builtins.py:3154 +#: bzrlib/builtins.py:3152 msgid " ...but do not ignore \"special.class\"::" msgstr "" -#: bzrlib/builtins.py:3156 +#: bzrlib/builtins.py:3154 msgid " bzr ignore \"!special.class\"" msgstr "" -#: bzrlib/builtins.py:3158 +#: bzrlib/builtins.py:3156 msgid " Ignore files whose name begins with the \"#\" character::" msgstr "" -#: bzrlib/builtins.py:3160 +#: bzrlib/builtins.py:3158 msgid " bzr ignore \"RE:^#\"" msgstr "" -#: bzrlib/builtins.py:3162 bzrlib/builtins.py:3166 +#: bzrlib/builtins.py:3160 bzrlib/builtins.py:3164 msgid " Ignore .o files under the lib directory::" msgstr "" -#: bzrlib/builtins.py:3164 +#: bzrlib/builtins.py:3162 msgid " bzr ignore \"lib/**/*.o\"" msgstr "" -#: bzrlib/builtins.py:3168 +#: bzrlib/builtins.py:3166 msgid " bzr ignore \"RE:lib/.*\\.o\"" msgstr "" -#: bzrlib/builtins.py:3170 +#: bzrlib/builtins.py:3168 msgid " Ignore everything but the \"debian\" toplevel directory::" msgstr "" -#: bzrlib/builtins.py:3172 +#: bzrlib/builtins.py:3170 msgid "" " bzr ignore \"RE:(?!debian/).*\"\n" " \n" @@ -1898,26 +1898,26 @@ " bzr ignore \"!!*~\"" msgstr "" -#: bzrlib/builtins.py:3186 +#: bzrlib/builtins.py:3184 msgid "Display the default ignore rules that bzr uses." msgstr "" -#: bzrlib/builtins.py:3198 +#: bzrlib/builtins.py:3196 msgid "ignore requires at least one NAME_PATTERN or --default-rules." msgstr "" -#: bzrlib/builtins.py:3209 +#: bzrlib/builtins.py:3207 #, python-format msgid "Invalid ignore pattern found. %s" msgid_plural "Invalid ignore patterns found. %s" msgstr[0] "" msgstr[1] "" -#: bzrlib/builtins.py:3218 +#: bzrlib/builtins.py:3216 msgid "NAME_PATTERN should not be an absolute path" msgstr "" -#: bzrlib/builtins.py:3231 +#: bzrlib/builtins.py:3229 #, python-format msgid "" "Warning: the following files are version controlled and match your ignore " @@ -1927,64 +1927,64 @@ "them.\n" msgstr "" -#: bzrlib/builtins.py:3238 +#: bzrlib/builtins.py:3236 msgid "List ignored files and the patterns that matched them." msgstr "" -#: bzrlib/builtins.py:3240 +#: bzrlib/builtins.py:3238 msgid "" "List all the ignored files and the ignore pattern that caused the file to\n" "be ignored." msgstr "" -#: bzrlib/builtins.py:3243 +#: bzrlib/builtins.py:3241 msgid "Alternatively, to list just the files::" msgstr "" -#: bzrlib/builtins.py:3245 +#: bzrlib/builtins.py:3243 msgid " bzr ls --ignored" msgstr "" -#: bzrlib/builtins.py:3279 +#: bzrlib/builtins.py:3277 #, python-format msgid "not a valid revision-number: %r" msgstr "" -#: bzrlib/builtins.py:3286 +#: bzrlib/builtins.py:3284 msgid "" "Export current or past revision to a destination directory or archive." msgstr "" -#: bzrlib/builtins.py:3288 +#: bzrlib/builtins.py:3286 msgid "If no revision is specified this exports the last committed revision." msgstr "" -#: bzrlib/builtins.py:3290 +#: bzrlib/builtins.py:3288 msgid "" "Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n" "given, try to find the format with the extension. If no extension\n" "is found exports to a directory (equivalent to --format=dir)." msgstr "" -#: bzrlib/builtins.py:3294 +#: bzrlib/builtins.py:3292 msgid "" "If root is supplied, it will be used as the root directory inside\n" "container formats (tar, zip, etc). If it is not supplied it will default\n" "to the exported filename. The root option has no effect for 'dir' format." msgstr "" -#: bzrlib/builtins.py:3298 +#: bzrlib/builtins.py:3296 msgid "" "If branch is omitted then the branch containing the current working\n" "directory will be used." msgstr "" -#: bzrlib/builtins.py:3301 +#: bzrlib/builtins.py:3299 msgid "" "Note: Export of tree with non-ASCII filenames to zip is not supported." msgstr "" -#: bzrlib/builtins.py:3303 +#: bzrlib/builtins.py:3301 msgid "" " ================= =========================\n" " Supported formats Autodetected by extension\n" @@ -1997,74 +1997,74 @@ " ================= =========================" msgstr "" -#: bzrlib/builtins.py:3317 +#: bzrlib/builtins.py:3315 msgid "Type of file to export to." msgstr "" -#: bzrlib/builtins.py:3320 +#: bzrlib/builtins.py:3318 msgid "Apply content filters to export the convenient form." msgstr "" -#: bzrlib/builtins.py:3324 +#: bzrlib/builtins.py:3322 msgid "Name of the root directory inside the exported file." msgstr "" -#: bzrlib/builtins.py:3326 +#: bzrlib/builtins.py:3324 msgid "" "Set modification time of files to that of the last revision in which it was " "changed." msgstr "" -#: bzrlib/builtins.py:3329 +#: bzrlib/builtins.py:3327 msgid "" "Export the working tree contents rather than that of the last revision." msgstr "" -#: bzrlib/builtins.py:3348 +#: bzrlib/builtins.py:3346 msgid "--uncommitted requires a working tree" msgstr "" -#: bzrlib/builtins.py:3357 +#: bzrlib/builtins.py:3355 #, python-format msgid "Unsupported export format: %s" msgstr "" -#: bzrlib/builtins.py:3361 +#: bzrlib/builtins.py:3359 msgid "" "Write the contents of a file as of a given revision to standard output." msgstr "" -#: bzrlib/builtins.py:3363 +#: bzrlib/builtins.py:3361 msgid "If no revision is nominated, the last revision is used." msgstr "" -#: bzrlib/builtins.py:3365 +#: bzrlib/builtins.py:3363 msgid "" "Note: Take care to redirect standard output when using this command on a\n" "binary file." msgstr "" -#: bzrlib/builtins.py:3371 +#: bzrlib/builtins.py:3369 msgid "The path name in the old tree." msgstr "" -#: bzrlib/builtins.py:3372 +#: bzrlib/builtins.py:3370 msgid "Apply content filters to display the convenience form." msgstr "" -#: bzrlib/builtins.py:3383 +#: bzrlib/builtins.py:3381 msgid "bzr cat --revision takes exactly one revision specifier" msgstr "" -#: bzrlib/builtins.py:3408 bzrlib/builtins.py:3420 +#: bzrlib/builtins.py:3406 bzrlib/builtins.py:3418 msgid "{0!r} is not present in revision {1}" msgstr "" -#: bzrlib/builtins.py:3443 +#: bzrlib/builtins.py:3441 msgid "Commit changes into a new revision." msgstr "" -#: bzrlib/builtins.py:3445 +#: bzrlib/builtins.py:3443 msgid "" "An explanatory message needs to be given for each commit. This is\n" "often done by using the --message option (getting the message from the\n" @@ -2074,44 +2074,44 @@ "boilerplate text loaded into the editor, use the --show-diff option." msgstr "" -#: bzrlib/builtins.py:3452 +#: bzrlib/builtins.py:3450 msgid "" "By default, the entire tree is committed and the person doing the\n" "commit is assumed to be the author. These defaults can be overridden\n" "as explained below." msgstr "" -#: bzrlib/builtins.py:3456 +#: bzrlib/builtins.py:3454 msgid ":Selective commits:" msgstr "" -#: bzrlib/builtins.py:3458 +#: bzrlib/builtins.py:3456 msgid "" " If selected files are specified, only changes to those files are\n" " committed. If a directory is specified then the directory and\n" " everything within it is committed." msgstr "" -#: bzrlib/builtins.py:3462 +#: bzrlib/builtins.py:3460 msgid "" " When excludes are given, they take precedence over selected files.\n" " For example, to commit only changes within foo, but not changes\n" " within foo/bar::" msgstr "" -#: bzrlib/builtins.py:3466 +#: bzrlib/builtins.py:3464 msgid " bzr commit foo -x foo/bar" msgstr "" -#: bzrlib/builtins.py:3468 +#: bzrlib/builtins.py:3466 msgid " A selective commit after a merge is not yet supported." msgstr "" -#: bzrlib/builtins.py:3470 +#: bzrlib/builtins.py:3468 msgid ":Custom authors:" msgstr "" -#: bzrlib/builtins.py:3472 +#: bzrlib/builtins.py:3470 msgid "" " If the author of the change is not the same person as the committer,\n" " you can specify the author's name using the --author option. The\n" @@ -2121,11 +2121,11 @@ " author." msgstr "" -#: bzrlib/builtins.py:3479 +#: bzrlib/builtins.py:3477 msgid ":Checks:" msgstr "" -#: bzrlib/builtins.py:3481 +#: bzrlib/builtins.py:3479 msgid "" " A common mistake is to forget to add a new file or directory before\n" " running the commit command. The --strict option checks for unknown\n" @@ -2134,18 +2134,18 @@ " for details." msgstr "" -#: bzrlib/builtins.py:3487 +#: bzrlib/builtins.py:3485 msgid ":Things to note:" msgstr "" -#: bzrlib/builtins.py:3489 +#: bzrlib/builtins.py:3487 msgid "" " If you accidentially commit the wrong changes or make a spelling\n" " mistake in the commit message say, you can use the uncommit command\n" " to undo it. See ``bzr help uncommit`` for details." msgstr "" -#: bzrlib/builtins.py:3493 +#: bzrlib/builtins.py:3491 msgid "" " Hooks can also be configured to run after a commit. This allows you\n" " to trigger updates to external systems like bug trackers. The --fixes\n" @@ -2153,59 +2153,59 @@ " one or more bugs. See ``bzr help bugs`` for details." msgstr "" -#: bzrlib/builtins.py:3503 +#: bzrlib/builtins.py:3501 msgid "Do not consider changes made to a given path." msgstr "" -#: bzrlib/builtins.py:3506 +#: bzrlib/builtins.py:3504 msgid "Description of the new revision." msgstr "" -#: bzrlib/builtins.py:3509 +#: bzrlib/builtins.py:3507 msgid "Commit even if nothing has changed." msgstr "" -#: bzrlib/builtins.py:3513 +#: bzrlib/builtins.py:3511 msgid "Take commit message from this file." msgstr "" -#: bzrlib/builtins.py:3515 +#: bzrlib/builtins.py:3513 msgid "Refuse to commit if there are unknown files in the working tree." msgstr "" -#: bzrlib/builtins.py:3518 +#: bzrlib/builtins.py:3516 msgid "" "Manually set a commit time using commit date format, e.g. '2009-10-10 " "08:00:00 +0100'." msgstr "" -#: bzrlib/builtins.py:3521 +#: bzrlib/builtins.py:3519 msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")." msgstr "" -#: bzrlib/builtins.py:3524 +#: bzrlib/builtins.py:3522 msgid "Set the author's name, if it's different from the committer." msgstr "" -#: bzrlib/builtins.py:3527 +#: bzrlib/builtins.py:3525 msgid "" "Perform a local commit in a bound branch. Local commits are not pushed to " "the master branch until a normal commit is performed." msgstr "" -#: bzrlib/builtins.py:3533 +#: bzrlib/builtins.py:3531 msgid "" "When no message is supplied, show the diff along with the status summary in " "the message editor." msgstr "" -#: bzrlib/builtins.py:3536 +#: bzrlib/builtins.py:3534 msgid "" "When committing to a foreign version control system do not push data that " "can not be natively represented." msgstr "" -#: bzrlib/builtins.py:3554 +#: bzrlib/builtins.py:3552 #, python-format msgid "" "No tracker specified for bug %s. Use the form 'tracker:id' or specify a " @@ -2213,7 +2213,7 @@ "See \"bzr help bugs\" for more information on this feature. Commit refused." msgstr "" -#: bzrlib/builtins.py:3563 +#: bzrlib/builtins.py:3561 #, python-format msgid "" "Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" " @@ -2221,91 +2221,91 @@ "Commit refused." msgstr "" -#: bzrlib/builtins.py:3572 +#: bzrlib/builtins.py:3570 #, python-format msgid "Unrecognized bug %s. Commit refused." msgstr "" -#: bzrlib/builtins.py:3575 +#: bzrlib/builtins.py:3573 #, python-format msgid "" "%s\n" "Commit refused." msgstr "" -#: bzrlib/builtins.py:3599 +#: bzrlib/builtins.py:3597 msgid "Could not parse --commit-time: " msgstr "" -#: bzrlib/builtins.py:3639 +#: bzrlib/builtins.py:3637 msgid "please specify either --message or --file" msgstr "" -#: bzrlib/builtins.py:3668 +#: bzrlib/builtins.py:3666 msgid "please specify a commit message with either --message or --file" msgstr "" -#: bzrlib/builtins.py:3671 +#: bzrlib/builtins.py:3669 msgid "" "Empty commit message specified. Please specify a commit message with either -" "-message or --file or leave a blank message with --message \"\"." msgstr "" -#: bzrlib/builtins.py:3691 +#: bzrlib/builtins.py:3689 msgid "" "No changes to commit. Please 'bzr add' the files you want to commit, or use -" "-unchanged to force an empty commit." msgstr "" -#: bzrlib/builtins.py:3695 +#: bzrlib/builtins.py:3693 msgid "" "Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr " "resolve FILE\" to resolve." msgstr "" -#: bzrlib/builtins.py:3699 +#: bzrlib/builtins.py:3697 msgid "Commit refused because there are unknown files in the working tree." msgstr "" -#: bzrlib/builtins.py:3702 +#: bzrlib/builtins.py:3700 msgid "" "\n" "To commit to master branch, run update and then commit.\n" "You can also pass --local to commit to continue working disconnected." msgstr "" -#: bzrlib/builtins.py:3710 +#: bzrlib/builtins.py:3708 msgid "" "Validate working tree structure, branch consistency and repository history." msgstr "" -#: bzrlib/builtins.py:3712 +#: bzrlib/builtins.py:3710 msgid "" "This command checks various invariants about branch and repository storage\n" "to detect data corruption or bzr bugs." msgstr "" -#: bzrlib/builtins.py:3715 +#: bzrlib/builtins.py:3713 msgid "" "The working tree and branch checks will only give output if a problem is\n" "detected. The output fields of the repository check are:" msgstr "" -#: bzrlib/builtins.py:3718 +#: bzrlib/builtins.py:3716 msgid "" "revisions\n" " This is just the number of revisions checked. It doesn't\n" " indicate a problem." msgstr "" -#: bzrlib/builtins.py:3722 +#: bzrlib/builtins.py:3720 msgid "" "versionedfiles\n" " This is just the number of versionedfiles checked. It\n" " doesn't indicate a problem." msgstr "" -#: bzrlib/builtins.py:3726 +#: bzrlib/builtins.py:3724 msgid "" "unreferenced ancestors\n" " Texts that are ancestors of other texts, but\n" @@ -2313,14 +2313,14 @@ " subtle problem that Bazaar can work around." msgstr "" -#: bzrlib/builtins.py:3731 +#: bzrlib/builtins.py:3729 msgid "" "unique file texts\n" " This is the total number of unique file contents\n" " seen in the checked revisions. It does not indicate a problem." msgstr "" -#: bzrlib/builtins.py:3735 +#: bzrlib/builtins.py:3733 msgid "" "repeated file texts\n" " This is the total number of repeated texts seen\n" @@ -2329,54 +2329,54 @@ " indicate a problem." msgstr "" -#: bzrlib/builtins.py:3741 +#: bzrlib/builtins.py:3739 msgid "" "If no restrictions are specified, all Bazaar data that is found at the " "given\n" "location will be checked." msgstr "" -#: bzrlib/builtins.py:3746 +#: bzrlib/builtins.py:3744 msgid " Check the tree and branch at 'foo'::" msgstr "" -#: bzrlib/builtins.py:3748 +#: bzrlib/builtins.py:3746 msgid " bzr check --tree --branch foo" msgstr "" -#: bzrlib/builtins.py:3750 +#: bzrlib/builtins.py:3748 msgid " Check only the repository at 'bar'::" msgstr "" -#: bzrlib/builtins.py:3752 +#: bzrlib/builtins.py:3750 msgid " bzr check --repo bar" msgstr "" -#: bzrlib/builtins.py:3754 +#: bzrlib/builtins.py:3752 msgid " Check everything at 'baz'::" msgstr "" -#: bzrlib/builtins.py:3756 +#: bzrlib/builtins.py:3754 msgid " bzr check baz" msgstr "" -#: bzrlib/builtins.py:3762 +#: bzrlib/builtins.py:3760 msgid "Check the branch related to the current directory." msgstr "" -#: bzrlib/builtins.py:3764 +#: bzrlib/builtins.py:3762 msgid "Check the repository related to the current directory." msgstr "" -#: bzrlib/builtins.py:3766 +#: bzrlib/builtins.py:3764 msgid "Check the working tree related to the current directory." msgstr "" -#: bzrlib/builtins.py:3780 +#: bzrlib/builtins.py:3778 msgid "Upgrade a repository, branch or working tree to a newer format." msgstr "" -#: bzrlib/builtins.py:3782 +#: bzrlib/builtins.py:3780 msgid "" "When the default format has changed after a major new release of\n" "Bazaar, you may be informed during certain operations that you\n" @@ -2385,7 +2385,7 @@ "with older repositories or with older versions of Bazaar." msgstr "" -#: bzrlib/builtins.py:3788 +#: bzrlib/builtins.py:3786 msgid "" "If you wish to upgrade to a particular format rather than the\n" "current default, that can be specified using the --format option.\n" @@ -2395,7 +2395,7 @@ "2.x default) so downgrading is not always possible." msgstr "" -#: bzrlib/builtins.py:3795 +#: bzrlib/builtins.py:3793 msgid "" "A backup.bzr.~#~ directory is created at the start of the conversion\n" "process (where # is a number). By default, this is left there on\n" @@ -2406,7 +2406,7 @@ "afterwards." msgstr "" -#: bzrlib/builtins.py:3803 +#: bzrlib/builtins.py:3801 msgid "" "If the location given is a shared repository, dependent branches\n" "are also converted provided the repository converts successfully.\n" @@ -2414,63 +2414,63 @@ "tried." msgstr "" -#: bzrlib/builtins.py:3808 +#: bzrlib/builtins.py:3806 msgid "" "For more information on upgrades, see the Bazaar Upgrade Guide,\n" "http://doc.bazaar.canonical.com/latest/en/upgrade-guide/." msgstr "" -#: bzrlib/builtins.py:3816 +#: bzrlib/builtins.py:3814 msgid "Upgrade to a specific format. See \"bzr help formats\" for details." msgstr "" -#: bzrlib/builtins.py:3820 +#: bzrlib/builtins.py:3818 msgid "Branch format" msgstr "" -#: bzrlib/builtins.py:3822 +#: bzrlib/builtins.py:3820 msgid "Remove the backup.bzr directory if successful." msgstr "" -#: bzrlib/builtins.py:3824 +#: bzrlib/builtins.py:3822 msgid "Show what would be done, but don't actually do anything." msgstr "" -#: bzrlib/builtins.py:3839 +#: bzrlib/builtins.py:3837 msgid "Show or set bzr user id." msgstr "" -#: bzrlib/builtins.py:3841 +#: bzrlib/builtins.py:3839 msgid "" ":Examples:\n" " Show the email of the current user::" msgstr "" -#: bzrlib/builtins.py:3844 +#: bzrlib/builtins.py:3842 msgid " bzr whoami --email" msgstr "" -#: bzrlib/builtins.py:3846 +#: bzrlib/builtins.py:3844 msgid " Set the current user::" msgstr "" -#: bzrlib/builtins.py:3848 +#: bzrlib/builtins.py:3846 msgid " bzr whoami \"Frank Chu \"" msgstr "" -#: bzrlib/builtins.py:3852 +#: bzrlib/builtins.py:3850 msgid "Display email address only." msgstr "" -#: bzrlib/builtins.py:3854 +#: bzrlib/builtins.py:3852 msgid "Set identity for the current branch instead of globally." msgstr "" -#: bzrlib/builtins.py:3880 +#: bzrlib/builtins.py:3878 msgid "--email can only be used to display existing identity" msgstr "" -#: bzrlib/builtins.py:3904 +#: bzrlib/builtins.py:3902 msgid "Print or set the branch nickname." msgstr "" @@ -2480,90 +2480,90 @@ "To print the current nickname, execute with no argument." msgstr "" -#: bzrlib/builtins.py:3910 +#: bzrlib/builtins.py:3908 msgid "" "Bound branches use the nickname of its master branch unless it is set\n" "locally." msgstr "" -#: bzrlib/builtins.py:3930 +#: bzrlib/builtins.py:3928 msgid "Set/unset and display aliases." msgstr "" -#: bzrlib/builtins.py:3932 +#: bzrlib/builtins.py:3930 msgid "" ":Examples:\n" " Show the current aliases::" msgstr "" -#: bzrlib/builtins.py:3935 +#: bzrlib/builtins.py:3933 msgid " bzr alias" msgstr "" -#: bzrlib/builtins.py:3937 +#: bzrlib/builtins.py:3935 msgid " Show the alias specified for 'll'::" msgstr "" -#: bzrlib/builtins.py:3939 +#: bzrlib/builtins.py:3937 msgid " bzr alias ll" msgstr "" -#: bzrlib/builtins.py:3941 +#: bzrlib/builtins.py:3939 msgid " Set an alias for 'll'::" msgstr "" -#: bzrlib/builtins.py:3943 +#: bzrlib/builtins.py:3941 msgid " bzr alias ll=\"log --line -r-10..-1\"" msgstr "" -#: bzrlib/builtins.py:3945 +#: bzrlib/builtins.py:3943 msgid " To remove an alias for 'll'::" msgstr "" -#: bzrlib/builtins.py:3947 +#: bzrlib/builtins.py:3945 msgid " bzr alias --remove ll" msgstr "" -#: bzrlib/builtins.py:3952 +#: bzrlib/builtins.py:3950 msgid "Remove the alias." msgstr "" -#: bzrlib/builtins.py:3970 +#: bzrlib/builtins.py:3968 msgid "bzr alias --remove expects an alias to remove." msgstr "" -#: bzrlib/builtins.py:4151 +#: bzrlib/builtins.py:4149 msgid "" "subunit not available. subunit needs to be installed to use --subunit." msgstr "" -#: bzrlib/builtins.py:4168 +#: bzrlib/builtins.py:4166 msgid "" "--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead" msgstr "" -#: bzrlib/builtins.py:4215 +#: bzrlib/builtins.py:4213 msgid "Show version of bzr." msgstr "" -#: bzrlib/builtins.py:4219 +#: bzrlib/builtins.py:4217 msgid "Print just the version number." msgstr "" -#: bzrlib/builtins.py:4238 +#: bzrlib/builtins.py:4236 msgid "It sure does!\n" msgstr "" -#: bzrlib/builtins.py:4262 +#: bzrlib/builtins.py:4260 #, python-format msgid "merge base is revision %s\n" msgstr "" -#: bzrlib/builtins.py:4266 +#: bzrlib/builtins.py:4264 msgid "Perform a three-way merge." msgstr "" -#: bzrlib/builtins.py:4268 +#: bzrlib/builtins.py:4266 msgid "" "The source of the merge can be specified either in the form of a branch,\n" "or in the form of a path to a file containing a merge directive generated\n" @@ -2574,20 +2574,20 @@ "the current working tree." msgstr "" -#: bzrlib/builtins.py:4276 +#: bzrlib/builtins.py:4274 msgid "" "When merging from a branch, by default bzr will try to merge in all new\n" "work from the other branch, automatically determining an appropriate base\n" "revision. If this fails, you may need to give an explicit base." msgstr "" -#: bzrlib/builtins.py:4280 +#: bzrlib/builtins.py:4278 msgid "" "To pick a different ending revision, pass \"--revision OTHER\". bzr will\n" "try to merge in all new work up to and including revision OTHER." msgstr "" -#: bzrlib/builtins.py:4283 +#: bzrlib/builtins.py:4281 msgid "" "If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n" "through OTHER, excluding BASE but including OTHER, will be merged. If this\n" @@ -2598,11 +2598,11 @@ "changes from the other branch is not stored in the commit." msgstr "" -#: bzrlib/builtins.py:4291 +#: bzrlib/builtins.py:4289 msgid "Revision numbers are always relative to the source branch." msgstr "" -#: bzrlib/builtins.py:4293 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106 +#: bzrlib/builtins.py:4291 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106 msgid "" "Merge will do its best to combine the changes in two branches, but there\n" "are some kinds of problems only a human can fix. When it encounters those,\n" @@ -2610,12 +2610,12 @@ "before you can commit." msgstr "" -#: bzrlib/builtins.py:4298 +#: bzrlib/builtins.py:4296 msgid "" "Use bzr resolve when you have fixed a problem. See also bzr conflicts." msgstr "" -#: bzrlib/builtins.py:4300 +#: bzrlib/builtins.py:4298 msgid "" "If there is no default branch set, the first merge will set it (use\n" "--no-remember to avoid setting it). After that, you can omit the branch\n" @@ -2623,14 +2623,14 @@ "only be saved if the remote location can be accessed." msgstr "" -#: bzrlib/builtins.py:4305 +#: bzrlib/builtins.py:4303 msgid "" "The results of the merge are placed into the destination working\n" "directory, where they can be reviewed (with bzr diff), tested, and then\n" "committed to record the result of the merge." msgstr "" -#: bzrlib/builtins.py:4309 +#: bzrlib/builtins.py:4307 msgid "" "merge refuses to run if there are any uncommitted changes, unless\n" "--force is given. If --force is given, then the changes from the source \n" @@ -2639,191 +2639,191 @@ "merge revision which has more than two parents." msgstr "" -#: bzrlib/builtins.py:4315 +#: bzrlib/builtins.py:4313 msgid "" "If one would like to merge changes from the working tree of the other\n" "branch without merging any committed revisions, the --uncommitted option\n" "can be given." msgstr "" -#: bzrlib/builtins.py:4319 +#: bzrlib/builtins.py:4317 msgid "" "To select only some changes to merge, use \"merge -i\", which will prompt\n" "you to apply each diff hunk and file change, similar to \"shelve\"." msgstr "" -#: bzrlib/builtins.py:4322 +#: bzrlib/builtins.py:4320 msgid "" ":Examples:\n" " To merge all new revisions from bzr.dev::" msgstr "" -#: bzrlib/builtins.py:4325 +#: bzrlib/builtins.py:4323 msgid " bzr merge ../bzr.dev" msgstr "" -#: bzrlib/builtins.py:4327 +#: bzrlib/builtins.py:4325 msgid " To merge changes up to and including revision 82 from bzr.dev::" msgstr "" -#: bzrlib/builtins.py:4329 +#: bzrlib/builtins.py:4327 msgid " bzr merge -r 82 ../bzr.dev" msgstr "" -#: bzrlib/builtins.py:4331 +#: bzrlib/builtins.py:4329 msgid " To merge the changes introduced by 82, without previous changes::" msgstr "" -#: bzrlib/builtins.py:4333 +#: bzrlib/builtins.py:4331 msgid " bzr merge -r 81..82 ../bzr.dev" msgstr "" -#: bzrlib/builtins.py:4335 +#: bzrlib/builtins.py:4333 msgid " To apply a merge directive contained in /tmp/merge::" msgstr "" -#: bzrlib/builtins.py:4337 +#: bzrlib/builtins.py:4335 msgid " bzr merge /tmp/merge" msgstr "" -#: bzrlib/builtins.py:4339 +#: bzrlib/builtins.py:4337 msgid "" " To create a merge revision with three parents from two branches\n" " feature1a and feature1b:" msgstr "" -#: bzrlib/builtins.py:4342 +#: bzrlib/builtins.py:4340 msgid "" " bzr merge ../feature1a\n" " bzr merge ../feature1b --force\n" " bzr commit -m 'revision with three parents'" msgstr "" -#: bzrlib/builtins.py:4354 +#: bzrlib/builtins.py:4352 msgid "Merge even if the destination tree has uncommitted changes." msgstr "" -#: bzrlib/builtins.py:4360 +#: bzrlib/builtins.py:4358 msgid "" "Apply uncommitted changes from a working copy, instead of branch changes." msgstr "" -#: bzrlib/builtins.py:4362 +#: bzrlib/builtins.py:4360 msgid "" "If the destination is already completely merged into the source, pull from " "the source rather than merging. When this happens, you do not need to " "commit the result." msgstr "" -#: bzrlib/builtins.py:4367 +#: bzrlib/builtins.py:4365 msgid "" "Branch to merge into, rather than the one containing the working directory." msgstr "" -#: bzrlib/builtins.py:4369 +#: bzrlib/builtins.py:4367 msgid "Instead of merging, show a diff of the merge." msgstr "" -#: bzrlib/builtins.py:4371 +#: bzrlib/builtins.py:4369 msgid "Select changes interactively." msgstr "" -#: bzrlib/builtins.py:4393 +#: bzrlib/builtins.py:4391 msgid "" "Merging into empty branches not currently supported, " "https://bugs.launchpad.net/bzr/+bug/308562" msgstr "" -#: bzrlib/builtins.py:4420 +#: bzrlib/builtins.py:4418 msgid "Cannot use --uncommitted with bundles or merge directives." msgstr "" -#: bzrlib/builtins.py:4431 +#: bzrlib/builtins.py:4429 msgid "Cannot use --uncommitted and --revision at the same time." msgstr "" -#: bzrlib/builtins.py:4451 +#: bzrlib/builtins.py:4449 msgid "merger: " msgstr "" -#: bzrlib/builtins.py:4453 bzrlib/bundle/apply_bundle.py:71 +#: bzrlib/builtins.py:4451 bzrlib/bundle/apply_bundle.py:71 msgid "Nothing to do." msgstr "" -#: bzrlib/builtins.py:4457 +#: bzrlib/builtins.py:4455 msgid "Cannot pull individual files" msgstr "" -#: bzrlib/builtins.py:4465 +#: bzrlib/builtins.py:4463 msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')" msgstr "" -#: bzrlib/builtins.py:4523 +#: bzrlib/builtins.py:4521 #, python-format msgid "Show-base is not supported for this merge type. %s" msgstr "" -#: bzrlib/builtins.py:4532 +#: bzrlib/builtins.py:4530 #, python-format msgid "Conflict reduction is not supported for merge type %s." msgstr "" -#: bzrlib/builtins.py:4536 +#: bzrlib/builtins.py:4534 msgid "Cannot do conflict reduction and show base." msgstr "" -#: bzrlib/builtins.py:4647 +#: bzrlib/builtins.py:4645 msgid "No location specified or remembered" msgstr "" -#: bzrlib/builtins.py:4649 +#: bzrlib/builtins.py:4647 msgid "{0} remembered {1} location {2}" msgstr "" -#: bzrlib/builtins.py:4655 +#: bzrlib/builtins.py:4653 msgid "Redo a merge." msgstr "" -#: bzrlib/builtins.py:4657 +#: bzrlib/builtins.py:4655 msgid "" "Use this if you want to try a different merge technique while resolving\n" "conflicts. Some merge techniques are better than others, and remerge\n" "lets you try different ones on different files." msgstr "" -#: bzrlib/builtins.py:4661 +#: bzrlib/builtins.py:4659 msgid "" "The options for remerge have the same meaning and defaults as the ones for\n" "merge. The difference is that remerge can (only) be run when there is a\n" "pending merge, and it lets you specify particular files." msgstr "" -#: bzrlib/builtins.py:4665 +#: bzrlib/builtins.py:4663 msgid "" ":Examples:\n" " Re-do the merge of all conflicted files, and show the base text in\n" " conflict regions, in addition to the usual THIS and OTHER texts::" msgstr "" -#: bzrlib/builtins.py:4669 +#: bzrlib/builtins.py:4667 msgid " bzr remerge --show-base" msgstr "" -#: bzrlib/builtins.py:4671 +#: bzrlib/builtins.py:4669 msgid "" " Re-do the merge of \"foobar\", using the weave merge algorithm, with\n" " additional processing to reduce the size of conflict regions::" msgstr "" -#: bzrlib/builtins.py:4674 +#: bzrlib/builtins.py:4672 msgid " bzr remerge --merge-type weave --reprocess foobar" msgstr "" -#: bzrlib/builtins.py:4681 +#: bzrlib/builtins.py:4679 msgid "Show base revision text in conflicts." msgstr "" -#: bzrlib/builtins.py:4693 +#: bzrlib/builtins.py:4691 msgid "" "Sorry, remerge only works after normal merges. Not cherrypicking or multi-" "merges." @@ -2856,7 +2856,7 @@ "'.~#~' appended to their name, where # is a number." msgstr "" -#: bzrlib/builtins.py:4773 +#: bzrlib/builtins.py:4771 msgid "" "When you provide files, you can use their current pathname or the pathname\n" "from the target revision. So you can use revert to \"undelete\" a file by\n" @@ -2864,7 +2864,7 @@ "reverted." msgstr "" -#: bzrlib/builtins.py:4778 +#: bzrlib/builtins.py:4776 msgid "" "If you have newly added files since the target revision, they will be\n" "removed. If the files to be removed have been changed, backups will be\n" @@ -2872,7 +2872,7 @@ "deleted." msgstr "" -#: bzrlib/builtins.py:4783 +#: bzrlib/builtins.py:4781 msgid "" "The working tree contains a list of revisions that have been merged but\n" "not yet committed. These revisions will be included as additional parents\n" @@ -2884,7 +2884,7 @@ "reverting any files." msgstr "" -#: bzrlib/builtins.py:4792 +#: bzrlib/builtins.py:4790 msgid "" "Using \"bzr revert --forget-merges\", it is possible to apply all of the\n" "changes from a branch in a single revision. To do this, perform the merge\n" @@ -2898,33 +2898,33 @@ "target branches." msgstr "" -#: bzrlib/builtins.py:4806 +#: bzrlib/builtins.py:4804 msgid "Do not save backups of reverted files." msgstr "" -#: bzrlib/builtins.py:4808 +#: bzrlib/builtins.py:4806 msgid "Remove pending merge marker, without changing any files." msgstr "" -#: bzrlib/builtins.py:4839 +#: bzrlib/builtins.py:4837 msgid "" "Show help on a command or other topic.\n" " " msgstr "" -#: bzrlib/builtins.py:4844 +#: bzrlib/builtins.py:4842 msgid "Show help on all commands." msgstr "" -#: bzrlib/builtins.py:4873 +#: bzrlib/builtins.py:4871 msgid "Show unmerged/unpulled revisions between two branches." msgstr "" -#: bzrlib/builtins.py:4875 +#: bzrlib/builtins.py:4873 msgid "OTHER_BRANCH may be local or remote." msgstr "" -#: bzrlib/builtins.py:4877 +#: bzrlib/builtins.py:4875 msgid "" "To filter on a range of revisions, you can use the command -r begin..end\n" "-r revision requests a specific revision, -r ..end or -r begin.. are\n" @@ -2935,126 +2935,126 @@ " 0 - no missing revisions" msgstr "" -#: bzrlib/builtins.py:4887 +#: bzrlib/builtins.py:4885 msgid "" " Determine the missing revisions between this and the branch at the\n" " remembered pull location::" msgstr "" -#: bzrlib/builtins.py:4890 +#: bzrlib/builtins.py:4888 msgid " bzr missing" msgstr "" -#: bzrlib/builtins.py:4892 +#: bzrlib/builtins.py:4890 msgid " Determine the missing revisions between this and another branch::" msgstr "" -#: bzrlib/builtins.py:4894 +#: bzrlib/builtins.py:4892 msgid " bzr missing http://server/branch" msgstr "" -#: bzrlib/builtins.py:4896 +#: bzrlib/builtins.py:4894 msgid "" " Determine the missing revisions up to a specific revision on the other\n" " branch::" msgstr "" -#: bzrlib/builtins.py:4899 +#: bzrlib/builtins.py:4897 msgid " bzr missing -r ..-10" msgstr "" -#: bzrlib/builtins.py:4901 +#: bzrlib/builtins.py:4899 msgid "" " Determine the missing revisions up to a specific revision on this\n" " branch::" msgstr "" -#: bzrlib/builtins.py:4904 +#: bzrlib/builtins.py:4902 msgid " bzr missing --my-revision ..-10" msgstr "" -#: bzrlib/builtins.py:4911 +#: bzrlib/builtins.py:4909 msgid "Reverse the order of revisions." msgstr "" -#: bzrlib/builtins.py:4913 +#: bzrlib/builtins.py:4911 msgid "Display changes in the local branch only." msgstr "" -#: bzrlib/builtins.py:4914 +#: bzrlib/builtins.py:4912 msgid "Same as --mine-only." msgstr "" -#: bzrlib/builtins.py:4916 +#: bzrlib/builtins.py:4914 msgid "Display changes in the remote branch only." msgstr "" -#: bzrlib/builtins.py:4917 +#: bzrlib/builtins.py:4915 msgid "Same as --theirs-only." msgstr "" -#: bzrlib/builtins.py:4922 +#: bzrlib/builtins.py:4920 msgid "" "Filter on other branch revisions (inclusive). See \"help revisionspec\" for " "details." msgstr "" -#: bzrlib/builtins.py:4926 +#: bzrlib/builtins.py:4924 msgid "" "Filter on local branch revisions (inclusive). See \"help revisionspec\" for " "details." msgstr "" -#: bzrlib/builtins.py:4929 +#: bzrlib/builtins.py:4927 msgid "Show all revisions in addition to the mainline ones." msgstr "" -#: bzrlib/builtins.py:4983 +#: bzrlib/builtins.py:4981 msgid "No peer location known or specified." msgstr "" -#: bzrlib/builtins.py:4987 +#: bzrlib/builtins.py:4985 msgid "Using saved parent location: {0}\n" msgstr "" -#: bzrlib/builtins.py:5020 +#: bzrlib/builtins.py:5018 #, python-format msgid "You have %d extra revision:\n" msgid_plural "You have %d extra revisions:\n" msgstr[0] "" msgstr[1] "" -#: bzrlib/builtins.py:5040 +#: bzrlib/builtins.py:5038 #, python-format msgid "You are missing %d revision:\n" msgid_plural "You are missing %d revisions:\n" msgstr[0] "" msgstr[1] "" -#: bzrlib/builtins.py:5055 +#: bzrlib/builtins.py:5053 msgid "This branch has no new revisions.\n" msgstr "" -#: bzrlib/builtins.py:5058 +#: bzrlib/builtins.py:5056 msgid "Other branch has no new revisions.\n" msgstr "" -#: bzrlib/builtins.py:5063 +#: bzrlib/builtins.py:5061 msgid "Branches are up to date.\n" msgstr "" -#: bzrlib/builtins.py:5074 +#: bzrlib/builtins.py:5072 msgid "Compress the data within a repository." msgstr "" -#: bzrlib/builtins.py:5076 +#: bzrlib/builtins.py:5074 msgid "" "This operation compresses the data within a bazaar repository. As\n" "bazaar supports automatic packing of repository, this operation is\n" "normally not required to be done manually." msgstr "" -#: bzrlib/builtins.py:5080 +#: bzrlib/builtins.py:5078 msgid "" "During the pack operation, bazaar takes a backup of existing repository\n" "data, i.e. pack files. This backup is eventually removed by bazaar\n" @@ -3063,7 +3063,7 @@ "used." msgstr "" -#: bzrlib/builtins.py:5086 +#: bzrlib/builtins.py:5084 msgid "" "Warning: If you use --clean-obsolete-packs and your machine crashes\n" "during or immediately after repacking, you may be left with a state\n" @@ -3071,25 +3071,25 @@ "been. In this case the repository may be unusable." msgstr "" -#: bzrlib/builtins.py:5095 +#: bzrlib/builtins.py:5093 msgid "Delete obsolete packs to save disk space." msgstr "" -#: bzrlib/builtins.py:5109 +#: bzrlib/builtins.py:5107 msgid "List the installed plugins." msgstr "" -#: bzrlib/builtins.py:5111 +#: bzrlib/builtins.py:5109 msgid "" "This command displays the list of installed plugins including\n" "version of plugin and a short description of each." msgstr "" -#: bzrlib/builtins.py:5114 +#: bzrlib/builtins.py:5112 msgid "--verbose shows the path where each plugin is located." msgstr "" -#: bzrlib/builtins.py:5116 +#: bzrlib/builtins.py:5114 msgid "" "A plugin is an external component for Bazaar that extends the\n" "revision control system, by adding or replacing code in Bazaar.\n" @@ -3098,7 +3098,7 @@ "customizing log output." msgstr "" -#: bzrlib/builtins.py:5122 +#: bzrlib/builtins.py:5120 msgid "" "See the Bazaar Plugin Guide \n" "for further information on plugins including where to find them and how to\n" @@ -3106,190 +3106,190 @@ "plugins using the Python programming language." msgstr "" -#: bzrlib/builtins.py:5138 +#: bzrlib/builtins.py:5136 msgid "Show testament (signing-form) of a revision." msgstr "" -#: bzrlib/builtins.py:5141 +#: bzrlib/builtins.py:5139 msgid "Produce long-format testament." msgstr "" -#: bzrlib/builtins.py:5143 +#: bzrlib/builtins.py:5141 msgid "Produce a strict-format testament." msgstr "" -#: bzrlib/builtins.py:5169 +#: bzrlib/builtins.py:5168 msgid "Show the origin of each line in a file." msgstr "" -#: bzrlib/builtins.py:5171 +#: bzrlib/builtins.py:5170 msgid "" "This prints out the given file with an annotation on the left side\n" "indicating which revision, author and date introduced the change." msgstr "" -#: bzrlib/builtins.py:5174 +#: bzrlib/builtins.py:5173 msgid "" "If the origin is the same for a run of consecutive lines, it is\n" "shown only at the top, unless the --all option is given." msgstr "" -#: bzrlib/builtins.py:5182 +#: bzrlib/builtins.py:5181 msgid "Show annotations on all lines." msgstr "" -#: bzrlib/builtins.py:5183 +#: bzrlib/builtins.py:5182 msgid "Show commit date in annotations." msgstr "" -#: bzrlib/builtins.py:5270 +#: bzrlib/builtins.py:5269 msgid "Cannot sign a range of non-revision-history revisions" msgstr "" -#: bzrlib/builtins.py:5282 +#: bzrlib/builtins.py:5281 msgid "Please supply either one revision, or a range." msgstr "" -#: bzrlib/builtins.py:5286 +#: bzrlib/builtins.py:5285 msgid "" "Convert the current branch into a checkout of the supplied branch.\n" "If no branch is supplied, rebind to the last bound location." msgstr "" -#: bzrlib/builtins.py:5289 +#: bzrlib/builtins.py:5288 msgid "" "Once converted into a checkout, commits must succeed on the master branch\n" "before they will be applied to the local branch." msgstr "" -#: bzrlib/builtins.py:5292 +#: bzrlib/builtins.py:5291 msgid "" "Bound branches use the nickname of its master branch unless it is set\n" "locally, in which case binding will update the local nickname to be\n" "that of the master." msgstr "" -#: bzrlib/builtins.py:5307 +#: bzrlib/builtins.py:5306 msgid "No location supplied. This format does not remember old locations." msgstr "" -#: bzrlib/builtins.py:5313 +#: bzrlib/builtins.py:5312 msgid "Branch is already bound" msgstr "" -#: bzrlib/builtins.py:5316 +#: bzrlib/builtins.py:5315 msgid "No location supplied and no previous location known" msgstr "" -#: bzrlib/builtins.py:5322 +#: bzrlib/builtins.py:5321 msgid "These branches have diverged. Try merging, and then bind again." msgstr "" -#: bzrlib/builtins.py:5329 +#: bzrlib/builtins.py:5328 msgid "Convert the current checkout into a regular branch." msgstr "" -#: bzrlib/builtins.py:5331 +#: bzrlib/builtins.py:5330 msgid "" "After unbinding, the local branch is considered independent and subsequent\n" "commits will be local only." msgstr "" -#: bzrlib/builtins.py:5342 +#: bzrlib/builtins.py:5341 msgid "Local branch is not bound" msgstr "" -#: bzrlib/builtins.py:5346 +#: bzrlib/builtins.py:5345 msgid "Remove the last committed revision." msgstr "" -#: bzrlib/builtins.py:5348 +#: bzrlib/builtins.py:5347 msgid "" "--verbose will print out what is being removed.\n" "--dry-run will go through all the motions, but not actually\n" "remove anything." msgstr "" -#: bzrlib/builtins.py:5352 +#: bzrlib/builtins.py:5351 msgid "" "If --revision is specified, uncommit revisions to leave the branch at the\n" "specified revision. For example, \"bzr uncommit -r 15\" will leave the\n" "branch at revision 15." msgstr "" -#: bzrlib/builtins.py:5356 +#: bzrlib/builtins.py:5355 msgid "" "Uncommit leaves the working tree ready for a new commit. The only change\n" "it may make is to restore any pending merges that were present before\n" "the commit." msgstr "" -#: bzrlib/builtins.py:5367 +#: bzrlib/builtins.py:5366 msgid "Don't actually make changes." msgstr "" -#: bzrlib/builtins.py:5368 +#: bzrlib/builtins.py:5367 msgid "Say yes to all questions." msgstr "" -#: bzrlib/builtins.py:5370 +#: bzrlib/builtins.py:5369 msgid "Keep tags that point to removed revisions." msgstr "" -#: bzrlib/builtins.py:5372 +#: bzrlib/builtins.py:5371 msgid "Only remove the commits from the local branch when in a checkout." msgstr "" -#: bzrlib/builtins.py:5421 +#: bzrlib/builtins.py:5420 msgid "No revisions to uncommit.\n" msgstr "" -#: bzrlib/builtins.py:5436 +#: bzrlib/builtins.py:5435 msgid "Dry-run, pretending to remove the above revisions.\n" msgstr "" -#: bzrlib/builtins.py:5439 +#: bzrlib/builtins.py:5438 msgid "The above revision(s) will be removed.\n" msgstr "" -#: bzrlib/builtins.py:5443 +#: bzrlib/builtins.py:5442 msgid "Uncommit these revisions" msgstr "" -#: bzrlib/builtins.py:5446 +#: bzrlib/builtins.py:5445 msgid "Canceled\n" msgstr "" -#: bzrlib/builtins.py:5453 +#: bzrlib/builtins.py:5452 #, python-format msgid "" "You can restore the old tip by running:\n" " bzr pull . -r revid:%s\n" msgstr "" -#: bzrlib/builtins.py:5458 +#: bzrlib/builtins.py:5457 msgid "Break a dead lock." msgstr "" -#: bzrlib/builtins.py:5460 +#: bzrlib/builtins.py:5459 msgid "" "This command breaks a lock on a repository, branch, working directory or\n" "config file." msgstr "" -#: bzrlib/builtins.py:5463 +#: bzrlib/builtins.py:5462 msgid "" "CAUTION: Locks should only be broken when you are sure that the process\n" "holding the lock has been stopped." msgstr "" -#: bzrlib/builtins.py:5466 +#: bzrlib/builtins.py:5465 msgid "" "You can get information on what locks are open via the 'bzr info\n" "[location]' command." msgstr "" -#: bzrlib/builtins.py:5469 +#: bzrlib/builtins.py:5468 msgid "" ":Examples:\n" " bzr break-lock\n" @@ -3297,31 +3297,31 @@ " bzr break-lock --conf ~/.bazaar" msgstr "" -#: bzrlib/builtins.py:5478 +#: bzrlib/builtins.py:5477 msgid "LOCATION is the directory where the config lock is." msgstr "" -#: bzrlib/builtins.py:5480 +#: bzrlib/builtins.py:5479 msgid "Do not ask for confirmation before breaking the lock." msgstr "" -#: bzrlib/builtins.py:5515 +#: bzrlib/builtins.py:5514 msgid "The Bazaar smart server protocol over TCP. (default port: 4155)" msgstr "" -#: bzrlib/builtins.py:5516 +#: bzrlib/builtins.py:5515 msgid "Run the bzr server." msgstr "" -#: bzrlib/builtins.py:5522 +#: bzrlib/builtins.py:5521 msgid "Serve on stdin/out for use from inetd or sshd." msgstr "" -#: bzrlib/builtins.py:5523 +#: bzrlib/builtins.py:5522 msgid "protocol" msgstr "" -#: bzrlib/builtins.py:5524 +#: bzrlib/builtins.py:5523 msgid "Protocol to serve." msgstr "" @@ -3332,11 +3332,11 @@ "The default port depends on the protocol." msgstr "" -#: bzrlib/builtins.py:5535 +#: bzrlib/builtins.py:5534 msgid "Serve contents of this directory." msgstr "" -#: bzrlib/builtins.py:5537 +#: bzrlib/builtins.py:5536 msgid "" "By default the server is a readonly server. Supplying --allow-writes " "enables write access to the contents of the served directory and below. " @@ -3345,114 +3345,114 @@ "uncontrolled write access to your file system." msgstr "" -#: bzrlib/builtins.py:5546 +#: bzrlib/builtins.py:5545 msgid "Override the default idle client timeout (5min)." msgstr "" -#: bzrlib/builtins.py:5564 +#: bzrlib/builtins.py:5563 msgid "Combine a tree into its containing tree." msgstr "" -#: bzrlib/builtins.py:5566 +#: bzrlib/builtins.py:5565 msgid "This command requires the target tree to be in a rich-root format." msgstr "" -#: bzrlib/builtins.py:5568 +#: bzrlib/builtins.py:5567 msgid "" "The TREE argument should be an independent tree, inside another tree, but\n" "not part of it. (Such trees can be produced by \"bzr split\", but also by\n" "running \"bzr branch\" with the target inside a tree.)" msgstr "" -#: bzrlib/builtins.py:5572 +#: bzrlib/builtins.py:5571 msgid "" "The result is a combined tree, with the subtree no longer an independent\n" "part. This is marked as a merge of the subtree into the containing tree,\n" "and all history is preserved." msgstr "" -#: bzrlib/builtins.py:5590 +#: bzrlib/builtins.py:5589 #, python-format msgid "" "Can't join trees because %s doesn't support rich root data.\n" "You can use bzr upgrade on the repository." msgstr "" -#: bzrlib/builtins.py:5600 bzrlib/builtins.py:5606 +#: bzrlib/builtins.py:5599 bzrlib/builtins.py:5605 msgid "Cannot join {0}. {1}" msgstr "" -#: bzrlib/builtins.py:5610 +#: bzrlib/builtins.py:5609 msgid "Split a subdirectory of a tree into a separate tree." msgstr "" -#: bzrlib/builtins.py:5612 +#: bzrlib/builtins.py:5611 msgid "" "This command will produce a target tree in a format that supports\n" "rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n" "converted into earlier formats like 'dirstate-tags'." msgstr "" -#: bzrlib/builtins.py:5616 +#: bzrlib/builtins.py:5615 msgid "" "The TREE argument should be a subdirectory of a working tree. That\n" "subdirectory will be converted into an independent tree, with its own\n" "branch. Commits in the top-level tree will not apply to the new subtree." msgstr "" -#: bzrlib/builtins.py:5696 +#: bzrlib/builtins.py:5695 msgid "No submit branch specified or known" msgstr "" -#: bzrlib/builtins.py:5705 bzrlib/send.py:109 +#: bzrlib/builtins.py:5704 bzrlib/send.py:109 msgid "No public branch specified or known" msgstr "" -#: bzrlib/builtins.py:5710 +#: bzrlib/builtins.py:5709 msgid "bzr merge-directive takes at most two one revision identifiers" msgstr "" -#: bzrlib/builtins.py:5719 +#: bzrlib/builtins.py:5718 msgid "No revisions to bundle." msgstr "" -#: bzrlib/builtins.py:5738 +#: bzrlib/builtins.py:5737 msgid "Mail or create a merge-directive for submitting changes." msgstr "" -#: bzrlib/builtins.py:5740 +#: bzrlib/builtins.py:5739 msgid "A merge directive provides many things needed for requesting merges:" msgstr "" -#: bzrlib/builtins.py:5742 +#: bzrlib/builtins.py:5741 msgid "* A machine-readable description of the merge to perform" msgstr "" -#: bzrlib/builtins.py:5744 +#: bzrlib/builtins.py:5743 msgid "* An optional patch that is a preview of the changes requested" msgstr "" -#: bzrlib/builtins.py:5746 +#: bzrlib/builtins.py:5745 msgid "" "* An optional bundle of revision data, so that the changes can be applied\n" " directly from the merge directive, without retrieving data from a\n" " branch." msgstr "" -#: bzrlib/builtins.py:5750 +#: bzrlib/builtins.py:5749 msgid "" "`bzr send` creates a compact data set that, when applied using bzr\n" "merge, has the same effect as merging from the source branch. " msgstr "" -#: bzrlib/builtins.py:5753 +#: bzrlib/builtins.py:5752 msgid "" "By default the merge directive is self-contained and can be applied to any\n" "branch containing submit_branch in its ancestory without needing access to\n" "the source branch." msgstr "" -#: bzrlib/builtins.py:5757 +#: bzrlib/builtins.py:5756 msgid "" "If --no-bundle is specified, then Bazaar doesn't send the contents of the\n" "revisions, but only a structured request to merge from the\n" @@ -3461,7 +3461,7 @@ "included if known, so that people can check it later." msgstr "" -#: bzrlib/builtins.py:5763 +#: bzrlib/builtins.py:5762 msgid "" "The submit branch defaults to the parent of the source branch, but can be\n" "overridden. Both submit branch and public branch will be remembered in\n" @@ -3470,7 +3470,7 @@ "be changed using --from." msgstr "" -#: bzrlib/builtins.py:5769 +#: bzrlib/builtins.py:5768 msgid "" "Both the submit branch and the public branch follow the usual behavior with\n" "respect to --remember: If there is no default location set, the first send\n" @@ -3479,7 +3479,7 @@ "--remember. The value will only be saved if the location can be accessed." msgstr "" -#: bzrlib/builtins.py:5775 +#: bzrlib/builtins.py:5774 msgid "" "In order to calculate those changes, bzr must analyse the submit branch.\n" "Therefore it is most efficient for the submit branch to be a local mirror.\n" @@ -3487,20 +3487,20 @@ "in the merge directive." msgstr "" -#: bzrlib/builtins.py:5780 +#: bzrlib/builtins.py:5779 msgid "" "The default behaviour is to send the merge directive by mail, unless -o is\n" "given, in which case it is sent to a file." msgstr "" -#: bzrlib/builtins.py:5783 +#: bzrlib/builtins.py:5782 msgid "" "Mail is sent using your preferred mail program. This should be transparent\n" "on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n" "If the preferred client can't be found (or used), your editor will be used." msgstr "" -#: bzrlib/builtins.py:5787 +#: bzrlib/builtins.py:5786 msgid "" "To use a specific mail program, set the mail_client configuration option.\n" "(For Thunderbird 1.5, this works around some bugs.) Supported values for\n" @@ -3512,7 +3512,7 @@ "supported clients." msgstr "" -#: bzrlib/builtins.py:5794 +#: bzrlib/builtins.py:5793 msgid "" "If mail is being sent, a to address is required. This can be supplied\n" "either on the commandline, by setting the submit_to configuration\n" @@ -3520,7 +3520,7 @@ "in the submit branch." msgstr "" -#: bzrlib/builtins.py:5799 +#: bzrlib/builtins.py:5798 msgid "" "Two formats are currently supported: \"4\" uses revision bundle format 4 " "and\n" @@ -3530,13 +3530,13 @@ "format 1. It is compatible with Bazaar 0.12 - 0.18." msgstr "" -#: bzrlib/builtins.py:5805 +#: bzrlib/builtins.py:5804 msgid "" "The merge directives created by bzr send may be applied using bzr merge or\n" "bzr pull by specifying a file containing a merge directive as the location." msgstr "" -#: bzrlib/builtins.py:5808 +#: bzrlib/builtins.py:5807 msgid "" "bzr send makes extensive use of public locations to map local locations " "into\n" @@ -3544,81 +3544,81 @@ "set them, and use `bzr info` to display them." msgstr "" -#: bzrlib/builtins.py:5832 +#: bzrlib/builtins.py:5831 msgid "Write merge directive to this file or directory; use - for stdout." msgstr "" -#: bzrlib/builtins.py:5836 +#: bzrlib/builtins.py:5835 msgid "" "Refuse to send if there are uncommitted changes in the working tree, --no-" "strict disables the check." msgstr "" -#: bzrlib/builtins.py:5838 +#: bzrlib/builtins.py:5837 msgid "Mail the request to this address." msgstr "" -#: bzrlib/builtins.py:5842 +#: bzrlib/builtins.py:5841 msgid "Body for the email." msgstr "" -#: bzrlib/builtins.py:5895 +#: bzrlib/builtins.py:5894 msgid "Do not include a bundle in the merge directive." msgstr "" -#: bzrlib/builtins.py:5896 +#: bzrlib/builtins.py:5895 msgid "Do not include a preview patch in the merge directive." msgstr "" -#: bzrlib/builtins.py:5899 +#: bzrlib/builtins.py:5898 msgid "Remember submit and public branch." msgstr "" -#: bzrlib/builtins.py:5901 +#: bzrlib/builtins.py:5900 msgid "" "Branch to generate the submission from, rather than the one containing the " "working directory." msgstr "" -#: bzrlib/builtins.py:5911 bzrlib/cmd_version_info.py:76 +#: bzrlib/builtins.py:5910 bzrlib/cmd_version_info.py:76 msgid "format" msgstr "" -#: bzrlib/builtins.py:5912 +#: bzrlib/builtins.py:5911 msgid "Use the specified output format." msgstr "" -#: bzrlib/builtins.py:5934 +#: bzrlib/builtins.py:5933 msgid "Create, remove or modify a tag naming a revision." msgstr "" -#: bzrlib/builtins.py:5936 +#: bzrlib/builtins.py:5935 msgid "" "Tags give human-meaningful names to revisions. Commands that take a -r\n" "(--revision) option can be given -rtag:X, where X is any previously\n" "created tag." msgstr "" -#: bzrlib/builtins.py:5940 +#: bzrlib/builtins.py:5939 msgid "" "Tags are stored in the branch. Tags are copied from one branch to another\n" "along when you branch, push, pull or merge." msgstr "" -#: bzrlib/builtins.py:5943 +#: bzrlib/builtins.py:5942 msgid "" "It is an error to give a tag name that already exists unless you pass\n" "--force, in which case the tag is moved to point to the new revision." msgstr "" -#: bzrlib/builtins.py:5946 +#: bzrlib/builtins.py:5945 msgid "" "To rename a tag (change the name but keep it on the same revsion), run " "``bzr\n" "tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``." msgstr "" -#: bzrlib/builtins.py:5949 +#: bzrlib/builtins.py:5948 msgid "" "If no tag name is specified it will be determined through the \n" "'automatic_tag_name' hook. This can e.g. be used to automatically tag\n" @@ -3626,76 +3626,76 @@ "details." msgstr "" -#: bzrlib/builtins.py:5959 +#: bzrlib/builtins.py:5958 msgid "Delete this tag rather than placing it." msgstr "" -#: bzrlib/builtins.py:5962 +#: bzrlib/builtins.py:5961 msgid "Branch in which to place the tag." msgstr "" -#: bzrlib/builtins.py:5964 +#: bzrlib/builtins.py:5963 msgid "Replace existing tags." msgstr "" -#: bzrlib/builtins.py:5979 +#: bzrlib/builtins.py:5978 msgid "No tag specified to delete." msgstr "" -#: bzrlib/builtins.py:5981 +#: bzrlib/builtins.py:5980 #, python-format msgid "Deleted tag %s." msgstr "" -#: bzrlib/builtins.py:5995 +#: bzrlib/builtins.py:5994 msgid "Please specify a tag name." msgstr "" -#: bzrlib/builtins.py:6003 +#: bzrlib/builtins.py:6002 #, python-format msgid "Tag %s already exists for that revision." msgstr "" -#: bzrlib/builtins.py:6007 +#: bzrlib/builtins.py:6006 #, python-format msgid "Created tag %s." msgstr "" -#: bzrlib/builtins.py:6009 +#: bzrlib/builtins.py:6008 #, python-format msgid "Updated tag %s." msgstr "" -#: bzrlib/builtins.py:6013 +#: bzrlib/builtins.py:6012 msgid "List tags." msgstr "" -#: bzrlib/builtins.py:6015 +#: bzrlib/builtins.py:6014 msgid "" "This command shows a table of tag names and the revisions they reference." msgstr "" -#: bzrlib/builtins.py:6021 +#: bzrlib/builtins.py:6020 msgid "Branch whose tags should be displayed." msgstr "" -#: bzrlib/builtins.py:6023 +#: bzrlib/builtins.py:6022 msgid "Sort tags by different criteria." msgstr "" -#: bzrlib/builtins.py:6023 +#: bzrlib/builtins.py:6022 msgid "Sorting" msgstr "" -#: bzrlib/builtins.py:6092 +#: bzrlib/builtins.py:6091 msgid "Reconfigure the type of a bzr directory." msgstr "" -#: bzrlib/builtins.py:6094 +#: bzrlib/builtins.py:6093 msgid "A target configuration must be specified." msgstr "" -#: bzrlib/builtins.py:6096 +#: bzrlib/builtins.py:6095 msgid "" "For checkouts, the bind-to location will be auto-detected if not specified.\n" "The order of preference is\n" @@ -3706,96 +3706,96 @@ "If none of these is available, --bind-to must be specified." msgstr "" -#: bzrlib/builtins.py:6110 +#: bzrlib/builtins.py:6109 msgid "Tree type" msgstr "" -#: bzrlib/builtins.py:6111 +#: bzrlib/builtins.py:6110 msgid "The relation between branch and tree." msgstr "" -#: bzrlib/builtins.py:6113 +#: bzrlib/builtins.py:6112 msgid "Reconfigure to be an unbound branch with no working tree." msgstr "" -#: bzrlib/builtins.py:6114 +#: bzrlib/builtins.py:6113 msgid "Reconfigure to be an unbound branch with a working tree." msgstr "" -#: bzrlib/builtins.py:6115 +#: bzrlib/builtins.py:6114 msgid "Reconfigure to be a bound branch with a working tree." msgstr "" -#: bzrlib/builtins.py:6116 +#: bzrlib/builtins.py:6115 msgid "Reconfigure to be a lightweight checkout (with no local history)." msgstr "" -#: bzrlib/builtins.py:6121 +#: bzrlib/builtins.py:6120 msgid "Repository type" msgstr "" -#: bzrlib/builtins.py:6122 +#: bzrlib/builtins.py:6121 msgid "Location fo the repository." msgstr "" -#: bzrlib/builtins.py:6124 +#: bzrlib/builtins.py:6123 msgid "" "Reconfigure to be a standalone branch (i.e. stop using shared repository)." msgstr "" -#: bzrlib/builtins.py:6126 +#: bzrlib/builtins.py:6125 msgid "Reconfigure to use a shared repository." msgstr "" -#: bzrlib/builtins.py:6130 +#: bzrlib/builtins.py:6129 msgid "Trees in Repository" msgstr "" -#: bzrlib/builtins.py:6131 +#: bzrlib/builtins.py:6130 msgid "Whether new branches in the repository have trees." msgstr "" -#: bzrlib/builtins.py:6133 +#: bzrlib/builtins.py:6132 msgid "" "Reconfigure repository to create working trees on branches by default." msgstr "" -#: bzrlib/builtins.py:6135 +#: bzrlib/builtins.py:6134 msgid "" "Reconfigure repository to not create working trees on branches by default." msgstr "" -#: bzrlib/builtins.py:6138 +#: bzrlib/builtins.py:6137 msgid "Branch to bind checkout to." msgstr "" -#: bzrlib/builtins.py:6140 +#: bzrlib/builtins.py:6139 msgid "Perform reconfiguration even if local changes will be lost." msgstr "" -#: bzrlib/builtins.py:6143 +#: bzrlib/builtins.py:6142 msgid "Reconfigure a branch to be stacked on another branch." msgstr "" -#: bzrlib/builtins.py:6147 +#: bzrlib/builtins.py:6146 msgid "" "Reconfigure a branch to be unstacked. This may require copying substantial " "data into it." msgstr "" -#: bzrlib/builtins.py:6157 +#: bzrlib/builtins.py:6156 msgid "Can't use both --stacked-on and --unstacked" msgstr "" -#: bzrlib/builtins.py:6171 +#: bzrlib/builtins.py:6170 msgid "No target configuration specified" msgstr "" -#: bzrlib/builtins.py:6206 +#: bzrlib/builtins.py:6205 msgid "Set the branch of a checkout and update." msgstr "" -#: bzrlib/builtins.py:6208 +#: bzrlib/builtins.py:6207 msgid "" "For lightweight checkouts, this changes the branch being referenced.\n" "For heavyweight checkouts, this checks that there are no local commits\n" @@ -3803,17 +3803,17 @@ "of the new location and binds to it." msgstr "" -#: bzrlib/builtins.py:6213 +#: bzrlib/builtins.py:6212 msgid "" "In both cases, the working tree is updated and uncommitted changes\n" "are merged. The user can commit or revert these as they desire." msgstr "" -#: bzrlib/builtins.py:6216 +#: bzrlib/builtins.py:6215 msgid "Pending merges need to be committed or reverted before using switch." msgstr "" -#: bzrlib/builtins.py:6218 +#: bzrlib/builtins.py:6217 msgid "" "The path to the branch to switch to can be specified relative to the parent\n" "directory of the current branch. For example, if you are currently in a\n" @@ -3821,34 +3821,34 @@ "/path/to/newbranch." msgstr "" -#: bzrlib/builtins.py:6223 +#: bzrlib/builtins.py:6222 msgid "" "Bound branches use the nickname of its master branch unless it is set\n" "locally, in which case switching will update the local nickname to be\n" "that of the master." msgstr "" -#: bzrlib/builtins.py:6231 +#: bzrlib/builtins.py:6230 msgid "Switch even if local commits will be lost." msgstr "" -#: bzrlib/builtins.py:6234 +#: bzrlib/builtins.py:6233 msgid "Create the target branch from this one before switching to it." msgstr "" -#: bzrlib/builtins.py:6248 +#: bzrlib/builtins.py:6250 msgid "You must supply either a revision or a location" msgstr "" -#: bzrlib/builtins.py:6261 +#: bzrlib/builtins.py:6263 msgid "cannot create branch without source branch" msgstr "" -#: bzrlib/builtins.py:6286 +#: bzrlib/builtins.py:6289 msgid "Manage filtered views." msgstr "" -#: bzrlib/builtins.py:6288 +#: bzrlib/builtins.py:6291 msgid "" "Views provide a mask over the tree so that users can focus on\n" "a subset of a tree when doing their work. After creating a view,\n" @@ -3858,7 +3858,7 @@ "must be within the current view." msgstr "" -#: bzrlib/builtins.py:6295 +#: bzrlib/builtins.py:6298 msgid "" "In most cases, a view has a short life-span: it is created to make\n" "a selected change and is deleted once that change is committed.\n" @@ -3866,7 +3866,7 @@ "and switch between them." msgstr "" -#: bzrlib/builtins.py:6300 +#: bzrlib/builtins.py:6303 msgid "" "To disable the current view without deleting it, you can switch to\n" "the pseudo view called ``off``. This can be useful when you need\n" @@ -3874,197 +3874,197 @@ "want to switch back to your view after that." msgstr "" -#: bzrlib/builtins.py:6305 +#: bzrlib/builtins.py:6308 msgid "" ":Examples:\n" " To define the current view::" msgstr "" -#: bzrlib/builtins.py:6308 +#: bzrlib/builtins.py:6311 msgid " bzr view file1 dir1 ..." msgstr "" -#: bzrlib/builtins.py:6310 +#: bzrlib/builtins.py:6313 msgid " To list the current view::" msgstr "" -#: bzrlib/builtins.py:6312 +#: bzrlib/builtins.py:6315 msgid " bzr view" msgstr "" -#: bzrlib/builtins.py:6314 +#: bzrlib/builtins.py:6317 msgid " To delete the current view::" msgstr "" -#: bzrlib/builtins.py:6316 +#: bzrlib/builtins.py:6319 msgid " bzr view --delete" msgstr "" -#: bzrlib/builtins.py:6318 +#: bzrlib/builtins.py:6321 msgid " To disable the current view without deleting it::" msgstr "" -#: bzrlib/builtins.py:6320 +#: bzrlib/builtins.py:6323 msgid " bzr view --switch off" msgstr "" -#: bzrlib/builtins.py:6322 +#: bzrlib/builtins.py:6325 msgid " To define a named view and switch to it::" msgstr "" -#: bzrlib/builtins.py:6324 +#: bzrlib/builtins.py:6327 msgid " bzr view --name view-name file1 dir1 ..." msgstr "" -#: bzrlib/builtins.py:6326 +#: bzrlib/builtins.py:6329 msgid " To list a named view::" msgstr "" -#: bzrlib/builtins.py:6328 +#: bzrlib/builtins.py:6331 msgid " bzr view --name view-name" msgstr "" -#: bzrlib/builtins.py:6330 +#: bzrlib/builtins.py:6333 msgid " To delete a named view::" msgstr "" -#: bzrlib/builtins.py:6332 +#: bzrlib/builtins.py:6335 msgid " bzr view --name view-name --delete" msgstr "" -#: bzrlib/builtins.py:6334 +#: bzrlib/builtins.py:6337 msgid " To switch to a named view::" msgstr "" -#: bzrlib/builtins.py:6336 +#: bzrlib/builtins.py:6339 msgid " bzr view --switch view-name" msgstr "" -#: bzrlib/builtins.py:6338 +#: bzrlib/builtins.py:6341 msgid " To list all views defined::" msgstr "" -#: bzrlib/builtins.py:6340 +#: bzrlib/builtins.py:6343 msgid " bzr view --all" msgstr "" -#: bzrlib/builtins.py:6342 +#: bzrlib/builtins.py:6345 msgid " To delete all views::" msgstr "" -#: bzrlib/builtins.py:6344 +#: bzrlib/builtins.py:6347 msgid " bzr view --delete --all" msgstr "" -#: bzrlib/builtins.py:6351 +#: bzrlib/builtins.py:6354 msgid "Apply list or delete action to all views." msgstr "" -#: bzrlib/builtins.py:6354 +#: bzrlib/builtins.py:6357 msgid "Delete the view." msgstr "" -#: bzrlib/builtins.py:6357 +#: bzrlib/builtins.py:6360 msgid "Name of the view to define, list or delete." msgstr "" -#: bzrlib/builtins.py:6361 +#: bzrlib/builtins.py:6364 msgid "Name of the view to switch to." msgstr "" -#: bzrlib/builtins.py:6380 +#: bzrlib/builtins.py:6383 msgid "Both --delete and a file list specified" msgstr "" -#: bzrlib/builtins.py:6383 +#: bzrlib/builtins.py:6386 msgid "Both --delete and --switch specified" msgstr "" -#: bzrlib/builtins.py:6386 +#: bzrlib/builtins.py:6389 msgid "Deleted all views.\n" msgstr "" -#: bzrlib/builtins.py:6388 +#: bzrlib/builtins.py:6391 msgid "No current view to delete" msgstr "" -#: bzrlib/builtins.py:6391 +#: bzrlib/builtins.py:6394 #, python-format msgid "Deleted '%s' view.\n" msgstr "" -#: bzrlib/builtins.py:6395 +#: bzrlib/builtins.py:6398 msgid "Both --switch and a file list specified" msgstr "" -#: bzrlib/builtins.py:6398 +#: bzrlib/builtins.py:6401 msgid "Both --switch and --all specified" msgstr "" -#: bzrlib/builtins.py:6401 +#: bzrlib/builtins.py:6404 msgid "No current view to disable" msgstr "" -#: bzrlib/builtins.py:6403 +#: bzrlib/builtins.py:6406 #, python-format msgid "Disabled '%s' view.\n" msgstr "" -#: bzrlib/builtins.py:6407 bzrlib/builtins.py:6429 +#: bzrlib/builtins.py:6410 bzrlib/builtins.py:6432 msgid "Using '{0}' view: {1}\n" msgstr "" -#: bzrlib/builtins.py:6410 +#: bzrlib/builtins.py:6413 msgid "Views defined:\n" msgstr "" -#: bzrlib/builtins.py:6419 +#: bzrlib/builtins.py:6422 msgid "No views defined.\n" msgstr "" -#: bzrlib/builtins.py:6426 +#: bzrlib/builtins.py:6429 msgid "Cannot change the 'off' pseudo view" msgstr "" -#: bzrlib/builtins.py:6434 +#: bzrlib/builtins.py:6437 msgid "No current view.\n" msgstr "" -#: bzrlib/builtins.py:6437 +#: bzrlib/builtins.py:6440 msgid "'{0}' view is: {1}\n" msgstr "" -#: bzrlib/builtins.py:6457 +#: bzrlib/builtins.py:6460 msgid " \n" msgstr "" -#: bzrlib/builtins.py:6461 +#: bzrlib/builtins.py:6464 msgid "Remove a branch." msgstr "" -#: bzrlib/builtins.py:6463 +#: bzrlib/builtins.py:6466 msgid "" "This will remove the branch from the specified location but \n" "will keep any working tree or repository in place." msgstr "" -#: bzrlib/builtins.py:6468 +#: bzrlib/builtins.py:6471 msgid " Remove the branch at repo/trunk::" msgstr "" -#: bzrlib/builtins.py:6470 +#: bzrlib/builtins.py:6473 msgid " bzr remove-branch repo/trunk" msgstr "" -#: bzrlib/builtins.py:6495 +#: bzrlib/builtins.py:6498 msgid "Plaintext diff output." msgstr "" -#: bzrlib/builtins.py:6496 +#: bzrlib/builtins.py:6499 msgid "Temporarily set aside some changes from the current tree." msgstr "" -#: bzrlib/builtins.py:6498 +#: bzrlib/builtins.py:6501 msgid "" "Shelve allows you to temporarily put changes you've made \"on the shelf\",\n" "ie. out of the way, until a later time when you can bring them back from\n" @@ -4073,11 +4073,11 @@ "will they survive its deletion." msgstr "" -#: bzrlib/builtins.py:6504 +#: bzrlib/builtins.py:6507 msgid "If shelve --list is specified, previously-shelved changes are listed." msgstr "" -#: bzrlib/builtins.py:6506 +#: bzrlib/builtins.py:6509 msgid "" "Shelve is intended to help separate several sets of changes that have\n" "been inappropriately mingled. If you just want to get rid of all changes\n" @@ -4085,35 +4085,35 @@ "shelve all text changes at once, use shelve --all." msgstr "" -#: bzrlib/builtins.py:6511 +#: bzrlib/builtins.py:6514 msgid "" "If filenames are specified, only the changes to those files will be\n" "shelved. Other files will be left untouched." msgstr "" -#: bzrlib/builtins.py:6514 +#: bzrlib/builtins.py:6517 msgid "" "If a revision is specified, changes since that revision will be shelved." msgstr "" -#: bzrlib/builtins.py:6516 +#: bzrlib/builtins.py:6519 msgid "" "You can put multiple items on the shelf, and by default, 'unshelve' will\n" "restore the most recently shelved changes." msgstr "" -#: bzrlib/builtins.py:6519 +#: bzrlib/builtins.py:6522 msgid "" "For complicated changes, it is possible to edit the changes in a separate\n" "editor program to decide what the file remaining in the working copy\n" "should look like. To do this, add the configuration option" msgstr "" -#: bzrlib/builtins.py:6523 +#: bzrlib/builtins.py:6526 msgid " change_editor = PROGRAM @new_path @old_path" msgstr "" -#: bzrlib/builtins.py:6525 +#: bzrlib/builtins.py:6528 msgid "" "where @new_path is replaced with the path of the new version of the \n" "file and @old_path is replaced with the path of the old version of \n" @@ -4122,116 +4122,116 @@ " " msgstr "" -#: bzrlib/builtins.py:6537 +#: bzrlib/builtins.py:6540 msgid "Shelve all changes." msgstr "" -#: bzrlib/builtins.py:6539 +#: bzrlib/builtins.py:6542 msgid "Method to use for writing diffs." msgstr "" -#: bzrlib/builtins.py:6539 +#: bzrlib/builtins.py:6542 msgid "writer" msgstr "" -#: bzrlib/builtins.py:6543 +#: bzrlib/builtins.py:6546 msgid "List shelved changes." msgstr "" -#: bzrlib/builtins.py:6545 +#: bzrlib/builtins.py:6548 msgid "Destroy removed changes instead of shelving them." msgstr "" -#: bzrlib/builtins.py:6574 +#: bzrlib/builtins.py:6577 msgid "No shelved changes." msgstr "" -#: bzrlib/builtins.py:6585 +#: bzrlib/builtins.py:6588 msgid "Restore shelved changes." msgstr "" -#: bzrlib/builtins.py:6587 +#: bzrlib/builtins.py:6590 msgid "" "By default, the most recently shelved changes are restored. However if you\n" "specify a shelf by id those changes will be restored instead. This works\n" "best when the changes don't depend on each other." msgstr "" -#: bzrlib/builtins.py:6596 +#: bzrlib/builtins.py:6599 msgid "The action to perform." msgstr "" -#: bzrlib/builtins.py:6596 bzrlib/conflicts.py:694 +#: bzrlib/builtins.py:6599 bzrlib/conflicts.py:694 msgid "action" msgstr "" -#: bzrlib/builtins.py:6598 +#: bzrlib/builtins.py:6601 msgid "Apply changes and remove from the shelf." msgstr "" -#: bzrlib/builtins.py:6599 +#: bzrlib/builtins.py:6602 msgid "Show changes, but do not apply or remove them." msgstr "" -#: bzrlib/builtins.py:6600 +#: bzrlib/builtins.py:6603 msgid "" "Instead of unshelving the changes, show the diff that would result from " "unshelving." msgstr "" -#: bzrlib/builtins.py:6602 +#: bzrlib/builtins.py:6605 msgid "Delete changes without applying them." msgstr "" -#: bzrlib/builtins.py:6603 +#: bzrlib/builtins.py:6606 msgid "Apply changes but don't delete them." msgstr "" -#: bzrlib/builtins.py:6618 +#: bzrlib/builtins.py:6621 msgid "Remove unwanted files from working tree." msgstr "" -#: bzrlib/builtins.py:6620 +#: bzrlib/builtins.py:6623 msgid "" "By default, only unknown files, not ignored files, are deleted. Versioned\n" "files are never deleted." msgstr "" -#: bzrlib/builtins.py:6623 +#: bzrlib/builtins.py:6626 msgid "" "Another class is 'detritus', which includes files emitted by bzr during\n" "normal operations and selftests. (The value of these files decreases with\n" "time.)" msgstr "" -#: bzrlib/builtins.py:6627 +#: bzrlib/builtins.py:6630 msgid "" "If no options are specified, unknown files are deleted. Otherwise, option\n" "flags are respected, and may be combined." msgstr "" -#: bzrlib/builtins.py:6630 +#: bzrlib/builtins.py:6633 msgid "To check what clean-tree will do, use --dry-run." msgstr "" -#: bzrlib/builtins.py:6633 +#: bzrlib/builtins.py:6636 msgid "Delete all ignored files." msgstr "" -#: bzrlib/builtins.py:6634 +#: bzrlib/builtins.py:6637 msgid "" "Delete conflict files, merge and revert backups, and failed selftest dirs." msgstr "" -#: bzrlib/builtins.py:6637 +#: bzrlib/builtins.py:6640 msgid "Delete files unknown to bzr (default)." msgstr "" -#: bzrlib/builtins.py:6638 +#: bzrlib/builtins.py:6641 msgid "Show files to delete instead of deleting them." msgstr "" -#: bzrlib/builtins.py:6640 +#: bzrlib/builtins.py:6643 msgid "Do not prompt before deleting." msgstr "" @@ -4503,7 +4503,7 @@ msgstr "" #: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712 -#: en/help_topics/configuration.txt:722 +#: en/help_topics/configuration.txt:738 msgid "For example::" msgstr "" @@ -4638,7 +4638,7 @@ msgid "extra argument to command {0}: {1}" msgstr "" -#: bzrlib/commands.py:972 +#: bzrlib/commands.py:952 #, python-format msgid "Profile data written to \"%s\"." msgstr "" @@ -4736,26 +4736,26 @@ msgid "All commits signed with verifiable keys" msgstr "" -#: bzrlib/config.py:436 +#: bzrlib/config.py:438 msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit." msgstr "" -#: bzrlib/config.py:2452 +#: bzrlib/config.py:2468 msgid "{0} is not an SI unit." msgstr "" -#: bzrlib/config.py:2971 +#: bzrlib/config.py:2989 msgid "" "Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value " "will be saved." msgstr "" -#: bzrlib/config.py:3116 +#: bzrlib/config.py:3134 #, python-format msgid "Invalid '%s', should be of the form 'name=value'" msgstr "" -#: bzrlib/config.py:4018 +#: bzrlib/config.py:4089 msgid "Display, set or remove a configuration option." msgstr "" @@ -4781,15 +4781,15 @@ "option again." msgstr "" -#: bzrlib/config.py:4040 +#: bzrlib/config.py:4115 msgid "Reduce the scope to the specified configuration file." msgstr "" -#: bzrlib/config.py:4044 +#: bzrlib/config.py:4119 msgid "Display all the defined values for the matching options." msgstr "" -#: bzrlib/config.py:4046 +#: bzrlib/config.py:4121 msgid "Remove the option from the configuration file." msgstr "" @@ -4873,7 +4873,7 @@ msgid "{0} is{1} redirected to {2}" msgstr "" -#: bzrlib/diff.py:399 +#: bzrlib/diff.py:400 #, python-format msgid "*** Ignoring files outside view. View is %s" msgstr "" @@ -5941,192 +5941,192 @@ "status).%(more)s" msgstr "" -#: bzrlib/errors.py:2898 +#: bzrlib/errors.py:2913 msgid "" "Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --" "list).%(more)s" msgstr "" -#: bzrlib/errors.py:2904 +#: bzrlib/errors.py:2919 msgid "Variable {%(name)s} is not available." msgstr "" -#: bzrlib/errors.py:2912 +#: bzrlib/errors.py:2927 msgid "No template specified." msgstr "" -#: bzrlib/errors.py:2917 +#: bzrlib/errors.py:2932 msgid "Unable to create symlink %(path_str)son this platform" msgstr "" -#: bzrlib/errors.py:2932 +#: bzrlib/errors.py:2947 msgid "" "Unsupported timezone format \"%(timezone)s\", options are \"utc\", " "\"original\", \"local\"." msgstr "" -#: bzrlib/errors.py:2966 +#: bzrlib/errors.py:2981 msgid "" "Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s" msgstr "" -#: bzrlib/errors.py:2978 +#: bzrlib/errors.py:2993 msgid "The \"%(config_id)s\" configuration does not exist." msgstr "" -#: bzrlib/errors.py:2986 +#: bzrlib/errors.py:3001 msgid "The \"%(option_name)s\" configuration option does not exist." msgstr "" -#: bzrlib/errors.py:2994 +#: bzrlib/errors.py:3009 msgid "The alias \"%(alias_name)s\" does not exist." msgstr "" -#: bzrlib/errors.py:3008 +#: bzrlib/errors.py:3023 msgid "\"%(alias_name)s\" is not a valid location alias." msgstr "" -#: bzrlib/errors.py:3016 +#: bzrlib/errors.py:3031 msgid "No %(alias_name)s location assigned." msgstr "" -#: bzrlib/errors.py:3024 +#: bzrlib/errors.py:3039 msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s." msgstr "" -#: bzrlib/errors.py:3034 +#: bzrlib/errors.py:3049 msgid "Unknown rules detected: %(unknowns_str)s." msgstr "" -#: bzrlib/errors.py:3045 +#: bzrlib/errors.py:3060 msgid "Tip change rejected: %(msg)s" msgstr "" -#: bzrlib/errors.py:3053 +#: bzrlib/errors.py:3068 msgid "Shelf corrupt." msgstr "" -#: bzrlib/errors.py:3058 +#: bzrlib/errors.py:3073 msgid "Corruption while decompressing repository file%(orig_error)s" msgstr "" -#: bzrlib/errors.py:3070 +#: bzrlib/errors.py:3085 msgid "No changes are shelved with id \"%(shelf_id)d\"." msgstr "" -#: bzrlib/errors.py:3078 +#: bzrlib/errors.py:3093 msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead." msgstr "" -#: bzrlib/errors.py:3086 +#: bzrlib/errors.py:3101 msgid "" "An attempt to access a url outside the server jail was made: '%(url)s'." msgstr "" -#: bzrlib/errors.py:3094 +#: bzrlib/errors.py:3109 msgid "The user aborted the operation." msgstr "" -#: bzrlib/errors.py:3099 +#: bzrlib/errors.py:3114 msgid "Branching '%(url)s'(%(format)s) must create a working tree." msgstr "" -#: bzrlib/errors.py:3109 +#: bzrlib/errors.py:3124 msgid "No such view: %(view_name)s." msgstr "" -#: bzrlib/errors.py:3119 +#: bzrlib/errors.py:3134 msgid "" "Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree " "to a later format." msgstr "" -#: bzrlib/errors.py:3128 +#: bzrlib/errors.py:3143 msgid "" "Specified file \"%(file_name)s\" is outside the current view: %(view_str)s" msgstr "" -#: bzrlib/errors.py:3195 +#: bzrlib/errors.py:3210 msgid "%(bzrdir)r does not support co-located branches." msgstr "" -#: bzrlib/errors.py:3201 +#: bzrlib/errors.py:3216 msgid "" "Unable to determine your name.\n" "Please, set your name with the 'whoami' command.\n" "E.g. bzr whoami \"Your Name \"" msgstr "" -#: bzrlib/errors.py:3210 +#: bzrlib/errors.py:3225 msgid "Invalid pattern(s) found. %(msg)s" msgstr "" -#: bzrlib/errors.py:3218 +#: bzrlib/errors.py:3233 msgid "" "Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr " "unbind` to fix." msgstr "" -#: bzrlib/errors.py:3229 +#: bzrlib/errors.py:3244 msgid "Loop involving %(refs)r while expanding \"%(string)s\"." msgstr "" -#: bzrlib/errors.py:3238 +#: bzrlib/errors.py:3253 msgid "Option %(name)s is not defined while expanding \"%(string)s\"." msgstr "" -#: bzrlib/errors.py:3247 +#: bzrlib/errors.py:3262 msgid "" "No compatible object available for operations from %(source)r to %(target)r." msgstr "" -#: bzrlib/errors.py:3257 +#: bzrlib/errors.py:3272 msgid "" "VFS requests over the smart server are not allowed. Encountered: %(method)s, " "%(arguments)s." msgstr "" -#: bzrlib/errors.py:3267 +#: bzrlib/errors.py:3282 msgid "" "Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by " "format %(format)r" msgstr "" -#: bzrlib/errors.py:3279 +#: bzrlib/errors.py:3294 msgid "" "Missing feature %(feature)s not provided by this version of Bazaar or any " "plugin." msgstr "" -#: bzrlib/errors.py:3292 +#: bzrlib/errors.py:3307 msgid "Binary files section encountered." msgstr "" -#: bzrlib/errors.py:3300 +#: bzrlib/errors.py:3315 msgid "" "Malformed patch header. %(desc)s\n" "%(line)r" msgstr "" -#: bzrlib/errors.py:3309 +#: bzrlib/errors.py:3324 msgid "" "Malformed hunk header. %(desc)s\n" "%(line)r" msgstr "" -#: bzrlib/errors.py:3318 +#: bzrlib/errors.py:3333 msgid "" "Malformed line. %(desc)s\n" "%(line)r" msgstr "" -#: bzrlib/errors.py:3328 +#: bzrlib/errors.py:3343 msgid "" "Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", " "but patch says it should be \"%(patch_line)s\"" msgstr "" -#: bzrlib/errors.py:3339 +#: bzrlib/errors.py:3354 msgid "The feature %(feature)s has already been registered." msgstr "" @@ -6257,7 +6257,7 @@ msgid "annotating" msgstr "" -#: bzrlib/lock.py:548 +#: bzrlib/lock.py:549 msgid "{0!r} was {1} locked again" msgstr "" @@ -6500,24 +6500,24 @@ msgid "Generate only the shell function, don't enable it" msgstr "" -#: bzrlib/plugins/launchpad/cmds.py:44 +#: bzrlib/plugins/launchpad/cmds.py:43 msgid "Register a branch with launchpad.net." msgstr "" -#: bzrlib/plugins/launchpad/cmds.py:46 +#: bzrlib/plugins/launchpad/cmds.py:45 msgid "" "This command lists a bzr branch in the directory of branches on\n" "launchpad.net. Registration allows the branch to be associated with\n" "bugs or specifications." msgstr "" -#: bzrlib/plugins/launchpad/cmds.py:50 +#: bzrlib/plugins/launchpad/cmds.py:49 msgid "" "Before using this command you must register the project to which the\n" "branch belongs, and create an account for yourself on launchpad.net." msgstr "" -#: bzrlib/plugins/launchpad/cmds.py:53 +#: bzrlib/plugins/launchpad/cmds.py:52 msgid "" "arguments:\n" " public_url: The publicly visible url for the branch to register.\n" @@ -6529,133 +6529,133 @@ " otherwise error." msgstr "" -#: bzrlib/plugins/launchpad/cmds.py:62 +#: bzrlib/plugins/launchpad/cmds.py:61 msgid "" "example:\n" " bzr register-branch http://foo.com/bzr/fooproject.mine \\\n" " --project fooproject" msgstr "" -#: bzrlib/plugins/launchpad/cmds.py:69 +#: bzrlib/plugins/launchpad/cmds.py:68 msgid "Launchpad project short name to associate with the branch." msgstr "" -#: bzrlib/plugins/launchpad/cmds.py:76 +#: bzrlib/plugins/launchpad/cmds.py:75 msgid "" "Short name for the branch; by default taken from the last component of the " "url." msgstr "" -#: bzrlib/plugins/launchpad/cmds.py:80 +#: bzrlib/plugins/launchpad/cmds.py:79 msgid "One-sentence description of the branch." msgstr "" -#: bzrlib/plugins/launchpad/cmds.py:83 +#: bzrlib/plugins/launchpad/cmds.py:82 msgid "Longer description of the purpose or contents of the branch." msgstr "" -#: bzrlib/plugins/launchpad/cmds.py:86 +#: bzrlib/plugins/launchpad/cmds.py:85 msgid "Branch author's email address, if not yourself." msgstr "" -#: bzrlib/plugins/launchpad/cmds.py:89 +#: bzrlib/plugins/launchpad/cmds.py:88 msgid "The bug this branch fixes." msgstr "" -#: bzrlib/plugins/launchpad/cmds.py:92 +#: bzrlib/plugins/launchpad/cmds.py:91 msgid "Prepare the request but don't actually send it." msgstr "" -#: bzrlib/plugins/launchpad/cmds.py:114 +#: bzrlib/plugins/launchpad/cmds.py:113 msgid "" "register-branch requires a public branch url - see bzr help register-branch." msgstr "" -#: bzrlib/plugins/launchpad/cmds.py:122 +#: bzrlib/plugins/launchpad/cmds.py:121 msgid "--product is deprecated; please use --project." msgstr "" -#: bzrlib/plugins/launchpad/cmds.py:152 +#: bzrlib/plugins/launchpad/cmds.py:151 msgid "Open a Launchpad branch page in your web browser." msgstr "" -#: bzrlib/plugins/launchpad/cmds.py:157 +#: bzrlib/plugins/launchpad/cmds.py:156 msgid "Do not actually open the browser. Just say the URL we would use." msgstr "" -#: bzrlib/plugins/launchpad/cmds.py:192 +#: bzrlib/plugins/launchpad/cmds.py:191 #, python-format msgid "Opening %s in web browser" msgstr "" -#: bzrlib/plugins/launchpad/cmds.py:200 +#: bzrlib/plugins/launchpad/cmds.py:199 msgid "Show or set the Launchpad user ID." msgstr "" -#: bzrlib/plugins/launchpad/cmds.py:202 +#: bzrlib/plugins/launchpad/cmds.py:201 msgid "" "When communicating with Launchpad, some commands need to know your\n" "Launchpad user ID. This command can be used to set or show the\n" "user ID that Bazaar will use for such communication." msgstr "" -#: bzrlib/plugins/launchpad/cmds.py:206 +#: bzrlib/plugins/launchpad/cmds.py:205 msgid "" ":Examples:\n" " Show the Launchpad ID of the current user::" msgstr "" -#: bzrlib/plugins/launchpad/cmds.py:209 +#: bzrlib/plugins/launchpad/cmds.py:208 msgid " bzr launchpad-login" msgstr "" -#: bzrlib/plugins/launchpad/cmds.py:211 +#: bzrlib/plugins/launchpad/cmds.py:210 msgid " Set the Launchpad ID of the current user to 'bob'::" msgstr "" -#: bzrlib/plugins/launchpad/cmds.py:213 +#: bzrlib/plugins/launchpad/cmds.py:212 msgid " bzr launchpad-login bob" msgstr "" -#: bzrlib/plugins/launchpad/cmds.py:220 +#: bzrlib/plugins/launchpad/cmds.py:219 msgid "Don't check that the user name is valid." msgstr "" -#: bzrlib/plugins/launchpad/cmds.py:235 bzrlib/plugins/launchpad/cmds.py:246 +#: bzrlib/plugins/launchpad/cmds.py:234 bzrlib/plugins/launchpad/cmds.py:245 msgid "Launchpad user ID exists and has SSH keys.\n" msgstr "" -#: bzrlib/plugins/launchpad/cmds.py:238 +#: bzrlib/plugins/launchpad/cmds.py:237 msgid "No Launchpad user ID configured.\n" msgstr "" -#: bzrlib/plugins/launchpad/cmds.py:249 +#: bzrlib/plugins/launchpad/cmds.py:248 #, python-format msgid "Launchpad user ID set to '%s'.\n" msgstr "" -#: bzrlib/plugins/launchpad/cmds.py:255 +#: bzrlib/plugins/launchpad/cmds.py:254 msgid "Ask Launchpad to mirror a branch now." msgstr "" -#: bzrlib/plugins/launchpad/cmds.py:272 +#: bzrlib/plugins/launchpad/cmds.py:271 msgid "Propose merging a branch on Launchpad." msgstr "" -#: bzrlib/plugins/launchpad/cmds.py:274 +#: bzrlib/plugins/launchpad/cmds.py:273 msgid "" "This will open your usual editor to provide the initial comment. When it\n" "has created the proposal, it will open it in your default web browser." msgstr "" -#: bzrlib/plugins/launchpad/cmds.py:277 +#: bzrlib/plugins/launchpad/cmds.py:276 msgid "" "The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n" "is not supplied, the remembered submit branch will be used. If no submit\n" "branch is remembered, the development focus will be used." msgstr "" -#: bzrlib/plugins/launchpad/cmds.py:281 +#: bzrlib/plugins/launchpad/cmds.py:280 msgid "" "By default, the SUBMIT_BRANCH's review team will be requested to review\n" "the merge proposal. This can be overriden by specifying --review (-R).\n" @@ -6663,21 +6663,21 @@ "may optionally be followed by '=' and the review type. For example:" msgstr "" -#: bzrlib/plugins/launchpad/cmds.py:286 +#: bzrlib/plugins/launchpad/cmds.py:285 msgid " bzr lp-propose-merge --review jrandom --review review-team=qa" msgstr "" -#: bzrlib/plugins/launchpad/cmds.py:288 +#: bzrlib/plugins/launchpad/cmds.py:287 msgid "" "This will propose a merge, request \"jrandom\" to perform a review of\n" "unspecified type, and request \"review-team\" to perform a \"qa\" review." msgstr "" -#: bzrlib/plugins/launchpad/cmds.py:293 +#: bzrlib/plugins/launchpad/cmds.py:292 msgid "Propose the merge on staging." msgstr "" -#: bzrlib/plugins/launchpad/cmds.py:295 +#: bzrlib/plugins/launchpad/cmds.py:294 msgid "Commit message." msgstr "" @@ -6707,7 +6707,7 @@ "which the merge was performed, or one of the revisions that was merged." msgstr "" -#: bzrlib/plugins/launchpad/cmds.py:345 +#: bzrlib/plugins/launchpad/cmds.py:344 msgid "So, to find the merge proposal that reviewed line 1 of README::" msgstr "" @@ -6715,11 +6715,11 @@ msgid " bzr lp-find-proposal -r annotate:README:1" msgstr "" -#: bzrlib/plugins/launchpad/cmds.py:363 +#: bzrlib/plugins/launchpad/cmds.py:365 msgid "No review found." msgstr "" -#: bzrlib/plugins/launchpad/cmds.py:364 +#: bzrlib/plugins/launchpad/cmds.py:366 #, python-format msgid "%d proposals(s) found." msgstr "" @@ -6740,7 +6740,7 @@ msgid "Finding Launchpad branch" msgstr "" -#: bzrlib/plugins/launchpad/cmds.py:395 +#: bzrlib/plugins/launchpad/cmds.py:378 msgid "Finding proposals" msgstr "" @@ -6748,38 +6748,38 @@ msgid "Setting ssh/sftp usernames for launchpad.net." msgstr "" -#: bzrlib/plugins/launchpad/lp_api.py:241 -#: bzrlib/plugins/launchpad/lp_api.py:246 +#: bzrlib/plugins/launchpad/lp_api.py:228 +#: bzrlib/plugins/launchpad/lp_api.py:233 #, python-format msgid "%s is not registered on Launchpad" msgstr "" -#: bzrlib/plugins/launchpad/lp_api.py:256 +#: bzrlib/plugins/launchpad/lp_api.py:243 #, python-format msgid "%s has no development focus." msgstr "" -#: bzrlib/plugins/launchpad/lp_api.py:261 +#: bzrlib/plugins/launchpad/lp_api.py:248 #, python-format msgid "development focus %s has no branch." msgstr "" -#: bzrlib/plugins/launchpad/lp_api.py:266 +#: bzrlib/plugins/launchpad/lp_api.py:253 #, python-format msgid "source package %s has no branch." msgstr "" -#: bzrlib/plugins/launchpad/lp_api.py:270 +#: bzrlib/plugins/launchpad/lp_api.py:257 #, python-format msgid "%s has no associated product or source package." msgstr "" -#: bzrlib/plugins/launchpad/lp_api.py:282 +#: bzrlib/plugins/launchpad/lp_api.py:269 #, python-format msgid "%s is already up-to-date." msgstr "" -#: bzrlib/plugins/launchpad/lp_api.py:289 +#: bzrlib/plugins/launchpad/lp_api.py:276 #, python-format msgid "Pushing to %s" msgstr "" @@ -6791,7 +6791,7 @@ " remote: {2}" msgstr "" -#: bzrlib/plugins/launchpad/lp_propose.py:150 +#: bzrlib/plugins/launchpad/lp_propose.py:159 #, python-format msgid "There is already a branch merge proposal: %s" msgstr "" @@ -7251,33 +7251,33 @@ msgid "listening on port: %s" msgstr "" -#: bzrlib/switch.py:73 +#: bzrlib/switch.py:84 msgid "Pending merges must be committed or reverted before using switch." msgstr "" -#: bzrlib/switch.py:100 +#: bzrlib/switch.py:111 msgid "" "Cannot switch as local commits found in the checkout. Commit these to the " "bound branch or use --force to throw them away." msgstr "" -#: bzrlib/switch.py:105 +#: bzrlib/switch.py:116 #, python-format msgid "" "Unable to connect to current master branch %(target)s: %(error)s To switch " "anyway, use --force." msgstr "" -#: bzrlib/switch.py:129 +#: bzrlib/switch.py:140 msgid "Cannot switch a branch, only a checkout." msgstr "" -#: bzrlib/switch.py:167 +#: bzrlib/switch.py:183 #, python-format msgid "Tree is up to date at revision %d." msgstr "" -#: bzrlib/switch.py:173 +#: bzrlib/switch.py:190 #, python-format msgid "Updated to revision %d." msgstr "" @@ -7441,7 +7441,7 @@ msgid "PageFaultCount %8d" msgstr "" -#: bzrlib/workingtree.py:1482 +#: bzrlib/workingtree.py:1516 msgid "Rerun update after fixing the conflicts." msgstr "" @@ -7773,7 +7773,7 @@ msgid "Environment Variables" msgstr "" -#: en/help_topics/env-variables.txt:3 +#: en/help_topics/env-variables.txt:5 msgid "" "=================== " "===========================================================\n" @@ -10403,14 +10403,14 @@ "~~~~~~~~~~~~~~~~~~~~~" msgstr "" -#: en/help_topics/configuration.txt:719 +#: en/help_topics/configuration.txt:735 msgid "" "Specifies which external merge tool (as defined above) should be selected " "by\n" "default in tools such as ``bzr qconflicts``." msgstr "" -#: en/help_topics/configuration.txt:724 +#: en/help_topics/configuration.txt:740 msgid " bzr.default_mergetool = kdiff3\n" msgstr "" diff -Nru language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/checkbox.po language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/checkbox.po --- language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/checkbox.po 2013-01-29 09:36:57.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/checkbox.po 2014-01-07 07:01:51.000000000 +0000 @@ -9,24 +9,24 @@ msgstr "" "Project-Id-Version: checkbox\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-18 23:32+0000\n" +"POT-Creation-Date: 2013-10-17 21:12+0000\n" "PO-Revision-Date: 2012-04-14 19:46+0000\n" "Last-Translator: Carlos Gong \n" "Language-Team: Chinese (simplified) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-01-28 15:47+0000\n" -"X-Generator: Launchpad (build 16451)\n" +"X-Launchpad-Export-Date: 2014-01-06 16:32+0000\n" +"X-Generator: Launchpad (build 16877)\n" "Language: \n" #. Title of the user interface #: ../gtk/checkbox-gtk.ui.h:1 ../qt/checkbox-qt.desktop.in.h:1 -#: ../plugins/user_interface.py:43 ../qt/frontend/ui_qtfront.h:589 +#: ../plugins/user_interface.py:43 msgid "System Testing" msgstr "系统测试" -#: ../gtk/checkbox-gtk.ui.h:2 ../checkbox_gtk/gtk_interface.py:538 +#: ../gtk/checkbox-gtk.ui.h:2 ../checkbox_gtk/gtk_interface.py:561 msgid "_Test" msgstr "测试(_T)" @@ -42,8 +42,8 @@ msgid "_Skip this test" msgstr "跳过这个测试(_S)" -#: ../gtk/checkbox-gtk.ui.h:6 ../checkbox_cli/cli_interface.py:444 -#: ../checkbox_urwid/urwid_interface.py:267 +#: ../gtk/checkbox-gtk.ui.h:6 ../checkbox_cli/cli_interface.py:460 +#: ../checkbox_urwid/urwid_interface.py:289 msgid "Further information:" msgstr "更多信息：" @@ -73,7 +73,7 @@ msgstr "检测音频设备的测试" #. description -#: ../jobs/audio.txt.in:16 +#: ../jobs/audio.txt.in:18 msgid "" "PURPOSE:\n" " This test will check that internal speakers work correctly\n" @@ -94,7 +94,7 @@ " 您听到声音了吗？" #. description -#: ../jobs/audio.txt.in:33 +#: ../jobs/audio.txt.in:73 msgid "" "PURPOSE:\n" " This test will check that headphones connector works correctly\n" @@ -114,7 +114,7 @@ " 您是否通过耳机听到了声音，从耳机播放的声音是否没有失真、咔嗒声或其他奇怪噪声？" #. description -#: ../jobs/audio.txt.in:49 +#: ../jobs/audio.txt.in:91 msgid "" "PURPOSE:\n" " This test will check that recording sound using the onboard microphone " @@ -136,7 +136,7 @@ " 是否听到回放了您说的话？" #. description -#: ../jobs/audio.txt.in:66 +#: ../jobs/audio.txt.in:110 msgid "" "PURPOSE:\n" " This test will check that recording sound using an external microphone " @@ -158,7 +158,7 @@ " 是否听到回放了您说的话？" #. description -#: ../jobs/audio.txt.in:82 +#: ../jobs/audio.txt.in:128 msgid "" "PURPOSE:\n" " This test will check that a USB audio device works correctly\n" @@ -197,13 +197,13 @@ " 此测试将尝试安装并运行自动测试用例。这些测试可能具有破坏性，因此在默认情况下，此测试被列入黑名单。" #. description -#: ../jobs/bluetooth.txt.in:8 +#: ../jobs/bluetooth.txt.in:22 msgid "" "Automated test to store bluetooth device information in checkbox report" msgstr "将蓝牙设备信息保存在 checkbox 报告中的自动测试" #. description -#: ../jobs/bluetooth.txt.in:14 +#: ../jobs/bluetooth.txt.in:28 msgid "" "PURPOSE:\n" " This test will check that bluetooth connection works correctly\n" @@ -236,7 +236,7 @@ " 所有这些步骤是否均能够执行？" #. description -#: ../jobs/bluetooth.txt.in:33 +#: ../jobs/bluetooth.txt.in:47 msgid "" "PURPOSE:\n" " This test will check that you can transfer information through a " @@ -258,7 +258,7 @@ " 所有文件是否均正确复制？" #. description -#: ../jobs/bluetooth.txt.in:47 +#: ../jobs/bluetooth.txt.in:61 msgid "" "PURPOSE:\n" " This test will check that you can record and hear audio using a " @@ -343,12 +343,12 @@ " 鼠标是否正常工作？" #. description -#: ../jobs/camera.txt.in:7 +#: ../jobs/camera.txt.in:6 msgid "This Automated test attempts to detect a camera." msgstr "此自动测试尝试检测摄像头。" #. description -#: ../jobs/camera.txt.in:16 +#: ../jobs/camera.txt.in:14 msgid "" "PURPOSE:\n" " This test will check that the built-in camera works\n" @@ -366,7 +366,7 @@ " 您是否看到了捕获的视频？" #. description -#: ../jobs/camera.txt.in:33 +#: ../jobs/camera.txt.in:32 msgid "" "PURPOSE:\n" " This test will check that the built-in camera works\n" @@ -428,22 +428,22 @@ msgstr "使用 固件测试用例(Firmware Test Suite, fwts cpufreq) 测试 CPU 的扩展能力。" #. description -#: ../jobs/cpu.txt.in:15 +#: ../jobs/cpu.txt.in:21 msgid "Test for clock jitter." msgstr "测试是否出现时钟抖动。" #. description -#: ../jobs/cpu.txt.in:23 +#: ../jobs/cpu.txt.in:28 msgid "Test offlining CPUs in a multicore system." msgstr "测试在多核系统上屏蔽 CPU。" #. description -#: ../jobs/cpu.txt.in:30 +#: ../jobs/cpu.txt.in:35 msgid "This test checks cpu topology for accuracy" msgstr "本测试将检测 CPU 的拓扑结构精度。" #. description -#: ../jobs/cpu.txt.in:38 +#: ../jobs/cpu.txt.in:42 msgid "This test checks that CPU frequency governors are obeyed when set." msgstr "此测试检查在设置了 CPU 频率管理器时，其是否得到遵守。" @@ -493,12 +493,12 @@ msgstr "测试在安装软件包后，syslogd 守护程序是否运行。" #. description -#: ../jobs/daemons.txt.in:61 +#: ../jobs/daemons.txt.in:60 msgid "Test if the udevd daemon is running when the package is installed." msgstr "测试在安装软件包后，udevd 守护程序是否运行。" #. description -#: ../jobs/daemons.txt.in:67 +#: ../jobs/daemons.txt.in:66 msgid "Test if the winbindd daemon is running when the package is installed." msgstr "测试在安装软件包后，winbindd 守护程序是否运行。" @@ -508,32 +508,32 @@ msgstr "检测并显示连接到该系统的磁盘。" #. description -#: ../jobs/disk.txt.in:9 +#: ../jobs/benchmarks.txt.in:18 msgid "Benchmark for each disk" msgstr "每个磁盘的基准测试" #. description -#: ../jobs/disk.txt.in:23 +#: ../jobs/disk.txt.in:9 msgid "Check stats changes for each disk" msgstr "检查每个磁盘的状态变化" #. description -#: ../jobs/disk.txt.in:40 +#: ../jobs/disk.txt.in:27 msgid "SMART test" msgstr "SMART 测试" #. description -#: ../jobs/disk.txt.in:56 +#: ../jobs/disk.txt.in:45 msgid "Maximum disk space used during a default installation test" msgstr "默认安装测试过程中使用的最大磁盘空间" #. description -#: ../jobs/disk.txt.in:71 +#: ../jobs/disk.txt.in:62 msgid "Verify system storage performs at or above baseline performance" msgstr "验证系统存储的表现是否达到或高于基线性能" #. description -#: ../jobs/disk.txt.in:88 +#: ../jobs/disk.txt.in:79 msgid "" "Verify that storage devices, such as Fibre Channel and RAID can be detected " "and perform under stress." @@ -629,7 +629,7 @@ " 此测试的验证自动进行。不要更改自动选择的结果" #. description -#: ../jobs/firewire.txt.in:19 +#: ../jobs/firewire.txt.in:20 msgid "" "This is an automated test which performs read/write operations on an " "attached FireWire HDD" @@ -664,17 +664,17 @@ msgstr "软盘测试" #. description -#: ../jobs/graphics.txt.in:5 +#: ../jobs/graphics.txt.in:12 msgid "Test to output the Xorg version" msgstr "输出 Xorg 版本的测试" #. description -#: ../jobs/graphics.txt.in:12 +#: ../jobs/benchmarks.txt.in:35 msgid "Run gtkperf to make sure that GTK based test cases work" msgstr "运行 gtkperf 以确保基于 GTK 的测试用例正常工作" #. description -#: ../jobs/graphics.txt.in:18 +#: ../jobs/graphics.txt.in:17 msgid "" "PURPOSE:\n" " This test will verify that the GUI is usable after manually changing " @@ -727,24 +727,24 @@ " 显示画面旋转是否正常改变？" #. description -#: ../jobs/graphics.txt.in:50 +#: ../jobs/graphics.txt.in:36 msgid "Test that the X process is running." msgstr "测试 X 进程是否正在运行。" #. description -#: ../jobs/graphics.txt.in:56 +#: ../jobs/graphics.txt.in:43 msgid "Test that the X is not running in failsafe mode." msgstr "测试 X 是否没有在故障安全(failsafe)模式下运行。" #. description -#: ../jobs/graphics.txt.in:63 +#: ../jobs/graphics.txt.in:44 msgid "" "Test that X does not leak memory when running programs on systems with intel " "based graphics." msgstr "测试当在配有英特尔显卡的系统上运行程序时，X 是否没有出现内存泄漏。" #. description -#: ../jobs/graphics.txt.in:70 +#: ../jobs/graphics.txt.in:51 msgid "" "PURPOSE:\n" " This test will verify the default display resolution\n" @@ -765,19 +765,19 @@ " 对于您的显示器，这是否可接受？" #. description -#: ../jobs/graphics.txt.in:85 +#: ../jobs/graphics.txt.in:67 msgid "" "Ensure the current resolution meets or exceeds the recommended minimum " "resolution (800x600). See here for details:" msgstr "确保当前分辨率达到或超过建议的最小分辨率(00x600)。有关详细信息，请参见这里：" #. description -#: ../jobs/graphics.txt.in:85 +#: ../jobs/graphics.txt.in:67 msgid "https://help.ubuntu.com/community/Installation/SystemRequirements" msgstr "https://help.ubuntu.com/community/Installation/SystemRequirements" #. description -#: ../jobs/graphics.txt.in:95 +#: ../jobs/graphics.txt.in:101 msgid "" "PURPOSE:\n" " This test will test the default display\n" @@ -794,12 +794,12 @@ " 是否看到色条和雪花？" #. description -#: ../jobs/graphics.txt.in:106 +#: ../jobs/graphics.txt.in:113 msgid "Check that VESA drivers are not in use" msgstr "检查是否未使用 VESA 驱动程序" #. description -#: ../jobs/graphics.txt.in:113 +#: ../jobs/graphics.txt.in:121 msgid "" "PURPOSE:\n" " This test cycles through the detected video modes\n" @@ -816,17 +816,17 @@ " 屏幕是否在每个模式下都正常工作？" #. description -#: ../jobs/graphics.txt.in:126 +#: ../jobs/graphics.txt.in:148 msgid "Check that hardware is able to run compiz" msgstr "检查硬件是否能够运行 compiz" #. description -#: ../jobs/graphics.txt.in:133 +#: ../jobs/graphics.txt.in:155 msgid "Check that hardware is able to run Unity 3D" msgstr "检查硬件是否能够运行 Unity 3D" #. description -#: ../jobs/graphics.txt.in:139 +#: ../jobs/graphics.txt.in:161 msgid "" "PURPOSE:\n" " This test tests the basic 3D capabilities of your video card\n" @@ -848,7 +848,7 @@ " 2. 此动画是否没有出现缓慢/不流畅现象？" #. description -#: ../jobs/hibernate.txt.in:7 +#: ../jobs/hibernate.txt.in:15 msgid "" "PURPOSE:\n" " This test will check to make sure your system can successfully hibernate " @@ -875,68 +875,68 @@ " 该系统是否成功休眠，唤醒后其是否正常工作？" #. description -#: ../jobs/info.txt.in:5 +#: ../jobs/info.txt.in:6 msgid "Attaches a report of installed codecs for Intel HDA" msgstr "附加已安装的英特尔 HDA 编解码器的报告" #. description -#: ../jobs/info.txt.in:10 +#: ../jobs/info.txt.in:12 msgid "Attaches a report of CPU information" msgstr "附加有关 CPU 信息的报告" #. description -#: ../jobs/info.txt.in:15 +#: ../jobs/info.txt.in:18 msgid "Attaches a copy of /var/log/dmesg to the test results" msgstr "将 /var/log/dmesg 的副本附加到测试结果中" #. description -#: ../jobs/info.txt.in:20 +#: ../jobs/info.txt.in:24 msgid "Attaches info on DMI" msgstr "附加有关 DMI 的信息" #. description -#: ../jobs/info.txt.in:26 +#: ../jobs/info.txt.in:32 msgid "Attaches dmidecode output" msgstr "附加 dmidecode 输出" #. description -#: ../jobs/info.txt.in:31 +#: ../jobs/info.txt.in:52 msgid "Attaches very verbose lspci output." msgstr "附加极为冗长的 lspci 输出。" #. description -#: ../jobs/info.txt.in:40 +#: ../jobs/info.txt.in:77 msgid "Attaches the contents of the various modprobe conf files." msgstr "附加各个 modprobe 配置文件的内容。" #. description -#: ../jobs/info.txt.in:45 +#: ../jobs/info.txt.in:83 msgid "Attaches the contents of the /etc/modules file." msgstr "附加 /etc/modules 文件的内容。" #. description -#: ../jobs/info.txt.in:50 +#: ../jobs/info.txt.in:89 msgid "attaches the contents of various sysctl config files." msgstr "附加各个 sysctl 配置文件的内容。" #. description -#: ../jobs/info.txt.in:54 +#: ../jobs/info.txt.in:93 msgid "Attaches a report of sysfs attributes." msgstr "附加 sysfs 属性的报告。" #. description -#: ../jobs/info.txt.in:65 +#: ../jobs/info.txt.in:106 msgid "" "Attaches a dump of the udev database showing system hardware information." msgstr "附加表示系统硬件信息的 udev 数据库的转储。" #. description -#: ../jobs/info.txt.in:72 +#: ../jobs/info.txt.in:119 msgid "Attaches a tarball of gcov data if present." msgstr "附加 gcov 数据(如果存在)的归档。" #. description -#: ../jobs/info.txt.in:77 +#: ../jobs/info.txt.in:125 msgid "Attaches a list of the currently running kernel modules." msgstr "附加当前正在运行的内核模块的列表。" @@ -956,42 +956,42 @@ msgstr "从运行的 固件测试用例(Firmware Test Suite)中收集日志。" #. description -#: ../jobs/info.txt.in:103 +#: ../jobs/info.txt.in:131 msgid "Attaches the contents of /proc/acpi/sleep if it exists." msgstr "附加 /proc/acpi/sleep 的内容(如果存在)。" #. description -#: ../jobs/info.txt.in:107 +#: ../jobs/info.txt.in:135 msgid "Bootchart information." msgstr "Bootchart 信息。" #. description -#: ../jobs/info.txt.in:116 +#: ../jobs/info.txt.in:144 msgid "SATA/IDE device information." msgstr "SATA/IDE 设备信息。" #. description -#: ../jobs/info.txt.in:133 +#: ../jobs/info.txt.in:163 msgid "Attaches the bootchart png file for bootchart runs" msgstr "附加针对 bootchart 运行情况的 bootchart png 文件" #. description -#: ../jobs/info.txt.in:142 +#: ../jobs/info.txt.in:172 msgid "Attaches the bootchart log for bootchart test runs." msgstr "附加针对 bootchart 测试运行情况的 bootchart log。" #. description -#: ../jobs/info.txt.in:150 +#: ../jobs/info.txt.in:180 msgid "installs the installer bootchart tarball if it exists." msgstr "安装启动流程检测程序。" #. description -#: ../jobs/info.txt.in:155 +#: ../jobs/info.txt.in:186 msgid "Attaches the installer debug log if it exists." msgstr "附加安装程序调试日志(如果存在)。" #. description -#: ../jobs/input.txt.in:4 +#: ../jobs/input.txt.in:22 msgid "" "PURPOSE:\n" " This test will test your pointing device\n" @@ -1010,7 +1010,7 @@ " 该指点设备是否正常工作？" #. description -#: ../jobs/input.txt.in:17 +#: ../jobs/input.txt.in:35 msgid "" "PURPOSE:\n" " This test will test your keyboard\n" @@ -1088,7 +1088,7 @@ " 在您按下该键后是否静音？" #. description -#: ../jobs/keys.txt.in:37 +#: ../jobs/keys.txt.in:48 msgid "" "PURPOSE:\n" " This test will test the sleep key\n" @@ -1124,7 +1124,7 @@ " 是否显示了电池状态通知？" #. description -#: ../jobs/keys.txt.in:60 +#: ../jobs/keys.txt.in:76 msgid "" "PURPOSE:\n" " This test will test the wireless key\n" @@ -1204,47 +1204,47 @@ msgstr "磁盘测试" #. description -#: ../jobs/local.txt.in:59 +#: ../jobs/local.txt.in:66 msgid "Fingerprint reader tests" msgstr "指纹阅读器测试" #. description -#: ../jobs/local.txt.in:66 +#: ../jobs/local.txt.in:73 msgid "Firewire disk tests" msgstr "火线(Firewire)磁盘测试" #. description -#: ../jobs/local.txt.in:73 +#: ../jobs/local.txt.in:80 msgid "Floppy disk tests" msgstr "软盘测试" #. description -#: ../jobs/local.txt.in:80 +#: ../jobs/local.txt.in:87 msgid "Graphics tests" msgstr "显卡测试" #. description -#: ../jobs/local.txt.in:87 +#: ../jobs/local.txt.in:94 msgid "Hibernation tests" msgstr "休眠测试" #. description -#: ../jobs/local.txt.in:94 +#: ../jobs/local.txt.in:101 msgid "Informational tests" msgstr "信息性测试" #. description -#: ../jobs/local.txt.in:101 +#: ../jobs/local.txt.in:108 msgid "Input Devices tests" msgstr "输入设备测试" #. description -#: ../jobs/local.txt.in:108 +#: ../jobs/local.txt.in:115 msgid "Software Installation tests" msgstr "软件安装测试" #. description -#: ../jobs/local.txt.in:115 +#: ../jobs/local.txt.in:122 msgid "Hotkey tests" msgstr "热键测试" @@ -1269,27 +1269,27 @@ msgstr "内存测试" #. description -#: ../jobs/local.txt.in:150 +#: ../jobs/local.txt.in:157 msgid "Miscellaneous tests" msgstr "杂项测试" #. description -#: ../jobs/local.txt.in:157 +#: ../jobs/local.txt.in:164 msgid "Monitor tests" msgstr "显示器测试" #. description -#: ../jobs/local.txt.in:164 +#: ../jobs/local.txt.in:171 msgid "Networking tests" msgstr "联网测试" #. description -#: ../jobs/local.txt.in:171 +#: ../jobs/local.txt.in:178 msgid "Optical Drive tests" msgstr "光驱测试" #. description -#: ../jobs/local.txt.in:178 +#: ../jobs/local.txt.in:185 msgid "Panel Clock Verification tests" msgstr "面板时钟验证测试" @@ -1299,7 +1299,7 @@ msgstr "PCMCIA/PCIX 卡测试" #. description -#: ../jobs/local.txt.in:192 +#: ../jobs/local.txt.in:206 msgid "Peripheral tests" msgstr "外围设备测试" @@ -1309,7 +1309,7 @@ msgstr "Phoronix 测试套件测试" #. description -#: ../jobs/local.txt.in:206 +#: ../jobs/local.txt.in:220 msgid "Power Management tests" msgstr "电源管理测试" @@ -1319,17 +1319,17 @@ msgstr "QA 回归测试" #. description -#: ../jobs/local.txt.in:220 +#: ../jobs/local.txt.in:227 msgid "Server Services checks" msgstr "服务器服务检查" #. description -#: ../jobs/local.txt.in:227 +#: ../jobs/local.txt.in:234 msgid "Suspend tests" msgstr "挂起测试" #. description -#: ../jobs/local.txt.in:234 +#: ../jobs/local.txt.in:241 msgid "Touchpad tests" msgstr "触控板测试" @@ -1339,22 +1339,22 @@ msgstr "Unity 测试" #. description -#: ../jobs/local.txt.in:248 +#: ../jobs/local.txt.in:255 msgid "USB tests" msgstr "USB 测试" #. description -#: ../jobs/local.txt.in:255 +#: ../jobs/local.txt.in:262 msgid "User Applications" msgstr "用户应用程序" #. description -#: ../jobs/local.txt.in:262 +#: ../jobs/local.txt.in:276 msgid "Wireless networking tests" msgstr "无线联网测试" #. description -#: ../jobs/local.txt.in:269 +#: ../jobs/local.txt.in:290 msgid "Stress tests" msgstr "压力测试" @@ -1400,7 +1400,7 @@ " 选择的结果。" #. description -#: ../jobs/mediacard.txt.in:20 +#: ../jobs/mediacard.txt.in:22 msgid "" "This test is automated and executes after the mediacard/mmc-insert test is " "run. It tests reading and writing to the MMC card." @@ -1453,7 +1453,7 @@ " 选择的结果。" #. description -#: ../jobs/mediacard.txt.in:59 +#: ../jobs/suspend.txt.in:1378 msgid "" "This test is automated and executes after the mediacard/mmc-insert-after-" "suspend test is run. It tests reading and writing to the MMC card after the " @@ -1509,7 +1509,7 @@ " 选择的结果。" #. description -#: ../jobs/mediacard.txt.in:97 +#: ../jobs/mediacard.txt.in:62 msgid "" "This test is automated and executes after the mediacard/sd-insert test is " "run. It tests reading and writing to the SD card." @@ -1560,7 +1560,7 @@ " 此测试的验证自动进行。不要更改自动选择的结果。" #. description -#: ../jobs/mediacard.txt.in:136 +#: ../jobs/suspend.txt.in:1420 msgid "" "This test is automated and executes after the mediacard/sd-insert-after-" "suspend test is run. It tests reading and writing to the SD card after the " @@ -1616,7 +1616,7 @@ " 此测试的验证自动进行。不要更改自动选择的结果。" #. description -#: ../jobs/mediacard.txt.in:174 +#: ../jobs/mediacard.txt.in:113 msgid "" "This test is automated and executes after the mediacard/sdhc-insert test is " "run. It tests reading and writing to the SDHC card." @@ -1668,7 +1668,7 @@ " 此测试的验证自动进行。不要更改自动选择的结果。" #. description -#: ../jobs/mediacard.txt.in:213 +#: ../jobs/suspend.txt.in:1463 msgid "" "This test is automated and executes after the mediacard/sdhc-insert-after-" "suspend test is run. It tests reading and writing to the SDHC card after the " @@ -1723,7 +1723,7 @@ " 此测试的验证自动进行。不要更改自动选择的结果。" #. description -#: ../jobs/mediacard.txt.in:251 +#: ../jobs/mediacard.txt.in:153 msgid "" "This test is automated and executes after the mediacard/cf-insert test is " "run. It tests reading and writing to the CF card." @@ -1774,7 +1774,7 @@ " 此测试的验证自动进行。不要更改自动选择的结果。" #. description -#: ../jobs/mediacard.txt.in:290 +#: ../jobs/mediacard.txt.in:194 msgid "" "This test is automated and executes after the mediacard/cf-insert-after-" "suspend test is run. It tests reading and writing to the CF card after the " @@ -1812,12 +1812,12 @@ msgstr "此测试检查对比由 DMI 检测的内存模块的大小和 meminfo 中报告的内存容量。" #. description -#: ../jobs/memory.txt.in:14 +#: ../jobs/memory.txt.in:13 msgid "Test and exercise memory." msgstr "测试和使用内存。" #. description -#: ../jobs/miscellanea.txt.in:8 +#: ../jobs/miscellanea.txt.in:21 msgid "" "PURPOSE:\n" " This test will check that the system can switch to a virtual terminal " @@ -1837,26 +1837,26 @@ " 您的屏幕是否临时变为文本控制台，然后又切回到您当前的会话？" #. description -#: ../jobs/miscellanea.txt.in:21 +#: ../jobs/miscellanea.txt.in:34 msgid "Run Firmware Test Suite (fwts) automated tests." msgstr "运行固件测试用例(Firmware Test Suite, fwts)自动测试。" #. description -#: ../jobs/miscellanea.txt.in:31 +#: ../jobs/miscellanea.txt.in:51 msgid "" "This will run some basic connectivity tests against a BMC, verifying that " "IPMI works." msgstr "本测试将检测 BMC 的联通性，以确认 IPMI 是否能够正常运行。" #. description -#: ../jobs/miscellanea.txt.in:37 +#: ../jobs/miscellanea.txt.in:57 msgid "" " Determine if we need to run tests specific to portable computers that may " "not apply to desktops." msgstr " 确定是否需要运行特定于便携式计算机的测试，这些测试不能用于台式机。" #. description -#: ../jobs/miscellanea.txt.in:45 +#: ../jobs/miscellanea.txt.in:65 msgid "" "Test that the /var/crash directory doesn't contain anything. Lists the files " "contained within if it does, or echoes the status of the directory (doesn't " @@ -1864,7 +1864,7 @@ msgstr "测试 /var/crash 目录是否没有包含任何内容。列出其中包含的文件(如果有)，或者回显该目录的状态(不存在或为空)" #. description -#: ../jobs/miscellanea.txt.in:53 +#: ../jobs/virtualization.txt.in:6 msgid "" "Test to check that virtualization is supported and the test system has at " "least a minimal amount of RAM to function as an OpenStack Compute Node" @@ -2004,29 +2004,29 @@ " 您的显示器是否变为空白，然后再次打开？" #. description -#: ../jobs/networking.txt.in:5 +#: ../jobs/networking.txt.in:9 msgid "Test to detect the available network controllers" msgstr "检测可用网络控制器的测试" #. description -#: ../jobs/networking.txt.in:11 +#: ../jobs/networking.txt.in:16 msgid "Tests whether the system has a working Internet connection." msgstr "测试该系统是否具有正在工作的互联网连接。" #. description -#: ../jobs/networking.txt.in:16 +#: ../jobs/networking.txt.in:21 msgid "Network Information" msgstr "网络信息" #. description -#: ../jobs/networking.txt.in:40 +#: ../jobs/networking.txt.in:46 msgid "" "This is an automated test to gather some info on the current state of your " "network devices. If no devices are found, the test will exit with an error." msgstr "这是一个收集有关您网络设备当前状态的一些信息的自动测试。如果未发现设备，此测试将退出并报错。" #. description -#: ../jobs/networking.txt.in:46 +#: ../jobs/networking.txt.in:52 msgid "" "PURPOSE:\n" " This test will check your wired connection\n" @@ -2048,7 +2048,7 @@ " 是否显示通知以及是否正确建立了该连接？" #. description -#: ../jobs/networking.txt.in:59 +#: ../jobs/networking.txt.in:65 msgid "" "PURPOSE:\n" " This test will check that a DSL modem can be configured and connected.\n" @@ -2078,49 +2078,49 @@ " 是否显示通知以及是否正确建立了该连接？" #. description -#: ../jobs/networking.txt.in:76 +#: ../jobs/networking.txt.in:82 msgid "" "Automated test case to verify availability of some system on the network " "using ICMP ECHO packets." msgstr "使用 ICMP ECHO 数据包验证某个系统在网络上的可用性的自动测试用例。" #. description -#: ../jobs/networking.txt.in:83 ../jobs/peripheral.txt.in:37 +#: ../jobs/networking.txt.in:89 ../jobs/peripheral.txt.in:37 msgid "" "Automated test case to make sure that it's possible to download files " "through HTTP" msgstr "确保可通过 HTTP 下载文件的自动测试用例" #. description -#: ../jobs/networking.txt.in:91 +#: ../jobs/networking.txt.in:97 msgid "Test to see if we can sync local clock to an NTP server" msgstr "测试能否将本地时钟与 NTP 服务器同步" #. description -#: ../jobs/networking.txt.in:97 +#: ../jobs/networking.txt.in:103 msgid "" "Verify that an installation of checkbox-server on the network can be reached " "over SSH." msgstr "验证是否可以通过 SSH 达到在网络上安装的 checkbox-server。" #. description -#: ../jobs/networking.txt.in:103 +#: ../jobs/networking.txt.in:109 msgid "Try to enable a remote printer on the network and print a test page." msgstr "尝试在网络上启用远程打印机，并打印测试页。" #. description -#: ../jobs/networking.txt.in:108 +#: ../jobs/networking.txt.in:114 msgid "" "Automated test to walk multiple network cards and test each one in sequence." msgstr "自动使用多个网卡以及按顺序测试每个网卡。" #. description -#: ../jobs/networking.txt.in:128 +#: ../jobs/networking.txt.in:134 msgid "Test to measure the network bandwidth" msgstr "测量网络带宽的测试" #. description -#: ../jobs/optical.txt.in:8 +#: ../jobs/optical.txt.in:4 msgid "Test to detect the optical drives" msgstr "检测光驱的测试" @@ -2176,7 +2176,7 @@ " 如果测试成功，程序将自动选择“是”，反之则为测试失败。" #. description -#: ../jobs/optical.txt.in:46 +#: ../jobs/optical.txt.in:94 msgid "" "PURPOSE:\n" " This test will check your CD audio playback capabilities\n" @@ -2234,7 +2234,7 @@ " 如果测试成功，程序将自动选择“是”，反之则为失败。" #. description -#: ../jobs/optical.txt.in:82 +#: ../jobs/optical.txt.in:149 msgid "" "PURPOSE:\n" " This test will check your DVD movie playback capabilities. Note that " @@ -2263,7 +2263,7 @@ " 所有这些步骤是否均能够执行？" #. description -#: ../jobs/optical.txt.in:100 +#: ../jobs/optical.txt.in:158 msgid "" "PURPOSE:\n" " This test will check your DVD playback capabilities\n" @@ -2297,7 +2297,7 @@ " 桌面右上角中的时钟是否显示您时区的正确日期和时间？" #. description -#: ../jobs/panel_clock_test.txt.in:16 +#: ../jobs/panel_clock_test.txt.in:18 msgid "" "PURPOSE:\n" " This test will verify that the desktop clock synchronizes with the system " @@ -2325,7 +2325,7 @@ " 现在桌面时钟是否显示的时间是否正确？" #. description -#: ../jobs/panel_reboot.txt.in:4 +#: ../jobs/panel_reboot.txt.in:3 msgid "" "PURPOSE:\n" " This test will verify that you can reboot your system from the desktop " @@ -2458,7 +2458,7 @@ " 该系统是否正确关闭和重新启动？" #. description -#: ../jobs/power-management.txt.in:15 +#: ../jobs/power-management.txt.in:84 msgid "" "PURPOSE:\n" " This test will check your lid sensors\n" @@ -2475,7 +2475,7 @@ " 关闭您的笔记本电脑盖是否导致您的系统挂起？" #. description -#: ../jobs/power-management.txt.in:32 +#: ../jobs/power-management.txt.in:101 msgid "" "PURPOSE:\n" " This test will check your lid sensors\n" @@ -2494,7 +2494,7 @@ " 在关闭此盖时屏幕是否关闭？" #. description -#: ../jobs/power-management.txt.in:50 +#: ../jobs/power-management.txt.in:119 msgid "" "PURPOSE:\n" " This test will check your lid sensors\n" @@ -2517,7 +2517,7 @@ " 打开此盖时该系统是否恢复？" #. description -#: ../jobs/power-management.txt.in:66 +#: ../jobs/power-management.txt.in:136 msgid "Make sure that the RTC (Real-Time Clock) device exists." msgstr "确认实时时钟(RTC)设备存在" @@ -2527,7 +2527,7 @@ msgstr "测试 ACPI 的唤醒报警特性（fwts wakealarm） " #. description -#: ../jobs/power-management.txt.in:81 +#: ../jobs/power-management.txt.in:141 msgid "" "Check to see if CONFIG_NO_HZ is set in the kernel (this is just a simple " "regression check)" @@ -2573,7 +2573,7 @@ msgstr "验证 Tomcat 服务器是否正在运行和工作。" #. description -#: ../jobs/stress.txt.in:8 +#: ../jobs/stress.txt.in:7 msgid "" "PURPOSE:\n" " Create jobs that use the CPU as much as possible for two hours. The test " @@ -2644,25 +2644,25 @@ msgstr "挂起前记录混音器设置。" #. description -#: ../jobs/suspend.txt.in:24 +#: ../jobs/suspend.txt.in:22 msgid "Verify that all the CPUs are online before suspending" msgstr "确认电脑休眠之前所有 CPU 都处于运行状态。" #. description -#: ../jobs/suspend.txt.in:31 +#: ../jobs/suspend.txt.in:27 msgid "" "Dumps memory info to a file for comparison after suspend test has been run" msgstr "将内存信息转储到一个文件中，以便运行了挂起测试后进行比较" #. description -#: ../jobs/suspend.txt.in:49 +#: ../jobs/suspend.txt.in:37 msgid "" "This test disconnects all connections and then connects to the wireless " "interface. It then checks the connection to confirm it's working as expected." msgstr "此测试将断开所有连接，然后连接到无线接口。然后，此测试将检查该连接，以确认其正常工作。" #. description -#: ../jobs/suspend.txt.in:83 +#: ../jobs/suspend.txt.in:171 msgid "" "PURPOSE:\n" " This test will check suspend and resume\n" @@ -2686,29 +2686,29 @@ " 您的系统是否正确挂起和恢复？" #. description -#: ../jobs/suspend.txt.in:96 +#: ../jobs/suspend.txt.in:253 msgid "Test the network after resuming." msgstr "恢复后测试网络。" #. description -#: ../jobs/suspend.txt.in:102 +#: ../jobs/suspend.txt.in:259 msgid "" "Test to see that we have the same resolution after resuming as before." msgstr "测试恢复后分辨率是否与之前相同。" #. description -#: ../jobs/suspend.txt.in:111 +#: ../jobs/suspend.txt.in:278 msgid "" "Verify that mixer settings after suspend are the same as before suspend." msgstr "验证在挂起之后混合器设置是否与挂起之前相同。" #. description -#: ../jobs/suspend.txt.in:127 +#: ../jobs/suspend.txt.in:291 msgid "Verify that all CPUs are online after resuming." msgstr "确认恢复之后所有 CPU 都处于运行状态。" #. description -#: ../jobs/suspend.txt.in:144 +#: ../jobs/suspend.txt.in:304 msgid "Verify that all memory is available after resuming from suspend." msgstr "验证在从挂起状态中恢复后所有内存是否均可用。" @@ -2727,7 +2727,7 @@ " 在从挂起状态中恢复后显示器是否正常工作？" #. description -#: ../jobs/suspend.txt.in:174 +#: ../jobs/suspend.txt.in:326 msgid "" "This test checks that the wireless interface is working after suspending the " "system. It disconnects all interfaces and then connects to the wireless " @@ -2735,21 +2735,21 @@ msgstr "此测试将检查在该系统挂起后无线接口是否正常工作。此测试将断开所有接口的连接，然后连接到无线接口，并且检查此连接是否正常工作。" #. description -#: ../jobs/suspend.txt.in:186 +#: ../jobs/suspend.txt.in:544 msgid "" "This test grabs the hardware address of the bluetooth adapter after suspend " "and compares it to the address grabbed before suspend." msgstr "本测试将获取休眠之后的蓝牙适配器地址，并于休眠之前进行对比。" #. description -#: ../jobs/suspend.txt.in:196 +#: ../jobs/suspend.txt.in:652 msgid "" "This is an automated Bluetooth file transfer test. It sends an image to the " "device specified by the BTDEVADDR environment variable." msgstr "这是一个自动蓝牙文件传输测试。此测试将向 BTDEVADDR 环境变量指定的设备发送一个图像。" #. description -#: ../jobs/suspend.txt.in:206 +#: ../jobs/suspend.txt.in:771 msgid "" "PURPOSE:\n" " This test will send the image 'JPEG_Color_Image_Ubuntu.jpg' to a " @@ -2771,7 +2771,7 @@ " 是否正确发送了这些数据？" #. description -#: ../jobs/suspend.txt.in:220 +#: ../jobs/suspend.txt.in:785 msgid "" "PURPOSE:\n" " This test will cycle through the detected display modes\n" @@ -2788,7 +2788,7 @@ " 您的显示器在检测到的模式下是否正常显示？" #. description -#: ../jobs/suspend.txt.in:232 +#: ../jobs/suspend.txt.in:797 msgid "" "This test will check to make sure supported video modes work after a suspend " "and resume. This is done automatically by taking screenshots and uploading " @@ -2796,7 +2796,7 @@ msgstr "此测试将检查并确保在挂起和恢复后支持的显示模式正常工作。这是通过捕获屏幕截图并将它们作为附件进行上传来自动进行的。" #. description -#: ../jobs/suspend.txt.in:241 +#: ../jobs/suspend.txt.in:806 msgid "" "This attaches screenshots from the " "suspend/cycle_resolutions_after_suspend_auto test to the results submission." @@ -2804,7 +2804,7 @@ "这会将 suspend/cycle_resolutions_after_suspend_auto 测试中捕获的屏幕截图附加到提交的结果中。" #. description -#: ../jobs/suspend.txt.in:251 +#: ../jobs/suspend.txt.in:835 msgid "" "This will check to make sure that your audio device works properly after a " "suspend and resume. This may work fine with speakers and onboard " @@ -2813,7 +2813,7 @@ msgstr "这将检查并确保在挂起和恢复后您的音频设备正常工作。此测试可以使用扬声器和内置麦克风，但最好使用将音频输出插孔与音频输入插孔相连的电缆。" #. description -#: ../jobs/suspend.txt.in:260 +#: ../jobs/suspend.txt.in:195 msgid "This is the automated version of suspend/suspend_advanced." msgstr "这是 suspend/suspend_advanced 的自动化版本。" @@ -2840,12 +2840,12 @@ msgstr "此测试将验证 Unity 是否正在运行，然后对 Unity 界面执行 autopilot.py 测试。" #. description -#: ../jobs/usb.txt.in:5 +#: ../jobs/usb.txt.in:4 msgid "Detects and shows USB devices attached to this system." msgstr "检测并显示连接到该系统的 USB 设备。" #. description -#: ../jobs/usb.txt.in:12 +#: ../jobs/usb.txt.in:10 msgid "" "PURPOSE:\n" " This test will check that your system detects USB storage devices.\n" @@ -2950,7 +2950,7 @@ " 此测试的验证自动进行。不要更改自动选择的结果。" #. description -#: ../jobs/usb.txt.in:88 +#: ../jobs/usb.txt.in:105 msgid "" "PURPOSE:\n" " This test will check your USB connection.\n" @@ -2972,7 +2972,7 @@ " 此测试的验证自动进行。不要更改自动选择的结果。" #. description -#: ../jobs/usb.txt.in:104 +#: ../jobs/usb.txt.in:139 msgid "This test is automated and executes after the usb/insert test is run." msgstr "此测试自动进行，并且在 usb/insert 测试运行后执行。" @@ -2987,7 +2987,7 @@ "自动测试。" #. description -#: ../jobs/usb.txt.in:120 +#: ../jobs/usb.txt.in:174 msgid "" "PURPOSE:\n" " This test will check your USB connection.\n" @@ -3321,7 +3321,7 @@ " 该视频是否正确播放？" #. description -#: ../jobs/user_apps.txt.in:283 +#: ../jobs/user_apps.txt.in:285 msgid "" "PURPOSE:\n" " This test will check that Firefox can play a Quicktime (.mov) video file.\n" @@ -3342,7 +3342,7 @@ " 是否使用了插件播放该视频？" #. description -#: ../jobs/user_apps.txt.in:297 +#: ../jobs/user_apps.txt.in:299 msgid "" "PURPOSE:\n" " This test will check that Empathy messaging client works.\n" @@ -3363,7 +3363,7 @@ " 您是否能够正确连接并收/发消息？" #. description -#: ../jobs/user_apps.txt.in:311 +#: ../jobs/user_apps.txt.in:313 msgid "" "PURPOSE:\n" " This test will check that Empathy messaging client works.\n" @@ -3384,7 +3384,7 @@ " 您是否能够正确连接并收/发消息？" #. description -#: ../jobs/user_apps.txt.in:325 +#: ../jobs/user_apps.txt.in:327 msgid "" "PURPOSE:\n" " This test will check that Empathy messaging client works.\n" @@ -3405,7 +3405,7 @@ " 您是否能够正确连接并收/发消息？" #. description -#: ../jobs/user_apps.txt.in:339 +#: ../jobs/user_apps.txt.in:341 msgid "" "PURPOSE:\n" " This test will check that Empathy messaging client works.\n" @@ -3426,7 +3426,7 @@ " 您是否能够正确连接并收/发消息？" #. description -#: ../jobs/user_apps.txt.in:353 +#: ../jobs/user_apps.txt.in:355 msgid "" "PURPOSE:\n" " This test will check that Empathy messaging client works.\n" @@ -3447,7 +3447,7 @@ " 您是否能够正确连接并收/发消息？" #. description -#: ../jobs/user_apps.txt.in:367 +#: ../jobs/user_apps.txt.in:369 msgid "" "PURPOSE:\n" " This test will check that Evolution works.\n" @@ -3466,7 +3466,7 @@ " 您是否能够正确接收并阅读电子邮件？" #. description -#: ../jobs/user_apps.txt.in:380 +#: ../jobs/user_apps.txt.in:382 msgid "" "PURPOSE:\n" " This test will check that Evolution works.\n" @@ -3485,7 +3485,7 @@ " 您是否能够正确接收并阅读电子邮件？" #. description -#: ../jobs/user_apps.txt.in:393 +#: ../jobs/user_apps.txt.in:395 msgid "" "PURPOSE:\n" " This test will check that Evolution works.\n" @@ -3504,7 +3504,7 @@ " 您是否能够无错误地发送电子邮件？" #. description -#: ../jobs/user_apps.txt.in:406 +#: ../jobs/user_apps.txt.in:408 msgid "" "PURPOSE:\n" " This test checks that gcalctool (Calculator) works.\n" @@ -3521,7 +3521,7 @@ " 该计算器是否正确启动？" #. description -#: ../jobs/user_apps.txt.in:419 +#: ../jobs/user_apps.txt.in:421 msgid "" "PURPOSE:\n" " This test checks that gcalctool (Calculator) works.\n" @@ -3546,7 +3546,7 @@ " 这些功能是否正常执行？" #. description -#: ../jobs/user_apps.txt.in:436 +#: ../jobs/user_apps.txt.in:438 msgid "" "PURPOSE:\n" " This test checks that gcalctool (Calculator) works.\n" @@ -3571,7 +3571,7 @@ " 这些是否正常执行？" #. description -#: ../jobs/user_apps.txt.in:453 +#: ../jobs/user_apps.txt.in:455 msgid "" "PURPOSE:\n" " This test checks that gcalctool (Calculator) works.\n" @@ -3594,7 +3594,7 @@ " 这些功能是否正常执行？" #. description -#: ../jobs/user_apps.txt.in:468 +#: ../jobs/user_apps.txt.in:470 msgid "" "PURPOSE:\n" " This test checks that gedit works.\n" @@ -3614,7 +3614,7 @@ " 是否正常执行？" #. description -#: ../jobs/user_apps.txt.in:482 +#: ../jobs/user_apps.txt.in:484 msgid "" "PURPOSE:\n" " This test checks that gedit works.\n" @@ -3634,7 +3634,7 @@ " 是否正常执行？" #. description -#: ../jobs/user_apps.txt.in:495 +#: ../jobs/user_apps.txt.in:497 msgid "" "PURPOSE:\n" " This test will check that Gnome Terminal works.\n" @@ -3656,12 +3656,12 @@ " 这是否正常执行？" #. description -#: ../jobs/wireless.txt.in:6 +#: ../jobs/wireless.txt.in:21 msgid "Wireless scanning test. It scans and reports on discovered APs." msgstr "无线网络扫描测试。将自动扫描和报告可用的无线网络。" #. description -#: ../jobs/wireless.txt.in:12 +#: ../jobs/wireless.txt.in:28 msgid "" "PURPOSE:\n" " This test will check your wireless connection.\n" @@ -3683,42 +3683,42 @@ " 是否显示通知以及是否正确建立了该连接？" #. description -#: ../jobs/wireless.txt.in:28 +#: ../jobs/wireless.txt.in:46 msgid "" "Tests that the systems wireless hardware can connect to a router using WPA " "security and the 802.11b/g protocols." msgstr "测试系统无线硬件是否能够连接到使用 WPA 安全和 802.11b/g 协议的路由器。" #. description -#: ../jobs/wireless.txt.in:38 +#: ../jobs/wireless.txt.in:58 msgid "" "Tests that the systems wireless hardware can connect to a router using no " "security and the 802.11b/g protocols." msgstr "测试系统无线硬件是否能够连接到不使用安全和 802.11b/g 协议的路由器。" #. description -#: ../jobs/wireless.txt.in:48 +#: ../jobs/wireless.txt.in:70 msgid "" "Tests that the systems wireless hardware can connect to a router using WPA " "security and the 802.11n protocol." msgstr "测试系统无线硬件是否能够连接到使用 WPA 安全和 802.11n 协议的路由器。" #. description -#: ../jobs/wireless.txt.in:58 +#: ../jobs/wireless.txt.in:82 msgid "" "Tests that the systems wireless hardware can connect to a router using no " "security and the 802.11n protocol." msgstr "测试系统无线硬件是否能够连接到不使用安全和 802.11n 协议的路由器。" #. description -#: ../jobs/wireless.txt.in:70 +#: ../jobs/wireless.txt.in:178 msgid "" "Tests the performance of a systems wireless connection through the iperf " "tool." msgstr "通过 iperf 工具测试系统无线连接的性能。" #. description -#: ../jobs/wireless.txt.in:81 +#: ../jobs/wireless.txt.in:189 msgid "" "Tests the performance of a systems wireless connection through the iperf " "tool, using UDP packets." @@ -3764,7 +3764,7 @@ msgid "Missing configuration file as argument.\n" msgstr "丢失配置文件作为参数。\n" -#: ../checkbox/job.py:84 +#: ../checkbox/job.py:85 msgid "Command not found." msgstr "未找到命令。" @@ -3859,107 +3859,108 @@ msgstr "未知信号" #: ../checkbox_cli/cli_interface.py:31 -#: ../checkbox_urwid/urwid_interface.py:917 ../checkbox_qt/qt_interface.py:37 +#: ../checkbox_urwid/urwid_interface.py:939 msgid "yes" msgstr "是" #: ../checkbox_cli/cli_interface.py:32 -#: ../checkbox_urwid/urwid_interface.py:918 ../checkbox_qt/qt_interface.py:38 +#: ../checkbox_urwid/urwid_interface.py:940 msgid "no" msgstr "否" #: ../checkbox_cli/cli_interface.py:33 -#: ../checkbox_urwid/urwid_interface.py:919 ../checkbox_qt/qt_interface.py:39 +#: ../checkbox_urwid/urwid_interface.py:941 msgid "skip" msgstr "跳过" -#: ../checkbox_cli/cli_interface.py:126 +#: ../checkbox_cli/cli_interface.py:127 msgid "Press any key to continue..." msgstr "按下任何一个键继续…" -#: ../checkbox_cli/cli_interface.py:135 ../checkbox_cli/cli_interface.py:234 +#: ../checkbox_cli/cli_interface.py:136 ../checkbox_cli/cli_interface.py:237 #, python-format msgid "Please choose (%s): " msgstr "请选择 (%s)： " -#: ../checkbox_cli/cli_interface.py:229 ../checkbox_cli/cli_interface.py:338 -#: ../checkbox_cli/cli_interface.py:368 +#: ../checkbox_cli/cli_interface.py:232 ../checkbox_cli/cli_interface.py:355 +#: ../checkbox_cli/cli_interface.py:386 msgid "Space when finished" msgstr "完成后的空间大小" -#: ../checkbox_cli/cli_interface.py:367 +#: ../checkbox_cli/cli_interface.py:384 msgid "Combine with character above to expand node" msgstr "使用以上字符连接来展开节点" -#: ../checkbox_cli/cli_interface.py:416 +#: ../checkbox_cli/cli_interface.py:432 msgid "test" msgstr "测试" -#: ../checkbox_cli/cli_interface.py:440 +#: ../checkbox_cli/cli_interface.py:456 msgid "test again" msgstr "再次测试" -#: ../checkbox_cli/cli_interface.py:446 +#: ../checkbox_cli/cli_interface.py:462 msgid "Please type here and press Ctrl-D when finished:\n" msgstr "请在这里输入并在结束时按下 Ctrl-D ：\n" -#: ../checkbox_urwid/urwid_interface.py:66 +#: ../checkbox_urwid/urwid_interface.py:86 msgid "Checkbox System Testing" msgstr "Checkbox 系统测试" -#: ../checkbox_urwid/urwid_interface.py:105 +#: ../checkbox_urwid/urwid_interface.py:127 ../checkbox/user_interface.py:70 +#: ../qt/frontend/ui_qtfront.h:644 msgid "Continue" msgstr "继续" -#: ../checkbox_urwid/urwid_interface.py:198 -#: ../checkbox_urwid/urwid_interface.py:274 -#: ../checkbox_urwid/urwid_interface.py:425 -#: ../checkbox_urwid/urwid_interface.py:547 ../qt/frontend/ui_qtfront.h:609 +#: ../checkbox_urwid/urwid_interface.py:220 +#: ../checkbox_urwid/urwid_interface.py:296 +#: ../checkbox_urwid/urwid_interface.py:447 +#: ../checkbox_urwid/urwid_interface.py:569 msgid "Previous" msgstr "上一个" -#: ../checkbox_urwid/urwid_interface.py:199 -#: ../checkbox_urwid/urwid_interface.py:275 -#: ../checkbox_urwid/urwid_interface.py:426 -#: ../checkbox_urwid/urwid_interface.py:548 ../qt/frontend/ui_qtfront.h:608 +#: ../checkbox_urwid/urwid_interface.py:221 +#: ../checkbox_urwid/urwid_interface.py:297 +#: ../checkbox_urwid/urwid_interface.py:448 +#: ../checkbox_urwid/urwid_interface.py:570 msgid "Next" msgstr "下一个" #. Show buttons -#: ../checkbox_urwid/urwid_interface.py:423 ../qt/frontend/qtfront.cpp:136 +#: ../checkbox_urwid/urwid_interface.py:445 msgid "Select All" msgstr "选择全部" -#: ../checkbox_urwid/urwid_interface.py:424 ../qt/frontend/qtfront.cpp:137 +#: ../checkbox_urwid/urwid_interface.py:446 msgid "Deselect All" msgstr "取消全部选择" #. Show buttons -#: ../checkbox_urwid/urwid_interface.py:545 +#: ../checkbox_urwid/urwid_interface.py:567 msgid "Expand All" msgstr "全部展开" -#: ../checkbox_urwid/urwid_interface.py:546 +#: ../checkbox_urwid/urwid_interface.py:568 msgid "Collapse All" msgstr "全部折叠" -#: ../checkbox_urwid/urwid_interface.py:1013 ../qt/frontend/ui_qtfront.h:603 +#: ../checkbox_urwid/urwid_interface.py:1034 msgid "Test" msgstr "测试" -#: ../checkbox_urwid/urwid_interface.py:1028 +#: ../checkbox_urwid/urwid_interface.py:1049 msgid "Test Again" msgstr "重新测试" -#: ../checkbox_gtk/gtk_interface.py:503 +#: ../checkbox_gtk/gtk_interface.py:525 msgid "_Test Again" msgstr "再次测试(_T)" -#: ../checkbox_gtk/gtk_interface.py:551 ../qt/frontend/qtfront.cpp:490 +#: ../checkbox_gtk/gtk_interface.py:574 ../qt/frontend/qtfront.cpp:555 msgid "Info" msgstr "信息" -#: ../checkbox_gtk/gtk_interface.py:575 ../qt/frontend/qtfront.cpp:247 +#: ../checkbox_gtk/gtk_interface.py:599 ../qt/frontend/qtfront.cpp:227 msgid "Error" msgstr "错误" @@ -3998,15 +3999,16 @@ msgid "Is a package upgrade in process? Error: %s" msgstr "是不是正在进行软件升级？错误：%s" -#: ../plugins/final_prompt.py:33 +#: ../plugins/final_prompt.py:24 msgid "Successfully finished testing!" msgstr "成功完成测试！" -#: ../plugins/final_prompt.py:34 +#: ../plugins/final_prompt.py:39 msgid "_Finish" msgstr "完成(_F)" -#: ../plugins/gather_prompt.py:35 +#. Resolve dependencies +#: ../plugins/gather_prompt.py:35 ../plugins/suites_prompt.py:98 msgid "Gathering information from your system..." msgstr "正在从您的系统上收集信息..." @@ -4034,12 +4036,12 @@ "\n" "警告：一些测试可能导致您的系统失去响应或响应缓慢。开始此测试过程前，请保存您的所有工作，并关闭其他所有正在运行的应用程序。" -#: ../plugins/launchpad_exchange.py:136 +#: ../plugins/launchpad_exchange.py:135 #, python-format msgid "Failed to process form: %s" msgstr "处理表单失败：%s" -#: ../plugins/launchpad_exchange.py:151 +#: ../plugins/launchpad_exchange.py:150 #, python-format msgid "" "Failed to contact server. Please try\n" @@ -4056,7 +4058,7 @@ "直接到系统数据库：\n" "https://launchpad.net/+hwdb/+submit" -#: ../plugins/launchpad_exchange.py:160 +#: ../plugins/launchpad_exchange.py:159 msgid "" "Failed to upload to server,\n" "please try again later." @@ -4064,11 +4066,12 @@ "上载到服务器失败，\n" "请一会儿重新尝试。" -#: ../plugins/launchpad_exchange.py:172 +#: ../plugins/launchpad_exchange.py:171 msgid "Information not posted to Launchpad." msgstr "不会发布到 Launchpad 上的信息。" -#: ../plugins/launchpad_prompt.py:74 +#. Ignore whether to submit to HEXR +#: ../plugins/launchpad_prompt.py:78 #, python-format msgid "" "The following report has been generated for submission to the Launchpad " @@ -4090,15 +4093,15 @@ "\n" " https://launchpad.net/+login" -#: ../plugins/launchpad_prompt.py:93 +#: ../plugins/launchpad_prompt.py:97 msgid "Email address must be in a proper format." msgstr "电子邮件地址必须有正确的格式。" -#: ../plugins/launchpad_prompt.py:99 +#: ../plugins/launchpad_prompt.py:103 msgid "Exchanging information with the server..." msgstr "和服务器交换信息..." -#: ../plugins/launchpad_report.py:167 +#: ../plugins/launchpad_report.py:172 msgid "" "The generated report seems to have validation errors,\n" "so it might not be processed by Launchpad." @@ -4106,7 +4109,7 @@ "生成的报告似乎具有确认错误，\n" "因此 Launchpad 可能不会处理该报告。" -#: ../plugins/lock_prompt.py:63 +#: ../plugins/lock_prompt.py:66 msgid "There is another checkbox running. Please close it first." msgstr "有另一个 Checkbox 正在运行。请先关闭它。" @@ -4114,7 +4117,7 @@ msgid "Recover" msgstr "恢复" -#: ../plugins/recover_prompt.py:54 +#: ../checkbox/user_interface.py:72 msgid "Restart" msgstr "重新启动" @@ -4140,147 +4143,147 @@ msgid "Select the suites to test" msgstr "选择套件来测试" -#: ../scripts/keyboard_test:21 +#: ../scripts/keyboard_test:22 msgid "Enter text:\n" msgstr "输入文本：\n" -#: ../scripts/keyboard_test:41 +#: ../scripts/keyboard_test:43 msgid "Type Text" msgstr "键入文本" -#: ../scripts/internet_test:139 +#: ../scripts/internet_test:254 msgid "No Internet connection" msgstr "没有互联网连接" -#: ../scripts/internet_test:142 +#: ../scripts/internet_test:224 msgid "Connection established lost a packet" msgstr "连接建立但有丢包" -#: ../scripts/internet_test:145 +#: ../scripts/internet_test:269 msgid "Internet connection fully established" msgstr "互联网连接完整建立" -#: ../qt/frontend/qtfront.cpp:85 +#: ../qt/frontend/qtfront.cpp:81 msgid "Audio Test" msgstr "音频测试" -#: ../qt/frontend/qtfront.cpp:86 +#: ../qt/frontend/qtfront.cpp:82 msgid "Bluetooth Test" msgstr "蓝牙测试" -#: ../qt/frontend/qtfront.cpp:87 +#: ../qt/frontend/qtfront.cpp:83 msgid "Camera Test" msgstr "摄像头测试" -#: ../qt/frontend/qtfront.cpp:88 +#: ../qt/frontend/qtfront.cpp:84 msgid "CPU Test" msgstr "CPU 测试" -#: ../qt/frontend/qtfront.cpp:89 +#: ../qt/frontend/qtfront.cpp:85 msgid "Disk Test" msgstr "硬盘测试" -#: ../qt/frontend/qtfront.cpp:90 +#: ../qt/frontend/qtfront.cpp:86 msgid "Firewire Test" msgstr "火线接口测试" -#: ../qt/frontend/qtfront.cpp:91 +#: ../qt/frontend/qtfront.cpp:87 msgid "Graphics Test" msgstr "显卡测试" -#: ../qt/frontend/qtfront.cpp:92 +#: ../qt/frontend/qtfront.cpp:88 msgid "Info Test" msgstr "信息测试" -#: ../qt/frontend/qtfront.cpp:93 +#: ../qt/frontend/qtfront.cpp:89 msgid "Input Test" msgstr "输入测试" -#: ../qt/frontend/qtfront.cpp:94 +#: ../qt/frontend/qtfront.cpp:90 msgid "Keys Test" msgstr "按键测试" -#: ../qt/frontend/qtfront.cpp:95 +#: ../qt/frontend/qtfront.cpp:91 msgid "Media Card Test" msgstr "媒体卡测试" -#: ../qt/frontend/qtfront.cpp:96 +#: ../qt/frontend/qtfront.cpp:92 msgid "Memory Test" msgstr "内存测试" -#: ../qt/frontend/qtfront.cpp:97 +#: ../qt/frontend/qtfront.cpp:93 msgid "Miscellanea Test" msgstr "其它测试" -#: ../qt/frontend/qtfront.cpp:98 +#: ../qt/frontend/qtfront.cpp:94 msgid "Monitor Test" msgstr "显示器测试" -#: ../qt/frontend/qtfront.cpp:99 +#: ../qt/frontend/qtfront.cpp:95 msgid "Networking Test" msgstr "网络测试" -#: ../qt/frontend/qtfront.cpp:100 +#: ../qt/frontend/qtfront.cpp:96 msgid "Wireless Test" msgstr "无线测试" -#: ../qt/frontend/qtfront.cpp:101 +#: ../qt/frontend/qtfront.cpp:97 msgid "Optical Test" msgstr "光驱测试" -#: ../qt/frontend/qtfront.cpp:102 +#: ../qt/frontend/qtfront.cpp:97 msgid "PCMCIA/PCIX Test" msgstr "PCMCIA/PCIX 扩展卡测试" -#: ../qt/frontend/qtfront.cpp:103 +#: ../qt/frontend/qtfront.cpp:99 msgid "Power Management Test" msgstr "电量管理测试" -#: ../qt/frontend/qtfront.cpp:104 +#: ../qt/frontend/qtfront.cpp:100 msgid "Suspend Test" msgstr "休眠测试" -#: ../qt/frontend/qtfront.cpp:105 +#: ../qt/frontend/qtfront.cpp:101 msgid "USB Test" msgstr "USB 接口测试" -#: ../qt/frontend/qtfront.cpp:107 +#: ../qt/frontend/qtfront.cpp:103 msgid "Not Started" msgstr "未能开始" -#: ../qt/frontend/qtfront.cpp:108 ../qt/frontend/qtfront.cpp:109 +#: ../qt/frontend/qtfront.cpp:104 ../qt/frontend/qtfront.cpp:105 msgid "Done" msgstr "完成" -#: ../qt/frontend/qtfront.cpp:110 +#: ../qt/frontend/qtfront.cpp:106 msgid "Not Supported" msgstr "不支持" -#: ../qt/frontend/qtfront.cpp:111 +#: ../qt/frontend/qtfront.cpp:107 msgid "Not Resolved" msgstr "未能解决" -#: ../qt/frontend/qtfront.cpp:112 +#: ../qt/frontend/qtfront.cpp:108 msgid "Not Tested" msgstr "尚未测试" -#: ../qt/frontend/qtfront.cpp:113 +#: ../qt/frontend/qtfront.cpp:109 msgid "In Progress" msgstr "测试中" -#: ../qt/frontend/qtfront.cpp:182 +#: ../qt/frontend/qtfront.cpp:161 msgid "Are you sure?" msgstr "您确定吗？" -#: ../qt/frontend/qtfront.cpp:182 +#: ../qt/frontend/qtfront.cpp:161 msgid "Do you really want to skip this test?" msgstr "确定要跳过这个测试吗？" -#: ../qt/frontend/qtfront.cpp:183 +#: ../qt/frontend/qtfront.cpp:162 msgid "Don't ask me again" msgstr "不要再次询问" -#: ../qt/frontend/treemodel.cpp:13 +#: ../qt/frontend/treemodel.cpp:15 msgid "" "Unselecting a test will invalidate your submission for Ubuntu Friendly. If " "you plan to participate in Ubuntu Friendly, please, select all tests. You " @@ -4289,7 +4292,7 @@ "如果您取消测试项目，您的结果将不会提交到 Ubuntu Freindly 项目。如果您准备参加 Ubuntu Friendly " "项目，请选择所有测试项目。如果在测试中缺乏相应设备，可以到时跳过对应测试项目。" -#: ../qt/frontend/ui_qtfront.h:588 +#: ../qt/frontend/ui_qtfront.h:641 msgid "Form" msgstr "来自" @@ -4301,11 +4304,11 @@ msgid "Don't show me this message in the future" msgstr "不要再次显示这一信息" -#: ../qt/frontend/ui_qtfront.h:592 ../qt/frontend/ui_qtfront.h:606 +#: ../qt/frontend/ui_qtfront.h:645 ../qt/frontend/ui_qtfront.h:663 msgid "Tab 1" msgstr "标签一" -#: ../qt/frontend/ui_qtfront.h:593 +#: ../qt/frontend/ui_qtfront.h:646 msgid "10 tests completed out of 30 (30%)" msgstr "您已完成30项测试中的10项" @@ -4313,23 +4316,23 @@ msgid "Lists of tests to run based on your system:" msgstr "根据您的系统情况，您可以进行以下测试：" -#: ../qt/frontend/ui_qtfront.h:596 +#: ../qt/frontend/ui_qtfront.h:649 msgid "Components" msgstr "组件" -#: ../qt/frontend/ui_qtfront.h:597 +#: ../qt/frontend/ui_qtfront.h:650 msgid "Status" msgstr "状态" -#: ../qt/frontend/ui_qtfront.h:598 +#: ../qt/frontend/ui_qtfront.h:653 msgid "Start testing" msgstr "开始测试" -#: ../qt/frontend/ui_qtfront.h:599 +#: ../qt/frontend/ui_qtfront.h:654 msgid " Selection " msgstr " 选择 " -#: ../qt/frontend/ui_qtfront.h:600 ../qt/frontend/ui_qtfront.h:601 +#: ../qt/frontend/ui_qtfront.h:655 ../qt/frontend/ui_qtfront.h:656 msgid "TextLabel" msgstr "文本标签" @@ -4345,11 +4348,11 @@ msgid "Comment" msgstr "注释" -#: ../qt/frontend/ui_qtfront.h:607 ../qt/frontend/ui_qtfront.h:623 +#: ../qt/frontend/ui_qtfront.h:664 ../qt/frontend/ui_qtfront.h:681 msgid "Tab 2" msgstr "标签二" -#: ../qt/frontend/ui_qtfront.h:610 +#: ../qt/frontend/ui_qtfront.h:667 msgid " Run " msgstr " 运行 " @@ -4369,39 +4372,25 @@ "

and click the Submit Results button to submit these test " -"results to Ubuntu Friendly.

" +"results to Launchpad.

" msgstr "" -"\n" -"\n" -"

请输入与您的 Launchpad 帐号相关联的电子邮件地址

\n" -"

然后点击提交按钮向 Ubuntu Friendly " -"项目提交您的测试结果。

" #: ../qt/frontend/ui_qtfront.h:617 msgid "Personal details" msgstr "个人信息" -#: ../qt/frontend/ui_qtfront.h:619 +#: ../qt/frontend/ui_qtfront.h:676 msgid "Email:" msgstr "电子邮件地址：" -#: ../qt/frontend/ui_qtfront.h:620 +#: ../qt/frontend/ui_qtfront.h:677 msgid "Submit results" msgstr "提交结果" -#: ../qt/frontend/ui_qtfront.h:621 +#: ../qt/frontend/ui_qtfront.h:678 msgid "View results" msgstr "查看结果" -#: ../qt/frontend/ui_qtfront.h:622 +#: ../qt/frontend/ui_qtfront.h:680 msgid " Results " msgstr " 结果 " diff -Nru language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/command-not-found.po language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/command-not-found.po --- language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/command-not-found.po 2013-01-29 09:37:14.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/command-not-found.po 2014-01-07 07:01:41.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-01-28 14:20+0000\n" -"X-Generator: Launchpad (build 16451)\n" +"X-Launchpad-Export-Date: 2014-01-06 14:52+0000\n" +"X-Generator: Launchpad (build 16877)\n" #: ../CommandNotFound/CommandNotFound.py:148 #, python-format diff -Nru language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/compiz.po language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/compiz.po --- language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/compiz.po 2013-01-29 09:37:12.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/compiz.po 2014-01-07 07:01:41.000000000 +0000 @@ -7,62 +7,62 @@ msgstr "" "Project-Id-Version: Compiz\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-21 19:28+0000\n" -"PO-Revision-Date: 2012-12-22 07:11+0000\n" +"POT-Creation-Date: 2013-09-26 16:44+0000\n" +"PO-Revision-Date: 2013-10-28 22:58+0000\n" "Last-Translator: Sephinroth \n" "Language-Team: Novell Language \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-01-28 14:17+0000\n" -"X-Generator: Launchpad (build 16451)\n" +"X-Launchpad-Export-Date: 2014-01-06 14:47+0000\n" +"X-Generator: Launchpad (build 16877)\n" #: ../gtk/gnome/compiz.desktop.in.h:1 msgid "Compiz" msgstr "Compiz" -#: ../gtk/window-decorator/events.c:138 ../metadata/core.xml.in.h:48 +#: ../gtk/window-decorator/events.c:141 ../metadata/core.xml.in.h:48 msgid "Close Window" msgstr "关闭窗口" -#: ../gtk/window-decorator/events.c:161 ../metadata/core.xml.in.h:58 +#: ../gtk/window-decorator/events.c:169 ../metadata/core.xml.in.h:58 msgid "Unmaximize Window" msgstr "恢复窗口" -#: ../gtk/window-decorator/events.c:164 ../metadata/core.xml.in.h:56 +#: ../gtk/window-decorator/events.c:172 ../metadata/core.xml.in.h:56 msgid "Maximize Window" msgstr "最大化窗口" -#: ../gtk/window-decorator/events.c:214 ../metadata/core.xml.in.h:54 +#: ../gtk/window-decorator/events.c:227 ../metadata/core.xml.in.h:54 msgid "Minimize Window" msgstr "最小化窗口" -#: ../gtk/window-decorator/events.c:234 ../metadata/core.xml.in.h:64 +#: ../gtk/window-decorator/events.c:247 ../metadata/core.xml.in.h:66 msgid "Window Menu" msgstr "窗口菜单" # 此功能完全不能用调整大小来描述，我找这个功能找了N久，才发现：调整大小！ = =； -#: ../gtk/window-decorator/events.c:257 +#: ../gtk/window-decorator/events.c:270 msgid "Shade" msgstr "阴影" -#: ../gtk/window-decorator/events.c:281 +#: ../gtk/window-decorator/events.c:294 msgid "Make Above" msgstr "置于上面" -#: ../gtk/window-decorator/events.c:305 +#: ../gtk/window-decorator/events.c:318 msgid "Stick" msgstr "粘滞窗口" -#: ../gtk/window-decorator/events.c:327 +#: ../gtk/window-decorator/events.c:340 msgid "Unshade" msgstr "去除阴影" -#: ../gtk/window-decorator/events.c:349 +#: ../gtk/window-decorator/events.c:362 msgid "Unmake Above" msgstr "取消顶置" -#: ../gtk/window-decorator/events.c:373 +#: ../gtk/window-decorator/events.c:386 msgid "Unstick" msgstr "取消粘滞" @@ -371,95 +371,95 @@ msgid "Unmaximize active window" msgstr "恢复激活的窗口" -#: ../metadata/core.xml.in.h:60 +#: ../metadata/core.xml.in.h:62 msgid "Maximize Window Horizontally" msgstr "水平方向最大化窗口" -#: ../metadata/core.xml.in.h:61 +#: ../metadata/core.xml.in.h:63 msgid "Maximize active window horizontally" msgstr "水平方向最大化激活的窗口" -#: ../metadata/core.xml.in.h:62 +#: ../metadata/core.xml.in.h:64 msgid "Maximize Window Vertically" msgstr "垂直方向最大化窗口" -#: ../metadata/core.xml.in.h:63 +#: ../metadata/core.xml.in.h:65 msgid "Maximize active window vertically" msgstr "垂直方向最大化激活的窗口" -#: ../metadata/core.xml.in.h:65 +#: ../metadata/core.xml.in.h:67 msgid "Window menu key binding" msgstr "窗口菜单按键绑定" -#: ../metadata/core.xml.in.h:66 +#: ../metadata/core.xml.in.h:68 msgid "Window menu button binding" msgstr "窗口菜单按钮绑定" -#: ../metadata/core.xml.in.h:67 +#: ../metadata/core.xml.in.h:69 msgid "Show Desktop" msgstr "显示桌面" -#: ../metadata/core.xml.in.h:68 +#: ../metadata/core.xml.in.h:70 msgid "Hide all windows and focus desktop" msgstr "隐藏所有窗口并聚焦于桌面" -#: ../metadata/core.xml.in.h:69 +#: ../metadata/core.xml.in.h:71 msgid "Toggle Window Maximized" msgstr "切换最大化的窗口" -#: ../metadata/core.xml.in.h:70 +#: ../metadata/core.xml.in.h:72 msgid "Toggle active window maximized" msgstr "将激活的窗口切换到最大化" -#: ../metadata/core.xml.in.h:71 +#: ../metadata/core.xml.in.h:73 msgid "Toggle Window Maximized Horizontally" msgstr "将窗口水平方向切换到最大化" -#: ../metadata/core.xml.in.h:72 +#: ../metadata/core.xml.in.h:74 msgid "Toggle active window maximized horizontally" msgstr "将激活的窗口水平方向切换到最大化" -#: ../metadata/core.xml.in.h:73 +#: ../metadata/core.xml.in.h:75 msgid "Toggle Window Maximized Vertically" msgstr "将窗口垂直方向切换到最大化" -#: ../metadata/core.xml.in.h:74 +#: ../metadata/core.xml.in.h:76 msgid "Toggle active window maximized vertically" msgstr "将激活的窗口垂直方向切换到最大化" -#: ../metadata/core.xml.in.h:75 +#: ../metadata/core.xml.in.h:77 msgid "Toggle Window Shaded" msgstr "将窗口切换到遮蔽" -#: ../metadata/core.xml.in.h:76 +#: ../metadata/core.xml.in.h:78 msgid "Toggle active window shaded" msgstr "将激活的窗口切换到遮蔽" -#: ../metadata/core.xml.in.h:77 +#: ../metadata/core.xml.in.h:79 msgid "Desktop Size" msgstr "桌面尺寸" -#: ../metadata/core.xml.in.h:78 +#: ../metadata/core.xml.in.h:80 msgid "Horizontal Virtual Size" msgstr "水平虚拟尺寸" -#: ../metadata/core.xml.in.h:79 +#: ../metadata/core.xml.in.h:81 msgid "Screen size multiplier for horizontal virtual size" msgstr "水平虚拟尺寸的放大倍数" -#: ../metadata/core.xml.in.h:80 +#: ../metadata/core.xml.in.h:82 msgid "Vertical Virtual Size" msgstr "垂直虚拟尺寸" -#: ../metadata/core.xml.in.h:81 +#: ../metadata/core.xml.in.h:83 msgid "Screen size multiplier for vertical virtual size" msgstr "垂直虚拟尺寸的放大倍数" -#: ../metadata/core.xml.in.h:82 +#: ../metadata/core.xml.in.h:84 msgid "Number of Desktops" msgstr "桌面数量" -#: ../metadata/core.xml.in.h:83 +#: ../metadata/core.xml.in.h:85 msgid "Number of virtual desktops" msgstr "虚拟桌面的数量" @@ -1453,7 +1453,7 @@ msgid "Unfold cube" msgstr "展开立方体" -#: ../plugins/cube/cube.xml.in.h:6 ../plugins/switcher/switcher.xml.in.h:26 +#: ../plugins/switcher/switcher.xml.in.h:26 msgid "Generate mipmaps when possible for higher quality scaling" msgstr "有可能时生成mipmaps用于更高质量的缩放比例" @@ -1491,20 +1491,20 @@ msgid "Inside cube" msgstr "立方体旋转时使用内部视角" -#: ../plugins/cube/cube.xml.in.h:15 ../plugins/rotate/rotate.xml.in.h:24 +#: ../plugins/rotate/rotate.xml.in.h:24 msgid "Acceleration" msgstr "加速" -#: ../plugins/cube/cube.xml.in.h:16 +#: ../plugins/cube/cube.xml.in.h:15 msgid "Fold Acceleration" msgstr "折叠加速" -#: ../plugins/cube/cube.xml.in.h:17 ../plugins/rotate/rotate.xml.in.h:26 -#: ../plugins/scale/scale.xml.in.h:6 ../plugins/switcher/switcher.xml.in.h:19 +#: ../plugins/rotate/rotate.xml.in.h:26 ../plugins/scale/scale.xml.in.h:6 +#: ../plugins/switcher/switcher.xml.in.h:19 msgid "Speed" msgstr "速度" -#: ../plugins/cube/cube.xml.in.h:18 +#: ../plugins/cube/cube.xml.in.h:17 msgid "Fold Speed" msgstr "折叠速度" @@ -1889,7 +1889,7 @@ msgid "Move Window" msgstr "移动窗口" -#: ../gtk/gnome/50-compiz-windows.xml.in.h:10 ../plugins/move/move.xml.in.h:2 +#: ../gtk/gnome/50-compiz-windows.xml.in.h:10 msgid "Move window" msgstr "移动窗口" @@ -1901,8 +1901,8 @@ msgid "Start moving window" msgstr "开始移动窗口" -#: ../plugins/move/move.xml.in.h:5 ../plugins/obs/obs.xml.in.h:3 -#: ../plugins/scale/scale.xml.in.h:12 ../plugins/switcher/switcher.xml.in.h:31 +#: ../plugins/obs/obs.xml.in.h:3 ../plugins/scale/scale.xml.in.h:12 +#: ../plugins/switcher/switcher.xml.in.h:31 msgid "Opacity" msgstr "不透明度" @@ -1910,7 +1910,7 @@ msgid "Opacity level of moving windows" msgstr "移动窗口的不透明度" -#: ../plugins/move/move.xml.in.h:7 +#: ../plugins/move/move.xml.in.h:9 msgid "Constrain Y" msgstr "约束 Y" @@ -1926,7 +1926,7 @@ msgid "Snapoff and auto unmaximized maximized windows when dragging" msgstr "拖动时删除快照并自动取消窗口的最大化" -#: ../plugins/move/move.xml.in.h:11 +#: ../plugins/move/move.xml.in.h:19 msgid "Lazy Positioning" msgstr "懒惰定位" @@ -1973,7 +1973,7 @@ msgid "Window specific settings" msgstr "窗口相关设置" -#: ../gtk/gnome/50-compiz-windows.xml.in.h:1 ../plugins/obs/obs.xml.in.h:11 +#: ../gtk/gnome/50-compiz-windows.xml.in.h:1 ../plugins/obs/obs.xml.in.h:15 #: ../plugins/place/place.xml.in.h:32 msgid "Windows" msgstr "窗口" @@ -1983,7 +1983,7 @@ msgstr "默认使用另一不透明度设置的窗口" # 都特例窗口设置的特殊饱和度数值 -#: ../plugins/obs/obs.xml.in.h:13 +#: ../plugins/obs/obs.xml.in.h:17 msgid "Window values" msgstr "窗口值" @@ -1991,7 +1991,7 @@ msgid "Opacity values for windows" msgstr "窗口的不透明度数值" -#: ../plugins/obs/obs.xml.in.h:15 ../plugins/switcher/switcher.xml.in.h:29 +#: ../plugins/obs/obs.xml.in.h:19 ../plugins/switcher/switcher.xml.in.h:29 msgid "Brightness" msgstr "亮度" @@ -2024,7 +2024,7 @@ msgid "Brightness values for windows" msgstr "窗口亮度" -#: ../plugins/obs/obs.xml.in.h:23 ../plugins/switcher/switcher.xml.in.h:27 +#: ../plugins/obs/obs.xml.in.h:31 ../plugins/switcher/switcher.xml.in.h:27 msgid "Saturation" msgstr "饱和度" @@ -2108,11 +2108,11 @@ msgid "If available use compression for textures converted from images" msgstr "如果可能，对从图片转换来的纹理进行压缩" -#: ../plugins/opengl/opengl.xml.in.h:14 +#: ../plugins/opengl/opengl.xml.in.h:20 msgid "Unredirect Driver Blacklist" msgstr "" -#: ../plugins/opengl/opengl.xml.in.h:15 +#: ../plugins/opengl/opengl.xml.in.h:21 msgid "" "If non-empty, specifies a POSIX (extended) regular expression to match " "against the OpenGL driver strings (newline separated): \"GL_VENDOR\\" @@ -2994,7 +2994,7 @@ "will be used." msgstr "把截屏图像放在这个目录。如果没有，会使用桌面文件夹。" -#: ../plugins/screenshot/screenshot.xml.in.h:7 +#: ../plugins/screenshot/screenshot.xml.in.h:13 msgid "Launch Application" msgstr "启动应用程序" @@ -3192,30 +3192,6 @@ msgid "Delay (in ms) between each rain-drop" msgstr "每次降雨效果之间的延时(以毫秒为单位)" -#: ../plugins/water/water.xml.in.h:13 -msgid "lightVec X" -msgstr "" - -#: ../plugins/water/water.xml.in.h:14 -msgid "Light vector X coordinate" -msgstr "" - -#: ../plugins/water/water.xml.in.h:15 -msgid "lightVec Y" -msgstr "" - -#: ../plugins/water/water.xml.in.h:16 -msgid "Light vector Y coordinate" -msgstr "" - -#: ../plugins/water/water.xml.in.h:17 -msgid "lightVec Z" -msgstr "" - -#: ../plugins/water/water.xml.in.h:18 -msgid "Light vector Z coordinate" -msgstr "" - #: ../plugins/water/water.xml.in.h:19 msgid "Title wave" msgstr "波浪标题" diff -Nru language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/coreutils.po language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/coreutils.po --- language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/coreutils.po 2013-01-29 09:37:11.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/coreutils.po 2014-01-07 07:01:15.000000000 +0000 @@ -14,14 +14,14 @@ "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" "POT-Creation-Date: 2011-09-08 17:09+0200\n" "PO-Revision-Date: 2012-11-20 02:44+0000\n" -"Last-Translator: Aron Xu \n" +"Last-Translator: Aron Xu \n" "Language-Team: Chinese (simplified) \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-Launchpad-Export-Date: 2013-01-28 10:48+0000\n" -"X-Generator: Launchpad (build 16451)\n" +"X-Launchpad-Export-Date: 2014-01-06 10:48+0000\n" +"X-Generator: Launchpad (build 16877)\n" "Language: zh_CN\n" #: lib/argmatch.c:133 @@ -42,19 +42,19 @@ msgid "error closing file" msgstr "关闭文件时出错" -#: lib/closeout.c:112 src/base64.c:109 src/base64.c:121 src/base64.c:127 -#: src/base64.c:168 src/base64.c:224 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:330 src/expand.c:355 src/head.c:298 -#: src/head.c:348 src/head.c:764 src/head.c:805 src/mktemp.c:351 src/od.c:919 -#: src/paste.c:160 src/shuf.c:369 src/split.c:742 src/split.c:979 -#: src/split.c:984 src/tail.c:350 src/tail.c:1202 src/tail.c:1308 -#: src/tail.c:2205 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 -#: src/unexpand.c:427 src/unexpand.c:443 +#: lib/closeout.c:112 src/base64.c:112 src/base64.c:124 src/base64.c:130 +#: src/base64.c:171 src/base64.c:227 src/cat.c:186 src/cat.c:202 src/cat.c:286 +#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/head.c:297 +#: src/head.c:347 src/head.c:763 src/head.c:804 src/mktemp.c:351 src/od.c:925 +#: src/paste.c:160 src/shuf.c:368 src/split.c:741 src/split.c:978 +#: src/split.c:983 src/tail.c:349 src/tail.c:1201 src/tail.c:1307 +#: src/tail.c:2204 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 +#: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "写入错误" -#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2612 +#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2617 #, c-format msgid "preserving permissions for %s" msgstr "%s 的保留权限" @@ -63,9 +63,9 @@ msgid "Unknown system error" msgstr "未知的系统错误" -#: src/copy.c:1642 src/copy.c:1694 src/copy.c:2277 src/copy.c:2599 -#: src/find-mount-point.c:84 src/install.c:679 src/realpath.c:145 -#: src/stat.c:1237 src/truncate.c:364 +#: src/copy.c:1642 src/copy.c:1694 src/copy.c:2277 src/copy.c:2604 +#: src/find-mount-point.c:84 src/install.c:678 src/realpath.c:145 +#: src/stat.c:1239 src/truncate.c:363 #, c-format msgid "cannot stat %s" msgstr "无法获取%s 的文件状态(stat)" @@ -258,13 +258,13 @@ msgid "cannot change permissions of %s" msgstr "无法更改%s 的权限" -#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:710 src/install.c:723 +#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:709 src/install.c:722 #, c-format msgid "cannot create directory %s" msgstr "无法创建目录%s" #: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 src/csplit.c:219 -#: src/split.c:930 src/tac.c:435 +#: src/split.c:929 src/tac.c:434 #, c-format msgid "memory exhausted" msgstr "内存耗尽" @@ -313,75 +313,75 @@ msgid "%s: end of file" msgstr "%s：文件结束" -#: lib/regcomp.c:130 +#: lib/regcomp.c:131 msgid "Success" msgstr "成功" -#: lib/regcomp.c:133 +#: lib/regcomp.c:134 msgid "No match" msgstr "无匹配" -#: lib/regcomp.c:136 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "无效的正则表达式" -#: lib/regcomp.c:139 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "无效的校勘字符" -#: lib/regcomp.c:142 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "无效的字符类型名" -#: lib/regcomp.c:145 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "末尾的反斜杠" -#: lib/regcomp.c:148 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "无效的后向引用" -#: lib/regcomp.c:151 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "未匹配的[ 或[^" -#: lib/regcomp.c:154 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "未匹配的( 或\\(" -#: lib/regcomp.c:157 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "未匹配的\\{" -#: lib/regcomp.c:160 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "\\{\\} 中内容无效" -#: lib/regcomp.c:163 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "无效的范围结束符" -#: lib/regcomp.c:166 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "内存耗尽" -#: lib/regcomp.c:169 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "无效的前置正则表达式" -#: lib/regcomp.c:172 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "正则表达式异常结束" -#: lib/regcomp.c:175 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "正则表达式过长" -#: lib/regcomp.c:178 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr "未匹配的 ) 或 \\)" -#: lib/regcomp.c:703 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "缺少之前的正则表达式" @@ -420,7 +420,7 @@ msgid "^[nN]" msgstr "^[nN]" -#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:518 +#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:516 #, c-format msgid "setting permissions for %s" msgstr "设置%s 的权限" @@ -571,24 +571,24 @@ msgid "Unknown signal %d" msgstr "未知信号%d" -#: lib/unicodeio.c:103 +#: lib/unicodeio.c:102 msgid "iconv function not usable" msgstr "iconv 函数无法使用" -#: lib/unicodeio.c:105 +#: lib/unicodeio.c:104 msgid "iconv function not available" msgstr "iconv 函数不存在" -#: lib/unicodeio.c:112 +#: lib/unicodeio.c:111 msgid "character out of range" msgstr "字符值超出可接受的范围以外" -#: lib/unicodeio.c:182 +#: lib/unicodeio.c:181 #, c-format msgid "cannot convert U+%04X to local character set" msgstr "无法将U+%04X 转换至用户的字符集" -#: lib/unicodeio.c:184 +#: lib/unicodeio.c:183 #, c-format msgid "cannot convert U+%04X to local character set: %s" msgstr "无法将U+%04X 转换至用户的字符集：%s" @@ -613,12 +613,12 @@ #: lib/version-etc.c:74 #, c-format msgid "Packaged by %s (%s)\n" -msgstr "由%s (%s)打包\n" +msgstr "由 %s 打包 (%s)\n" #: lib/version-etc.c:77 #, c-format msgid "Packaged by %s\n" -msgstr "由%s 打包\n" +msgstr "由 %s 打包\n" #. TRANSLATORS: Translate "(C)" to the copyright symbol #. (C-in-a-circle), if this symbol is available in the user's @@ -768,7 +768,7 @@ msgid "Report %s bugs to: %s\n" msgstr "请向 %2$s 报告 %1$s 的错误\n" -#: lib/version-etc.c:251 src/system.h:565 +#: lib/version-etc.c:251 src/system.h:573 #, c-format msgid "%s home page: <%s>\n" msgstr "%s 的主页：<%s>\n" @@ -778,7 +778,7 @@ msgid "%s home page: \n" msgstr "%s 项目主页：\n" -#: lib/version-etc.c:256 src/system.h:566 +#: lib/version-etc.c:256 src/system.h:574 msgid "General help using GNU software: \n" msgstr "GNU 软件一般性帮助：\n" @@ -880,7 +880,7 @@ "使用 Base64 编码/解码文件或标准输入输出。\n" "\n" -#: src/base64.c:64 +#: src/base64.c:67 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -894,7 +894,7 @@ " -w, --wrap=字符数\t在指定的字符数后自动换行(默认为76)，0 为禁用自动换行\n" "\n" -#: src/base64.c:73 src/cat.c:110 src/fmt.c:296 src/shuf.c:71 src/sum.c:70 +#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:70 src/sum.c:70 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -902,7 +902,7 @@ "\n" "如果没有指定文件，或者文件为\"-\"，则从标准输入读取。\n" -#: src/base64.c:76 +#: src/base64.c:79 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -914,37 +914,37 @@ "数据以 RFC 3548 规定的 Base64 字母格式进行编码。 解码时，输入数据(加密流)可能包含一些非有效 Base64 " "字符的新行字符。可以尝试用 --ignore-garbage 选项来恢复加密流中任何非 base64 字符。\n" -#: src/base64.c:171 src/base64.c:208 src/csplit.c:263 src/csplit.c:1437 -#: src/join.c:451 src/shuf.c:157 src/shuf.c:361 src/tac-pipe.c:74 +#: src/base64.c:174 src/base64.c:211 src/csplit.c:263 src/csplit.c:1437 +#: src/join.c:451 src/shuf.c:156 src/shuf.c:360 src/tac-pipe.c:74 #: src/tee.c:204 src/tr.c:1644 #, c-format msgid "read error" msgstr "读取错误" -#: src/base64.c:227 +#: src/base64.c:230 #, c-format msgid "invalid input" msgstr "输入无效" -#: src/base64.c:264 +#: src/base64.c:267 #, c-format msgid "invalid wrap size: %s" msgstr "无效的换行字符数：%s" -#: src/base64.c:283 src/basename.c:173 src/comm.c:435 src/cp.c:607 -#: src/date.c:441 src/dircolors.c:447 src/du.c:937 src/hostid.c:74 +#: src/base64.c:286 src/basename.c:174 src/comm.c:435 src/cp.c:605 +#: src/date.c:445 src/dircolors.c:447 src/du.c:964 src/hostid.c:74 #: src/hostname.c:111 src/id.c:169 src/install.c:930 src/join.c:961 -#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:157 src/mv.c:449 -#: src/nproc.c:119 src/od.c:1802 src/ptx.c:2081 src/readlink.c:154 -#: src/seq.c:519 src/shuf.c:320 src/shuf.c:339 src/sort.c:4532 -#: src/split.c:1327 src/tr.c:1797 src/tsort.c:555 src/tty.c:112 -#: src/uname.c:251 src/uniq.c:454 src/uniq.c:471 src/unlink.c:81 -#: src/uptime.c:250 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79 +#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:156 src/mv.c:449 +#: src/nproc.c:119 src/od.c:1808 src/ptx.c:2080 src/seq.c:546 src/shuf.c:319 +#: src/shuf.c:338 src/sort.c:4531 src/split.c:1326 src/tr.c:1797 +#: src/tsort.c:555 src/tty.c:112 src/uname.c:251 src/uniq.c:453 src/uniq.c:470 +#: src/unlink.c:81 src/uptime.c:250 src/users.c:146 src/wc.c:666 src/who.c:827 +#: src/whoami.c:79 #, c-format msgid "extra operand %s" msgstr "额外的操作数 %s" -#: src/base64.c:315 src/cat.c:781 +#: src/base64.c:318 src/cat.c:781 #, c-format msgid "closing standard input" msgstr "关闭标准输入" @@ -996,13 +996,13 @@ " %s /usr/bin/sort 输出\"sort\"。\n" " %s include/stdio.h .h 输出\"stdio\"。\n" -#: src/basename.c:167 src/chcon.c:531 src/chgrp.c:277 src/chmod.c:526 +#: src/basename.c:168 src/chcon.c:537 src/chgrp.c:277 src/chmod.c:526 #: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1371 #: src/dirname.c:116 src/expr.c:326 src/join.c:1147 src/link.c:77 -#: src/mkdir.c:183 src/mkfifo.c:108 src/mknod.c:146 src/nohup.c:111 -#: src/pathchk.c:148 src/printf.c:674 src/readlink.c:146 src/realpath.c:236 -#: src/rm.c:321 src/rmdir.c:223 src/seq.c:513 src/setuidgid.c:137 -#: src/sleep.c:119 src/stat.c:1493 src/stdbuf.c:346 src/tr.c:1782 +#: src/mkdir.c:182 src/mkfifo.c:107 src/mknod.c:145 src/nohup.c:111 +#: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236 +#: src/rm.c:321 src/rmdir.c:223 src/seq.c:540 src/setuidgid.c:137 +#: src/sleep.c:119 src/stat.c:1499 src/stdbuf.c:345 src/tr.c:1782 #: src/unlink.c:75 #, c-format msgid "missing operand" @@ -1020,8 +1020,8 @@ msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:872 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4720 src/nl.c:182 src/paste.c:435 src/pr.c:2768 src/sum.c:58 +#: src/cat.c:88 src/df.c:1209 src/expand.c:103 src/fold.c:66 src/head.c:105 +#: src/ls.c:4720 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58 #: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" @@ -1101,7 +1101,7 @@ msgid "Jim Meyering" msgstr "Jim Meyering" -#: src/chcon.c:100 src/runcon.c:203 src/runcon.c:234 +#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:238 #, c-format msgid "failed to create security context: %s" msgstr "创建安全环境失败：%s" @@ -1111,8 +1111,8 @@ msgid "failed to set %s security context component to %s" msgstr "设置%s 安全环境组件到%s 失败" -#: src/chcon.c:156 src/chcon.c:540 src/copy.c:2227 src/runcon.c:217 -#: src/stat.c:700 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:2227 src/runcon.c:221 +#: src/stat.c:702 #, c-format msgid "failed to get security context of %s" msgstr "无法取得%s 的安全环境" @@ -1128,12 +1128,12 @@ msgstr "改变%s 的环境到%s 失败" #: src/chcon.c:255 src/chmod.c:216 src/chown-core.c:325 src/copy.c:581 -#: src/du.c:451 src/ls.c:2981 +#: src/du.c:457 src/ls.c:2981 #, c-format msgid "cannot access %s" msgstr "无法访问%s" -#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:431 +#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:437 #, c-format msgid "cannot read directory %s" msgstr "无法读取目录%s" @@ -1148,7 +1148,7 @@ msgid "fts_read failed" msgstr "fts_read 失败" -#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:629 +#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:642 #: src/remove.c:576 #, c-format msgid "fts_close failed" @@ -1226,36 +1226,36 @@ " -P 不遍历任何符号链接(默认)\n" "\n" -#: src/chcon.c:512 src/chgrp.c:264 src/chown.c:267 +#: src/chcon.c:518 src/chgrp.c:264 src/chown.c:267 #, c-format msgid "-R --dereference requires either -H or -L" msgstr "-R --dereference 需要-H 或-L 其中之一" -#: src/chcon.c:518 +#: src/chcon.c:524 #, c-format msgid "-R -h requires -P" msgstr "-R -h 需要-P" -#: src/chcon.c:533 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282 +#: src/chcon.c:539 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282 #: src/comm.c:429 src/csplit.c:1373 src/join.c:1149 src/link.c:79 -#: src/mknod.c:148 src/setuidgid.c:139 src/tr.c:1785 +#: src/mknod.c:147 src/setuidgid.c:139 src/tr.c:1785 #, c-format msgid "missing operand after %s" msgstr "%s 后缺少操作数" -#: src/chcon.c:556 src/runcon.c:247 +#: src/chcon.c:562 src/runcon.c:251 #, c-format msgid "invalid context: %s" msgstr "无效模式：%s" -#: src/chcon.c:563 +#: src/chcon.c:569 #, c-format msgid "conflicting security context specifiers given" msgstr "给出的安全环境说明冲突" -#: src/chcon.c:572 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:536 -#: src/chmod.c:555 src/chown.c:290 src/chown.c:319 src/cp.c:433 src/cp.c:493 -#: src/mv.c:97 src/pwd.c:273 src/rm.c:331 src/touch.c:348 +#: src/chcon.c:578 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:536 +#: src/chmod.c:555 src/chown.c:290 src/chown.c:319 src/cp.c:431 src/cp.c:491 +#: src/mv.c:97 src/pwd.c:273 src/rm.c:331 src/touch.c:347 #, c-format msgid "failed to get attributes of %s" msgstr "无法取得%s 的属性" @@ -1659,8 +1659,8 @@ msgid "failed to set user-ID" msgstr "设置用户ID 失败" -#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:366 -#: src/timeout.c:428 +#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:365 +#: src/timeout.c:454 #, c-format msgid "failed to run command %s" msgstr "无法运行命令%s" @@ -1779,7 +1779,7 @@ msgid "reading %s" msgstr "正在读入%s" -#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:426 +#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:425 #, c-format msgid "cannot lseek %s" msgstr "无法lseek %s" @@ -1809,7 +1809,7 @@ msgid "clearing permissions for %s" msgstr "清除%s 的权限" -#: src/copy.c:697 src/copy.c:2475 src/cp.c:331 +#: src/copy.c:697 src/copy.c:2480 src/cp.c:329 #, c-format msgid "failed to preserve ownership for %s" msgstr "无法保留%s 的所有者" @@ -1824,14 +1824,14 @@ msgid "failed to preserve authorship for %s" msgstr "保留%s 的作者失败" -#: src/copy.c:804 src/csplit.c:640 src/du.c:944 src/fmt.c:452 src/head.c:855 -#: src/sort.c:4544 src/split.c:1343 src/tail.c:1757 src/wc.c:678 +#: src/copy.c:804 src/csplit.c:640 src/du.c:971 src/fmt.c:451 src/head.c:854 +#: src/sort.c:4543 src/split.c:1342 src/tail.c:1756 src/wc.c:678 #, c-format msgid "cannot open %s for reading" msgstr "无法打开%s 读取数据" -#: src/copy.c:810 src/copy.c:972 src/dd.c:1554 src/dd.c:2122 src/dd.c:2260 -#: src/tail.c:1593 src/tail.c:1659 src/truncate.c:141 +#: src/copy.c:810 src/copy.c:972 src/dd.c:1554 src/dd.c:2122 src/dd.c:2261 +#: src/tail.c:1592 src/tail.c:1658 src/truncate.c:140 #, c-format msgid "cannot fstat %s" msgstr "无法获取%s 的文件状态(fstat)" @@ -1878,7 +1878,7 @@ msgid "failed to clone %s from %s" msgstr "" -#: src/copy.c:1098 src/copy.c:2536 +#: src/copy.c:1098 src/copy.c:2541 #, c-format msgid "preserving times for %s" msgstr "正在保留 %s 的时间" @@ -1994,8 +1994,8 @@ msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "无法进行跨设备的移动：%s 至%s；无法删除目标" -#: src/copy.c:2212 src/install.c:906 src/mkdir.c:189 src/mkfifo.c:114 -#: src/mknod.c:167 +#: src/copy.c:2212 src/install.c:906 src/mkdir.c:188 src/mkfifo.c:113 +#: src/mknod.c:166 #, c-format msgid "failed to set default file creation context to %s" msgstr "无法取得%s 的创建环境" @@ -2015,37 +2015,37 @@ msgid "cannot create symbolic link %s to %s" msgstr "无法创建指向%2$s 的符号链接%1$s" -#: src/copy.c:2411 src/mkfifo.c:133 +#: src/copy.c:2416 src/mkfifo.c:132 #, c-format msgid "cannot create fifo %s" msgstr "无法创建先进先出文件%s" -#: src/copy.c:2420 +#: src/copy.c:2425 #, c-format msgid "cannot create special file %s" msgstr "无法创建特殊文件%s" -#: src/copy.c:2431 src/ls.c:3185 src/stat.c:919 +#: src/copy.c:2436 src/ls.c:3185 src/stat.c:921 #, c-format msgid "cannot read symbolic link %s" msgstr "无法读取符号链接%s" -#: src/copy.c:2458 +#: src/copy.c:2463 #, c-format msgid "cannot create symbolic link %s" msgstr "无法创建符号链接%s" -#: src/copy.c:2490 +#: src/copy.c:2495 #, c-format msgid "%s has unknown file type" msgstr "%s 的文件类型不详" -#: src/copy.c:2639 src/ln.c:358 +#: src/copy.c:2644 src/ln.c:358 #, c-format msgid "cannot un-backup %s" msgstr "无法将%s 的备份还原" -#: src/copy.c:2643 +#: src/copy.c:2648 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (还原备份)\n" @@ -2080,7 +2080,7 @@ "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "长选项必须使用的参数对于短选项时也是必需使用的。\n" -#: src/cp.c:169 +#: src/cp.c:168 msgid "" " -a, --archive same as -dR --preserve=all\n" " --attributes-only don't copy the file data, just the " @@ -2116,13 +2116,13 @@ " -i, --interactive\t\t覆盖前询问(使前面的 -n 选项失效)\n" " -H\t\t\t\t跟随源文件中的命令行符号链接\n" -#: src/cp.c:188 +#: src/cp.c:186 msgid "" " -l, --link hard link files instead of copying\n" " -L, --dereference always follow symbolic links in SOURCE\n" msgstr "" -#: src/cp.c:192 +#: src/cp.c:190 msgid "" " -n, --no-clobber do not overwrite an existing file (overrides\n" " a previous -i option)\n" @@ -2131,7 +2131,7 @@ " -n, --no-clobber\t\t不要覆盖已存在的文件(使前面的 -i 选项失效)\n" " -P, --no-dereference\t\t不跟随源文件中的符号链接\n" -#: src/cp.c:197 +#: src/cp.c:195 msgid "" " -p same as --preserve=mode,ownership,timestamps\n" " --preserve[=ATTR_LIST] preserve the specified attributes (default:\n" @@ -2144,7 +2144,7 @@ " --preserve[=属性列表\t保持指定的属性(默认：模式,所有权,时间戳)，如果\n" "\t\t\t\t\t可能保持附加属性：环境、链接、xattr 等\n" -#: src/cp.c:205 +#: src/cp.c:203 msgid "" " --no-preserve=ATTR_LIST don't preserve the specified attributes\n" " --parents use full source file name under DIRECTORY\n" @@ -2152,7 +2152,7 @@ " --sno-preserve=属性列表\t不保留指定的文件属性\n" " --parents\t\t\t复制前在目标目录创建来源文件路径中的所有目录\n" -#: src/cp.c:209 +#: src/cp.c:207 msgid "" " -R, -r, --recursive copy directories recursively\n" " --reflink[=WHEN] control clone/CoW copies. See below\n" @@ -2165,7 +2165,7 @@ " --remove-destination\t尝试打开目标文件前先删除已存在的目的地\n" "\t\t\t\t\t文件 (相对于 --force 选项)\n" -#: src/cp.c:215 +#: src/cp.c:213 msgid "" " --sparse=WHEN control creation of sparse files. See below\n" " --strip-trailing-slashes remove any trailing slashes from each " @@ -2175,7 +2175,7 @@ " --sparse=WHEN\t\t控制创建稀疏文件的方式\n" " --strip-trailing-slashes\t删除参数中所有源文件/目录末端的斜杠\n" -#: src/cp.c:220 +#: src/cp.c:218 msgid "" " -s, --symbolic-link make symbolic links instead of copying\n" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -2189,7 +2189,7 @@ " 复制至目标目录\n" " -T, --no-target-directory\t将目标目录视作普通文件\n" -#: src/cp.c:226 +#: src/cp.c:224 msgid "" " -u, --update copy only when the SOURCE file is newer\n" " than the destination file or when the\n" @@ -2202,7 +2202,7 @@ " -v, --verbose\t\t显示详细的进行步骤\n" " -x, --one-file-system\t不跨越文件系统进行操作\n" -#: src/cp.c:235 +#: src/cp.c:233 msgid "" "\n" "By default, sparse SOURCE files are detected by a crude heuristic and the\n" @@ -2242,7 +2242,7 @@ "变量来选择。以下是可用的变量值：\n" "\n" -#: src/cp.c:254 src/install.c:657 src/mv.c:330 +#: src/cp.c:252 src/install.c:656 src/ln.c:427 src/mv.c:329 msgid "" " none, off never make backups (even if --backup is given)\n" " numbered, t make numbered backups\n" @@ -2254,7 +2254,7 @@ " existing, nil 若有数字的备份文件已经存在则使用数字，否则使用普通方式备份\n" " simple, never 永远使用普通方式备份\n" -#: src/cp.c:260 +#: src/cp.c:258 msgid "" "\n" "As a special case, cp makes a backup of SOURCE when the force and backup\n" @@ -2265,22 +2265,22 @@ "有一个特别情况：如果同时指定--force 和--backup 选项，而源文件和目标文件\n" "是同一个已存在的一般文件的话，cp 会将源文件备份。\n" -#: src/cp.c:319 +#: src/cp.c:317 #, c-format msgid "failed to preserve times for %s" msgstr "无法保留%s 的时间" -#: src/cp.c:350 +#: src/cp.c:348 #, c-format msgid "failed to preserve permissions for %s" msgstr "保留%s 的权限失败" -#: src/cp.c:477 +#: src/cp.c:475 #, c-format msgid "cannot make directory %s" msgstr "无法创建目录%s" -#: src/cp.c:526 src/cp.c:545 +#: src/cp.c:524 src/cp.c:543 #, c-format msgid "%s exists but is not a directory" msgstr "%s 存在但并非目录" @@ -2291,64 +2291,64 @@ msgid "accessing %s" msgstr "正在访问%s" -#: src/cp.c:592 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1182 -#: src/touch.c:430 src/truncate.c:355 +#: src/cp.c:590 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1181 +#: src/touch.c:429 src/truncate.c:354 #, c-format msgid "missing file operand" msgstr "缺少了文件操作数" -#: src/cp.c:594 src/install.c:917 src/ln.c:560 src/mv.c:436 +#: src/cp.c:592 src/install.c:917 src/ln.c:560 src/mv.c:436 #, c-format msgid "missing destination file operand after %s" msgstr "在%s 后缺少了要操作的目标文件" -#: src/cp.c:603 src/install.c:926 src/mv.c:445 +#: src/cp.c:601 src/install.c:926 src/mv.c:445 #, c-format msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)" msgstr "无法同时使用--target-directory (-t) 和--no-target-directory (-T) 选项" -#: src/cp.c:619 src/cp.c:1073 src/install.c:404 src/install.c:847 +#: src/cp.c:617 src/cp.c:1072 src/install.c:404 src/install.c:847 #: src/install.c:939 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:403 #: src/mv.c:459 #, c-format msgid "target %s is not a directory" msgstr "目标%s 不是目录" -#: src/cp.c:730 +#: src/cp.c:728 #, c-format msgid "with --parents, the destination must be a directory" msgstr "当跟随--parents 选项时，目的地必须是目录" -#: src/cp.c:1066 src/install.c:840 src/ln.c:511 src/mv.c:396 +#: src/cp.c:1064 src/install.c:839 src/ln.c:510 src/mv.c:395 #, c-format msgid "multiple target directories specified" msgstr "指定了多个目标目录" -#: src/cp.c:1111 +#: src/cp.c:1110 #, c-format msgid "cannot make both hard and symbolic links" msgstr "无法同时创建硬链接及符号链接" -#: src/cp.c:1118 src/mv.c:466 +#: src/cp.c:1117 src/mv.c:466 #, c-format msgid "options --backup and --no-clobber are mutually exclusive" msgstr "选项--backup 和 --no-clobber 互斥" -#: src/cp.c:1124 +#: src/cp.c:1123 #, c-format msgid "--reflink can be used only with --sparse=auto" msgstr "--reflink 只能与--sparse=auto 一起用" -#: src/cp.c:1132 src/install.c:900 src/ln.c:582 src/mv.c:474 +#: src/cp.c:1131 src/install.c:900 src/ln.c:582 src/mv.c:474 msgid "backup type" msgstr "备份方式" -#: src/cp.c:1157 +#: src/cp.c:1156 #, c-format msgid "cannot preserve security context without an SELinux-enabled kernel" msgstr "无法在未启用SELinux 支持的内核上使用安全环境" -#: src/cp.c:1163 +#: src/cp.c:1162 #, c-format msgid "" "cannot preserve extended attributes, cp is built without xattr support" @@ -2384,7 +2384,7 @@ msgid "%s: %s: match not found" msgstr "%s：%s：无匹配" -#: src/csplit.c:810 src/csplit.c:850 src/nl.c:359 src/tac.c:274 +#: src/csplit.c:810 src/csplit.c:850 src/nl.c:351 src/tac.c:273 #, c-format msgid "error in regular expression search" msgstr "正则表达式搜索时出错" @@ -2500,7 +2500,7 @@ " -f, --prefix=前缀\t\t使用指定前缀代替\"xx\"\n" " -k, --keep-files\t\t不移除错误的输出文件\n" -#: src/csplit.c:1468 +#: src/csplit.c:1467 msgid "" " -n, --digits=DIGITS use specified number of digits instead of 2\n" " -s, --quiet, --silent do not print counts of output file sizes\n" @@ -2510,7 +2510,7 @@ " -s, --quiet, --silent\t不显示输出文件的尺寸计数\n" " -z, --elide-empty-files\t删除空的输出文件\n" -#: src/csplit.c:1475 +#: src/csplit.c:1474 msgid "" "\n" "Read standard input if FILE is -. Each PATTERN may be:\n" @@ -2543,7 +2543,7 @@ msgid "David M. Ihnat" msgstr "David M. Ihnat" -#: src/cut.c:64 +#: src/cut.c:64 src/cut.c:372 msgid "fields and positions are numbered from 1" msgstr "序号从1 开始计数" @@ -2560,7 +2560,7 @@ "从每个文件中输出指定部分到标准输出。\n" "\n" -#: src/cut.c:200 +#: src/cut.c:199 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2570,7 +2570,7 @@ " -c, --characters=列表\t\t只选中指定的这些字符\n" " -d, --delimiter=分界符\t使用指定分界符代替制表符作为区域分界\n" -#: src/cut.c:205 +#: src/cut.c:204 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2581,13 +2581,13 @@ "\t\t\t\t行，除非-s 选项被指定\n" " -n\t\t\t\t(忽略)\n" -#: src/cut.c:211 +#: src/cut.c:210 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" msgstr " --complement\t\t补全选中的字节、字符或域\n" -#: src/cut.c:215 +#: src/cut.c:214 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2597,7 +2597,7 @@ " --output-delimiter=字符串\t使用指定的字符串作为输出分界符，默认采用输入\n" "\t\t\t\t的分界符\n" -#: src/cut.c:222 +#: src/cut.c:221 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2608,7 +2608,7 @@ "仅使用f -b, -c 或-f 中的一个。每一个列表都是专门为一个类别作出的，或者您可以用逗号隔\n" "开要同时显示的不同类别。您的输入顺序将作为读取顺序，每个仅能输入一次。\n" -#: src/cut.c:228 +#: src/cut.c:227 msgid "" "Each range is one of:\n" "\n" @@ -2631,41 +2631,42 @@ msgid "invalid byte or field list" msgstr "无效的字节或域列表" -#: src/cut.c:385 +#: src/cut.c:387 msgid "invalid range with no endpoint: -" msgstr "无终点的无效的范围：-" -#: src/cut.c:399 +#: src/cut.c:403 msgid "invalid decreasing range" msgstr "无效的缩小的范围" -#: src/cut.c:478 +#: src/cut.c:482 #, c-format msgid "byte offset %s is too large" msgstr "字节偏移量%s 过大" -#: src/cut.c:481 +#: src/cut.c:485 #, c-format msgid "field number %s is too large" msgstr "域编号%s 过大" -#: src/cut.c:789 src/cut.c:797 +#: src/cut.c:795 src/cut.c:803 msgid "only one type of list may be specified" msgstr "只能指定列表中的一种类型" -#: src/cut.c:806 +#: src/cut.c:812 src/numfmt.c:1408 +#, c-format msgid "the delimiter must be a single character" msgstr "分界符必须是单个字符" -#: src/cut.c:841 +#: src/cut.c:847 msgid "you must specify a list of bytes, characters, or fields" msgstr "您必须指定一组字节、字符或域的列表" -#: src/cut.c:844 +#: src/cut.c:850 msgid "an input delimiter may be specified only when operating on fields" msgstr "只有当操作域时才可以指定输入分界符" -#: src/cut.c:848 +#: src/cut.c:854 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2673,11 +2674,11 @@ "清除没有分界符的行只有在\n" "\t操作域时才有意义" -#: src/cut.c:864 +#: src/cut.c:870 msgid "missing list of fields" msgstr "缺少域列表" -#: src/cut.c:866 +#: src/cut.c:872 msgid "missing list of positions" msgstr "缺少位置列表" @@ -2702,7 +2703,7 @@ " -d,--date=字符串\t\t显示指定字符串所描述的时间，而非当前时间\n" " -f,--file=日期文件\t\t类似--date，从日期文件中按行读入时间描述\n" -#: src/date.c:138 +#: src/date.c:142 msgid "" " -r, --reference=FILE display the last modification time of FILE\n" " -R, --rfc-2822 output date and time in RFC 2822 format.\n" @@ -2730,7 +2731,7 @@ " -s, --set=字符串 \t设置指定字符串来分开时间\n" " -u, --utc, --universal\t输出或者设置协调的通用时间\n" -#: src/date.c:154 +#: src/date.c:158 msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" @@ -2744,7 +2745,7 @@ " %%\t一个文字的 %\n" " %a\t当前locale 的星期名缩写(例如： 日，代表星期日)\n" -#: src/date.c:161 +#: src/date.c:165 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2756,7 +2757,7 @@ " %B\t当前locale 的月名全称 (如：一月)\n" " %c\t当前locale 的日期和时间 (如：2005年3月3日 星期四 23:05:25)\n" -#: src/date.c:167 +#: src/date.c:171 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2768,7 +2769,7 @@ " %D\t按月计的日期；等于%m/%d/%y\n" " %e\t按月计的日期，添加空格，等于%_d\n" -#: src/date.c:173 +#: src/date.c:177 msgid "" " %F full date; same as %Y-%m-%d\n" " %g last two digits of year of ISO week number (see %G)\n" @@ -2778,7 +2779,7 @@ " %g\tISO-8601 格式年份的最后两位 (参见%G)\n" " %G\tISO-8601 格式年份 (参见%V)，一般只和 %V 结合使用\n" -#: src/date.c:178 +#: src/date.c:182 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2790,7 +2791,7 @@ " %I\t小时(00-12)\n" " %j\t按年计的日期(001-366)\n" -#: src/date.c:184 +#: src/date.c:188 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -2798,7 +2799,7 @@ " %M minute (00..59)\n" msgstr "" -#: src/date.c:190 +#: src/date.c:194 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2816,7 +2817,7 @@ " %R\t24 小时时间的时和分，等价于 %H:%M\n" " %s\t自UTC 时间 1970-01-01 00:00:00 以来所经过的秒数\n" -#: src/date.c:199 +#: src/date.c:203 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2828,7 +2829,7 @@ " %T\t时间，等于%H:%M:%S\n" " %u\t星期，1 代表星期一\n" -#: src/date.c:205 +#: src/date.c:209 msgid "" " %U week number of year, with Sunday as first day of week (00..53)\n" " %V ISO week number, with Monday as first day of week (01..53)\n" @@ -2840,7 +2841,7 @@ " %w\t一星期中的第几日(0-6)，0 代表周一\n" " %W\t一年中的第几周，以周一为每星期第一天(00-53)\n" -#: src/date.c:211 +#: src/date.c:215 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -2852,7 +2853,7 @@ " %y\t年份最后两位数位 (00-99)\n" " %Y\t年份\n" -#: src/date.c:217 +#: src/date.c:221 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -2889,7 +2890,7 @@ " ^ 如果可能，使用大写字母\n" " # 如果可能，使用相反的大小写\n" -#: src/date.c:235 +#: src/date.c:239 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -2902,7 +2903,7 @@ "作为一个可选的修饰声明，它可以是E，在可能的情况下使用本地环境关联的\n" "表示方式；或者是O，在可能的情况下使用本地环境关联的数字符号。\n" -#: src/date.c:242 +#: src/date.c:246 msgid "" "\n" "Examples:\n" @@ -2916,30 +2917,30 @@ " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" msgstr "" -#: src/date.c:275 src/dd.c:2201 src/head.c:846 src/md5sum.c:498 -#: src/md5sum.c:862 src/od.c:863 src/od.c:1914 src/pr.c:1176 src/pr.c:1372 -#: src/pr.c:1494 src/stty.c:843 src/tac.c:563 src/tail.c:343 src/tee.c:126 +#: src/date.c:279 src/dd.c:2201 src/head.c:845 src/md5sum.c:498 +#: src/md5sum.c:862 src/od.c:869 src/od.c:1920 src/pr.c:1172 src/pr.c:1362 +#: src/pr.c:1484 src/stty.c:851 src/tac.c:562 src/tail.c:342 src/tee.c:126 #: src/tr.c:1945 src/tsort.c:530 src/wc.c:196 #, c-format msgid "standard input" msgstr "标准输入" -#: src/date.c:303 src/date.c:523 +#: src/date.c:307 src/date.c:527 #, c-format msgid "invalid date %s" msgstr "无效的日期%s" -#: src/date.c:414 src/date.c:448 +#: src/date.c:418 src/date.c:452 #, c-format msgid "multiple output formats specified" msgstr "指定了多种输出格式" -#: src/date.c:426 +#: src/date.c:430 #, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "被指定的这几种日期显示选项是相互抵触的" -#: src/date.c:433 +#: src/date.c:437 #, c-format msgid "the options to print and set the time may not be used together" msgstr "显示与设置时间的选项不能同时使用" @@ -2954,12 +2955,12 @@ "参数%s 缺少前导的\"+\"；\n" "当使用选项来描述日期是，任何非选项参数都必须以\"+\"所引导的字符串出现" -#: src/date.c:531 +#: src/date.c:535 #, c-format msgid "cannot set date" msgstr "无法设置日期" -#: src/date.c:554 src/du.c:365 +#: src/date.c:558 src/du.c:371 #, c-format msgid "time %s is out of range" msgstr "时间%s 超出范围" @@ -3254,7 +3255,7 @@ msgid "invalid status flag" msgstr "状态标志无效" -#: src/dd.c:1266 src/truncate.c:311 +#: src/dd.c:1266 src/truncate.c:310 #, c-format msgid "invalid number %s" msgstr "无效的数字%s" @@ -3353,19 +3354,19 @@ msgid "opening %s" msgstr "正在打开%s" -#: src/dd.c:2245 +#: src/dd.c:2246 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=% (%lu-byte) " "blocks" msgstr "偏移量过大：无法在seek=% (%lu-字节) 块的长度上实施截断" -#: src/dd.c:2133 src/dd.c:2266 +#: src/dd.c:2267 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "无法针对输出文件%2$s 的%1$ 字节处实施截断" -#: src/dd.c:2282 src/dd.c:2288 +#: src/dd.c:2283 src/dd.c:2289 #, c-format msgid "failed to discard cache for: %s" msgstr "无法丢弃缓存：%s" @@ -3377,59 +3378,59 @@ msgstr "Paul Eggert" # ## Proof reading to here. -#: src/df.c:140 +#: src/df.c:172 msgid "Filesystem" msgstr "文件系统" -#: src/df.c:141 +#: src/df.c:175 msgid "Type" msgstr "类型" -#: src/df.c:142 +#: src/df.c:178 src/df.c:542 msgid "blocks" msgstr "块" -#: src/df.c:142 +#: src/df.c:190 msgid "Inodes" msgstr "Inode" -#: src/df.c:142 +#: src/df.c:410 src/df.c:449 msgid "Size" msgstr "容量" -#: src/df.c:143 +#: src/df.c:181 msgid "Used" msgstr "已用" -#: src/df.c:143 +#: src/df.c:193 msgid "IUsed" msgstr "已用(I)" -#: src/df.c:144 +#: src/df.c:184 msgid "Available" msgstr "可用" -#: src/df.c:144 +#: src/df.c:196 msgid "IFree" msgstr "可用(I)" -#: src/df.c:144 +#: src/df.c:414 src/df.c:451 msgid "Avail" msgstr "可用" -#: src/df.c:145 +#: src/df.c:187 msgid "Use%" msgstr "已用%" -#: src/df.c:145 +#: src/df.c:199 msgid "IUse%" msgstr "已用(I)%" -#: src/df.c:145 +#: src/df.c:474 msgid "Capacity" msgstr "配额" -#: src/df.c:146 +#: src/df.c:202 msgid "Mounted on" msgstr "挂载点" @@ -3459,7 +3460,7 @@ " -h, --human-readable\t以可读性较好的格式显示尺寸(例如：1K 234M 2G)\n" " -H, --si\t\t计算时使用1000 为基底而非1024\n" -#: src/df.c:891 +#: src/df.c:1227 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3488,20 +3489,20 @@ " -x, --exclude-type=类型\t只显示文件系统不是指定类型信息\n" " -v\t\t\t(忽略)\n" -#: src/df.c:1060 +#: src/df.c:1442 #, c-format msgid "file system type %s both selected and excluded" msgstr "不能同时选择和排除文件系统类型%s" -#: src/df.c:1117 +#: src/df.c:1500 msgid "Warning: " msgstr "警告： " -#: src/df.c:1119 src/stat.c:812 +#: src/df.c:1502 src/stat.c:814 msgid "cannot read table of mounted file systems" msgstr "%s 无法读取已挂载上的文件系统的目录" -#: src/df.c:1151 +#: src/df.c:1539 #, c-format msgid "no file systems processed" msgstr "未处理文件系统" @@ -3608,7 +3609,7 @@ " %s /usr/bin/\t输出\"/usr\"。\n" " %s stdio.h\t\t输出\".\"。\n" -#: src/du.c:265 src/sort.c:394 src/wc.c:112 +#: src/du.c:270 src/sort.c:394 src/wc.c:112 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3731,59 +3732,60 @@ " --time-style=样式\t按照指定样式显示时间(样式解释规则同\"date\"命令)：\n" "\t\t\tfull-iso，long-iso，iso，+FORMAT\n" -#: src/du.c:611 +#: src/du.c:624 #, c-format msgid "fts_read failed: %s" msgstr "fts_read 失败：%s" -#: src/du.c:767 +#: src/du.c:780 #, c-format msgid "invalid maximum depth %s" msgstr "目录最大深度%s 无效" -#: src/du.c:860 +#: src/du.c:887 #, c-format msgid "cannot both summarize and show all entries" msgstr "不能既显示总用量，同时又显示每个项目" -#: src/du.c:867 +#: src/du.c:894 #, c-format msgid "warning: summarizing is the same as using --max-depth=0" msgstr "警告：显示总用量等价于使用--max-depth=0" -#: src/du.c:873 +#: src/du.c:900 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "警告：显示总用量的选项和--max-depth=%lu 互斥" -#: src/du.c:939 src/sort.c:4534 src/wc.c:668 +#: src/du.c:966 src/sort.c:4533 src/wc.c:668 msgid "file operands cannot be combined with --files0-from" msgstr "文件操作数不能于--files0-from 参数一起使用" -#: src/du.c:999 src/md5sum.c:608 src/od.c:903 src/tac.c:239 src/tac.c:350 -#: src/tac.c:506 src/tac.c:586 src/wc.c:733 +#: src/du.c:1026 src/md5sum.c:608 src/od.c:909 src/tac.c:238 src/tac.c:349 +#: src/tac.c:505 src/tac.c:585 src/wc.c:733 #, c-format msgid "%s: read error" msgstr "%s：读取出错" -#: src/du.c:1013 src/sort.c:4563 src/wc.c:747 +#: src/du.c:1040 src/sort.c:4562 src/wc.c:747 #, c-format msgid "when reading file names from stdin, no file name of %s allowed" msgstr "当从标准输入读取时，不允许指定文件名%s" -#: src/du.c:1030 src/du.c:1038 src/wc.c:760 src/wc.c:768 +#: src/du.c:1057 src/du.c:1065 src/wc.c:760 src/wc.c:768 msgid "invalid zero-length file name" msgstr "无效的零长度文件名" -#: src/du.c:1058 src/head.c:149 src/head.c:262 src/head.c:334 src/head.c:538 -#: src/head.c:620 src/head.c:700 src/head.c:758 src/head.c:782 src/tail.c:412 -#: src/tail.c:500 src/tail.c:549 src/tail.c:642 src/tail.c:770 src/tail.c:818 -#: src/tail.c:855 src/tail.c:1783 src/tail.c:1813 src/uniq.c:395 +#: src/copy.c:168 src/dd.c:1617 src/dd.c:1984 src/du.c:1085 src/head.c:148 +#: src/head.c:261 src/head.c:333 src/head.c:537 src/head.c:619 src/head.c:699 +#: src/head.c:757 src/head.c:781 src/tail.c:411 src/tail.c:499 src/tail.c:548 +#: src/tail.c:641 src/tail.c:769 src/tail.c:817 src/tail.c:854 src/tail.c:1782 +#: src/tail.c:1812 src/uniq.c:394 #, c-format msgid "error reading %s" msgstr "读取%s 时出错" -#: src/du.c:1061 src/ls.c:2649 src/wc.c:791 +#: src/du.c:1088 src/ls.c:2649 src/wc.c:791 msgid "total" msgstr "总用量" @@ -3898,7 +3900,7 @@ " -0, --null 以空字符而非新行符结束每一输出行\n" " -u, --unset=名称 从当前环境中撤消一个变量\n" -#: src/env.c:64 +#: src/env.c:68 msgid "" "\n" "A mere - implies -i. If no COMMAND, print the resulting environment.\n" @@ -3906,17 +3908,17 @@ "\n" "单纯的 - 意味着 -i。如果没有命令，则打印结果环境。\n" -#: src/env.c:120 +#: src/env.c:124 #, c-format msgid "cannot unset %s" msgstr "无法撤消 %s" -#: src/env.c:131 +#: src/env.c:135 #, c-format msgid "cannot set %s" msgstr "无法设定 %s" -#: src/env.c:148 +#: src/env.c:152 #, c-format msgid "cannot specify --null (-0) with command" msgstr "无法以命令指定--null (-0)" @@ -3931,7 +3933,7 @@ "如果不指定文件，或者文件为\"-\"，程序将从标准输入读取数据。\n" "\n" -#: src/expand.c:115 +#: src/expand.c:114 msgid "" " -i, --initial do not convert tabs after non blanks\n" " -t, --tabs=NUMBER have tabs NUMBER characters apart, not 8\n" @@ -3939,32 +3941,32 @@ " -i, --initial\t\t不转换非空白符后的制表符\n" " -t, --tabs=数字\t设置每个制表符为指定数字的宽度，而不是默认的8\n" -#: src/expand.c:119 +#: src/expand.c:118 msgid "" " -t, --tabs=LIST use comma separated list of explicit tab positions\n" msgstr " -t, --tabs=列表\t指定制表符位置列表，用逗号分隔\n" -#: src/expand.c:172 src/unexpand.c:191 +#: src/expand.c:171 src/unexpand.c:190 #, c-format msgid "tab stop is too large %s" msgstr "%s：制表符跳格量过大" -#: src/expand.c:180 src/unexpand.c:199 +#: src/expand.c:179 src/unexpand.c:198 #, c-format msgid "tab size contains invalid character(s): %s" msgstr "制表符尺寸中包含无效字符：%s" -#: src/expand.c:206 src/unexpand.c:225 +#: src/expand.c:205 src/unexpand.c:224 #, c-format msgid "tab size cannot be 0" msgstr "制表符尺寸不可为0" -#: src/expand.c:208 src/unexpand.c:227 +#: src/expand.c:207 src/unexpand.c:226 #, c-format msgid "tab sizes must be ascending" msgstr "制表符尺寸必须是升序的" -#: src/expand.c:326 src/expand.c:345 src/unexpand.c:374 src/unexpand.c:419 +#: src/expand.c:325 src/expand.c:344 src/unexpand.c:373 src/unexpand.c:418 #, c-format msgid "input line is too long" msgstr "输入行太长" @@ -4118,12 +4120,12 @@ msgid "non-integer argument" msgstr "非整数参数" -#: src/expr.c:793 src/truncate.c:315 +#: src/expr.c:793 src/truncate.c:314 #, c-format msgid "division by zero" msgstr "除以零" -#: src/expr.c:887 src/sort.c:2045 +#: src/expr.c:887 src/sort.c:2044 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "请设置LC_ALL='C' 以避免出现问题。" @@ -4141,17 +4143,17 @@ msgid "using single-precision arithmetic" msgstr "使用单精度运算" -#: src/factor.c:2411 src/od.c:1640 src/od.c:1709 +#: src/factor.c:2442 src/od.c:1646 src/od.c:1715 #, c-format msgid "%s is too large" msgstr "%s 太大" -#: src/factor.c:2388 +#: src/factor.c:2419 #, c-format msgid "%s is not a valid positive integer" msgstr "%s 不是有效的正整数" -#: src/factor.c:2423 +#: src/factor.c:2454 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4160,7 +4162,7 @@ "用法：%s [数字]...\n" "　或：%s 选项\n" -#: src/factor.c:2428 +#: src/factor.c:2459 msgid "" "Print the prime factors of each specified integer NUMBER. If none\n" "are specified on the command line, read them from standard input.\n" @@ -4205,7 +4207,7 @@ "选项 \"-宽度\" 是\"--width=数字\" 的缩写。\n" "\n" -#: src/fmt.c:279 +#: src/fmt.c:278 msgid "" " -c, --crown-margin preserve indentation of first two lines\n" " -p, --prefix=STRING reformat only lines beginning with STRING,\n" @@ -4227,14 +4229,14 @@ " -u, --uniform-spacing\t\t每两个单词间保留一个空格，每句之后保留两个空格\n" " -w, --width=宽度\t\t最大行宽(默认为75 列宽度)\n" -#: src/fmt.c:360 +#: src/fmt.c:359 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" "option; use -w N instead" msgstr "无效选项 -- %c；宽度必须是第一个选项才能被正确识别；请使用 -w N" -#: src/fmt.c:406 src/fmt.c:417 +#: src/fmt.c:405 src/fmt.c:416 #, c-format msgid "invalid width: %s" msgstr "无效的宽度：%s" @@ -4248,7 +4250,7 @@ "对每个指定的文件(默认由标准输入读取)设置自动换行，并将重新排版后的结果输出到标准输出。\n" "\n" -#: src/fold.c:78 +#: src/fold.c:77 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4258,7 +4260,7 @@ " -s, --spaces\t\t在空格处断行\n" " -w, --width=宽度\t使用指定的列宽度代替默认的80\n" -#: src/fold.c:289 src/pr.c:836 +#: src/fold.c:288 src/pr.c:832 #, c-format msgid "invalid number of columns: %s" msgstr "无效的列数：%s" @@ -4342,7 +4344,7 @@ "\t\t\t如果附加\"-\"参数，则除了每个文件的最后K 行外显示\n" "\t\t\t剩余全部内容\n" -#: src/head.c:126 +#: src/head.c:125 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4350,7 +4352,7 @@ " -q, --quiet, --silent\t不显示包含给定文件名的文件头\n" " -v, --verbose\t\t总是显示包含给定文件名的文件头\n" -#: src/head.c:132 +#: src/head.c:131 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -4362,58 +4364,58 @@ "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n" "GB 1000*1000*1000, G 1024*1024*1024, 对于T, P, E, Z, Y 同样适用。\n" -#: src/head.c:152 +#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 src/head.c:151 #, c-format msgid "error writing %s" msgstr "写入%s 出错" -#: src/head.c:155 +#: src/head.c:154 #, c-format msgid "%s: file has shrunk too much" msgstr "%s：文件被过度收缩" -#: src/head.c:228 src/head.c:1052 +#: src/head.c:227 src/head.c:1051 #, c-format msgid "%s: number of bytes is too large" msgstr "%s：字节数过大" -#: src/head.c:441 +#: src/head.c:440 #, c-format msgid "%s: cannot lseek back to original position" msgstr "%s：lseek 无法回溯到初始位置" -#: src/head.c:613 src/head.c:692 src/tail.c:450 +#: src/head.c:612 src/head.c:691 src/tail.c:449 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s：无法检索到偏移量%s" -#: src/head.c:799 +#: src/head.c:798 #, c-format msgid "cannot reposition file pointer for %s" msgstr "无法复位%s 的文件指针" -#: src/head.c:886 +#: src/head.c:885 #, c-format msgid "%s: %s is so large that it is not representable" msgstr "%s：%s 过大以至于无法表示" -#: src/head.c:887 +#: src/head.c:886 msgid "number of lines" msgstr "参数数目错误" -#: src/head.c:887 +#: src/head.c:886 msgid "number of bytes" msgstr "字节数" -#: src/head.c:894 src/tail.c:1948 +#: src/head.c:893 src/tail.c:1947 msgid "invalid number of lines" msgstr "无效的号码%s" -#: src/head.c:895 src/tail.c:1949 +#: src/head.c:894 src/tail.c:1948 msgid "invalid number of bytes" msgstr "无效的号码%s" -#: src/head.c:982 src/head.c:1040 +#: src/head.c:981 src/head.c:1039 #, c-format msgid "invalid trailing option -- %c" msgstr "无效的加附选项 -- %c" @@ -4577,7 +4579,7 @@ msgid "cannot set time stamps for %s" msgstr "无法设置%s 的时间戳" -#: src/install.c:527 src/split.c:427 src/timeout.c:413 +#: src/install.c:527 src/split.c:426 src/timeout.c:439 #, c-format msgid "fork system call failed" msgstr "创建系统进程(fork)出错" @@ -4638,7 +4640,7 @@ "中同时设置其所有权和权限模式。在第四种形式中，创建给出目标目录中的所有组件。\n" "\n" -#: src/install.c:616 +#: src/install.c:615 msgid "" " --backup[=CONTROL] make a backup of each existing destination file\n" " -b like --backup but does not accept an argument\n" @@ -4655,7 +4657,7 @@ " -C, --compare\t\t比较每组源文件和目标文件，在一些情况下不修改目标文件\n" " -d, --directory\t将所有参数视为目录名称；为指定的目录创建所有组件\n" -#: src/install.c:625 +#: src/install.c:624 msgid "" " -D create all leading components of DEST except the " "last,\n" @@ -4671,7 +4673,7 @@ " -m, --mode=模式\t自行设置权限模式(像chmod)，而不是rwxr-xr-x\n" " -o, --owner=所有者\t自行设置所有者(只适用于超级用户)\n" -#: src/install.c:632 +#: src/install.c:631 msgid "" " -p, --preserve-timestamps apply access/modification times of SOURCE " "files\n" @@ -4692,7 +4694,7 @@ " -T, --no-target-directory\t将目标文件视为普通文件\n" " -v, --verbose\t\t\t创建目录时显示其名称\n" -#: src/install.c:642 +#: src/install.c:641 msgid "" " --preserve-context preserve SELinux security context\n" " -Z, --context=CONTEXT set SELinux security context of files and " @@ -4727,7 +4729,7 @@ msgid "cannot force target context to %s and preserve it" msgstr "无法对%s 强制为目标环境，保持原样" -#: src/install.c:947 src/mkdir.c:202 src/stdbuf.c:327 +#: src/install.c:947 src/mkdir.c:201 src/stdbuf.c:326 #, c-format msgid "invalid mode %s" msgstr "无效模式%s" @@ -4868,12 +4870,12 @@ msgid "conflicting empty-field replacement strings" msgstr "有冲突的空区块替换字符串" -#: src/join.c:1101 src/sort.c:4469 +#: src/join.c:1101 src/sort.c:4468 #, c-format msgid "multi-character tab %s" msgstr "多字符标签%s" -#: src/join.c:1105 src/sort.c:4474 +#: src/join.c:1105 src/sort.c:4473 #, c-format msgid "incompatible tabs" msgstr "不兼容的标签" @@ -4902,7 +4904,7 @@ "向进程发送信号，或是列出可用信号。\n" "\n" -#: src/kill.c:89 +#: src/kill.c:88 msgid "" " -s, --signal=SIGNAL, -SIGNAL\n" " specify the name or number of the signal to be sent\n" @@ -4927,32 +4929,32 @@ "信号终止后的退出状态号。\n" "进程号(PID) 是一个整数，如果为负数则表示一个进程组。\n" -#: src/kill.c:206 +#: src/kill.c:205 #, c-format msgid "%s: invalid process id" msgstr "%s：无效的进程号" -#: src/kill.c:260 +#: src/kill.c:259 #, c-format msgid "invalid option -- %c" msgstr "无效的选项 -- %c" -#: src/kill.c:269 +#: src/kill.c:268 #, c-format msgid "%s: multiple signals specified" msgstr "%s：同时指定了多个信号" -#: src/kill.c:283 +#: src/kill.c:282 #, c-format msgid "multiple -l or -t options specified" msgstr "同时指定了多个-l 或-t 选项" -#: src/kill.c:300 +#: src/kill.c:299 #, c-format msgid "cannot combine signal with -l or -t" msgstr "无法将-l 或-t 选项结合使用" -#: src/kill.c:306 +#: src/kill.c:305 #, c-format msgid "no process ID specified" msgstr "未指定进程号" @@ -5071,7 +5073,7 @@ "当链接解析正常时，将其解析为一个与其父目录关联的链接。\n" "\n" -#: src/ln.c:395 +#: src/ln.c:394 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -5190,7 +5192,7 @@ msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "忽略无效的环境变量 TABSIZE 所示的制表符尺寸值：%s" -#: src/ls.c:1750 src/ptx.c:1976 +#: src/ls.c:1750 src/ptx.c:1975 #, c-format msgid "invalid line width: %s" msgstr "无效的行宽：%s" @@ -5257,7 +5259,7 @@ "\n" msgstr "" -#: src/ls.c:4729 +#: src/ls.c:4728 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -5316,11 +5318,11 @@ "\t\t\t\t单栏-1，详细-l，垂直-C\n" " --full-time\t\t即-l --time-style=full-iso\n" -#: src/ls.c:4761 +#: src/ls.c:4760 msgid " -g like -l, but do not list owner\n" msgstr " -g\t\t\t\t类似-l，但不列出所有者\n" -#: src/ls.c:4764 +#: src/ls.c:4763 msgid "" " --group-directories-first\n" " group directories before files.\n" @@ -5331,7 +5333,7 @@ "\t\t\t在文件前分组目录。此选项可与--sort 一起使用，\n" "\t\t\t但是一旦使用--sort=none (-U)将禁用分组\n" -#: src/ls.c:4770 +#: src/ls.c:4769 msgid "" " -G, --no-group in a long listing, don't print group names\n" " -h, --human-readable with -l, print sizes in human readable format\n" @@ -5343,7 +5345,7 @@ "\t\t\t\t(例如 1K 234M 2G)\n" " --si\t\t\t同上面类似，但是使用1000 为基底而非1024\n" -#: src/ls.c:4776 +#: src/ls.c:4775 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -5379,7 +5381,7 @@ " -I, --ignore=PATTERN\t\t不显示任何符合指定shell PATTERN 的项目\n" " -k\t\t\t\t即--block-size=1K\n" -#: src/ls.c:4796 +#: src/ls.c:4795 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5393,7 +5395,7 @@ "\t\t\t\t的对象而并非符号链接本身的信息\n" " -m\t\t\t\t所有项目以逗号分隔，并填满整行行宽\n" -#: src/ls.c:4804 +#: src/ls.c:4803 msgid "" " -n, --numeric-uid-gid like -l, but list numeric user and group IDs\n" " -N, --literal print raw entry names (don't treat e.g. " @@ -5426,7 +5428,7 @@ " --quoting-style=方式\t使用指定的quoting 方式显示条目的名称：\n" "\t\t\t\tliteral、locale、shell、shell-always、c、escape\n" -#: src/ls.c:4821 +#: src/ls.c:4820 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -5437,7 +5439,7 @@ " -R, --recursive\t\t递归显示子目录\n" " -s, --size\t\t\t以块数形式显示每个文件分配的尺寸\n" -#: src/ls.c:4826 +#: src/ls.c:4825 msgid "" " -S sort by file size\n" " --sort=WORD sort by WORD instead of name: none -U,\n" @@ -5480,13 +5482,13 @@ " -t\t\t\t\t根据修改时间排序\n" " -T, --tabsize=宽度\t指定制表符(Tab)的宽度，而非8 个字符\n" -#: src/ls.c:4845 +#: src/ls.c:4844 msgid "" " -t sort by modification time, newest first\n" " -T, --tabsize=COLS assume tab stops at each COLS instead of 8\n" msgstr "" -#: src/ls.c:4849 +#: src/ls.c:4848 msgid "" " -u with -lt: sort by, and show, access time\n" " with -l: show access time and sort by name\n" @@ -5500,7 +5502,7 @@ " -U\t\t\t不进行排序；按照目录顺序列出项目\n" " -v\t\t\t在文本中进行数字(版本)的自然排序\n" -#: src/ls.c:4856 +#: src/ls.c:4855 msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" @@ -5514,7 +5516,7 @@ " -X\t\t\t根据扩展名排序\n" " -1\t\t\t每行只列出一个文件\n" -#: src/ls.c:4866 +#: src/ls.c:4865 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -5527,7 +5529,7 @@ "使用 --color=auto 选项，ls 只在标准输出被连至终端时才生成颜色代码。\n" "LS_COLORS 环境变量可改变此设置，可使用 dircolors 命令来设置。\n" -#: src/ls.c:4873 +#: src/ls.c:4872 msgid "" "\n" "Exit status:\n" @@ -5713,7 +5715,7 @@ "若指定目录不存在则创建目录。\n" "\n" -#: src/mkdir.c:64 +#: src/mkdir.c:63 msgid "" " -m, --mode=MODE set file mode (as in chmod), not a=rwx - umask\n" " -p, --parents no error if existing, make parent directories as needed\n" @@ -5726,7 +5728,7 @@ " -v, --verbose \t每次创建新目录都显示信息\n" " -Z, --context=CTX \t将每个创建的目录的SELinux 安全环境设置为CTX\n" -#: src/mkdir.c:169 +#: src/mkdir.c:168 #, c-format msgid "created directory %s" msgstr "已创建目录 %s" @@ -5744,22 +5746,22 @@ "以指定的名称创建先进先出文件(FIFO)。\n" "\n" -#: src/mkfifo.c:59 src/mknod.c:61 +#: src/mkfifo.c:58 src/mknod.c:60 msgid "" " -m, --mode=MODE set file permission bits to MODE, not a=rw - umask\n" msgstr " -m, --mode=模式 \t设置权限模式(类似chmod)，而不是rwxrwxrwx 减umask\n" -#: src/mkfifo.c:62 +#: src/mkfifo.c:61 msgid "" " -Z, --context=CTX set the SELinux security context of each NAME to CTX\n" msgstr " -Z, --context=CTX \t将每个创建的目录的SELinux 安全环境设置为CTX\n" -#: src/mkfifo.c:122 src/mknod.c:128 +#: src/mkfifo.c:121 src/mknod.c:127 #, c-format msgid "invalid mode" msgstr "无效的权限模式" -#: src/mkfifo.c:127 src/mknod.c:133 +#: src/mkfifo.c:126 src/mknod.c:132 #, c-format msgid "mode must specify only file permission bits" msgstr "模式必须只指定文件许可位" @@ -5777,12 +5779,12 @@ "创建指定类型和名称的特殊文件。\n" "\n" -#: src/mknod.c:64 +#: src/mknod.c:63 msgid "" " -Z, --context=CTX set the SELinux security context of NAME to CTX\n" msgstr " -Z, --context=CTX \t将对应名称文件的SELinux 安全环境设置为CTX\n" -#: src/mknod.c:69 +#: src/mknod.c:68 msgid "" "\n" "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n" @@ -5796,7 +5798,7 @@ "解析；如果以\"0\"开头，则被视作八进制数；其余情况下被视作十进制数。\n" "可用的类型包括：\n" -#: src/mknod.c:76 +#: src/mknod.c:75 msgid "" "\n" " b create a block (buffered) special file\n" @@ -5808,40 +5810,40 @@ " c, u 创建(没有缓冲的)字符特殊文件\n" " p 创建先进先出(FIFO)特殊文件\n" -#: src/mknod.c:151 +#: src/mknod.c:150 msgid "Special files require major and minor device numbers." msgstr "创建块设备文件时，必需指定主、次设备号。" -#: src/mknod.c:161 +#: src/mknod.c:160 msgid "Fifos do not have major and minor device numbers." msgstr "先进先出(FIFO)文件不需要指定主、次设备号。" -#: src/mknod.c:177 +#: src/mknod.c:176 #, c-format msgid "block special files not supported" msgstr "不支持区块特殊文件" -#: src/mknod.c:186 +#: src/mknod.c:185 #, c-format msgid "character special files not supported" msgstr "不支持字符特殊文件" -#: src/mknod.c:202 +#: src/mknod.c:201 #, c-format msgid "invalid major device number %s" msgstr "无效的主设备号 %s" -#: src/mknod.c:207 +#: src/mknod.c:206 #, c-format msgid "invalid minor device number %s" msgstr "无效的次设备号 %s" -#: src/mknod.c:212 +#: src/mknod.c:211 #, c-format msgid "invalid device %s %s" msgstr "无效的设备文件%s %s" -#: src/mknod.c:226 +#: src/mknod.c:225 #, c-format msgid "invalid device type %s" msgstr "无效的设备类型 %s" @@ -5932,7 +5934,7 @@ msgid "with --suffix, template %s must end in X" msgstr "使用 --suffix，模板 %s 必须以 X 结尾" -#: src/mktemp.c:274 src/split.c:1131 +#: src/mktemp.c:274 src/split.c:1130 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "无效后缀 %s，含有目录分隔符" @@ -5970,7 +5972,7 @@ "将源文件重命名为目标文件，或将源文件移动至指定目录。\n" "\n" -#: src/mv.c:299 +#: src/mv.c:298 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -5989,7 +5991,7 @@ " -n, --no-clobber 不覆盖已存在文件\n" "如果您指定了-i、-f、-n 中的多个，仅最后一个生效。\n" -#: src/mv.c:308 +#: src/mv.c:307 msgid "" " --strip-trailing-slashes remove any trailing slashes from each " "SOURCE\n" @@ -5999,7 +6001,7 @@ " --strip-trailing-slashes\t去掉每个源文件参数尾部的斜线\n" " -S, --suffix=SUFFIX\t\t替换常用的备份文件后缀\n" -#: src/mv.c:313 +#: src/mv.c:312 msgid "" " -t, --target-directory=DIRECTORY move all SOURCE arguments into " "DIRECTORY\n" @@ -6036,22 +6038,22 @@ "\n" " -n, --adjustment=N 对优先级数值加上指定整数N (默认为10)\n" -#: src/nice.c:168 +#: src/nice.c:172 #, c-format msgid "invalid adjustment %s" msgstr "无效的调整值%s" -#: src/nice.c:177 +#: src/nice.c:181 #, c-format msgid "a command must be given with an adjustment" msgstr "命令必须和调整值配合指定" -#: src/nice.c:184 src/nice.c:195 +#: src/nice.c:188 src/nice.c:199 #, c-format msgid "cannot get niceness" msgstr "无法获取优先级" -#: src/nice.c:201 +#: src/nice.c:205 #, c-format msgid "cannot set niceness" msgstr "无法设置优先级" @@ -6071,7 +6073,7 @@ "如果不指定文件或指定文件为\"-\" ，程序将从标准输入读取数据。\n" "\n" -#: src/nl.c:194 +#: src/nl.c:186 msgid "" " -b, --body-numbering=STYLE use STYLE for numbering body lines\n" " -d, --section-delimiter=CC use CC for separating logical pages\n" @@ -6081,7 +6083,7 @@ " -d, --section-delimiter=CC\t使用指定的CC 分割逻辑页数\n" " -f, --footer-numbering=样式\t使用指定样式编号文件的页脚行目\n" -#: src/nl.c:199 +#: src/nl.c:191 msgid "" " -h, --header-numbering=STYLE use STYLE for numbering header lines\n" " -i, --line-increment=NUMBER line number increment at each line\n" @@ -6099,7 +6101,7 @@ " -p, --no-renumber\t\t在逻辑页数切换时不将行号值复位\n" " -s, --number-separator=字符串\t可能的话在行号后添加字符串\n" -#: src/nl.c:207 +#: src/nl.c:199 msgid "" " -v, --starting-line-number=NUMBER first line number on each logical page\n" " -w, --number-width=NUMBER use NUMBER columns for line numbers\n" @@ -6107,7 +6109,7 @@ " -v, --starting-line-number=数字\t每个逻辑页上的第一行的行号\n" " -w, --number-width=数字\t为行号使用指定的栏数\n" -#: src/nl.c:213 +#: src/nl.c:205 msgid "" "\n" "By default, selects -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn. CC are\n" @@ -6119,7 +6121,7 @@ "逻辑页数的两个分界符，其中缺失的第二个字符暗含了\":\"，如果您要指定\"\\\"，\n" "请输入\"\\\\\"。可用的样式如下：\n" -#: src/nl.c:219 +#: src/nl.c:211 msgid "" "\n" " a number all lines\n" @@ -6148,27 +6150,27 @@ " rz \t右对齐，空格用0 填充\n" "\n" -#: src/nl.c:286 +#: src/nl.c:278 #, c-format msgid "line number overflow" msgstr "行号溢出" -#: src/nl.c:486 +#: src/nl.c:478 #, c-format msgid "invalid header numbering style: %s" msgstr "无效的页眉号样式：%s" -#: src/nl.c:494 +#: src/nl.c:486 #, c-format msgid "invalid body numbering style: %s" msgstr "无效的正文号样式：%s" -#: src/nl.c:502 +#: src/nl.c:494 #, c-format msgid "invalid footer numbering style: %s" msgstr "无效的页脚号样式：%s" -#: src/nl.c:511 +#: src/nl.c:503 #, c-format msgid "invalid starting line number: %s" msgstr "无效的起始行号：%s" @@ -6178,22 +6180,22 @@ msgid "WARNING: --page-increment is deprecated; use --line-increment instead" msgstr "警告：不推荐使用--page-increment，请使用--line-increment" -#: src/nl.c:524 +#: src/nl.c:512 #, c-format msgid "invalid line number increment: %s" msgstr "无效的行号递增值：%s" -#: src/nl.c:536 +#: src/nl.c:524 #, c-format msgid "invalid number of blank lines: %s" msgstr "无效的空行数：%s" -#: src/nl.c:550 +#: src/nl.c:538 #, c-format msgid "invalid line number field width: %s" msgstr "无效的行宽数值：%s" -#: src/nl.c:569 +#: src/nl.c:557 #, c-format msgid "invalid line numbering format: %s" msgstr "无效的编号格式：%s" @@ -6242,7 +6244,7 @@ msgid "ignoring input" msgstr "忽略输入" -#: src/nohup.c:163 src/nohup.c:165 +#: src/dd.c:2207 src/dd.c:2236 src/nohup.c:163 src/nohup.c:165 #, c-format msgid "failed to open %s" msgstr "打开%s 失败" @@ -6382,7 +6384,7 @@ " -c\t即 -t c， 使用ASCII 字符，或者反斜杠正名的特殊字符\n" " -d\t即 -t u2，使用无符号十进制双字节字符\n" -#: src/od.c:332 +#: src/od.c:345 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -6429,7 +6431,7 @@ " a\t\t重定义字符，忽略高位字节\n" " c\t\tASCII 码字符或者是反斜线字串(如\\n)\n" -#: src/od.c:356 +#: src/od.c:360 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -6487,12 +6489,12 @@ "不带数字的--string 选项代表3；不带数字的--width 选项代表32。\n" "默认情况下od 使用 -A o -t oS -w16 参数。\n" -#: src/od.c:633 src/od.c:753 +#: src/od.c:639 src/od.c:759 #, c-format msgid "invalid type string %s" msgstr "无效类型的字符串%s" -#: src/od.c:643 +#: src/od.c:649 #, c-format msgid "" "invalid type string %s;\n" @@ -6501,7 +6503,7 @@ "无效的类型字符串%s；\n" "系统无法提供对%lu-字节整形类型数值的支持" -#: src/od.c:764 +#: src/od.c:770 #, c-format msgid "" "invalid type string %s;\n" @@ -6515,7 +6517,7 @@ msgid "invalid character `%c' in type string %s" msgstr "无效字符\"%c\"出现在类型字符串%s 中" -#: src/od.c:1047 +#: src/od.c:1053 #, c-format msgid "cannot skip past end of combined input" msgstr "无法略过输入内容的报尾" @@ -6526,21 +6528,21 @@ "invalid output address radix `%c'; it must be one character from [doxn]" msgstr "无效的输出地址基数\"%c\"，它必须是 [doxn] 四个字符中的一个" -#: src/od.c:1729 +#: src/od.c:1735 #, c-format msgid "no type may be specified when dumping strings" msgstr "在转储字符串时不能指定类型" -#: src/od.c:1804 +#: src/od.c:1810 msgid "compatibility mode supports at most one file" msgstr "兼容模式最多支持一个文件" -#: src/od.c:1825 +#: src/od.c:1831 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "略过字节数+ 读入字节数的值过大" -#: src/od.c:1868 +#: src/od.c:1874 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "警告：无效的宽度值%lu，已使用%d 代替" @@ -6566,7 +6568,7 @@ "如果没有指定文件，或指定文件为\"-\"，程序将从标准输入读取数据。\n" "\n" -#: src/paste.c:448 +#: src/paste.c:447 msgid "" " -d, --delimiters=LIST reuse characters from LIST instead of TABs\n" " -s, --serial paste one file at a time instead of in parallel\n" @@ -6574,7 +6576,7 @@ " -d, --delimiters=列表\t改用指定列表里的字符替代制表分隔符\n" " -s, --serial\t\t不使用平行的行目输出模式，而是每个文件占用一行\n" -#: src/paste.c:509 +#: src/paste.c:508 #, c-format msgid "delimiter list ends with an unescaped backslash: %s" msgstr "分割符列表以一个未跳过的反斜线结束：%s" @@ -6767,7 +6769,7 @@ msgid "`--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "\"--pages=首页[:末页]\"缺失参数" -#: src/pr.c:914 +#: src/pr.c:910 #, c-format msgid "invalid page range %s" msgstr "页码范围%s 无效" @@ -6797,12 +6799,12 @@ msgid "`-W PAGE_WIDTH' invalid number of characters: %s" msgstr "\"-w \"中含有无效的字符数：%s" -#: src/pr.c:1100 +#: src/pr.c:1096 #, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "在平行输出参数时不能指定栏数" -#: src/pr.c:1104 +#: src/pr.c:1100 #, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "无法同时指定相交输出和平行输出参数" @@ -6812,22 +6814,22 @@ msgid "`-%c' extra characters or invalid number in the argument: %s" msgstr "有多余字符\"-%c\"或无效数字出现在参数%s 中" -#: src/pr.c:1304 +#: src/pr.c:1293 #, c-format msgid "page width too narrow" msgstr "过窄" -#: src/pr.c:2369 +#: src/pr.c:2353 #, c-format msgid "starting page number % exceeds page count %" msgstr "起始页码% 超出了最大页数%" -#: src/pr.c:2396 +#: src/pr.c:2380 #, c-format msgid "page number overflow" msgstr "页码溢出" -#: src/pr.c:2401 +#: src/pr.c:2385 #, c-format msgid "Page %" msgstr "第 % 页" @@ -6840,7 +6842,7 @@ "对指定文件附注打印所需的页码或聚焦。\n" "\n" -#: src/pr.c:2780 +#: src/pr.c:2763 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -6855,7 +6857,7 @@ "\t\t\t输出指定的列数。如果指定了-a 选项，则从上到下列印。\n" "\t\t\t程序会自动在每一页均衡每列占用的行数。\n" -#: src/pr.c:2788 +#: src/pr.c:2771 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -6869,7 +6871,7 @@ "\t\t\t使用头标(^G)和八进制反斜杠标记\n" " -d, --double-space\t加倍输出空白区域\n" -#: src/pr.c:2796 +#: src/pr.c:2779 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -6887,7 +6889,7 @@ " -F, -f, --form-feed\t使用出纸页页标代替新行作为页面间的分隔符\n" "\t\t\t(使用-F 选项时报头为3 行,不使用时为5 行)\n" -#: src/pr.c:2806 +#: src/pr.c:2789 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -6906,7 +6908,7 @@ " -J, --join-lines\t合并整个行，关闭-W 选项的行截断，不使用栏调整，使用\n" "\t\t\t\t--sep-string[=字符串] 设置分隔符\n" -#: src/pr.c:2815 +#: src/pr.c:2798 msgid "" " -l, --length=PAGE_LENGTH\n" " set the page length to PAGE_LENGTH (66) lines\n" @@ -6920,7 +6922,7 @@ " -m, --merge\t\t在同一行显示所有文件，每个文件占用一栏，分割行，但是当\n" "\t\t\t使用-J 时将行合并到完整长度\n" -#: src/pr.c:2822 +#: src/pr.c:2805 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -6935,7 +6937,7 @@ " -N, --first-line-number=数字\n" "\t\t\t从首页的首行以指定数字开始计数(参看\"+首页\")\n" -#: src/pr.c:2830 +#: src/pr.c:2813 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -6949,7 +6951,7 @@ " -r, --no-file-warnings\n" "\t\t\t当文件无法打开时忽略警告\n" -#: src/pr.c:2837 +#: src/pr.c:2820 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -6978,7 +6980,7 @@ "\t\t\t分栏选项无影响\n" " -t, --omit-header\t忽略页眉和页脚\n" -#: src/pr.c:2851 +#: src/pr.c:2834 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -6999,7 +7001,7 @@ "\t\t\t为多栏页面输出将设置为指定的字符数(默认72)，\n" "\t\t\t仅当-s[char] 选项不启用时有效(即保持默认值 72)。\n" -#: src/pr.c:2861 +#: src/pr.c:2844 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -7011,7 +7013,7 @@ "\t\t\t总是将页宽设置为指定的(默认72)字符数，\n" "\t\t\t除非-J 选项启用总是截断行，此参数与-S 或-s 冲突\n" -#: src/pr.c:2869 +#: src/pr.c:2852 msgid "" "\n" "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" @@ -7197,7 +7199,7 @@ " -S, --sentence-regexp=正则表达式\t用于匹配行末或句末\n" " -T, --format=tex\t\t生成TeX 格式输出\n" -#: src/ptx.c:1840 +#: src/ptx.c:1839 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -7213,7 +7215,7 @@ " -i, --ignore-file=文件\t从指定文件中读取忽略单词的列表\n" " -o, --only-file=文件\t\t只从指定文件中读取单词列表\n" -#: src/ptx.c:1848 +#: src/ptx.c:1847 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -7233,7 +7235,7 @@ "如果不指定文件，或者文件为 \"-\"，程序将从标准输入读取数据。默认时隐含\n" "\"-F /\"选项。\n" -#: src/ptx.c:1949 +#: src/ptx.c:1948 #, c-format msgid "invalid gap width: %s" msgstr "无效的间隙宽度：%s" @@ -7259,7 +7261,7 @@ msgid "failed to chdir to %s" msgstr "无法切换到目录%s" -#: src/pwd.c:170 src/pwd.c:277 src/split.c:374 +#: src/pwd.c:170 src/pwd.c:277 src/split.c:373 #, c-format msgid "failed to stat %s" msgstr "获取%s 的文件状态失败(stat)" @@ -7275,7 +7277,7 @@ msgstr "忽略不是选项的参数" #. This is a proper name. See the gettext manual, section Names. -#: src/readlink.c:33 +#: src/readlink.c:32 msgid "Dmitry V. Levin" msgstr "Dmitry V. Levin" @@ -7385,8 +7387,8 @@ msgid "Try `%s ./%s' to remove the file %s.\n" msgstr "尝试使用\"%s ./%s\"删除文件%s。\n" -#: src/realpath.c:71 src/rm.c:135 src/shred.c:147 src/stat.c:1347 -#: src/touch.c:212 +#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:147 +#: src/stat.c:1349 src/touch.c:212 #, c-format msgid "Usage: %s [OPTION]... FILE...\n" msgstr "用法：%s [选项]... 文件...\n" @@ -7559,72 +7561,72 @@ " -l, --range=范围\t级别范围\n" "\n" -#: src/runcon.c:140 +#: src/runcon.c:144 #, c-format msgid "multiple roles" msgstr "多角色" -#: src/runcon.c:145 +#: src/runcon.c:149 #, c-format msgid "multiple types" msgstr "多类型" -#: src/runcon.c:150 +#: src/runcon.c:154 #, c-format msgid "multiple users" msgstr "多用户" -#: src/runcon.c:155 +#: src/runcon.c:159 #, c-format msgid "multiple levelranges" msgstr "复合级别范围" -#: src/runcon.c:173 src/runcon.c:209 +#: src/runcon.c:177 src/runcon.c:213 #, c-format msgid "failed to get current context" msgstr "无法获得当前安全环境" -#: src/runcon.c:183 +#: src/runcon.c:187 #, c-format msgid "you must specify -c, -t, -u, -l, -r, or context" msgstr "您必须指定-c，-t，-u，-l，-r 或环境" -#: src/runcon.c:191 +#: src/runcon.c:195 #, c-format msgid "no command specified" msgstr "没有指定命令" -#: src/runcon.c:197 +#: src/runcon.c:201 #, c-format msgid "%s may be used only on a SELinux kernel" msgstr "%s 只能用于启用了SELinux 支持的内核" -#: src/runcon.c:223 +#: src/runcon.c:227 #, c-format msgid "failed to compute a new context" msgstr "计算新的环境失败" -#: src/runcon.c:237 +#: src/runcon.c:241 #, c-format msgid "failed to set new user %s" msgstr "设置新用户%s 失败" -#: src/runcon.c:239 +#: src/runcon.c:243 #, c-format msgid "failed to set new type %s" msgstr "设置新类型%s 失败" -#: src/runcon.c:241 +#: src/runcon.c:245 #, c-format msgid "failed to set new range %s" msgstr "设置新范围%s 失败" -#: src/runcon.c:243 +#: src/runcon.c:247 #, c-format msgid "failed to set new role %s" msgstr "设置新角色%s 失败" -#: src/runcon.c:251 +#: src/runcon.c:255 #, c-format msgid "unable to set security context %s" msgstr "无法设置安全环境%s" @@ -7654,7 +7656,7 @@ " -s, --separator=字符串\t使用指定字符串分隔数字(默认使用：\\n)\n" " -w, --equal-width\t在列前添加0 使得宽度相同\n" -#: src/seq.c:82 +#: src/seq.c:86 msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" @@ -7677,32 +7679,32 @@ "指定的格式必须适用于显示\"double\"类型的参数；当首数、增量和尾数均为指定\n" "精确度的定点十进制数时默认为\"%.精确度f\"，否则默认为\"%g\"。\n" -#: src/seq.c:136 +#: src/seq.c:140 #, c-format msgid "invalid floating point argument: %s" msgstr "无效的浮点参数：%s" -#: src/seq.c:193 +#: src/numfmt.c:974 src/seq.c:212 #, c-format msgid "format %s has no %% directive" msgstr "格式%s 没有%% 指令" -#: src/seq.c:210 +#: src/numfmt.c:1007 src/seq.c:229 #, c-format msgid "format %s ends in %%" msgstr "格式%s 以%% 结束" -#: src/seq.c:213 +#: src/seq.c:232 #, c-format msgid "format %s has unknown %%%c directive" msgstr "格式%s 中包含未知%%%c 指令" -#: src/seq.c:217 +#: src/numfmt.c:1018 src/seq.c:236 #, c-format msgid "format %s has too many %% directives" msgstr "格式%s 中%% 指令过多" -#: src/seq.c:528 +#: src/seq.c:555 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "当输出等宽字符串时不应再指定格式字符串" @@ -7779,7 +7781,7 @@ "多次覆盖文件，使得即使是昂贵的硬件探测仪器也难以将数据复原。\n" "\n" -#: src/shred.c:156 +#: src/shred.c:155 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -7792,7 +7794,7 @@ " --random-source=文件\t从指定文件中取出随机字节\n" " -s, --size=N\t\t粉碎数据为指定字节的碎片(可使用K、M 和G 作为单位)\n" -#: src/shred.c:162 +#: src/shred.c:161 msgid "" " -u, --remove truncate and remove file after overwriting\n" " -v, --verbose show progress\n" @@ -7805,7 +7807,7 @@ " -x, --exact\t\t不将文件大小增加至最接近的块大小\n" " -z, --zero \t\t最后一次使用0 进行覆盖以隐藏覆盖动作\n" -#: src/shred.c:171 +#: src/shred.c:170 msgid "" "\n" "If FILE is -, shred standard output.\n" @@ -7824,7 +7826,7 @@ "一般文件时，绝大多数人都会使用--remove 选项。\n" "\n" -#: src/shred.c:181 +#: src/shred.c:180 msgid "" "CAUTION: Note that shred relies on a very important assumption:\n" "that the file system overwrites data in place. This is the traditional\n" @@ -7840,7 +7842,7 @@ "例子：\n" "\n" -#: src/shred.c:189 +#: src/shred.c:188 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -7860,7 +7862,7 @@ "* 会不时进行快照记录的文件系统，像Network Applicance 的NFS 服务器\n" "\n" -#: src/shred.c:199 +#: src/shred.c:198 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -7873,7 +7875,7 @@ "* 压缩文件系统\n" "\n" -#: src/shred.c:206 +#: src/shred.c:205 msgid "" "In the case of ext3 file systems, the above disclaimer applies\n" "(and shred is thus of limited effectiveness) only in data=journal mode,\n" @@ -7891,7 +7893,7 @@ "您可以查看mount 的man 页面以获得详细信息。\n" "\n" -#: src/shred.c:216 +#: src/shred.c:215 msgid "" "In addition, file system backups and remote mirrors may contain copies\n" "of the file that cannot be removed, and that will allow a shredded file\n" @@ -7901,122 +7903,122 @@ "包含不能被删除的文件副本，这将会\n" "允许碎片文件被恢复。\n" -#: src/shred.c:296 +#: src/shred.c:295 #, c-format msgid "%s: fdatasync failed" msgstr "%s：fadatsync 失败" -#: src/shred.c:307 +#: src/shred.c:306 #, c-format msgid "%s: fsync failed" msgstr "%s：fsync 失败" -#: src/shred.c:384 +#: src/shred.c:383 #, c-format msgid "%s: cannot rewind" msgstr "%s：无法反绕操作" -#: src/shred.c:403 +#: src/shred.c:402 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s：第%lu 次，共%lu 次 (%s)..." -#: src/shred.c:453 +#: src/shred.c:452 #, c-format msgid "%s: error writing at offset %s" msgstr "%s：在位置%s 写入时出现错误" -#: src/shred.c:471 +#: src/shred.c:470 #, c-format msgid "%s: lseek failed" msgstr "%s：lseek 失败" -#: src/shred.c:482 +#: src/shred.c:481 #, c-format msgid "%s: file too large" msgstr "%s：文件过大" -#: src/shred.c:505 +#: src/shred.c:504 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s：第%lu 次，共%lu 次 (%s)...%s" -#: src/shred.c:521 +#: src/shred.c:520 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s：第%lu 次，共%lu 次 (%s)...%s/%s %d%%" -#: src/shred.c:768 +#: src/shred.c:767 #, c-format msgid "%s: fstat failed" msgstr "%s：获取文件状态失败(fstat)" -#: src/shred.c:779 +#: src/shred.c:778 #, c-format msgid "%s: invalid file type" msgstr "%s：无效的文件类型" -#: src/shred.c:798 +#: src/shred.c:797 #, c-format msgid "%s: file has negative size" msgstr "%s：文件的大小为负数" -#: src/shred.c:865 src/sort.c:933 src/split.c:379 +#: src/shred.c:864 src/sort.c:932 src/split.c:378 #, c-format msgid "%s: error truncating" msgstr "%s：截断文件时出错" -#: src/shred.c:881 +#: src/shred.c:880 #, c-format msgid "%s: fcntl failed" msgstr "%s：文件控制操作失败(fcntl)" -#: src/shred.c:886 +#: src/shred.c:885 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "%s：不能对只可追加数据的文件描述符(file descriptor) 进行粉碎" -#: src/shred.c:968 +#: src/shred.c:967 #, c-format msgid "%s: removing" msgstr "%s：正在删除" -#: src/shred.c:992 +#: src/shred.c:991 #, c-format msgid "%s: renamed to %s" msgstr "%s：名称已更改为 %s" -#: src/shred.c:1014 +#: src/shred.c:1013 #, c-format msgid "%s: failed to remove" msgstr "%s：删除失败" -#: src/shred.c:1018 +#: src/shred.c:1017 #, c-format msgid "%s: removed" msgstr "%s：已删除" -#: src/shred.c:1025 src/shred.c:1068 +#: src/shred.c:1024 src/shred.c:1067 #, c-format msgid "%s: failed to close" msgstr "%s：无法关闭" -#: src/shred.c:1061 +#: src/shred.c:1060 #, c-format msgid "%s: failed to open for writing" msgstr "%s：无法以写模式打开" -#: src/shred.c:1126 +#: src/shred.c:1125 #, c-format msgid "%s: invalid number of passes" msgstr "%s：覆盖次数无效" -#: src/shred.c:1135 src/shuf.c:291 src/sort.c:4442 +#: src/shred.c:1134 src/shuf.c:290 src/sort.c:4441 #, c-format msgid "multiple random sources specified" msgstr "指定了多个随机源" -#: src/shred.c:1149 +#: src/shred.c:1148 #, c-format msgid "%s: invalid file size" msgstr "%s：文件大小无效" @@ -8040,7 +8042,7 @@ "把输入行按随机顺序输出到标准输出。\n" "\n" -#: src/shuf.c:61 +#: src/shuf.c:60 msgid "" " -e, --echo treat each ARG as an input line\n" " -i, --input-range=LO-HI treat each number LO through HI as an input " @@ -8057,27 +8059,27 @@ " --random-source=文件\t从指定文件获得随机比特\n" " -z, --zero-terminated\t以0 结束行而非新行\n" -#: src/shuf.c:245 +#: src/shuf.c:244 #, c-format msgid "multiple -i options specified" msgstr "指定了多个-i 选项" -#: src/shuf.c:265 +#: src/shuf.c:264 #, c-format msgid "invalid input range %s" msgstr "无效的输入范围：%s" -#: src/shuf.c:278 +#: src/shuf.c:277 #, c-format msgid "invalid line count %s" msgstr "无效的行数%s" -#: src/shuf.c:285 src/sort.c:4436 +#: src/shuf.c:284 src/sort.c:4435 #, c-format msgid "multiple output files specified" msgstr "指定了多个输出文件" -#: src/shuf.c:311 +#: src/shuf.c:310 #, c-format msgid "cannot combine -e and -i options" msgstr "不能同时指定-e 和-i 选项" @@ -8102,12 +8104,12 @@ "如果参数个数超过2 个，暂停的总时间为各个参数的值的和。\n" "\n" -#: src/sleep.c:135 src/timeout.c:298 +#: src/sleep.c:135 src/timeout.c:320 #, c-format msgid "invalid time interval %s" msgstr "无效的时间间隔%s" -#: src/sleep.c:146 src/tail.c:1220 +#: src/sleep.c:146 src/tail.c:1219 #, c-format msgid "cannot read realtime clock" msgstr "无法读取实时时钟" @@ -8120,7 +8122,7 @@ "串联排序所有指定文件并将结果写到标准输出。\n" "\n" -#: src/sort.c:406 +#: src/sort.c:405 msgid "" "Ordering options:\n" "\n" @@ -8128,7 +8130,7 @@ "排序选项：\n" "\n" -#: src/sort.c:410 +#: src/sort.c:409 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -8150,12 +8152,12 @@ " -M, --month-sort\t\t比较 (未知) < \"一月\" < ... < \"十二月\"\n" "\t\t\t\t在LC_ALL=C 时为(unknown) < `JAN' < ... < `DEC'\n" -#: src/sort.c:421 +#: src/sort.c:420 msgid "" " -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n" msgstr " -h, --human-numeric-sort 使用易读性数字(例如： 2K 1G)\n" -#: src/sort.c:424 +#: src/sort.c:423 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -8167,7 +8169,7 @@ " --random-source=文件\t从指定文件中获得随机字节\n" " -r, --reverse\t\t\t逆序输出排序结果\n" -#: src/sort.c:430 +#: src/sort.c:429 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -8182,7 +8184,7 @@ " -V, --version-sort\t\t在文本内进行自然版本排序\n" "\n" -#: src/sort.c:438 +#: src/sort.c:437 msgid "" "Other options:\n" "\n" @@ -8190,7 +8192,7 @@ "其他选项：\n" "\n" -#: src/sort.c:442 +#: src/sort.c:441 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" @@ -8198,7 +8200,7 @@ " --batch-size=NMERGE\t一次最多合并NMERGE 个输入；如果输入更多\n" "\t\t\t\t\t则使用临时文件\n" -#: src/sort.c:446 +#: src/sort.c:445 msgid "" " -c, --check, --check=diagnose-first check for sorted input; do not sort\n" " -C, --check=quiet, --check=silent like -c, but do not report first bad " @@ -8211,7 +8213,7 @@ " --compress-program=程序\t使用指定程序压缩临时文件；使用该程序\n" "\t\t\t\t\t的-d 参数解压缩文件\n" -#: src/sort.c:453 +#: src/sort.c:452 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -8234,7 +8236,7 @@ "\t\t\t\t参看POS 语法。\n" " -m, --merge\t\t\t合并已排序的文件，不再进行排序\n" -#: src/sort.c:464 +#: src/sort.c:463 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -8245,7 +8247,7 @@ " -s, --stable\t\t\t禁用last-resort 比较以稳定比较算法\n" " -S, --buffer-size=大小\t指定主内存缓存大小\n" -#: src/sort.c:470 +#: src/sort.c:469 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -8265,7 +8267,7 @@ " --parallel=N\t\t将同时运行的排序数改变为N\n" " -u, --unique\t\t配合-c，严格校验排序；不配合-c，则只输出一次排序结果\n" -#: src/sort.c:479 +#: src/sort.c:478 msgid " -z, --zero-terminated end lines with 0 byte, not newline\n" msgstr " -z, --zero-terminated\t以0 字节而非新行作为行尾标志\n" @@ -8291,7 +8293,7 @@ "\n" "指定的大小可以使用以下单位之一：\n" -#: src/sort.c:497 +#: src/sort.c:496 msgid "" "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n" "\n" @@ -8310,107 +8312,107 @@ "本地环境变量会影响排序结果。\n" "如果希望以字节的自然值获得最传统的排序结果，请设置LC_ALL=C。\n" -#: src/sort.c:698 +#: src/sort.c:697 #, c-format msgid "waiting for %s [-d]" msgstr "等待 %s [-d]" -#: src/sort.c:703 +#: src/sort.c:702 #, c-format msgid "%s [-d] terminated abnormally" msgstr "%s [-d] 不正常结束" -#: src/sort.c:857 +#: src/sort.c:856 #, c-format msgid "cannot create temporary file in %s" msgstr "无法在%s 创建临时文件" -#: src/sort.c:951 src/sort.c:2026 src/sort.c:3072 src/sort.c:3714 -#: src/sort.c:3805 src/sort.c:3808 +#: src/sort.c:950 src/sort.c:2025 src/sort.c:3071 src/sort.c:3713 +#: src/sort.c:3804 src/sort.c:3807 msgid "open failed" msgstr "打开失败" -#: src/sort.c:971 +#: src/sort.c:970 msgid "fflush failed" msgstr "冲洗流失败(fflush)" -#: src/sort.c:976 src/sort.c:2029 src/sort.c:4707 +#: src/sort.c:975 src/sort.c:2028 src/sort.c:4706 msgid "close failed" msgstr "关闭失败" -#: src/sort.c:987 +#: src/sort.c:986 #, c-format msgid "dup2 failed" msgstr "复制已打开文件描述符失败(dup2)" -#: src/sort.c:1104 +#: src/sort.c:1103 #, c-format msgid "couldn't execute %s" msgstr "无法执行%s" -#: src/sort.c:1111 +#: src/sort.c:1110 msgid "couldn't create temporary file" msgstr "无法创建临时文件" -#: src/sort.c:1150 +#: src/sort.c:1149 #, c-format msgid "couldn't create process for %s -d" msgstr "无法创建进程%s -d" -#: src/sort.c:1162 +#: src/sort.c:1161 #, c-format msgid "couldn't execute %s -d" msgstr "无法执行%s -d" -#: src/sort.c:1221 +#: src/sort.c:1220 #, c-format msgid "warning: cannot remove: %s" msgstr "警告：无法删除：%s" -#: src/sort.c:1307 +#: src/sort.c:1306 #, c-format msgid "invalid --%s argument %s" msgstr "无效的 --%s 参数%s" -#: src/sort.c:1310 +#: src/sort.c:1309 #, c-format msgid "minimum --%s argument is %s" msgstr "最小 --%s 参数是%s" -#: src/sort.c:1325 +#: src/sort.c:1324 #, c-format msgid "--%s argument %s too large" msgstr "--%s 参数%s 太长" -#: src/sort.c:1328 +#: src/sort.c:1327 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "最大 --%s 参数在当前资源限制(rlimit)设置下是%s" -#: src/sort.c:1410 +#: src/sort.c:1409 #, c-format msgid "number in parallel must be nonzero" msgstr "单个的数字必须不为零" -#: src/sort.c:1495 +#: src/sort.c:1494 msgid "stat failed" msgstr "获取文件状态失败(stat)" -#: src/sort.c:1756 +#: src/sort.c:1755 msgid "read failed" msgstr "读取失败" -#: src/sort.c:2044 +#: src/sort.c:2043 #, c-format msgid "string transformation failed" msgstr "字符串转换失败" -#: src/sort.c:2047 +#: src/sort.c:2046 #, c-format msgid "the untransformed string was %s" msgstr "未转换的字符串为%s" -#: src/sort.c:2210 +#: src/sort.c:2209 #, c-format msgid "^ no match for key\n" msgstr "^ 没有匹配项\n" @@ -8420,7 +8422,7 @@ msgid "obsolescent key `%s' used; consider `%s' instead" msgstr "使用了旧的值%s，考虑转为使用%s" -#: src/sort.c:2396 +#: src/sort.c:2395 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "值%lu 宽度为零，忽略" @@ -8431,7 +8433,7 @@ "leading blanks are significant in key %lu; consider also specifying `b'" msgstr "值%lu 开头有大量空格，考虑同时指定\"b\"" -#: src/sort.c:2420 +#: src/sort.c:2419 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "值%lu 为数字且跨多个域" @@ -8447,20 +8449,20 @@ msgid "option `-r' only applies to last-resort comparison" msgstr "选项\"-r\" 仅用于last-resort 比较" -#: src/sort.c:2732 src/sort.c:2741 +#: src/sort.c:2731 src/sort.c:2740 msgid "write failed" msgstr "写入失败" -#: src/sort.c:2784 +#: src/sort.c:2783 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s：%s:%s：无序： " -#: src/sort.c:2787 +#: src/sort.c:2786 msgid "standard error" msgstr "标准错误" -#: src/sort.c:3977 +#: src/sort.c:3976 #, c-format msgid "%s: invalid field specification %s" msgstr "%s：无效的区块规格%s" @@ -8470,7 +8472,7 @@ msgid "options `-%s' are incompatible" msgstr "选项\"-%s\"不兼容" -#: src/sort.c:4039 +#: src/sort.c:4038 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s：在%s 处的计数无效" @@ -8483,24 +8485,24 @@ msgid "invalid number after `.'" msgstr "在\".\"后的编号无效" -#: src/sort.c:4316 src/sort.c:4422 +#: src/sort.c:4315 src/sort.c:4421 msgid "stray character in field spec" msgstr "区块中有孤立字符" -#: src/sort.c:4363 +#: src/sort.c:4362 #, c-format msgid "multiple compress programs specified" msgstr "指定了多个压缩程序" -#: src/sort.c:4380 +#: src/sort.c:4379 msgid "invalid number at field start" msgstr "区块起始处的编号无效" -#: src/sort.c:4384 src/sort.c:4412 +#: src/sort.c:4383 src/sort.c:4411 msgid "field number is zero" msgstr "区块编号为零" -#: src/sort.c:4393 +#: src/sort.c:4392 msgid "character offset is zero" msgstr "字符偏移量为零" @@ -8508,37 +8510,37 @@ msgid "invalid number after `,'" msgstr "在\",\"后的编号无效" -#: src/sort.c:4458 +#: src/sort.c:4457 #, c-format msgid "empty tab" msgstr "空标签" -#: src/sort.c:4551 src/wc.c:692 +#: src/sort.c:4550 src/wc.c:692 #, c-format msgid "cannot read file names from %s" msgstr "无法从%s 中读取文件名" -#: src/sort.c:4573 +#: src/sort.c:4572 #, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "%s：%lu：无效的 0 长度文件名" -#: src/sort.c:4579 +#: src/sort.c:4578 #, c-format msgid "no input from %s" msgstr "没有来自%s 的输入" -#: src/sort.c:4625 +#: src/sort.c:4624 #, c-format msgid "using %s sorting rules" msgstr "使用%s 排序规则" -#: src/sort.c:4628 +#: src/sort.c:4627 #, c-format msgid "using simple byte comparison" msgstr "使用简单字节比较" -#: src/sort.c:4659 +#: src/sort.c:4658 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "不允许额外的操作数%s 与-%c 一起使用" @@ -8580,7 +8582,7 @@ " -u, --unbuffered immediately copy input to output with `-n r/...'\n" msgstr "" -#: src/split.c:230 +#: src/split.c:229 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" @@ -8606,127 +8608,127 @@ "r/N\t类似l 但使用轮询分配\n" "r/K/N\t类似r/N 但尽将N 个文件中的第K 个输出到标准输出\n" -#: src/split.c:355 +#: src/split.c:354 #, c-format msgid "output file suffixes exhausted" msgstr "已排除输出文件后缀" -#: src/split.c:367 +#: src/split.c:366 #, c-format msgid "creating file %s\n" msgstr "正在创建文件%s\n" -#: src/split.c:392 +#: src/split.c:391 #, c-format msgid "failed to set FILE environment variable" msgstr "" -#: src/split.c:394 +#: src/split.c:393 #, c-format msgid "executing with FILE=%s\n" msgstr "" -#: src/split.c:396 +#: src/split.c:395 #, c-format msgid "failed to create pipe" msgstr "" -#: src/split.c:410 +#: src/split.c:409 #, c-format msgid "closing prior pipe" msgstr "" -#: src/split.c:412 +#: src/split.c:411 #, c-format msgid "closing output pipe" msgstr "" -#: src/split.c:416 +#: src/split.c:415 #, c-format msgid "moving input pipe" msgstr "" -#: src/split.c:418 +#: src/split.c:417 #, c-format msgid "closing input pipe" msgstr "" -#: src/split.c:423 +#: src/split.c:422 #, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "" -#: src/split.c:429 +#: src/split.c:428 #, c-format msgid "failed to close input pipe" msgstr "" -#: src/split.c:465 +#: src/split.c:464 #, c-format msgid "waiting for child process" msgstr "" -#: src/split.c:475 +#: src/split.c:474 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "" -#: src/split.c:483 +#: src/split.c:482 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "" -#: src/split.c:490 src/timeout.c:468 +#: src/split.c:489 src/timeout.c:494 #, c-format msgid "unknown status from command (0x%X)" msgstr "来自命令的未知状态 (0x%X)" -#: src/split.c:1053 +#: src/split.c:1052 #, c-format msgid "cannot split in more than one way" msgstr "无法以多于一种的方式切分输入" -#: src/split.c:1066 src/split.c:1206 src/split.c:1377 +#: src/split.c:1065 src/split.c:1205 src/split.c:1376 #, c-format msgid "%s: invalid number of chunks" msgstr "%s：无效的块数" -#: src/split.c:1070 +#: src/split.c:1069 #, c-format msgid "%s: invalid chunk number" msgstr "%s：无效块数" -#: src/split.c:1120 +#: src/split.c:1119 #, c-format msgid "%s: invalid suffix length" msgstr "%s：文件类型无效" -#: src/split.c:1145 src/split.c:1153 src/split.c:1176 src/split.c:1181 +#: src/split.c:1144 src/split.c:1152 src/split.c:1175 src/split.c:1180 #, c-format msgid "%s: invalid number of bytes" msgstr "%s：无效的字节数" -#: src/split.c:1164 src/split.c:1311 +#: src/split.c:1163 src/split.c:1310 #, c-format msgid "%s: invalid number of lines" msgstr "%s：无效的行数" -#: src/split.c:1237 +#: src/split.c:1236 #, c-format msgid "line count option -%s%c... is too large" msgstr "行数选项-%s%c... 过大" -#: src/split.c:1277 +#: src/split.c:1276 #, c-format msgid "%s: invalid IO block size" msgstr "%s：无效的IO 块大小" -#: src/split.c:1298 +#: src/split.c:1297 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "" -#: src/split.c:1370 +#: src/split.c:1369 #, c-format msgid "%s: cannot determine file size" msgstr "%s：无法确定文件大小" @@ -8736,7 +8738,7 @@ msgid "Michael Meskes" msgstr "Michael Meskes" -#: src/stat.c:855 +#: src/stat.c:857 #, c-format msgid "failed to canonicalize %s" msgstr "规范化%s 失败" @@ -8746,34 +8748,34 @@ msgid "warning: unrecognized escape `\\%c'" msgstr "警告：无法识别的转义字符\"\\%c\"" -#: src/stat.c:1122 +#: src/stat.c:1124 #, c-format msgid "%s: invalid directive" msgstr "%s：无效指令" -#: src/stat.c:1168 +#: src/stat.c:1170 #, c-format msgid "warning: backslash at end of format" msgstr "警告：格式末尾出现反斜杠" -#: src/stat.c:1199 +#: src/stat.c:1201 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "用 %s 进行标准输入在文件系统模式下无法工作" -#: src/stat.c:1206 +#: src/stat.c:1208 #, c-format msgid "cannot read file system information for %s" msgstr "无法为 %s 读取文件系统信息" -#: src/stat.c:1226 +#: src/stat.c:1228 #, c-format msgid "cannot stat standard input" msgstr "无法从标准输入获取文件信息(stat)" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' with --file-system, and NOT from printf. -#: src/stat.c:1262 +#: src/stat.c:1264 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -8789,7 +8791,7 @@ #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1285 +#: src/stat.c:1287 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -8799,30 +8801,30 @@ #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1295 +#: src/stat.c:1297 msgid "Device: %Dh/%dd\tInode: %-10i Links: %-5h Device type: %t,%T\n" msgstr "设备：%Dh/%dd\tInode：%-10i 硬链接：%-5h 设备类型：%t,%T\n" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1303 +#: src/stat.c:1305 msgid "Device: %Dh/%dd\tInode: %-10i Links: %h\n" msgstr "设备：%Dh/%dd\tInode：%-10i 硬链接：%h\n" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1312 +#: src/stat.c:1314 msgid "Access: (%04a/%10.10A) Uid: (%5u/%8U) Gid: (%5g/%8G)\n" msgstr "权限：(%04a/%10.10A) Uid：(%5u/%8U) Gid：(%5g/%8G)\n" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1322 +#: src/stat.c:1324 #, c-format msgid "Context: %C\n" msgstr "环境：%C\n" -#: src/stat.c:1330 +#: src/stat.c:1332 msgid "" "Access: %x\n" "Modify: %y\n" @@ -8846,7 +8848,7 @@ " -L, --dereference\t跟随链接\n" " -f, --file-system\t显示文件系统状态而非文件状态\n" -#: src/stat.c:1354 +#: src/stat.c:1360 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -8994,7 +8996,7 @@ "运行标准流缓冲区操作已改变的 COMMAND。\n" "\n" -#: src/stdbuf.c:98 +#: src/stdbuf.c:97 msgid "" " -i, --input=MODE adjust standard input stream buffering\n" " -o, --output=MODE adjust standard output stream buffering\n" @@ -9022,7 +9024,7 @@ "\n" "若 MODE 是 0，则相应的流将不缓冲。\n" -#: src/stdbuf.c:111 +#: src/stdbuf.c:110 msgid "" "\n" "Otherwise MODE is a number which may be followed by one of the following:\n" @@ -9051,22 +9053,22 @@ "还有某些滤件程序(如dd 和cat 之类)，它们不使用输入输出流，\n" "因此不受stdbuf 设置的影响。\n" -#: src/stdbuf.c:227 +#: src/stdbuf.c:226 #, c-format msgid "failed to find %s" msgstr "查找%s 失败" -#: src/stdbuf.c:247 src/stdbuf.c:279 +#: src/stdbuf.c:246 src/stdbuf.c:278 #, c-format msgid "failed to update the environment with %s" msgstr "更新%s 的环境失败" -#: src/stdbuf.c:321 +#: src/stdbuf.c:320 #, c-format msgid "line buffering stdin is meaningless" msgstr "对标准输入进行行缓冲无意义" -#: src/stty.c:510 +#: src/stty.c:513 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -9091,7 +9093,7 @@ " -g, --save\t\t以stty 可读取的格式输出当前全部设置\n" " -F, --file=设备\t打开并使用指定设备代替标准输入\n" -#: src/stty.c:525 +#: src/stty.c:532 msgid "" "\n" "Optional - before SETTING indicates negation. An * marks non-POSIX\n" @@ -9101,7 +9103,7 @@ "可选- 在设置前的指示中，* 标记出了非POSIX 标准的设置。以下系\n" "统定义象征了哪些设置是有效的。\n" -#: src/stty.c:530 +#: src/stty.c:537 msgid "" "\n" "Special characters:\n" @@ -9115,7 +9117,7 @@ " eof\t字符\t表示文件末尾而发送的字符(用于终止输入)\n" " eol\t字符\t为表示行尾而发送的字符\n" -#: src/stty.c:537 +#: src/stty.c:544 msgid "" " * eol2 CHAR alternate CHAR for ending the line\n" " erase CHAR CHAR will erase the last character typed\n" @@ -9127,7 +9129,7 @@ " intr 字符\t用于发送中断信号的字符\n" " kill 字符\t用于擦除当前终端行的字符\n" -#: src/stty.c:543 +#: src/stty.c:550 msgid "" " * lnext CHAR CHAR will enter the next character quoted\n" " quit CHAR CHAR will send a quit signal\n" @@ -9139,7 +9141,7 @@ " * rprnt 字符\t用于重绘当前行的字符\n" " start 字符\t在停止后重新开启输出的字符\n" -#: src/stty.c:549 +#: src/stty.c:556 msgid "" " stop CHAR CHAR will stop the output\n" " susp CHAR CHAR will send a terminal stop signal\n" @@ -9151,7 +9153,7 @@ " * swtch 字符\t在不同的shell 层次间切换的字符\n" " * werase 字符\t擦除前一个输入的单词的字符\n" -#: src/stty.c:555 +#: src/stty.c:562 msgid "" "\n" "Special settings:\n" @@ -9165,7 +9167,7 @@ " * cols N\t统治内核终端上有N 栏\n" " * columns N\t等于cols N\n" -#: src/stty.c:562 +#: src/stty.c:569 msgid "" " ispeed N set the input speed to N\n" " * line N use line discipline N\n" @@ -9178,7 +9180,7 @@ " min N\t和 -icanon 配合使用，设置每次一完整读入的最小字符数为\n" " ospeed N\t设置输出速度为N 波特\n" -#: src/stty.c:568 +#: src/stty.c:575 msgid "" " * rows N tell the kernel that the terminal has N rows\n" " * size print the number of rows and columns according to the " @@ -9222,7 +9224,7 @@ " [-]parenb\t对输出生成奇偶校验位并等待输入的奇偶校验位\n" " [-]parodd\t设置校验位为奇数 (配合\"-\"则为偶数)\n" -#: src/stty.c:589 +#: src/stty.c:597 msgid "" "\n" "Input settings:\n" @@ -9238,7 +9240,7 @@ " [-]ignbrk\t忽略中断字符\n" " [-]igncr\t忽略回车\n" -#: src/stty.c:597 +#: src/stty.c:605 msgid "" " [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" @@ -9252,11 +9254,11 @@ " [-]inpck\t启用输入奇偶性校验\n" " [-]istrip\t剥除输入字符的高8 位比特\n" -#: src/stty.c:604 +#: src/stty.c:612 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr " * [-]iutf8\t假定输入字符都是UTF-8 编码\n" -#: src/stty.c:607 +#: src/stty.c:615 msgid "" " * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" @@ -9272,7 +9274,7 @@ " [-]parmrk\t标记奇偶校验错误 (结合255-0 字符序列)\n" " [-]tandem\t等于[-]ixoff\n" -#: src/stty.c:615 +#: src/stty.c:623 msgid "" "\n" "Output settings:\n" @@ -9288,7 +9290,7 @@ " * ffN\t\t换页延迟的风格，N 的值为0 至1\n" " * nlN\t\t换行延迟的风格，N 的值为0 至1\n" -#: src/stty.c:623 +#: src/stty.c:631 msgid "" " * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of null characters\n" @@ -9304,7 +9306,7 @@ " * [-]onlcr\t将换行符转换为回车\n" " * [-]onlret\t使得换行符的行为表现和回车相同\n" -#: src/stty.c:631 +#: src/stty.c:639 msgid "" " * [-]onocr do not print carriage returns in the first column\n" " [-]opost postprocess output\n" @@ -9320,7 +9322,7 @@ " * -tabs\t等于tab3\n" " * vtN\t\t垂直制表符延迟的风格，N 的值为0 至1\n" -#: src/stty.c:639 +#: src/stty.c:647 msgid "" "\n" "Local settings:\n" @@ -9377,7 +9379,7 @@ " * [-]tostop\t中止尝试向终端写入数据的后台任务\n" " * [-]xcase\t和icanon 配合使用，用转义符\"\\\"退出大写状态\n" -#: src/stty.c:667 +#: src/stty.c:675 msgid "" "\n" "Combination settings:\n" @@ -9391,7 +9393,7 @@ " cbreak\t等于-icanon\n" " -cbreak\t等于icanon\n" -#: src/stty.c:674 +#: src/stty.c:682 msgid "" " cooked same as brkint ignpar istrip icrnl ixon opost isig\n" " icanon, eof and eol characters to their default values\n" @@ -9403,7 +9405,7 @@ " -cooked\t等于-raw\n" " crt\t\t等于echoe echoctl echoke\n" -#: src/stty.c:680 +#: src/stty.c:688 msgid "" " dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" " kill ^u\n" @@ -9416,7 +9418,7 @@ " ek\t\t清除所有字符，将它们回溯为默认值\n" " evenp\t等于parenb -parodd cs7\n" -#: src/stty.c:687 +#: src/stty.c:695 msgid "" " -evenp same as -parenb cs8\n" " * [-]lcase same as xcase iuclc olcuc\n" @@ -9432,7 +9434,7 @@ " nl\t\t等于-icrnl -onlcr\n" " -nl\t\t等于icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" -#: src/stty.c:695 +#: src/stty.c:703 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -9446,7 +9448,7 @@ " pass8\t等于-parenb -istrip cs8\n" " -pass8\t等于parenb istrip cs7\n" -#: src/stty.c:702 +#: src/stty.c:710 msgid "" " raw same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" " -inlcr -igncr -icrnl -ixon -ixoff -iuclc -ixany\n" @@ -9458,7 +9460,7 @@ " -imaxbel -opost -isig -icanon -xcase min 1 time 0\n" " -raw\t等于cooked\n" -#: src/stty.c:708 +#: src/stty.c:716 msgid "" " sane same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" " -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n" @@ -9474,7 +9476,7 @@ "\t\t-xcase -tostop -echoprt echoctl echoke，所有特殊字符均\n" "\t\t使用默认值\n" -#: src/stty.c:716 +#: src/stty.c:724 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -9487,55 +9489,55 @@ "规则以及与标准stty 设置间的偏差。在设置中，字符会被逐字读取或是被编码为^c、\n" "0x37、0177 或127 这样的字符，其中有特殊值^- 或undef 被用于禁止特殊字符。\n" -#: src/stty.c:788 +#: src/stty.c:796 #, c-format msgid "only one device may be specified" msgstr "只能指定一个设备" -#: src/stty.c:818 +#: src/stty.c:826 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" "mutually exclusive" msgstr "verbose 和 stty-readable 两种输入风格的选项是互相抵触的" -#: src/stty.c:824 +#: src/stty.c:832 #, c-format msgid "when specifying an output style, modes may not be set" msgstr "当指定了输出风格时，模式不能再被设置" -#: src/stty.c:839 +#: src/stty.c:847 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "%s：无法重置非阻塞模式" -#: src/stty.c:884 src/stty.c:994 +#: src/stty.c:892 src/stty.c:1002 #, c-format msgid "invalid argument %s" msgstr "无效的参数 %s" -#: src/stty.c:895 src/stty.c:912 src/stty.c:924 src/stty.c:937 src/stty.c:949 -#: src/stty.c:969 +#: src/stty.c:903 src/stty.c:920 src/stty.c:932 src/stty.c:945 src/stty.c:957 +#: src/stty.c:977 #, c-format msgid "missing argument to %s" msgstr "缺少%s 的参数" -#: src/stty.c:975 +#: src/stty.c:983 #, c-format msgid "invalid line discipline %s" msgstr "无效的行约束%s" -#: src/stty.c:1045 +#: src/stty.c:1053 #, c-format msgid "%s: unable to perform all requested operations" msgstr "%s：无法执行所有请求的操作" -#: src/stty.c:1391 +#: src/stty.c:1399 #, c-format msgid "%s: no size information for this device" msgstr "%s：此设备没有大小信息" -#: src/stty.c:1912 +#: src/stty.c:1920 #, c-format msgid "invalid integer argument %s" msgstr "无效的整数参数%s" @@ -9677,7 +9679,7 @@ "SIZE 可以是一个可选的整数，后面跟着以下单位中的一个：\n" "KB 1000，K 1024，MB 1000*1000，M 1024*1024，还有 G、T、P、E、Z、Y。\n" -#: src/system.h:553 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -9690,7 +9692,7 @@ "及 BLOCKSIZE 环境变量中第一个可用的 SIZE 单位。\n" "否则，默认单位是 1024 字节(或是 512，若设定 POSIXLY_CORRECT 的话)。\n" -#: src/system.h:563 +#: src/system.h:571 #, c-format msgid "" "\n" @@ -9703,17 +9705,17 @@ #. to form one of #. the URLs at http://translationproject.org/team/. Otherwise, replace #. the entire URL with your translation team's email address. -#: src/system.h:577 +#: src/system.h:585 #, c-format msgid "Report %s translation bugs to \n" msgstr "请向 报告%s 的翻译错误\n" -#: src/system.h:581 +#: src/system.h:589 #, c-format msgid "For complete documentation, run: info coreutils '%s invocation'\n" msgstr "要获取完整文档，请运行：info coreutils '%s invocation'\n" -#: src/system.h:620 +#: src/system.h:628 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -9743,7 +9745,7 @@ "如果不指定文件，或文件为\"-\"，则从标准输入读取数据。\n" "\n" -#: src/tac.c:145 +#: src/tac.c:144 msgid "" " -b, --before attach the separator before instead of after\n" " -r, --regex interpret the separator as a regular expression\n" @@ -9753,27 +9755,27 @@ " -r, --regex\t\t\t将分隔标志视作正则表达式来解析\n" " -s, --separator=字符串\t使用指定字符串代替换行作为分隔标志\n" -#: src/tac.c:235 src/tac.c:336 +#: src/tac.c:234 src/tac.c:335 #, c-format msgid "%s: seek failed" msgstr "%s：检索失败" -#: src/tac.c:264 +#: src/tac.c:263 #, c-format msgid "record too large" msgstr "记录数据过大" -#: src/truncate.c:405 +#: src/truncate.c:404 #, c-format msgid "cannot open %s for writing" msgstr "无法打开%s 读取数据" -#: src/tac.c:512 src/tac.c:519 +#: src/tac.c:511 src/tac.c:518 #, c-format msgid "%s: write error" msgstr "%s：写入出错" -#: src/tac.c:630 +#: src/tac.c:629 #, c-format msgid "separator cannot be empty" msgstr "分隔符不能为空" @@ -9796,7 +9798,7 @@ "如果不指定文件或文件为\"-\" ，则从标准输入读取数据。\n" "\n" -#: src/tail.c:271 +#: src/tail.c:270 msgid "" " -c, --bytes=K output the last K bytes; alternatively, use -c " "+K\n" @@ -9806,7 +9808,7 @@ " -c, --bytes=K\t\t输出最后K 字节；另外，使用-c +K 从每个文件的\n" "\t\t\t第K 字节输出\n" -#: src/tail.c:275 +#: src/tail.c:274 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -9819,7 +9821,7 @@ "\t\t\t-f, --follow 等于--follow=descriptor \n" " -F\t\t即--follow=name --retry\n" -#: src/tail.c:282 +#: src/tail.c:281 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -9839,7 +9841,7 @@ "\t\t\t\t接或重命名(这是循环日志文件的通常情况)。\n" "\t\t\t\t由于有inotify，这个选项很少使用。\n" -#: src/tail.c:295 +#: src/tail.c:294 msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" " -q, --quiet, --silent never output headers giving file names\n" @@ -9852,7 +9854,7 @@ " --retry\t\t即使目标文件不可访问依然试图打开；在与参数\n" "\t\t\t--follow=name 同时使用时常常有用。\n" -#: src/tail.c:302 +#: src/tail.c:301 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations.\n" @@ -9878,7 +9880,7 @@ "GB 1000*1000*1000，G 1024*1024*1024，以及T，P，E，Z，Y。\n" "\n" -#: src/tail.c:320 +#: src/tail.c:319 msgid "" "With --follow (-f), tail defaults to following the file descriptor, which\n" "means that even if a tail'ed file is renamed, tail will continue to track\n" @@ -9891,152 +9893,152 @@ "的程序动作并不如您所愿。在这种场合可以使用--follow=name 选项，它会使\n" "tail 定期追踪打开给定名称的文件，以确认它是否被删除或被其它某些程序重新创建过。\n" -#: src/tail.c:379 +#: src/tail.c:378 #, c-format msgid "closing %s (fd=%d)" msgstr "正在关闭 %s (fd=%d)" -#: src/tail.c:454 +#: src/tail.c:453 #, c-format msgid "%s: cannot seek to relative offset %s" msgstr "%s：无法检索相对偏移量 %s" -#: src/tail.c:458 +#: src/tail.c:457 #, c-format msgid "%s: cannot seek to end-relative offset %s" msgstr "%s：无法检索相对偏移量的末尾 %s" -#: src/tail.c:895 +#: src/tail.c:894 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "无法定位 %s 的位置，回归为 polling 机制" -#: src/tail.c:964 +#: src/tail.c:963 #, c-format msgid "%s has become inaccessible" msgstr "%s 已不可访问" -#: src/tail.c:981 +#: src/tail.c:980 #, c-format msgid "%s has been replaced with an untailable file; giving up on this name" msgstr "%s 已被替换为tail 无法处理的文件，放弃跟踪" -#: src/tail.c:990 +#: src/tail.c:989 #, c-format msgid "%s has been replaced with a remote file. giving up on this name" msgstr "%s 已被替换为一个远程文件，放弃跟踪" -#: src/tail.c:1011 +#: src/tail.c:1010 #, c-format msgid "%s has become accessible" msgstr "%s 已经可以访问" -#: src/tail.c:1019 +#: src/tail.c:1018 #, c-format msgid "%s has appeared; following end of new file" msgstr "%s 已被建立，正在跟随新文件的末尾" -#: src/tail.c:1030 +#: src/tail.c:1029 #, c-format msgid "%s has been replaced; following end of new file" msgstr "%s 已被替换，正在跟随新文件的末尾" -#: src/tail.c:1131 +#: src/tail.c:1130 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s：无法更改非阻塞模式" -#: src/tail.c:1173 src/tail.c:1288 +#: src/tail.c:1172 src/tail.c:1287 #, c-format msgid "%s: file truncated" msgstr "%s：文件已截断" -#: src/tail.c:1197 src/tail.c:1443 +#: src/tail.c:1196 src/tail.c:1442 #, c-format msgid "no files remaining" msgstr "没有剩余文件" -#: src/tail.c:1370 +#: src/tail.c:1369 #, c-format msgid "cannot watch parent directory of %s" msgstr "无法监视%s 的上级目录" -#: src/tail.c:1373 src/tail.c:1388 +#: src/tail.c:1372 src/tail.c:1387 #, c-format msgid "inotify resources exhausted" msgstr "inotify 资源耗尽" -#: src/tail.c:1391 src/tail.c:1520 +#: src/tail.c:1390 src/tail.c:1519 #, c-format msgid "cannot watch %s" msgstr "无法监视%s" -#: src/tail.c:1474 +#: src/tail.c:1473 #, c-format msgid "error monitoring inotify event" msgstr "监视inotify 事件出错" -#: src/tail.c:1494 +#: src/tail.c:1493 #, c-format msgid "error reading inotify event" msgstr "读取inotify 事件出错" -#: src/tail.c:1787 +#: src/tail.c:1786 #, c-format msgid "%s: cannot follow end of this type of file; giving up on this name" msgstr "%s：无法跟随此类型文件的末尾，已放弃" -#: src/tail.c:1904 +#: src/tail.c:1903 #, c-format msgid "number in %s is too large" msgstr "%s 中的数字过大" -#: src/tail.c:1976 +#: src/tail.c:1975 #, c-format msgid "%s: invalid maximum number of unchanged stats between opens" msgstr "%s：两次打开的间隔因过大而无效" -#: src/tail.c:1992 +#: src/tail.c:1991 #, c-format msgid "%s: invalid PID" msgstr "%s：无效的进程号" -#: src/tail.c:2011 +#: src/tail.c:2010 #, c-format msgid "%s: invalid number of seconds" msgstr "%s：无效的秒数" -#: src/tail.c:2027 +#: src/tail.c:2026 #, c-format msgid "option used in invalid context -- %c" msgstr "在未定义环境中的无效选项 -- %c" -#: src/tail.c:2035 +#: src/tail.c:2034 #, c-format msgid "warning: --retry is useful mainly when following by name" msgstr "警告：--retry 参数需要在后面附加名称后使用" -#: src/tail.c:2039 +#: src/tail.c:2038 #, c-format msgid "warning: PID ignored; --pid=PID is useful only when following" msgstr "警告：已忽略进程号，只有在跟随模式下--pid=PID 选项才是有用的" -#: src/tail.c:2042 +#: src/tail.c:2041 #, c-format msgid "warning: --pid=PID is not supported on this system" msgstr "警告：此系统不支持--pid=PID" -#: src/tail.c:2143 +#: src/tail.c:2142 #, c-format msgid "cannot follow %s by name" msgstr "无法按名称跟随%s" -#: src/tail.c:2149 +#: src/tail.c:2148 #, c-format msgid "warning: following standard input indefinitely is ineffective" msgstr "警告：无限期跟随标准输入是无用的" -#: src/tail.c:2210 +#: src/tail.c:2209 #, c-format msgid "inotify cannot be used, reverting to polling" msgstr "无法使用 inotify 机制，回归为 polling 机制" @@ -10300,17 +10302,17 @@ msgid "extra argument %s" msgstr "多余的参数%s" -#: src/timeout.c:127 +#: src/timeout.c:145 #, c-format msgid "warning: timer_settime" msgstr "" -#: src/timeout.c:132 +#: src/timeout.c:150 #, c-format msgid "warning: timer_create" msgstr "" -#: src/timeout.c:207 +#: src/timeout.c:225 #, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -10367,12 +10369,12 @@ "如果没有指定信号则默认为TERM 信号。TERM 信号在进程没有捕获此信号时杀死进程。\n" "对于另一些进程可能需要使用KILL (9)信号，当然此信号不能被捕获。\n" -#: src/timeout.c:445 +#: src/timeout.c:471 #, c-format msgid "error waiting for command" msgstr "等待命令出错" -#: src/timeout.c:341 +#: src/timeout.c:363 #, c-format msgid "warning: disabling core dumps failed" msgstr "" @@ -10387,7 +10389,7 @@ msgid "Randy Smith" msgstr "Randy Smith" -#: src/touch.c:115 src/touch.c:310 +#: src/touch.c:115 src/touch.c:309 #, c-format msgid "invalid date format %s" msgstr "日期格式%s 无效" @@ -10420,7 +10422,7 @@ "如果文件名为\"-\"则特殊处理，更改与标准输出相关的文件的访问时间。\n" "\n" -#: src/touch.c:226 +#: src/touch.c:225 msgid "" " -a change only the access time\n" " -c, --no-create do not create any files\n" @@ -10432,7 +10434,7 @@ " -d, --date=字符串\t使用指定字符串表示时间而非当前时间\n" " -f\t\t\t(忽略)\n" -#: src/touch.c:232 +#: src/touch.c:231 msgid "" " -h, --no-dereference affect each symbolic link instead of any " "referenced\n" @@ -10457,7 +10459,7 @@ " --time=WORD\t\t使用WORD 指定的时间：access、atime、use 都等于-a\n" "\t\t\t选项的效果，而modify、mtime 等于-m 选项的效果\n" -#: src/touch.c:247 +#: src/touch.c:246 msgid "" "\n" "Note that the -d and -t options accept different time-date formats.\n" @@ -10465,7 +10467,7 @@ "\n" "请注意，-d 和-t 选项可接受不同的时间/日期格式。\n" -#: src/touch.c:336 +#: src/touch.c:335 #, c-format msgid "cannot specify times from more than one source" msgstr "无法由多于一种的来源来指定时间" @@ -10742,16 +10744,16 @@ "如果指定文件小于指定大小则用0 补足。\n" "\n" -#: src/truncate.c:110 +#: src/truncate.c:109 msgid " -c, --no-create do not create any files\n" msgstr " -c, --no-create\t不创建文件\n" -#: src/truncate.c:113 +#: src/truncate.c:112 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr " -o, --io-blocks\t将SIZE 视为IO 块数而不使用字节数\n" -#: src/truncate.c:116 +#: src/truncate.c:115 msgid "" " -r, --reference=RFILE base size on RFILE\n" " -s, --size=SIZE set or adjust the file size by SIZE\n" @@ -10774,52 +10776,52 @@ "\"/\" 运算的数学计算式为 m / n * n；\n" "\"%\" 运算的数学计算式为( m + n - 1 ) / n * n\n" -#: src/truncate.c:150 +#: src/truncate.c:149 #, c-format msgid "overflow in % * % byte blocks for file %s" msgstr "在文件%3$s 的%1$ * %2$ 字节块中溢出" -#: src/truncate.c:184 src/truncate.c:385 +#: src/truncate.c:183 src/truncate.c:384 #, c-format msgid "cannot get the size of %s" msgstr "无法获得%s 的大小" -#: src/truncate.c:174 +#: src/truncate.c:173 #, c-format msgid "%s has unusable, apparently negative size" msgstr "%s 的文件大小为负数，无法使用" -#: src/truncate.c:206 +#: src/truncate.c:205 #, c-format msgid "overflow rounding up size of file %s" msgstr "处理大于等于文件%s 的指定大小的最大倍数时溢出" -#: src/truncate.c:216 +#: src/truncate.c:215 #, c-format msgid "overflow extending size of file %s" msgstr "扩展文件%s 大小时溢出" -#: src/truncate.c:231 +#: src/truncate.c:230 #, c-format msgid "failed to truncate %s at % bytes" msgstr "在%2$ 字节处截断%1$s 失败" -#: src/truncate.c:304 +#: src/truncate.c:303 #, c-format msgid "multiple relative modifiers specified" msgstr "指定了多个相关修饰符" -#: src/truncate.c:334 +#: src/truncate.c:333 #, c-format msgid "you must specify either %s or %s" msgstr "您必须在%s 或%s 中指定一个" -#: src/truncate.c:341 +#: src/truncate.c:340 #, c-format msgid "you must specify a relative %s with %s" msgstr "您必须为%2$s 中指定一个相关的%1$s" -#: src/truncate.c:348 +#: src/truncate.c:347 #, c-format msgid "%s was specified but %s was not" msgstr "已指定%s 但未指定%s" @@ -10921,7 +10923,7 @@ "如果不指定文件，或者文件为\"-\"，则从标准输入读取数据。\n" "\n" -#: src/unexpand.c:125 +#: src/unexpand.c:124 msgid "" " -a, --all convert all blanks, instead of just initial blanks\n" " --first-only convert only leading sequences of blanks (overrides -a)\n" @@ -10933,12 +10935,12 @@ " -t, --tabs=N\t\t设置制表符宽度为N 而非默认的8(启用-a 选项)\n" " -t, --tabs=列表\t使用逗号分隔的列表列出制表符位置(启用-a 选项)\n" -#: src/unexpand.c:153 +#: src/unexpand.c:152 #, c-format msgid "tabs are too far apart" msgstr "制表符过于分散" -#: src/unexpand.c:505 +#: src/unexpand.c:504 #, c-format msgid "tab stop value is too large" msgstr "制表符限长过大" @@ -10961,7 +10963,7 @@ "不附加任何选项时匹配行将在首次出现处被合并。\n" "\n" -#: src/uniq.c:148 +#: src/uniq.c:147 msgid "" " -c, --count prefix lines by the number of occurrences\n" " -d, --repeated only print duplicate lines\n" @@ -10969,7 +10971,7 @@ " -c, --count\t\t在每行前加上表示相应行目出现次数的前缀编号\n" " -d, --repeated\t只输出重复的行\n" -#: src/uniq.c:152 +#: src/uniq.c:151 msgid "" " -D, --all-repeated[=delimit-method] print all duplicate lines\n" " delimit-method={none(default),prepend,separate}\n" @@ -10989,11 +10991,11 @@ " -u, --unique\t\t只显示唯一的行\n" " -z, --zero-terminated\t使用'\\0'作为行结束符，而不是新换行\n" -#: src/uniq.c:162 +#: src/uniq.c:161 msgid " -w, --check-chars=N compare no more than N characters in lines\n" msgstr " -w, --check-chars=N\t对每行第N 个字符以后的内容不作对照\n" -#: src/uniq.c:167 +#: src/uniq.c:166 msgid "" "\n" "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n" @@ -11014,24 +11016,24 @@ "如果您想先对输入排序，使用没有uniq 的\"sort -u\"。\n" "同时，比较服从\"LC_COLLATE\" 变量所指定的规则。\n" -#: src/uniq.c:359 +#: src/uniq.c:358 #, c-format msgid "too many repeated lines" msgstr "重复行过多" -#: src/uniq.c:522 +#: src/uniq.c:521 msgid "invalid number of fields to skip" msgstr "要略过的区块数量无效" -#: src/uniq.c:531 +#: src/uniq.c:530 msgid "invalid number of bytes to skip" msgstr "要略过的字节数量无效" -#: src/uniq.c:540 +#: src/uniq.c:539 msgid "invalid number of bytes to compare" msgstr "要对照的字节数量无效" -#: src/uniq.c:559 +#: src/uniq.c:558 #, c-format msgid "printing all duplicated lines and repeat counts is meaningless" msgstr "同时输出重复的行和重复计数是没有意义的" diff -Nru language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/cpio.po language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/cpio.po --- language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/cpio.po 2013-01-29 09:37:13.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/cpio.po 2014-01-07 07:01:15.000000000 +0000 @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2013-01-28 10:48+0000\n" -"X-Generator: Launchpad (build 16451)\n" +"X-Launchpad-Export-Date: 2014-01-06 10:48+0000\n" +"X-Generator: Launchpad (build 16877)\n" #: gnu/argmatch.c:135 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/cpplib-4.6.po language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/cpplib-4.6.po --- language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/cpplib-4.6.po 2013-01-29 09:36:59.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/cpplib-4.6.po 2014-01-07 07:01:56.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-01-28 16:32+0000\n" -"X-Generator: Launchpad (build 16451)\n" +"X-Launchpad-Export-Date: 2014-01-06 17:29+0000\n" +"X-Generator: Launchpad (build 16877)\n" "X-Poedit-Country: CHINA\n" "Language: zh_CN\n" "X-Poedit-Language: Chinese\n" diff -Nru language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/cpplib.po language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/cpplib.po --- language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/cpplib.po 2013-01-29 09:37:07.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/cpplib.po 2014-01-07 07:01:41.000000000 +0000 @@ -15,8 +15,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-01-28 14:18+0000\n" -"X-Generator: Launchpad (build 16451)\n" +"X-Launchpad-Export-Date: 2014-01-06 14:49+0000\n" +"X-Generator: Launchpad (build 16877)\n" #: charset.c:654 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/cracklib.po language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/cracklib.po --- language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/cracklib.po 2013-01-29 09:37:09.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/cracklib.po 2014-01-07 07:01:15.000000000 +0000 @@ -14,65 +14,65 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-01-28 10:48+0000\n" -"X-Generator: Launchpad (build 16451)\n" +"X-Launchpad-Export-Date: 2014-01-06 10:48+0000\n" +"X-Generator: Launchpad (build 16877)\n" -#: lib/fascist.c:550 +#: lib/fascist.c:674 msgid "you are not registered in the password file" msgstr "??????????????????????????????" -#: lib/fascist.c:564 +#: lib/fascist.c:516 msgid "it is based on your username" msgstr "??????????????????" -#: lib/fascist.c:629 +#: lib/fascist.c:576 msgid "it is based upon your password entry" msgstr "????????????????????????" -#: lib/fascist.c:649 +#: lib/fascist.c:591 msgid "it is derived from your password entry" msgstr "???????????????????????????" -#: lib/fascist.c:662 +#: lib/fascist.c:599 msgid "it's derived from your password entry" msgstr "???????????????????????????" -#: lib/fascist.c:676 +#: lib/fascist.c:608 msgid "it is derivable from your password entry" msgstr "???????????????????????????" -#: lib/fascist.c:690 +#: lib/fascist.c:617 msgid "it's derivable from your password entry" msgstr "???????????????????????????" -#: lib/fascist.c:726 +#: lib/fascist.c:709 msgid "it is WAY too short" msgstr "WAY ??????" -#: lib/fascist.c:731 +#: lib/fascist.c:714 msgid "it is too short" msgstr "??????" -#: lib/fascist.c:748 +#: lib/fascist.c:731 msgid "it does not contain enough DIFFERENT characters" msgstr "????????????????????????????????????" -#: lib/fascist.c:762 +#: lib/fascist.c:745 msgid "it is all whitespace" msgstr "????????????" -#: lib/fascist.c:781 +#: lib/fascist.c:764 msgid "it is too simplistic/systematic" msgstr "????????????/?????????" -#: lib/fascist.c:786 +#: lib/fascist.c:769 msgid "it looks like a National Insurance number." msgstr "??????????????????????????????" -#: lib/fascist.c:813 +#: lib/fascist.c:801 msgid "it is based on a dictionary word" msgstr "?????????????????????" -#: lib/fascist.c:832 +#: lib/fascist.c:820 msgid "it is based on a (reversed) dictionary word" msgstr "????????????????????????????????????" diff -Nru language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/cryptsetup-luks.po language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/cryptsetup-luks.po --- language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/cryptsetup-luks.po 2013-01-29 09:37:16.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/cryptsetup-luks.po 2014-01-07 07:01:27.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-01-28 12:27+0000\n" -"X-Generator: Launchpad (build 16451)\n" +"X-Launchpad-Export-Date: 2014-01-06 12:43+0000\n" +"X-Generator: Launchpad (build 16877)\n" #: luks/keyencryption.c:61 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/cryptsetup.po language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/cryptsetup.po --- language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/cryptsetup.po 2013-01-29 09:37:12.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/cryptsetup.po 2014-01-07 07:01:27.000000000 +0000 @@ -14,85 +14,85 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-01-28 12:26+0000\n" -"X-Generator: Launchpad (build 16451)\n" +"X-Launchpad-Export-Date: 2014-01-06 12:43+0000\n" +"X-Generator: Launchpad (build 16877)\n" -#: lib/libdevmapper.c:184 +#: lib/libdevmapper.c:235 msgid "Cannot initialize device-mapper. Is dm_mod kernel module loaded?\n" msgstr "" -#: lib/libdevmapper.c:423 +#: lib/libdevmapper.c:523 #, c-format msgid "DM-UUID for device %s was truncated.\n" msgstr "" -#: lib/random.c:74 +#: lib/random.c:76 msgid "" "System is out of entropy while generating volume key.\n" "Please move mouse or type some text in another window to gather some random " "events.\n" msgstr "" -#: lib/random.c:78 +#: lib/random.c:80 #, c-format msgid "Generating key (%d%% done).\n" msgstr "" -#: lib/random.c:167 +#: lib/random.c:169 msgid "Fatal error during RNG initialisation.\n" msgstr "" -#: lib/random.c:204 +#: lib/random.c:206 msgid "Unknown RNG quality requested.\n" msgstr "" -#: lib/random.c:209 +#: lib/random.c:211 #, c-format msgid "Error %d reading from RNG: %s\n" msgstr "" -#: lib/setup.c:163 +#: lib/setup.c:190 msgid "Cannot initialize crypto RNG backend.\n" msgstr "" -#: lib/setup.c:169 +#: lib/setup.c:196 msgid "Cannot initialize crypto backend.\n" msgstr "" -#: lib/setup.c:192 +#: lib/setup.c:219 lib/setup.c:1110 lib/verity/verity.c:123 #, c-format msgid "Hash algorithm %s not supported.\n" msgstr "" -#: lib/setup.c:195 lib/loopaes/loopaes.c:88 +#: lib/setup.c:222 lib/loopaes/loopaes.c:90 #, c-format msgid "Key processing error (using hash %s).\n" msgstr "" -#: lib/setup.c:231 +#: lib/setup.c:268 msgid "All key slots full.\n" msgstr "" -#: lib/setup.c:238 +#: lib/setup.c:275 #, c-format msgid "Key slot %d is invalid, please select between 0 and %d.\n" msgstr "" -#: lib/setup.c:244 +#: lib/setup.c:281 #, c-format msgid "Key slot %d is full, please select another one.\n" msgstr "" -#: lib/setup.c:347 +#: lib/setup.c:390 #, c-format msgid "Enter passphrase for %s: " msgstr "" -#: lib/setup.c:507 +#: lib/utils_device.c:349 msgid "Cannot find a free loopback device.\n" msgstr "" -#: lib/setup.c:515 +#: lib/utils_device.c:356 msgid "" "Attaching loopback device failed (loop device with autoclear flag is " "required).\n" @@ -103,116 +103,119 @@ msgid "LUKS header detected but device %s is too small.\n" msgstr "" -#: lib/setup.c:587 lib/setup.c:1075 +#: lib/setup.c:587 lib/setup.c:1337 msgid "This operation is not supported for this device type.\n" msgstr "" -#: lib/setup.c:650 lib/setup.c:1042 lib/setup.c:1812 +#: lib/setup.c:825 lib/setup.c:1298 lib/setup.c:2173 #, c-format msgid "Device %s is not active.\n" msgstr "" -#: lib/setup.c:668 +#: lib/setup.c:842 #, c-format msgid "Underlying device for crypt device %s disappeared.\n" msgstr "" -#: lib/setup.c:782 +#: lib/setup.c:907 msgid "Invalid plain crypt parameters.\n" msgstr "" -#: lib/setup.c:787 lib/setup.c:892 +#: lib/setup.c:912 lib/setup.c:1037 msgid "Invalid key size.\n" msgstr "" -#: lib/setup.c:828 +#: lib/setup.c:959 msgid "Can't format LUKS without device.\n" msgstr "" -#: lib/setup.c:866 +#: lib/setup.c:1007 #, c-format msgid "Cannot format device %s which is still in use.\n" msgstr "" -#: lib/setup.c:869 +#: lib/setup.c:1014 #, c-format msgid "Cannot wipe header on device %s.\n" msgstr "" -#: lib/setup.c:887 +#: lib/setup.c:1032 msgid "Can't format LOOPAES without device.\n" msgstr "" -#: lib/setup.c:947 +#: lib/setup.c:1201 #, c-format msgid "Unknown crypt device type %s requested.\n" msgstr "" -#: lib/setup.c:1090 +#: lib/setup.c:1352 msgid "Do you really want to change UUID of device?" msgstr "" -#: lib/setup.c:1175 lib/setup.c:1222 lib/setup.c:1271 lib/setup.c:1337 -#: lib/setup.c:1413 lib/setup.c:1494 lib/setup.c:1540 lib/setup.c:1877 -#: lib/setup.c:1982 lib/setup.c:2121 +#: lib/setup.c:1440 lib/setup.c:1485 lib/setup.c:1534 lib/setup.c:1600 +#: lib/setup.c:1673 lib/setup.c:1737 lib/setup.c:1818 lib/setup.c:1864 +#: lib/setup.c:2238 lib/setup.c:2532 msgid "This operation is supported only for LUKS device.\n" msgstr "" -#: lib/setup.c:1182 +#: lib/setup.c:1447 #, c-format msgid "Volume %s is not active.\n" msgstr "" -#: lib/setup.c:1194 +#: lib/setup.c:1458 #, c-format msgid "Volume %s is already suspended.\n" msgstr "" -#: lib/setup.c:1232 lib/setup.c:1281 +#: lib/setup.c:1495 lib/setup.c:1544 #, c-format msgid "Volume %s is not suspended.\n" msgstr "" -#: lib/setup.c:1288 lib/setup.c:1665 lib/setup.c:1679 src/cryptsetup.c:343 +#: lib/setup.c:1551 lib/setup.c:1989 lib/setup.c:2003 src/cryptsetup.c:151 +#: src/cryptsetup.c:229 src/cryptsetup.c:316 src/cryptsetup.c:660 +#: src/cryptsetup.c:1070 msgid "Enter passphrase: " msgstr "" -#: lib/setup.c:1351 lib/setup.c:1427 +#: lib/setup.c:1614 lib/setup.c:1751 msgid "Cannot add key slot, all slots disabled and no volume key provided.\n" msgstr "" -#: lib/setup.c:1360 lib/setup.c:1433 lib/setup.c:1437 +#: lib/setup.c:1623 lib/setup.c:1757 lib/setup.c:1761 msgid "Enter any passphrase: " msgstr "" -#: lib/setup.c:1377 lib/setup.c:1450 lib/setup.c:1454 lib/setup.c:1517 +#: lib/setup.c:1640 lib/setup.c:1774 lib/setup.c:1778 lib/setup.c:1841 +#: src/cryptsetup.c:942 msgid "Enter new passphrase for key slot: " msgstr "" -#: lib/setup.c:1508 lib/setup.c:1769 lib/setup.c:1782 lib/setup.c:1888 +#: lib/setup.c:1832 lib/setup.c:2093 lib/setup.c:2106 lib/setup.c:2249 msgid "Volume key does not match the volume.\n" msgstr "" -#: lib/setup.c:1546 +#: lib/setup.c:1870 #, c-format msgid "Key slot %d is invalid.\n" msgstr "" -#: lib/setup.c:1551 +#: lib/setup.c:1875 #, c-format msgid "Key slot %d is not used.\n" msgstr "" -#: lib/setup.c:1581 lib/setup.c:1653 lib/setup.c:1745 +#: lib/setup.c:1905 lib/setup.c:1977 lib/setup.c:2069 #, c-format msgid "Device %s already exists.\n" msgstr "" -#: lib/setup.c:1756 +#: lib/setup.c:2080 msgid "Incorrect volume key specified for plain device.\n" msgstr "" -#: lib/setup.c:1787 +#: lib/setup.c:2136 msgid "Device type is not properly initialised.\n" msgstr "" @@ -221,25 +224,25 @@ msgid "Device %s is busy.\n" msgstr "" -#: lib/setup.c:1816 +#: lib/setup.c:2177 #, c-format msgid "Invalid device %s.\n" msgstr "" -#: lib/setup.c:1844 +#: lib/setup.c:2204 msgid "Volume key buffer too small.\n" msgstr "" -#: lib/setup.c:1852 +#: lib/setup.c:2212 msgid "Cannot retrieve volume key for plain device.\n" msgstr "" -#: lib/setup.c:1858 +#: lib/setup.c:2219 #, c-format msgid "This operation is not supported for %s crypt device.\n" msgstr "" -#: lib/utils.c:270 +#: lib/utils_device.c:52 lib/luks1/keyencryption.c:82 #, c-format msgid "Device %s doesn't exist or access denied.\n" msgstr "" @@ -261,32 +264,32 @@ msgid "read-only" msgstr "" -#: lib/utils.c:289 +#: src/cryptsetup_reencrypt.c:157 #, c-format msgid "Cannot read device %s.\n" msgstr "" -#: lib/utils.c:386 +#: lib/utils_device.c:396 #, c-format msgid "Cannot use device %s which is in use (already mapped or mounted).\n" msgstr "" -#: lib/utils.c:390 +#: lib/utils_device.c:400 #, c-format msgid "Cannot get info about device %s.\n" msgstr "" -#: lib/utils.c:396 +#: lib/utils_device.c:406 #, c-format msgid "Requested offset is beyond real size of device %s.\n" msgstr "" -#: lib/utils.c:404 +#: lib/utils_device.c:414 #, c-format msgid "Device %s has zero size.\n" msgstr "" -#: lib/utils.c:415 lib/luks1/keymanage.c:532 +#: lib/utils_device.c:425 lib/luks1/keymanage.c:89 #, c-format msgid "Device %s is too small.\n" msgstr "" @@ -301,7 +304,7 @@ msgid "WARNING!!! Possibly insecure memory. Are you root?\n" msgstr "" -#: lib/utils.c:445 +#: lib/utils.c:244 msgid "Cannot get process priority.\n" msgstr "" @@ -310,36 +313,36 @@ msgid "setpriority %d failed: %s\n" msgstr "" -#: lib/utils.c:459 +#: lib/utils.c:258 msgid "Cannot unlock memory.\n" msgstr "" -#: lib/utils_crypt.c:221 lib/utils_crypt.c:234 lib/utils_crypt.c:338 -#: lib/utils_crypt.c:354 +#: lib/utils_crypt.c:227 lib/utils_crypt.c:240 lib/utils_crypt.c:387 +#: lib/utils_crypt.c:402 msgid "Out of memory while reading passphrase.\n" msgstr "" -#: lib/utils_crypt.c:226 lib/utils_crypt.c:241 +#: lib/utils_crypt.c:232 lib/utils_crypt.c:247 msgid "Error reading passphrase from terminal.\n" msgstr "" -#: lib/utils_crypt.c:239 +#: lib/utils_crypt.c:245 msgid "Verify passphrase: " msgstr "" -#: lib/utils_crypt.c:246 +#: lib/utils_crypt.c:252 msgid "Passphrases do not match.\n" msgstr "" -#: lib/utils_crypt.c:306 +#: lib/utils_crypt.c:355 lib/tcrypt/tcrypt.c:443 msgid "Failed to open key file.\n" msgstr "" -#: lib/utils_crypt.c:315 +#: lib/utils_crypt.c:364 msgid "Failed to stat key file.\n" msgstr "" -#: lib/utils_crypt.c:362 +#: lib/utils_crypt.c:410 msgid "Error reading passphrase.\n" msgstr "" @@ -347,7 +350,7 @@ msgid "Maximum keyfile size exceeeded.\n" msgstr "" -#: lib/utils_crypt.c:385 +#: lib/utils_crypt.c:433 msgid "Cannot read requested amount of data.\n" msgstr "" @@ -356,7 +359,7 @@ msgid "Unable to obtain sector size for %s" msgstr "不能为%s获得扇区大小" -#: lib/luks1/keyencryption.c:106 +#: lib/luks1/keyencryption.c:36 msgid "Key size in XTS mode must be 256 or 512 bits.\n" msgstr "" @@ -372,11 +375,11 @@ "%s" msgstr "" -#: lib/luks1/keyencryption.c:155 +#: lib/luks1/keyencryption.c:103 msgid "Failed to open temporary keystore device.\n" msgstr "" -#: lib/luks1/keyencryption.c:162 +#: lib/luks1/keyencryption.c:110 msgid "Failed to access temporary keystore device.\n" msgstr "" @@ -385,12 +388,13 @@ msgid "Requested file %s already exist.\n" msgstr "" -#: lib/luks1/keymanage.c:169 lib/luks1/keymanage.c:399 +#: lib/luks1/keymanage.c:175 lib/luks1/keymanage.c:412 +#: src/cryptsetup_reencrypt.c:978 #, c-format msgid "Device %s is not a valid LUKS device.\n" msgstr "" -#: lib/luks1/keymanage.c:189 +#: lib/luks1/keymanage.c:200 #, c-format msgid "Cannot write header backup file %s.\n" msgstr "" @@ -400,65 +404,67 @@ msgid "Backup file %s doesn't exist.\n" msgstr "" -#: lib/luks1/keymanage.c:224 +#: lib/luks1/keymanage.c:233 msgid "Backup file doesn't contain valid LUKS header.\n" msgstr "" -#: lib/luks1/keymanage.c:237 +#: lib/luks1/keymanage.c:246 lib/luks1/keymanage.c:483 #, c-format msgid "Cannot open header backup file %s.\n" msgstr "" -#: lib/luks1/keymanage.c:243 +#: lib/luks1/keymanage.c:252 #, c-format msgid "Cannot read header backup file %s.\n" msgstr "" -#: lib/luks1/keymanage.c:254 +#: lib/luks1/keymanage.c:263 msgid "" "Data offset or key size differs on device and backup, restore failed.\n" msgstr "" -#: lib/luks1/keymanage.c:262 +#: lib/luks1/keymanage.c:271 #, c-format msgid "Device %s %s%s" msgstr "" -#: lib/luks1/keymanage.c:263 +#: lib/luks1/keymanage.c:272 msgid "" "does not contain LUKS header. Replacing header can destroy data on that " "device." msgstr "" -#: lib/luks1/keymanage.c:264 +#: lib/luks1/keymanage.c:273 msgid "" "already contains LUKS header. Replacing header will destroy existing " "keyslots." msgstr "" -#: lib/luks1/keymanage.c:265 +#: lib/luks1/keymanage.c:274 msgid "" "\n" "WARNING: real device header has different UUID than backup!" msgstr "" -#: lib/luks1/keymanage.c:280 lib/luks1/keymanage.c:504 -#: lib/luks1/keymanage.c:538 +#: lib/luks1/keymanage.c:293 lib/luks1/keymanage.c:522 +#: lib/luks1/keymanage.c:562 lib/tcrypt/tcrypt.c:581 lib/verity/verity.c:82 +#: lib/verity/verity.c:179 lib/verity/verity_hash.c:294 +#: lib/verity/verity_hash.c:305 lib/verity/verity_hash.c:325 #, c-format msgid "Cannot open device %s.\n" msgstr "" -#: lib/luks1/keymanage.c:402 +#: lib/luks1/keymanage.c:415 #, c-format msgid "Unsupported LUKS version %d.\n" msgstr "" -#: lib/luks1/keymanage.c:408 lib/luks1/keymanage.c:610 +#: lib/luks1/keymanage.c:421 lib/luks1/keymanage.c:619 #, c-format msgid "Requested LUKS hash %s is not supported.\n" msgstr "" -#: lib/luks1/keymanage.c:423 +#: lib/luks1/keymanage.c:436 #, c-format msgid "LUKS keyslot %u is invalid.\n" msgstr "" @@ -468,40 +474,40 @@ msgid "Cannot open file %s.\n" msgstr "" -#: lib/luks1/keymanage.c:559 +#: lib/luks1/keymanage.c:583 #, c-format msgid "Error during update of LUKS header on device %s.\n" msgstr "" -#: lib/luks1/keymanage.c:566 +#: lib/luks1/keymanage.c:590 #, c-format msgid "Error re-reading LUKS header after update on device %s.\n" msgstr "" -#: lib/luks1/keymanage.c:578 +#: lib/luks1/keymanage.c:656 lib/luks1/keymanage.c:752 #, c-format msgid "Not compatible PBKDF2 options (using hash algorithm %s).\n" msgstr "" -#: lib/luks1/keymanage.c:615 lib/luks1/keymanage.c:697 +#: lib/luks1/keymanage.c:624 lib/luks1/keymanage.c:711 msgid "Wrong LUKS UUID format provided.\n" msgstr "" -#: lib/luks1/keymanage.c:640 +#: lib/luks1/keymanage.c:649 msgid "Cannot create LUKS header: reading random salt failed.\n" msgstr "" -#: lib/luks1/keymanage.c:657 +#: lib/luks1/keymanage.c:671 #, c-format msgid "Cannot create LUKS header: header digest failed (using hash %s).\n" msgstr "" -#: lib/luks1/keymanage.c:722 +#: lib/luks1/keymanage.c:736 #, c-format msgid "Key slot %d active, purge first.\n" msgstr "" -#: lib/luks1/keymanage.c:727 +#: lib/luks1/keymanage.c:742 #, c-format msgid "Key slot %d material includes too few stripes. Header manipulation?\n" msgstr "" @@ -514,38 +520,39 @@ msgid "Failed to read from key storage.\n" msgstr "" -#: lib/luks1/keymanage.c:889 +#: lib/luks1/keymanage.c:904 #, c-format msgid "Key slot %d unlocked.\n" msgstr "" -#: lib/luks1/keymanage.c:925 src/cryptsetup.c:732 src/cryptsetup.c:916 +#: lib/luks1/keymanage.c:939 src/cryptsetup.c:796 +#: src/cryptsetup_reencrypt.c:882 src/cryptsetup_reencrypt.c:916 msgid "No key available with this passphrase.\n" msgstr "" -#: lib/luks1/keymanage.c:943 +#: lib/luks1/keymanage.c:957 #, c-format msgid "Key slot %d is invalid, please select keyslot between 0 and %d.\n" msgstr "" -#: lib/luks1/keymanage.c:957 +#: lib/luks1/keymanage.c:975 #, c-format msgid "Cannot wipe device %s.\n" msgstr "" -#: lib/loopaes/loopaes.c:143 +#: lib/loopaes/loopaes.c:146 msgid "Detected not yet supported GPG encrypted keyfile.\n" msgstr "" -#: lib/loopaes/loopaes.c:144 +#: lib/loopaes/loopaes.c:147 msgid "Please use gpg --decrypt | cryptsetup --keyfile=- ...\n" msgstr "" -#: lib/loopaes/loopaes.c:176 +#: lib/loopaes/loopaes.c:168 lib/loopaes/loopaes.c:188 msgid "Incompatible loop-AES keyfile detected.\n" msgstr "" -#: lib/loopaes/loopaes.c:226 +#: lib/loopaes/loopaes.c:244 msgid "Kernel doesn't support loop-AES compatible mapping.\n" msgstr "" @@ -557,8 +564,8 @@ msgid "create device" msgstr "创建设备" -#: src/cryptsetup.c:106 src/cryptsetup.c:107 src/cryptsetup.c:108 -#: src/cryptsetup.c:118 src/cryptsetup.c:125 +#: src/cryptsetup.c:1239 src/cryptsetup.c:1240 src/cryptsetup.c:1241 +#: src/cryptsetup.c:1242 src/veritysetup.c:310 src/veritysetup.c:311 msgid "" msgstr "<名称>" @@ -566,19 +573,19 @@ msgid "remove device" msgstr "删除设备" -#: src/cryptsetup.c:107 +#: src/cryptsetup.c:1240 msgid "resize active device" msgstr "改变激活分区大小" -#: src/cryptsetup.c:108 +#: src/cryptsetup.c:1241 msgid "show device status" msgstr "显示设备状态" -#: src/cryptsetup.c:110 src/cryptsetup.c:112 +#: src/cryptsetup.c:1244 src/cryptsetup.c:1245 msgid " []" msgstr "<设备> [<新密钥文件>]" -#: src/cryptsetup.c:110 +#: src/cryptsetup.c:1244 msgid "formats a LUKS device" msgstr "格式化成一个LUKS设备" @@ -590,41 +597,41 @@ msgid "open LUKS device as mapping " msgstr "打开LUKS设备映射为<名称>" -#: src/cryptsetup.c:112 +#: src/cryptsetup.c:1245 msgid "add key to LUKS device" msgstr "添加密钥到LUKS设备" -#: src/cryptsetup.c:113 src/cryptsetup.c:114 +#: src/cryptsetup.c:1246 src/cryptsetup.c:1247 msgid " []" msgstr "" -#: src/cryptsetup.c:113 +#: src/cryptsetup.c:1246 msgid "removes supplied key or key file from LUKS device" msgstr "" -#: src/cryptsetup.c:114 +#: src/cryptsetup.c:1247 msgid "changes supplied key or key file of LUKS device" msgstr "" -#: src/cryptsetup.c:115 +#: src/cryptsetup.c:1248 msgid " " msgstr "<设备> " -#: src/cryptsetup.c:115 +#: src/cryptsetup.c:1248 msgid "wipes key with number from LUKS device" msgstr "从LUKS 设备用数字清除密钥" -#: src/cryptsetup.c:109 src/cryptsetup.c:116 src/cryptsetup.c:117 -#: src/cryptsetup.c:119 src/cryptsetup.c:120 src/cryptsetup.c:121 -#: src/cryptsetup.c:122 src/cryptsetup.c:123 +#: src/cryptsetup.c:1243 src/cryptsetup.c:1249 src/cryptsetup.c:1250 +#: src/cryptsetup.c:1251 src/cryptsetup.c:1252 src/cryptsetup.c:1253 +#: src/cryptsetup.c:1254 src/cryptsetup.c:1255 src/cryptsetup.c:1256 msgid "" msgstr "<设备>" -#: src/cryptsetup.c:116 +#: src/cryptsetup.c:1249 msgid "print UUID of LUKS device" msgstr "显示LUKS设备的UUID" -#: src/cryptsetup.c:117 +#: src/cryptsetup.c:1250 msgid "tests for LUKS partition header" msgstr "为LUKS分区头检测<设备>" @@ -632,23 +639,23 @@ msgid "remove LUKS mapping" msgstr "卸载LUKS 映射" -#: src/cryptsetup.c:119 +#: src/cryptsetup.c:1251 msgid "dump LUKS partition information" msgstr "复制LUKS分区信息" -#: src/cryptsetup.c:120 +#: src/cryptsetup.c:1253 msgid "Suspend LUKS device and wipe key (all IOs are frozen)." msgstr "" -#: src/cryptsetup.c:121 +#: src/cryptsetup.c:1254 msgid "Resume suspended LUKS device." msgstr "" -#: src/cryptsetup.c:122 +#: src/cryptsetup.c:1255 msgid "Backup LUKS device header and keyslots" msgstr "" -#: src/cryptsetup.c:123 +#: src/cryptsetup.c:1256 msgid "Restore LUKS device header and keyslots" msgstr "" @@ -660,33 +667,34 @@ msgid "remove loop-AES mapping" msgstr "" -#: src/cryptsetup.c:233 +#: src/utils_tools.c:172 msgid "Command successful.\n" msgstr "命令成功.\n" -#: src/cryptsetup.c:247 +#: src/utils_tools.c:186 #, c-format msgid "Command failed with code %i" msgstr "" -#: src/cryptsetup.c:375 +#: src/cryptsetup.c:183 msgid "Option --key-file is required.\n" msgstr "" -#: src/cryptsetup.c:564 +#: src/cryptsetup.c:625 #, c-format msgid "This will overwrite data on %s irrevocably." msgstr "这将不能取消地在 %s 上覆盖数据" -#: src/cryptsetup.c:566 +#: src/cryptsetup.c:627 msgid "memory allocation error in action_luksFormat" msgstr "内存配置错误在 action_luksFormat" -#: src/cryptsetup.c:578 +#: src/cryptsetup.c:116 src/cryptsetup.c:495 src/cryptsetup.c:639 +#: src/cryptsetup_reencrypt.c:485 src/cryptsetup_reencrypt.c:520 msgid "No known cipher specification pattern detected.\n" msgstr "" -#: src/cryptsetup.c:584 +#: src/cryptsetup.c:645 #, c-format msgid "Cannot use %s as on-disk header.\n" msgstr "" @@ -695,21 +703,21 @@ msgid "Enter LUKS passphrase: " msgstr "" -#: src/cryptsetup.c:654 +#: src/cryptsetup.c:718 msgid "Reduced data offset is allowed only for detached LUKS header.\n" msgstr "" -#: src/cryptsetup.c:755 src/cryptsetup.c:810 +#: src/cryptsetup.c:819 src/cryptsetup.c:875 #, c-format msgid "Key slot %d selected for deletion.\n" msgstr "" -#: src/cryptsetup.c:758 +#: src/cryptsetup.c:822 #, c-format msgid "Key %d not active. Can't wipe.\n" msgstr "密钥 %d 没有激活. 不能清除.\n" -#: src/cryptsetup.c:766 src/cryptsetup.c:813 +#: src/cryptsetup.c:830 src/cryptsetup.c:878 msgid "" "This is the last keyslot. Device will become unusable after purging this key." msgstr "这是最后的 keyslot. 设备将不可用在清除这个密钥后." @@ -730,17 +738,17 @@ msgid "Enter new LUKS passphrase: " msgstr "" -#: src/cryptsetup.c:949 +#: lib/setup.c:1705 #, c-format msgid "Key slot %d changed.\n" msgstr "" -#: src/cryptsetup.c:955 +#: lib/setup.c:1708 #, c-format msgid "Replaced with key slot %d.\n" msgstr "" -#: src/cryptsetup.c:960 +#: lib/setup.c:1713 msgid "Failed to swap new key slot.\n" msgstr "" @@ -751,11 +759,11 @@ "This dump should be always stored encrypted on safe place." msgstr "" -#: src/cryptsetup.c:1124 src/cryptsetup.c:1145 +#: src/cryptsetup.c:1165 src/cryptsetup.c:1186 msgid "Option --header-backup-file is required.\n" msgstr "" -#: src/cryptsetup.c:1183 +#: src/cryptsetup.c:1273 src/veritysetup.c:327 msgid "" "\n" " is one of:\n" @@ -763,7 +771,7 @@ "\n" " 是其中之一:\n" -#: src/cryptsetup.c:1189 +#: src/cryptsetup.c:1283 #, c-format msgid "" "\n" @@ -787,7 +795,7 @@ "(characters)\n" msgstr "" -#: src/cryptsetup.c:1201 +#: src/cryptsetup.c:1297 #, c-format msgid "" "\n" @@ -797,153 +805,156 @@ "\tLUKS1: %s, Key: %d bits, LUKS header hashing: %s, RNG: %s\n" msgstr "" -#: src/cryptsetup.c:1269 +#: src/cryptsetup.c:1347 src/veritysetup.c:367 src/cryptsetup_reencrypt.c:1099 msgid "Show this help message" msgstr "显示该帮助信息" -#: src/cryptsetup.c:1270 +#: src/cryptsetup.c:1348 src/veritysetup.c:368 src/cryptsetup_reencrypt.c:1100 msgid "Display brief usage" msgstr "显示简短用法" -#: src/cryptsetup.c:1274 +#: src/cryptsetup.c:1352 src/veritysetup.c:372 src/cryptsetup_reencrypt.c:1104 msgid "Help options:" msgstr "帮助选项" -#: src/cryptsetup.c:1275 +#: src/cryptsetup.c:1353 src/veritysetup.c:373 src/cryptsetup_reencrypt.c:1105 msgid "Print package version" msgstr "显示包版本" -#: src/cryptsetup.c:1276 +#: src/cryptsetup.c:1354 src/veritysetup.c:374 src/cryptsetup_reencrypt.c:1106 msgid "Shows more detailed error messages" msgstr "显示更多的详细错误信息" -#: src/cryptsetup.c:1277 +#: src/cryptsetup.c:1355 src/veritysetup.c:375 src/cryptsetup_reencrypt.c:1107 msgid "Show debug messages" msgstr "" -#: src/cryptsetup.c:1278 +#: src/cryptsetup.c:1356 src/cryptsetup_reencrypt.c:1109 msgid "The cipher used to encrypt the disk (see /proc/crypto)" msgstr "这个密码用于加密这个磁盘(参看 /proc/crypto)" -#: src/cryptsetup.c:1279 +#: src/cryptsetup.c:1357 src/cryptsetup_reencrypt.c:1111 msgid "The hash used to create the encryption key from the passphrase" msgstr "hash用于从密钥中创建加密密钥" -#: src/cryptsetup.c:1280 +#: src/cryptsetup.c:1358 msgid "Verifies the passphrase by asking for it twice" msgstr "通过两次来校验密钥" -#: src/cryptsetup.c:1281 +#: src/cryptsetup.c:1359 src/cryptsetup_reencrypt.c:1112 msgid "Read the key from a file." msgstr "" -#: src/cryptsetup.c:1282 +#: src/cryptsetup.c:1360 msgid "Read the volume (master) key from file." msgstr "" -#: src/cryptsetup.c:1283 +#: src/cryptsetup.c:1361 msgid "Dump volume (master) key instead of keyslots info." msgstr "" -#: src/cryptsetup.c:1284 +#: src/cryptsetup.c:1362 src/cryptsetup_reencrypt.c:1110 msgid "The size of the encryption key" msgstr "加密密码的长度" -#: src/cryptsetup.c:1284 +#: src/cryptsetup.c:1362 src/cryptsetup_reencrypt.c:1110 msgid "BITS" msgstr "位数" -#: src/cryptsetup.c:1285 +#: src/cryptsetup.c:1363 src/cryptsetup_reencrypt.c:1123 msgid "Limits the read from keyfile" msgstr "" -#: src/cryptsetup.c:1285 src/cryptsetup.c:1286 src/cryptsetup.c:1287 -#: src/cryptsetup.c:1288 +#: src/cryptsetup.c:1363 src/cryptsetup.c:1364 src/cryptsetup.c:1365 +#: src/cryptsetup.c:1366 src/veritysetup.c:378 src/veritysetup.c:379 +#: src/veritysetup.c:381 src/cryptsetup_reencrypt.c:1122 +#: src/cryptsetup_reencrypt.c:1123 src/cryptsetup_reencrypt.c:1124 +#: src/cryptsetup_reencrypt.c:1125 msgid "bytes" msgstr "" -#: src/cryptsetup.c:1287 +#: src/cryptsetup.c:1365 msgid "Limits the read from newly added keyfile" msgstr "" -#: src/cryptsetup.c:1289 +#: src/cryptsetup.c:1367 msgid "Slot number for new key (default is first free)" msgstr "" -#: src/cryptsetup.c:1290 +#: src/cryptsetup.c:1368 msgid "The size of the device" msgstr "设备尺寸" -#: src/cryptsetup.c:1290 src/cryptsetup.c:1291 src/cryptsetup.c:1292 -#: src/cryptsetup.c:1298 +#: src/cryptsetup.c:1368 src/cryptsetup.c:1369 src/cryptsetup.c:1370 +#: src/cryptsetup.c:1376 msgid "SECTORS" msgstr "扇区数" -#: src/cryptsetup.c:1291 +#: src/cryptsetup.c:1369 msgid "The start offset in the backend device" msgstr "在后台设备中的开始偏移量" -#: src/cryptsetup.c:1292 +#: src/cryptsetup.c:1370 msgid "How many sectors of the encrypted data to skip at the beginning" msgstr "加密数据在开始跳过多少扇区" -#: src/cryptsetup.c:1293 +#: src/cryptsetup.c:1371 msgid "Create a readonly mapping" msgstr "创建一个只读映射" -#: src/cryptsetup.c:1294 +#: src/cryptsetup.c:1372 src/cryptsetup_reencrypt.c:1113 msgid "PBKDF2 iteration time for LUKS (in ms)" msgstr "用于LUKS的PBKDF2 重复时间 (毫秒内)" -#: src/cryptsetup.c:1294 +#: src/cryptsetup.c:1372 src/cryptsetup_reencrypt.c:1113 msgid "msecs" msgstr "毫秒" -#: src/cryptsetup.c:1295 +#: src/cryptsetup.c:1373 src/cryptsetup_reencrypt.c:1114 msgid "Do not ask for confirmation" msgstr "不询问确认" -#: src/cryptsetup.c:1296 +#: src/cryptsetup.c:1374 msgid "Timeout for interactive passphrase prompt (in seconds)" msgstr "交互密钥提示的时间限制(秒数)" -#: src/cryptsetup.c:1296 +#: src/cryptsetup.c:1374 msgid "secs" msgstr "秒" -#: src/cryptsetup.c:1297 +#: src/cryptsetup.c:1375 src/cryptsetup_reencrypt.c:1115 msgid "How often the input of the passphrase can be retried" msgstr "多久能重试再输入密钥" -#: src/cryptsetup.c:1298 +#: src/cryptsetup.c:1376 msgid "Align payload at sector boundaries - for luksFormat" msgstr "为luksFormat排列有效负荷在扇区边界" -#: src/cryptsetup.c:1299 +#: src/cryptsetup.c:1377 msgid "File with LUKS header and keyslots backup." msgstr "" -#: src/cryptsetup.c:1300 +#: src/cryptsetup.c:1378 src/cryptsetup_reencrypt.c:1116 msgid "Use /dev/random for generating volume key." msgstr "" -#: src/cryptsetup.c:1301 +#: src/cryptsetup.c:1379 src/cryptsetup_reencrypt.c:1117 msgid "Use /dev/urandom for generating volume key." msgstr "" -#: src/cryptsetup.c:1302 +#: src/cryptsetup.c:1380 msgid "Share device with another non-overlapping crypt segment." msgstr "" -#: src/cryptsetup.c:1303 +#: src/cryptsetup.c:1381 src/veritysetup.c:384 msgid "UUID for device to use." msgstr "" -#: src/cryptsetup.c:1304 +#: src/cryptsetup.c:1382 msgid "Allow discards (aka TRIM) requests for device." msgstr "" -#: src/cryptsetup.c:1305 +#: src/cryptsetup.c:1383 msgid "Device or file with separated LUKS header." msgstr "" @@ -951,15 +962,15 @@ msgid "[OPTION...] ]" msgstr "[选项...] ]" -#: src/cryptsetup.c:1364 +#: src/cryptsetup.c:1452 src/veritysetup.c:438 msgid "Argument missing." msgstr "缺少参数." -#: src/cryptsetup.c:1370 +#: src/cryptsetup.c:1500 src/veritysetup.c:444 msgid "Unknown action." msgstr "未知参数" -#: src/cryptsetup.c:1385 +#: src/cryptsetup.c:1314 src/veritysetup.c:459 #, c-format msgid "%s: requires %s as arguments" msgstr "%s: requires %s 作为参数" @@ -980,32 +991,33 @@ "To limit read from keyfile use --keyfile-size=(bytes)." msgstr "" -#: src/cryptsetup.c:1419 +#: src/cryptsetup.c:1535 src/cryptsetup_reencrypt.c:1185 msgid "Key size must be a multiple of 8 bits" msgstr "密码长度必须是8的倍数" -#: src/cryptsetup.c:1426 +#: src/cryptsetup.c:1542 src/cryptsetup_reencrypt.c:1190 msgid "Key slot is invalid." msgstr "" -#: src/cryptsetup.c:1433 +#: src/cryptsetup.c:1549 msgid "" "Option --key-file takes precedence over specified key file argument.\n" msgstr "" -#: src/cryptsetup.c:1441 +#: src/cryptsetup.c:1557 src/veritysetup.c:466 src/cryptsetup_reencrypt.c:1174 msgid "Negative number for option not permitted." msgstr "" -#: src/cryptsetup.c:1446 +#: src/cryptsetup.c:1561 src/cryptsetup_reencrypt.c:1168 +#: src/cryptsetup_reencrypt.c:1194 msgid "Only one of --use-[u]random options is allowed." msgstr "" -#: src/cryptsetup.c:1450 +#: src/cryptsetup.c:1565 msgid "Option --use-[u]random is allowed only for luksFormat." msgstr "" -#: src/cryptsetup.c:1454 +#: src/cryptsetup.c:1569 msgid "Option --uuid is allowed only for luksFormat and luksUUID." msgstr "" diff -Nru language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/cwidget.po language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/cwidget.po --- language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/cwidget.po 2013-01-29 09:37:10.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/cwidget.po 2014-01-07 07:01:48.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-01-28 15:21+0000\n" -"X-Generator: Launchpad (build 16451)\n" +"X-Launchpad-Export-Date: 2014-01-06 16:02+0000\n" +"X-Generator: Launchpad (build 16877)\n" #: src/cwidget/config/column_definition.cc:273 msgid "Bad format parameter" diff -Nru language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/dctrl-tools.po language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/dctrl-tools.po --- language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/dctrl-tools.po 2013-01-29 09:36:58.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/dctrl-tools.po 2014-01-07 07:01:41.000000000 +0000 @@ -14,46 +14,46 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-01-28 14:19+0000\n" -"X-Generator: Launchpad (build 16451)\n" +"X-Launchpad-Export-Date: 2014-01-06 14:49+0000\n" +"X-Generator: Launchpad (build 16877)\n" -#: lib/ifile.c:54 +#: lib/ifile.c:58 #, c-format msgid "%s (child): failed to exec /bin/sh: %s\n" msgstr "%s（子段）：执行/bin/sh失败：%s\n" -#: lib/ifile.c:100 +#: lib/ifile.c:104 #, c-format msgid "%s: command (%s) failed (exit status %d)\n" msgstr "%s：命令（%s）失败（退出状态%d）\n" -#: lib/ifile.c:109 +#: lib/ifile.c:113 #, c-format msgid "%s: command (%s) was killed by signal %d\n" msgstr "%s：命令（%s）被信号%d杀死\n" -#: lib/ifile.c:127 +#: lib/ifile.c:131 #, c-format msgid "%s: %s: cannot stat: %s\n" msgstr "%s：%s：不能stat：%s\n" -#: lib/ifile.c:138 +#: lib/ifile.c:142 msgid "is a directory, skipping" msgstr "是一个目录，跳过" -#: lib/ifile.c:139 +#: lib/ifile.c:143 msgid "is a block device, skipping" msgstr "是一个块设备，跳过" -#: lib/ifile.c:140 +#: lib/ifile.c:144 msgid "internal error" msgstr "内部错误" -#: lib/ifile.c:141 +#: lib/ifile.c:145 msgid "is a socket, skipping" msgstr "是一个接口，跳过" -#: lib/ifile.c:142 +#: lib/ifile.c:146 msgid "unknown file type, skipping" msgstr "未知文件类型，跳过" @@ -67,11 +67,11 @@ msgid "%s: popen failed for %s: %s\n" msgstr "%s：popen因为%s失败：%s\n" -#: lib/paragraph.c:154 +#: lib/paragraph.c:172 msgid "warning: expected a colon" msgstr "警告：应该是一个冒号" -#: lib/paragraph.c:159 +#: lib/paragraph.c:177 msgid "expected a colon" msgstr "应该是个冒号" @@ -83,7 +83,7 @@ msgid "Parse error in field." msgstr "字段分析错误" -#: grep-dctrl/grep-dctrl.c:47 +#: grep-dctrl/grep-dctrl.c:50 msgid "grep-dctrl -- grep Debian control files" msgstr "grep-dctrl -- grep Debian 控制文件" @@ -91,47 +91,47 @@ msgid "Show the testing banner." msgstr "显示测试横幅" -#: grep-dctrl/grep-dctrl.c:112 sort-dctrl/sort-dctrl.c:39 -#: tbl-dctrl/tbl-dctrl.c:42 join-dctrl/join-dctrl.c:45 +#: grep-dctrl/grep-dctrl.c:70 sort-dctrl/sort-dctrl.c:39 +#: tbl-dctrl/tbl-dctrl.c:43 join-dctrl/join-dctrl.c:45 msgid "LEVEL" msgstr "级别" -#: grep-dctrl/grep-dctrl.c:112 sort-dctrl/sort-dctrl.c:39 -#: tbl-dctrl/tbl-dctrl.c:42 join-dctrl/join-dctrl.c:45 +#: sort-dctrl/sort-dctrl.c:39 tbl-dctrl/tbl-dctrl.c:43 +#: join-dctrl/join-dctrl.c:45 msgid "Set debugging level to LEVEL." msgstr "设置debug等级为LEVEL" -#: grep-dctrl/grep-dctrl.c:113 grep-dctrl/grep-dctrl.c:116 +#: grep-dctrl/grep-dctrl.c:71 grep-dctrl/grep-dctrl.c:74 msgid "FIELD,FIELD,..." msgstr "字段，字段，..." -#: grep-dctrl/grep-dctrl.c:113 +#: grep-dctrl/grep-dctrl.c:71 msgid "Restrict pattern matching to the FIELDs given." msgstr "限制模式匹配到给出字段。" -#: grep-dctrl/grep-dctrl.c:114 +#: grep-dctrl/grep-dctrl.c:72 msgid "This is a shorthand for -FPackage." msgstr "这是一个简写的FPackage" -#: grep-dctrl/grep-dctrl.c:115 +#: grep-dctrl/grep-dctrl.c:73 msgid "This is a shorthand for -FSource:Package." msgstr "这是一个简写的FSource:Package" -#: grep-dctrl/grep-dctrl.c:116 +#: grep-dctrl/grep-dctrl.c:74 msgid "Show only the body of these fields from the matching paragraphs." msgstr "仅显示匹配段落中这些字段的正文部分。" -#: grep-dctrl/grep-dctrl.c:117 +#: grep-dctrl/grep-dctrl.c:75 msgid "" "Show only the first line of the \"Description\" field from the matching " "paragraphs." msgstr "仅显示匹配段落中“描述”的第一行。" -#: grep-dctrl/grep-dctrl.c:118 +#: grep-dctrl/grep-dctrl.c:76 msgid "Suppress field names when showing specified fields." msgstr "当显示指定的字段，压缩字段名。" -#: grep-dctrl/grep-dctrl.c:119 +#: grep-dctrl/grep-dctrl.c:77 msgid "Regard the pattern as an extended POSIX regular expression." msgstr "把模型作为一个扩展的POSIX常规表达式。" @@ -139,19 +139,19 @@ msgid "The pattern is a standard POSIX regular expression." msgstr "模型是一个标准的POSIX常规表达式。" -#: grep-dctrl/grep-dctrl.c:121 +#: grep-dctrl/grep-dctrl.c:79 msgid "Ignore case when looking for a match." msgstr "在搜索匹配时忽略大小写" -#: grep-dctrl/grep-dctrl.c:122 +#: grep-dctrl/grep-dctrl.c:80 msgid "Show only paragraphs that do not match." msgstr "只显示不匹配的段落。" -#: grep-dctrl/grep-dctrl.c:123 +#: grep-dctrl/grep-dctrl.c:81 msgid "Show those fields that have NOT been selected with -s" msgstr "使用参数-s显示没有被选中的文件" -#: grep-dctrl/grep-dctrl.c:124 +#: grep-dctrl/grep-dctrl.c:82 msgid "Show only the count of matching paragraphs." msgstr "仅显示匹配段落的数量。" @@ -163,12 +163,12 @@ msgid "Use FNAME as the config file." msgstr "把FNAME用作配置文件。" -#: grep-dctrl/grep-dctrl.c:126 +#: grep-dctrl/grep-dctrl.c:83 msgid "Do an exact match." msgstr "进行一次精确匹配。" -#: grep-dctrl/grep-dctrl.c:127 sort-dctrl/sort-dctrl.c:38 -#: tbl-dctrl/tbl-dctrl.c:41 join-dctrl/join-dctrl.c:44 +#: grep-dctrl/grep-dctrl.c:84 sort-dctrl/sort-dctrl.c:38 +#: tbl-dctrl/tbl-dctrl.c:42 join-dctrl/join-dctrl.c:44 msgid "Print out the copyright license." msgstr "打印版权许可。" @@ -184,7 +184,7 @@ msgid "Negate the following predicate." msgstr "求反（非）下列段落。" -#: grep-dctrl/grep-dctrl.c:131 +#: grep-dctrl/grep-dctrl.c:88 msgid "Test for version number equality." msgstr "测试版本号数字是否相等。" @@ -192,7 +192,7 @@ msgid "Version number comparison: <." msgstr "版本号比较：<。" -#: grep-dctrl/grep-dctrl.c:133 +#: grep-dctrl/grep-dctrl.c:90 msgid "Version number comparison: <=." msgstr "版本号比较：<=。" @@ -200,11 +200,11 @@ msgid "Version number comparison: >." msgstr "版本号比较：>。" -#: grep-dctrl/grep-dctrl.c:135 +#: grep-dctrl/grep-dctrl.c:92 msgid "Version number comparison: >=." msgstr "版本号比较：>=。" -#: grep-dctrl/grep-dctrl.c:136 +#: grep-dctrl/grep-dctrl.c:93 msgid "Debug option parsing." msgstr "调试选项语法分析。" @@ -212,24 +212,24 @@ msgid "Do no output to stdout." msgstr "不作输出到stdout。" -#: grep-dctrl/grep-dctrl.c:139 sort-dctrl/sort-dctrl.c:41 -#: tbl-dctrl/tbl-dctrl.c:43 join-dctrl/join-dctrl.c:46 +#: grep-dctrl/grep-dctrl.c:96 sort-dctrl/sort-dctrl.c:41 +#: tbl-dctrl/tbl-dctrl.c:44 join-dctrl/join-dctrl.c:46 msgid "Attempt mmapping input files" msgstr "尝试映射输入文件。" -#: grep-dctrl/grep-dctrl.c:140 +#: grep-dctrl/grep-dctrl.c:97 msgid "Ignore parse errors" msgstr "忽略语法分析错误" -#: grep-dctrl/grep-dctrl.c:141 +#: grep-dctrl/grep-dctrl.c:98 msgid "PATTERN" msgstr "模型" -#: grep-dctrl/grep-dctrl.c:141 +#: grep-dctrl/grep-dctrl.c:98 msgid "Specify the pattern to search for" msgstr "指定模型来搜索" -#: grep-dctrl/grep-dctrl.c:142 +#: grep-dctrl/grep-dctrl.c:99 msgid "Match only whole package names (this implies -e)" msgstr "仅匹配整个软件包名(隐含包含选项 -e )" @@ -245,13 +245,13 @@ msgid "inconsistent atom modifiers" msgstr "不相容的基本单位组合键" -#: grep-dctrl/grep-dctrl.c:430 grep-dctrl/grep-dctrl.c:838 +#: grep-dctrl/grep-dctrl.c:241 grep-dctrl/grep-dctrl.c:852 #: join-dctrl/join-dctrl.c:113 msgid "too many output fields" msgstr "过多输出字段" -#: grep-dctrl/grep-dctrl.c:454 sort-dctrl/sort-dctrl.c:104 -#: tbl-dctrl/tbl-dctrl.c:301 join-dctrl/join-dctrl.c:168 +#: grep-dctrl/grep-dctrl.c:265 sort-dctrl/sort-dctrl.c:104 +#: tbl-dctrl/tbl-dctrl.c:305 join-dctrl/join-dctrl.c:168 #, c-format msgid "no such log level '%s'" msgstr "没有“%s”这个日志级别" @@ -260,8 +260,8 @@ msgid "Multiple patterns for the same atom are not allowed" msgstr "复杂模型对于同一个基本单位是不被允许的" -#: grep-dctrl/grep-dctrl.c:586 sort-dctrl/sort-dctrl.c:120 -#: tbl-dctrl/tbl-dctrl.c:313 join-dctrl/join-dctrl.c:180 +#: grep-dctrl/grep-dctrl.c:724 sort-dctrl/sort-dctrl.c:120 +#: tbl-dctrl/tbl-dctrl.c:317 join-dctrl/join-dctrl.c:180 msgid "too many file names" msgstr "过多文件名" @@ -293,11 +293,11 @@ msgid "unexpected atom in command line" msgstr "命令行中有意外的基本单位" -#: grep-dctrl/grep-dctrl.c:708 +#: grep-dctrl/grep-dctrl.c:595 msgid "missing ')' in command line" msgstr "命令行中缺失“)“" -#: grep-dctrl/grep-dctrl.c:820 +#: grep-dctrl/grep-dctrl.c:623 msgid "A pattern is mandatory" msgstr "必须有一个模型" @@ -309,15 +309,15 @@ msgid "malformed predicate" msgstr "错误的判定" -#: grep-dctrl/grep-dctrl.c:842 +#: grep-dctrl/grep-dctrl.c:856 msgid "Adding \"Description\" to selected output fields because of -d" msgstr "添加\"描述\"到选择的输出字段因为 -d" -#: grep-dctrl/grep-dctrl.c:850 +#: grep-dctrl/grep-dctrl.c:864 msgid "-I requires at least one instance of -s" msgstr "-I 需要至少一个 -s 情况" -#: grep-dctrl/grep-dctrl.c:856 +#: grep-dctrl/grep-dctrl.c:870 msgid "cannot suppress field names when showing whole paragraphs" msgstr "当显示整个段落时不能压缩字段名" @@ -381,35 +381,35 @@ msgid "sort-dctrl -- sort Debian control files" msgstr "sort-dctrl -- sort Debian控制文件" -#: tbl-dctrl/tbl-dctrl.c:38 +#: tbl-dctrl/tbl-dctrl.c:39 msgid "DELIM" msgstr "DELIM" -#: tbl-dctrl/tbl-dctrl.c:38 +#: tbl-dctrl/tbl-dctrl.c:39 msgid "Specify a delimiter." msgstr "指定一个分界符" -#: tbl-dctrl/tbl-dctrl.c:39 +#: tbl-dctrl/tbl-dctrl.c:40 msgid "Do not print a table heading" msgstr "不能够打印一个表格头" -#: tbl-dctrl/tbl-dctrl.c:40 +#: tbl-dctrl/tbl-dctrl.c:41 msgid "SPEC" msgstr "SPEC" -#: tbl-dctrl/tbl-dctrl.c:40 +#: tbl-dctrl/tbl-dctrl.c:41 msgid "Append the specified column." msgstr "追加指定的列。" -#: tbl-dctrl/tbl-dctrl.c:284 +#: tbl-dctrl/tbl-dctrl.c:288 msgid "invalid column length" msgstr "无效列长" -#: tbl-dctrl/tbl-dctrl.c:338 +#: tbl-dctrl/tbl-dctrl.c:342 msgid "tbl-dctrl -- tabularize Debian control files" msgstr "tbl-dctrl -- tabularize Debian控制文件" -#: tbl-dctrl/tbl-dctrl.c:359 +#: tbl-dctrl/tbl-dctrl.c:364 msgid "bad multibyte character" msgstr "错误的多字节字符" diff -Nru language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/debconf.po language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/debconf.po --- language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/debconf.po 2013-01-29 09:37:14.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/debconf.po 2014-01-07 07:01:15.000000000 +0000 @@ -15,8 +15,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-01-28 10:49+0000\n" -"X-Generator: Launchpad (build 16451)\n" +"X-Launchpad-Export-Date: 2014-01-06 10:48+0000\n" +"X-Generator: Launchpad (build 16877)\n" "Language: zh_CN\n" #: ../Debconf/AutoSelect.pm:76 diff -Nru language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/debian-tasks.po language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/debian-tasks.po --- language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/debian-tasks.po 2013-01-29 09:37:16.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/debian-tasks.po 2014-01-07 07:01:38.000000000 +0000 @@ -16,8 +16,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-01-28 13:48+0000\n" -"X-Generator: Launchpad (build 16451)\n" +"X-Launchpad-Export-Date: 2014-01-06 14:14+0000\n" +"X-Generator: Launchpad (build 16877)\n" "Language: \n" #. Description diff -Nru language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/debianutils.po language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/debianutils.po --- language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/debianutils.po 2013-01-29 09:37:07.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/debianutils.po 2014-01-07 07:01:15.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-01-28 10:49+0000\n" -"X-Generator: Launchpad (build 16451)\n" +"X-Launchpad-Export-Date: 2014-01-06 10:49+0000\n" +"X-Generator: Launchpad (build 16877)\n" #. type: TH #: ../add-shell.8:1 @@ -147,7 +147,7 @@ msgstr "" #. type: TH -#: ../ischroot.1:2 ../tempfile.1:2 +#: ../ischroot.1:2 #, no-wrap msgid "30 May 2011" msgstr "" @@ -211,7 +211,7 @@ msgstr "" #. type: SH -#: ../ischroot.1:22 ../run-parts.8:46 ../savelog.8:92 ../tempfile.1:46 ../which.1:14 +#: ../ischroot.1:22 ../run-parts.8:47 ../savelog.8:92 ../tempfile.1:46 ../which.1:14 #, no-wrap msgid "OPTIONS" msgstr "选项" @@ -371,50 +371,50 @@ msgstr "" #. type: TP -#: ../run-parts.8:47 +#: ../run-parts.8:48 #, no-wrap msgid "B<--test>" msgstr "B<--test>" #. type: Plain text -#: ../run-parts.8:51 +#: ../run-parts.8:52 msgid "" "print the names of the scripts which would be run, but don't actually run " "them." msgstr "" #. type: TP -#: ../run-parts.8:51 +#: ../run-parts.8:52 #, no-wrap msgid "B<--list>" msgstr "B<--list>" #. type: Plain text -#: ../run-parts.8:55 +#: ../run-parts.8:56 msgid "" "print the names of the all matching files (not limited to executables), but " "don't actually run them. This option cannot be used with --test." msgstr "" #. type: TP -#: ../run-parts.8:55 +#: ../run-parts.8:56 #, no-wrap msgid "B<-v, --verbose>" msgstr "B<-v, --verbose>" #. type: Plain text -#: ../run-parts.8:58 +#: ../run-parts.8:59 msgid "print the name of each script to stderr before running." msgstr "" #. type: TP -#: ../run-parts.8:58 +#: ../run-parts.8:59 #, no-wrap msgid "B<--report>" msgstr "B<--report>" #. type: Plain text -#: ../run-parts.8:63 +#: ../run-parts.8:64 msgid "" "similar to B<--verbose>, but only prints the name of scripts which produce " "output. The script's name is printed to whichever of stdout or stderr the " @@ -422,46 +422,46 @@ msgstr "" #. type: TP -#: ../run-parts.8:63 +#: ../run-parts.8:64 #, no-wrap msgid "B<--reverse>" msgstr "B<--reverse>" #. type: Plain text -#: ../run-parts.8:66 +#: ../run-parts.8:67 msgid "reverse the scripts' execution order." msgstr "" #. type: TP -#: ../run-parts.8:66 +#: ../run-parts.8:67 #, no-wrap msgid "B<--exit-on-error>" msgstr "B<--exit-on-error>" #. type: Plain text -#: ../run-parts.8:69 +#: ../run-parts.8:70 msgid "exit as soon as a script returns with a non-zero exit code." msgstr "" #. type: TP -#: ../run-parts.8:69 +#: ../run-parts.8:70 #, no-wrap msgid "B<--lsbsysinit>" msgstr "B<--lsbsysinit>" #. type: Plain text -#: ../run-parts.8:72 +#: ../run-parts.8:73 msgid "use LSB namespaces instead of classical behavior." msgstr "" #. type: TP -#: ../run-parts.8:72 +#: ../run-parts.8:73 #, no-wrap msgid "B<--new-session>" msgstr "B<--new-session>" #. type: Plain text -#: ../run-parts.8:77 +#: ../run-parts.8:78 msgid "" "run each script in a separate process session. If you use this option, " "killing run-parts will not kill the currently running script, it will run " @@ -469,125 +469,125 @@ msgstr "" #. type: TP -#: ../run-parts.8:77 +#: ../run-parts.8:78 #, no-wrap msgid "B<--regex=>I" msgstr "B<--regex=>I" #. type: Plain text -#: ../run-parts.8:82 +#: ../run-parts.8:83 msgid "" "validate filenames against custom extended regular expression I. See " "the EXAMPLES section for an example." msgstr "" #. type: TP -#: ../run-parts.8:82 +#: ../run-parts.8:83 #, no-wrap msgid "B<-u, --umask=>I" msgstr "B<-u, --umask=>I" #. type: Plain text -#: ../run-parts.8:89 +#: ../run-parts.8:90 msgid "" "sets the umask to I before running the scripts. I should be " "specified in octal. By default the umask is set to 022." msgstr "" #. type: TP -#: ../run-parts.8:89 +#: ../run-parts.8:90 #, no-wrap msgid "B<-a, --arg=>I" msgstr "B<-a, --arg=>I" #. type: Plain text -#: ../run-parts.8:96 +#: ../run-parts.8:97 msgid "" "pass I to the scripts. Use B<--arg> once for each argument you " "want passed." msgstr "" #. type: TP -#: ../run-parts.8:96 +#: ../run-parts.8:97 #, no-wrap msgid "B<-->" msgstr "B<-->" #. type: Plain text -#: ../run-parts.8:102 +#: ../run-parts.8:103 msgid "" "specifies that this is the end of the options. Any filename after B<--> " "will be not be interpreted as an option even if it starts with a hyphen." msgstr "" #. type: TP -#: ../run-parts.8:102 +#: ../run-parts.8:103 #, no-wrap msgid "B<-h, --help>" msgstr "B<-h, --help>" #. type: Plain text -#: ../run-parts.8:105 +#: ../run-parts.8:106 msgid "display usage information and exit." msgstr "" #. type: TP -#: ../run-parts.8:105 +#: ../run-parts.8:106 #, no-wrap msgid "B<-V, --version>" msgstr "B<-V, --version>" #. type: Plain text -#: ../run-parts.8:108 +#: ../run-parts.8:109 msgid "display version and copyright and exit." msgstr "显示版本和版权然后退出。" #. type: SH -#: ../run-parts.8:109 +#: ../run-parts.8:110 #, no-wrap msgid "EXAMPLES" msgstr "示例" #. type: Plain text -#: ../run-parts.8:112 +#: ../run-parts.8:113 msgid "" "Print the names of all files in /etc that start with `p' and end with `d':" msgstr "" #. type: Plain text -#: ../run-parts.8:114 +#: ../run-parts.8:115 msgid "run-parts --list --regex \\[aq]^p.*d$\\[aq] /etc" msgstr "run-parts --list --regex \\[aq]^p.*d$\\[aq] /etc" #. type: SH -#: ../run-parts.8:115 +#: ../run-parts.8:116 #, no-wrap msgid "COPYRIGHT" msgstr "版权" #. type: Plain text -#: ../run-parts.8:118 +#: ../run-parts.8:119 msgid "Copyright (C) 1994 Ian Jackson." msgstr "Copyright (C) 1994 Ian Jackson." #. type: Plain text -#: ../run-parts.8:120 +#: ../run-parts.8:121 msgid "Copyright (C) 1996 Jeff Noxon." msgstr "Copyright (C) 1996 Jeff Noxon." #. type: Plain text -#: ../run-parts.8:122 +#: ../run-parts.8:123 msgid "Copyright (C) 1996, 1997, 1998 Guy Maor" msgstr "Copyright (C) 1996, 1997, 1998 Guy Maor" #. type: Plain text -#: ../run-parts.8:124 +#: ../run-parts.8:125 msgid "" "Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Clint Adams" msgstr "" #. type: Plain text -#: ../run-parts.8:129 +#: ../run-parts.8:130 msgid "" "B is free software; see the GNU General Public License version 2 " "or later for copying conditions. There is I warranty." diff -Nru language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/devscripts.po language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/devscripts.po --- language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/devscripts.po 2013-01-29 09:37:00.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20140106/data/zh_CN/LC_MESSAGES/devscripts.po 2014-01-07 07:01:16.000000000 +0000 @@ -9,13 +9,13 @@ "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-03-30 16:45+0300\n" "PO-Revision-Date: 2009-10-26 12:20+0000\n" -"Last-Translator: Hugh \n" +"Last-Translator: Hugh SH \n" "Language-Team: Simplified Chinese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-01-28 10:51+0000\n" -"X-Generator: Launchpad (build 16451)\n" +"X-Launchpad-Export-Date: 2014-01-06 10:51+0000\n" +"X-Generator: Launchpad (build 16877)\n" #. type: TH #: ../scripts/annotate-output.1:1 @@ -36,7 +36,7 @@ msgstr "DEBIAN" #. type: SH -#: ../scripts/annotate-output.1:2 ../scripts/archpath.1:2 ../scripts/bts.pl:39 ../scripts/build-rdeps.pl:18 ../scripts/chdist.pl:18 ../scripts/checkbashisms.1:2 ../scripts/cowpoke.1:18 ../scripts/cvs-debc.1:2 ../scripts/cvs-debi.1:2 ../scripts/cvs-debrelease.1:2 ../scripts/cvs-debuild.1:2 ../scripts/dcmd.1:2 ../scripts/dcontrol.pl:198 ../scripts/dd-list.1:18 ../scripts/debc.1:2 ../scripts/debchange.1:2 ../scripts/debcheckout.pl:24 ../scripts/debclean.1:2 ../scripts/debcommit.pl:3 ../scripts/debdiff.1:2 ../scripts/debi.1:2 ../scripts/debpkg.1:2 ../scripts/debrelease.1:2 ../scripts/debrsign.1:2 ../scripts/debsign.1:2 ../scripts/debsnap.1:3 ../scripts/debuild.1:2 ../scripts/desktop2menu.pl:24 ../scripts/dep3changelog.1:2 ../scripts/devscripts.1:2 ../scripts/dget.pl:493 ../scripts/diff2patches.1:2 ../scripts/dpkg-depcheck.1:2 ../scripts/dpkg-genbuilddeps.1:2 ../doc/edit-patch.1:2 ../scripts/dscextract.1:2 ../scripts/dscverify.1:2 ../scripts/getbuildlog.1:2 ../scripts/grep-excuses.1:2 ../scripts/licensecheck.pl:22 ../scripts/list-unreleased.1:2 ../scripts/manpage-alert.1:2 ../scripts/mass-bug.pl:21 ../scripts/mergechanges.1:2 ../scripts/mk-build-deps.pl:24 ../scripts/namecheck.pl:3 ../scripts/nmudiff.1:2 ../scripts/plotchangelog.1:2 ../scripts/pts-subscribe.1:2 ../scripts/rc-alert.1:2 ../scripts/rmadison.pl:204 ../doc/suspicious-source.1:17 ../scripts/svnpath.pl:3 ../scripts/tagpending.pl:79 ../scripts/transition-check.pl:23 ../scripts/uscan.1:2 ../scripts/uupdate.1:2 ../doc/what-patch.1:2 ../scripts/whodepends.1:2 ../scripts/who-uploads.1:2 ../scripts/wnpp-alert.1:2 ../scripts/wnpp-check.1:2 ../doc/wrap-and-sort.1:16 ../scripts/devscripts.conf.5:2 +#: ../scripts/annotate-output.1:2 ../scripts/archpath.1:2 ../scripts/bts.pl:39 ../scripts/build-rdeps.pl:18 ../scripts/chdist.pl:18 ../scripts/checkbashisms.1:2 ../scripts/cowpoke.1:18 ../scripts/cvs-debc.1:2 ../scripts/cvs-debi.1:2 ../scripts/cvs-debrelease.1:2 ../scripts/cvs-debuild.1:2 ../scripts/dcmd.1:2 ../scripts/dcontrol.pl:196 ../scripts/dd-list.1:18 ../scripts/debc.1:2 ../scripts/debchange.1:2 ../scripts/debcheckout.pl:24 ../scripts/debclean.1:2 ../scripts/debcommit.pl:3 ../scripts/debdiff.1:2 ../scripts/debi.1:2 ../scripts/debpkg.1:2 ../scripts/debrelease.1:2 ../scripts/debrsign.1:2 ../scripts/debsign.1:2 ../scripts/debsnap.1:3 ../scripts/debuild.1:2 ../scripts/desktop2menu.pl:24 ../scripts/dep3changelog.1:2 ../scripts/devscripts.1:2 ../scripts/dget.pl:508 ../scripts/diff2patches.1:2 ../scripts/dpkg-depcheck.1:2 ../scripts/dpkg-genbuilddeps.1:2 ../doc/edit-patch.1:2 ../scripts/dscextract.1:2 ../scripts/dscverify.1:2 ../scripts/getbuildlog.1:2 ../scripts/grep-excuses.1:2 ../scripts/licensecheck.pl:22 ../scripts/list-unreleased.1:2 ../scripts/manpage-alert.1:2 ../scripts/mass-bug.pl:21 ../scripts/mergechanges.1:2 ../scripts/mk-build-deps.pl:24 ../scripts/namecheck.pl:3 ../scripts/nmudiff.1:2 ../scripts/origtargz.pl:20 ../scripts/plotchangelog.1:2 ../scripts/pts-subscribe.1:2 ../scripts/rc-alert.1:2 ../scripts/rmadison.pl:201 ../doc/suspicious-source.1:17 ../scripts/svnpath.pl:3 ../scripts/tagpending.pl:79 ../scripts/transition-check.pl:23 ../scripts/uscan.1:2 ../scripts/uupdate.1:2 ../doc/what-patch.1:2 ../scripts/whodepends.1:2 ../scripts/who-uploads.1:2 ../scripts/who-permits-upload.pl:42 ../scripts/wnpp-alert.1:2 ../scripts/wnpp-check.1:2 ../doc/wrap-and-sort.1:16 ../scripts/devscripts.conf.5:2 #, no-wrap msgid "NAME" msgstr "名称" @@ -47,7 +47,7 @@ msgstr "annotate-output - 用时间和流信息对程序输出作注解" #. type: SH -#: ../scripts/annotate-output.1:4 ../scripts/archpath.1:4 ../scripts/bts.pl:182 ../scripts/build-rdeps.pl:22 ../scripts/chdist.pl:22 ../scripts/checkbashisms.1:4 ../scripts/cowpoke.1:20 ../scripts/cvs-debc.1:4 ../scripts/cvs-debi.1:4 ../scripts/cvs-debrelease.1:4 ../scripts/cvs-debuild.1:4 ../scripts/dcmd.1:4 ../scripts/dcontrol.pl:202 ../scripts/dd-list.1:21 ../scripts/debc.1:4 ../scripts/debchange.1:4 ../scripts/debcheckout.pl:28 ../scripts/debclean.1:4 ../scripts/debcommit.pl:7 ../scripts/debdiff.1:4 ../scripts/debi.1:4 ../scripts/debpkg.1:4 ../scripts/debrelease.1:4 ../scripts/debrsign.1:4 ../scripts/debsign.1:4 ../scripts/debsnap.1:6 ../scripts/debuild.1:4 ../scripts/desktop2menu.pl:28 ../scripts/dep3changelog.1:4 ../scripts/dget.pl:497 ../scripts/dpkg-depcheck.1:4 ../scripts/dpkg-genbuilddeps.1:4 ../doc/edit-patch.1:6 ../scripts/dscextract.1:4 ../scripts/dscverify.1:4 ../scripts/getbuildlog.1:4 ../scripts/grep-excuses.1:4 ../scripts/licensecheck.pl:26 ../scripts/list-unreleased.1:4 ../scripts/manpage-alert.1:4 ../scripts/mass-bug.pl:25 ../scripts/mergechanges.1:4 ../scripts/mk-build-deps.pl:28 ../scripts/nmudiff.1:4 ../scripts/plotchangelog.1:4 ../scripts/pts-subscribe.1:4 ../scripts/rc-alert.1:4 ../scripts/rmadison.pl:208 ../doc/suspicious-source.1:21 ../scripts/svnpath.pl:7 ../scripts/tagpending.pl:83 ../scripts/transition-check.pl:27 ../scripts/uscan.1:4 ../scripts/uupdate.1:4 ../doc/what-patch.1:5 ../scripts/whodepends.1:4 ../scripts/who-uploads.1:4 ../scripts/wnpp-alert.1:4 ../scripts/wnpp-check.1:4 ../doc/wrap-and-sort.1:18 +#: ../scripts/annotate-output.1:4 ../scripts/archpath.1:4 ../scripts/bts.pl:185 ../scripts/build-rdeps.pl:22 ../scripts/chdist.pl:22 ../scripts/checkbashisms.1:4 ../scripts/cowpoke.1:20 ../scripts/cvs-debc.1:4 ../scripts/cvs-debi.1:4 ../scripts/cvs-debrelease.1:4 ../scripts/cvs-debuild.1:4 ../scripts/dcmd.1:4 ../scripts/dcontrol.pl:200 ../scripts/dd-list.1:21 ../scripts/debc.1:4 ../scripts/debchange.1:4 ../scripts/debcheckout.pl:28 ../scripts/debclean.1:4 ../scripts/debcommit.pl:7 ../scripts/debdiff.1:4 ../scripts/debi.1:4 ../scripts/debpkg.1:4 ../scripts/debrelease.1:4 ../scripts/debrsign.1:4 ../scripts/debsign.1:4 ../scripts/debsnap.1:6 ../scripts/debuild.1:4 ../scripts/desktop2menu.pl:28 ../scripts/dep3changelog.1:4 ../scripts/dget.pl:512 ../scripts/dpkg-depcheck.1:4 ../scripts/dpkg-genbuilddeps.1:4 ../doc/edit-patch.1:6 ../scripts/dscextract.1:4 ../scripts/dscverify.1:4 ../scripts/getbuildlog.1:4 ../scripts/grep-excuses.1:4 ../scripts/licensecheck.pl:26 ../scripts/list-unreleased.1:4 ../scripts/manpage-alert.1:4 ../scripts/mass-bug.pl:25 ../scripts/mergechanges.1:4 ../scripts/mk-build-deps.pl:28 ../scripts/nmudiff.1:4 ../scripts/origtargz.pl:24 ../scripts/plotchangelog.1:4 ../scripts/pts-subscribe.1:4 ../scripts/rc-alert.1:4 ../scripts/rmadison.pl:205 ../doc/suspicious-source.1:21 ../scripts/svnpath.pl:7 ../scripts/tagpending.pl:83 ../scripts/transition-check.pl:27 ../scripts/uscan.1:4 ../scripts/uupdate.1:4 ../doc/what-patch.1:5 ../scripts/whodepends.1:4 ../scripts/who-uploads.1:4 ../scripts/who-permits-upload.pl:46 ../scripts/wnpp-alert.1:4 ../scripts/wnpp-check.1:4 ../doc/wrap-and-sort.1:18 #, no-wrap msgid "SYNOPSIS" msgstr "概要" @@ -58,7 +58,7 @@ msgstr "" #. type: SH -#: ../scripts/annotate-output.1:6 ../scripts/archpath.1:12 ../scripts/bts.pl:186 ../scripts/build-rdeps.pl:26 ../scripts/chdist.pl:26 ../scripts/checkbashisms.1:8 ../scripts/cowpoke.1:24 ../scripts/cvs-debc.1:6 ../scripts/cvs-debi.1:6 ../scripts/cvs-debrelease.1:7 ../scripts/cvs-debuild.1:7 ../scripts/dcmd.1:7 ../scripts/dcontrol.pl:210 ../scripts/dd-list.1:26 ../scripts/debc.1:6 ../scripts/debchange.1:8 ../scripts/debcheckout.pl:40 ../scripts/debclean.1:6 ../scripts/debcommit.pl:11 ../scripts/debdiff.1:15 ../scripts/debi.1:6 ../scripts/debpkg.1:6 ../scripts/debrelease.1:6 ../scripts/deb-reversion.dbk:82 ../scripts/debrsign.1:7 ../scripts/debsign.1:6 ../scripts/debsnap.1:14 ../scripts/debuild.1:10 ../scripts/desktop2menu.pl:34 ../scripts/dep3changelog.1:6 ../scripts/devscripts.1:4 ../scripts/dget.pl:507 ../scripts/diff2patches.1:10 ../scripts/dpkg-depcheck.1:6 ../scripts/dpkg-genbuilddeps.1:6 ../doc/edit-patch.1:11 ../scripts/dscextract.1:6 ../scripts/dscverify.1:6 ../scripts/getbuildlog.1:8 ../scripts/grep-excuses.1:6 ../scripts/licensecheck.pl:35 ../scripts/list-unreleased.1:6 ../scripts/manpage-alert.1:8 ../scripts/mass-bug.pl:29 ../scripts/mergechanges.1:6 ../scripts/mk-build-deps.pl:34 ../scripts/nmudiff.1:6 ../scripts/plotchangelog.1:7 ../scripts/pts-subscribe.1:8 ../scripts/rc-alert.1:8 ../scripts/rmadison.pl:216 ../doc/suspicious-source.1:24 ../scripts/svnpath.pl:17 ../scripts/tagpending.pl:87 ../scripts/transition-check.pl:33 ../scripts/uscan.1:6 ../scripts/uupdate.1:8 ../doc/what-patch.1:8 ../scripts/whodepends.1:6 ../scripts/who-uploads.1:6 ../scripts/wnpp-alert.1:8 ../scripts/wnpp-check.1:8 ../doc/wrap-and-sort.1:22 ../scripts/devscripts.conf.5:4 +#: ../scripts/annotate-output.1:6 ../scripts/archpath.1:12 ../scripts/bts.pl:189 ../scripts/build-rdeps.pl:26 ../scripts/chdist.pl:26 ../scripts/checkbashisms.1:8 ../scripts/cowpoke.1:24 ../scripts/cvs-debc.1:6 ../scripts/cvs-debi.1:6 ../scripts/cvs-debrelease.1:7 ../scripts/cvs-debuild.1:7 ../scripts/dcmd.1:6 ../scripts/dcontrol.pl:208 ../scripts/dd-list.1:26 ../scripts/debc.1:6 ../scripts/debchange.1:8 ../scripts/debcheckout.pl:40 ../scripts/debclean.1:6 ../scripts/debcommit.pl:11 ../scripts/debdiff.1:15 ../scripts/debi.1:6 ../scripts/debpkg.1:6 ../scripts/debrelease.1:6 ../scripts/deb-reversion.dbk:82 ../scripts/debrsign.1:7 ../scripts/debsign.1:6 ../scripts/debsnap.1:14 ../scripts/debuild.1:10 ../scripts/desktop2menu.pl:34 ../scripts/dep3changelog.1:6 ../scripts/devscripts.1:4 ../scripts/dget.pl:522 ../scripts/diff2patches.1:10 ../scripts/dpkg-depcheck.1:6 ../scripts/dpkg-genbuilddeps.1:6 ../doc/edit-patch.1:11 ../scripts/dscextract.1:6 ../scripts/dscverify.1:6 ../scripts/getbuildlog.1:8 ../scripts/grep-excuses.1:6 ../scripts/licensecheck.pl:35 ../scripts/list-unreleased.1:6 ../scripts/manpage-alert.1:8 ../scripts/mass-bug.pl:29 ../scripts/mergechanges.1:6 ../scripts/mk-build-deps.pl:34 ../scripts/nmudiff.1:6 ../scripts/origtargz.pl:34 ../scripts/plotchangelog.1:7 ../scripts/pts-subscribe.1:8 ../scripts/rc-alert.1:8 ../scripts/rmadison.pl:213 ../doc/suspicious-source.1:24 ../scripts/svnpath.pl:17 ../scripts/tagpending.pl:87 ../scripts/transition-check.pl:33 ../scripts/uscan.1:6 ../scripts/uupdate.1:8 ../doc/what-patch.1:8 ../scripts/whodepends.1:6 ../scripts/who-uploads.1:6 ../scripts/who-permits-upload.pl:50 ../scripts/wnpp-alert.1:8 ../scripts/wnpp-check.1:8 ../doc/wrap-and-sort.1:22 ../scripts/devscripts.conf.5:4 #, no-wrap msgid "DESCRIPTION" msgstr "描述" @@ -71,7 +71,7 @@ msgstr "B 会执行指定的程序并在每行上添加当前时间、O(标准输出) 和 E(标准错误)。" #. type: SH -#: ../scripts/annotate-output.1:11 ../scripts/bts.pl:238 ../scripts/build-rdeps.pl:30 ../scripts/chdist.pl:33 ../scripts/checkbashisms.1:23 ../scripts/cowpoke.1:29 ../scripts/cvs-debc.1:24 ../scripts/cvs-debi.1:28 ../scripts/cvs-debrelease.1:21 ../scripts/cvs-debuild.1:32 ../scripts/dcmd.1:16 ../scripts/dcontrol.pl:244 ../scripts/dd-list.1:58 ../scripts/debc.1:64 ../scripts/debchange.1:145 ../scripts/debcheckout.pl:68 ../scripts/debclean.1:60 ../scripts/debcommit.pl:19 ../scripts/debdiff.1:50 ../scripts/debi.1:65 ../scripts/debrelease.1:56 ../scripts/deb-reversion.dbk:128 ../scripts/debrsign.1:30 ../scripts/debsign.1:39 ../scripts/debsnap.1:26 ../scripts/debuild.1:219 ../scripts/dep3changelog.1:15 ../scripts/dget.pl:546 ../scripts/diff2patches.1:16 ../scripts/dpkg-depcheck.1:15 ../scripts/dscextract.1:14 ../scripts/dscverify.1:17 ../scripts/getbuildlog.1:24 ../scripts/grep-excuses.1:13 ../scripts/licensecheck.pl:44 ../scripts/list-unreleased.1:12 ../scripts/manpage-alert.1:14 ../scripts/mass-bug.pl:59 ../scripts/mk-build-deps.pl:44 ../scripts/nmudiff.1:21 ../scripts/plotchangelog.1:43 ../scripts/pts-subscribe.1:18 ../scripts/rc-alert.1:17 ../scripts/rmadison.pl:225 ../doc/suspicious-source.1:34 ../scripts/tagpending.pl:93 ../scripts/transition-check.pl:42 ../scripts/uscan.1:336 ../scripts/uupdate.1:52 ../doc/what-patch.1:15 ../scripts/whodepends.1:10 ../scripts/who-uploads.1:15 ../scripts/wnpp-alert.1:17 ../scripts/wnpp-check.1:16 ../doc/wrap-and-sort.1:33 +#: ../scripts/annotate-output.1:11 ../scripts/bts.pl:241 ../scripts/build-rdeps.pl:30 ../scripts/chdist.pl:33 ../scripts/checkbashisms.1:23 ../scripts/cowpoke.1:29 ../scripts/cvs-debc.1:24 ../scripts/cvs-debi.1:28 ../scripts/cvs-debrelease.1:21 ../scripts/cvs-debuild.1:32 ../scripts/dcmd.1:15 ../scripts/dcontrol.pl:242 ../scripts/dd-list.1:58 ../scripts/debc.1:64 ../scripts/debchange.1:145 ../scripts/debcheckout.pl:68 ../scripts/debclean.1:60 ../scripts/debcommit.pl:19 ../scripts/debdiff.1:50 ../scripts/debi.1:65 ../scripts/debrelease.1:56 ../scripts/deb-reversion.dbk:128 ../scripts/debrsign.1:30 ../scripts/debsign.1:39 ../scripts/debsnap.1:26 ../scripts/debuild.1:219 ../scripts/dep3changelog.1:15 ../scripts/dget.pl:563 ../scripts/diff2patches.1:16 ../scripts/dpkg-depcheck.1:15 ../scripts/dscextract.1:14 ../scripts/dscverify.1:17 ../scripts/getbuildlog.1:24 ../scripts/grep-excuses.1:13 ../scripts/licensecheck.pl:44 ../scripts/list-unreleased.1:12 ../scripts/manpage-alert.1:14 ../scripts/mass-bug.pl:59 ../scripts/mk-build-deps.pl:44 ../scripts/nmudiff.1:21 ../scripts/origtargz.pl:95 ../scripts/plotchangelog.1:43 ../scripts/pts-subscribe.1:18 ../scripts/rc-alert.1:17 ../scripts/rmadison.pl:222 ../doc/suspicious-source.1:34 ../scripts/tagpending.pl:93 ../scripts/transition-check.pl:42 ../scripts/uscan.1:352 ../scripts/uupdate.1:52 ../doc/what-patch.1:15 ../scripts/whodepends.1:10 ../scripts/who-uploads.1:15 ../scripts/who-permits-upload.pl:56 ../scripts/wnpp-alert.1:17 ../scripts/wnpp-check.1:16 ../doc/wrap-and-sort.1:33 #, no-wrap msgid "OPTIONS" msgstr "选项" @@ -89,7 +89,7 @@ msgstr "" #. type: TP -#: ../scripts/annotate-output.1:16 ../scripts/chdist.pl:37 ../scripts/dcontrol.pl:256 ../scripts/dd-list.1:59 ../scripts/debcheckout.pl:93 ../scripts/debsnap.1:57 ../scripts/dget.pl:599 ../scripts/dpkg-depcheck.1:96 ../scripts/getbuildlog.1:25 ../scripts/mk-build-deps.pl:79 ../scripts/rmadison.pl:249 ../doc/suspicious-source.1:35 ../doc/what-patch.1:17 ../doc/wrap-and-sort.1:34 +#: ../scripts/annotate-output.1:16 ../scripts/chdist.pl:37 ../scripts/dcontrol.pl:254 ../scripts/dd-list.1:59 ../scripts/debcheckout.pl:93 ../scripts/debsnap.1:57 ../scripts/dget.pl:621 ../scripts/dpkg-depcheck.1:96 ../scripts/getbuildlog.1:25 ../scripts/mk-build-deps.pl:79 ../scripts/rmadison.pl:246 ../doc/suspicious-source.1:35 ../doc/what-patch.1:17 ../doc/wrap-and-sort.1:34 #, no-wrap msgid "B<-h>, B<--help>" msgstr "B<-h>, B<--help>" @@ -100,7 +100,7 @@ msgstr "显示一条帮助信息并成功退出。" #. type: SH -#: ../scripts/annotate-output.1:20 ../scripts/dscextract.1:30 ../scripts/uscan.1:321 +#: ../scripts/annotate-output.1:20 ../scripts/dscextract.1:30 ../scripts/uscan.1:337 #, no-wrap msgid "EXAMPLE" msgstr "示例" @@ -159,7 +159,7 @@ msgstr "" #. type: SH -#: ../scripts/annotate-output.1:47 ../scripts/bts.pl:4105 ../scripts/checkbashisms.1:60 ../scripts/cowpoke.1:263 ../scripts/cvs-debc.1:58 ../scripts/cvs-debi.1:62 ../scripts/cvs-debrelease.1:64 ../scripts/cvs-debuild.1:53 ../scripts/dcmd.1:98 ../scripts/dcontrol.pl:289 ../scripts/debc.1:115 ../scripts/debchange.1:469 ../scripts/debcheckout.pl:222 ../scripts/debclean.1:107 ../scripts/debcommit.pl:858 ../scripts/debdiff.1:215 ../scripts/debi.1:132 ../scripts/debrelease.1:132 ../scripts/deb-reversion.dbk:247 ../scripts/debrsign.1:66 ../scripts/debsign.1:134 ../scripts/debsnap.1:118 ../scripts/debuild.1:410 ../scripts/dep3changelog.1:28 ../scripts/dget.pl:653 ../scripts/diff2patches.1:45 ../scripts/dpkg-depcheck.1:118 ../scripts/dpkg-genbuilddeps.1:30 ../scripts/dscverify.1:73 ../scripts/grep-excuses.1:38 ../scripts/list-unreleased.1:19 ../scripts/nmudiff.1:108 ../scripts/plotchangelog.1:124 ../scripts/pts-subscribe.1:51 ../scripts/rc-alert.1:121 ../scripts/rmadison.pl:332 ../scripts/tagpending.pl:148 ../scripts/uscan.1:541 ../scripts/uupdate.1:170 ../doc/what-patch.1:35 ../scripts/wnpp-alert.1:29 ../scripts/wnpp-check.1:23 ../scripts/devscripts.conf.5:54 +#: ../scripts/annotate-output.1:47 ../scripts/bts.pl:4113 ../scripts/checkbashisms.1:63 ../scripts/cowpoke.1:264 ../scripts/cvs-debc.1:58 ../scripts/cvs-debi.1:62 ../scripts/cvs-debrelease.1:64 ../scripts/cvs-debuild.1:53 ../scripts/dcmd.1:97 ../scripts/dcontrol.pl:287 ../scripts/debc.1:115 ../scripts/debchange.1:469 ../scripts/debcheckout.pl:228 ../scripts/debclean.1:107 ../scripts/debcommit.pl:874 ../scripts/debdiff.1:215 ../scripts/debi.1:132 ../scripts/debrelease.1:132 ../scripts/deb-reversion.dbk:247 ../scripts/debrsign.1:66 ../scripts/debsign.1:134 ../scripts/debsnap.1:118 ../scripts/debuild.1:410 ../scripts/dep3changelog.1:28 ../scripts/dget.pl:683 ../scripts/diff2patches.1:45 ../scripts/dpkg-depcheck.1:118 ../scripts/dpkg-genbuilddeps.1:30 ../scripts/dscverify.1:75 ../scripts/grep-excuses.1:38 ../scripts/list-unreleased.1:19 ../scripts/nmudiff.1:108 ../scripts/origtargz.pl:156 ../scripts/plotchangelog.1:124 ../scripts/pts-subscribe.1:51 ../scripts/rc-alert.1:121 ../scripts/rmadison.pl:333 ../scripts/tagpending.pl:148 ../scripts/uscan.1:566 ../scripts/uupdate.1:170 ../doc/what-patch.1:35 ../scripts/who-permits-upload.pl:161 ../scripts/wnpp-alert.1:29 ../scripts/wnpp-check.1:23 ../scripts/devscripts.conf.5:54 #, no-wrap msgid "SEE ALSO" msgstr "参见" @@ -184,7 +184,7 @@ msgstr "本程序是由社区支持（这意味着：您需要自己修补软件缺陷）。欢迎打补丁和提供反馈（正面或负面的）。" #. type: SH -#: ../scripts/annotate-output.1:55 ../scripts/archpath.1:54 ../scripts/build-rdeps.pl:345 ../scripts/checkbashisms.1:62 ../scripts/cowpoke.1:269 ../scripts/cvs-debc.1:64 ../scripts/cvs-debi.1:68 ../scripts/cvs-debrelease.1:69 ../scripts/cvs-debuild.1:59 ../scripts/dcmd.1:101 ../scripts/dcontrol.pl:282 ../scripts/dd-list.1:100 ../scripts/debc.1:120 ../scripts/debchange.1:476 ../scripts/debcheckout.pl:227 ../scripts/debclean.1:111 ../scripts/debcommit.pl:854 ../scripts/debdiff.1:222 ../scripts/debi.1:136 ../scripts/debpkg.1:23 ../scripts/debrelease.1:137 ../scripts/deb-reversion.dbk:292 ../scripts/debrsign.1:71 ../scripts/debsign.1:146 ../scripts/debuild.1:423 ../scripts/desktop2menu.pl:52 ../scripts/dep3changelog.1:26 ../scripts/dget.pl:645 ../scripts/diff2patches.1:48 ../scripts/dpkg-genbuilddeps.1:36 ../scripts/dscextract.1:32 ../scripts/dscverify.1:78 ../scripts/getbuildlog.1:41 ../scripts/grep-excuses.1:40 ../scripts/licensecheck.pl:129 ../scripts/list-unreleased.1:21 ../scripts/manpage-alert.1:20 ../scripts/mass-bug.pl:520 ../scripts/mergechanges.1:18 ../scripts/mk-build-deps.pl:94 ../scripts/namecheck.pl:30 ../scripts/nmudiff.1:113 ../scripts/plotchangelog.1:126 ../scripts/pts-subscribe.1:56 ../scripts/rc-alert.1:125 ../scripts/rmadison.pl:336 ../scripts/svnpath.pl:93 ../scripts/transition-check.pl:81 ../scripts/uscan.1:547 ../scripts/uupdate.1:177 ../scripts/whodepends.1:19 ../scripts/who-uploads.1:71 ../scripts/wnpp-alert.1:31 ../scripts/wnpp-check.1:33 ../scripts/devscripts.conf.5:58 +#: ../scripts/annotate-output.1:55 ../scripts/archpath.1:54 ../scripts/build-rdeps.pl:345 ../scripts/checkbashisms.1:65 ../scripts/cowpoke.1:270 ../scripts/cvs-debc.1:63 ../scripts/cvs-debi.1:67 ../scripts/cvs-debrelease.1:68 ../scripts/cvs-debuild.1:58 ../scripts/dcmd.1:100 ../scripts/dcontrol.pl:280 ../scripts/dd-list.1:100 ../scripts/debc.1:119 ../scripts/debchange.1:475 ../scripts/debcheckout.pl:233 ../scripts/debclean.1:110 ../scripts/debcommit.pl:870 ../scripts/debdiff.1:221 ../scripts/debi.1:135 ../scripts/debpkg.1:23 ../scripts/debrelease.1:136 ../scripts/deb-reversion.dbk:292 ../scripts/debrsign.1:70 ../scripts/debsign.1:145 ../scripts/debuild.1:422 ../scripts/desktop2menu.pl:52 ../scripts/dep3changelog.1:26 ../scripts/dget.pl:675 ../scripts/diff2patches.1:48 ../scripts/dpkg-genbuilddeps.1:36 ../scripts/dscextract.1:32 ../scripts/dscverify.1:79 ../scripts/getbuildlog.1:41 ../scripts/grep-excuses.1:40 ../scripts/licensecheck.pl:129 ../scripts/list-unreleased.1:21 ../scripts/manpage-alert.1:20 ../scripts/mass-bug.pl:522 ../scripts/mergechanges.1:18 ../scripts/mk-build-deps.pl:94 ../scripts/namecheck.pl:30 ../scripts/nmudiff.1:112 ../scripts/origtargz.pl:160 ../scripts/plotchangelog.1:126 ../scripts/pts-subscribe.1:56 ../scripts/rc-alert.1:125 ../scripts/rmadison.pl:337 ../scripts/svnpath.pl:93 ../scripts/transition-check.pl:81 ../scripts/uscan.1:571 ../scripts/uupdate.1:177 ../scripts/whodepends.1:19 ../scripts/who-uploads.1:71 ../scripts/who-permits-upload.pl:156 ../scripts/wnpp-alert.1:31 ../scripts/wnpp-check.1:33 ../scripts/devscripts.conf.5:58 #, no-wrap msgid "AUTHOR" msgstr "作者" @@ -304,14 +304,14 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:184 +#: ../scripts/bts.pl:187 msgid "" "B [I] I [I] [B<#>I] [B<.>|B<,> " "I [I] [B<#>I]] ..." msgstr "" #. type: textblock -#: ../scripts/bts.pl:188 +#: ../scripts/bts.pl:191 msgid "" "This is a command line interface to the Debian Bug Tracking System (BTS), " "intended mainly for use by developers. It lets the BTS be manipulated using " @@ -322,7 +322,7 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:196 +#: ../scripts/bts.pl:199 msgid "" "In general, the command line interface is the same as what you would write " "in a mail to control@bugs.debian.org, just prefixed with \"bts\". For " @@ -330,7 +330,7 @@ msgstr "" #. type: verbatim -#: ../scripts/bts.pl:200 +#: ../scripts/bts.pl:203 #, no-wrap msgid "" " % bts severity 69042 normal\n" @@ -340,7 +340,7 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:204 +#: ../scripts/bts.pl:207 msgid "" "A few additional commands have been added for your convenience, and this " "program is less strict about what constitutes a valid bug number. For " @@ -350,7 +350,7 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:210 +#: ../scripts/bts.pl:213 msgid "" "Also, for your convenience, this program allows you to abbreviate commands " "to the shortest unique substring (similar to how cvs lets you abbreviate " @@ -358,7 +358,7 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:214 +#: ../scripts/bts.pl:217 msgid "" "It is also possible to include a comment in the mail sent to the BTS. If " "your shell does not strip out the comment in a command like \"bts severity " @@ -370,7 +370,7 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:222 +#: ../scripts/bts.pl:225 msgid "" "You can specify multiple commands by separating them with a single dot, " "rather like B; a single comma may also be used; all the " @@ -380,7 +380,7 @@ msgstr "" #. type: verbatim -#: ../scripts/bts.pl:228 +#: ../scripts/bts.pl:231 #, no-wrap msgid "" " % bts severity 95672 normal , merge 95672 95673 \\#they are the same!\n" @@ -388,14 +388,14 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:230 +#: ../scripts/bts.pl:233 msgid "" "The abbreviation \"it\" may be used to refer to the last mentioned bug " "number, so you could write:" msgstr "" #. type: verbatim -#: ../scripts/bts.pl:233 +#: ../scripts/bts.pl:236 #, no-wrap msgid "" " % bts severity 95672 wishlist , retitle it \"bts: please add a --foo " @@ -404,26 +404,26 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:235 +#: ../scripts/bts.pl:238 msgid "" "Please use this program responsibly, and do take our users into " "consideration." msgstr "" #. type: textblock -#: ../scripts/bts.pl:240 +#: ../scripts/bts.pl:243 msgid "" "B examines the B configuration files as described below. " "Command line options override the configuration file settings, though." msgstr "" #. type: =item -#: ../scripts/bts.pl:246 +#: ../scripts/bts.pl:249 msgid "B<-o>, B<--offline>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:248 +#: ../scripts/bts.pl:251 msgid "" "Make B use cached bugs for the B and B commands, if a cache " "is available for the requested data. See the B command, below for " @@ -431,46 +431,46 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:252 +#: ../scripts/bts.pl:255 msgid "B<--online>, B<--no-offline>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:254 +#: ../scripts/bts.pl:257 msgid "" "Opposite of B<--offline>; overrides any configuration file directive to work " "offline." msgstr "" #. type: =item -#: ../scripts/bts.pl:257 +#: ../scripts/bts.pl:260 msgid "B<-n>, B<--no-action>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:259 +#: ../scripts/bts.pl:262 msgid "Do not send emails but print them to standard output." msgstr "不发送邮件而是打印到标准输出" #. type: =item -#: ../scripts/bts.pl:261 +#: ../scripts/bts.pl:264 msgid "B<--cache>, B<--no-cache>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:263 +#: ../scripts/bts.pl:266 msgid "" "Should we attempt to cache new versions of BTS pages when performing " "B/B commands? Default is to cache." msgstr "" #. type: =item -#: ../scripts/bts.pl:266 +#: ../scripts/bts.pl:269 msgid "B<--cache-mode=>{B|B|B}" msgstr "" #. type: textblock -#: ../scripts/bts.pl:268 +#: ../scripts/bts.pl:271 msgid "" "When running a B command, should we only mirror the basic bug " "(B), or should we also mirror the mbox version (B), or should we " @@ -479,36 +479,36 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:274 +#: ../scripts/bts.pl:277 msgid "B<--cache-delay=>I" msgstr "" #. type: textblock -#: ../scripts/bts.pl:276 +#: ../scripts/bts.pl:279 msgid "" "Time in seconds to delay between each download, to avoid hammering the BTS " "web server. Default is 5 seconds." msgstr "" #. type: =item -#: ../scripts/bts.pl:279 +#: ../scripts/bts.pl:282 msgid "B<--mbox>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:281 +#: ../scripts/bts.pl:284 msgid "" "Open a mail reader to read the mbox corresponding to a given bug number for " "B and B commands." msgstr "" #. type: =item -#: ../scripts/bts.pl:284 +#: ../scripts/bts.pl:287 msgid "B<--mailreader=>I" msgstr "" #. type: textblock -#: ../scripts/bts.pl:286 +#: ../scripts/bts.pl:289 msgid "" "Specify the command to read the mbox. Must contain a \"B<%s>\" string " "(unquoted!), which will be replaced by the name of the mbox file. The " @@ -518,7 +518,7 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:292 +#: ../scripts/bts.pl:295 msgid "B<--cc-addr=>I" msgstr "" @@ -530,12 +530,12 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:297 +#: ../scripts/bts.pl:300 msgid "B<--use-default-cc>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:299 +#: ../scripts/bts.pl:302 msgid "" "Add the addresses specified in the configuration file option " "B to the list specified using B<--cc-addr>. This is the " @@ -543,23 +543,23 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:303 +#: ../scripts/bts.pl:306 msgid "B<--no-use-default-cc>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:305 +#: ../scripts/bts.pl:308 msgid "" "Do not add addresses specified in B to the carbon copy list." msgstr "" #. type: =item -#: ../scripts/bts.pl:308 ../scripts/mass-bug.pl:103 +#: ../scripts/bts.pl:311 ../scripts/mass-bug.pl:103 msgid "B<--sendmail=>I" msgstr "" #. type: textblock -#: ../scripts/bts.pl:310 +#: ../scripts/bts.pl:313 msgid "" "Specify the B command. The command will be split on white space " "and will not be passed to a shell. Default is F. The " @@ -570,50 +570,50 @@ msgstr "" #. type: TP -#: ../scripts/bts.pl:317 ../scripts/nmudiff.1:31 +#: ../scripts/bts.pl:320 ../scripts/nmudiff.1:31 #, no-wrap msgid "B<--mutt>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:319 +#: ../scripts/bts.pl:322 msgid "" "Use B for sending of mails. Default is not to use B, except for " "some commands." msgstr "" #. type: textblock -#: ../scripts/bts.pl:322 +#: ../scripts/bts.pl:325 msgid "" "Note that one of B<$DEBEMAIL> or B<$EMAIL> must be set in the environment in " "order to use B to send emails." msgstr "" #. type: TP -#: ../scripts/bts.pl:325 ../scripts/nmudiff.1:36 +#: ../scripts/bts.pl:328 ../scripts/nmudiff.1:36 #, no-wrap msgid "B<--no-mutt>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:327 +#: ../scripts/bts.pl:330 msgid "Don't use B for sending of mails." msgstr "" #. type: =item -#: ../scripts/bts.pl:329 +#: ../scripts/bts.pl:332 msgid "B<--smtp-host=>I" msgstr "" #. type: textblock -#: ../scripts/bts.pl:331 +#: ../scripts/bts.pl:334 msgid "" "Specify an SMTP host. If given, B will send mail by talking directly " "to this SMTP host rather than by invoking a B command." msgstr "" #. type: textblock -#: ../scripts/bts.pl:334 +#: ../scripts/bts.pl:337 msgid "" "The host name may be followed by a colon (\":\") and a port number in order " "to use a port other than the default. It may also begin with \"ssmtp://\" " @@ -621,14 +621,14 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:338 +#: ../scripts/bts.pl:341 msgid "" "Note that one of B<$DEBEMAIL> or B<$EMAIL> must be set in the environment in " "order to use direct SMTP connections to send emails." msgstr "" #. type: textblock -#: ../scripts/bts.pl:341 +#: ../scripts/bts.pl:344 msgid "" "Note that when sending directly via an SMTP host, specifying addresses in B<-" "-cc-addr> or B that the SMTP host will not relay will cause " @@ -636,7 +636,7 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:345 +#: ../scripts/bts.pl:348 msgid "" "Note also that the use of the B command may, when either B<--" "interactive> or B<--force-interactive> mode is enabled, lead to the " @@ -648,12 +648,12 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:352 +#: ../scripts/bts.pl:355 msgid "B<--smtp-username=>I, B<--smtp-password=>I" msgstr "" #. type: textblock -#: ../scripts/bts.pl:354 +#: ../scripts/bts.pl:357 msgid "" "Specify the credentials to use when connecting to the SMTP server specified " "by B<--smtp-host>. If the server does not require authentication then these " @@ -661,48 +661,48 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:358 +#: ../scripts/bts.pl:361 msgid "" "If a username is specified but not a password, B will prompt for the " "password before sending the mail." msgstr "" #. type: =item -#: ../scripts/bts.pl:361 +#: ../scripts/bts.pl:364 msgid "B<--smtp-helo=>I" msgstr "" #. type: textblock -#: ../scripts/bts.pl:363 +#: ../scripts/bts.pl:366 msgid "" "Specify the name to use in the I command when connecting to the SMTP " "server; defaults to the contents of the file F, if it exists." msgstr "" #. type: textblock -#: ../scripts/bts.pl:367 +#: ../scripts/bts.pl:370 msgid "" "Note that some SMTP servers may reject the use of a I which either " "does not resolve or does not appear to belong to the host using it." msgstr "" #. type: =item -#: ../scripts/bts.pl:370 +#: ../scripts/bts.pl:373 msgid "B<--bts-server>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:372 +#: ../scripts/bts.pl:375 msgid "Use a debbugs server other than bugs.debian.org." msgstr "" #. type: =item -#: ../scripts/bts.pl:374 +#: ../scripts/bts.pl:377 msgid "B<-f>, B<--force-refresh>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:376 +#: ../scripts/bts.pl:379 msgid "" "Download a bug report again, even if it does not appear to have changed " "since the last B command. Useful if a B<--cache-mode=full> is " @@ -711,116 +711,116 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:382 +#: ../scripts/bts.pl:385 msgid "B<--no-force-refresh>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:384 +#: ../scripts/bts.pl:387 msgid "Suppress any configuration file B<--force-refresh> option." msgstr "" #. type: =item -#: ../scripts/bts.pl:386 +#: ../scripts/bts.pl:389 msgid "B<--only-new>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:388 +#: ../scripts/bts.pl:391 msgid "" "Download only new bugs when caching. Do not check for updates in bugs we " "already have." msgstr "" #. type: =item -#: ../scripts/bts.pl:391 +#: ../scripts/bts.pl:394 msgid "B<--include-resolved>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:393 +#: ../scripts/bts.pl:396 msgid "" "When caching bug reports, include those that are marked as resolved. This " "is the default behaviour." msgstr "" #. type: =item -#: ../scripts/bts.pl:396 +#: ../scripts/bts.pl:399 msgid "B<--no-include-resolved>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:398 +#: ../scripts/bts.pl:401 msgid "" "Reverse the behaviour of the previous option. That is, do not cache bugs " "that are marked as resolved." msgstr "" #. type: =item -#: ../scripts/bts.pl:401 +#: ../scripts/bts.pl:404 msgid "B<--no-ack>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:403 +#: ../scripts/bts.pl:406 msgid "" "Suppress acknowledgment mails from the BTS. Note that this will only affect " "the copies of messages CCed to bugs, not those sent to the control bot." msgstr "" #. type: =item -#: ../scripts/bts.pl:407 +#: ../scripts/bts.pl:410 msgid "B<--ack>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:409 +#: ../scripts/bts.pl:412 msgid "" "Do not suppress acknowledgement mails. This is the default behaviour." msgstr "" #. type: =item -#: ../scripts/bts.pl:411 ../scripts/tagpending.pl:135 +#: ../scripts/bts.pl:414 ../scripts/tagpending.pl:135 msgid "B<-i>, B<--interactive>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:413 +#: ../scripts/bts.pl:416 msgid "" "Before sending an e-mail to the control bot, display the content and allow " "it to be edited, or the sending cancelled." msgstr "" #. type: =item -#: ../scripts/bts.pl:416 +#: ../scripts/bts.pl:419 msgid "B<--force-interactive>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:418 +#: ../scripts/bts.pl:421 msgid "" "Similar to B<--interactive>, with the exception that an editor is spawned " "before prompting for confirmation of the message to be sent." msgstr "" #. type: =item -#: ../scripts/bts.pl:421 +#: ../scripts/bts.pl:424 msgid "B<--no-interactive>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:423 +#: ../scripts/bts.pl:426 msgid "" "Send control e-mails without confirmation. This is the default behaviour." msgstr "" #. type: =item -#: ../scripts/bts.pl:425 ../scripts/dget.pl:554 +#: ../scripts/bts.pl:428 ../scripts/dget.pl:576 msgid "B<-q>, B<--quiet>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:427 +#: ../scripts/bts.pl:430 msgid "" "When running B, only display information about newly cached " "pages, not messages saying already cached. If this option is specified " @@ -828,89 +828,89 @@ msgstr "" #. type: TP -#: ../scripts/bts.pl:431 ../scripts/cvs-debrelease.1:57 ../scripts/cvs-debuild.1:38 ../scripts/debc.1:85 ../scripts/debchange.1:377 ../scripts/debclean.1:77 ../scripts/debdiff.1:151 ../scripts/debi.1:102 ../scripts/debrelease.1:95 ../scripts/debsign.1:96 ../scripts/debuild.1:221 ../scripts/dpkg-depcheck.1:92 ../scripts/dscverify.1:24 ../scripts/grep-excuses.1:14 ../scripts/licensecheck.pl:89 ../scripts/mass-bug.pl:112 ../scripts/nmudiff.1:69 ../scripts/rmadison.pl:281 ../scripts/uscan.1:444 ../scripts/uupdate.1:78 ../scripts/who-uploads.1:40 +#: ../scripts/bts.pl:434 ../scripts/cvs-debrelease.1:57 ../scripts/cvs-debuild.1:38 ../scripts/debc.1:85 ../scripts/debchange.1:377 ../scripts/debclean.1:77 ../scripts/debdiff.1:151 ../scripts/debi.1:102 ../scripts/debrelease.1:95 ../scripts/debsign.1:96 ../scripts/debuild.1:221 ../scripts/dpkg-depcheck.1:92 ../scripts/dscverify.1:24 ../scripts/grep-excuses.1:14 ../scripts/licensecheck.pl:89 ../scripts/mass-bug.pl:112 ../scripts/nmudiff.1:69 ../scripts/rmadison.pl:286 ../scripts/uscan.1:464 ../scripts/uupdate.1:78 ../scripts/who-uploads.1:40 #, no-wrap msgid "B<--no-conf>, B<--noconf>" msgstr "" #. type: Plain text -#: ../scripts/bts.pl:433 ../scripts/cvs-debrelease.1:61 ../scripts/debc.1:89 ../scripts/debchange.1:381 ../scripts/debclean.1:81 ../scripts/debdiff.1:155 ../scripts/debi.1:106 ../scripts/debrelease.1:99 ../scripts/debsign.1:100 ../scripts/debuild.1:225 ../scripts/dpkg-depcheck.1:96 ../scripts/dscverify.1:28 ../scripts/grep-excuses.1:18 ../scripts/mass-bug.pl:114 ../scripts/nmudiff.1:73 ../scripts/uscan.1:448 ../scripts/uupdate.1:82 ../scripts/who-uploads.1:44 +#: ../scripts/bts.pl:436 ../scripts/cvs-debrelease.1:61 ../scripts/debc.1:89 ../scripts/debchange.1:381 ../scripts/debclean.1:81 ../scripts/debdiff.1:155 ../scripts/debi.1:106 ../scripts/debrelease.1:99 ../scripts/debsign.1:100 ../scripts/debuild.1:225 ../scripts/dpkg-depcheck.1:96 ../scripts/dscverify.1:28 ../scripts/grep-excuses.1:18 ../scripts/mass-bug.pl:114 ../scripts/nmudiff.1:73 ../scripts/uscan.1:468 ../scripts/uupdate.1:82 ../scripts/who-uploads.1:44 msgid "" "Do not read any configuration files. This can only be used as the first " "option given on the command-line." msgstr "" #. type: =head1 -#: ../scripts/bts.pl:787 ../scripts/chdist.pl:55 +#: ../scripts/bts.pl:790 ../scripts/chdist.pl:55 msgid "COMMANDS" msgstr "" #. type: textblock -#: ../scripts/bts.pl:789 +#: ../scripts/bts.pl:792 msgid "" "For full details about the commands, see the BTS documentation. " "L" msgstr "" #. type: =item -#: ../scripts/bts.pl:794 +#: ../scripts/bts.pl:797 msgid "" "B [I] [I | I | I | B<:> ] " "[IB<=>I ...]" msgstr "" #. type: =item -#: ../scripts/bts.pl:796 +#: ../scripts/bts.pl:799 msgid "" "B [I] [BI | BI] " "[IB<=>I ...]" msgstr "" #. type: =item -#: ../scripts/bts.pl:798 +#: ../scripts/bts.pl:801 msgid "" "B [I] [BI | BI ] [IB<=>I " "...]" msgstr "" #. type: =item -#: ../scripts/bts.pl:800 +#: ../scripts/bts.pl:803 msgid "B [B | B... | B]" msgstr "" #. type: textblock -#: ../scripts/bts.pl:802 +#: ../scripts/bts.pl:805 msgid "This is a synonym for B." msgstr "" #. type: =item -#: ../scripts/bts.pl:810 +#: ../scripts/bts.pl:813 msgid "" "B [I] [I | I | I | B<:> ] " "[IB<=>I ...]" msgstr "" #. type: =item -#: ../scripts/bts.pl:812 +#: ../scripts/bts.pl:815 msgid "" "B [I] [BI | BI] " "[IB<=>I ...]" msgstr "" #. type: =item -#: ../scripts/bts.pl:814 +#: ../scripts/bts.pl:817 msgid "" "B [I] [BI | BI ] [IB<=>I " "...]" msgstr "" #. type: =item -#: ../scripts/bts.pl:816 +#: ../scripts/bts.pl:819 msgid "B [B | B... | B]" msgstr "" #. type: textblock -#: ../scripts/bts.pl:818 +#: ../scripts/bts.pl:821 msgid "" "Display the page listing the requested bugs in a web browser using sensible-" "browser(1)." @@ -928,17 +928,17 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:828 +#: ../scripts/bts.pl:831 msgid "The meanings of the possible arguments are as follows:" msgstr "" #. type: =item -#: ../scripts/bts.pl:832 +#: ../scripts/bts.pl:835 msgid "(none)" msgstr "" #. type: textblock -#: ../scripts/bts.pl:834 +#: ../scripts/bts.pl:837 msgid "" "If nothing is specified, B will display your bugs, assuming that " "either B or B (examined in that order) is set to the " @@ -946,72 +946,72 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:838 +#: ../scripts/bts.pl:841 msgid "I" msgstr "" #. type: textblock -#: ../scripts/bts.pl:840 +#: ../scripts/bts.pl:843 msgid "Display bug number I." msgstr "" #. type: =item -#: ../scripts/bts.pl:842 +#: ../scripts/bts.pl:845 msgid "I" msgstr "" #. type: textblock -#: ../scripts/bts.pl:844 +#: ../scripts/bts.pl:847 msgid "Display the bugs for the package I." msgstr "" #. type: =item -#: ../scripts/bts.pl:846 +#: ../scripts/bts.pl:849 msgid "BI" msgstr "" #. type: textblock -#: ../scripts/bts.pl:848 +#: ../scripts/bts.pl:851 msgid "Display the bugs for the source package I." msgstr "" #. type: =item -#: ../scripts/bts.pl:850 +#: ../scripts/bts.pl:853 msgid "I" msgstr "" #. type: textblock -#: ../scripts/bts.pl:852 +#: ../scripts/bts.pl:855 msgid "Display the bugs for the maintainer email address I." msgstr "" #. type: =item -#: ../scripts/bts.pl:854 +#: ../scripts/bts.pl:857 msgid "BI" msgstr "" #. type: textblock -#: ../scripts/bts.pl:856 +#: ../scripts/bts.pl:859 msgid "Display the bugs for the submitter email address I." msgstr "" #. type: =item -#: ../scripts/bts.pl:858 +#: ../scripts/bts.pl:861 msgid "BI" msgstr "" #. type: textblock -#: ../scripts/bts.pl:860 +#: ../scripts/bts.pl:863 msgid "Display the bugs which are tagged with I." msgstr "" #. type: =item -#: ../scripts/bts.pl:862 +#: ../scripts/bts.pl:865 msgid "BI" msgstr "" #. type: textblock -#: ../scripts/bts.pl:864 +#: ../scripts/bts.pl:867 msgid "" "Display the bugs which are tagged with usertag I. See the BTS " "documentation for more information on usertags. This will require the use " @@ -1019,12 +1019,12 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:868 +#: ../scripts/bts.pl:871 msgid "B<:>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:870 +#: ../scripts/bts.pl:873 msgid "" "Details of the bug tracking system itself, along with a bug-request page " "with more options than this script, can be found on http://bugs.debian.org/. " @@ -1032,12 +1032,12 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:875 +#: ../scripts/bts.pl:878 msgid "B, B" msgstr "" #. type: textblock -#: ../scripts/bts.pl:877 +#: ../scripts/bts.pl:880 msgid "" "Display the front page of the release-critical pages on the BTS. This is a " "synonym for http://bugs.debian.org/release-critical/index.html. It is also " @@ -1046,7 +1046,7 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:884 +#: ../scripts/bts.pl:887 msgid "" "After the argument specifying what to display, you can optionally specify " "options to use to format the page or change what it displayed. These are " @@ -1071,14 +1071,14 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:902 +#: ../scripts/bts.pl:905 msgid "" "Any other B commands following this on the command line will be " "executed after the browser has been exited." msgstr "" #. type: textblock -#: ../scripts/bts.pl:905 +#: ../scripts/bts.pl:908 msgid "" "The desired browser can be specified and configured by setting the " "B environment variable. The conventions follow those defined by " @@ -1087,7 +1087,7 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:910 +#: ../scripts/bts.pl:913 msgid "" "The value of B may consist of a colon-separated series of browser " "command parts. These should be tried in order until one succeeds. Each " @@ -1098,7 +1098,7 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:918 +#: ../scripts/bts.pl:921 msgid "" "Rationale: We need to be able to specify multiple browser commands so " "programs obeying this convention can do the right thing in either X or " @@ -1110,161 +1110,161 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:926 +#: ../scripts/bts.pl:929 msgid "For example, on most Linux systems a good thing to do would be:" msgstr "" #. type: textblock -#: ../scripts/bts.pl:928 +#: ../scripts/bts.pl:931 msgid "BROWSER='mozilla -raise -remote \"openURL(%s,new-window)\":links'" msgstr "" #. type: =item -#: ../scripts/bts.pl:1003 +#: ../scripts/bts.pl:1006 msgid "B