Binary files /tmp/tmpCInAlZ/0OHu9z4YX4/language-pack-zh-hans-base-20.04+20200709/data/extra.tar and /tmp/tmpCInAlZ/0_eRHhkE3f/language-pack-zh-hans-base-20.04+20210121/data/extra.tar differ diff -Nru language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/aa-enabled.po language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/aa-enabled.po --- language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/aa-enabled.po 2020-07-10 08:58:53.000000000 +0000 +++ language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/aa-enabled.po 2021-01-22 11:31:21.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: 2020-07-09 20:16+0000\n" -"X-Generator: Launchpad (build 4809fcb62f445aaa3ae919f7f6c3cc7d156ea57a)\n" +"X-Launchpad-Export-Date: 2021-01-21 21:27+0000\n" +"X-Generator: Launchpad (build 2d1d5e352f0d063d660df2300e31f66bed027fa5)\n" #: ../aa_enabled.c:26 #, c-format diff -Nru language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/acl.po language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/acl.po --- language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/acl.po 2020-07-10 08:58:52.000000000 +0000 +++ language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/acl.po 2021-01-22 11:31:20.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: 2020-07-09 17:33+0000\n" -"X-Generator: Launchpad (build 4809fcb62f445aaa3ae919f7f6c3cc7d156ea57a)\n" +"X-Launchpad-Export-Date: 2021-01-21 18:33+0000\n" +"X-Generator: Launchpad (build 2d1d5e352f0d063d660df2300e31f66bed027fa5)\n" #: libacl/perm_copy_fd.c:124 libacl/perm_copy_fd.c:136 #: libacl/perm_copy_fd.c:198 libacl/perm_copy_file.c:124 diff -Nru language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/adduser.po language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/adduser.po --- language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/adduser.po 2020-07-10 08:58:46.000000000 +0000 +++ language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/adduser.po 2021-01-22 11:31:13.000000000 +0000 @@ -18,8 +18,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2020-07-09 16:49+0000\n" -"X-Generator: Launchpad (build 4809fcb62f445aaa3ae919f7f6c3cc7d156ea57a)\n" +"X-Launchpad-Export-Date: 2021-01-21 17:46+0000\n" +"X-Generator: Launchpad (build 2d1d5e352f0d063d660df2300e31f66bed027fa5)\n" "Language: zh_CN\n" #. everyone can issue "--help" and "--version", but only root can go on @@ -90,12 +90,12 @@ msgid "Adding group `%s' (GID %d) ...\n" msgstr "正在添加组\"%s\" (GID %d)...\n" -#: ../adduser:318 ../adduser:351 ../adduser:376 ../deluser:387 ../deluser:424 +#: ../adduser:318 ../adduser:351 ../adduser:380 ../deluser:387 ../deluser:424 #: ../deluser:461 msgid "Done.\n" msgstr "完成。\n" -#: ../adduser:327 ../adduser:850 +#: ../adduser:327 ../adduser:860 #, perl-format msgid "The group `%s' already exists.\n" msgstr "\"%s\"组已经存在。\n" @@ -110,232 +110,232 @@ msgid "The user `%s' does not exist.\n" msgstr "用户\"%s\"不存在。\n" -#: ../adduser:362 ../adduser:630 ../adduser:857 ../deluser:395 ../deluser:436 +#: ../adduser:362 ../adduser:634 ../adduser:867 ../deluser:395 ../deluser:436 #, perl-format msgid "The group `%s' does not exist.\n" msgstr "\"%s\"组不存在。\n" -#: ../adduser:365 ../adduser:634 +#: ../adduser:365 ../adduser:638 #, perl-format msgid "The user `%s' is already a member of `%s'.\n" msgstr "用户\"%s\"已经属于\"%s\"组。\n" -#: ../adduser:370 ../adduser:640 +#: ../adduser:370 ../adduser:644 #, perl-format msgid "Adding user `%s' to group `%s' ...\n" msgstr "正在添加用户\"%s\"到\"%s\"组...\n" -#: ../adduser:390 +#: ../adduser:394 #, perl-format msgid "The system user `%s' already exists. Exiting.\n" msgstr "系统用户\"%s\"已经存在，退出。\n" -#: ../adduser:393 +#: ../adduser:397 #, perl-format msgid "The user `%s' already exists, but is not a system user. Exiting.\n" msgstr "" -#: ../adduser:397 +#: ../adduser:401 #, perl-format msgid "The user `%s' already exists with a different UID. Exiting.\n" msgstr "用户\"%s\"已经存在，但是 UID 不同，退出。\n" -#: ../adduser:411 +#: ../adduser:415 #, perl-format msgid "" "No UID/GID pair is available in the range %d-%d (FIRST_SYS_UID - " "LAST_SYS_UID).\n" msgstr "范围 %d-%d (FIRST_SYS_UID - LAST_SYS_UID)里没有可用的 UID/GID。\n" -#: ../adduser:412 ../adduser:424 ../adduser:513 ../adduser:525 +#: ../adduser:416 ../adduser:428 ../adduser:517 ../adduser:529 #, perl-format msgid "The user `%s' was not created.\n" msgstr "用户\"%s\"未创建成功。\n" -#: ../adduser:423 +#: ../adduser:427 #, perl-format msgid "" "No UID is available in the range %d-%d (FIRST_SYS_UID - LAST_SYS_UID).\n" msgstr "范围 %d-%d (FIRST_SYS_UID - LAST_SYS_UID)里没有可用的 UID。\n" -#: ../adduser:428 ../adduser:434 ../adduser:529 ../adduser:535 +#: ../adduser:432 ../adduser:438 ../adduser:533 ../adduser:539 msgid "Internal error" msgstr "内部错误" -#: ../adduser:436 +#: ../adduser:440 #, perl-format msgid "Adding system user `%s' (UID %d) ...\n" msgstr "正在添加系统用户\"%s\" (UID %d)...\n" -#: ../adduser:441 +#: ../adduser:445 #, perl-format msgid "Adding new group `%s' (GID %d) ...\n" msgstr "正在添加新组\"%s\" (GID %d)...\n" -#: ../adduser:452 +#: ../adduser:456 #, perl-format msgid "Adding new user `%s' (UID %d) with group `%s' ...\n" msgstr "正在将新用户\"%s\" (UID %d)添加到组\"%s\"...\n" -#: ../adduser:475 ../AdduserCommon.pm:162 +#: ../adduser:479 ../AdduserCommon.pm:162 #, perl-format msgid "`%s' returned error code %d. Exiting.\n" msgstr "\"%s\"返回错误代码 %d，退出。\n" -#: ../adduser:477 ../AdduserCommon.pm:164 +#: ../adduser:481 ../AdduserCommon.pm:164 #, perl-format msgid "`%s' exited from signal %d. Exiting.\n" msgstr "\"%s\"从信号 %d 中退出，退出。\n" -#: ../adduser:479 +#: ../adduser:483 #, perl-format msgid "" "%s failed with return code 15, shadow not enabled, password aging cannot be " "set. Continuing.\n" msgstr "%s 出错，返回代码 15，未启用影子(shadow)，无法设定密码时效，继续。\n" -#: ../adduser:504 +#: ../adduser:508 #, perl-format msgid "Adding user `%s' ...\n" msgstr "正在添加用户\"%s\"...\n" -#: ../adduser:512 +#: ../adduser:516 #, perl-format msgid "" "No UID/GID pair is available in the range %d-%d (FIRST_UID - LAST_UID).\n" msgstr "范围 %d-%d (FIRST_UID - LAST_UID) 里没有可用的 UID/GID。\n" -#: ../adduser:524 +#: ../adduser:528 #, perl-format msgid "No UID is available in the range %d-%d (FIRST_UID - LAST_UID).\n" msgstr "范围 %d-%d (FIRST_UID - LAST_UID) 里没有可用的 UID。\n" -#: ../adduser:540 +#: ../adduser:544 #, perl-format msgid "Adding new group `%s' (%d) ...\n" msgstr "正在添加新组\"%s\" (%d)...\n" -#: ../adduser:551 +#: ../adduser:555 #, perl-format msgid "Adding new user `%s' (%d) with group `%s' ...\n" msgstr "正在添加新用户\"%s\" (%d) 到组\"%s\"...\n" #. hm, error, should we break now? -#: ../adduser:580 +#: ../adduser:584 msgid "Permission denied\n" msgstr "权限不足\n" -#: ../adduser:581 +#: ../adduser:585 msgid "invalid combination of options\n" msgstr "选项组合无效\n" -#: ../adduser:582 +#: ../adduser:586 msgid "unexpected failure, nothing done\n" msgstr "未预料的错误，操作取消\n" -#: ../adduser:583 +#: ../adduser:587 msgid "unexpected failure, passwd file missing\n" msgstr "未预料的错误，passwd 文件缺失\n" -#: ../adduser:584 +#: ../adduser:588 msgid "passwd file busy, try again\n" msgstr "passwd 文件忙，请再试一次\n" -#: ../adduser:585 +#: ../adduser:589 msgid "invalid argument to option\n" msgstr "无效的参数\n" #. Translators: [y/N] has to be replaced by values defined in your #. locale. You can see by running "locale noexpr" which regular #. expression will be checked to find positive answer. -#: ../adduser:590 +#: ../adduser:594 msgid "Try again? [y/N] " msgstr "再试一次？[y/N] " #. Translators: [y/N] has to be replaced by values defined in your #. locale. You can see by running "locale yesexpr" which regular #. expression will be checked to find positive answer. -#: ../adduser:620 +#: ../adduser:624 msgid "Is the information correct? [Y/n] " msgstr "这些信息是否正确？ [Y/n] " -#: ../adduser:627 +#: ../adduser:631 #, perl-format msgid "Adding new user `%s' to extra groups ...\n" msgstr "正在添加用户\"%s\"到附加组...\n" -#: ../adduser:653 +#: ../adduser:663 #, perl-format msgid "Setting quota for user `%s' to values of user `%s' ...\n" msgstr "设定磁盘配额，用户\"%s\"的配额与用户\"%s\"的相同 ...\n" -#: ../adduser:690 +#: ../adduser:700 #, perl-format msgid "Not creating home directory `%s'.\n" msgstr "无法创建主目录\"%s\"。\n" -#: ../adduser:693 +#: ../adduser:703 #, perl-format msgid "The home directory `%s' already exists. Not copying from `%s'.\n" msgstr "主目录\"%s\"已经存在。没有从\"%s\"复制文件。\n" -#: ../adduser:699 +#: ../adduser:709 #, perl-format msgid "" "Warning: The home directory `%s' does not belong to the user you are " "currently creating.\n" msgstr "警告：主目录 %s 不属于您当前创建的用户。\n" -#: ../adduser:704 +#: ../adduser:714 #, perl-format msgid "Creating home directory `%s' ...\n" msgstr "创建主目录\"%s\"...\n" -#: ../adduser:706 +#: ../adduser:716 #, perl-format msgid "Couldn't create home directory `%s': %s.\n" msgstr "无法创建主目录\"%s\"：%s。\n" -#: ../adduser:724 +#: ../adduser:734 msgid "Setting up encryption ...\n" msgstr "加密设置 ...\n" -#: ../adduser:729 +#: ../adduser:739 #, perl-format msgid "Copying files from `%s' ...\n" msgstr "正在从\"%s\"复制文件...\n" -#: ../adduser:731 +#: ../adduser:741 #, perl-format msgid "fork for `find' failed: %s\n" msgstr "创建\"find\"子进程失败：%s\n" -#: ../adduser:840 +#: ../adduser:850 #, perl-format msgid "The user `%s' already exists, and is not a system user.\n" msgstr "用户\"%s\"已存在，但不是系统用户。\n" -#: ../adduser:842 +#: ../adduser:852 #, perl-format msgid "The user `%s' already exists.\n" msgstr "用户\"%s\"已经存在。\n" -#: ../adduser:845 +#: ../adduser:855 #, perl-format msgid "The UID %d is already in use.\n" msgstr "UID %d 已经被使用。\n" -#: ../adduser:852 +#: ../adduser:862 #, perl-format msgid "The GID %d is already in use.\n" msgstr "GID %d 已经被使用。\n" -#: ../adduser:859 +#: ../adduser:869 #, perl-format msgid "The GID %d does not exist.\n" msgstr "GID %d 不存在。\n" -#: ../adduser:906 +#: ../adduser:916 #, perl-format msgid "" "Cannot deal with %s.\n" @@ -344,7 +344,7 @@ "无法处理 %s。\n" "它不是目录、文件或链接。\n" -#: ../adduser:927 +#: ../adduser:937 #, perl-format msgid "" "%s: To avoid problems, the username should consist only of\n" @@ -357,11 +357,11 @@ "号、＠和横线，并且不以横线开头(IEEE Std 1003.1-2001 对此有\n" "所定义)。为了与 Samba 机器帐户的兼容性，支持以 $ 结尾的用户名\n" -#: ../adduser:937 +#: ../adduser:947 msgid "Allowing use of questionable username.\n" msgstr "允许使用可疑的用户名。\n" -#: ../adduser:941 +#: ../adduser:951 #, perl-format msgid "" "%s: Please enter a username matching the regular expression configured\n" @@ -372,44 +372,44 @@ "%s: 请输入匹配 NAME_REGEX[_SYSTEM] 配置选项配置的正则表达式的用户名。\n" "使用 ｀--force-badname‘ 选项可以放松检查或者重新配置 NAME_REGEX。\n" -#: ../adduser:957 +#: ../adduser:967 #, perl-format msgid "Selecting UID from range %d to %d ...\n" msgstr "从 %d 到 %d 中选择 UID...\n" -#: ../adduser:975 +#: ../adduser:985 #, perl-format msgid "Selecting GID from range %d to %d ...\n" msgstr "从 %d 到 %d 中选择 GID...\n" -#: ../adduser:1033 +#: ../adduser:1043 #, perl-format msgid "Stopped: %s\n" msgstr "停止：%s\n" -#: ../adduser:1035 +#: ../adduser:1045 #, perl-format msgid "Removing directory `%s' ...\n" msgstr "正在删除目录'%s'...\n" -#: ../adduser:1039 ../deluser:375 +#: ../adduser:1049 ../deluser:375 #, perl-format msgid "Removing user `%s' ...\n" msgstr "正在删除用户 '%s'...\n" -#: ../adduser:1043 ../deluser:420 +#: ../adduser:1053 ../deluser:420 #, perl-format msgid "Removing group `%s' ...\n" msgstr "正在删除组 '%s'...\n" #. Translators: the variable %s is INT, QUIT, or HUP. #. Please do not insert a space character between SIG and %s. -#: ../adduser:1054 +#: ../adduser:1064 #, perl-format msgid "Caught a SIG%s.\n" msgstr "捕获 SIG%s.\n" -#: ../adduser:1059 +#: ../adduser:1069 #, perl-format msgid "" "adduser version %s\n" @@ -418,7 +418,7 @@ "adduser 版本 %s\n" "\n" -#: ../adduser:1060 +#: ../adduser:1070 msgid "" "Adds a user or group to the system.\n" " \n" @@ -434,7 +434,7 @@ " Ted Hajek \n" "\n" -#: ../adduser:1067 ../deluser:483 +#: ../adduser:1077 ../deluser:483 msgid "" "This program is free software; you can redistribute it and/or modify\n" "it under the terms of the GNU General Public License as published by\n" @@ -451,7 +451,7 @@ "本程序期望其会有用，但没有任何的保证；甚至不对任何商业能力或其特殊目的的适用性有隐含的保证。关于GNU公共条款详细信息请参见/usr/share/comm" "on-licenses/GPL。\n" -#: ../adduser:1081 +#: ../adduser:1091 msgid "" "adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID]\n" "[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid ID]\n" diff -Nru language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/alsa-utils.po language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/alsa-utils.po --- language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/alsa-utils.po 2020-07-10 08:58:50.000000000 +0000 +++ language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/alsa-utils.po 2021-01-22 11:31:17.000000000 +0000 @@ -14,26 +14,26 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2020-07-09 16:49+0000\n" -"X-Generator: Launchpad (build 4809fcb62f445aaa3ae919f7f6c3cc7d156ea57a)\n" +"X-Launchpad-Export-Date: 2021-01-21 17:46+0000\n" +"X-Generator: Launchpad (build 2d1d5e352f0d063d660df2300e31f66bed027fa5)\n" -#: alsamixer/card_select.c:126 alsamixer/device_name.c:126 +#: alsamixer/card_select.c:77 alsamixer/device_name.c:127 msgid "Sound Card" msgstr "" -#: alsamixer/card_select.c:181 +#: alsamixer/card_select.c:115 msgid "(default)" msgstr "" -#: alsamixer/card_select.c:191 +#: alsamixer/card_select.c:125 msgid "cannot enumerate sound cards" msgstr "" -#: alsamixer/card_select.c:215 +#: alsamixer/card_select.c:147 msgid "enter device name..." msgstr "" -#: alsamixer/cli.c:40 +#: alsamixer/cli.c:43 msgid "Usage: alsamixer [options]" msgstr "" @@ -46,29 +46,29 @@ " -V, --view=MODE starting view mode: playback/capture/all" msgstr "" -#: alsamixer/cli.c:46 +#: alsamixer/cli.c:53 msgid "" "Debugging options:\n" " -g, --no-color toggle using of colors\n" " -a, --abstraction=NAME mixer abstraction level: none/basic" msgstr "" -#: alsamixer/cli.c:77 +#: alsamixer/cli.c:88 #, c-format msgid "invalid card index: %s\n" msgstr "" -#: alsamixer/cli.c:103 +#: alsamixer/cli.c:126 #, c-format msgid "unknown abstraction level: %s\n" msgstr "" -#: alsamixer/cli.c:108 +#: alsamixer/cli.c:131 #, c-format msgid "unknown option: %c\n" msgstr "" -#: alsamixer/cli.c:110 +#: alsamixer/cli.c:133 msgid "try `alsamixer --help' for more information\n" msgstr "" @@ -81,138 +81,138 @@ msgid "%s: %s\n" msgstr "" -#: alsamixer/mixer_display.c:98 +#: alsamixer/mixer_display.c:99 msgid "Card:" msgstr "" -#: alsamixer/mixer_display.c:99 +#: alsamixer/mixer_display.c:100 msgid "Chip:" msgstr "" -#: alsamixer/mixer_display.c:100 +#: alsamixer/mixer_display.c:101 msgid "View:" msgstr "" -#: alsamixer/mixer_display.c:101 +#: alsamixer/mixer_display.c:102 msgid "Item:" msgstr "" -#: alsamixer/mixer_display.c:104 +#: alsamixer/mixer_display.c:105 msgid "F1: Help" msgstr "" -#: alsamixer/mixer_display.c:105 +#: alsamixer/mixer_display.c:106 msgid "F2: System information" msgstr "" -#: alsamixer/mixer_display.c:106 +#: alsamixer/mixer_display.c:107 msgid "F6: Select sound card" msgstr "" -#: alsamixer/mixer_display.c:107 +#: alsamixer/mixer_display.c:108 msgid "Esc: Exit" msgstr "" -#: alsamixer/mixer_display.c:174 +#: alsamixer/mixer_display.c:179 msgid "(unplugged)" msgstr "" -#: alsamixer/mixer_display.c:192 +#: alsamixer/mixer_display.c:197 msgid "Playback" msgstr "" -#: alsamixer/mixer_display.c:193 +#: alsamixer/mixer_display.c:198 msgid "Capture" msgstr "" -#: alsamixer/mixer_display.c:194 +#: alsamixer/mixer_display.c:199 msgid "All" msgstr "" -#: alsamixer/mixer_display.c:234 +#: alsamixer/mixer_display.c:240 msgid "mute" msgstr "" -#: alsamixer/mixer_display.c:275 alsamixer/mixer_display.c:285 +#: alsamixer/mixer_display.c:281 alsamixer/mixer_display.c:291 msgid "dB gain:" msgstr "" -#: alsamixer/mixer_display.c:285 +#: alsamixer/mixer_display.c:291 #, c-format msgid " [%s %s, %s]" msgstr "" -#: alsamixer/mixer_display.c:294 alsamixer/mixer_display.c:300 -#: alsamixer/mixer_display.c:306 alsamixer/mixer_display.c:312 +#: alsamixer/mixer_display.c:300 alsamixer/mixer_display.c:306 +#: alsamixer/mixer_display.c:312 alsamixer/mixer_display.c:318 msgid "Off" msgstr "" -#: alsamixer/mixer_display.c:300 alsamixer/mixer_display.c:312 +#: alsamixer/mixer_display.c:306 alsamixer/mixer_display.c:318 msgid "On" msgstr "" -#: alsamixer/mixer_display.c:363 +#: alsamixer/mixer_display.c:370 msgid "The sound device was unplugged." msgstr "" -#: alsamixer/mixer_display.c:364 +#: alsamixer/mixer_display.c:371 msgid "Press F6 to select another sound card." msgstr "" -#: alsamixer/mixer_display.c:379 +#: alsamixer/mixer_display.c:386 msgid "This sound device does not have any playback controls." msgstr "" -#: alsamixer/mixer_display.c:381 +#: alsamixer/mixer_display.c:388 msgid "This sound device does not have any capture controls." msgstr "" -#: alsamixer/mixer_display.c:383 +#: alsamixer/mixer_display.c:390 msgid "This sound device does not have any controls." msgstr "" #. TRANSLATORS: playback on; one character -#: alsamixer/mixer_display.c:516 alsamixer/mixer_display.c:521 +#: alsamixer/mixer_display.c:523 alsamixer/mixer_display.c:528 msgid "O" msgstr "" #. TRANSLATORS: playback muted; one character -#: alsamixer/mixer_display.c:518 alsamixer/mixer_display.c:522 +#: alsamixer/mixer_display.c:525 alsamixer/mixer_display.c:529 msgid "M" msgstr "" #. TRANSLATORS: "left"; no more than two characters -#: alsamixer/mixer_display.c:536 +#: alsamixer/mixer_display.c:545 msgid "L" msgstr "" #. TRANSLATORS: "right"; no more than two characters -#: alsamixer/mixer_display.c:540 +#: alsamixer/mixer_display.c:551 msgid "R" msgstr "" #. TRANSLATORS: no more than eight characters -#: alsamixer/mixer_display.c:542 +#: alsamixer/mixer_display.c:555 msgid "CAPTURE" msgstr "" -#: alsamixer/mixer_display.c:592 +#: alsamixer/mixer_display.c:611 msgid "Front" msgstr "" -#: alsamixer/mixer_display.c:595 +#: alsamixer/mixer_display.c:614 msgid "Rear" msgstr "" -#: alsamixer/mixer_display.c:598 speaker-test/speaker-test.c:124 +#: alsamixer/mixer_display.c:617 speaker-test/speaker-test.c:124 msgid "Center" msgstr "中间" -#: alsamixer/mixer_display.c:601 +#: alsamixer/mixer_display.c:620 msgid "Woofer" msgstr "" -#: alsamixer/mixer_display.c:604 +#: alsamixer/mixer_display.c:623 msgid "Side" msgstr "" @@ -344,11 +344,11 @@ msgid "Help" msgstr "" -#: alsamixer/proc_files.c:103 +#: alsamixer/proc_files.c:56 msgid "Select File" msgstr "" -#: alsamixer/textbox.c:52 alsamixer/textbox.c:66 +#: alsamixer/textbox.c:51 alsamixer/textbox.c:65 msgid "Error" msgstr "" @@ -611,7 +611,7 @@ msgstr "未设置块错误： %s" #: aplay/aplay.c:852 aplay/aplay.c:976 aplay/aplay.c:1266 aplay/aplay.c:1466 -#: aplay/aplay.c:1989 aplay/aplay.c:2019 +#: aplay/aplay.c:1986 aplay/aplay.c:2016 msgid "not enough memory" msgstr "記憶體不足" @@ -681,7 +681,7 @@ msgid "Warning: format is changed to S16_BE\n" msgstr "警告：格式已變更至 S16_BE\n" -#: aplay/aplay.c:1214 aplay/aplay.c:2304 aplay/aplay.c:2311 aplay/aplay.c:2836 +#: aplay/aplay.c:1214 aplay/aplay.c:2307 aplay/aplay.c:2314 aplay/aplay.c:2839 msgid "read error" msgstr "讀取錯誤" @@ -861,129 +861,129 @@ msgid " !clip " msgstr " !clip " -#: aplay/aplay.c:1865 +#: aplay/aplay.c:1862 #, c-format msgid "Unsupported bit size %d.\n" msgstr "不支持的比特大小%d。\n" -#: aplay/aplay.c:1899 +#: aplay/aplay.c:1896 #, c-format msgid "Max peak (%li samples): 0x%08x " msgstr "最大峰值（%li 样本）：0x%08x " -#: aplay/aplay.c:1933 +#: aplay/aplay.c:1930 #, c-format msgid "" "Suspicious buffer position (%li total): avail = %li, delay = %li, buffer = " "%li\n" msgstr "可疑的缓冲位置（总共 %li）：作用=%li，延迟=%li，缓冲=%li\n" -#: aplay/aplay.c:2061 +#: aplay/aplay.c:2058 #, c-format msgid "write error: %s" msgstr "写入错误：%s" -#: aplay/aplay.c:2109 +#: aplay/aplay.c:2106 #, c-format msgid "writev error: %s" msgstr "writev 错误: %s" -#: aplay/aplay.c:2153 +#: aplay/aplay.c:2152 #, c-format msgid "read error: %s" msgstr "读取错误：%s" -#: aplay/aplay.c:2197 +#: aplay/aplay.c:2199 #, c-format msgid "readv error: %s" msgstr "readv 错误: %s" -#: aplay/aplay.c:2245 +#: aplay/aplay.c:2248 msgid "can't allocate buffer for silence" msgstr "不能为无声分配缓冲" -#: aplay/aplay.c:2254 aplay/aplay.c:2482 aplay/aplay.c:2487 aplay/aplay.c:2537 -#: aplay/aplay.c:2546 aplay/aplay.c:2553 aplay/aplay.c:2563 aplay/aplay.c:2569 -#: aplay/aplay.c:2641 aplay/aplay.c:2671 aplay/aplay.c:2685 +#: aplay/aplay.c:2257 aplay/aplay.c:2485 aplay/aplay.c:2490 aplay/aplay.c:2540 +#: aplay/aplay.c:2549 aplay/aplay.c:2556 aplay/aplay.c:2566 aplay/aplay.c:2572 +#: aplay/aplay.c:2644 aplay/aplay.c:2674 aplay/aplay.c:2688 msgid "write error" msgstr "写入错误" -#: aplay/aplay.c:2267 +#: aplay/aplay.c:2270 #, c-format msgid "voc_pcm_flush - silence error" msgstr "voc_pcm_flush - 无声错误" -#: aplay/aplay.c:2270 +#: aplay/aplay.c:2273 msgid "voc_pcm_flush error" msgstr "voc_pcm_flush 错误" -#: aplay/aplay.c:2295 +#: aplay/aplay.c:2298 msgid "malloc error" msgstr "分配错误" -#: aplay/aplay.c:2299 +#: aplay/aplay.c:2302 #, c-format msgid "Playing Creative Labs Channel file '%s'...\n" msgstr "正在播放Creative Labs Channel 文件 '%s'...\n" -#: aplay/aplay.c:2367 aplay/aplay.c:2462 +#: aplay/aplay.c:2370 aplay/aplay.c:2465 msgid "can't play packed .voc files" msgstr "无法播放打包的.voc文件" -#: aplay/aplay.c:2422 +#: aplay/aplay.c:2425 #, c-format msgid "can't play loops; %s isn't seekable\n" msgstr "无法播放循环;%s不可取\n" -#: aplay/aplay.c:2471 +#: aplay/aplay.c:2474 #, c-format msgid "unknown blocktype %d. terminate." msgstr "未知块类型 %d。结束。" -#: aplay/aplay.c:2605 +#: aplay/aplay.c:2608 #, c-format msgid "Wave doesn't support %s format..." msgstr "波不支持%s格式..." -#: aplay/aplay.c:2665 +#: aplay/aplay.c:2668 #, c-format msgid "Sparc Audio doesn't support %s format..." msgstr "Sparc Audio不支持%s格式..." -#: aplay/aplay.c:2740 +#: aplay/aplay.c:2743 msgid "Playing" msgstr "正在播放" -#: aplay/aplay.c:2740 +#: aplay/aplay.c:2743 msgid "Recording" msgstr "正在录音" -#: aplay/aplay.c:2744 +#: aplay/aplay.c:2747 #, c-format msgid "Rate %d Hz, " msgstr "频率%dHz， " -#: aplay/aplay.c:2746 +#: aplay/aplay.c:2749 #, c-format msgid "Mono" msgstr "Mono" -#: aplay/aplay.c:2748 +#: aplay/aplay.c:2751 #, c-format msgid "Stereo" msgstr "Stereo" -#: aplay/aplay.c:2750 +#: aplay/aplay.c:2753 #, c-format msgid "Channels %i" msgstr "频道 %i" -#: aplay/aplay.c:3351 +#: aplay/aplay.c:3356 #, c-format msgid "You need to specify %u files" msgstr "" -#: aplay/aplay.c:3404 +#: aplay/aplay.c:3409 #, c-format msgid "You need to specify %d files" msgstr "你需要指定%d个文件" diff -Nru language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/apparmorapplet.po language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/apparmorapplet.po --- language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/apparmorapplet.po 2020-07-10 08:58:53.000000000 +0000 +++ language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/apparmorapplet.po 2021-01-22 11:31:21.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: 2020-07-09 18:41+0000\n" -"X-Generator: Launchpad (build 4809fcb62f445aaa3ae919f7f6c3cc7d156ea57a)\n" +"X-Launchpad-Export-Date: 2021-01-21 19:43+0000\n" +"X-Generator: Launchpad (build 2d1d5e352f0d063d660df2300e31f66bed027fa5)\n" #: src/apparmor-applet.c:244 msgid "" diff -Nru language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/apparmor-parser.po language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/apparmor-parser.po --- language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/apparmor-parser.po 2020-07-10 08:58:49.000000000 +0000 +++ language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/apparmor-parser.po 2021-01-22 11:31:17.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: 2020-07-09 18:40+0000\n" -"X-Generator: Launchpad (build 4809fcb62f445aaa3ae919f7f6c3cc7d156ea57a)\n" +"X-Launchpad-Export-Date: 2021-01-21 19:42+0000\n" +"X-Generator: Launchpad (build 2d1d5e352f0d063d660df2300e31f66bed027fa5)\n" #: ../parser_include.c:113 ../parser_include.c:111 msgid "Error: Out of memory.\n" diff -Nru language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/apparmor-utils.po language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/apparmor-utils.po --- language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/apparmor-utils.po 2020-07-10 08:58:46.000000000 +0000 +++ language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/apparmor-utils.po 2021-01-22 11:31:13.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: 2020-07-09 18:40+0000\n" -"X-Generator: Launchpad (build 4809fcb62f445aaa3ae919f7f6c3cc7d156ea57a)\n" +"X-Launchpad-Export-Date: 2021-01-21 19:42+0000\n" +"X-Generator: Launchpad (build 2d1d5e352f0d063d660df2300e31f66bed027fa5)\n" #: ../aa-genprof:56 msgid "Generate profile for the given program" diff -Nru language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/app-install-data.po language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/app-install-data.po --- language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/app-install-data.po 2020-07-10 08:58:47.000000000 +0000 +++ language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/app-install-data.po 2021-01-22 11:31:14.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: 2020-07-09 18:46+0000\n" -"X-Generator: Launchpad (build 4809fcb62f445aaa3ae919f7f6c3cc7d156ea57a)\n" +"X-Launchpad-Export-Date: 2021-01-21 19:47+0000\n" +"X-Generator: Launchpad (build 2d1d5e352f0d063d660df2300e31f66bed027fa5)\n" "Language: zh_CN\n" #: ../menu-data-additional/7zip.desktop.in.h:1 diff -Nru language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/apport.po language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/apport.po --- language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/apport.po 2020-07-10 08:58:52.000000000 +0000 +++ language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/apport.po 2021-01-22 11:31:20.000000000 +0000 @@ -7,32 +7,58 @@ msgstr "" "Project-Id-Version: apport\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-02 10:22+0000\n" +"POT-Creation-Date: 2020-12-04 21:07+0000\n" "PO-Revision-Date: 2018-03-26 08:29+0000\n" "Last-Translator: xcffl \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: 2020-07-09 18:27+0000\n" -"X-Generator: Launchpad (build 4809fcb62f445aaa3ae919f7f6c3cc7d156ea57a)\n" +"X-Launchpad-Export-Date: 2021-01-21 19:29+0000\n" +"X-Generator: Launchpad (build 2d1d5e352f0d063d660df2300e31f66bed027fa5)\n" "Language: zh_CN\n" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:139 +#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:195 +#: ../data/general-hooks/ubuntu.py:195 +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:203 +#: ../data/general-hooks/ubuntu.py:203 +msgid "You have already encountered this package installation failure." +msgstr "您遭遇到了该软件包安装失败。" + +#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:219 +#: ../data/general-hooks/ubuntu.py:219 +msgid "" +"Your system was initially configured with grub version 2, but you have " +"removed it from your system in favor of grub 1 without configuring it. To " +"ensure your bootloader configuration is updated whenever a new kernel is " +"available, open a terminal and run:\n" +"\n" +" sudo apt-get install grub-pc\n" +msgstr "" +"系统最初使用 grub2 配置，但是您已经在系统中将其删除，而没有配置grub 1。当一个新内核可用时，为了确保您的引导配置被更新，打开终端并运行：\n" +"\n" +" sudo apt-get install grub-pc\n" + #: ../apport/ui.py:139 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:139 msgid "This package does not seem to be installed correctly" msgstr "该软件包似乎没有被正确安装" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:144 #: ../apport/ui.py:144 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:144 #, 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/python3.8/dist-packages/apport/ui.py:163 #: ../apport/ui.py:163 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:163 #, python-format msgid "" "You have some obsolete package versions installed. Please upgrade the " @@ -44,137 +70,147 @@ "\n" "%s" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:300 #: ../apport/ui.py:300 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:300 msgid "unknown program" msgstr "未知程序" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:301 #: ../apport/ui.py:301 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:301 #, python-format msgid "Sorry, the program \"%s\" closed unexpectedly" msgstr "对不起，%s 程序异常退出" +#: ../apport/ui.py:303 ../apport/ui.py:1456 #: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:303 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1449 -#: ../apport/ui.py:303 ../apport/ui.py:1449 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1456 #, python-format msgid "Problem in %s" msgstr "%s 中的问题" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:304 #: ../apport/ui.py:304 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:304 msgid "" "Your computer does not have enough free memory to automatically analyze the " "problem and send a report to the developers." msgstr "您的计算机剩余空间不足，程序无法自动诊断问题并向开发者发送问题报告。" +#: ../apport/ui.py:359 ../apport/ui.py:367 ../apport/ui.py:516 +#: ../apport/ui.py:519 ../apport/ui.py:724 ../apport/ui.py:1262 +#: ../apport/ui.py:1428 ../apport/ui.py:1432 #: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:359 #: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:367 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:510 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:513 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:718 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1255 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1421 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1425 -#: ../apport/ui.py:359 ../apport/ui.py:367 ../apport/ui.py:510 -#: ../apport/ui.py:513 ../apport/ui.py:718 ../apport/ui.py:1255 -#: ../apport/ui.py:1421 ../apport/ui.py:1425 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:516 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:519 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:724 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1262 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1428 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1432 msgid "Invalid problem report" msgstr "无效的问题报告" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:360 #: ../apport/ui.py:360 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:360 msgid "You are not allowed to access this problem report." msgstr "您没有访问这个问题报告的权限。" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:363 #: ../apport/ui.py:363 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:363 msgid "Error" msgstr "错误" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:364 #: ../apport/ui.py:364 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:364 msgid "There is not enough disk space available to process this report." msgstr "没有足够的磁盘空间来处理报告。" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:402 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:491 -#: ../apport/ui.py:402 ../apport/ui.py:491 +#: ../apport/ui.py:400 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:400 +msgid "No PID specified" +msgstr "" + +#: ../apport/ui.py:401 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:401 +msgid "You need to specify a PID. See --help for more information." +msgstr "" + +#: ../apport/ui.py:408 ../apport/ui.py:497 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:408 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:497 msgid "Invalid PID" msgstr "无效的 PID" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:403 -#: ../apport/ui.py:403 +#: ../apport/ui.py:409 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:409 msgid "The specified process ID does not exist." msgstr "" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:406 -#: ../apport/ui.py:406 +#: ../apport/ui.py:412 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:412 msgid "Not your PID" msgstr "" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:407 -#: ../apport/ui.py:407 +#: ../apport/ui.py:413 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:413 msgid "The specified process ID does not belong to you." msgstr "" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:458 -#: ../apport/ui.py:458 +#: ../apport/ui.py:464 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:464 msgid "No package specified" msgstr "没有指定软件包" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:459 -#: ../apport/ui.py:459 +#: ../apport/ui.py:465 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:465 msgid "" "You need to specify a package or a PID. See --help for more information." msgstr "您需要指定一个软件包或者 PID。使用 --help 选项来获取更多信息。" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:488 -#: ../apport/ui.py:488 +#: ../apport/ui.py:494 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:494 msgid "Permission denied" msgstr "拒绝访问" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:489 -#: ../apport/ui.py:489 +#: ../apport/ui.py:495 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:495 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.8/dist-packages/apport/ui.py:492 -#: ../apport/ui.py:492 +#: ../apport/ui.py:498 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:498 msgid "The specified process ID does not belong to a program." msgstr "指定的进程 ID 不属于一个程序。" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:511 -#: ../apport/ui.py:511 +#: ../apport/ui.py:517 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:517 #, python-format msgid "Symptom script %s did not determine an affected package" msgstr "症状脚本 %s 没有划定受影响的包" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:514 -#: ../apport/ui.py:514 +#: ../apport/ui.py:520 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:520 #, python-format msgid "Package %s does not exist" msgstr "软件包 %s 不存在" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:543 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:730 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:735 -#: ../apport/ui.py:543 ../apport/ui.py:730 ../apport/ui.py:735 +#: ../apport/ui.py:549 ../apport/ui.py:736 ../apport/ui.py:741 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:549 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:736 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:741 msgid "Cannot create report" msgstr "无法创建报告" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:558 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:604 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:620 -#: ../apport/ui.py:558 ../apport/ui.py:604 ../apport/ui.py:620 +#: ../apport/ui.py:564 ../apport/ui.py:610 ../apport/ui.py:626 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:564 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:610 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:626 msgid "Updating problem report" msgstr "更新问题报告" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:559 -#: ../apport/ui.py:559 +#: ../apport/ui.py:565 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:565 msgid "" "You are not the reporter or subscriber of this problem report, or the report " "is a duplicate or already closed.\n" @@ -184,8 +220,8 @@ "您不是该问题报告的报告者或订阅者，或者该报告被视为重复或已经关闭。\n" "请使用 apport-bug 新建一份报告。" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:568 -#: ../apport/ui.py:568 +#: ../apport/ui.py:574 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:574 msgid "" "You are not the reporter of this problem report. It is much easier to mark a " "bug as a duplicate of another than to move your comments and attachments to " @@ -200,65 +236,65 @@ "因此，我们建议您使用 apport-bug 来提交新的错误报告，并在当前报告中对您新提交的报告进行评论。\n" "您确定要继续么？" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:605 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:621 -#: ../apport/ui.py:605 ../apport/ui.py:621 +#: ../apport/ui.py:611 ../apport/ui.py:627 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:611 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:627 msgid "No additional information collected." msgstr "未收集更多信息。" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:672 -#: ../apport/ui.py:672 +#: ../apport/ui.py:678 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:678 msgid "What kind of problem do you want to report?" msgstr "您想报告什么类型的问题？" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:689 -#: ../apport/ui.py:689 +#: ../apport/ui.py:695 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:695 msgid "Unknown symptom" msgstr "未知症状" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:690 -#: ../apport/ui.py:690 +#: ../apport/ui.py:696 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:696 #, python-format msgid "The symptom \"%s\" is not known." msgstr "症状 %s 未知。" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:721 -#: ../apport/ui.py:721 +#: ../apport/ui.py:727 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:727 msgid "" "After closing this message please click on an application window to report a " "problem about it." msgstr "在关闭这个消息只后，请点击要报告问题的程序窗口。" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:731 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:736 -#: ../apport/ui.py:731 ../apport/ui.py:736 +#: ../apport/ui.py:737 ../apport/ui.py:742 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:737 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:742 msgid "xprop failed to determine process ID of the window" msgstr "xprop 无法确定窗口的进程 ID" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:750 -#: ../apport/ui.py:750 +#: ../apport/ui.py:756 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:756 msgid "%prog " msgstr "%prog <报告号>" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:752 -#: ../apport/ui.py:752 +#: ../apport/ui.py:758 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:758 msgid "Specify package name." msgstr "请指定包的名称。" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:754 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:805 -#: ../apport/ui.py:754 ../apport/ui.py:805 +#: ../apport/ui.py:760 ../apport/ui.py:812 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:760 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:812 msgid "Add an extra tag to the report. Can be specified multiple times." msgstr "向报告中添加额外的标记，可多次指定。" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:784 -#: ../apport/ui.py:784 +#: ../apport/ui.py:791 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:791 msgid "" "%prog [options] [symptom|pid|package|program path|.apport/.crash file]" msgstr "%prog [选项] [症状|PID|软件包|程序目录|.apport/.crash file]" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:787 -#: ../apport/ui.py:787 +#: ../apport/ui.py:794 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:794 msgid "" "Start in bug filing mode. Requires --package and an optional --pid, or just " "a --pid. If neither is given, display a list of known symptoms. (Implied if " @@ -266,209 +302,209 @@ msgstr "" "以填写 bug 模式启动。需要 --package 和可选的 --pid 参数，或单独使用 --pid 参数。如果二者均未给出，将显示一系列症状供选择。" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:789 -#: ../apport/ui.py:789 +#: ../apport/ui.py:796 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:796 msgid "Click a window as a target for filing a problem report." msgstr "点击一个窗口作为提交问题报告的目标。" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:791 -#: ../apport/ui.py:791 +#: ../apport/ui.py:798 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:798 msgid "Start in bug updating mode. Can take an optional --package." msgstr "启动错误更新模式。可以使用选项 --package 来指定软件包。" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:793 -#: ../apport/ui.py:793 +#: ../apport/ui.py:800 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:800 msgid "" "File a bug report about a symptom. (Implied if symptom name is given as only " "argument.)" msgstr "针对某个症状报告 bug。" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:795 -#: ../apport/ui.py:795 +#: ../apport/ui.py:802 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:802 msgid "" "Specify package name in --file-bug mode. This is optional if a --pid is " "specified. (Implied if package name is given as only argument.)" msgstr "--file-bug 模式中指定软件包名。如果指定了 --pid，则是可选的。(如果只给定软件包名这一个参数则为必需。)" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:797 -#: ../apport/ui.py:797 +#: ../apport/ui.py:804 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:804 msgid "" "Specify a running program in --file-bug mode. If this is specified, the bug " "report will contain more information. (Implied if pid is given as only " "argument.)" msgstr "在 --file-bug 模式中指定运行的程序。如果指定，该问题报告将包含更多的信息。(默认指定 pid 作为唯一参数。)" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:799 -#: ../apport/ui.py:799 +#: ../apport/ui.py:806 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:806 msgid "The provided pid is a hanging application." msgstr "此进程号的程序是挂起的。" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:801 -#: ../apport/ui.py:801 +#: ../apport/ui.py:808 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:808 #, python-format msgid "" "Report the crash from given .apport or .crash file instead of the pending " "ones in %s. (Implied if file is given as only argument.)" msgstr "从给定的 .apport 或者 .crash 文件，而不是从正在处理的 %s 中汇报崩溃。(如果文件只给定了参数时实现。)" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:803 -#: ../apport/ui.py:803 +#: ../apport/ui.py:810 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:810 msgid "" "In bug filing mode, save the collected information into a file instead of " "reporting it. This file can then be reported later on from a different " "machine." msgstr "在提交报告过程中，将收集到的信息保存到要报告的文件中。该文件可用于稍后在另一台机器上提交。" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:807 -#: ../apport/ui.py:807 +#: ../apport/ui.py:814 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:814 msgid "Print the Apport version number." msgstr "输出 Apport 版本号" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:958 -#: ../apport/ui.py:958 +#: ../apport/ui.py:965 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:965 msgid "" "This will launch apport-retrace in a terminal window to examine the crash." msgstr "这将在终端窗口中启动 apport-retrace，以检查此崩溃。" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:959 -#: ../apport/ui.py:959 +#: ../apport/ui.py:966 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:966 msgid "Run gdb session" msgstr "运行 gdb 会话" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:960 -#: ../apport/ui.py:960 +#: ../apport/ui.py:967 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:967 msgid "Run gdb session without downloading debug symbols" msgstr "不下载调试符号的情况下运行 gdb 会话" #. TRANSLATORS: %s contains the crash report file name -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:962 -#: ../apport/ui.py:962 +#: ../apport/ui.py:969 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:969 #, python-format msgid "Update %s with fully symbolic stack trace" msgstr "利用全符号的堆栈跟踪更新 %s" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:998 -#: ../apport/ui.py:998 +#: ../apport/ui.py:1005 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1005 msgid "Can't remember send report status settings" msgstr "" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:999 -#: ../apport/ui.py:999 +#: ../apport/ui.py:1006 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1006 msgid "" "Saving crash reporting state failed. Can't set auto or never reporting mode." msgstr "" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1058 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1068 -#: ../apport/ui.py:1058 ../apport/ui.py:1068 +#: ../apport/ui.py:1065 ../apport/ui.py:1075 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1065 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1075 msgid "" "This problem report applies to a program which is not installed any more." msgstr "这一问题报告适用于不再安装的程序。" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1083 -#: ../apport/ui.py:1083 +#: ../apport/ui.py:1090 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1090 #, python-format msgid "" "The problem happened with the program %s which changed since the crash " "occurred." msgstr "自崩溃发生起已更改的程序 %s 出现问题。" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1130 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1211 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1427 -#: ../apport/ui.py:1130 ../apport/ui.py:1211 ../apport/ui.py:1427 +#: ../apport/ui.py:1137 ../apport/ui.py:1218 ../apport/ui.py:1434 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1137 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1218 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1434 msgid "This problem report is damaged and cannot be processed." msgstr "该问题报告已损坏，无法处理。" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1135 -#: ../apport/ui.py:1135 +#: ../apport/ui.py:1142 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1142 msgid "This report is about a package that is not installed." msgstr "" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1139 -#: ../apport/ui.py:1139 +#: ../apport/ui.py:1146 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1146 msgid "An error occurred while attempting to process this problem report:" msgstr "尝试处理此问题报告时出现错误：" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1149 -#: ../apport/ui.py:1149 +#: ../apport/ui.py:1156 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1156 msgid "" "You have two versions of this application installed, which one do you want " "to report a bug against?" msgstr "" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1150 -#: ../apport/ui.py:1150 +#: ../apport/ui.py:1157 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1157 #, python-format msgid "%s snap" msgstr "" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1151 -#: ../apport/ui.py:1151 +#: ../apport/ui.py:1158 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1158 #, python-format msgid "%s deb package" msgstr "" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1184 -#: ../apport/ui.py:1184 +#: ../apport/ui.py:1191 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1191 #, python-format msgid "" "%s is provided by a snap published by %s. Contact them via %s for help." msgstr "" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1186 -#: ../apport/ui.py:1186 +#: ../apport/ui.py:1193 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1193 #, python-format msgid "" "%s is provided by a snap published by %s. No contact address has been " "provided; visit the forum at https://forum.snapcraft.io/ for help." msgstr "" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1256 -#: ../apport/ui.py:1256 +#: ../apport/ui.py:1263 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1263 msgid "Could not determine the package or source package name." msgstr "无法检测包或者源码包的名称。" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1274 -#: ../apport/ui.py:1274 +#: ../apport/ui.py:1281 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1281 msgid "Unable to start web browser" msgstr "无法打开浏览器" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1275 -#: ../apport/ui.py:1275 +#: ../apport/ui.py:1282 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1282 #, python-format msgid "Unable to start web browser to open %s." msgstr "无法使用浏览器打开网页 %s" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1375 -#: ../apport/ui.py:1375 +#: ../apport/ui.py:1382 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1382 #, python-format msgid "Please enter your account information for the %s bug tracking system" msgstr "请为 %s 错误追踪系统输入您的帐户信息" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1387 -#: ../apport/ui.py:1387 +#: ../apport/ui.py:1394 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1394 msgid "Network problem" msgstr "网络问题" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1389 -#: ../apport/ui.py:1389 +#: ../apport/ui.py:1396 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1396 msgid "" "Cannot connect to crash database, please check your Internet connection." msgstr "无法连接到崩溃数据库，请检查您的 Internet 连接。" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1416 -#: ../apport/ui.py:1416 +#: ../apport/ui.py:1423 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1423 msgid "Memory exhaustion" msgstr "内存耗尽" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1417 -#: ../apport/ui.py:1417 +#: ../apport/ui.py:1424 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1424 msgid "Your system does not have enough memory to process this crash report." msgstr "您的系统没有足够的内存来处理此崩溃报告。" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1452 -#: ../apport/ui.py:1452 +#: ../apport/ui.py:1459 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1459 #, python-format msgid "" "The problem cannot be reported:\n" @@ -479,86 +515,161 @@ "\n" "%s" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1508 +#: ../apport/ui.py:1515 ../apport/ui.py:1522 #: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1515 -#: ../apport/ui.py:1508 ../apport/ui.py:1515 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1522 msgid "Problem already known" msgstr "该问题为已知问题" -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1509 -#: ../apport/ui.py:1509 +#: ../apport/ui.py:1516 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1516 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/python3.8/dist-packages/apport/ui.py:1516 -#: ../apport/ui.py:1516 +#: ../apport/ui.py:1523 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1523 msgid "This problem was already reported to developers. Thank you!" msgstr "已将此问题报告给开发人员。谢谢！" -#: ../debian/tmp/usr/bin/apport-unpack.py:22 ../bin/apport-unpack.py:22 +#: ../kde/apport-kde-mimelnk.desktop.in.h:1 +msgid "Apport crash file" +msgstr "Apport 崩溃文件" + +#: ../gtk/apport-gtk.desktop.in.h:1 ../kde/apport-kde-mime.desktop.in.h:1 +#: ../kde/apport-kde.desktop.in.h:1 +msgid "Report a problem..." +msgstr "提交一份问题报告…" + +#: ../gtk/apport-gtk.desktop.in.h:2 ../kde/apport-kde-mime.desktop.in.h:2 +#: ../kde/apport-kde.desktop.in.h:2 +msgid "Report a malfunction to the developers" +msgstr "向开发者报告一个故障" + +#: ../gtk/apport-gtk.py:146 ../debian/tmp/usr/share/apport/apport-kde.py:363 +#: ../kde/apport-kde.py:363 ../debian/tmp/usr/share/apport/apport-gtk.py:146 +#: ../bin/apport-cli.py:166 ../debian/tmp/usr/bin/apport-cli.py:166 +msgid "(binary data)" +msgstr "(二进制数据)" + +#: ../gtk/apport-gtk.py:161 ../debian/tmp/usr/share/apport/apport-gtk.py:161 #, python-format -msgid "Usage: %s " -msgstr "用法：%s <报告> <目标目录>" +msgid "Sorry, the application %s has stopped unexpectedly." +msgstr "对不起，应用程序 %s 意外停止。" -#: ../debian/tmp/usr/bin/apport-unpack.py:42 ../bin/apport-unpack.py:42 -msgid "Destination directory exists and is not empty." -msgstr "目标目录存在且不为空。" +#: ../gtk/apport-gtk.py:164 ../debian/tmp/usr/share/apport/apport-gtk.py:164 +#, python-format +msgid "Sorry, %s has closed unexpectedly." +msgstr "对不起，%s 已意外关闭。" -#: ../debian/tmp/usr/share/apport/apport-kde.py:186 ../gtk/apport-gtk.ui.h:6 -#: ../debian/tmp/usr/bin/apport-cli.py:194 ../bin/apport-cli.py:194 -#: ../kde/apport-kde.py:186 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:6 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:181 ../gtk/apport-gtk.py:181 +#: ../gtk/apport-gtk.py:169 ../debian/tmp/usr/share/apport/apport-kde.py:200 +#: ../debian/tmp/usr/share/apport/apport-kde.py:238 ../kde/apport-kde.py:200 +#: ../kde/apport-kde.py:238 ../debian/tmp/usr/share/apport/apport-gtk.py:169 +#, python-format +msgid "Sorry, %s has experienced an internal error." +msgstr "对不起，%s 出现了内部错误。" + +#: ../gtk/apport-gtk.py:181 ../debian/tmp/usr/share/apport/apport-kde.py:186 +#: ../kde/apport-kde.py:186 ../debian/tmp/usr/share/apport/apport-gtk.py:181 +#: ../gtk/apport-gtk.ui.h:6 ../bin/apport-cli.py:194 +#: ../debian/tmp/usr/bin/apport-cli.py:194 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:6 msgid "Send problem report to the developers?" msgstr "向开发者发送问题报告？" -#: ../debian/tmp/usr/share/apport/apport-kde.py:194 ../gtk/apport-gtk.ui.h:14 -#: ../kde/apport-kde.py:194 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:14 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:188 ../gtk/apport-gtk.py:188 +#: ../gtk/apport-gtk.py:188 ../debian/tmp/usr/share/apport/apport-kde.py:194 +#: ../kde/apport-kde.py:194 ../debian/tmp/usr/share/apport/apport-gtk.py:188 +#: ../gtk/apport-gtk.ui.h:14 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:14 msgid "Send" msgstr "发送" -#: ../debian/tmp/usr/share/apport/apport-kde.py:200 -#: ../debian/tmp/usr/share/apport/apport-kde.py:238 ../kde/apport-kde.py:200 -#: ../kde/apport-kde.py:238 ../debian/tmp/usr/share/apport/apport-gtk.py:169 -#: ../gtk/apport-gtk.py:169 +#: ../gtk/apport-gtk.py:204 ../gtk/apport-gtk.py:575 +#: ../debian/tmp/usr/share/apport/apport-kde.py:292 ../kde/apport-kde.py:292 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:204 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:575 ../gtk/apport-gtk.ui.h:11 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:11 +msgid "Show Details" +msgstr "显示详细信息" + +#: ../gtk/apport-gtk.py:216 ../debian/tmp/usr/share/apport/apport-kde.py:231 +#: ../debian/tmp/usr/share/apport/apport-kde.py:244 ../kde/apport-kde.py:231 +#: ../kde/apport-kde.py:244 ../debian/tmp/usr/share/apport/apport-gtk.py:216 +msgid "Continue" +msgstr "继续" + +#: ../gtk/apport-gtk.py:239 ../debian/tmp/usr/share/apport/apport-gtk.py:239 #, python-format -msgid "Sorry, %s has experienced an internal error." -msgstr "对不起，%s 出现了内部错误。" +msgid "The application %s has stopped responding." +msgstr "应用程序 %s 停止响应。" + +#: ../gtk/apport-gtk.py:243 ../debian/tmp/usr/share/apport/apport-gtk.py:243 +#, python-format +msgid "The program \"%s\" has stopped responding." +msgstr "程序 %s 停止响应。" -#: ../debian/tmp/usr/share/apport/apport-kde.py:208 ../kde/apport-kde.py:208 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:259 ../gtk/apport-gtk.py:259 +#: ../gtk/apport-gtk.py:259 ../debian/tmp/usr/share/apport/apport-kde.py:208 +#: ../kde/apport-kde.py:208 ../debian/tmp/usr/share/apport/apport-gtk.py:259 #, python-format msgid "Package: %s" msgstr "软件包：%s" -#: ../debian/tmp/usr/share/apport/apport-kde.py:214 ../kde/apport-kde.py:214 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:265 ../gtk/apport-gtk.py:265 +#: ../gtk/apport-gtk.py:265 ../debian/tmp/usr/share/apport/apport-kde.py:214 +#: ../kde/apport-kde.py:214 ../debian/tmp/usr/share/apport/apport-gtk.py:265 msgid "Sorry, a problem occurred while installing software." msgstr "对不起，安装软件时出现问题。" +#: ../gtk/apport-gtk.py:274 ../gtk/apport-gtk.py:289 #: ../debian/tmp/usr/share/apport/apport-kde.py:220 ../kde/apport-kde.py:220 #: ../debian/tmp/usr/share/apport/apport-gtk.py:274 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:289 ../gtk/apport-gtk.py:274 -#: ../gtk/apport-gtk.py:289 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:289 #, python-format msgid "The application %s has experienced an internal error." msgstr "应用程序 %s 发生内部错误。" -#: ../debian/tmp/usr/share/apport/apport-kde.py:223 ../kde/apport-kde.py:223 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:277 ../gtk/apport-gtk.py:277 +#: ../gtk/apport-gtk.py:277 ../debian/tmp/usr/share/apport/apport-kde.py:223 +#: ../kde/apport-kde.py:223 ../debian/tmp/usr/share/apport/apport-gtk.py:277 #, python-format msgid "The application %s has closed unexpectedly." msgstr "应用程序 %s 已意外关闭。" -#: ../debian/tmp/usr/share/apport/apport-kde.py:231 -#: ../debian/tmp/usr/share/apport/apport-kde.py:244 ../kde/apport-kde.py:231 -#: ../kde/apport-kde.py:244 ../debian/tmp/usr/share/apport/apport-gtk.py:216 -#: ../gtk/apport-gtk.py:216 -msgid "Continue" -msgstr "继续" +#: ../gtk/apport-gtk.py:297 ../debian/tmp/usr/share/apport/apport-kde.py:241 +#: ../kde/apport-kde.py:241 ../debian/tmp/usr/share/apport/apport-gtk.py:297 +#: ../gtk/apport-gtk.ui.h:7 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:7 +msgid "If you notice further problems, try restarting the computer." +msgstr "如果您注意到更多问题，请尝试重新启动计算机。" + +#: ../gtk/apport-gtk.py:299 ../debian/tmp/usr/share/apport/apport-kde.py:245 +#: ../kde/apport-kde.py:245 ../debian/tmp/usr/share/apport/apport-gtk.py:299 +msgid "Ignore future problems of this type" +msgstr "以后忽略此类错误" + +#: ../gtk/apport-gtk.py:579 ../debian/tmp/usr/share/apport/apport-kde.py:289 +#: ../kde/apport-kde.py:289 ../debian/tmp/usr/share/apport/apport-gtk.py:579 +msgid "Hide Details" +msgstr "隐藏详细信息" + +#: ../debian/tmp/usr/share/apport/apportcheckresume.py:67 +#: ../data/apportcheckresume.py:67 +msgid "" +"This occurred during a previous suspend, and prevented the system from " +"resuming properly." +msgstr "发生于之前的挂起时，并且使系统午饭正常恢复。" + +#: ../debian/tmp/usr/share/apport/apportcheckresume.py:69 +#: ../data/apportcheckresume.py:69 +msgid "" +"This occurred during a previous hibernation, and prevented the system from " +"resuming properly." +msgstr "发生于之前的休眠时，并且使系统午饭正常恢复。" + +#: ../debian/tmp/usr/share/apport/apportcheckresume.py:74 +#: ../data/apportcheckresume.py:74 +msgid "" +"The resume processing hung very near the end and will have appeared to have " +"completed normally." +msgstr "这个恢复过程已经非常接近尾声，将正常结束。" #: ../debian/tmp/usr/share/apport/apport-kde.py:234 ../kde/apport-kde.py:234 msgid "Leave Closed" @@ -570,30 +681,6 @@ msgid "Relaunch" msgstr "重新启动程序" -#: ../debian/tmp/usr/share/apport/apport-kde.py:241 ../gtk/apport-gtk.ui.h:7 -#: ../kde/apport-kde.py:241 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:7 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:297 ../gtk/apport-gtk.py:297 -msgid "If you notice further problems, try restarting the computer." -msgstr "如果您注意到更多问题，请尝试重新启动计算机。" - -#: ../debian/tmp/usr/share/apport/apport-kde.py:245 ../kde/apport-kde.py:245 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:299 ../gtk/apport-gtk.py:299 -msgid "Ignore future problems of this type" -msgstr "以后忽略此类错误" - -#: ../debian/tmp/usr/share/apport/apport-kde.py:289 ../kde/apport-kde.py:289 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:579 ../gtk/apport-gtk.py:579 -msgid "Hide Details" -msgstr "隐藏详细信息" - -#: ../debian/tmp/usr/share/apport/apport-kde.py:292 ../gtk/apport-gtk.ui.h:11 -#: ../kde/apport-kde.py:292 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:11 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:204 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:575 ../gtk/apport-gtk.py:204 -#: ../gtk/apport-gtk.py:575 -msgid "Show Details" -msgstr "显示详细信息" - #: ../debian/tmp/usr/share/apport/apport-kde.py:315 ../kde/apport-kde.py:315 msgid "Username:" msgstr "用户名：" @@ -602,20 +689,12 @@ msgid "Password:" msgstr "密码：" -#: ../debian/tmp/usr/share/apport/apport-kde.py:363 -#: ../debian/tmp/usr/bin/apport-cli.py:166 ../bin/apport-cli.py:166 -#: ../kde/apport-kde.py:363 ../debian/tmp/usr/share/apport/apport-gtk.py:146 -#: ../gtk/apport-gtk.py:146 -msgid "(binary data)" -msgstr "(二进制数据)" - #: ../debian/tmp/usr/share/apport/apport-kde.py:406 ../kde/apport-kde.py:406 msgid "Collecting Problem Information" msgstr "正在收集问题信息" -#: ../debian/tmp/usr/share/apport/apport-kde.py:407 -#: ../debian/tmp/usr/bin/apport-cli.py:254 ../bin/apport-cli.py:254 -#: ../kde/apport-kde.py:407 +#: ../debian/tmp/usr/share/apport/apport-kde.py:407 ../kde/apport-kde.py:407 +#: ../bin/apport-cli.py:254 ../debian/tmp/usr/bin/apport-cli.py:254 msgid "Collecting problem information" msgstr "正在收集问题信息" @@ -629,14 +708,15 @@ msgid "Uploading Problem Information" msgstr "上传问题信息" -#: ../debian/tmp/usr/share/apport/apport-kde.py:435 ../gtk/apport-gtk.ui.h:17 -#: ../debian/tmp/usr/bin/apport-cli.py:267 ../bin/apport-cli.py:267 -#: ../kde/apport-kde.py:435 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:17 +#: ../debian/tmp/usr/share/apport/apport-kde.py:435 ../kde/apport-kde.py:435 +#: ../gtk/apport-gtk.ui.h:17 ../bin/apport-cli.py:267 +#: ../debian/tmp/usr/bin/apport-cli.py:267 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:17 msgid "Uploading problem information" msgstr "上传问题信息" -#: ../debian/tmp/usr/share/apport/apport-kde.py:436 ../gtk/apport-gtk.ui.h:19 -#: ../kde/apport-kde.py:436 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:19 +#: ../debian/tmp/usr/share/apport/apport-kde.py:436 ../kde/apport-kde.py:436 +#: ../gtk/apport-gtk.ui.h:19 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:19 msgid "" "The collected information is being sent to the bug tracking system. This " "might take a few minutes." @@ -644,12 +724,40 @@ #: ../debian/tmp/usr/share/apport/apport-kde.py:469 #: ../debian/tmp/usr/share/apport/apport-kde.py:504 -#: ../debian/tmp/usr/share/apport/apport-kde.py:524 ../gtk/apport-gtk.ui.h:1 -#: ../kde/apport-kde.py:469 ../kde/apport-kde.py:504 ../kde/apport-kde.py:524 +#: ../debian/tmp/usr/share/apport/apport-kde.py:524 ../kde/apport-kde.py:469 +#: ../kde/apport-kde.py:504 ../kde/apport-kde.py:524 ../gtk/apport-gtk.ui.h:1 #: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:1 msgid "Apport" msgstr "Apport" +#: ../apport/com.ubuntu.apport.policy.in.h:1 +msgid "Collect system information" +msgstr "收集系统信息" + +#: ../apport/com.ubuntu.apport.policy.in.h:2 +msgid "" +"Authentication is required to collect system information for this problem " +"report" +msgstr "为此问题报告收集系统信息需要授权" + +#: ../apport/com.ubuntu.apport.policy.in.h:3 +msgid "System problem reports" +msgstr "系统问题报告" + +#: ../apport/com.ubuntu.apport.policy.in.h:4 +msgid "" +"Please enter your password to access problem reports of system programs" +msgstr "请输入您的密码以查看系统程序问题报告。" + +#: ../debian/tmp/usr/bin/apport-unpack.py:22 ../bin/apport-unpack.py:22 +#, python-format +msgid "Usage: %s " +msgstr "用法：%s <报告> <目标目录>" + +#: ../debian/tmp/usr/bin/apport-unpack.py:42 ../bin/apport-unpack.py:42 +msgid "Destination directory exists and is not empty." +msgstr "目标目录存在且不为空。" + #: ../gtk/apport-gtk.ui.h:2 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:2 msgid "Cancel" msgstr "取消" @@ -737,9 +845,8 @@ "detection" msgstr "该可执行文件运行 Valgrind MemCheck 工具下的内存泄漏检测" -#: ../bin/apport-valgrind.py:66 ../bin/apport-retrace.py:65 -#: ../debian/tmp/usr/bin/apport-valgrind.py:66 -#: ../debian/tmp/usr/bin/apport-retrace.py:65 +#: ../bin/apport-valgrind.py:66 ../debian/tmp/usr/bin/apport-retrace.py:65 +#: ../bin/apport-retrace.py:65 ../debian/tmp/usr/bin/apport-valgrind.py:66 msgid "" "Install an extra package into the sandbox (can be specified multiple times)" msgstr "将其他软件包安装到沙盒(可多次加以指定)中" @@ -749,208 +856,42 @@ msgid "Error: %s is not an executable. Stopping." msgstr "错误：%s 不是可执行文件，停止。" -#: ../debian/tmp/usr/bin/apport-cli.py:80 ../bin/apport-cli.py:80 -msgid "Press any key to continue..." -msgstr "按任意键继续…" - -#: ../debian/tmp/usr/bin/apport-cli.py:87 ../bin/apport-cli.py:87 -msgid "What would you like to do? Your options are:" -msgstr "您想做什么？您的选择是：" - -#: ../debian/tmp/usr/bin/apport-cli.py:100 ../bin/apport-cli.py:100 -#, python-format -msgid "Please choose (%s):" -msgstr "请选择(%s)：" - -#: ../debian/tmp/usr/bin/apport-cli.py:164 ../bin/apport-cli.py:164 -#, python-format -msgid "(%i bytes)" -msgstr "(%i 字节)" - -#: ../debian/tmp/usr/bin/apport-cli.py:195 ../bin/apport-cli.py:195 -msgid "" -"After the problem report has been sent, please fill out the form in the\n" -"automatically opened web browser." -msgstr "" -"当问题报告被发出之后，请填写\n" -"自动弹出窗口的表格。" - -#: ../debian/tmp/usr/bin/apport-cli.py:198 ../bin/apport-cli.py:198 -#, python-format -msgid "&Send report (%s)" -msgstr "发送报告(&S)(%s)" - -#: ../debian/tmp/usr/bin/apport-cli.py:202 ../bin/apport-cli.py:202 -msgid "&Examine locally" -msgstr "本地检查(&E)" - -#: ../debian/tmp/usr/bin/apport-cli.py:206 ../bin/apport-cli.py:206 -msgid "&View report" -msgstr "查看报告(&V)" - -#: ../debian/tmp/usr/bin/apport-cli.py:207 ../bin/apport-cli.py:207 -msgid "&Keep report file for sending later or copying to somewhere else" -msgstr "保存报告文件以便稍后发送或者复制到其他地方(&K)" - -#: ../debian/tmp/usr/bin/apport-cli.py:208 ../bin/apport-cli.py:208 -msgid "Cancel and &ignore future crashes of this program version" -msgstr "终止并忽略这个版本软件以后出现的崩溃(&I)" - -#: ../debian/tmp/usr/bin/apport-cli.py:210 -#: ../debian/tmp/usr/bin/apport-cli.py:287 -#: ../debian/tmp/usr/bin/apport-cli.py:319 -#: ../debian/tmp/usr/bin/apport-cli.py:340 ../bin/apport-cli.py:210 -#: ../bin/apport-cli.py:287 ../bin/apport-cli.py:319 ../bin/apport-cli.py:340 -msgid "&Cancel" -msgstr "取消(&C)" - -#: ../debian/tmp/usr/bin/apport-cli.py:238 ../bin/apport-cli.py:238 -msgid "Problem report file:" -msgstr "问题报告文件：" - -#: ../debian/tmp/usr/bin/apport-cli.py:244 -#: ../debian/tmp/usr/bin/apport-cli.py:249 ../bin/apport-cli.py:244 -#: ../bin/apport-cli.py:249 -msgid "&Confirm" -msgstr "确认(&C)" - -#: ../debian/tmp/usr/bin/apport-cli.py:248 ../bin/apport-cli.py:248 -#, python-format -msgid "Error: %s" -msgstr "错误：%s" - -#: ../debian/tmp/usr/bin/apport-cli.py:255 ../bin/apport-cli.py:255 -msgid "" -"The collected information can be sent to the developers to improve the\n" -"application. This might take a few minutes." -msgstr "" -"收集到的信息将会传送到开发人员处以改进软件。\n" -"这可能会花费几分钟时间，" - -#: ../debian/tmp/usr/bin/apport-cli.py:268 ../bin/apport-cli.py:268 -msgid "" -"The collected information is being sent to the bug tracking system.\n" -"This might take a few minutes." -msgstr "" -"收集到的信息正在被发送到错误跟踪系统。\n" -"这可能要花费几分钟时间。" - -#: ../debian/tmp/usr/bin/apport-cli.py:318 ../bin/apport-cli.py:318 -msgid "&Done" -msgstr "完成(&D)" - -#: ../debian/tmp/usr/bin/apport-cli.py:324 ../bin/apport-cli.py:324 -msgid "none" -msgstr "无" - -#: ../debian/tmp/usr/bin/apport-cli.py:325 ../bin/apport-cli.py:325 -#, python-format -msgid "Selected: %s. Multiple choices:" -msgstr "已选择：%s。 多重选择：" - -#: ../debian/tmp/usr/bin/apport-cli.py:341 ../bin/apport-cli.py:341 -msgid "Choices:" -msgstr "选择：" - -#: ../debian/tmp/usr/bin/apport-cli.py:355 ../bin/apport-cli.py:355 -msgid "Path to file (Enter to cancel):" -msgstr "文件的路径(回车取消)：" - -#: ../debian/tmp/usr/bin/apport-cli.py:361 ../bin/apport-cli.py:361 -msgid "File does not exist." -msgstr "文件不存在。" - -#: ../debian/tmp/usr/bin/apport-cli.py:363 ../bin/apport-cli.py:363 -msgid "This is a directory." -msgstr "这是一个目录。" - -#: ../debian/tmp/usr/bin/apport-cli.py:369 ../bin/apport-cli.py:369 -msgid "To continue, you must visit the following URL:" -msgstr "要继续，您必须访问下面这个网址：" - -#: ../debian/tmp/usr/bin/apport-cli.py:371 ../bin/apport-cli.py:371 -msgid "" -"You can launch a browser now, or copy this URL into a browser on another " -"computer." -msgstr "您现在可以启动一个浏览器，或者复制这个网址到另外一个电脑的浏览器。" - -#: ../debian/tmp/usr/bin/apport-cli.py:373 ../bin/apport-cli.py:373 -msgid "Launch a browser now" -msgstr "现在启动一个浏览器" - -#: ../debian/tmp/usr/bin/apport-cli.py:388 ../bin/apport-cli.py:388 -msgid "No pending crash reports. Try --help for more information." -msgstr "没有已知的崩溃报告，尝试 --help 以获得更多信息。" - -#: ../kde/apport-kde-mime.desktop.in.h:1 ../kde/apport-kde.desktop.in.h:1 -#: ../gtk/apport-gtk.desktop.in.h:1 -msgid "Report a problem..." -msgstr "提交一份问题报告…" - -#: ../kde/apport-kde-mime.desktop.in.h:2 ../kde/apport-kde.desktop.in.h:2 -#: ../gtk/apport-gtk.desktop.in.h:2 -msgid "Report a malfunction to the developers" -msgstr "向开发者报告一个故障" - -#: ../data/kernel_oops.py:29 ../debian/tmp/usr/share/apport/kernel_oops.py:29 -msgid "Your system might become unstable now and might need to be restarted." -msgstr "您的系统现在可能变得不稳定，可能需要重新启动。" - -#: ../apport/com.ubuntu.apport.policy.in.h:1 -msgid "Collect system information" -msgstr "收集系统信息" - -#: ../apport/com.ubuntu.apport.policy.in.h:2 -msgid "" -"Authentication is required to collect system information for this problem " -"report" -msgstr "为此问题报告收集系统信息需要授权" - -#: ../apport/com.ubuntu.apport.policy.in.h:3 -msgid "System problem reports" -msgstr "系统问题报告" - -#: ../apport/com.ubuntu.apport.policy.in.h:4 -msgid "" -"Please enter your password to access problem reports of system programs" -msgstr "请输入您的密码以查看系统程序问题报告。" - -#: ../bin/apport-retrace.py:34 ../debian/tmp/usr/bin/apport-retrace.py:34 +#: ../debian/tmp/usr/bin/apport-retrace.py:34 ../bin/apport-retrace.py:34 msgid "Do not put the new traces into the report, but write them to stdout." msgstr "不把新的痕迹写入到报告，但是把它们写入到标准输出。" -#: ../bin/apport-retrace.py:36 ../debian/tmp/usr/bin/apport-retrace.py:36 +#: ../debian/tmp/usr/bin/apport-retrace.py:36 ../bin/apport-retrace.py:36 msgid "" "Start an interactive gdb session with the report's core dump (-o ignored; " "does not rewrite report)" msgstr "启动一个交互式的 gdb 进程并载入提交的崩溃信息 (-o 不重新生成报告)" -#: ../bin/apport-retrace.py:38 ../debian/tmp/usr/bin/apport-retrace.py:38 +#: ../debian/tmp/usr/bin/apport-retrace.py:38 ../bin/apport-retrace.py:38 msgid "" "Write modified report to given file instead of changing the original report" msgstr "将更改过的报告写入指定文件而非改变原始报告" -#: ../bin/apport-retrace.py:41 ../debian/tmp/usr/bin/apport-retrace.py:41 +#: ../debian/tmp/usr/bin/apport-retrace.py:41 ../bin/apport-retrace.py:41 msgid "Remove the core dump from the report after stack trace regeneration" msgstr "生成栈回溯后将内核转储从报告中删除" -#: ../bin/apport-retrace.py:43 ../debian/tmp/usr/bin/apport-retrace.py:43 +#: ../debian/tmp/usr/bin/apport-retrace.py:43 ../bin/apport-retrace.py:43 msgid "Override report's CoreFile" msgstr "覆盖报告核心文件" -#: ../bin/apport-retrace.py:45 ../debian/tmp/usr/bin/apport-retrace.py:45 +#: ../debian/tmp/usr/bin/apport-retrace.py:45 ../bin/apport-retrace.py:45 msgid "Override report's ExecutablePath" msgstr "覆盖报告执行路径" -#: ../bin/apport-retrace.py:47 ../debian/tmp/usr/bin/apport-retrace.py:47 +#: ../debian/tmp/usr/bin/apport-retrace.py:47 ../bin/apport-retrace.py:47 msgid "Override report's ProcMaps" msgstr "覆盖报告的进程表" -#: ../bin/apport-retrace.py:49 ../debian/tmp/usr/bin/apport-retrace.py:49 +#: ../debian/tmp/usr/bin/apport-retrace.py:49 ../bin/apport-retrace.py:49 msgid "Rebuild report's Package information" msgstr "重建报告的包信息" -#: ../bin/apport-retrace.py:51 ../debian/tmp/usr/bin/apport-retrace.py:51 +#: ../debian/tmp/usr/bin/apport-retrace.py:51 ../bin/apport-retrace.py:51 msgid "" "Build a temporary sandbox and download/install the necessary packages and " "debug symbols in there; without this option it assumes that the necessary " @@ -962,135 +903,201 @@ "构建临时沙盒，以及下载/安装必要的软件包和调试符号；如果没有该选项，则会假设该系统中已安装了必要的软件包和调试符号。此参数指向该打包系统配置库目录；如果指" "定 \"system\"，则其将使用系统配置文件，但之后，其将只能够追溯当前正在运行的版本上发生的崩溃。" -#: ../bin/apport-retrace.py:53 ../debian/tmp/usr/bin/apport-retrace.py:53 +#: ../debian/tmp/usr/bin/apport-retrace.py:53 ../bin/apport-retrace.py:53 msgid "" "Build another temporary sandbox for installing gdb and its dependencies " "using the same release as the report rather than whatever version of gdb you " "have installed." msgstr "生成另一个临时沙盒，在其中安装报告所述版本的 gdb 和它的依赖项，而不使用您现有版本的 gdb。" -#: ../bin/apport-retrace.py:55 ../debian/tmp/usr/bin/apport-retrace.py:55 +#: ../debian/tmp/usr/bin/apport-retrace.py:55 ../bin/apport-retrace.py:55 msgid "" "Report download/install progress when installing packages into sandbox" msgstr "在将软件包安装到沙盒中时，报告下载和安装的进度" -#: ../bin/apport-retrace.py:57 ../debian/tmp/usr/bin/apport-retrace.py:57 +#: ../debian/tmp/usr/bin/apport-retrace.py:57 ../bin/apport-retrace.py:57 msgid "Prepend timestamps to log messages, for batch operation" msgstr "为进行批量操作，请预先设置时间戳，以记录消息" -#: ../bin/apport-retrace.py:59 ../debian/tmp/usr/bin/apport-retrace.py:59 +#: ../debian/tmp/usr/bin/apport-retrace.py:59 ../bin/apport-retrace.py:59 msgid "" "Create and use third-party repositories from origins specified in reports" msgstr "根据报告中指定的来源创建并使用第三方软件仓库" -#: ../bin/apport-retrace.py:61 ../debian/tmp/usr/bin/apport-retrace.py:61 +#: ../debian/tmp/usr/bin/apport-retrace.py:61 ../bin/apport-retrace.py:61 msgid "Cache directory for packages downloaded in the sandbox" msgstr "下载到沙盒中软件包的缓存目录" -#: ../bin/apport-retrace.py:63 ../debian/tmp/usr/bin/apport-retrace.py:63 +#: ../debian/tmp/usr/bin/apport-retrace.py:63 ../bin/apport-retrace.py:63 msgid "" "Directory for unpacked packages. Future runs will assume that any already " "downloaded package is also extracted to this sandbox." msgstr "用于解压包目录。以后运行将假设任何已下载的包被提取到这个沙盒。" -#: ../bin/apport-retrace.py:67 ../debian/tmp/usr/bin/apport-retrace.py:67 +#: ../debian/tmp/usr/bin/apport-retrace.py:67 ../bin/apport-retrace.py:67 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)" -#: ../bin/apport-retrace.py:69 ../debian/tmp/usr/bin/apport-retrace.py:69 +#: ../debian/tmp/usr/bin/apport-retrace.py:69 ../bin/apport-retrace.py:69 msgid "" "Display retraced stack traces and ask for confirmation before sending them " "to the crash database." msgstr "显示返回的堆栈信息，并询求确认是否将其发送至崩溃数据库。" -#: ../bin/apport-retrace.py:71 ../debian/tmp/usr/bin/apport-retrace.py:71 +#: ../debian/tmp/usr/bin/apport-retrace.py:71 ../bin/apport-retrace.py:71 msgid "" "Path to the duplicate sqlite database (default: no duplicate checking)" msgstr "SQLite 数据库路径重复(默认：不重复检查)" -#: ../bin/apport-retrace.py:73 ../debian/tmp/usr/bin/apport-retrace.py:73 +#: ../debian/tmp/usr/bin/apport-retrace.py:73 ../bin/apport-retrace.py:73 msgid "Do not add StacktraceSource to the report." msgstr "不要将 StacktraceSource 附加到报告中。" -#: ../bin/apport-retrace.py:82 ../debian/tmp/usr/bin/apport-retrace.py:82 +#: ../debian/tmp/usr/bin/apport-retrace.py:82 ../bin/apport-retrace.py:82 msgid "You cannot use -C without -S. Stopping." msgstr "您不能在未指定 -S 选项的情况下使用 -C 选项，停止。" #. translators: don't translate y/n, apport currently only checks for "y" -#: ../bin/apport-retrace.py:115 ../debian/tmp/usr/bin/apport-retrace.py:115 +#: ../debian/tmp/usr/bin/apport-retrace.py:115 ../bin/apport-retrace.py:115 msgid "OK to send these as attachments? [y/n]" msgstr "确定以附件形式发送这些？[y/n]" -#: ../debian/tmp/usr/share/apport/apportcheckresume.py:67 -#: ../data/apportcheckresume.py:67 -msgid "" -"This occurred during a previous suspend, and prevented the system from " -"resuming properly." -msgstr "发生于之前的挂起时，并且使系统午饭正常恢复。" - -#: ../debian/tmp/usr/share/apport/apportcheckresume.py:69 -#: ../data/apportcheckresume.py:69 -msgid "" -"This occurred during a previous hibernation, and prevented the system from " -"resuming properly." -msgstr "发生于之前的休眠时，并且使系统午饭正常恢复。" +#: ../debian/tmp/usr/share/apport/kernel_oops.py:29 ../data/kernel_oops.py:29 +msgid "Your system might become unstable now and might need to be restarted." +msgstr "您的系统现在可能变得不稳定，可能需要重新启动。" -#: ../debian/tmp/usr/share/apport/apportcheckresume.py:74 -#: ../data/apportcheckresume.py:74 -msgid "" -"The resume processing hung very near the end and will have appeared to have " -"completed normally." -msgstr "这个恢复过程已经非常接近尾声，将正常结束。" +#: ../bin/apport-cli.py:80 ../debian/tmp/usr/bin/apport-cli.py:80 +msgid "Press any key to continue..." +msgstr "按任意键继续…" -#: ../kde/apport-kde-mimelnk.desktop.in.h:1 -msgid "Apport crash file" -msgstr "Apport 崩溃文件" +#: ../bin/apport-cli.py:87 ../debian/tmp/usr/bin/apport-cli.py:87 +msgid "What would you like to do? Your options are:" +msgstr "您想做什么？您的选择是：" -#: ../debian/tmp/usr/share/apport/apport-gtk.py:161 ../gtk/apport-gtk.py:161 +#: ../bin/apport-cli.py:100 ../debian/tmp/usr/bin/apport-cli.py:100 #, python-format -msgid "Sorry, the application %s has stopped unexpectedly." -msgstr "对不起，应用程序 %s 意外停止。" +msgid "Please choose (%s):" +msgstr "请选择(%s)：" -#: ../debian/tmp/usr/share/apport/apport-gtk.py:164 ../gtk/apport-gtk.py:164 +#: ../bin/apport-cli.py:164 ../debian/tmp/usr/bin/apport-cli.py:164 #, python-format -msgid "Sorry, %s has closed unexpectedly." -msgstr "对不起，%s 已意外关闭。" +msgid "(%i bytes)" +msgstr "(%i 字节)" -#: ../debian/tmp/usr/share/apport/apport-gtk.py:239 ../gtk/apport-gtk.py:239 +#: ../bin/apport-cli.py:195 ../debian/tmp/usr/bin/apport-cli.py:195 +msgid "" +"After the problem report has been sent, please fill out the form in the\n" +"automatically opened web browser." +msgstr "" +"当问题报告被发出之后，请填写\n" +"自动弹出窗口的表格。" + +#: ../bin/apport-cli.py:198 ../debian/tmp/usr/bin/apport-cli.py:198 #, python-format -msgid "The application %s has stopped responding." -msgstr "应用程序 %s 停止响应。" +msgid "&Send report (%s)" +msgstr "发送报告(&S)(%s)" + +#: ../bin/apport-cli.py:202 ../debian/tmp/usr/bin/apport-cli.py:202 +msgid "&Examine locally" +msgstr "本地检查(&E)" + +#: ../bin/apport-cli.py:206 ../debian/tmp/usr/bin/apport-cli.py:206 +msgid "&View report" +msgstr "查看报告(&V)" + +#: ../bin/apport-cli.py:207 ../debian/tmp/usr/bin/apport-cli.py:207 +msgid "&Keep report file for sending later or copying to somewhere else" +msgstr "保存报告文件以便稍后发送或者复制到其他地方(&K)" -#: ../debian/tmp/usr/share/apport/apport-gtk.py:243 ../gtk/apport-gtk.py:243 +#: ../bin/apport-cli.py:208 ../debian/tmp/usr/bin/apport-cli.py:208 +msgid "Cancel and &ignore future crashes of this program version" +msgstr "终止并忽略这个版本软件以后出现的崩溃(&I)" + +#: ../bin/apport-cli.py:210 ../bin/apport-cli.py:287 ../bin/apport-cli.py:319 +#: ../bin/apport-cli.py:340 ../debian/tmp/usr/bin/apport-cli.py:210 +#: ../debian/tmp/usr/bin/apport-cli.py:287 +#: ../debian/tmp/usr/bin/apport-cli.py:319 +#: ../debian/tmp/usr/bin/apport-cli.py:340 +msgid "&Cancel" +msgstr "取消(&C)" + +#: ../bin/apport-cli.py:238 ../debian/tmp/usr/bin/apport-cli.py:238 +msgid "Problem report file:" +msgstr "问题报告文件：" + +#: ../bin/apport-cli.py:244 ../bin/apport-cli.py:249 +#: ../debian/tmp/usr/bin/apport-cli.py:244 +#: ../debian/tmp/usr/bin/apport-cli.py:249 +msgid "&Confirm" +msgstr "确认(&C)" + +#: ../bin/apport-cli.py:248 ../debian/tmp/usr/bin/apport-cli.py:248 #, python-format -msgid "The program \"%s\" has stopped responding." -msgstr "程序 %s 停止响应。" +msgid "Error: %s" +msgstr "错误：%s" -#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:195 -#: ../data/general-hooks/ubuntu.py:195 +#: ../bin/apport-cli.py:255 ../debian/tmp/usr/bin/apport-cli.py:255 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:203 -#: ../data/general-hooks/ubuntu.py:203 -msgid "You have already encountered this package installation failure." -msgstr "您遭遇到了该软件包安装失败。" +"The collected information can be sent to the developers to improve the\n" +"application. This might take a few minutes." +msgstr "" +"收集到的信息将会传送到开发人员处以改进软件。\n" +"这可能会花费几分钟时间，" -#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:219 -#: ../data/general-hooks/ubuntu.py:219 +#: ../bin/apport-cli.py:268 ../debian/tmp/usr/bin/apport-cli.py:268 msgid "" -"Your system was initially configured with grub version 2, but you have " -"removed it from your system in favor of grub 1 without configuring it. To " -"ensure your bootloader configuration is updated whenever a new kernel is " -"available, open a terminal and run:\n" -"\n" -" sudo apt-get install grub-pc\n" +"The collected information is being sent to the bug tracking system.\n" +"This might take a few minutes." msgstr "" -"系统最初使用 grub2 配置，但是您已经在系统中将其删除，而没有配置grub 1。当一个新内核可用时，为了确保您的引导配置被更新，打开终端并运行：\n" -"\n" -" sudo apt-get install grub-pc\n" +"收集到的信息正在被发送到错误跟踪系统。\n" +"这可能要花费几分钟时间。" + +#: ../bin/apport-cli.py:318 ../debian/tmp/usr/bin/apport-cli.py:318 +msgid "&Done" +msgstr "完成(&D)" + +#: ../bin/apport-cli.py:324 ../debian/tmp/usr/bin/apport-cli.py:324 +msgid "none" +msgstr "无" + +#: ../bin/apport-cli.py:325 ../debian/tmp/usr/bin/apport-cli.py:325 +#, python-format +msgid "Selected: %s. Multiple choices:" +msgstr "已选择：%s。 多重选择：" + +#: ../bin/apport-cli.py:341 ../debian/tmp/usr/bin/apport-cli.py:341 +msgid "Choices:" +msgstr "选择：" + +#: ../bin/apport-cli.py:355 ../debian/tmp/usr/bin/apport-cli.py:355 +msgid "Path to file (Enter to cancel):" +msgstr "文件的路径(回车取消)：" + +#: ../bin/apport-cli.py:361 ../debian/tmp/usr/bin/apport-cli.py:361 +msgid "File does not exist." +msgstr "文件不存在。" + +#: ../bin/apport-cli.py:363 ../debian/tmp/usr/bin/apport-cli.py:363 +msgid "This is a directory." +msgstr "这是一个目录。" + +#: ../bin/apport-cli.py:369 ../debian/tmp/usr/bin/apport-cli.py:369 +msgid "To continue, you must visit the following URL:" +msgstr "要继续，您必须访问下面这个网址：" + +#: ../bin/apport-cli.py:371 ../debian/tmp/usr/bin/apport-cli.py:371 +msgid "" +"You can launch a browser now, or copy this URL into a browser on another " +"computer." +msgstr "您现在可以启动一个浏览器，或者复制这个网址到另外一个电脑的浏览器。" + +#: ../bin/apport-cli.py:373 ../debian/tmp/usr/bin/apport-cli.py:373 +msgid "Launch a browser now" +msgstr "现在启动一个浏览器" + +#: ../bin/apport-cli.py:388 ../debian/tmp/usr/bin/apport-cli.py:388 +msgid "No pending crash reports. Try --help for more information." +msgstr "没有已知的崩溃报告，尝试 --help 以获得更多信息。" diff -Nru language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/appstream-glib.po language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/appstream-glib.po --- language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/appstream-glib.po 2020-07-10 08:58:54.000000000 +0000 +++ language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/appstream-glib.po 2021-01-22 11:31:22.000000000 +0000 @@ -22,8 +22,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2020-07-09 19:49+0000\n" -"X-Generator: Launchpad (build 4809fcb62f445aaa3ae919f7f6c3cc7d156ea57a)\n" +"X-Launchpad-Export-Date: 2021-01-21 20:56+0000\n" +"X-Generator: Launchpad (build 2d1d5e352f0d063d660df2300e31f66bed027fa5)\n" "Language: zh-CN\n" #. TRANSLATORS: command line option diff -Nru language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/appstream.po language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/appstream.po --- language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/appstream.po 2020-07-10 08:58:47.000000000 +0000 +++ language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/appstream.po 2021-01-22 11:31:14.000000000 +0000 @@ -21,8 +21,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2020-07-09 19:38+0000\n" -"X-Generator: Launchpad (build 4809fcb62f445aaa3ae919f7f6c3cc7d156ea57a)\n" +"X-Launchpad-Export-Date: 2021-01-21 20:45+0000\n" +"X-Generator: Launchpad (build 2d1d5e352f0d063d660df2300e31f66bed027fa5)\n" "Language: zh_CN\n" #: tools/appstream-cli.c:157 @@ -46,21 +46,21 @@ msgid "" "A tag must not be localized in metainfo files (upstream " "metadata). Localize the individual paragraphs instead." -msgstr "" +msgstr "不必将标签翻译成metainfo文件（上游元数据）。单独翻译每段文字。" #. TRANSLATORS: Please do not translate AppStream tag and property names (in backticks). #: src/as-validator-issue-tag.h:200 msgid "" "A screenshot must contain at least one image or video in order to be useful. " "Please add an to it." -msgstr "" +msgstr "一个有用的截图应该包含至少一个图片或视频。请添加给截图。" #: src/as-validator-issue-tag.h:205 msgid "" "A screenshot must contain either images or videos, but not both at the same " "time. Please use this screenshot exclusively for either static images or for " "videos." -msgstr "" +msgstr "截图必须包含图像或视频，但不能同时包含两者。请将此截图用于静态图像或视频。" #: src/as-category.c:123 msgctxt "Category of Games" @@ -141,6 +141,8 @@ "an invalid XML tag that would not be rendered correctly in applications " "supporting the metainfo specification." msgstr "" +"AppStream 中的简介只支持有限的文本格式标签：段落 (

) 和列表 (

    ,
      )。以下简介的标记文本中包含无效的 XML " +"标签，不能在支持该源信息渲染标准的应用中正常渲染。" #: data/org.freedesktop.appstream.cli.metainfo.xml:12 msgid "" @@ -175,12 +177,12 @@ msgid "" "As per AppStream specification, the mentioned tag must only appear once in " "this context. Having multiple tags of this kind is not valid." -msgstr "" +msgstr "根据AppStream规范，所提到的标记在此上下文中只能出现一次。具有多个此类标记无效。" #. TRANSLATORS: ascli flag description for: --format as part of the news-to-metainfo command #: tools/appstream-cli.c:766 msgid "Assume the input file is in the selected format ('yaml' or 'text')." -msgstr "" +msgstr "假设输入文件是所选的格式（'yaml' 或者 'text'）。" #: src/as-category.c:101 msgctxt "Category of Education" @@ -278,7 +280,7 @@ #: tools/appstream-cli.c:866 msgid "Compare two version numbers." -msgstr "" +msgstr "比较两个版本号。" #: src/as-provided.c:166 msgid "Component" @@ -296,17 +298,17 @@ #: src/as-validator-issue-tag.h:379 msgid "Consider using a secure (HTTPS) URL for the remote icon link." -msgstr "" +msgstr "请考虑使用安全的 (HTTPS) 远程图标链接 URL。" #: src/as-validator-issue-tag.h:401 msgid "Consider using a secure (HTTPS) URL for this web link." -msgstr "" +msgstr "建议使用安全的（HTTPS）URL 作为此网页链接。" #: src/as-validator-issue-tag.h:194 msgid "" "Consider using a secure (HTTPS) URL to reference this screenshot image or " "video." -msgstr "" +msgstr "请考虑使用安全的 (HTTPS) 链接 URL 来引用此屏幕截图或录像。" #: tools/appstream-cli.c:870 msgid "Convert a YAML or text NEWS file into metainfo releases." @@ -513,7 +515,7 @@ "For videos, only the WebM and Matroska (.mkv) container formats are " "currently supported. The file extension of the referenced video does not " "belong to either of these formats." -msgstr "" +msgstr "目前只支持 WebM 和 Matroska (.mkv) 容器格式的视频。引用的视频所用的扩展名不属于这些格式。" #. TRANSLATORS: ascli flag description for: --format when validating XML files #: tools/appstream-cli.c:131 @@ -571,8 +573,8 @@ msgstr "" #. TRANSLATORS: An invalid XML tag was found, "Found" refers to the tag name found, "Allowed" to the permitted name. -#: src/as-validator.c:525 src/as-validator.c:944 src/as-validator.c:1026 -#: src/as-validator.c:1249 +#: src/as-validator.c:527 src/as-validator.c:946 src/as-validator.c:1028 +#: src/as-validator.c:1251 #, c-format msgid "Found: %s - Allowed: %s" msgstr "" @@ -911,7 +913,7 @@ msgstr "" #. TRANSLATORS: We tried to download from an URL, but the retrieved data was empty -#: src/as-validator.c:364 +#: src/as-validator.c:366 msgid "Retrieved file size was zero." msgstr "" @@ -1529,7 +1531,7 @@ "'provides/font' tag." msgstr "" -#: src/as-validator.c:333 +#: src/as-validator.c:335 msgid "URL format is invalid." msgstr "" diff -Nru language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/aptitude.po language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/aptitude.po --- language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/aptitude.po 2020-07-10 08:58:57.000000000 +0000 +++ language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/aptitude.po 2021-01-22 11:31:25.000000000 +0000 @@ -22,8 +22,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: 2020-07-09 16:51+0000\n" -"X-Generator: Launchpad (build 4809fcb62f445aaa3ae919f7f6c3cc7d156ea57a)\n" +"X-Launchpad-Export-Date: 2021-01-21 17:48+0000\n" +"X-Generator: Launchpad (build 2d1d5e352f0d063d660df2300e31f66bed027fa5)\n" "Language: zh_CN\n" #. TRANSLATORS: These strings describing config items diff -Nru language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/apt-listchanges.po language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/apt-listchanges.po --- language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/apt-listchanges.po 2020-07-10 08:58:47.000000000 +0000 +++ language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/apt-listchanges.po 2021-01-22 11:31:15.000000000 +0000 @@ -13,137 +13,137 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2020-07-09 16:50+0000\n" -"X-Generator: Launchpad (build 4809fcb62f445aaa3ae919f7f6c3cc7d156ea57a)\n" +"X-Launchpad-Export-Date: 2021-01-21 17:47+0000\n" +"X-Generator: Launchpad (build 2d1d5e352f0d063d660df2300e31f66bed027fa5)\n" "Language: \n" "Generated-By: pygettext.py 1.4\n" -#: ../apt-listchanges.py:62 +#: ../apt-listchanges.py:70 #, python-format msgid "Unknown frontend: %s" msgstr "未知前端：%s" -#: ../apt-listchanges.py:78 +#: ../apt-listchanges.py:86 #, python-format msgid "Cannot reopen /dev/tty for stdin: %s" msgstr "" -#: ../apt-listchanges.py:133 +#: ../apt-listchanges.py:142 #, python-format msgid "News for %s" msgstr "%s 的新消息" -#: ../apt-listchanges.py:135 +#: ../apt-listchanges.py:144 #, python-format msgid "Changes for %s" msgstr "%s 的变更" -#: ../apt-listchanges.py:145 +#: ../apt-listchanges.py:154 msgid "Informational notes" msgstr "信息备忘" -#: ../apt-listchanges.py:152 +#: ../apt-listchanges.py:161 msgid "apt-listchanges: News" msgstr "apt-listchanges: 新内容" -#: ../apt-listchanges.py:153 +#: ../apt-listchanges.py:162 msgid "apt-listchanges: Changelogs" msgstr "apt-listchanges: 变更日志" -#: ../apt-listchanges.py:159 +#: ../apt-listchanges.py:168 #, python-format msgid "apt-listchanges: news for %s" msgstr "apt-listchanges: %s 的新内容" -#: ../apt-listchanges.py:160 +#: ../apt-listchanges.py:169 #, python-format msgid "apt-listchanges: changelogs for %s" msgstr "apt-listchanges: %s 的变更日志" -#: ../apt-listchanges.py:166 +#: ../apt-listchanges.py:175 msgid "Didn't find any valid .deb archives" msgstr "" -#: ../apt-listchanges.py:183 +#: ../apt-listchanges.py:194 #, python-format msgid "%s: will be newly installed" msgstr "%s：将被全新安装" -#: ../apt-listchanges.py:210 +#: ../apt-listchanges.py:221 #, python-format msgid "%(pkg)s: Version %(version)s has already been seen" msgstr "%(pkg)s：版本 %(version)s 已经被看过了" -#: ../apt-listchanges.py:214 +#: ../apt-listchanges.py:225 #, python-format msgid "" "%(pkg)s: Version %(version)s is lower than version of related packages " "(%(maxversion)s)" msgstr "" -#: ../apt-listchanges.py:268 +#: ../apt-listchanges.py:279 msgid "Binary NMU of" msgstr "" -#: ../apt-listchanges.py:302 +#: ../apt-listchanges.py:313 #, python-format msgid "Received signal %d, exiting" msgstr "" -#: ../apt-listchanges/apt_listchanges.py:55 +#: ../apt-listchanges/apt_listchanges.py:54 msgid "Aborting" msgstr "正在终止" -#: ../apt-listchanges/apt_listchanges.py:60 +#: ../apt-listchanges/apt_listchanges.py:59 #, python-format msgid "Confirmation failed: %s" msgstr "" -#: ../apt-listchanges/apt_listchanges.py:64 +#: ../apt-listchanges/apt_listchanges.py:63 #, python-format msgid "Mailing %(address)s: %(subject)s" msgstr "正在邮寄给 %(address)s: %(subject)s" -#: ../apt-listchanges/apt_listchanges.py:83 +#: ../apt-listchanges/apt_listchanges.py:82 #, python-format msgid "Failed to send mail to %(address)s: %(errmsg)s" msgstr "" -#: ../apt-listchanges/apt_listchanges.py:92 +#: ../apt-listchanges/apt_listchanges.py:91 #, python-format msgid "The mail frontend needs an installed 'sendmail', using %s" msgstr "" -#: ../apt-listchanges/apt_listchanges.py:98 +#: ../apt-listchanges/apt_listchanges.py:97 #, python-format msgid "The mail frontend needs an e-mail address to be configured, using %s" msgstr "" -#: ../apt-listchanges/apt_listchanges.py:111 +#: ../apt-listchanges/apt_listchanges.py:110 msgid "Available apt-listchanges frontends:" msgstr "" -#: ../apt-listchanges/apt_listchanges.py:113 +#: ../apt-listchanges/apt_listchanges.py:112 msgid "Choose a frontend by entering its number: " msgstr "" -#: ../apt-listchanges/apt_listchanges.py:122 -#: ../apt-listchanges/apt_listchanges.py:431 +#: ../apt-listchanges/apt_listchanges.py:121 +#: ../apt-listchanges/apt_listchanges.py:467 #, python-format msgid "Error: %s" msgstr "" -#: ../apt-listchanges/apt_listchanges.py:124 +#: ../apt-listchanges/apt_listchanges.py:123 #, python-format msgid "Using default frontend: %s" msgstr "" -#: ../apt-listchanges/apt_listchanges.py:167 +#: ../apt-listchanges/apt_listchanges.py:176 #, python-format msgid "$DISPLAY is not set, falling back to %(frontend)s" msgstr "" -#: ../apt-listchanges/apt_listchanges.py:187 +#: ../apt-listchanges/apt_listchanges.py:196 #, python-format msgid "" "The gtk frontend needs a working python3-gi,\n" @@ -151,110 +151,111 @@ "The error is: %(errmsg)s" msgstr "" -#: ../apt-listchanges/apt_listchanges.py:288 +#: ../apt-listchanges/apt_listchanges.py:297 msgid "Do you want to continue? [Y/n] " msgstr "您想继续吗？[Y/n]？ " -#: ../apt-listchanges/apt_listchanges.py:301 -#: ../apt-listchanges/apt_listchanges.py:327 -#: ../apt-listchanges/apt_listchanges.py:335 +#: ../apt-listchanges/apt_listchanges.py:310 +#: ../apt-listchanges/apt_listchanges.py:363 +#: ../apt-listchanges/apt_listchanges.py:371 msgid "Reading changelogs" msgstr "读取变更记录(changelogs)" -#: ../apt-listchanges/apt_listchanges.py:335 +#: ../apt-listchanges/apt_listchanges.py:371 msgid "Done" msgstr "完成" -#: ../apt-listchanges/apt_listchanges.py:368 +#: ../apt-listchanges/apt_listchanges.py:349 +#: ../apt-listchanges/apt_listchanges.py:404 #, python-format msgid "Command %(cmd)s exited with status %(status)d" msgstr "" -#: ../apt-listchanges/apt_listchanges.py:413 +#: ../apt-listchanges/apt_listchanges.py:449 #, python-format msgid "Found user: %(user)s, temporary directory: %(dir)s" msgstr "" -#: ../apt-listchanges/apt_listchanges.py:459 +#: ../apt-listchanges/apt_listchanges.py:495 #, python-format msgid "Error getting user from variable '%(envvar)s': %(errmsg)s" msgstr "" -#: ../apt-listchanges/apt_listchanges.py:465 +#: ../apt-listchanges/apt_listchanges.py:501 msgid "Cannot find suitable user to drop root privileges" msgstr "" -#: ../apt-listchanges/apt_listchanges.py:491 +#: ../apt-listchanges/apt_listchanges.py:527 #, python-format msgid "" "None of the following directories is accessible by user %(user)s: %(dirs)s" msgstr "" -#: ../apt-listchanges/apt_listchanges.py:521 +#: ../apt-listchanges/apt_listchanges.py:557 msgid "press q to quit" msgstr "" -#: ../apt-listchanges/ALCConfig.py:88 +#: ../apt-listchanges/ALCConfig.py:116 #, python-format msgid "Unknown configuration file option: %s" msgstr "" -#: ../apt-listchanges/ALCConfig.py:101 +#: ../apt-listchanges/ALCConfig.py:129 msgid "Usage: apt-listchanges [options] {--apt | filename.deb ...}\n" msgstr "用法: apt-listchanges [选项] {--apt | filename.deb ...}\n" -#: ../apt-listchanges/ALCConfig.py:107 +#: ../apt-listchanges/ALCConfig.py:135 #, python-format msgid "" "Unknown argument %(arg)s for option %(opt)s. Allowed are: %(allowed)s." msgstr "" -#: ../apt-listchanges/ALCConfig.py:119 +#: ../apt-listchanges/ALCConfig.py:147 #, python-format msgid "%(deb)s does not have '.deb' extension" msgstr "" -#: ../apt-listchanges/ALCConfig.py:122 +#: ../apt-listchanges/ALCConfig.py:150 #, python-format msgid "%(deb)s does not exist or is not a file" msgstr "" -#: ../apt-listchanges/ALCConfig.py:125 +#: ../apt-listchanges/ALCConfig.py:153 #, python-format msgid "%(deb)s is not readable" msgstr "" -#: ../apt-listchanges/ALCConfig.py:216 +#: ../apt-listchanges/ALCConfig.py:254 msgid "--since= and --show-all are mutually exclusive" msgstr "" -#: ../apt-listchanges/ALCConfig.py:224 +#: ../apt-listchanges/ALCConfig.py:262 msgid "--since= expects a path to exactly one .deb archive" msgstr "" -#: ../apt-listchanges/DebianFiles.py:119 ../apt-listchanges/DebianFiles.py:128 +#: ../apt-listchanges/DebianFiles.py:118 ../apt-listchanges/DebianFiles.py:127 #, python-format msgid "Error processing '%(what)s': %(errmsg)s" msgstr "" -#: ../apt-listchanges/DebianFiles.py:337 +#: ../apt-listchanges/DebianFiles.py:342 #, python-format msgid "Ignoring `%s' (seems to be a directory!)" msgstr "忽略“%s” (似乎是个目录！)" -#: ../apt-listchanges/DebianFiles.py:410 +#: ../apt-listchanges/DebianFiles.py:417 #, python-format msgid "Calling %(cmd)s to retrieve changelog" msgstr "" -#: ../apt-listchanges/DebianFiles.py:414 +#: ../apt-listchanges/DebianFiles.py:421 #, python-format msgid "" "Unable to retrieve changelog for package %(pkg)s; 'apt-get changelog' failed " "with: %(errmsg)s" msgstr "" -#: ../apt-listchanges/DebianFiles.py:420 +#: ../apt-listchanges/DebianFiles.py:427 #, python-format msgid "" "Unable to retrieve changelog for package %(pkg)s; could not run 'apt-get " @@ -279,30 +280,30 @@ "Select no to abort the installation." msgstr "" -#: ../apt-listchanges/ALCApt.py:55 +#: ../apt-listchanges/ALCApt.py:54 msgid "APT pipeline messages:" msgstr "" -#: ../apt-listchanges/ALCApt.py:63 +#: ../apt-listchanges/ALCApt.py:62 msgid "Packages list:" msgstr "" -#: ../apt-listchanges/ALCApt.py:71 +#: ../apt-listchanges/ALCApt.py:70 msgid "" "APT_HOOK_INFO_FD environment variable is not defined\n" "(is Dpkg::Tools::Options::/usr/bin/apt-listchanges::InfoFD set to 20?)" msgstr "" -#: ../apt-listchanges/ALCApt.py:77 +#: ../apt-listchanges/ALCApt.py:76 msgid "Invalid (non-numeric) value of APT_HOOK_INFO_FD environment variable" msgstr "" -#: ../apt-listchanges/ALCApt.py:80 +#: ../apt-listchanges/ALCApt.py:79 #, python-format msgid "Will read apt pipeline messages from file descriptor %d" msgstr "" -#: ../apt-listchanges/ALCApt.py:83 +#: ../apt-listchanges/ALCApt.py:82 msgid "" "Incorrect value (0) of APT_HOOK_INFO_FD environment variable.\n" "If the warning persists after restart of the package manager (e.g. " @@ -311,19 +312,19 @@ "updated." msgstr "" -#: ../apt-listchanges/ALCApt.py:88 +#: ../apt-listchanges/ALCApt.py:87 msgid "" "APT_HOOK_INFO_FD environment variable is incorrectly defined\n" "(Dpkg::Tools::Options::/usr/bin/apt-listchanges::InfoFD should be greater " "than 2)." msgstr "" -#: ../apt-listchanges/ALCApt.py:94 +#: ../apt-listchanges/ALCApt.py:93 #, python-format msgid "Cannot read from file descriptor %(fd)d: %(errmsg)s" msgstr "" -#: ../apt-listchanges/ALCApt.py:100 +#: ../apt-listchanges/ALCApt.py:99 msgid "" "Wrong or missing VERSION from apt pipeline\n" "(is Dpkg::Tools::Options::/usr/bin/apt-listchanges::Version set to 2?)" @@ -331,29 +332,29 @@ "从 apt 传送来的信息缺少版本号(VERSION)或者存在错误的版本号\n" "(Dpkg::Tools::Options::/usr/bin/apt-listchanges::Version 设为 2 了吗？)" -#: ../apt-listchanges/ALCLog.py:30 ../apt-listchanges/ALCLog.py:36 +#: ../apt-listchanges/ALCLog.py:29 ../apt-listchanges/ALCLog.py:35 #, python-format msgid "apt-listchanges: %(msg)s" msgstr "" -#: ../apt-listchanges/ALCLog.py:33 +#: ../apt-listchanges/ALCLog.py:32 #, python-format msgid "apt-listchanges warning: %(msg)s" msgstr "" -#: ../apt-listchanges/ALCSeenDb.py:55 +#: ../apt-listchanges/ALCSeenDb.py:54 msgid "" "Path to the seen database is unknown.\n" "Please either specify it with --save-seen option\n" "or pass --profile=apt to have it read from the configuration file." msgstr "" -#: ../apt-listchanges/ALCSeenDb.py:66 +#: ../apt-listchanges/ALCSeenDb.py:65 #, python-format msgid "Database %(db)s does not end with %(ext)s" msgstr "" -#: ../apt-listchanges/ALCSeenDb.py:75 +#: ../apt-listchanges/ALCSeenDb.py:74 #, python-format msgid "Database %(db)s failed to load: %(errmsg)s" msgstr "" diff -Nru language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/apt.po language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/apt.po --- language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/apt.po 2020-07-10 08:58:52.000000000 +0000 +++ language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/apt.po 2021-01-22 11:31:20.000000000 +0000 @@ -11,16 +11,16 @@ msgstr "" "Project-Id-Version: apt 2.0.1\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2020-05-13 13:24+0000\n" -"PO-Revision-Date: 2020-05-14 19:20+0000\n" +"POT-Creation-Date: 2021-01-14 14:40+0000\n" +"PO-Revision-Date: 2021-01-14 17:12+0000\n" "Last-Translator: Boyuan Yang <073plan@gmail.com>\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: 2020-07-09 16:49+0000\n" -"X-Generator: Launchpad (build 4809fcb62f445aaa3ae919f7f6c3cc7d156ea57a)\n" +"X-Launchpad-Export-Date: 2021-01-21 17:46+0000\n" +"X-Generator: Launchpad (build 2d1d5e352f0d063d660df2300e31f66bed027fa5)\n" "Language: zh_CN\n" #. TRANSLATOR: Very short word to be displayed before unchanged files in 'apt-get update' @@ -96,11 +96,11 @@ msgid " Done" msgstr " 完成" -#: apt-private/private-cachefile.cc:111 apt-private/private-install.cc:684 +#: apt-private/private-cachefile.cc:111 apt-private/private-install.cc:691 msgid "You might want to run 'apt --fix-broken install' to correct these." msgstr "您也许需要运行“apt --fix-broken install”来修正上面的错误。" -#: apt-private/private-cachefile.cc:113 apt-private/private-install.cc:686 +#: apt-private/private-cachefile.cc:113 apt-private/private-install.cc:693 msgid "" "Unmet dependencies. Try 'apt --fix-broken install' with no packages (or " "specify a solution)." @@ -168,12 +168,12 @@ msgstr "类似 '%s' 的虚拟软件包「不」可以卸载\n" #. TRANSLATORS: Note, this is not an interactive question -#: apt-private/private-cacheset.cc:358 apt-private/private-install.cc:1094 +#: apt-private/private-cacheset.cc:358 apt-private/private-install.cc:1104 #, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" msgstr "软件包 %s 未安装，所以不会被卸载。您的意思是 ‘%s’ 吗？\n" -#: apt-private/private-cacheset.cc:364 apt-private/private-install.cc:1100 +#: apt-private/private-cacheset.cc:364 apt-private/private-install.cc:1110 #, c-format msgid "Package '%s' is not installed, so not removed\n" msgstr "软件包 %s 未安装，所以不会被卸载\n" @@ -183,16 +183,16 @@ msgid "Note, selecting '%s' instead of '%s'\n" msgstr "注意，选中 '%s' 而非 '%s'\n" -#: apt-private/private-cmndline.cc:406 +#: apt-private/private-cmndline.cc:417 msgid "Most used commands:" msgstr "常用命令：" -#: apt-private/private-cmndline.cc:445 +#: apt-private/private-cmndline.cc:457 #, c-format msgid "See %s for more information about the available commands." msgstr "参见 %s 以获取更多关于可用命令的信息。" -#: apt-private/private-cmndline.cc:449 +#: apt-private/private-cmndline.cc:461 msgid "" "Configuration options and syntax is detailed in apt.conf(5).\n" "Information about how to configure sources can be found in sources.list(5).\n" @@ -204,15 +204,15 @@ "软件包及其版本偏好可以通过 apt_preferences(5) 来设置。\n" "关于安全方面的细节可以参考 apt-secure(8).\n" -#: apt-private/private-cmndline.cc:454 +#: apt-private/private-cmndline.cc:466 msgid "This APT has Super Cow Powers." msgstr "本 APT 具有超级牛力。" -#: apt-private/private-cmndline.cc:456 +#: apt-private/private-cmndline.cc:468 msgid "This APT helper has Super Meep Powers." msgstr "本 APT 助手具有超级喵力。" -#: apt-private/private-cmndline.cc:554 +#: apt-private/private-cmndline.cc:565 msgid "" "--force-yes is deprecated, use one of the options starting with --allow " "instead." @@ -287,7 +287,7 @@ #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:70 apt-private/private-install.cc:529 +#: apt-private/private-install.cc:70 apt-private/private-install.cc:536 msgid "The following information may help to resolve the situation:" msgstr "下列信息可能会对解决问题有所帮助：" @@ -423,21 +423,21 @@ msgid "Note: This is done automatically and on purpose by dpkg." msgstr "注意：这是自动被 dpkg 有意完成的。" -#: apt-private/private-install.cc:418 +#: apt-private/private-install.cc:425 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "我们不应该进行删除，无法启动自动删除器" -#: apt-private/private-install.cc:526 +#: apt-private/private-install.cc:533 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "似乎自动卸载工具损坏了一些软件，这不应该发生。请向 apt 提交错误报告。" -#: apt-private/private-install.cc:533 +#: apt-private/private-install.cc:540 msgid "Internal Error, AutoRemover broke stuff" msgstr "内部错误，自动卸载工具坏事了" -#: apt-private/private-install.cc:542 +#: apt-private/private-install.cc:549 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -445,70 +445,70 @@ "required:" msgstr[0] "下列软件包是自动安装的并且现在不需要了：" -#: apt-private/private-install.cc:549 +#: apt-private/private-install.cc:556 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" "%lu packages were automatically installed and are no longer required.\n" msgstr[0] "%lu 个自动安装的的软件包现在已不再需要了。\n" -#: apt-private/private-install.cc:559 +#: apt-private/private-install.cc:566 #, c-format msgid "Use '%s' to remove it." msgid_plural "Use '%s' to remove them." msgstr[0] "使用'%s'来卸载它(它们)。" -#: apt-private/private-install.cc:756 apt-private/private-install.cc:763 -#: apt-private/private-install.cc:771 +#: apt-private/private-install.cc:766 apt-private/private-install.cc:773 +#: apt-private/private-install.cc:781 #, c-format msgid "Unsupported file %s given on commandline" msgstr "命令行中有不支持的文件 %s" -#: apt-private/private-install.cc:836 +#: apt-private/private-install.cc:846 msgid "The following additional packages will be installed:" msgstr "将会同时安装下列软件：" -#: apt-private/private-install.cc:925 +#: apt-private/private-install.cc:935 msgid "Suggested packages:" msgstr "建议安装：" -#: apt-private/private-install.cc:927 +#: apt-private/private-install.cc:937 msgid "Recommended packages:" msgstr "推荐安装：" -#: apt-private/private-install.cc:969 +#: apt-private/private-install.cc:979 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "忽略了 %s，它已经被安装而且没有指定要升级。\n" -#: apt-private/private-install.cc:973 +#: apt-private/private-install.cc:983 #, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "忽略了 %s，它已经被安装而且仅请求了升级。\n" -#: apt-private/private-install.cc:985 +#: apt-private/private-install.cc:995 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "不能重新安装 %s，因为无法下载它。\n" #. TRANSLATORS: First string is package name, second is version -#: apt-private/private-install.cc:991 +#: apt-private/private-install.cc:1001 #, c-format msgid "%s is already the newest version (%s).\n" msgstr "%s 已经是最新版 (%s)。\n" -#: apt-private/private-install.cc:1010 cmdline/apt-get.cc:121 +#: apt-private/private-install.cc:1020 cmdline/apt-get.cc:121 #: cmdline/apt-mark.cc:94 #, c-format msgid "%s set to manually installed.\n" msgstr "%s 已设置为手动安装。\n" -#: apt-private/private-install.cc:1043 +#: apt-private/private-install.cc:1053 #, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n" -#: apt-private/private-install.cc:1052 +#: apt-private/private-install.cc:1062 #, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "由于 %4$s，为 %3$s 选定了版本 %1$s (%2$s)\n" @@ -525,7 +525,7 @@ msgstr[0] "还有 %i 个版本。请使用 -a 选项来查看它(他们)。" #. TRANSLATORS: placeholder is a binary name like apt or apt-get -#: apt-private/private-main.cc:65 +#: apt-private/private-main.cc:66 #, c-format msgid "" "NOTE: This is only a simulation!\n" @@ -727,7 +727,7 @@ msgid "Package files:" msgstr "软件包文件：" -#: apt-private/private-show.cc:495 apt-private/private-show.cc:573 +#: apt-private/private-show.cc:495 apt-private/private-show.cc:579 msgid "Cache is out of sync, can't x-ref a package file" msgstr "缓存尚未同步，无法交差引证(x-ref)一个软件包文件" @@ -1013,7 +1013,7 @@ msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "该命令已废弃。请使用‘apt-mark showauto’。" -#: cmdline/apt-cache.cc:1100 +#: cmdline/apt-cache.cc:1096 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] show pkg1 [pkg2 ...]\n" @@ -1034,31 +1034,31 @@ "那么它显示的信息可能就会过时。不过作为交换，apt-cache 不依赖\n" "当前软件源的可用性（比如：离线状态）。\n" -#: cmdline/apt-cache.cc:1116 +#: cmdline/apt-cache.cc:1112 msgid "Show source records" msgstr "显示源文件的各项记录" -#: cmdline/apt-cache.cc:1122 +#: cmdline/apt-cache.cc:1118 msgid "Search the package list for a regex pattern" msgstr "根据正则表达式搜索软件包列表" -#: cmdline/apt-cache.cc:1123 +#: cmdline/apt-cache.cc:1119 msgid "Show raw dependency information for a package" msgstr "显示该软件包的依赖关系信息" -#: cmdline/apt-cache.cc:1124 +#: cmdline/apt-cache.cc:1120 msgid "Show reverse dependency information for a package" msgstr "显示所有依赖于该软件包的软件包名字" -#: cmdline/apt-cache.cc:1127 +#: cmdline/apt-cache.cc:1123 msgid "Show a readable record for the package" msgstr "以便于阅读的格式介绍该软件包" -#: cmdline/apt-cache.cc:1128 +#: cmdline/apt-cache.cc:1124 msgid "List the names of all packages in the system" msgstr "列出所有软件包的名字" -#: cmdline/apt-cache.cc:1130 +#: cmdline/apt-cache.cc:1126 msgid "Show policy settings" msgstr "显示软件包的安装设置状态" @@ -1253,7 +1253,7 @@ msgid "GetSrvRec failed for %s" msgstr "GetSrvRec 失败，因为 %s" -#: cmdline/apt-helper.cc:293 +#: cmdline/apt-helper.cc:301 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] cat-file file ...\n" @@ -1268,31 +1268,31 @@ "apt-helper 汇集了各种各样的功能来供shell脚本调用，比如\n" "使用与APT相同的代理设置，或者相同的捕获系统。\n" -#: cmdline/apt-helper.cc:305 +#: cmdline/apt-helper.cc:313 msgid "download the given uri to the target-path" msgstr "将 URI 指定的文件下载到目标路径" -#: cmdline/apt-helper.cc:306 +#: cmdline/apt-helper.cc:314 msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)" msgstr "查询一个 SRV 记录 (如： _http._tcp.ftp.debian.org)" -#: cmdline/apt-helper.cc:307 +#: cmdline/apt-helper.cc:315 msgid "concatenate files, with automatic decompression" msgstr "自动解压并连接文件" -#: cmdline/apt-helper.cc:308 +#: cmdline/apt-helper.cc:316 msgid "detect proxy using apt.conf" msgstr "用 apt.conf 检测代理设置" -#: cmdline/apt-helper.cc:309 +#: cmdline/apt-helper.cc:317 msgid "wait for system to be online" msgstr "等待系统上线" -#: cmdline/apt-helper.cc:310 +#: cmdline/apt-helper.cc:318 msgid "drop privileges before running given command" msgstr "运行给定命令前先降低权限" -#: cmdline/apt-helper.cc:311 +#: cmdline/apt-helper.cc:319 msgid "analyse a pattern" msgstr "分析一个模式" @@ -1530,28 +1530,28 @@ msgid "Unknown date format" msgstr "无法识别的日期格式" -#: methods/basehttp.cc:636 +#: methods/basehttp.cc:652 msgid "Bad header data" msgstr "错误的报头数据" -#: methods/basehttp.cc:655 methods/basehttp.cc:781 +#: methods/basehttp.cc:671 msgid "Connection failed" msgstr "连接失败" -#: methods/basehttp.cc:708 methods/ftp.cc:970 methods/http.cc:620 -#: methods/http.cc:879 +#: methods/basehttp.cc:724 methods/ftp.cc:970 methods/http.cc:620 +#: methods/http.cc:858 #, c-format msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?" msgstr "文件尺寸不符(%llu != %llu)。您使用的镜像正在同步中？" -#: methods/basehttp.cc:749 +#: methods/basehttp.cc:765 #, c-format msgid "" "Automatically disabled %s due to incorrect response from server/proxy. (man " "5 apt.conf)" msgstr "由于服务器或代理的响应错误，因此自动禁止 %s。（参见 man 5 apt.conf）" -#: methods/basehttp.cc:859 +#: methods/basehttp.cc:866 msgid "Internal error" msgstr "内部错误" @@ -1635,32 +1635,32 @@ #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:364 methods/rsh.cc:457 +#: methods/connect.cc:361 methods/rsh.cc:457 #, c-format msgid "Connecting to %s" msgstr "正在连接 %s" -#: methods/connect.cc:400 methods/connect.cc:421 +#: methods/connect.cc:397 methods/connect.cc:418 #, c-format msgid "Could not resolve '%s'" msgstr "无法解析域名“%s”" -#: methods/connect.cc:428 +#: methods/connect.cc:425 #, c-format msgid "Temporary failure resolving '%s'" msgstr "暂时不能解析域名“%s”" -#: methods/connect.cc:433 +#: methods/connect.cc:430 #, c-format msgid "System error resolving '%s:%s'" msgstr "解析“%s:%s”时出现系统故障" -#: methods/connect.cc:436 +#: methods/connect.cc:433 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "解析“%s:%s”时，出现了某些故障(%i - %s)" -#: methods/connect.cc:472 +#: methods/connect.cc:469 #, c-format msgid "Unable to connect to %s:%s:" msgstr "不能连接到 %s：%s：" @@ -1791,7 +1791,7 @@ msgid "Unable to accept connection" msgstr "无法接受连接" -#: methods/ftp.cc:918 methods/http.cc:1037 methods/rsh.cc:334 +#: methods/ftp.cc:918 methods/http.cc:1015 methods/rsh.cc:334 msgid "Problem hashing file" msgstr "把文件加入哈希表时出错" @@ -1866,31 +1866,31 @@ "available:\n" msgstr "由于没有公钥，无法验证下列签名：\n" -#: methods/http.cc:716 +#: methods/http.cc:715 msgid "Error writing to the file" msgstr "写入文件出错" -#: methods/http.cc:733 +#: methods/http.cc:724 msgid "Error reading from server. Remote end closed connection" msgstr "从服务器读取数据时出错，对方关闭了连接" -#: methods/http.cc:737 +#: methods/http.cc:728 msgid "Error reading from server" msgstr "从服务器读取数据出错" -#: methods/http.cc:774 +#: methods/http.cc:747 msgid "Error writing to file" msgstr "写入文件出错" -#: methods/http.cc:841 +#: methods/http.cc:815 msgid "Select failed" msgstr "select 调用出错" -#: methods/http.cc:847 +#: methods/http.cc:821 msgid "Connection timed out" msgstr "连接超时" -#: methods/http.cc:871 +#: methods/http.cc:870 msgid "Error writing to output file" msgstr "写输出文件时出错" @@ -1898,12 +1898,12 @@ msgid "The list of sources could not be read." msgstr "无法读取源列表。" -#: methods/rred.cc:703 methods/rred.cc:713 +#: methods/rred.cc:732 methods/rred.cc:742 #, c-format msgid "Failed to stat %s" msgstr "无法获得 %s 的状态" -#: methods/rred.cc:710 +#: methods/rred.cc:739 msgid "Failed to set modification time" msgstr "无法设置文件的修改日期" diff -Nru language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/apturl.po language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/apturl.po --- language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/apturl.po 2020-07-10 08:58:52.000000000 +0000 +++ language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/apturl.po 2021-01-22 11:31:19.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: 2020-07-09 18:49+0000\n" -"X-Generator: Launchpad (build 4809fcb62f445aaa3ae919f7f6c3cc7d156ea57a)\n" +"X-Launchpad-Export-Date: 2021-01-21 19:52+0000\n" +"X-Generator: Launchpad (build 2d1d5e352f0d063d660df2300e31f66bed027fa5)\n" #: ../apturl-gtk:49 ../apturl-kde:52 msgid "User requested interrupt." diff -Nru language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/apt-utils.po language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/apt-utils.po --- language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/apt-utils.po 2020-07-10 08:58:52.000000000 +0000 +++ language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/apt-utils.po 2021-01-22 11:31:19.000000000 +0000 @@ -11,15 +11,15 @@ msgstr "" "Project-Id-Version: apt 2.0.1\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2020-05-13 13:24+0000\n" -"PO-Revision-Date: 2020-05-14 19:20+0000\n" +"POT-Creation-Date: 2021-01-14 14:40+0000\n" +"PO-Revision-Date: 2021-01-14 17:08+0000\n" "Last-Translator: Boyuan Yang <073plan@gmail.com>\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: 2020-07-09 16:49+0000\n" -"X-Generator: Launchpad (build 4809fcb62f445aaa3ae919f7f6c3cc7d156ea57a)\n" +"X-Launchpad-Export-Date: 2021-01-21 17:46+0000\n" +"X-Generator: Launchpad (build 2d1d5e352f0d063d660df2300e31f66bed027fa5)\n" "Language: zh_CN\n" #: cmdline/apt-dump-solver.cc:37 diff -Nru language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/aspell.po language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/aspell.po --- language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/aspell.po 2020-07-10 08:58:49.000000000 +0000 +++ language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/aspell.po 2021-01-22 11:31:17.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: 2020-07-09 16:51+0000\n" -"X-Generator: Launchpad (build 4809fcb62f445aaa3ae919f7f6c3cc7d156ea57a)\n" +"X-Launchpad-Export-Date: 2021-01-21 17:48+0000\n" +"X-Generator: Launchpad (build 2d1d5e352f0d063d660df2300e31f66bed027fa5)\n" "Language: zh_CN\n" "X-Bugs: Report translation errors to the Language-Team address.\n" diff -Nru language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/at-spi2-core.po language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/at-spi2-core.po --- language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/at-spi2-core.po 2020-07-10 08:58:46.000000000 +0000 +++ language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/at-spi2-core.po 2021-01-22 11:31:13.000000000 +0000 @@ -18,8 +18,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2020-07-09 19:13+0000\n" -"X-Generator: Launchpad (build 4809fcb62f445aaa3ae919f7f6c3cc7d156ea57a)\n" +"X-Launchpad-Export-Date: 2021-01-21 20:17+0000\n" +"X-Generator: Launchpad (build 2d1d5e352f0d063d660df2300e31f66bed027fa5)\n" "Language: zh_CN\n" #: atspi/atspi-component.c:326 atspi/atspi-misc.c:1073 atspi/atspi-value.c:111 diff -Nru language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/attr.po language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/attr.po --- language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/attr.po 2020-07-10 08:58:54.000000000 +0000 +++ language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/attr.po 2021-01-22 11:31: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: 2020-07-09 16:51+0000\n" -"X-Generator: Launchpad (build 4809fcb62f445aaa3ae919f7f6c3cc7d156ea57a)\n" +"X-Launchpad-Export-Date: 2021-01-21 17:48+0000\n" +"X-Generator: Launchpad (build 2d1d5e352f0d063d660df2300e31f66bed027fa5)\n" #: libattr/attr_copy_file.c:78 libattr/attr_copy_file.c:93 #: libattr/attr_copy_fd.c:80 libattr/attr_copy_fd.c:95 diff -Nru language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/bash.po language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/bash.po --- language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/bash.po 2020-07-10 08:58:50.000000000 +0000 +++ language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/bash.po 2021-01-22 11:31:17.000000000 +0000 @@ -40,88 +40,88 @@ "Project-Id-Version: bash 5.0-beta2\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-12-19 15:52-0500\n" -"PO-Revision-Date: 2020-07-08 00:56+0000\n" +"PO-Revision-Date: 2020-07-16 12:03+0000\n" "Last-Translator: Boyuan Yang <073plan@gmail.com>\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: 2020-07-09 16:52+0000\n" -"X-Generator: Launchpad (build 4809fcb62f445aaa3ae919f7f6c3cc7d156ea57a)\n" +"X-Launchpad-Export-Date: 2021-01-21 17:49+0000\n" +"X-Generator: Launchpad (build 2d1d5e352f0d063d660df2300e31f66bed027fa5)\n" "Language: zh_CN\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -#: arrayfunc.c:58 +#: arrayfunc.c:66 msgid "bad array subscript" msgstr "数组下标不正确" -#: arrayfunc.c:377 builtins/declare.def:638 variables.c:2254 variables.c:2280 -#: variables.c:3108 +#: arrayfunc.c:421 builtins/declare.def:638 variables.c:2274 variables.c:2300 +#: variables.c:3133 #, c-format msgid "%s: removing nameref attribute" msgstr "%s：正在移除名称引用属性" -#: arrayfunc.c:402 builtins/declare.def:851 +#: arrayfunc.c:446 builtins/declare.def:851 #, c-format msgid "%s: cannot convert indexed to associative array" msgstr "%s：无法将索引数组转化为关联数组" -#: arrayfunc.c:586 +#: arrayfunc.c:700 #, c-format msgid "%s: invalid associative array key" msgstr "%s：无效的关联数组键" -#: arrayfunc.c:588 +#: arrayfunc.c:702 #, c-format msgid "%s: cannot assign to non-numeric index" msgstr "%s：无法为非数字的索引赋值" -#: arrayfunc.c:633 +#: arrayfunc.c:747 #, c-format msgid "%s: %s: must use subscript when assigning associative array" msgstr "%s：%s：为关联数组赋值时必须使用下标" -#: bashhist.c:451 +#: bashhist.c:452 #, c-format msgid "%s: cannot create: %s" msgstr "%s：无法创建: %s" -#: bashline.c:4144 +#: bashline.c:4310 msgid "bash_execute_unix_command: cannot find keymap for command" msgstr "bash_execute_unix_command: 无法为命令找到键映射" -#: bashline.c:4254 +#: bashline.c:4459 #, c-format msgid "%s: first non-whitespace character is not `\"'" msgstr "%s：第一个非空字符不是“\"”" -#: bashline.c:4283 +#: bashline.c:4488 #, c-format msgid "no closing `%c' in %s" msgstr "%2$s 中没有闭合的“%1$c”" -#: bashline.c:4317 +#: bashline.c:4519 #, c-format msgid "%s: missing colon separator" msgstr "%s：缺少冒号分隔符" -#: braces.c:331 +#: braces.c:327 #, c-format msgid "brace expansion: cannot allocate memory for %s" msgstr "大括号展开：无法为 %s 分配内存" -#: braces.c:429 +#: braces.c:406 #, c-format msgid "brace expansion: failed to allocate memory for %u elements" msgstr "大括号展开：为 %u 个元素分配内存失败" -#: braces.c:474 +#: braces.c:451 #, c-format msgid "brace expansion: failed to allocate memory for `%s'" msgstr "大括号展开：为“%s”分配内存失败" -#: builtins/alias.def:131 variables.c:1842 +#: builtins/alias.def:131 variables.c:1844 #, c-format msgid "`%s': invalid alias name" msgstr "“%s”: 无效的别名" @@ -140,22 +140,22 @@ msgid "%s: cannot read: %s" msgstr "%s：无法读取: %s" -#: builtins/bind.def:304 builtins/bind.def:334 +#: builtins/bind.def:328 builtins/bind.def:358 #, c-format msgid "`%s': unknown function name" msgstr "“%s”: 未知函数名" -#: builtins/bind.def:312 +#: builtins/bind.def:336 #, c-format msgid "%s is not bound to any keys.\n" msgstr "%s 未与任何键绑定。\n" -#: builtins/bind.def:316 +#: builtins/bind.def:340 #, c-format msgid "%s can be invoked via " msgstr "%s 可以被调用，通过 " -#: builtins/bind.def:353 builtins/bind.def:368 +#: builtins/bind.def:378 builtins/bind.def:395 #, c-format msgid "`%s': cannot unbind" msgstr "“%s”: 无法解除绑定" @@ -178,19 +178,19 @@ " \n" " 不带 EXPR 时，返回 " -#: builtins/cd.def:326 +#: builtins/cd.def:327 msgid "HOME not set" msgstr "HOME 未设定" -#: builtins/cd.def:334 builtins/common.c:161 test.c:891 +#: builtins/cd.def:335 builtins/common.c:161 test.c:901 msgid "too many arguments" msgstr "参数太多" -#: builtins/cd.def:341 +#: builtins/cd.def:342 msgid "null directory" msgstr "空目录" -#: builtins/cd.def:352 +#: builtins/cd.def:353 msgid "OLDPWD not set" msgstr "OLDPWD 未设定" @@ -209,7 +209,7 @@ msgid "%s: usage: " msgstr "%s：用法： " -#: builtins/common.c:193 shell.c:510 shell.c:838 +#: builtins/common.c:193 shell.c:516 shell.c:844 #, c-format msgid "%s: option requires an argument" msgstr "%s：选项需要一个参数" @@ -224,7 +224,7 @@ msgid "%s: not found" msgstr "%s：未找到" -#: builtins/common.c:216 shell.c:851 +#: builtins/common.c:216 shell.c:857 #, c-format msgid "%s: invalid option" msgstr "%s：无效选项" @@ -234,7 +234,7 @@ msgid "%s: invalid option name" msgstr "%s：无效的选项名" -#: builtins/common.c:230 execute_cmd.c:2372 general.c:352 general.c:357 +#: builtins/common.c:230 execute_cmd.c:2373 general.c:368 general.c:373 #, c-format msgid "`%s': not a valid identifier" msgstr "“%s”: 不是有效的标识符" @@ -247,7 +247,7 @@ msgid "invalid hex number" msgstr "无效的十六进制数" -#: builtins/common.c:244 expr.c:1564 +#: builtins/common.c:244 expr.c:1569 msgid "invalid number" msgstr "无效数字" @@ -323,73 +323,73 @@ msgid "error getting terminal attributes: %s" msgstr "获取终端属性时出错: %s" -#: builtins/common.c:579 +#: builtins/common.c:635 #, c-format msgid "%s: error retrieving current directory: %s: %s\n" msgstr "%s：获取当前目录时出错: %s：%s\n" -#: builtins/common.c:645 builtins/common.c:647 +#: builtins/common.c:701 builtins/common.c:703 #, c-format msgid "%s: ambiguous job spec" msgstr "%s：模糊的任务声明" -#: builtins/common.c:908 +#: builtins/common.c:964 msgid "help not available in this version" msgstr "此版本内帮助不可用" -#: builtins/complete.def:281 +#: builtins/complete.def:287 #, c-format msgid "%s: invalid action name" msgstr "%s：无效的动作名" -#: builtins/complete.def:474 builtins/complete.def:679 -#: builtins/complete.def:910 +#: builtins/complete.def:486 builtins/complete.def:634 +#: builtins/complete.def:865 #, c-format msgid "%s: no completion specification" msgstr "%s：没有补全声明" -#: builtins/complete.def:733 +#: builtins/complete.def:688 msgid "warning: -F option may not work as you expect" msgstr "警告: -F 选项可能不像您预期的那样工作" -#: builtins/complete.def:735 +#: builtins/complete.def:690 msgid "warning: -C option may not work as you expect" msgstr "警告: -C 选项可能不像您预期的那样工作" -#: builtins/complete.def:883 +#: builtins/complete.def:838 msgid "not currently executing completion function" msgstr "当前未执行补全功能" -#: builtins/declare.def:132 +#: builtins/declare.def:134 msgid "can only be used in a function" msgstr "只能在函数中使用" -#: builtins/declare.def:369 builtins/declare.def:756 +#: builtins/declare.def:363 builtins/declare.def:756 #, c-format msgid "%s: reference variable cannot be an array" msgstr "%s：引用变量不能为数组" -#: builtins/declare.def:380 variables.c:3363 +#: builtins/declare.def:374 variables.c:3385 #, c-format msgid "%s: nameref variable self references not allowed" msgstr "%s：不允许名称引用变量引用自身" -#: builtins/declare.def:385 variables.c:2084 variables.c:3272 variables.c:3285 -#: variables.c:3360 +#: builtins/declare.def:379 variables.c:2104 variables.c:3304 variables.c:3312 +#: variables.c:3382 #, c-format msgid "%s: circular name reference" msgstr "%s：循环变量名引用" -#: builtins/declare.def:390 builtins/declare.def:762 builtins/declare.def:773 +#: builtins/declare.def:384 builtins/declare.def:762 builtins/declare.def:773 #, c-format msgid "`%s': invalid variable name for name reference" msgstr "“%s”: 无效的名称引用变量名" -#: builtins/declare.def:520 +#: builtins/declare.def:514 msgid "cannot use `-f' to make functions" msgstr "无法用 `-f' 生成函数" -#: builtins/declare.def:532 execute_cmd.c:5852 +#: builtins/declare.def:526 execute_cmd.c:5986 #, c-format msgid "%s: readonly function" msgstr "%s：只读函数" @@ -404,7 +404,7 @@ msgid "%s: cannot destroy array variables in this way" msgstr "%s：无法以这种方式销毁数组变量" -#: builtins/declare.def:845 builtins/read.def:788 +#: builtins/declare.def:845 builtins/read.def:815 #, c-format msgid "%s: cannot convert associative to indexed array" msgstr "%s：无法将关联数组转化为索引数组" @@ -418,27 +418,27 @@ msgid "cannot open shared object %s: %s" msgstr "无法打开共享对象 %s：%s" -#: builtins/enable.def:369 +#: builtins/enable.def:371 #, c-format msgid "cannot find %s in shared object %s: %s" msgstr "无法在共享对象 %2$s 中找到 %1$s: %3$s" -#: builtins/enable.def:387 +#: builtins/enable.def:392 #, c-format msgid "load function for %s returns failure (%d): not loaded" msgstr "为 %s 载入函数失败 (%d): 未载入" -#: builtins/enable.def:512 +#: builtins/enable.def:517 #, c-format msgid "%s: not dynamically loaded" msgstr "%s：未以动态方式加载" -#: builtins/enable.def:538 +#: builtins/enable.def:543 #, c-format msgid "%s: cannot delete: %s" msgstr "%s：无法删除: %s" -#: builtins/evalfile.c:138 builtins/hash.def:184 execute_cmd.c:5684 +#: builtins/evalfile.c:138 builtins/hash.def:185 execute_cmd.c:5818 #, c-format msgid "%s: is a directory" msgstr "%s：是一个目录" @@ -453,12 +453,12 @@ msgid "%s: file is too large" msgstr "%s：文件太大" -#: builtins/evalfile.c:188 builtins/evalfile.c:206 shell.c:1623 +#: builtins/evalfile.c:188 builtins/evalfile.c:206 shell.c:1647 #, c-format msgid "%s: cannot execute binary file" msgstr "%s：无法执行二进制文件" -#: builtins/exec.def:156 builtins/exec.def:158 builtins/exec.def:243 +#: builtins/exec.def:158 builtins/exec.def:160 builtins/exec.def:246 #, c-format msgid "%s: cannot execute: %s" msgstr "%s：无法执行: %s" @@ -482,15 +482,16 @@ msgid "There are running jobs.\n" msgstr "有运行中的任务。\n" -#: builtins/fc.def:265 +#: builtins/fc.def:275 builtins/fc.def:373 builtins/fc.def:417 msgid "no command found" msgstr "未找到命令" -#: builtins/fc.def:323 builtins/fc.def:372 +#: builtins/fc.def:363 builtins/fc.def:368 builtins/fc.def:407 +#: builtins/fc.def:412 msgid "history specification" msgstr "历史声明" -#: builtins/fc.def:393 +#: builtins/fc.def:444 #, c-format msgid "%s: cannot open temp file: %s" msgstr "%s：无法打开临时文件: %s" @@ -518,12 +519,12 @@ msgid "hashing disabled" msgstr "已禁用哈希" -#: builtins/hash.def:138 +#: builtins/hash.def:139 #, c-format msgid "%s: hash table empty\n" msgstr "%s：哈希表为空\n" -#: builtins/hash.def:266 +#: builtins/hash.def:267 #, c-format msgid "hits\tcommand\n" msgstr "命中\t命令\n" @@ -563,21 +564,21 @@ "名称旁边的星号(*)表示该命令被禁用。\n" "\n" -#: builtins/history.def:154 +#: builtins/history.def:155 msgid "cannot use more than one of -anrw" msgstr "最多只能使用 -anrw 选项中的一个" -#: builtins/history.def:187 builtins/history.def:197 builtins/history.def:212 -#: builtins/history.def:229 builtins/history.def:241 builtins/history.def:248 +#: builtins/history.def:188 builtins/history.def:198 builtins/history.def:213 +#: builtins/history.def:230 builtins/history.def:242 builtins/history.def:249 msgid "history position" msgstr "历史位置" -#: builtins/history.def:331 +#: builtins/history.def:340 #, c-format msgid "%s: invalid timestamp" msgstr "%s：无效时间戳" -#: builtins/history.def:442 +#: builtins/history.def:451 #, c-format msgid "%s: history expansion failed" msgstr "%s：历史扩展失败" @@ -600,7 +601,7 @@ msgid "Unknown error" msgstr "未知错误" -#: builtins/let.def:97 builtins/let.def:122 expr.c:638 expr.c:656 +#: builtins/let.def:97 builtins/let.def:122 expr.c:639 expr.c:657 msgid "expression expected" msgstr "需要表达式" @@ -609,12 +610,12 @@ msgid "%s: not an indexed array" msgstr "%s：不是一个索引数组" -#: builtins/mapfile.def:271 builtins/read.def:307 +#: builtins/mapfile.def:271 builtins/read.def:308 #, c-format msgid "%s: invalid file descriptor specification" msgstr "%s：无效的文件描述符声明" -#: builtins/mapfile.def:279 builtins/read.def:314 +#: builtins/mapfile.def:279 builtins/read.def:315 #, c-format msgid "%d: invalid file descriptor: %s" msgstr "%d: 无效的文件描述符: %s" @@ -642,36 +643,36 @@ msgid "array variable support required" msgstr "需要数组变量支持" -#: builtins/printf.def:420 +#: builtins/printf.def:419 #, c-format msgid "`%s': missing format character" msgstr "“%s”: 缺少格式字符" -#: builtins/printf.def:475 +#: builtins/printf.def:474 #, c-format msgid "`%c': invalid time format specification" msgstr "“%c”：无效的时间格式声明" -#: builtins/printf.def:677 +#: builtins/printf.def:676 #, c-format msgid "`%c': invalid format character" msgstr "“%c”：无效格式字符" -#: builtins/printf.def:703 +#: builtins/printf.def:702 #, c-format msgid "warning: %s: %s" msgstr "警告: %s：%s" -#: builtins/printf.def:789 +#: builtins/printf.def:788 #, c-format msgid "format parsing problem: %s" msgstr "格式解析问题: %s" -#: builtins/printf.def:886 +#: builtins/printf.def:885 msgid "missing hex digit for \\x" msgstr "使用了 \\x 但缺少十六进制位" -#: builtins/printf.def:901 +#: builtins/printf.def:900 #, c-format msgid "missing unicode digit for \\%c" msgstr "使用了 \\%c 但缺少 unicode 数" @@ -823,12 +824,12 @@ " \n" " `dirs' 内建变量显示目录栈。" -#: builtins/read.def:279 +#: builtins/read.def:280 #, c-format msgid "%s: invalid timeout specification" msgstr "%s：无效的超时声明" -#: builtins/read.def:733 +#: builtins/read.def:755 #, c-format msgid "read error: %d: %s" msgstr "读错误: %d: %s" @@ -837,21 +838,21 @@ msgid "can only `return' from a function or sourced script" msgstr "只能从函数或者源脚本返回(`return')" -#: builtins/set.def:852 +#: builtins/set.def:869 msgid "cannot simultaneously unset a function and a variable" msgstr "无法同时取消设定一个函数和一个变量" -#: builtins/set.def:904 +#: builtins/common.c:1013 builtins/set.def:932 variables.c:3844 #, c-format msgid "%s: cannot unset" msgstr "%s：无法取消设定" -#: builtins/set.def:925 variables.c:3813 +#: builtins/common.c:1008 builtins/set.def:953 variables.c:3839 #, c-format msgid "%s: cannot unset: readonly %s" msgstr "%s：无法取消设定: 只读 %s" -#: builtins/set.def:938 +#: builtins/set.def:966 #, c-format msgid "%s: not an array variable" msgstr "%s：不是数组变量" @@ -866,7 +867,7 @@ msgid "%s: cannot export" msgstr "%s：无法导出" -#: builtins/shift.def:73 builtins/shift.def:79 +#: builtins/shift.def:72 builtins/shift.def:79 msgid "shift count" msgstr "位移计数" @@ -874,7 +875,7 @@ msgid "cannot set and unset shell options simultaneously" msgstr "无法同时设定和取消设定 shell 选项" -#: builtins/shopt.def:420 +#: builtins/shopt.def:428 #, c-format msgid "%s: invalid shell option name" msgstr "%s：无效的 shell 选项名" @@ -931,26 +932,26 @@ msgid "%s is hashed (%s)\n" msgstr "%s 已被录入哈希表 (%s)\n" -#: builtins/ulimit.def:396 +#: builtins/ulimit.def:400 #, c-format msgid "%s: invalid limit argument" msgstr "%s：无效的 limit 参数" -#: builtins/ulimit.def:422 +#: builtins/ulimit.def:426 #, c-format msgid "`%c': bad command" msgstr "“%c”：命令错误" -#: builtins/ulimit.def:451 +#: builtins/ulimit.def:455 #, c-format msgid "%s: cannot get limit: %s" msgstr "%s：无法获取 limit 值: %s" -#: builtins/ulimit.def:477 +#: builtins/ulimit.def:481 msgid "limit" msgstr "limit" -#: builtins/ulimit.def:489 builtins/ulimit.def:789 +#: builtins/ulimit.def:493 builtins/ulimit.def:793 #, c-format msgid "%s: cannot modify limit: %s" msgstr "%s：无法修改 limit 值: %s" @@ -1010,76 +1011,75 @@ msgid "%s: unbound variable" msgstr "%s：未绑定的变量" -#: eval.c:245 -#, c-format +#: eval.c:242 msgid "timed out waiting for input: auto-logout\n" msgstr " 等待输入超时：自动注销\n" -#: execute_cmd.c:536 +#: execute_cmd.c:537 #, c-format msgid "cannot redirect standard input from /dev/null: %s" msgstr "无法从 /dev/null 重定向标准输入: %s" -#: execute_cmd.c:1306 +#: execute_cmd.c:1297 #, c-format msgid "TIMEFORMAT: `%c': invalid format character" msgstr "时间格式: `%c': 无效的格式字符" -#: execute_cmd.c:2361 +#: execute_cmd.c:2362 #, c-format msgid "execute_coproc: coproc [%d:%s] still exists" msgstr "execute_coproc: 副进程 [%d:%s] 仍然存在" -#: execute_cmd.c:2485 +#: execute_cmd.c:2486 msgid "pipe error" msgstr "管道错误" -#: execute_cmd.c:4671 +#: execute_cmd.c:4793 #, c-format msgid "eval: maximum eval nesting level exceeded (%d)" msgstr "eval: 超出最大 eval 嵌套层数 (%d)" -#: execute_cmd.c:4683 +#: execute_cmd.c:4805 #, c-format msgid "%s: maximum source nesting level exceeded (%d)" msgstr "%s：超出最大 source 嵌套层数 (%d)" -#: execute_cmd.c:4791 +#: execute_cmd.c:4913 #, c-format msgid "%s: maximum function nesting level exceeded (%d)" msgstr "%s：超出最大函数嵌套层数 (%d)" -#: execute_cmd.c:5340 +#: execute_cmd.c:5467 #, c-format msgid "%s: restricted: cannot specify `/' in command names" msgstr "%s：受限的: 无法在命令名中使用 `/'" -#: execute_cmd.c:5438 +#: execute_cmd.c:5574 #, c-format msgid "%s: command not found" msgstr "%s：未找到命令" -#: execute_cmd.c:5682 +#: execute_cmd.c:5816 #, c-format msgid "%s: %s" msgstr "%s：%s" -#: execute_cmd.c:5720 +#: execute_cmd.c:5854 #, c-format msgid "%s: %s: bad interpreter" msgstr "%s：%s：解释器错误" -#: execute_cmd.c:5757 +#: execute_cmd.c:5891 #, c-format msgid "%s: cannot execute binary file: %s" msgstr "%s：无法执行二进制文件: %s" -#: execute_cmd.c:5843 +#: execute_cmd.c:5977 #, c-format msgid "`%s': is a special builtin" msgstr "“%s”: 特殊内建" -#: execute_cmd.c:5895 +#: execute_cmd.c:6029 #, c-format msgid "cannot duplicate fd %d to fd %d" msgstr "无法复制文件描述符 %d 到文件描述符 %d" @@ -1104,61 +1104,61 @@ msgid "syntax error in variable assignment" msgstr "变量赋值中有语法错误" -#: expr.c:544 expr.c:910 +#: expr.c:544 expr.c:911 msgid "division by 0" msgstr "除以 0" -#: expr.c:591 +#: expr.c:592 msgid "bug: bad expassign token" msgstr "错误：表达式赋值符号错误" -#: expr.c:645 +#: expr.c:646 msgid "`:' expected for conditional expression" msgstr "条件表达式需要 `:'" -#: expr.c:971 +#: expr.c:972 msgid "exponent less than 0" msgstr "指数小于 0" -#: expr.c:1028 +#: expr.c:1029 msgid "identifier expected after pre-increment or pre-decrement" msgstr "预增符或预减符后应跟有标识符" -#: expr.c:1055 +#: expr.c:1056 msgid "missing `)'" msgstr "缺少“)”" -#: expr.c:1106 expr.c:1484 +#: expr.c:1107 expr.c:1487 msgid "syntax error: operand expected" msgstr "语法错误: 需要操作数" -#: expr.c:1486 +#: expr.c:1489 msgid "syntax error: invalid arithmetic operator" msgstr "语法错误: 无效的算术运算符" -#: expr.c:1510 +#: expr.c:1513 #, c-format msgid "%s%s%s: %s (error token is \"%s\")" msgstr "%s%s%s：%s (错误符号是 \"%s\")" -#: expr.c:1568 +#: expr.c:1573 msgid "invalid arithmetic base" msgstr "无效的算术进制" -#: expr.c:1588 +#: expr.c:1598 msgid "value too great for base" msgstr "数值太大不可为算术进制的基" -#: expr.c:1637 +#: expr.c:1647 #, c-format msgid "%s: expression error\n" msgstr "%s：表达式错误\n" -#: general.c:69 +#: general.c:70 msgid "getcwd: cannot access parent directories" msgstr "getcwd: 无法访问父目录" -#: input.c:99 subst.c:5930 +#: input.c:99 subst.c:6069 #, c-format msgid "cannot reset nodelay mode for fd %d" msgstr "无法为文件描述符 %d 重置nodelay模式" @@ -1173,16 +1173,16 @@ msgid "save_bash_input: buffer already exists for new fd %d" msgstr "save_bash_input: 已经存在新的文件描述符 %d 的缓冲区" -#: jobs.c:529 +#: jobs.c:543 msgid "start_pipeline: pgrp pipe" msgstr "start_pipeline: 进程组管道" -#: jobs.c:1084 +#: jobs.c:1283 #, c-format msgid "forked pid %d appears in running job %d" msgstr "叉分 (fork) 出的的进程号 %d 出现在运行中的任务 %d 中" -#: jobs.c:1203 +#: jobs.c:1402 #, c-format msgid "deleting stopped job %d with process group %ld" msgstr "删除进程组 %2$ld 中已停止的任务 %1$d" @@ -1192,142 +1192,142 @@ msgid "add_process: process %5ld (%s) in the_pipeline" msgstr "add_process: 进程 %5ld(%s) 进入 the_pipeline" -#: jobs.c:1310 +#: jobs.c:1511 #, c-format msgid "add_process: pid %5ld (%s) marked as still alive" msgstr "add_process: 进程号 %5ld(%s) 标注为仍活着" -#: jobs.c:1639 +#: jobs.c:1850 #, c-format msgid "describe_pid: %ld: no such pid" msgstr "describe_pid: %ld: 无此进程号" -#: jobs.c:1654 +#: jobs.c:1865 #, c-format msgid "Signal %d" msgstr "信号 %d" -#: jobs.c:1668 jobs.c:1694 +#: jobs.c:1879 jobs.c:1905 msgid "Done" msgstr "已完成" -#: jobs.c:1673 siglist.c:123 +#: jobs.c:1884 siglist.c:122 msgid "Stopped" msgstr "已停止" -#: jobs.c:1677 +#: jobs.c:1888 #, c-format msgid "Stopped(%s)" msgstr "已停止(%s)" -#: jobs.c:1681 +#: jobs.c:1892 msgid "Running" msgstr "运行中" -#: jobs.c:1698 +#: jobs.c:1909 #, c-format msgid "Done(%d)" msgstr "已完成(%d)" -#: jobs.c:1700 +#: jobs.c:1911 #, c-format msgid "Exit %d" msgstr "退出 %d" -#: jobs.c:1703 +#: jobs.c:1914 msgid "Unknown status" msgstr "未知状态" -#: jobs.c:1790 +#: jobs.c:2001 #, c-format msgid "(core dumped) " msgstr "（核心已转储） " -#: jobs.c:1809 +#: jobs.c:2020 #, c-format msgid " (wd: %s)" msgstr " (工作目录: %s)" -#: jobs.c:2037 +#: jobs.c:2259 #, c-format msgid "child setpgid (%ld to %ld)" msgstr "子进程 setpgid (%ld 到 %ld)" -#: jobs.c:2399 nojobs.c:657 +#: jobs.c:2617 nojobs.c:664 #, c-format msgid "wait: pid %ld is not a child of this shell" msgstr "wait: 进程号 %ld 不是当前 shell 的子进程" -#: jobs.c:2695 +#: jobs.c:2893 #, c-format msgid "wait_for: No record of process %ld" msgstr "wiat_for: 没有进程 %ld 的记录" -#: jobs.c:3055 +#: jobs.c:3236 #, c-format msgid "wait_for_job: job %d is stopped" msgstr "wait_for_job: 任务 %d 已停止" -#: jobs.c:3362 +#: jobs.c:3571 #, c-format msgid "%s: job has terminated" msgstr "%s：任务已经终止" -#: jobs.c:3371 +#: jobs.c:3580 #, c-format msgid "%s: job %d already in background" msgstr "%s：任务 %d 已在后台" -#: jobs.c:3597 +#: jobs.c:3806 msgid "waitchld: turning on WNOHANG to avoid indefinite block" msgstr "waitchld: 打开 WNOHANG 以避免无限阻塞" -#: jobs.c:4120 +#: jobs.c:4320 #, c-format msgid "%s: line %d: " msgstr "%s：行 %d: " -#: jobs.c:4134 nojobs.c:900 +#: jobs.c:4334 nojobs.c:919 #, c-format msgid " (core dumped)" msgstr " (核心已转储)" -#: jobs.c:4146 jobs.c:4159 +#: jobs.c:4346 jobs.c:4359 #, c-format msgid "(wd now: %s)\n" msgstr "(当前工作目录：%s)\n" -#: jobs.c:4191 +#: jobs.c:4391 msgid "initialize_job_control: getpgrp failed" msgstr "initialize_job_control: getpgrp 失败" -#: jobs.c:4247 +#: jobs.c:4447 msgid "initialize_job_control: no job control in background" msgstr "initialize_job_control: 后台无任务控制" -#: jobs.c:4263 +#: jobs.c:4463 msgid "initialize_job_control: line discipline" msgstr "initialize_job_control: 行规则" -#: jobs.c:4273 +#: jobs.c:4473 msgid "initialize_job_control: setpgid" msgstr "initialize_job_control: setpgid" -#: jobs.c:4294 jobs.c:4303 +#: jobs.c:4494 jobs.c:4503 #, c-format msgid "cannot set terminal process group (%d)" msgstr "无法设定终端进程组(%d)" -#: jobs.c:4308 +#: jobs.c:4508 msgid "no job control in this shell" msgstr "此 shell 中无任务控制" -#: lib/malloc/malloc.c:331 +#: lib/malloc/malloc.c:353 #, c-format msgid "malloc: failed assertion: %s\n" msgstr "malloc: 断言失败: %s\n" -#: lib/malloc/malloc.c:347 +#: lib/malloc/malloc.c:369 #, c-format msgid "" "\r\n" @@ -1336,39 +1336,39 @@ "\r\n" "malloc: %s:%d：断言已修补\r\n" -#: lib/malloc/malloc.c:348 +#: lib/malloc/malloc.c:370 lib/malloc/malloc.c:933 msgid "unknown" msgstr "未知" -#: lib/malloc/malloc.c:855 +#: lib/malloc/malloc.c:882 msgid "malloc: block on free list clobbered" msgstr "malloc: 空闲链表中的块损坏" -#: lib/malloc/malloc.c:932 +#: lib/malloc/malloc.c:972 msgid "free: called with already freed block argument" msgstr "free：调用时用了已经释放的块作为参数" -#: lib/malloc/malloc.c:935 +#: lib/malloc/malloc.c:975 msgid "free: called with unallocated block argument" msgstr "free: 调用时用了未分配的块作为参数" -#: lib/malloc/malloc.c:954 +#: lib/malloc/malloc.c:994 msgid "free: underflow detected; mh_nbytes out of range" msgstr "free: 检测到下溢；mh_nbytes 越界" -#: lib/malloc/malloc.c:960 +#: lib/malloc/malloc.c:1009 msgid "free: start and end chunk sizes differ" msgstr "free: 其实和末尾块大小不一致" -#: lib/malloc/malloc.c:1070 +#: lib/malloc/malloc.c:1119 msgid "realloc: called with unallocated block argument" msgstr "realloc：调用时用了未分配的块作为参数" -#: lib/malloc/malloc.c:1085 +#: lib/malloc/malloc.c:1134 msgid "realloc: underflow detected; mh_nbytes out of range" msgstr "realloc: 检测到下溢；mh_nbytes 越界" -#: lib/malloc/malloc.c:1091 +#: lib/malloc/malloc.c:1150 msgid "realloc: start and end chunk sizes differ" msgstr "realloc: 其实和末尾块大小不一致" @@ -1410,22 +1410,22 @@ msgid "network operations not supported" msgstr "不支持网络操作" -#: locale.c:205 +#: locale.c:217 #, c-format msgid "setlocale: LC_ALL: cannot change locale (%s)" msgstr "setlocale：LC_ALL：无法改变区域选项 (%s)" -#: locale.c:207 +#: locale.c:219 #, c-format msgid "setlocale: LC_ALL: cannot change locale (%s): %s" msgstr "setlocale：LC_ALL：无法改变区域选项 (%s)：%s" -#: locale.c:272 +#: locale.c:292 #, c-format msgid "setlocale: %s: cannot change locale (%s)" msgstr "setlocale：%s：无法改变区域选项 (%s)" -#: locale.c:274 +#: locale.c:294 #, c-format msgid "setlocale: %s: cannot change locale (%s): %s" msgstr "setlocale：%s：无法改变区域选项 (%s)：%s" @@ -1471,110 +1471,110 @@ msgid "make_redirection: redirection instruction `%d' out of range" msgstr "make_redirection：重定向指令“%d”越界" -#: parse.y:2380 +#: parse.y:2393 #, c-format msgid "" "shell_getc: shell_input_line_size (%zu) exceeds SIZE_MAX (%lu): line " "truncated" msgstr "shell_getc：shell_input_line_size (%zu) 超过 SIZE_MAX (%lu)：行被截断" -#: parse.y:2786 +#: parse.y:2826 msgid "maximum here-document count exceeded" msgstr "超出最大立即文档数量" -#: parse.y:3536 parse.y:3906 +#: parse.y:3581 parse.y:3957 parse.y:4556 #, c-format msgid "unexpected EOF while looking for matching `%c'" msgstr "寻找匹配的“%c”时遇到了未预期的文件结束符" -#: parse.y:4606 +#: parse.y:4696 msgid "unexpected EOF while looking for `]]'" msgstr "寻找“]]”时遇到了未预期的文件结束符" -#: parse.y:4611 +#: parse.y:4701 #, c-format msgid "syntax error in conditional expression: unexpected token `%s'" msgstr "条件表达式中有语法错误：未预期的符号“%s”" -#: parse.y:4615 +#: parse.y:4705 msgid "syntax error in conditional expression" msgstr "条件表达式中有语法错误" -#: parse.y:4693 +#: parse.y:4783 #, c-format msgid "unexpected token `%s', expected `)'" msgstr "未预期的符号“%s” ，需要“)”" -#: parse.y:4697 +#: parse.y:4787 msgid "expected `)'" msgstr "需要“)”" -#: parse.y:4725 +#: parse.y:4815 #, c-format msgid "unexpected argument `%s' to conditional unary operator" msgstr "一元条件运算符使用了未预期的参数“%s”" -#: parse.y:4729 +#: parse.y:4819 msgid "unexpected argument to conditional unary operator" msgstr "一元条件运算符使用了未预期的参数" -#: parse.y:4775 +#: parse.y:4865 #, c-format msgid "unexpected token `%s', conditional binary operator expected" msgstr "未预期的符号“%s”，需要二元条件运算符" -#: parse.y:4779 +#: parse.y:4869 msgid "conditional binary operator expected" msgstr "需要二元条件运算符" -#: parse.y:4801 +#: parse.y:4891 #, c-format msgid "unexpected argument `%s' to conditional binary operator" msgstr "二元条件运算符使用了未预期的参数“%s”" -#: parse.y:4805 +#: parse.y:4895 msgid "unexpected argument to conditional binary operator" msgstr "二元条件运算符使用了未预期的参数" -#: parse.y:4816 +#: parse.y:4906 #, c-format msgid "unexpected token `%c' in conditional command" msgstr "条件命令中有未预期的符号“%c”" -#: parse.y:4819 +#: parse.y:4909 #, c-format msgid "unexpected token `%s' in conditional command" msgstr "条件命令中有未预期的符号“%s”" -#: parse.y:4823 +#: parse.y:4913 #, c-format msgid "unexpected token %d in conditional command" msgstr "条件命令中有未预期的符号 %d" -#: parse.y:6245 +#: parse.y:6336 #, c-format msgid "syntax error near unexpected token `%s'" msgstr "未预期的符号“%s”附近有语法错误" -#: parse.y:6263 +#: parse.y:6355 #, c-format msgid "syntax error near `%s'" msgstr "“%s”附近有语法错误" -#: parse.y:6273 +#: parse.y:6365 msgid "syntax error: unexpected end of file" msgstr "语法错误: 未预期的文件结尾" -#: parse.y:6273 +#: parse.y:6365 msgid "syntax error" msgstr "语法错误" -#: parse.y:6335 +#: parse.y:6428 #, c-format msgid "Use \"%s\" to leave the shell.\n" msgstr "使用 \"%s\" 退出 shell 。\n" -#: parse.y:6497 +#: parse.y:6602 msgid "unexpected EOF while looking for matching `)'" msgstr "寻找匹配的“)”时遇到了未预期的文件结束符" @@ -1617,90 +1617,90 @@ msgid "cprintf: `%c': invalid format character" msgstr "cprintf: `%c': 无效的格式字符" -#: redir.c:121 redir.c:167 +#: redir.c:149 redir.c:197 msgid "file descriptor out of range" msgstr "文件描述符超出范围" -#: redir.c:174 +#: redir.c:204 #, c-format msgid "%s: ambiguous redirect" msgstr "%s：模糊的重定向" -#: redir.c:178 +#: redir.c:208 #, c-format msgid "%s: cannot overwrite existing file" msgstr "%s：无法覆盖已存在的文件" -#: redir.c:183 +#: redir.c:213 #, c-format msgid "%s: restricted: cannot redirect output" msgstr "%s：受限的: 无法重定向输出" -#: redir.c:188 +#: redir.c:218 #, c-format msgid "cannot create temp file for here-document: %s" msgstr "无法为立即文档创建临时文件: %s" -#: redir.c:192 +#: redir.c:222 #, c-format msgid "%s: cannot assign fd to variable" msgstr "%s：无法将文件描述符赋值给变量" -#: redir.c:591 +#: redir.c:649 msgid "/dev/(tcp|udp)/host/port not supported without networking" msgstr "没有网络时不支持 /dev/(tcp|udp)/host/port" -#: redir.c:875 redir.c:990 redir.c:1051 redir.c:1221 +#: redir.c:938 redir.c:1053 redir.c:1114 redir.c:1284 msgid "redirection error: cannot duplicate fd" msgstr "重定向错误: 无法复制文件描述符" -#: shell.c:343 +#: shell.c:347 msgid "could not find /tmp, please create!" msgstr "无法找到 /tmp ，请创建！" -#: shell.c:347 +#: shell.c:351 msgid "/tmp must be a valid directory name" msgstr "/tmp 必须为有效的目录名" -#: shell.c:798 +#: shell.c:804 msgid "pretty-printing mode ignored in interactive shells" msgstr "在交互式 shell 中将忽略美化输出模式" -#: shell.c:940 +#: shell.c:948 #, c-format msgid "%c%c: invalid option" msgstr "%c%c: 无效的选项" -#: shell.c:1299 +#: shell.c:1319 #, c-format msgid "cannot set uid to %d: effective uid %d" msgstr "无法将 uid 设为 %d: 有效 uid %d" -#: shell.c:1306 +#: shell.c:1330 #, c-format msgid "cannot set gid to %d: effective gid %d" msgstr "无法将 gid 设为 %d: 有效 gid %d" -#: shell.c:1494 +#: shell.c:1518 msgid "cannot start debugger; debugging mode disabled" msgstr "无法启动调试器；调试模式已禁用" -#: shell.c:1608 +#: shell.c:1632 #, c-format msgid "%s: Is a directory" msgstr "%s：是一个目录" # 这个是查看用户的 /etc/passwd 信息得到的名字。既然是用户的名字，就叫做无名氏吧。（有点想写“红领巾”来着。） -#: shell.c:1826 +#: shell.c:1881 msgid "I have no name!" msgstr "无名氏！" -#: shell.c:1980 +#: shell.c:2035 #, c-format msgid "GNU bash, version %s-(%s)\n" msgstr "GNU bash，版本 %s-(%s)\n" -#: shell.c:1981 +#: shell.c:2036 #, c-format msgid "" "Usage:\t%s [GNU long option] [option] ...\n" @@ -1709,215 +1709,215 @@ "用法：\t%s [GNU 长选项] [选项] ...\n" "\t%s [GNU 长选项] [选项] 脚本文件 ...\n" -#: shell.c:1983 +#: shell.c:2038 msgid "GNU long options:\n" msgstr "GNU 长选项:\n" -#: shell.c:1987 +#: shell.c:2042 msgid "Shell options:\n" msgstr "Shell 选项:\n" -#: shell.c:1988 +#: shell.c:2043 msgid "\t-ilrsD or -c command or -O shopt_option\t\t(invocation only)\n" msgstr "\t-irsD 或 -c <命令> 或 -O \t\t(仅适合调用)\n" -#: shell.c:2007 +#: shell.c:2062 #, c-format msgid "\t-%s or -o option\n" msgstr "\t-%s 或 -o <选项>\n" -#: shell.c:2013 +#: shell.c:2068 #, c-format msgid "Type `%s -c \"help set\"' for more information about shell options.\n" msgstr "请输入`%s -c \"help set\"' 以获得关于 shell 选项的更多信息\n" -#: shell.c:2014 +#: shell.c:2069 #, c-format msgid "" "Type `%s -c help' for more information about shell builtin commands.\n" msgstr "请输入 `%s -c help' 以获得关于 shell 内建命令的更多信息.\n" # 写如何报告程序错误的地方应该提到如何报告翻译问题。 -#: shell.c:2015 +#: shell.c:2070 #, c-format msgid "Use the `bashbug' command to report bugs.\n" msgstr "" "请使用“bashbug”命令来报告程序错误。\n" "请将翻译错误报告到 。\n" -#: shell.c:2017 +#: shell.c:2072 #, c-format msgid "bash home page: \n" msgstr "bash 首页：\n" -#: shell.c:2018 +#: shell.c:2073 #, c-format msgid "General help using GNU software: \n" msgstr "使用 GNU 软件的通用帮助：\n" -#: sig.c:730 +#: sig.c:757 #, c-format msgid "sigprocmask: %d: invalid operation" msgstr "sigprocmask: %d: 无效的操作" -#: siglist.c:48 +#: siglist.c:47 msgid "Bogus signal" msgstr "伪信号" -#: siglist.c:51 +#: siglist.c:50 msgid "Hangup" msgstr "挂断" -#: siglist.c:55 +#: siglist.c:54 msgid "Interrupt" msgstr "中断" -#: siglist.c:59 +#: siglist.c:58 msgid "Quit" msgstr "退出" -#: siglist.c:63 +#: siglist.c:62 msgid "Illegal instruction" msgstr "非法的指令" -#: siglist.c:67 +#: siglist.c:66 msgid "BPT trace/trap" msgstr "断点追踪/陷阱" -#: siglist.c:75 +#: siglist.c:74 msgid "ABORT instruction" msgstr "放弃指令" -#: siglist.c:79 +#: siglist.c:78 msgid "EMT instruction" msgstr "模拟器陷阱指令" -#: siglist.c:83 +#: siglist.c:82 msgid "Floating point exception" msgstr "浮点数异常" -#: siglist.c:87 +#: siglist.c:86 msgid "Killed" msgstr "已杀死" -#: siglist.c:91 +#: siglist.c:90 msgid "Bus error" msgstr "总线错误" -#: siglist.c:95 +#: siglist.c:94 msgid "Segmentation fault" msgstr "段错误" -#: siglist.c:99 +#: siglist.c:98 msgid "Bad system call" msgstr "错误的系统调用" -#: siglist.c:103 +#: siglist.c:102 msgid "Broken pipe" msgstr "管道破裂" -#: siglist.c:107 +#: siglist.c:106 msgid "Alarm clock" msgstr "闹钟" -#: siglist.c:111 +#: siglist.c:110 msgid "Terminated" msgstr "已终止" -#: siglist.c:115 +#: siglist.c:114 msgid "Urgent IO condition" msgstr "紧急 I/O 状况" -#: siglist.c:119 +#: siglist.c:118 msgid "Stopped (signal)" msgstr "已停止(信号)" -#: siglist.c:127 +#: siglist.c:126 msgid "Continue" msgstr "继续" -#: siglist.c:135 +#: siglist.c:134 msgid "Child death or stop" msgstr "子进程已死或者停止" -#: siglist.c:139 +#: siglist.c:138 msgid "Stopped (tty input)" msgstr "已停止(tty 输入)" -#: siglist.c:143 +#: siglist.c:142 msgid "Stopped (tty output)" msgstr "已停止(tty 输出)" -#: siglist.c:147 +#: siglist.c:146 msgid "I/O ready" msgstr "I/O 就绪" -#: siglist.c:151 +#: siglist.c:150 msgid "CPU limit" msgstr "CPU 限制" -#: siglist.c:155 +#: siglist.c:154 msgid "File limit" msgstr "文件限制" -#: siglist.c:159 +#: siglist.c:158 msgid "Alarm (virtual)" msgstr "报警(虚拟)" # Personally I treat this as something coming from alarm() by a profiler. -#: siglist.c:163 +#: siglist.c:162 msgid "Alarm (profile)" msgstr "报警(分析)" -#: siglist.c:167 +#: siglist.c:166 msgid "Window changed" msgstr "窗口已改变" -#: siglist.c:171 +#: siglist.c:170 msgid "Record lock" msgstr "记录锁" -#: siglist.c:175 +#: siglist.c:174 msgid "User signal 1" msgstr "用户信号1" -#: siglist.c:179 +#: siglist.c:178 msgid "User signal 2" msgstr "用户信号2" -#: siglist.c:183 +#: siglist.c:182 msgid "HFT input data pending" msgstr "HFT 待输入数据" -#: siglist.c:187 +#: siglist.c:186 msgid "power failure imminent" msgstr "即将停电" -#: siglist.c:191 +#: siglist.c:190 msgid "system crash imminent" msgstr "系统即将崩溃" -#: siglist.c:195 +#: siglist.c:194 msgid "migrate process to another CPU" msgstr "迁移进程至另一个 CPU" -#: siglist.c:199 +#: siglist.c:198 msgid "programming error" msgstr "编程错误" -#: siglist.c:203 +#: siglist.c:202 msgid "HFT monitor mode granted" msgstr "已授予 HFT 监视模式" -#: siglist.c:207 +#: siglist.c:206 msgid "HFT monitor mode retracted" msgstr "已撤销 HFT 监视模式" -#: siglist.c:211 +#: siglist.c:210 msgid "HFT sound sequence has completed" msgstr "已完成 HFT 声音序列" -#: siglist.c:215 +#: siglist.c:214 msgid "Information request" msgstr "信息请求" @@ -1925,112 +1925,112 @@ msgid "Unknown Signal #" msgstr "未知信号 #" -#: siglist.c:225 +#: siglist.c:222 siglist.c:224 #, c-format msgid "Unknown Signal #%d" msgstr "未知信号 #%d" -#: subst.c:1454 subst.c:1644 +#: subst.c:1476 subst.c:1666 #, c-format msgid "bad substitution: no closing `%s' in %s" msgstr "错误的替换: 在 %2$s 中没有闭合的 `%1$s'" -#: subst.c:3231 +#: subst.c:3281 #, c-format msgid "%s: cannot assign list to array member" msgstr "%s：无法将链表赋值给数组成员" -#: subst.c:5789 subst.c:5805 +#: subst.c:5910 subst.c:5926 msgid "cannot make pipe for process substitution" msgstr "无法为进程替换创建管道" -#: subst.c:5851 +#: subst.c:5985 msgid "cannot make child for process substitution" msgstr "无法为进程替换创建子进程" -#: subst.c:5920 +#: subst.c:6059 #, c-format msgid "cannot open named pipe %s for reading" msgstr "无法打开命名管道 %s 以读取" -#: subst.c:5922 +#: subst.c:6061 #, c-format msgid "cannot open named pipe %s for writing" msgstr "无法打开命名管道 %s 进行写入" -#: subst.c:5945 +#: subst.c:6084 #, c-format msgid "cannot duplicate named pipe %s as fd %d" msgstr "无法将命名管道 %s 作为文件描述符 %d 复制" -#: subst.c:6062 +#: subst.c:6213 msgid "command substitution: ignored null byte in input" msgstr "命令替换：忽略输入中的 null 字节" -#: subst.c:6190 +#: subst.c:6353 msgid "cannot make pipe for command substitution" msgstr "无法为命令替换创建管道" -#: subst.c:6233 +#: subst.c:6397 msgid "cannot make child for command substitution" msgstr "无法为命令替换创建子进程" -#: subst.c:6259 +#: subst.c:6423 msgid "command_substitute: cannot duplicate pipe as fd 1" msgstr "command_substitute: 无法将管道复制为文件描述符 1" -#: subst.c:6710 subst.c:9623 +#: subst.c:6883 subst.c:9952 #, c-format msgid "%s: invalid variable name for name reference" msgstr "%s：无效的引用变量名" -#: subst.c:6806 subst.c:6824 subst.c:6979 +#: subst.c:6979 subst.c:6997 subst.c:7169 #, c-format msgid "%s: invalid indirect expansion" msgstr "%s：无效的间接展开" -#: subst.c:6840 subst.c:6987 +#: subst.c:7013 subst.c:7177 #, c-format msgid "%s: invalid variable name" msgstr "%s：无效的变量名" -#: subst.c:7056 +#: subst.c:7256 #, c-format msgid "%s: parameter not set" msgstr "%s：参数未设置" -#: subst.c:7058 +#: subst.c:7258 #, c-format msgid "%s: parameter null or not set" msgstr "%s：参数为空或未设置" -#: subst.c:7295 subst.c:7310 +#: subst.c:7503 subst.c:7518 #, c-format msgid "%s: substring expression < 0" msgstr "%s：子串表达式 < 0" -#: subst.c:8973 subst.c:8994 +#: subst.c:9281 subst.c:9302 #, c-format msgid "%s: bad substitution" msgstr "%s：错误的替换" -#: subst.c:9082 +#: subst.c:9390 #, c-format msgid "$%s: cannot assign in this way" msgstr "$%s：无法这样赋值" -#: subst.c:9485 +#: subst.c:9814 msgid "" "future versions of the shell will force evaluation as an arithmetic " "substitution" msgstr "未来版本的 shell 会强制估值为算术替换" -#: subst.c:10043 +#: subst.c:10367 #, c-format msgid "bad substitution: no closing \"`\" in %s" msgstr "错误的替换: 在 %s 中没有闭合的 \"`\"" -#: subst.c:11070 +#: subst.c:11434 #, c-format msgid "no match: %s" msgstr "无匹配: %s" @@ -2053,111 +2053,111 @@ msgid "`)' expected, found %s" msgstr "需要“)”，却找到 %s" -#: test.c:282 test.c:750 test.c:753 +#: test.c:756 test.c:759 #, c-format msgid "%s: unary operator expected" msgstr "%s：需要一元表达式" -#: test.c:469 test.c:793 +#: test.c:466 test.c:799 #, c-format msgid "%s: binary operator expected" msgstr "%s：需要二元表达式" -#: test.c:875 +#: test.c:881 msgid "missing `]'" msgstr "缺少 `]'" -#: trap.c:216 +#: trap.c:220 msgid "invalid signal number" msgstr "无效的信号数" -#: trap.c:320 +#: trap.c:325 #, c-format msgid "trap handler: maximum trap handler level exceeded (%d)" msgstr "trap handler: 超出最大的 trap handler 层次 (%d)" -#: trap.c:408 +#: trap.c:414 #, c-format msgid "run_pending_traps: bad value in trap_list[%d]: %p" msgstr "run_pending_traps: trap_list[%d] 中的错误值: %p" -#: trap.c:412 +#: trap.c:418 #, c-format msgid "" "run_pending_traps: signal handler is SIG_DFL, resending %d (%s) to myself" msgstr "run_pending_traps: 信号处理器是 SIG_DFL，重新发送 %d (%s) 给自己" -#: trap.c:470 +#: trap.c:487 #, c-format msgid "trap_handler: bad signal %d" msgstr "trap_handler: 错误的信号 %d" -#: variables.c:412 +#: variables.c:421 #, c-format msgid "error importing function definition for `%s'" msgstr "“%s”函数定义导入错误" -#: variables.c:821 +#: variables.c:833 #, c-format msgid "shell level (%d) too high, resetting to 1" msgstr "shell 层次 (%d) 太高，重置为 1" -#: variables.c:2655 +#: variables.c:2674 msgid "make_local_variable: no function context at current scope" msgstr "make_local_variable: 当前作用域中没有函数上下文" -#: variables.c:2674 +#: variables.c:2693 #, c-format msgid "%s: variable may not be assigned value" msgstr "%s：变量不可赋值" -#: variables.c:3453 +#: variables.c:3475 #, c-format msgid "%s: assigning integer to name reference" msgstr "%s：将整数赋值给名称引用" -#: variables.c:4365 +#: variables.c:4404 msgid "all_local_variables: no function context at current scope" msgstr "all_local_variables: 当前作用域中没有函数上下文" -#: variables.c:4698 +#: variables.c:4771 #, c-format msgid "%s has null exportstr" msgstr "%s 的 exportstr 为空" -#: variables.c:4703 variables.c:4712 +#: variables.c:4776 variables.c:4785 #, c-format msgid "invalid character %d in exportstr for %s" msgstr "%2$s 的 exportstr 中有无效的字符 %1$d" -#: variables.c:4718 +#: variables.c:4791 #, c-format msgid "no `=' in exportstr for %s" msgstr "%s 的 exportstr 中没有“=”" -#: variables.c:5243 +#: variables.c:5331 msgid "pop_var_context: head of shell_variables not a function context" msgstr "pop_var_context: shell_variables 的头部不是函数上下文" -#: variables.c:5256 +#: variables.c:5344 msgid "pop_var_context: no global_variables context" msgstr "pop_var_context: 没有 global_variables 上下文" -#: variables.c:5336 +#: variables.c:5424 msgid "pop_scope: head of shell_variables not a temporary environment scope" msgstr "pop_scope: shell_variables 的头部不是临时环境作用域" -#: variables.c:6272 +#: variables.c:6387 #, c-format msgid "%s: %s: cannot open as FILE" msgstr "%s：%s：无法作为文件打开" -#: variables.c:6277 +#: variables.c:6392 #, c-format msgid "%s: %s: invalid value for trace file descriptor" msgstr "%s：%s：追踪文件描述符的值无效" -#: variables.c:6322 +#: variables.c:6437 #, c-format msgid "%s: %s: compatibility value out of range" msgstr "%s：%s：兼容版本数值越界" @@ -2978,7 +2978,7 @@ " 退出状态：\n" " 返回成功，除非提供了无效选项或者发生变量赋值错误。" -#: builtins.c:530 +#: builtins.c:532 msgid "" "Set variable values and attributes.\n" " \n" @@ -2988,7 +2988,7 @@ " \n" " `declare' 的等价形式。参见 `help declare'。" -#: builtins.c:538 +#: builtins.c:540 msgid "" "Define local variables.\n" " \n" @@ -3013,7 +3013,7 @@ " 退出状态：\n" " 返回成功，除非使用了无效的选项、发生了赋值错误或者 shell 不在执行一个函数。" -#: builtins.c:555 +#: builtins.c:557 msgid "" "Write arguments to the standard output.\n" " \n" @@ -3052,8 +3052,37 @@ " Exit Status:\n" " Returns success unless a write error occurs." msgstr "" +"将参数写到标准输出。\n" +" \n" +" 在标准输出上，显示用空格分割的 ARG 参数后跟一个换行。\n" +" \n" +" 选项：\n" +" -n\t不要追加换行\n" +" -e\t启用下列反斜杠转义的解释\n" +" -E\t显式地抑制对于反斜杠转义的解释\n" +" \n" +" `echo' 对下列反斜杠字符进行转义：\n" +" \t警告(响铃)\n" +" \\b\t退格\n" +" \\c\t抑制更多的输出\n" +" \\e\t转义字符\n" +" \\f\t换页字符\n" +" \\n\t换行\n" +" \\r\t回车\n" +" \\t\t横向制表符\n" +" \\v\t纵向制表符\n" +" \\\\\t反斜杠\n" +" \\0nnn\t以 NNN（八进制）为 ASCII 码的字符。NNN 可以是 0 到 3 个八进制位\n" +" \\xHH\t以 HH（十六进制）为值的八比特字符。HH 可以是一个或两个十六进制位\n" +" \\uHHHH\t以 HHHH（十六进制）为值的 Unicode 字符。HHHH 可以是一个到\n" +" \t\t四个十六进制位。\n" +" \\UHHHHHHHH 以 HHHHHHHH（十六进制）为值的 Unicode 字符。\n" +" \t\tHHHHHHHH 可以是一到八个十六进制位。\n" +" \n" +" 退出状态：\n" +" 返回成功除非有写错误发生。" -#: builtins.c:595 +#: builtins.c:597 msgid "" "Write arguments to the standard output.\n" " \n" @@ -3075,7 +3104,7 @@ " 退出状态：\n" " 除非写错误发生，否则返回成功。" -#: builtins.c:610 +#: builtins.c:612 msgid "" "Enable and disable shell builtins.\n" " \n" @@ -3125,7 +3154,7 @@ " 退出状态：\n" " 返回成功，除非 NAME 不是一个 shell 内建或者有错误发生。" -#: builtins.c:638 +#: builtins.c:640 msgid "" "Execute arguments as a shell command.\n" " \n" @@ -3222,7 +3251,7 @@ " 如果一个选项被找到则返回成功；如果遇到了选项的结尾或者\n" " 有错误发生则返回失败。" -#: builtins.c:692 +#: builtins.c:694 msgid "" "Replace the shell with the given command.\n" " \n" @@ -3261,7 +3290,7 @@ " 退出状态：\n" " 返回成功除非 COMMAND 命令没有找到或者出现一个重定向错误。" -#: builtins.c:713 +#: builtins.c:715 msgid "" "Exit the shell.\n" " \n" @@ -3273,7 +3302,7 @@ " 以状态 N 退出 shell。 如果 N 被省略，则退出状态\n" " 为最后一个执行的命令的退出状态。" -#: builtins.c:722 +#: builtins.c:724 msgid "" "Exit a login shell.\n" " \n" @@ -3286,7 +3315,7 @@ " 以状态 N 退出一个登录 shell。如果不在登录 shell 中执行，则\n" " 返回一个错误。" -#: builtins.c:732 +#: builtins.c:734 msgid "" "Display or execute commands from the history list.\n" " \n" @@ -3339,7 +3368,7 @@ " 退出状态：\n" " 返回成功，或者执行的命令的状态；如果错误发生则返回非零。" -#: builtins.c:762 +#: builtins.c:764 msgid "" "Move job to the foreground.\n" " \n" @@ -3359,7 +3388,7 @@ " 退出状态：\n" " 放至前台的命令状态，或者当错误发生时为失败。" -#: builtins.c:777 +#: builtins.c:779 msgid "" "Move jobs to the background.\n" " \n" @@ -3381,7 +3410,7 @@ " 退出状态：\n" " 返回成功除非任务管理没有启用或者错误发生。" -#: builtins.c:791 +#: builtins.c:793 msgid "" "Remember or display program locations.\n" " \n" @@ -3424,7 +3453,7 @@ " 退出状态：\n" " 返回成功，除非 NAME 命令没有找到或者使用了无效的选项。" -#: builtins.c:816 +#: builtins.c:818 msgid "" "Display information about builtin commands.\n" " \n" @@ -3463,7 +3492,7 @@ " 退出状态：\n" " 返回成功，除非未找到 PATTERN 模式没有找到或者使用了无效选项。" -#: builtins.c:840 +#: builtins.c:842 msgid "" "Display or manipulate the history list.\n" " \n" @@ -3526,7 +3555,7 @@ " 退出状态：\n" " 返回成功，除非使用了无效的选项或者发生错误。" -#: builtins.c:877 +#: builtins.c:879 msgid "" "Display status of jobs.\n" " \n" @@ -3568,7 +3597,7 @@ " 返回成功，除非使用了无效的选项或者有错误发生。\n" " 如果使用 -x 选项，则返回 COMMAND 命令的退出状态。" -#: builtins.c:904 +#: builtins.c:906 msgid "" "Remove jobs from current shell.\n" " \n" @@ -3598,7 +3627,7 @@ " 退出状态：\n" " 返回成功除非使用了无效的选项或者 JOBSPEC 声明。" -#: builtins.c:923 +#: builtins.c:925 msgid "" "Send a signal to a job.\n" " \n" @@ -3638,7 +3667,7 @@ " 退出状态：\n" " 返回成功，除非使用了无效的选项或者有错误发生。" -#: builtins.c:947 +#: builtins.c:949 msgid "" "Evaluate arithmetic expressions.\n" " \n" @@ -3719,7 +3748,7 @@ " 退出状态：\n" " 如果最后一个 ARG 参数估值为 0，则 let 返回 1； 否则 let 返回 0。" -#: builtins.c:992 +#: builtins.c:994 msgid "" "Read a line from the standard input and split it into fields.\n" " \n" @@ -3803,7 +3832,7 @@ " 返回码为零，除非遇到了文件结束符、读超时（且返回码不大于128）、\n" " 出现了变量赋值错误或者无效的文件描述符作为参数传递给了 -u 选项。" -#: builtins.c:1039 +#: builtins.c:1041 msgid "" "Return from a shell function.\n" " \n" @@ -3823,7 +3852,7 @@ " 退出状态：\n" " 返回 N，或者如果 shell 不在执行一个函数或引用脚本时，失败。" -#: builtins.c:1052 +#: builtins.c:1054 msgid "" "Set or unset values of shell options and positional parameters.\n" " \n" @@ -3986,7 +4015,7 @@ " 退出状态：\n" " 返回成功除非使用了无效的参数。" -#: builtins.c:1137 +#: builtins.c:1139 msgid "" "Unset values and attributes of shell variables and functions.\n" " \n" @@ -4023,7 +4052,7 @@ " 退出状态：\n" " 返回成功，除非使用了无效的选项或者 NAME 名称为只读。" -#: builtins.c:1159 +#: builtins.c:1161 msgid "" "Set export attribute for shell variables.\n" " \n" @@ -4056,7 +4085,7 @@ " 退出状态：\n" " 返回成功，除非使用了无效的选项或者 NAME 名称。" -#: builtins.c:1178 +#: builtins.c:1180 msgid "" "Mark shell variables as unchangeable.\n" " \n" @@ -4092,7 +4121,7 @@ " 退出状态：\n" " 返回成功，除非使用了无效的选项或者 NAME 名称。" -#: builtins.c:1200 +#: builtins.c:1202 msgid "" "Shift positional parameters.\n" " \n" @@ -4110,7 +4139,7 @@ " 退出状态：\n" " 返回成功，除非 N 为负或者大于 $#。" -#: builtins.c:1212 builtins.c:1227 +#: builtins.c:1214 builtins.c:1229 msgid "" "Execute commands from a file in the current shell.\n" " \n" @@ -4132,7 +4161,7 @@ " 退出状态：\n" " 返回 FILENAME 文件中最后一个命令的状态；如果 FILENAME 文件不可读则失败。" -#: builtins.c:1243 +#: builtins.c:1245 msgid "" "Suspend shell execution.\n" " \n" @@ -4156,7 +4185,7 @@ " 退出状态：\n" " 返回成功，除非没有启用任务控制或者有错误发生。" -#: builtins.c:1259 +#: builtins.c:1261 msgid "" "Evaluate conditional expression.\n" " \n" @@ -4310,7 +4339,7 @@ " 如果 EXPR 表达式估值为真则返回成功；如果 EXPR 表达式估值\n" " 为假或者使用了无效的参数则返回失败。" -#: builtins.c:1341 +#: builtins.c:1343 msgid "" "Evaluate conditional expression.\n" " \n" @@ -4322,7 +4351,7 @@ " 是内建命令 \"test\" 的同义词，但是最后一个参数必须是\n" " 字符 `]'，以匹配起始的 `['。" -#: builtins.c:1350 +#: builtins.c:1352 msgid "" "Display process times.\n" " \n" @@ -4343,7 +4372,7 @@ # EXIT and DEBUG should be as-is. Use before you translate, please. # The -signal is only an example; Read carefully. -#: builtins.c:1362 +#: builtins.c:1364 msgid "" "Trap signals and other events.\n" " \n" @@ -4413,7 +4442,7 @@ " 退出状态：\n" " 返回成功，除非使用了无效的选项或者 SIGSPEC。" -#: builtins.c:1398 +#: builtins.c:1400 msgid "" "Display information about command type.\n" " \n" @@ -4555,7 +4584,7 @@ " 退出状态：\n" " 返回成功，除非使用了无效的选项或者错误发生。" -#: builtins.c:1479 +#: builtins.c:1482 msgid "" "Display or set file mode mask.\n" " \n" @@ -4622,7 +4651,7 @@ " 退出状态：\n" " 返回最后一个 ID 进程的状态；如果使用了无效的 ID 或者选项则失败。" -#: builtins.c:1523 +#: builtins.c:1533 msgid "" "Wait for process completion and return exit status.\n" " \n" @@ -4644,7 +4673,7 @@ " 退出状态：\n" " 返回进程 ID 的状态；如果 PID 是无效的进程号或者指定了无效的选项则失败。" -#: builtins.c:1538 +#: builtins.c:1548 msgid "" "Execute commands for each member in a list.\n" " \n" @@ -4665,7 +4694,7 @@ " 退出状态：\n" " 返回最后执行的命令的状态。" -#: builtins.c:1552 +#: builtins.c:1562 msgid "" "Arithmetic for loop.\n" " \n" @@ -4695,7 +4724,7 @@ " 退出状态：\n" " 返回最后执行的命令的状态。" -#: builtins.c:1570 +#: builtins.c:1580 msgid "" "Select words from a list and execute commands.\n" " \n" @@ -4728,7 +4757,7 @@ " 退出状态：\n" " 返回最后一个执行的命令的状态。" -#: builtins.c:1591 +#: builtins.c:1601 msgid "" "Report time consumed by pipeline's execution.\n" " \n" @@ -4756,7 +4785,7 @@ " 退出状态：\n" " 返回状态即PIPELINE 的返回状态。" -#: builtins.c:1608 +#: builtins.c:1618 msgid "" "Execute commands based on pattern matching.\n" " \n" @@ -4774,7 +4803,7 @@ " 退出状态：\n" " 返回最后一个执行的命令的状态。" -#: builtins.c:1620 +#: builtins.c:1630 msgid "" "Execute commands based on conditional.\n" " \n" @@ -4805,7 +4834,7 @@ " 退出状态：\n" " 返回最后一个执行的命令的状态。" -#: builtins.c:1637 +#: builtins.c:1647 msgid "" "Execute commands as long as a test succeeds.\n" " \n" @@ -4823,7 +4852,7 @@ " 退出状态：\n" " 返回最后一个执行的命令的状态。" -#: builtins.c:1649 +#: builtins.c:1659 msgid "" "Execute commands as long as a test does not succeed.\n" " \n" @@ -4841,7 +4870,7 @@ " 退出状态：\n" " 返回最后一个执行的命令的状态。" -#: builtins.c:1661 +#: builtins.c:1671 msgid "" "Create a coprocess named NAME.\n" " \n" @@ -4863,7 +4892,7 @@ " 退出状态：\n" " 副进程会返回退出状态 0。" -#: builtins.c:1675 +#: builtins.c:1685 msgid "" "Define shell function.\n" " \n" @@ -4886,7 +4915,7 @@ " 退出状态：\n" " 返回成功除非 NAME 为只读。" -#: builtins.c:1689 +#: builtins.c:1699 msgid "" "Group commands as a unit.\n" " \n" @@ -4904,7 +4933,7 @@ " 退出状态：\n" " 返回最后一个执行的命令的状态。" -#: builtins.c:1701 +#: builtins.c:1711 msgid "" "Resume job in foreground.\n" " \n" @@ -4946,7 +4975,7 @@ " 退出状态\n" " 如果表达式估值为0则返回 1；否则返回0。" -#: builtins.c:1728 +#: builtins.c:1738 msgid "" "Execute conditional command.\n" " \n" @@ -4993,7 +5022,7 @@ " 退出状态：\n" " 根据 EXPRESSION 的值为0或1。" -#: builtins.c:1754 +#: builtins.c:1764 msgid "" "Common shell variable names and usage.\n" " \n" @@ -5088,7 +5117,7 @@ " HISTIGNORE\t用于决定哪些命令被存入历史文件的模式\n" " \t\t列表，以冒号分隔。\n" -#: builtins.c:1811 +#: builtins.c:1821 msgid "" "Add directories to stack.\n" " \n" @@ -5141,7 +5170,7 @@ " 退出状态：\n" " 返回成功，除非使用了无效的参数或者目录转换失败。" -#: builtins.c:1845 +#: builtins.c:1855 msgid "" "Remove directories from stack.\n" " \n" @@ -5188,7 +5217,7 @@ " 退出状态：\n" " 返回成功，除非使用了无效的参数或者目录变换失败。" -#: builtins.c:1875 +#: builtins.c:1885 msgid "" "Display directory stack.\n" " \n" @@ -5237,7 +5266,7 @@ " 退出状态：\n" " 返回成功，除非使用了无效的选项或者发生错误。" -#: builtins.c:1906 +#: builtins.c:1916 msgid "" "Set and unset shell options.\n" " \n" @@ -5273,7 +5302,7 @@ " 如果 OPTNAME 选项被启用则返回成功；如果是\n" " 无效的选项或 OPTNAME 被禁用则失败。" -#: builtins.c:1927 +#: builtins.c:1937 msgid "" "Formats and prints ARGUMENTS under control of the FORMAT.\n" " \n" @@ -5359,7 +5388,7 @@ " Returns success unless an invalid option is supplied or an error occurs." msgstr "" -#: builtins.c:1991 +#: builtins.c:2001 msgid "" "Display possible completions depending on the options.\n" " \n" @@ -5380,7 +5409,7 @@ " 退出状态：\n" " 除非使用了无效选项或者错误发生，否则返回成功。" -#: builtins.c:2006 +#: builtins.c:2016 msgid "" "Modify or display completion options.\n" " \n" @@ -5433,7 +5462,7 @@ " 退出状态：\n" " 返回成功，除非使用了无效的选项或者 NAME 名称没有定义补全声明。" -#: builtins.c:2037 +#: builtins.c:2047 msgid "" "Read lines from the standard input into an indexed array variable.\n" " \n" @@ -5500,7 +5529,7 @@ " 退出状态：\n" " 返回成功，除非使用了无效的选项，或者 ARRAY 变量只读或不是下标数组。" -#: builtins.c:2073 +#: builtins.c:2083 msgid "" "Read lines from a file into an array variable.\n" " \n" diff -Nru language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/bfd.po language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/bfd.po --- language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/bfd.po 2020-07-10 08:58:52.000000000 +0000 +++ language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/bfd.po 2021-01-22 11:31:19.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: 2020-07-09 20:17+0000\n" -"X-Generator: Launchpad (build 4809fcb62f445aaa3ae919f7f6c3cc7d156ea57a)\n" +"X-Launchpad-Export-Date: 2021-01-21 21:28+0000\n" +"X-Generator: Launchpad (build 2d1d5e352f0d063d660df2300e31f66bed027fa5)\n" #: aout-adobe.c:127 msgid "%B: Unknown section type in a.out.adobe file: %x\n" diff -Nru language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/binutils.po language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/binutils.po --- language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/binutils.po 2020-07-10 08:58:45.000000000 +0000 +++ language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/binutils.po 2021-01-22 11:31:13.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: 2020-07-09 16:53+0000\n" -"X-Generator: Launchpad (build 4809fcb62f445aaa3ae919f7f6c3cc7d156ea57a)\n" +"X-Launchpad-Export-Date: 2021-01-21 17:51+0000\n" +"X-Generator: Launchpad (build 2d1d5e352f0d063d660df2300e31f66bed027fa5)\n" "Language: zh_CN\n" "X-Bugs: Report translation errors to the Language-Team address.\n" @@ -61,10 +61,10 @@ "\n" msgstr "" -#: addr2line.c:109 ar.c:349 ar.c:386 coffdump.c:471 dlltool.c:3981 -#: dllwrap.c:518 elfedit.c:921 objcopy.c:691 objcopy.c:745 readelf.c:4607 +#: addr2line.c:109 ar.c:358 ar.c:395 coffdump.c:471 dlltool.c:3707 +#: dllwrap.c:518 elfedit.c:938 objcopy.c:692 objcopy.c:746 readelf.c:4662 #: size.c:109 srconv.c:1704 strings.c:727 sysdump.c:646 windmc.c:227 -#: windres.c:688 +#: windres.c:690 #, c-format msgid "Report bugs to %s\n" msgstr "将 bug 报告到 %s\n" @@ -100,225 +100,225 @@ msgid "%s: cannot find section %s" msgstr "%s：无法找到节：%s" -#: addr2line.c:444 ar.c:747 dlltool.c:3499 nm.c:1726 objcopy.c:5993 -#: objdump.c:5127 size.c:153 strings.c:291 windmc.c:960 windres.c:815 +#: addr2line.c:444 ar.c:759 dlltool.c:3231 nm.c:1738 objcopy.c:6058 +#: objdump.c:5161 size.c:153 strings.c:291 windmc.c:960 windres.c:817 msgid "fatal error: libbfd ABI mismatch" msgstr "" -#: addr2line.c:471 nm.c:1752 objdump.c:5174 +#: addr2line.c:471 nm.c:1764 objdump.c:5208 readelf.c:4928 #, c-format msgid "unknown demangling style `%s'" msgstr "未知的解码(demangle)风格“%s”" -#: ar.c:268 +#: ar.c:275 #, c-format msgid "no entry %s in archive\n" msgstr "归档文件中没有条目 %s\n" -#: ar.c:282 +#: ar.c:289 #, c-format msgid "" "Usage: %s [emulation options] [-]{dmpqrstx}[abcDfilMNoOPsSTuvV] [--plugin " "] [member-name] [count] archive-file file...\n" msgstr "" -#: ar.c:288 +#: ar.c:295 #, c-format msgid "" "Usage: %s [emulation options] [-]{dmpqrstx}[abcDfilMNoOPsSTuvV] [member-" "name] [count] archive-file file...\n" msgstr "" -#: ar.c:296 +#: ar.c:303 #, c-format msgid " %s -M [ - read options from \n" msgstr " @ - 从 读取选项\n" -#: ar.c:337 +#: ar.c:345 #, c-format msgid " --target=BFDNAME - specify the target object format as BFDNAME\n" msgstr " --target=BFDNAME - 指定目标对象格式为 BFDNAME\n" -#: ar.c:338 +#: ar.c:346 #, c-format msgid "" " --output=DIRNAME - specify the output directory for extraction operations\n" msgstr "" -#: ar.c:340 +#: ar.c:349 #, c-format msgid " optional:\n" msgstr " 可选项：\n" -#: ar.c:341 +#: ar.c:350 #, c-format msgid " --plugin

      - load the specified plugin\n" msgstr " --plugin

      - 加载指定的插件程序\n" -#: ar.c:362 +#: ar.c:371 #, c-format msgid "Usage: %s [options] archive\n" msgstr "用法：%s [选项] 归档文件\n" -#: ar.c:363 +#: ar.c:372 #, c-format msgid " Generate an index to speed access to archives\n" msgstr " 生成索引以加快对归档文件的访问\n" -#: ar.c:364 +#: ar.c:373 #, c-format msgid "" " The options are:\n" @@ -327,12 +327,12 @@ " 选项是：\n" " @ 从 读取选项\n" -#: ar.c:367 +#: ar.c:376 #, c-format msgid " --plugin Load the specified plugin\n" msgstr " --plugin 加载指定的插件程序\n" -#: ar.c:371 +#: ar.c:380 #, c-format msgid "" " -D Use zero for symbol map timestamp (default)\n" @@ -341,7 +341,7 @@ " -D 将 0 用于符号表时间戳（默认）\n" " -U 使用实际符号表时间戳\n" -#: ar.c:375 +#: ar.c:384 #, c-format msgid "" " -D Use zero for symbol map timestamp\n" @@ -350,7 +350,7 @@ " -D 将 0 用于符号表时间戳\n" " -U 使用实际符号表时间戳（默认）\n" -#: ar.c:378 +#: ar.c:387 #, c-format msgid "" " -t Update the archive's symbol map timestamp\n" @@ -361,101 +361,101 @@ " -h --help 打印本帮助消息\n" " -v --version 打印版本信息\n" -#: ar.c:503 +#: ar.c:512 msgid "two different operation options specified" msgstr "给出了两个不同的操作选项" -#: ar.c:597 ar.c:672 nm.c:1839 +#: ar.c:609 ar.c:684 nm.c:1854 #, c-format msgid "sorry - this program has been built without plugin support\n" msgstr "抱歉 - 此程序构建时未启用插件支持\n" -#: ar.c:803 +#: ar.c:815 msgid "no operation specified" msgstr "没有指定操作" -#: ar.c:806 +#: ar.c:818 msgid "`u' is only meaningful with the `r' option." msgstr "“u”只在使用“r”选项的时候才有意义。" -#: ar.c:809 +#: ar.c:821 msgid "`u' is not meaningful with the `D' option." msgstr "“u”在使用“D”选项的时候没有意义。" -#: ar.c:812 +#: ar.c:824 msgid "`u' modifier ignored since `D' is the default (see `U')" msgstr "`u' 修饰符被忽略，因为 `D' 为默认（参见 `U'）" -#: ar.c:821 +#: ar.c:833 msgid "missing position arg." msgstr "" -#: ar.c:827 +#: ar.c:839 msgid "`N' is only meaningful with the `x' and `d' options." msgstr "“N”只在使用“x”和“d”选项的时候才有意义。" -#: ar.c:829 +#: ar.c:841 msgid "`N' missing value." msgstr "" -#: ar.c:832 +#: ar.c:844 msgid "Value for `N' must be positive." msgstr "“N”的值必须是正数。" -#: ar.c:848 +#: ar.c:860 msgid "`x' cannot be used on thin archives." msgstr "`x' 不能被用于归档上。" -#: ar.c:895 +#: ar.c:953 #, c-format msgid "internal error -- this option not implemented" msgstr "内部错误 -- 该选项尚未实现" -#: ar.c:964 +#: ar.c:1022 #, c-format msgid "creating %s" msgstr "正在创建 %s" -#: ar.c:995 +#: ar.c:1053 #, c-format msgid "Cannot convert existing library %s to thin format" msgstr "" -#: ar.c:1001 +#: ar.c:1059 #, c-format msgid "Cannot convert existing thin library %s to normal format" msgstr "" -#: ar.c:1033 ar.c:1130 ar.c:1447 objcopy.c:3582 +#: ar.c:1091 ar.c:1188 ar.c:1520 objcopy.c:3617 #, c-format msgid "internal stat error on %s" msgstr "在 %s 内部状态错误" -#: ar.c:1052 ar.c:1156 +#: ar.c:1110 ar.c:1214 #, c-format msgid "%s is not a valid archive" msgstr "%s 不是有效的归档文件" -#: ar.c:1080 +#: ar.c:1138 #, c-format msgid "illegal output pathname for archive member: %s, using '%s' instead" msgstr "" -#: ar.c:1204 +#: ar.c:1265 msgid "could not create temporary file whilst writing archive" msgstr "" -#: ar.c:1351 +#: ar.c:1423 #, c-format msgid "No member named `%s'\n" msgstr "没有名为“%s”的成员\n" -#: ar.c:1401 +#: ar.c:1473 #, c-format msgid "no entry %s in archive %s!" msgstr "归档文件 %2$s 中没有条目 %1$s！" -#: ar.c:1541 +#: ar.c:1633 #, c-format msgid "%s: no archive map to update" msgstr "%s：没有要更新的归档映射" @@ -495,27 +495,27 @@ msgid "%s: no output archive specified yet\n" msgstr "%s：尚未指定输出归档文件\n" -#: arsup.c:257 arsup.c:300 arsup.c:342 arsup.c:365 arsup.c:431 +#: arsup.c:257 arsup.c:300 arsup.c:342 arsup.c:377 arsup.c:443 #, c-format msgid "%s: no open output archive\n" msgstr "%s：未打开输出归档文件\n" -#: arsup.c:273 arsup.c:386 arsup.c:412 +#: arsup.c:273 arsup.c:398 arsup.c:424 #, c-format msgid "%s: can't open file %s\n" msgstr "%s：无法打开文件 %s\n" -#: arsup.c:327 arsup.c:408 arsup.c:489 +#: arsup.c:327 arsup.c:420 arsup.c:501 #, c-format msgid "%s: can't find module file %s\n" msgstr "%s：无法找到模块文件 %s\n" -#: arsup.c:440 +#: arsup.c:452 #, c-format msgid "Current open archive is %s\n" msgstr "当前打开的归档文件是 %s\n" -#: arsup.c:464 +#: arsup.c:476 #, c-format msgid "%s: no open archive\n" msgstr "%s：未打开归档文件\n" @@ -526,7 +526,7 @@ msgstr " 没有仿真特有的选项\n" #. Macros for common output. -#: binemul.h:49 +#: binemul.h:53 #, c-format msgid " emulation options: \n" msgstr " 仿真选项： \n" @@ -729,7 +729,7 @@ msgid "Symbol %s, tag %d, number %d" msgstr "" -#: coffdump.c:345 readelf.c:17436 readelf.c:17524 +#: coffdump.c:345 readelf.c:18016 readelf.c:18107 #, c-format msgid "Type" msgstr "类型" @@ -956,7 +956,7 @@ msgid "%s: is not a COFF format file" msgstr "" -#: cxxfilt.c:124 nm.c:285 objdump.c:318 +#: cxxfilt.c:124 nm.c:296 objdump.c:318 #, c-format msgid "Report bugs to %s.\n" msgstr "将 bug 报告到 %s。\n" @@ -1054,241 +1054,241 @@ msgid "debug_write_type: illegal type encountered" msgstr "debug_write_type：遇到非法类型" -#: dlltool.c:902 dlltool.c:927 dlltool.c:957 +#: dlltool.c:866 dlltool.c:890 dlltool.c:919 #, c-format msgid "Internal error: Unknown machine type: %d" msgstr "内部错误：未知的机器类型：%d" -#: dlltool.c:998 +#: dlltool.c:960 #, c-format msgid "Can't open def file: %s" msgstr "无法打开 def 文件：%s" -#: dlltool.c:1003 +#: dlltool.c:965 #, c-format msgid "Processing def file: %s" msgstr "处理 def 文件：%s" -#: dlltool.c:1007 +#: dlltool.c:969 msgid "Processed def file" msgstr "已处理的 def 文件" -#: dlltool.c:1031 +#: dlltool.c:993 #, c-format msgid "Syntax error in def file %s:%d" msgstr "def 文件中语法错误 %s：%d" -#: dlltool.c:1068 +#: dlltool.c:1030 #, c-format msgid "%s: Path components stripped from image name, '%s'." msgstr "%s：从映像名 '%s' 中截去路径成分。" -#: dlltool.c:1086 +#: dlltool.c:1048 #, c-format msgid "NAME: %s base: %x" msgstr "名称：%s 基址：%x" -#: dlltool.c:1089 dlltool.c:1110 +#: dlltool.c:1051 dlltool.c:1072 msgid "Can't have LIBRARY and NAME" msgstr "不能同时具有 LIBRARY 和 NAME" -#: dlltool.c:1107 +#: dlltool.c:1069 #, c-format msgid "LIBRARY: %s base: %x" msgstr "库：%s 基址：%x" -#: dlltool.c:1262 +#: dlltool.c:1224 #, c-format msgid "VERSION %d.%d\n" msgstr "版本 %d.%d\n" -#: dlltool.c:1310 +#: dlltool.c:1272 #, c-format msgid "run: %s %s" msgstr "运行：%s %s" -#: dlltool.c:1351 resrc.c:288 +#: dlltool.c:1313 resrc.c:288 #, c-format msgid "wait: %s" msgstr "等待：%s" -#: dlltool.c:1356 dllwrap.c:416 resrc.c:293 +#: dlltool.c:1318 dllwrap.c:416 resrc.c:293 #, c-format msgid "subprocess got fatal signal %d" msgstr "子进程收到致命信号 %d" -#: dlltool.c:1362 dllwrap.c:423 resrc.c:300 +#: dlltool.c:1324 dllwrap.c:423 resrc.c:300 #, c-format msgid "%s exited with status %d" msgstr "%s 以状态 %d 退出" -#: dlltool.c:1393 +#: dlltool.c:1355 #, c-format msgid "Sucking in info from %s section in %s" msgstr "从 %2$s 中的 %1$s 节获取信息" -#: dlltool.c:1533 +#: dlltool.c:1495 #, c-format msgid "Excluding symbol: %s" msgstr "排除符号：%s" -#: dlltool.c:1622 dlltool.c:1633 nm.c:1121 nm.c:1131 nm.c:1140 +#: dlltool.c:1584 dlltool.c:1595 nm.c:1133 nm.c:1143 nm.c:1152 #, c-format msgid "%s: no symbols" msgstr "%s：无符号" #. FIXME: we ought to read in and block out the base relocations. -#: dlltool.c:1659 +#: dlltool.c:1621 #, c-format msgid "Done reading %s" msgstr "读取 %s 完成" -#: dlltool.c:1669 +#: dlltool.c:1631 #, c-format msgid "Unable to open object file: %s: %s" msgstr "无法打开目标文件：%s: %s" -#: dlltool.c:1672 +#: dlltool.c:1634 #, c-format msgid "Scanning object file %s" msgstr "正在扫描目标文件 %s" -#: dlltool.c:1692 +#: dlltool.c:1654 #, c-format msgid "Cannot produce mcore-elf dll from archive file: %s" msgstr "无法从归档文件中生成 mcore-elf 动态连接库：%s" -#: dlltool.c:1794 +#: dlltool.c:1756 msgid "Adding exports to output file" msgstr "正在加入导出至输出文件" -#: dlltool.c:1846 +#: dlltool.c:1808 msgid "Added exports to output file" msgstr "已加入导出至输出文件" -#: dlltool.c:2014 +#: dlltool.c:1976 #, c-format msgid "Generating export file: %s" msgstr "正在生成导出文件：%s" -#: dlltool.c:2019 +#: dlltool.c:1981 #, c-format msgid "Unable to open temporary assembler file: %s" msgstr "无法打开临时汇编文件：%s" -#: dlltool.c:2024 +#: dlltool.c:1986 #, c-format msgid "Opened temporary file: %s" msgstr "已打开的临时文件：%s" -#: dlltool.c:2200 +#: dlltool.c:2162 msgid "failed to read the number of entries from base file" msgstr "从基底文件读取条目数量时失败" -#: dlltool.c:2251 +#: dlltool.c:2213 msgid "Generated exports file" msgstr "已生成的导出文件" -#: dlltool.c:2461 +#: dlltool.c:2371 #, c-format msgid "bfd_open failed open stub file: %s: %s" msgstr "无法打开输出文件：%s: %s" -#: dlltool.c:2465 +#: dlltool.c:2375 #, c-format msgid "Creating stub file: %s" msgstr "正在创建占位文件：%s" -#: dlltool.c:2934 +#: dlltool.c:2689 #, c-format msgid "bfd_open failed reopen stub file: %s: %s" msgstr "无法打开输出文件：%s: %s" -#: dlltool.c:2948 dlltool.c:3027 +#: dlltool.c:2703 dlltool.c:2782 #, c-format msgid "failed to open temporary head file: %s" msgstr "打开临时头文件失败：%s" -#: dlltool.c:3012 dlltool.c:3098 +#: dlltool.c:2767 dlltool.c:2853 #, c-format msgid "failed to open temporary head file: %s: %s" msgstr "打开临时标头文件失败：%s: %s" -#: dlltool.c:3113 +#: dlltool.c:2868 #, c-format msgid "failed to open temporary tail file: %s" msgstr "打开临时尾文件失败：%s" -#: dlltool.c:3172 +#: dlltool.c:2904 #, c-format msgid "failed to open temporary tail file: %s: %s" msgstr "打开临时标尾文件失败：%s: %s" -#: dlltool.c:3195 +#: dlltool.c:2927 #, c-format msgid "Can't create .lib file: %s: %s" msgstr "无法创建 .lib 文件：%s: %s" -#: dlltool.c:3199 +#: dlltool.c:2931 #, c-format msgid "Creating library file: %s" msgstr "正在创建库文件：%s" -#: dlltool.c:3286 dlltool.c:3292 +#: dlltool.c:3018 dlltool.c:3024 #, c-format msgid "cannot delete %s: %s" msgstr "无法删除 %s：%s" -#: dlltool.c:3298 +#: dlltool.c:3030 msgid "Created lib file" msgstr "已创建的 lib 文件" -#: dlltool.c:3504 +#: dlltool.c:3236 #, c-format msgid "Can't open .lib file: %s: %s" msgstr "无法打开 .lib 文件：%s: %s" -#: dlltool.c:3512 dlltool.c:3534 +#: dlltool.c:3244 dlltool.c:3266 #, c-format msgid "%s is not a library" msgstr "%s 不是一个函数库" -#: dlltool.c:3552 +#: dlltool.c:3284 #, c-format msgid "Import library `%s' specifies two or more dlls" msgstr "" -#: dlltool.c:3563 +#: dlltool.c:3295 #, c-format msgid "Unable to determine dll name for `%s' (not an import library?)" msgstr "无法确定 ‘%s’ 的 dll 名称（不是导入库？）" -#: dlltool.c:3795 +#: dlltool.c:3521 #, c-format msgid "Warning, ignoring duplicate EXPORT %s %d,%d" msgstr "警告，正在忽略重复的 EXPORT %s %d,%d" -#: dlltool.c:3801 +#: dlltool.c:3527 #, c-format msgid "Error, duplicate EXPORT with ordinals: %s" msgstr "错误，重复的 EXPORT 以及原始出处: %s" -#: dlltool.c:3904 +#: dlltool.c:3630 msgid "Processing definitions" msgstr "正在处理定义" -#: dlltool.c:3931 +#: dlltool.c:3657 msgid "Processed definitions" msgstr "已处理定义" #. xgetext:c-format -#: dlltool.c:3938 dllwrap.c:477 +#: dlltool.c:3664 dllwrap.c:477 #, c-format msgid "Usage %s \n" msgstr "用法 %s <选项> <目标文件>\n" #. xgetext:c-format -#: dlltool.c:3940 +#: dlltool.c:3666 #, c-format msgid "" " -m --machine Create as DLL for . [default: %s]\n" @@ -1302,238 +1302,238 @@ msgstr "" " 可能的 ：arm[_interwork]、i386、mcore[-elf]{-le|-be}、ppc、thumb\n" -#: dlltool.c:3942 +#: dlltool.c:3668 #, c-format msgid " -e --output-exp Generate an export file.\n" msgstr " -e --output-exp 生成导出文件。\n" -#: dlltool.c:3943 +#: dlltool.c:3669 #, c-format msgid " -l --output-lib Generate an interface library.\n" msgstr " -l --output-lib 生成界面库。\n" -#: dlltool.c:3944 +#: dlltool.c:3670 #, c-format msgid " -y --output-delaylib Create a delay-import library.\n" msgstr " -y --output-delaylib 生成延迟导入库。\n" -#: dlltool.c:3945 +#: dlltool.c:3671 #, c-format msgid " -a --add-indirect Add dll indirects to export file.\n" msgstr " -a --add-indirect 添加 dll 间接至导出文件。\n" -#: dlltool.c:3946 +#: dlltool.c:3672 #, c-format msgid "" " -D --dllname Name of input dll to put into interface lib.\n" msgstr " -D --dllname <名称> 要置入接口函数库的输入 dll 名称。\n" -#: dlltool.c:3947 +#: dlltool.c:3673 #, c-format msgid " -d --input-def Name of .def file to be read in.\n" msgstr " -d --input-def 需读取的 .def 文件名。\n" -#: dlltool.c:3948 +#: dlltool.c:3674 #, c-format msgid " -z --output-def Name of .def file to be created.\n" msgstr " -z --output-def 需创建的 .def 文件名。\n" -#: dlltool.c:3949 +#: dlltool.c:3675 #, c-format msgid " --export-all-symbols Export all symbols to .def\n" msgstr " --export-all-symbols 将所有符号导出到 .def\n" -#: dlltool.c:3950 +#: dlltool.c:3676 #, c-format msgid " --no-export-all-symbols Only export listed symbols\n" msgstr " --no-export-all-symbols 只导出列举的符号\n" -#: dlltool.c:3951 +#: dlltool.c:3677 #, c-format msgid " --exclude-symbols Don't export \n" msgstr " --exclude-symbols 不要导出 \n" -#: dlltool.c:3952 +#: dlltool.c:3678 #, c-format msgid " --no-default-excludes Clear default exclude symbols\n" msgstr " --no-default-excludes 清空缺省排除的符号\n" # Need texinfo page -#: dlltool.c:3953 +#: dlltool.c:3679 #, c-format msgid " -b --base-file Read linker generated base file.\n" msgstr " -b --base-file 读取链接器所产生的 base 文件。\n" -#: dlltool.c:3954 +#: dlltool.c:3680 #, c-format msgid " -x --no-idata4 Don't generate idata$4 section.\n" msgstr " -x --no-idata4 不生成 idata$4 节。\n" -#: dlltool.c:3955 +#: dlltool.c:3681 #, c-format msgid " -c --no-idata5 Don't generate idata$5 section.\n" msgstr " -c --no-idata5 不生成 idata$5 节。\n" -#: dlltool.c:3956 +#: dlltool.c:3682 #, c-format msgid "" " --use-nul-prefixed-import-tables Use zero prefixed idata$4 and " "idata$5.\n" msgstr "" -#: dlltool.c:3957 +#: dlltool.c:3683 #, c-format msgid "" " -U --add-underscore Add underscores to all symbols in interface " "library.\n" msgstr " -U --add-underscore 于接口中所有符号添加下划线。\n" -#: dlltool.c:3958 +#: dlltool.c:3684 #, c-format msgid "" " --add-stdcall-underscore Add underscores to stdcall symbols in " "interface library.\n" msgstr " --add-stdcall-underscore 向接口中的 stdcall 符号添加下划线。\n" -#: dlltool.c:3959 +#: dlltool.c:3685 #, c-format msgid "" " --no-leading-underscore All symbols shouldn't be prefixed by an " "underscore.\n" msgstr "" -#: dlltool.c:3960 +#: dlltool.c:3686 #, c-format msgid "" " --leading-underscore All symbols should be prefixed by an " "underscore.\n" msgstr "" -#: dlltool.c:3961 +#: dlltool.c:3687 #, c-format msgid " -k --kill-at Kill @ from exported names.\n" msgstr " -k --kill-at 删去导出名称中的 @。\n" -#: dlltool.c:3962 +#: dlltool.c:3688 #, c-format msgid " -A --add-stdcall-alias Add aliases without @.\n" msgstr " -A --add-stdcall-alias 添加不带 @ 的别名。\n" -#: dlltool.c:3963 +#: dlltool.c:3689 #, c-format msgid " -p --ext-prefix-alias Add aliases with .\n" msgstr " -p --ext-prefix-alias <前缀> 添加附带 <前缀> 的别名。\n" -#: dlltool.c:3964 +#: dlltool.c:3690 #, c-format msgid " -S --as Use for assembler.\n" msgstr " -S --as 将 用作汇编程序。\n" -#: dlltool.c:3965 +#: dlltool.c:3691 #, c-format msgid " -f --as-flags Pass to the assembler.\n" msgstr " -f --as-flags 把 传递给汇编程序。\n" -#: dlltool.c:3966 +#: dlltool.c:3692 #, c-format msgid "" " -C --compat-implib Create backward compatible import library.\n" msgstr " -C --compat-implib 创建向后兼容的导入库。\n" -#: dlltool.c:3967 +#: dlltool.c:3693 #, c-format msgid "" " -n --no-delete Keep temp files (repeat for extra " "preservation).\n" msgstr " -n --no-delete 保留临时文件 (重复以保留更多)。\n" -#: dlltool.c:3968 +#: dlltool.c:3694 #, c-format msgid "" " -t --temp-prefix Use to construct temp file names.\n" msgstr " -t --temp-prefix <前缀> 使用 <前缀> 来构造临时文件名称。\n" -#: dlltool.c:3969 +#: dlltool.c:3695 #, c-format msgid "" " -I --identify Report the name of the DLL associated with " ".\n" msgstr "" -#: dlltool.c:3970 +#: dlltool.c:3696 #, c-format msgid "" " --identify-strict Causes --identify to report error when multiple " "DLLs.\n" msgstr "" -#: dlltool.c:3971 +#: dlltool.c:3697 #, c-format msgid " -v --verbose Be verbose.\n" msgstr " -v --verbose 输出更多信息。\n" -#: dlltool.c:3972 +#: dlltool.c:3698 #, c-format msgid " -V --version Display the program version.\n" msgstr " -V --version 显示程序版本号。\n" -#: dlltool.c:3973 +#: dlltool.c:3699 #, c-format msgid " -h --help Display this information.\n" msgstr " -h --help 显示本信息。\n" -#: dlltool.c:3974 +#: dlltool.c:3700 #, c-format msgid " @ Read options from .\n" msgstr " @ 从 读取选项。\n" -#: dlltool.c:3976 +#: dlltool.c:3702 #, c-format msgid "" " -M --mcore-elf Process mcore-elf object files into .\n" msgstr " -M --mcore-elf <输出名称> 将 mcore-elf 对象文件处理成 <输出名称>。\n" -#: dlltool.c:3977 +#: dlltool.c:3703 #, c-format msgid " -L --linker Use as the linker.\n" msgstr " -L --linker 将 用作连接器。\n" -#: dlltool.c:3978 +#: dlltool.c:3704 #, c-format msgid " -F --linker-flags Pass to the linker.\n" msgstr " -F --linker-flags 把 传递给连接器。\n" -#: dlltool.c:4124 +#: dlltool.c:3850 #, c-format msgid "Unable to open def-file: %s" msgstr "" -#: dlltool.c:4129 +#: dlltool.c:3855 #, c-format msgid "Path components stripped from dllname, '%s'." msgstr "已从 dll 名称 '%s' 中截去路径部分。" -#: dlltool.c:4177 +#: dlltool.c:3903 #, c-format msgid "Unable to open base-file: %s" msgstr "无法打开 base 文件：%s" -#: dlltool.c:4212 +#: dlltool.c:3938 #, c-format msgid "Machine '%s' not supported" msgstr "不支持机器“%s”" -#: dlltool.c:4292 +#: dlltool.c:4018 #, c-format msgid "Warning, machine type (%d) not supported for delayimport." msgstr "" -#: dlltool.c:4360 dllwrap.c:206 +#: dlltool.c:4086 dllwrap.c:206 #, c-format msgid "Tried file: %s" msgstr "已尝试文件：%s" -#: dlltool.c:4367 dllwrap.c:213 +#: dlltool.c:4093 dllwrap.c:213 #, c-format msgid "Using file: %s" msgstr "正处理文件：%s" @@ -1763,11 +1763,11 @@ msgid " Rest are passed unmodified to the language driver\n" msgstr " 其余的都不加任何修改第传递给语言驱动器\n" -#: dllwrap.c:799 +#: dllwrap.c:802 msgid "Must provide at least one of -o or --dllname options" msgstr "必须提供至少一个 -o 或 --dllname 选项" -#: dllwrap.c:828 +#: dllwrap.c:831 msgid "" "no export definition file provided.\n" "Creating one, but that may not be what you want" @@ -1775,43 +1775,43 @@ "未提供导出定义文件。\n" "创建一个，但可能不是您所要的" -#: dllwrap.c:1017 +#: dllwrap.c:1020 #, c-format msgid "DLLTOOL name : %s\n" msgstr "DLLTOOL 名称 ：%s\n" -#: dllwrap.c:1018 +#: dllwrap.c:1021 #, c-format msgid "DLLTOOL options : %s\n" msgstr "DLLTOOL 选项 ：%s\n" -#: dllwrap.c:1019 +#: dllwrap.c:1022 #, c-format msgid "DRIVER name : %s\n" msgstr "驱动器名称 ：%s\n" -#: dllwrap.c:1020 +#: dllwrap.c:1023 #, c-format msgid "DRIVER options : %s\n" msgstr "驱动器选项 ：%s\n" -#: dwarf.c:177 +#: dwarf.c:178 msgid "Encoded value extends past end of section\n" msgstr "" -#: dwarf.c:185 +#: dwarf.c:186 #, c-format msgid "Encoded size of %d is too large to read\n" msgstr "" -#: dwarf.c:193 +#: dwarf.c:194 msgid "Encoded size of 0 is too small to read\n" msgstr "" #. Read AMOUNT bytes from PTR and store them in VAL as an unsigned value. #. Checks to make sure that the read will not reach or pass END #. and that VAL is big enough to hold AMOUNT bytes. -#: dwarf.c:387 +#: dwarf.c:402 #, c-format msgid "" "internal error: attempt to read %d byte of data in to %d sized variable" @@ -1820,16 +1820,16 @@ msgstr[0] "" msgstr[1] "" -#: dwarf.c:512 dwarf.c:4748 +#: dwarf.c:527 dwarf.c:5156 msgid "Badly formed extended line op encountered!\n" msgstr "" -#: dwarf.c:518 +#: dwarf.c:533 #, c-format msgid " Extended opcode %d: " msgstr " 扩充操作码 %d： " -#: dwarf.c:523 +#: dwarf.c:538 #, c-format msgid "" "End of Sequence\n" @@ -1838,36 +1838,36 @@ "序列结束\n" "\n" -#: dwarf.c:531 +#: dwarf.c:546 #, c-format msgid "Length (%lu) of DW_LNE_set_address op is too long\n" msgstr "" -#: dwarf.c:537 +#: dwarf.c:552 #, c-format msgid "set Address to 0x%s\n" msgstr "设置地址为 0x%s\n" -#: dwarf.c:544 +#: dwarf.c:559 #, c-format msgid "define new File Table entry\n" msgstr "定义新文件表条目\n" -#: dwarf.c:545 dwarf.c:4049 +#: dwarf.c:560 dwarf.c:4457 #, c-format msgid " Entry\tDir\tTime\tSize\tName\n" msgstr " 条目\t目录\t时间\t大小\t名称\n" -#: dwarf.c:564 +#: dwarf.c:579 msgid "DW_LNE_define_file: Bad opcode length\n" msgstr "" -#: dwarf.c:569 +#: dwarf.c:584 #, c-format msgid "set Discriminator to %s\n" msgstr "" -#: dwarf.c:635 +#: dwarf.c:650 #, c-format msgid " UNKNOWN DW_LNE_HP_SFC opcode (%u)\n" msgstr "" @@ -1876,425 +1876,425 @@ #. the limited range of the unsigned char data type used #. for op_code. #. && op_code <= DW_LNE_hi_user -#: dwarf.c:652 +#: dwarf.c:667 #, c-format msgid "user defined: " msgstr "用户定义： " -#: dwarf.c:654 +#: dwarf.c:669 #, c-format msgid "UNKNOWN: " msgstr "未知： " -#: dwarf.c:655 +#: dwarf.c:670 #, c-format msgid "length %d [" msgstr "长度 %d [" -#: dwarf.c:673 dwarf.c:743 +#: dwarf.c:688 dwarf.c:758 msgid "" msgstr "<没有 .debug_str 节>" -#: dwarf.c:677 +#: dwarf.c:692 #, c-format msgid "DW_FORM_strp offset too big: %s\n" msgstr "" -#: dwarf.c:679 dwarf.c:707 dwarf.c:1745 +#: dwarf.c:694 dwarf.c:722 dwarf.c:1866 msgid "" msgstr "<偏移量过大>" -#: dwarf.c:689 +#: dwarf.c:704 msgid "" msgstr "" -#: dwarf.c:701 +#: dwarf.c:716 msgid "" msgstr "" -#: dwarf.c:705 +#: dwarf.c:720 #, c-format msgid "DW_FORM_line_strp offset too big: %s\n" msgstr "" -#: dwarf.c:717 +#: dwarf.c:732 msgid "" msgstr "" -#: dwarf.c:738 +#: dwarf.c:753 msgid "" msgstr "<没有 .debug_str_offsets.dwo 节>" -#: dwarf.c:739 +#: dwarf.c:754 msgid "" msgstr "<没有 .debug_str_offsets 节>" -#: dwarf.c:740 +#: dwarf.c:758 #, c-format msgid "DW_FORM_GNU_str_index offset too big: %s\n" msgstr "" -#: dwarf.c:793 +#: dwarf.c:808 msgid "" msgstr "<索引偏移量过大>" -#: dwarf.c:742 +#: dwarf.c:757 msgid "" msgstr "<没有 .debug_str.dwo 节>" -#: dwarf.c:800 +#: dwarf.c:815 #, c-format msgid "DW_FORM_GNU_str_index indirect offset too big: %s\n" msgstr "" -#: dwarf.c:802 +#: dwarf.c:817 msgid "" msgstr "<间接索引偏移量过大>" -#: dwarf.c:811 +#: dwarf.c:826 msgid "" msgstr "" -#: dwarf.c:822 +#: dwarf.c:837 msgid "" msgstr "<没有 .debug_addr 节>" -#: dwarf.c:826 +#: dwarf.c:841 #, c-format msgid "Offset into section %s too big: %s\n" msgstr "" #. Report the missing single zero which ends the section. -#: dwarf.c:998 +#: dwarf.c:1119 msgid ".debug_abbrev section not zero terminated\n" msgstr ".debug_abbrev 节不由零终止\n" -#: dwarf.c:1013 +#: dwarf.c:1134 #, c-format msgid "User TAG value: %#lx" msgstr "" -#: dwarf.c:1015 +#: dwarf.c:1136 #, c-format msgid "Unknown TAG value: %#lx" msgstr "" -#: dwarf.c:1035 +#: dwarf.c:1156 #, c-format msgid "Unknown FORM value: %lx" msgstr "未知的 FORM 值：%lx" -#: dwarf.c:1051 +#: dwarf.c:1172 #, c-format msgid "Unknown IDX value: %lx" msgstr "" -#: dwarf.c:1065 +#: dwarf.c:1186 #, c-format msgid "%c%s byte block: " msgstr "" -#: dwarf.c:1409 +#: dwarf.c:1530 #, c-format msgid "(DW_OP_call_ref in frame info)" msgstr "" -#: dwarf.c:1432 +#: dwarf.c:1553 #, c-format msgid "size: %s " msgstr "大小：%s " -#: dwarf.c:1434 +#: dwarf.c:1555 #, c-format msgid "offset: %s " msgstr "偏移量：%s " -#: dwarf.c:1450 +#: dwarf.c:1571 #, c-format msgid "DW_OP_GNU_push_tls_address or DW_OP_HP_unknown" msgstr "" -#: dwarf.c:1475 +#: dwarf.c:1596 #, c-format msgid "(%s in frame info)" msgstr "" -#: dwarf.c:1577 +#: dwarf.c:1698 #, c-format msgid "(DW_OP_GNU_variable_value in frame info)" msgstr "" -#: dwarf.c:1630 +#: dwarf.c:1751 #, c-format msgid "(User defined location op 0x%x)" msgstr "" -#: dwarf.c:1632 +#: dwarf.c:1753 #, c-format msgid "(Unknown location op 0x%x)" msgstr "" -#: dwarf.c:1714 +#: dwarf.c:1835 msgid "" msgstr "" -#: dwarf.c:1738 +#: dwarf.c:1859 msgid "" msgstr "" -#: dwarf.c:1743 +#: dwarf.c:1864 #, c-format msgid "" "DW_FORM_GNU_strp_alt offset (%s) too big or no string sections available\n" msgstr "" -#: dwarf.c:1766 +#: dwarf.c:1887 #, c-format msgid "Unknown AT value: %lx" msgstr "未知的 AT 值：%lx" -#: dwarf.c:1831 +#: dwarf.c:1953 #, c-format msgid "Corrupt attribute block length: %lx\n" msgstr "" -#: dwarf.c:2087 +#: dwarf.c:2336 msgid "corrupt discr_list - not using a block form\n" msgstr "" -#: dwarf.c:2094 +#: dwarf.c:2343 msgid "corrupt discr_list - block not long enough\n" msgstr "" -#: dwarf.c:2139 +#: dwarf.c:2388 #, c-format msgid "corrupt discr_list - unrecognised discriminant byte %#x\n" msgstr "" -#: dwarf.c:2179 +#: dwarf.c:2428 msgid "Corrupt attribute\n" msgstr "" -#: dwarf.c:2194 +#: dwarf.c:2208 msgid "Internal error: DWARF version is not 2, 3 or 4.\n" msgstr "内部错误：DWARF 版本号码并非 2, 3 或 4。\n" -#: dwarf.c:2321 +#: dwarf.c:2586 msgid "DW_FORM_data8 is unsupported when sizeof (dwarf_vma) != 8\n" msgstr "当 sizeof (dwarf_vma) != 8 时，不支持 DW_FORM_data8\n" -#: dwarf.c:2366 +#: dwarf.c:2631 msgid "Block ends prematurely\n" msgstr "" -#: dwarf.c:2393 +#: dwarf.c:2665 #, c-format msgid "%c(indirect string, offset: 0x%s): %s" msgstr "" -#: dwarf.c:2400 +#: dwarf.c:2680 #, c-format msgid "%c(indirect line string, offset: 0x%s): %s" msgstr "" -#: dwarf.c:2411 +#: dwarf.c:2698 #, c-format msgid "%c(indexed string: 0x%s): %s" msgstr "" -#: dwarf.c:2420 +#: dwarf.c:2713 #, c-format msgid "%c(alt indirect string, offset: 0x%s) %s" msgstr "" -#: dwarf.c:2445 +#: dwarf.c:2750 #, c-format msgid "%c(addr_index: 0x%s): %s" msgstr "" -#: dwarf.c:2451 +#: dwarf.c:2757 #, c-format msgid "Unrecognized form: %lu\n" msgstr "无法识别的形式：%lu\n" -#: dwarf.c:2512 +#: dwarf.c:2818 msgid "More location offset attributes than DW_AT_GNU_locview attributes\n" msgstr "" -#: dwarf.c:2524 +#: dwarf.c:2830 msgid "More DW_AT_GNU_locview attributes than location offset attributes\n" msgstr "" -#: dwarf.c:2587 dwarf.c:2614 dwarf.c:2629 +#: dwarf.c:2893 dwarf.c:2920 dwarf.c:2935 #, c-format msgid "Unsupported form (%s) for attribute %s\n" msgstr "" -#: dwarf.c:2663 +#: dwarf.c:2978 #, c-format msgid "(not inlined)" msgstr "(未内连)" -#: dwarf.c:2666 +#: dwarf.c:2981 #, c-format msgid "(inlined)" msgstr "(已内连)" -#: dwarf.c:2669 +#: dwarf.c:2984 #, c-format msgid "(declared as inline but ignored)" msgstr "(声明为内连但被忽略)" -#: dwarf.c:2672 +#: dwarf.c:2987 #, c-format msgid "(declared as inline and inlined)" msgstr "(声明为内连并已内连)" -#: dwarf.c:2675 +#: dwarf.c:2990 #, c-format msgid " (Unknown inline attribute value: %s)" msgstr " (未知的内嵌属性值：%s)" -#: dwarf.c:2732 +#: dwarf.c:3047 #, c-format msgid "(implementation defined: %s)" msgstr "（实现决定：%s）" -#: dwarf.c:2735 +#: dwarf.c:3050 #, c-format msgid "(Unknown: %s)" msgstr "<未知：%s>" -#: dwarf.c:2780 +#: dwarf.c:3095 #, c-format msgid "(user defined type)" msgstr "(用户定义的类型)" -#: dwarf.c:2782 +#: dwarf.c:3097 #, c-format msgid "(unknown type)" msgstr "(未知的类型)" -#: dwarf.c:2795 +#: dwarf.c:3110 #, c-format msgid "(unknown accessibility)" msgstr "(未知的可访问性)" -#: dwarf.c:2807 +#: dwarf.c:3122 #, c-format msgid "(unknown visibility)" msgstr "(未知的可见性)" -#: dwarf.c:2820 +#: dwarf.c:3135 #, c-format msgid "(user specified)" msgstr "" -#: dwarf.c:2822 +#: dwarf.c:3137 #, c-format msgid "(unknown endianity)" msgstr "" -#: dwarf.c:2834 +#: dwarf.c:3149 #, c-format msgid "(unknown virtuality)" msgstr "(未知的)" -#: dwarf.c:2846 +#: dwarf.c:3161 #, c-format msgid "(unknown case)" msgstr "(未知的案例)" -#: dwarf.c:2864 +#: dwarf.c:3179 #, c-format msgid "(user defined)" msgstr "(用户定义的)" -#: dwarf.c:2866 +#: dwarf.c:3181 #, c-format msgid "(unknown convention)" msgstr "未知的节" -#: dwarf.c:2875 +#: dwarf.c:3190 #, c-format msgid "(undefined)" msgstr "(未定义的)" -#: dwarf.c:2885 +#: dwarf.c:3200 #, c-format msgid "(unsigned)" msgstr "" -#: dwarf.c:2886 +#: dwarf.c:3201 #, c-format msgid "(leading overpunch)" msgstr "" -#: dwarf.c:2887 +#: dwarf.c:3202 #, c-format msgid "(trailing overpunch)" msgstr "" -#: dwarf.c:2888 +#: dwarf.c:3203 #, c-format msgid "(leading separate)" msgstr "" -#: dwarf.c:2889 +#: dwarf.c:3204 #, c-format msgid "(trailing separate)" msgstr "" -#: dwarf.c:2890 dwarf.c:2901 +#: dwarf.c:3205 dwarf.c:3216 #, c-format msgid "(unrecognised)" msgstr "" -#: dwarf.c:2898 +#: dwarf.c:3213 #, c-format msgid "(no)" msgstr "" -#: dwarf.c:2899 +#: dwarf.c:3214 #, c-format msgid "(in class)" msgstr "" -#: dwarf.c:2900 +#: dwarf.c:3215 #, c-format msgid "(out of class)" msgstr "" -#: dwarf.c:2932 +#: dwarf.c:3247 #, c-format msgid " (location list)" msgstr " (位置列表)" -#: dwarf.c:2953 dwarf.c:5926 dwarf.c:6075 dwarf.c:6250 +#: dwarf.c:3268 dwarf.c:6378 dwarf.c:6542 dwarf.c:6717 #, c-format msgid " [without DW_AT_frame_base]" msgstr " [不含 DW_AT_frame_base]" -#: dwarf.c:2986 +#: dwarf.c:3298 #, c-format msgid "" "Offset %s used as value for DW_AT_import attribute of DIE at offset 0x%lx is " "too big.\n" msgstr "" -#: dwarf.c:2997 +#: dwarf.c:3304 #, c-format msgid "\t[Abbrev Number: %ld" msgstr "\t[缩写偏移量: %ld" -#: dwarf.c:3102 +#: dwarf.c:3399 #, c-format msgid "" "Raw dump of debug contents of section %s (loaded from %s):\n" "\n" msgstr "" -#: dwarf.c:3105 +#: dwarf.c:3402 #, c-format msgid "" "Raw dump of debug contents of section %s:\n" @@ -2303,14 +2303,14 @@ "%s 节的调试内容转储：\n" "\n" -#: dwarf.c:3110 +#: dwarf.c:3407 #, c-format msgid "" "Contents of the %s section (loaded from %s):\n" "\n" msgstr "" -#: dwarf.c:3113 +#: dwarf.c:3410 #, c-format msgid "" "Contents of the %s section:\n" @@ -2319,180 +2319,180 @@ "%s 节的内容:\n" "\n" -#: dwarf.c:3162 +#: dwarf.c:3459 #, c-format msgid "Reserved length value (0x%s) found in section %s\n" msgstr "" -#: dwarf.c:3174 +#: dwarf.c:3471 #, c-format msgid "Corrupt unit length (0x%s) found in section %s\n" msgstr "" -#: dwarf.c:3182 +#: dwarf.c:3479 #, c-format msgid "No comp units in %s section ?\n" msgstr "" -#: dwarf.c:3191 +#: dwarf.c:3488 #, c-format msgid "Not enough memory for a debug info array of %u entries\n" msgstr "" -#: dwarf.c:3220 +#: dwarf.c:3517 #, c-format msgid "Unable to locate %s section!\n" msgstr "无法找到 %s 节的位置！\n" -#: dwarf.c:3300 +#: dwarf.c:3690 #, c-format msgid "Invalid pointer size (%d) in compunit header, using %d instead\n" msgstr "" -#: dwarf.c:3344 +#: dwarf.c:3734 #, c-format msgid " Compilation Unit @ offset 0x%s:\n" msgstr " 编译单元 @ 偏移 0x%s:\n" -#: dwarf.c:3346 +#: dwarf.c:3736 #, c-format msgid " Length: 0x%s (%s)\n" msgstr " 长度： 0x%s (%s)\n" -#: dwarf.c:3349 +#: dwarf.c:3739 #, c-format msgid " Version: %d\n" msgstr " 版本： %d\n" -#: dwarf.c:3350 +#: dwarf.c:3744 #, c-format msgid " Abbrev Offset: 0x%s\n" msgstr " 缩写偏移量： 0x%s\n" -#: dwarf.c:3352 +#: dwarf.c:3746 #, c-format msgid " Pointer Size: %d\n" msgstr " 指针大小： %d\n" -#: dwarf.c:3357 +#: dwarf.c:3751 #, c-format msgid " Signature: 0x%s\n" msgstr " 签名： 0x%s\n" -#: dwarf.c:3360 +#: dwarf.c:3754 #, c-format msgid " Type Offset: 0x%s\n" msgstr " 类型偏移量： 0x%s\n" -#: dwarf.c:3368 +#: dwarf.c:3762 #, c-format msgid " Section contributions:\n" msgstr " 区段贡献：\n" -#: dwarf.c:3369 +#: dwarf.c:3763 #, c-format msgid " .debug_abbrev.dwo: 0x%s 0x%s\n" msgstr " .debug_abbrev.dwo: 0x%s 0x%s\n" -#: dwarf.c:3372 +#: dwarf.c:3766 #, c-format msgid " .debug_line.dwo: 0x%s 0x%s\n" msgstr " .debug_line.dwo: 0x%s 0x%s\n" -#: dwarf.c:3375 +#: dwarf.c:3769 #, c-format msgid " .debug_loc.dwo: 0x%s 0x%s\n" msgstr " .debug_loc.dwo: 0x%s 0x%s\n" -#: dwarf.c:3378 +#: dwarf.c:3772 #, c-format msgid " .debug_str_offsets.dwo: 0x%s 0x%s\n" msgstr "" -#: dwarf.c:3388 dwarf.c:5152 dwarf.c:6676 dwarf.c:8986 +#: dwarf.c:3782 dwarf.c:5597 dwarf.c:7143 dwarf.c:9457 #, c-format msgid "Debug info is corrupted, %s header at %#lx has length %s\n" msgstr "" -#: dwarf.c:3401 +#: dwarf.c:3795 #, c-format msgid "CU at offset %s contains corrupt or unsupported version number: %d.\n" msgstr "" -#: dwarf.c:3410 +#: dwarf.c:3805 #, c-format msgid "CU at offset %s contains corrupt or unsupported unit type: %d.\n" msgstr "" -#: dwarf.c:3420 +#: dwarf.c:3813 #, c-format msgid "" "Debug info is corrupted, abbrev offset (%lx) is larger than abbrev section " "size (%lx)\n" msgstr "" -#: dwarf.c:3426 +#: dwarf.c:3819 #, c-format msgid "" "Debug info is corrupted, abbrev size (%lx) is larger than abbrev section " "size (%lx)\n" msgstr "" -#: dwarf.c:3470 +#: dwarf.c:3876 #, c-format msgid " <%d><%lx>: Abbrev Number: 0\n" msgstr " <%d><%lx>：缩写编号：0\n" -#: dwarf.c:3480 +#: dwarf.c:3886 #, c-format msgid "Bogus end-of-siblings marker detected at offset %lx in %s section\n" msgstr "" -#: dwarf.c:3484 +#: dwarf.c:3890 msgid "Further warnings about bogus end-of-sibling markers suppressed\n" msgstr "" -#: dwarf.c:3503 +#: dwarf.c:3909 #, c-format msgid " <%d><%lx>: Abbrev Number: %lu" msgstr " <%d><%lx>：缩写编号：%lu" -#: dwarf.c:3507 +#: dwarf.c:3913 #, c-format msgid " <%d><%lx>: ...\n" msgstr "" -#: dwarf.c:3526 +#: dwarf.c:3934 #, c-format msgid "" "DIE at offset 0x%lx refers to abbreviation number %lu which does not exist\n" msgstr "" -#: dwarf.c:3600 +#: dwarf.c:4008 msgid "DIE has locviews without loclist\n" msgstr "" -#: dwarf.c:3714 +#: dwarf.c:4122 #, c-format msgid "" "The length field (0x%lx) in the debug_line header is wrong - the section is " "too small\n" msgstr "" -#: dwarf.c:3728 +#: dwarf.c:4136 msgid "Only DWARF version 2, 3, 4 and 5 line info is currently supported.\n" msgstr "" -#: dwarf.c:3740 dwarf.c:6343 dwarf.c:7161 +#: dwarf.c:4148 dwarf.c:6810 dwarf.c:7634 #, c-format msgid "The %s section contains unsupported segment selector size: %d.\n" msgstr "" -#: dwarf.c:3757 +#: dwarf.c:4165 msgid "Invalid maximum operations per insn.\n" msgstr "" -#: dwarf.c:3773 +#: dwarf.c:4181 #, c-format msgid "Line length %s extends beyond end of section\n" msgstr "" @@ -2509,11 +2509,11 @@ msgid "Corrupt directory list\n" msgstr "" -#: dwarf.c:4492 dwarf.c:4517 dwarf.c:4564 +#: dwarf.c:4900 dwarf.c:4925 dwarf.c:4972 msgid "Corrupt file name list\n" msgstr "" -#: dwarf.c:4019 +#: dwarf.c:4427 #, c-format msgid "" "\n" @@ -2522,7 +2522,7 @@ "\n" " 目录表为空。\n" -#: dwarf.c:4044 +#: dwarf.c:4452 #, c-format msgid "" "\n" @@ -2531,7 +2531,7 @@ "\n" " 文件名表为空。\n" -#: dwarf.c:4024 +#: dwarf.c:4432 #, c-format msgid "" "\n" @@ -2540,7 +2540,7 @@ "\n" " 目录表 (偏移 0x%lx):\n" -#: dwarf.c:4047 +#: dwarf.c:4455 #, c-format msgid "" "\n" @@ -2549,37 +2549,37 @@ "\n" " 文件名表 (偏移 0x%lx):\n" -#: dwarf.c:3836 +#: dwarf.c:4244 #, c-format msgid " Entry" msgstr "" -#: dwarf.c:3850 +#: dwarf.c:4258 #, c-format msgid "\tName" msgstr "" -#: dwarf.c:3853 +#: dwarf.c:4261 #, c-format msgid "\tDir" msgstr "" -#: dwarf.c:3856 +#: dwarf.c:4264 #, c-format msgid "\tTime" msgstr "" -#: dwarf.c:3859 +#: dwarf.c:4267 #, c-format msgid "\tSize" msgstr "" -#: dwarf.c:3809 +#: dwarf.c:3467 #, c-format msgid "\tMD5" msgstr "" -#: dwarf.c:3865 +#: dwarf.c:4273 #, c-format msgid "\t(Unknown format content type %s)" msgstr "" @@ -2592,71 +2592,71 @@ msgid "Corrupt file name entries list\n" msgstr "" -#: dwarf.c:3947 dwarf.c:4362 +#: dwarf.c:4355 dwarf.c:4770 msgid "" "Partial .debug_line. section encountered without a prior full .debug_line " "section\n" msgstr "" -#: dwarf.c:3960 dwarf.c:5460 +#: dwarf.c:4368 dwarf.c:5905 #, c-format msgid " Offset: 0x%lx\n" msgstr " 偏移： 0x%lx\n" -#: dwarf.c:3961 +#: dwarf.c:4369 #, c-format msgid " Length: %ld\n" msgstr " 长度： %ld\n" -#: dwarf.c:3962 +#: dwarf.c:4370 #, c-format msgid " DWARF Version: %d\n" msgstr " DWARF 版本： %d\n" -#: dwarf.c:3968 +#: dwarf.c:4376 #, c-format msgid " Prologue Length: %d\n" msgstr " 导言长度： %d\n" -#: dwarf.c:3969 +#: dwarf.c:4377 #, c-format msgid " Minimum Instruction Length: %d\n" msgstr " 最小指令长度： %d\n" -#: dwarf.c:3971 +#: dwarf.c:4379 #, c-format msgid " Maximum Ops per Instruction: %d\n" msgstr " 每个指令中最大操作码数： %d\n" -#: dwarf.c:3972 +#: dwarf.c:4380 #, c-format msgid " Initial value of 'is_stmt': %d\n" msgstr " “is_stmt”的初始值： %d\n" -#: dwarf.c:3973 +#: dwarf.c:4381 #, c-format msgid " Line Base: %d\n" msgstr " 行基数： %d\n" -#: dwarf.c:3974 +#: dwarf.c:4382 #, c-format msgid " Line Range: %d\n" msgstr " 行范围： %d\n" -#: dwarf.c:3975 +#: dwarf.c:4383 #, c-format msgid " Opcode Base: %d\n" msgstr " 操作码基数： %d\n" -#: dwarf.c:3980 dwarf.c:4378 +#: dwarf.c:4388 dwarf.c:4786 msgid "Line range of 0 is invalid, using 1 instead\n" msgstr "" -#: dwarf.c:3992 +#: dwarf.c:4400 msgid "Line Base extends beyond end of section\n" msgstr "" -#: dwarf.c:3996 +#: dwarf.c:4404 #, c-format msgid "" "\n" @@ -2665,299 +2665,299 @@ "\n" " 操作码:\n" -#: dwarf.c:3999 +#: dwarf.c:4407 #, c-format msgid " Opcode %d has %d arg\n" msgid_plural " Opcode %d has %d args\n" msgstr[0] "" msgstr[1] "" -#: dwarf.c:4070 +#: dwarf.c:4478 msgid "Corrupt file name table entry\n" msgstr "损坏的文件表条目\n" -#: dwarf.c:4086 +#: dwarf.c:4494 #, c-format msgid " No Line Number Statements.\n" msgstr " 无行号语句。\n" -#: dwarf.c:4089 +#: dwarf.c:4497 #, c-format msgid " Line Number Statements:\n" msgstr " 行号语句：\n" -#: dwarf.c:4111 +#: dwarf.c:4519 #, c-format msgid " Special opcode %d: advance Address by %s to 0x%s%s" msgstr "" -#: dwarf.c:4116 dwarf.c:4137 dwarf.c:4179 dwarf.c:4199 dwarf.c:4249 -#: dwarf.c:4269 +#: dwarf.c:4524 dwarf.c:4545 dwarf.c:4587 dwarf.c:4607 dwarf.c:4657 +#: dwarf.c:4677 msgid " (reset view)" msgstr "" -#: dwarf.c:4131 +#: dwarf.c:4539 #, c-format msgid " Special opcode %d: advance Address by %s to 0x%s[%d]%s" msgstr "" -#: dwarf.c:4141 +#: dwarf.c:4549 #, c-format msgid " and Line by %s to %d" msgstr "" -#: dwarf.c:4144 dwarf.c:4161 +#: dwarf.c:4552 dwarf.c:4569 #, c-format msgid " (view %u)\n" msgstr "" -#: dwarf.c:4159 +#: dwarf.c:4567 #, c-format msgid " Copy" msgstr "" -#: dwarf.c:4175 +#: dwarf.c:4583 #, c-format msgid " Advance PC by %s to 0x%s%s\n" msgstr "" -#: dwarf.c:4194 +#: dwarf.c:4602 #, c-format msgid " Advance PC by %s to 0x%s[%d]%s\n" msgstr "" -#: dwarf.c:4206 +#: dwarf.c:4614 #, c-format msgid " Advance Line by %s to %d\n" msgstr "" -#: dwarf.c:4213 +#: dwarf.c:4621 #, c-format msgid " Set File Name to entry %s in the File Name Table\n" msgstr "" -#: dwarf.c:4220 +#: dwarf.c:4628 #, c-format msgid " Set column to %s\n" msgstr " 将列设定为 %s\n" -#: dwarf.c:4228 +#: dwarf.c:4636 #, c-format msgid " Set is_stmt to %s\n" msgstr " 将 is_stmt 设定为 %s\n" -#: dwarf.c:4233 +#: dwarf.c:4641 #, c-format msgid " Set basic block\n" msgstr " 设定基本块\n" -#: dwarf.c:4245 +#: dwarf.c:4653 #, c-format msgid " Advance PC by constant %s to 0x%s%s\n" msgstr "" -#: dwarf.c:4264 +#: dwarf.c:4672 #, c-format msgid " Advance PC by constant %s to 0x%s[%d]%s\n" msgstr "" -#: dwarf.c:4277 +#: dwarf.c:4685 #, c-format msgid " Advance PC by fixed size amount %s to 0x%s\n" msgstr "" -#: dwarf.c:4284 +#: dwarf.c:4692 #, c-format msgid " Set prologue_end to true\n" msgstr " 将 prologue_end 设置为真\n" -#: dwarf.c:4288 +#: dwarf.c:4696 #, c-format msgid " Set epilogue_begin to true\n" msgstr " 将 epilogue_begin 设置为真\n" -#: dwarf.c:4293 +#: dwarf.c:4701 #, c-format msgid " Set ISA to %s\n" msgstr " 将 ISA 设定为 %s\n" -#: dwarf.c:4297 dwarf.c:4930 +#: dwarf.c:4705 dwarf.c:5338 #, c-format msgid " Unknown opcode %d with operands: " msgstr "" -#: dwarf.c:4391 +#: dwarf.c:4799 #, c-format msgid "opcode base of %d extends beyond end of section\n" msgstr "" -#: dwarf.c:4418 dwarf.c:4442 dwarf.c:4472 +#: dwarf.c:4826 dwarf.c:4850 dwarf.c:4880 msgid "Corrupt directories list\n" msgstr "" -#: dwarf.c:4584 +#: dwarf.c:4992 msgid "directory table ends unexpectedly\n" msgstr "" -#: dwarf.c:4623 +#: dwarf.c:5031 msgid "file table ends unexpectedly\n" msgstr "" -#: dwarf.c:4658 +#: dwarf.c:5066 #, c-format msgid "CU: %s:\n" msgstr "" -#: dwarf.c:4668 dwarf.c:4968 readelf.c:6023 readelf.c:6098 readelf.c:6116 -#: readelf.c:6134 readelf.c:6935 readelf.c:11013 readelf.c:11646 -#: readelf.c:11659 readelf.c:16520 readelf.c:16552 +#: dwarf.c:5076 dwarf.c:5376 readelf.c:6131 readelf.c:6228 readelf.c:6246 +#: readelf.c:6264 readelf.c:7065 readelf.c:11185 readelf.c:11818 +#: readelf.c:11831 readelf.c:17100 readelf.c:17132 msgid "" msgstr "<未知>" -#: dwarf.c:4671 dwarf.c:4860 +#: dwarf.c:5079 dwarf.c:5268 #, c-format msgid "directory index %u > number of directories %s\n" msgstr "" -#: dwarf.c:4673 dwarf.c:4962 elfcomm.c:902 readelf.c:337 readelf.c:704 -#: readelf.c:7096 readelf.c:7632 readelf.c:9644 readelf.c:11973 readelf.c:12039 -#: readelf.c:12043 readelf.c:12082 readelf.c:15357 readelf.c:15446 -#: readelf.c:16039 readelf.c:16058 readelf.c:16177 readelf.c:16529 -#: readelf.c:17682 readelf.c:17685 +#: dwarf.c:5081 dwarf.c:5370 elfcomm.c:867 readelf.c:349 readelf.c:726 +#: readelf.c:7227 readelf.c:7763 readelf.c:9785 readelf.c:12145 readelf.c:12211 +#: readelf.c:12215 readelf.c:12254 readelf.c:15833 readelf.c:15922 +#: readelf.c:16515 readelf.c:16534 readelf.c:16653 readelf.c:17109 +#: readelf.c:18265 readelf.c:18268 #, c-format msgid "" msgstr "<已损坏>" -#: dwarf.c:4679 +#: dwarf.c:5087 #, c-format msgid "CU: %s/%s:\n" msgstr "" -#: dwarf.c:4685 +#: dwarf.c:5093 #, c-format msgid "" "File name Line number Starting address View " " Stmt\n" msgstr "" -#: dwarf.c:4794 +#: dwarf.c:5202 #, c-format msgid "UNKNOWN (%u): length %ld\n" msgstr "" -#: dwarf.c:4844 +#: dwarf.c:5252 #, c-format msgid "" "\n" " [Use file table entry %d]\n" msgstr "" -#: dwarf.c:4848 +#: dwarf.c:5256 #, c-format msgid "file index %u > number of files %u\n" msgstr "" -#: dwarf.c:4849 +#: dwarf.c:5257 #, c-format msgid "" "\n" " " msgstr "" -#: dwarf.c:4855 +#: dwarf.c:5263 #, c-format msgid "" "\n" " [Use file %s in directory table entry %d]\n" msgstr "" -#: dwarf.c:4862 +#: dwarf.c:5270 #, c-format msgid "" "\n" " \n" msgstr "" -#: dwarf.c:4926 +#: dwarf.c:5334 #, c-format msgid " Set ISA to %lu\n" msgstr " 设置 ISA 为 %lu\n" -#: dwarf.c:4961 +#: dwarf.c:5369 #, c-format msgid "corrupt file index %u encountered\n" msgstr "" -#: dwarf.c:5101 +#: dwarf.c:5546 msgid "no info" msgstr "无信息" -#: dwarf.c:5102 +#: dwarf.c:5547 msgid "type" msgstr "类型" -#: dwarf.c:5103 +#: dwarf.c:5548 msgid "variable" msgstr "变量" -#: dwarf.c:5104 +#: dwarf.c:5549 msgid "function" msgstr "函数" -#: dwarf.c:5105 +#: dwarf.c:5550 msgid "other" msgstr "" -#: dwarf.c:5106 +#: dwarf.c:5551 msgid "unused5" msgstr "未用 5" -#: dwarf.c:5107 +#: dwarf.c:5552 msgid "unused6" msgstr "未用 6" -#: dwarf.c:5108 +#: dwarf.c:5553 msgid "unused7" msgstr "未用 7" -#: dwarf.c:5168 dwarf.c:6689 +#: dwarf.c:5613 dwarf.c:7156 #, c-format msgid "" ".debug_info offset of 0x%lx in %s section does not point to a CU header.\n" msgstr "" -#: dwarf.c:5173 +#: dwarf.c:5618 #, c-format msgid " Length: %ld\n" msgstr " 长度： %ld\n" -#: dwarf.c:5175 +#: dwarf.c:5620 #, c-format msgid " Version: %d\n" msgstr " 版本： %d\n" -#: dwarf.c:5177 +#: dwarf.c:5622 #, c-format msgid " Offset into .debug_info section: 0x%lx\n" msgstr "" -#: dwarf.c:5179 +#: dwarf.c:5624 #, c-format msgid " Size of area in .debug_info section: %ld\n" msgstr " 在 .debug_info 节中区域的大小： %ld\n" -#: dwarf.c:5188 +#: dwarf.c:5633 msgid "Only DWARF 2 and 3 pubnames are currently supported\n" msgstr "目前只支持第二与第三版 DWARF 的 pubname\n" -#: dwarf.c:5196 +#: dwarf.c:5641 #, c-format msgid "" "\n" " Offset Kind Name\n" msgstr "" -#: dwarf.c:5198 +#: dwarf.c:5643 #, c-format msgid "" "\n" @@ -2966,257 +2966,257 @@ "\n" " 偏移量\t名称\n" -#: dwarf.c:5234 +#: dwarf.c:5679 msgid "s" msgstr "s" -#: dwarf.c:5234 +#: dwarf.c:5679 msgid "g" msgstr "g" -#: dwarf.c:5290 +#: dwarf.c:5735 #, c-format msgid " DW_MACINFO_start_file - lineno: %d filenum: %d\n" msgstr " DW_MACINFO_start_file - 行号：%d 文件编号：%d\n" -#: dwarf.c:5296 +#: dwarf.c:5741 #, c-format msgid " DW_MACINFO_end_file\n" msgstr " DW_MACINFO_end_file\n" -#: dwarf.c:5303 +#: dwarf.c:5748 #, c-format msgid " DW_MACINFO_define - lineno : %d macro : %s\n" msgstr " DW_MACINFO_define - 行号：%d 宏：%s\n" -#: dwarf.c:5311 +#: dwarf.c:5756 #, c-format msgid " DW_MACINFO_undef - lineno : %d macro : %s\n" msgstr " DW_MACINFO_undef - 行号：%d 宏：%s\n" -#: dwarf.c:5322 +#: dwarf.c:5767 #, c-format msgid " DW_MACINFO_vendor_ext - constant : %d string : %s\n" msgstr " DW_MACINFO_vendor_ext - 常量：%d 字符串：%s\n" -#: dwarf.c:5452 +#: dwarf.c:5897 #, c-format msgid "Only GNU extension to DWARF 4 or 5 of %s is currently supported.\n" msgstr "" -#: dwarf.c:5462 +#: dwarf.c:5907 #, c-format msgid " Version: %d\n" msgstr " 版本： %d\n" -#: dwarf.c:5463 +#: dwarf.c:5908 #, c-format msgid " Offset size: %d\n" msgstr " 偏移量长度： %d\n" -#: dwarf.c:5467 +#: dwarf.c:5912 #, c-format msgid " Offset into .debug_line: 0x%lx\n" msgstr " .debug_info 节中的偏移量: 0x%lx\n" -#: dwarf.c:5481 +#: dwarf.c:5926 #, c-format msgid " Extension opcode arguments:\n" msgstr "" -#: dwarf.c:5488 +#: dwarf.c:5933 #, c-format msgid " DW_MACRO_%02x has no arguments\n" msgstr "" -#: dwarf.c:5491 +#: dwarf.c:5936 #, c-format msgid " DW_MACRO_%02x arguments: " msgstr "" -#: dwarf.c:5517 +#: dwarf.c:5962 #, c-format msgid "Invalid extension opcode form %s\n" msgstr "" -#: dwarf.c:5534 +#: dwarf.c:5979 msgid ".debug_macro section not zero terminated\n" msgstr "" -#: dwarf.c:5569 +#: dwarf.c:6014 msgid "DW_MACRO_start_file used, but no .debug_line offset provided.\n" msgstr "" -#: dwarf.c:5575 +#: dwarf.c:6020 #, c-format msgid " DW_MACRO_start_file - lineno: %d filenum: %d\n" msgstr "" -#: dwarf.c:5578 +#: dwarf.c:6023 #, c-format msgid " DW_MACRO_start_file - lineno: %d filenum: %d filename: %s%s%s\n" msgstr "" -#: dwarf.c:5586 +#: dwarf.c:6031 #, c-format msgid " DW_MACRO_end_file\n" msgstr "" -#: dwarf.c:5548 +#: dwarf.c:5993 #, c-format msgid " DW_MACRO_define - lineno : %d macro : %s\n" msgstr "" -#: dwarf.c:5556 +#: dwarf.c:6001 #, c-format msgid " DW_MACRO_undef - lineno : %d macro : %s\n" msgstr "" -#: dwarf.c:5593 +#: dwarf.c:6038 #, c-format msgid " DW_MACRO_define_strp - lineno : %d macro : %s\n" msgstr "" -#: dwarf.c:5601 +#: dwarf.c:6046 #, c-format msgid " DW_MACRO_undef_strp - lineno : %d macro : %s\n" msgstr "" -#: dwarf.c:5607 +#: dwarf.c:6052 #, c-format msgid " DW_MACRO_import - offset : 0x%lx\n" msgstr "" -#: dwarf.c:5614 +#: dwarf.c:6059 #, c-format msgid " DW_MACRO_define_sup - lineno : %d macro offset : 0x%lx\n" msgstr "" -#: dwarf.c:5621 +#: dwarf.c:6066 #, c-format msgid " DW_MACRO_undef_sup - lineno : %d macro offset : 0x%lx\n" msgstr "" -#: dwarf.c:5627 +#: dwarf.c:6072 #, c-format msgid " DW_MACRO_import_sup - offset : 0x%lx\n" msgstr "" -#: dwarf.c:5656 +#: dwarf.c:6101 #, c-format msgid " Unknown macro opcode %02x seen\n" msgstr "" -#: dwarf.c:5667 +#: dwarf.c:6112 #, c-format msgid " DW_MACRO_%02x\n" msgstr "" -#: dwarf.c:5670 +#: dwarf.c:6115 #, c-format msgid " DW_MACRO_%02x -" msgstr "" -#: dwarf.c:5719 +#: dwarf.c:6171 #, c-format msgid " Number TAG (0x%lx)\n" msgstr "" -#: dwarf.c:5728 +#: dwarf.c:6180 msgid "has children" msgstr "" -#: dwarf.c:5728 +#: dwarf.c:6180 msgid "no children" msgstr "" -#: dwarf.c:5790 +#: dwarf.c:6242 #, c-format msgid "location view pair\n" msgstr "" -#: dwarf.c:5822 +#: dwarf.c:6274 #, c-format msgid "No debug information available for loc lists of entry: %u\n" msgstr "" -#: dwarf.c:5834 dwarf.c:5981 dwarf.c:6143 +#: dwarf.c:6286 dwarf.c:6433 dwarf.c:6610 #, c-format msgid "Invalid pointer size (%d) in debug info for entry %d\n" msgstr "" -#: dwarf.c:5846 dwarf.c:5899 dwarf.c:5908 dwarf.c:5993 dwarf.c:6055 -#: dwarf.c:6154 dwarf.c:6227 dwarf.c:6235 +#: dwarf.c:6298 dwarf.c:6351 dwarf.c:6360 dwarf.c:6445 dwarf.c:6522 +#: dwarf.c:6621 dwarf.c:6694 dwarf.c:6702 #, c-format msgid "Location list starting at offset 0x%lx is not terminated.\n" msgstr "" -#: dwarf.c:5867 dwarf.c:6019 dwarf.c:6192 dwarf.c:6986 dwarf.c:7041 +#: dwarf.c:6319 dwarf.c:6473 dwarf.c:6659 dwarf.c:7452 dwarf.c:7507 #, c-format msgid "\n" msgstr "<列表末尾>\n" -#: dwarf.c:5879 dwarf.c:6029 dwarf.c:7046 +#: dwarf.c:6331 dwarf.c:6494 dwarf.c:7512 #, c-format msgid "(base address)\n" msgstr "(基址)\n" -#: dwarf.c:5893 dwarf.c:6012 dwarf.c:6180 +#: dwarf.c:6345 dwarf.c:6466 dwarf.c:6647 #, c-format msgid "" "views at %8.8lx for:\n" " %*s " msgstr "" -#: dwarf.c:5929 dwarf.c:6078 +#: dwarf.c:6381 dwarf.c:6545 msgid " (start == end)" msgstr " (开始 == 结束)" -#: dwarf.c:5931 dwarf.c:6080 +#: dwarf.c:6383 dwarf.c:6547 msgid " (start > end)" msgstr " (开始 > 结束)" -#: dwarf.c:5968 +#: dwarf.c:6420 #, c-format msgid "No debug information available for loclists lists of entry: %u\n" msgstr "" -#: dwarf.c:6034 +#: dwarf.c:6499 #, c-format msgid "View pair entry in loclist with locviews attribute\n" msgstr "" -#: dwarf.c:6041 +#: dwarf.c:6506 #, c-format msgid "views for:\n" msgstr "" -#: dwarf.c:6045 +#: dwarf.c:6510 #, c-format msgid "Invalid location list entry type %d\n" msgstr "" -#: dwarf.c:6089 +#: dwarf.c:6556 #, c-format msgid "Trailing view pair not used in a range" msgstr "" -#: dwarf.c:6131 +#: dwarf.c:6598 #, c-format msgid "No debug information for loc lists of entry: %u\n" msgstr "" -#: dwarf.c:6198 +#: dwarf.c:6665 #, c-format msgid "(base address selection entry)\n" msgstr "" -#: dwarf.c:6219 +#: dwarf.c:6686 #, c-format msgid "Unknown location list entry type 0x%x.\n" msgstr "" -#: dwarf.c:6312 dwarf.c:6565 dwarf.c:6786 dwarf.c:6861 dwarf.c:7101 +#: dwarf.c:6779 dwarf.c:7032 dwarf.c:7253 dwarf.c:7328 dwarf.c:7574 #, c-format msgid "" "\n" @@ -3225,33 +3225,33 @@ "\n" "%s 段空。\n" -#: dwarf.c:6332 +#: dwarf.c:6799 #, c-format msgid "The %s section contains corrupt or unsupported version number: %d.\n" msgstr "" -#: dwarf.c:6352 +#: dwarf.c:6819 #, c-format msgid "The %s section contains unsupported offset entry count: %d.\n" msgstr "" -#: dwarf.c:6363 dwarf.c:6792 dwarf.c:7179 +#: dwarf.c:6830 dwarf.c:7259 dwarf.c:7652 #, c-format msgid "" "Unable to load/parse the .debug_info section, so cannot interpret the %s " "section.\n" msgstr "无法加载/解析 .debug_info 段，因此不能解释 %s 段。\n" -#: dwarf.c:6411 +#: dwarf.c:6878 msgid "No location lists in .debug_info section!\n" msgstr ".debug_info 节中没有定位列表！\n" -#: dwarf.c:6416 +#: dwarf.c:6883 #, c-format msgid "Location lists in %s section start at 0x%s\n" msgstr "" -#: dwarf.c:6426 +#: dwarf.c:6893 #, c-format msgid "" " Warning: This section has relocations - addresses seen here may not be " @@ -3259,86 +3259,86 @@ "\n" msgstr "" -#: dwarf.c:6428 +#: dwarf.c:6895 #, c-format msgid " Offset Begin End Expression\n" msgstr "" -#: dwarf.c:6483 +#: dwarf.c:6950 #, c-format msgid "There is a hole [0x%lx - 0x%lx] in .debug_loc section.\n" msgstr "在 .debug_loc 节中有一处空洞 [0x%lx - 0x%lx]。\n" -#: dwarf.c:6487 +#: dwarf.c:6954 #, c-format msgid "There is an overlap [0x%lx - 0x%lx] in .debug_loc section.\n" msgstr "在 .debug_loc 节中有一处重叠 [0x%lx - 0x%lx]。\n" -#: dwarf.c:6496 +#: dwarf.c:6963 #, c-format msgid "Offset 0x%lx is bigger than .debug_loc section size.\n" msgstr "偏移量 0x%lx 大于 .debug_loc 节大小。\n" -#: dwarf.c:6503 +#: dwarf.c:6970 #, c-format msgid "View Offset 0x%lx is bigger than .debug_loc section size.\n" msgstr "" -#: dwarf.c:6520 +#: dwarf.c:6987 msgid "DWO is not yet supported.\n" msgstr "" -#: dwarf.c:6537 +#: dwarf.c:7004 msgid "" "Hole and overlap detection requires adjacent view lists and loclists.\n" msgstr "" -#: dwarf.c:6546 +#: dwarf.c:7013 #, c-format msgid "There is %ld unused byte at the end of section %s\n" msgid_plural "There are %ld unused bytes at the end of section %s\n" msgstr[0] "" msgstr[1] "" -#: dwarf.c:6702 +#: dwarf.c:7169 msgid "Only DWARF 2 and 3 aranges are currently supported.\n" msgstr "目前只支持第二与第三版 DWARF 的 arange。\n" -#: dwarf.c:6706 +#: dwarf.c:7173 #, c-format msgid " Length: %ld\n" msgstr " 长度： %ld\n" -#: dwarf.c:6708 +#: dwarf.c:7175 #, c-format msgid " Version: %d\n" msgstr " 版本： %d\n" -#: dwarf.c:6709 +#: dwarf.c:7176 #, c-format msgid " Offset into .debug_info: 0x%lx\n" msgstr " .debug_info 节中的偏移量: 0x%lx\n" -#: dwarf.c:6711 +#: dwarf.c:7178 #, c-format msgid " Pointer Size: %d\n" msgstr " 指针大小: %d\n" -#: dwarf.c:6712 +#: dwarf.c:7179 #, c-format msgid " Segment Size: %d\n" msgstr " 节区大小: %d\n" -#: dwarf.c:6719 +#: dwarf.c:7186 #, c-format msgid "Invalid address size in %s section!\n" msgstr "" -#: dwarf.c:6729 +#: dwarf.c:7196 msgid "Pointer size + Segment size is not a power of two.\n" msgstr "" -#: dwarf.c:6734 +#: dwarf.c:7201 #, c-format msgid "" "\n" @@ -3347,7 +3347,7 @@ "\n" " 地址 长度\n" -#: dwarf.c:6736 +#: dwarf.c:7203 #, c-format msgid "" "\n" @@ -3356,370 +3356,370 @@ "\n" " 地址 长度\n" -#: dwarf.c:6812 +#: dwarf.c:7279 #, c-format msgid "Corrupt address base (%lx) found in debug section %u\n" msgstr "" -#: dwarf.c:6828 +#: dwarf.c:7295 #, c-format msgid " For compilation unit at offset 0x%s:\n" msgstr " 对编译单元，位于偏移 0x%s:\n" -#: dwarf.c:6831 +#: dwarf.c:7298 #, c-format msgid "\tIndex\tAddress\n" msgstr "" -#: dwarf.c:6838 +#: dwarf.c:7305 #, c-format msgid "\t%d:\t" msgstr "" -#: dwarf.c:7005 dwarf.c:7075 +#: dwarf.c:7471 dwarf.c:7548 msgid "(start == end)" msgstr "" -#: dwarf.c:7007 dwarf.c:7077 +#: dwarf.c:7473 dwarf.c:7550 msgid "(start > end)" msgstr "" -#: dwarf.c:7029 +#: dwarf.c:7495 #, c-format msgid "Range list starting at offset 0x%lx is not terminated.\n" msgstr "" -#: dwarf.c:7062 +#: dwarf.c:7528 #, c-format msgid "Invalid range list entry type %d\n" msgstr "" -#: dwarf.c:7140 +#: dwarf.c:7613 #, c-format msgid "" "The length field (0x%lx) in the debug_rnglists header is wrong - the section " "is too small\n" msgstr "" -#: dwarf.c:7151 +#: dwarf.c:7624 msgid "Only DWARF version 5 debug_rnglists info is currently supported.\n" msgstr "" -#: dwarf.c:7170 +#: dwarf.c:7643 #, c-format msgid "The %s section contains unsupported offset entry count: %u.\n" msgstr "" #. This can happen when the file was compiled with -gsplit-debug #. which removes references to range lists from the primary .o file. -#: dwarf.c:7192 +#: dwarf.c:7665 #, c-format msgid "No range lists in .debug_info section.\n" msgstr "" -#: dwarf.c:7217 +#: dwarf.c:7690 #, c-format msgid "Range lists in %s section start at 0x%lx\n" msgstr "" -#: dwarf.c:7222 +#: dwarf.c:7695 #, c-format msgid " Offset Begin End\n" msgstr "" -#: dwarf.c:7241 +#: dwarf.c:7714 #, c-format msgid "Corrupt pointer size (%d) in debug entry at offset %8.8lx\n" msgstr "" -#: dwarf.c:7248 +#: dwarf.c:7721 #, c-format msgid "Corrupt offset (%#8.8lx) in range entry %u\n" msgstr "" -#: dwarf.c:7265 +#: dwarf.c:7738 #, c-format msgid "There is a hole [0x%lx - 0x%lx] in %s section.\n" msgstr "" -#: dwarf.c:7272 +#: dwarf.c:7745 #, c-format msgid "There is an overlap [0x%lx - 0x%lx] in %s section.\n" msgstr "" -#: dwarf.c:7348 +#: dwarf.c:7821 #, c-format msgid "Unfeasibly large register number: %u\n" msgstr "" -#: dwarf.c:7361 +#: dwarf.c:7834 #, c-format msgid "Out of memory allocating %u columns in dwarf frame arrays\n" msgstr "" -#: dwarf.c:7812 +#: dwarf.c:8283 msgid "No terminator for augmentation name\n" msgstr "" -#: dwarf.c:7824 +#: dwarf.c:8295 #, c-format msgid "Invalid pointer size (%d) in CIE data\n" msgstr "" -#: dwarf.c:7832 +#: dwarf.c:8303 #, c-format msgid "Invalid segment size (%d) in CIE data\n" msgstr "" -#: dwarf.c:7863 dwarf.c:8234 +#: dwarf.c:8334 dwarf.c:8705 #, c-format msgid "Augmentation data too long: 0x%s, expected at most %#lx\n" msgstr "" -#: dwarf.c:7950 +#: dwarf.c:8421 #, c-format msgid " Augmentation data: " msgstr "" -#: dwarf.c:7966 +#: dwarf.c:8437 msgid "bad register: " msgstr "" -#: dwarf.c:8136 +#: dwarf.c:8607 msgid "Failed to read CIE information\n" msgstr "" -#: dwarf.c:8147 dwarf.c:8171 dwarf.c:8198 +#: dwarf.c:8618 dwarf.c:8642 dwarf.c:8669 msgid "Invalid max register\n" msgstr "" #. PR 17512: file: 9e196b3e. -#: dwarf.c:8213 +#: dwarf.c:8684 #, c-format msgid "Probably corrupt segment size: %d - using 4 instead\n" msgstr "" -#: dwarf.c:8359 +#: dwarf.c:8830 #, c-format msgid "Corrupt CFA_def expression value: %lu\n" msgstr "" #. PR 17512: file:306-192417-0.005. -#: dwarf.c:8373 +#: dwarf.c:8844 #, c-format msgid "Corrupt CFA expression value: %lu\n" msgstr "" -#: dwarf.c:8676 +#: dwarf.c:9147 msgid "Invalid column number in saved frame state\n" msgstr "" -#: dwarf.c:8723 +#: dwarf.c:9194 #, c-format msgid " DW_CFA_def_cfa_expression: \n" msgstr "" -#: dwarf.c:8747 +#: dwarf.c:9218 #, c-format msgid " DW_CFA_expression: \n" msgstr "" -#: dwarf.c:8879 +#: dwarf.c:9350 #, c-format msgid " DW_CFA_??? (User defined call frame op: %#x)\n" msgstr "" -#: dwarf.c:8881 +#: dwarf.c:9352 #, c-format msgid "Unsupported or unknown Dwarf Call Frame Instruction number: %#x\n" msgstr "" -#: dwarf.c:8995 dwarf.c:9399 +#: dwarf.c:9466 dwarf.c:9870 #, c-format msgid "Version %ld\n" msgstr "版本 %ld\n" -#: dwarf.c:9001 +#: dwarf.c:9472 msgid "Only DWARF version 5 .debug_names is currently supported.\n" msgstr "" -#: dwarf.c:9008 +#: dwarf.c:9479 #, c-format msgid "Padding field of .debug_names must be 0 (found 0x%x)\n" msgstr "" -#: dwarf.c:9013 +#: dwarf.c:9484 msgid "Compilation unit count must be >= 1 in .debug_names\n" msgstr "" -#: dwarf.c:9024 +#: dwarf.c:9495 #, c-format msgid "" "Augmentation string length %u must be rounded up to a multiple of 4 in " ".debug_names.\n" msgstr "" -#: dwarf.c:9030 +#: dwarf.c:9501 #, c-format msgid "Augmentation string:" msgstr "" -#: dwarf.c:9057 +#: dwarf.c:9528 #, c-format msgid "CU table:\n" msgstr "" -#: dwarf.c:9063 dwarf.c:9073 +#: dwarf.c:9534 dwarf.c:9544 #, c-format msgid "[%3u] 0x%lx\n" msgstr "" -#: dwarf.c:9067 +#: dwarf.c:9538 #, c-format msgid "TU table:\n" msgstr "" -#: dwarf.c:9077 +#: dwarf.c:9548 #, c-format msgid "Foreign TU table:\n" msgstr "" -#: dwarf.c:9083 +#: dwarf.c:9554 #, c-format msgid "[%3u] " msgstr "" -#: dwarf.c:9103 +#: dwarf.c:9574 #, c-format msgid "" "Entry pool offset (0x%lx) exceeds unit size 0x%lx for unit 0x%lx in the " "debug_names\n" msgstr "" -#: dwarf.c:9120 +#: dwarf.c:9591 #, c-format msgid "Used %zu of %lu bucket.\n" msgid_plural "Used %zu of %lu buckets.\n" msgstr[0] "" msgstr[1] "" -#: dwarf.c:9147 +#: dwarf.c:9618 #, c-format msgid "" "Out of %lu items there are %zu bucket clashes (longest of %zu entries).\n" msgstr "" -#: dwarf.c:9184 +#: dwarf.c:9655 #, c-format msgid "Duplicate abbreviation tag %lu in unit 0x%lx in the debug_names\n" msgstr "" -#: dwarf.c:9206 dwarf.c:9525 +#: dwarf.c:9677 dwarf.c:9996 #, c-format msgid "" "\n" "Symbol table:\n" msgstr "" -#: dwarf.c:9259 +#: dwarf.c:9730 #, c-format msgid "Undefined abbreviation tag %lu in unit 0x%lx in the debug_names\n" msgstr "" -#: dwarf.c:9290 +#: dwarf.c:9761 #, c-format msgid " " msgstr "" -#: dwarf.c:9322 +#: dwarf.c:9793 msgid "The debuglink filename is corrupt/missing\n" msgstr "" -#: dwarf.c:9326 +#: dwarf.c:9797 #, c-format msgid " Separate debug info file: %s\n" msgstr "" -#: dwarf.c:9337 +#: dwarf.c:9808 msgid "CRC offset missing/truncated\n" msgstr "" -#: dwarf.c:9343 +#: dwarf.c:9814 #, c-format msgid " CRC value: %#x\n" msgstr "" -#: dwarf.c:9347 +#: dwarf.c:9818 #, c-format msgid "There are %#lx extraneous bytes at the end of the section\n" msgstr "" -#: dwarf.c:9361 +#: dwarf.c:9832 #, c-format msgid "Build-ID is too short (%#lx bytes)\n" msgstr "" -#: dwarf.c:9365 +#: dwarf.c:9836 #, c-format msgid " Build-ID (%#lx bytes):" msgstr "" -#: dwarf.c:9394 +#: dwarf.c:9865 #, c-format msgid "Truncated header in the %s section.\n" msgstr "" -#: dwarf.c:9405 +#: dwarf.c:9876 #, c-format msgid "Unsupported version %lu.\n" msgstr "不支持的版本 %lu。\n" -#: dwarf.c:9409 +#: dwarf.c:9880 msgid "The address table data in version 3 may be wrong.\n" msgstr "地址表数据在第三版中也许是错误的。\n" -#: dwarf.c:9411 +#: dwarf.c:9882 msgid "Version 4 does not support case insensitive lookups.\n" msgstr "版本 4 不支持大小写不敏感的查找。\n" -#: dwarf.c:9413 +#: dwarf.c:9884 msgid "Version 5 does not include inlined functions.\n" msgstr "版本 5 不包含内联函数。\n" -#: dwarf.c:9415 +#: dwarf.c:9886 msgid "Version 6 does not include symbol attributes.\n" msgstr "版本 6 不包含符号属性。\n" -#: dwarf.c:9433 +#: dwarf.c:9904 #, c-format msgid "Corrupt header in the %s section.\n" msgstr "" -#: dwarf.c:9440 +#: dwarf.c:9911 #, c-format msgid "TU offset (%x) is less than CU offset (%x)\n" msgstr "" -#: dwarf.c:9449 +#: dwarf.c:9920 #, c-format msgid "Address table offset (%x) is less than TU offset (%x)\n" msgstr "" -#: dwarf.c:9459 +#: dwarf.c:9930 #, c-format msgid "Symbol table offset (%x) is less then Address table offset (%x)\n" msgstr "" -#: dwarf.c:9468 +#: dwarf.c:9939 #, c-format msgid "Constant pool offset (%x) is less than symbol table offset (%x)\n" msgstr "" -#: dwarf.c:9483 +#: dwarf.c:9954 msgid "Address table extends beyond end of section.\n" msgstr "" -#: dwarf.c:9487 +#: dwarf.c:9958 #, c-format msgid "" "\n" @@ -3728,12 +3728,12 @@ "\n" "CU 表：\n" -#: dwarf.c:9493 +#: dwarf.c:9964 #, c-format msgid "[%3u] 0x%lx - 0x%lx\n" msgstr "[%3u] 0x%lx - 0x%lx\n" -#: dwarf.c:9498 +#: dwarf.c:9969 #, c-format msgid "" "\n" @@ -3742,12 +3742,12 @@ "\n" "TU 表：\n" -#: dwarf.c:9505 +#: dwarf.c:9976 #, c-format msgid "[%3u] 0x%lx 0x%lx " msgstr "[%3u] 0x%lx 0x%lx " -#: dwarf.c:9512 +#: dwarf.c:9983 #, c-format msgid "" "\n" @@ -3756,282 +3756,282 @@ "\n" "地址表：\n" -#: dwarf.c:9522 +#: dwarf.c:9993 #, c-format msgid "%lu\n" msgstr "%lu\n" -#: dwarf.c:9542 +#: dwarf.c:10013 #, c-format msgid "[%3u] " msgstr "" -#: dwarf.c:9543 +#: dwarf.c:10014 #, c-format msgid "Corrupt name offset of 0x%x found for symbol table slot %d\n" msgstr "" -#: dwarf.c:9554 +#: dwarf.c:10025 #, c-format msgid "\n" msgstr "" -#: dwarf.c:9555 +#: dwarf.c:10026 #, c-format msgid "Corrupt CU vector offset of 0x%x found for symbol table slot %d\n" msgstr "" -#: dwarf.c:9568 +#: dwarf.c:10039 #, c-format msgid "Invalid number of CUs (0x%x) for symbol table slot %d\n" msgstr "" -#: dwarf.c:9593 +#: dwarf.c:10064 msgid "static" msgstr "静态" -#: dwarf.c:9593 +#: dwarf.c:10064 msgid "global" msgstr "全局" -#: dwarf.c:9631 dwarf.c:9642 +#: dwarf.c:10102 dwarf.c:10113 msgid "Internal error: out of space in the shndx pool.\n" msgstr "" -#: dwarf.c:9706 +#: dwarf.c:10177 #, c-format msgid "Section %s is empty\n" msgstr "" -#: dwarf.c:9712 +#: dwarf.c:10183 #, c-format msgid "Section %s is too small to contain a CU/TU header\n" msgstr "" -#: dwarf.c:9731 +#: dwarf.c:10202 #, c-format msgid " Version: %u\n" msgstr "" -#: dwarf.c:9733 +#: dwarf.c:10204 #, c-format msgid " Number of columns: %u\n" msgstr "" -#: dwarf.c:9734 +#: dwarf.c:10205 #, c-format msgid " Number of used entries: %u\n" msgstr "" -#: dwarf.c:9735 +#: dwarf.c:10206 #, c-format msgid "" " Number of slots: %u\n" "\n" msgstr "" -#: dwarf.c:9744 +#: dwarf.c:10215 #, c-format msgid "Section %s is too small for %u slot\n" msgid_plural "Section %s is too small for %u slots\n" msgstr[0] "" msgstr[1] "" -#: dwarf.c:9768 +#: dwarf.c:10239 msgid "Section index pool located before start of section\n" msgstr "" -#: dwarf.c:9773 +#: dwarf.c:10244 #, c-format msgid " [%3d] Signature: 0x%s Sections: " msgstr "" -#: dwarf.c:9780 +#: dwarf.c:10251 #, c-format msgid "Section %s too small for shndx pool\n" msgstr "" -#: dwarf.c:9828 +#: dwarf.c:10299 #, c-format msgid "Section %s too small for offset and size tables\n" msgstr "" -#: dwarf.c:9835 +#: dwarf.c:10306 #, c-format msgid " Offset table\n" msgstr " 偏移量表\n" -#: dwarf.c:9837 dwarf.c:9938 +#: dwarf.c:10308 dwarf.c:10409 msgid "signature" msgstr "签名" -#: dwarf.c:9837 dwarf.c:9938 +#: dwarf.c:10308 dwarf.c:10409 msgid "dwo_id" msgstr "dwo_id" -#: dwarf.c:9875 +#: dwarf.c:10346 #, c-format msgid "Row index (%u) is larger than number of used entries (%u)\n" msgstr "" -#: dwarf.c:9889 +#: dwarf.c:10360 #, c-format msgid "Signature (%p) extends beyond end of space in section\n" msgstr "" -#: dwarf.c:9898 +#: dwarf.c:10369 #, c-format msgid "Row index (%u) * num columns (%u) > space remaining in section\n" msgstr "" -#: dwarf.c:9904 dwarf.c:9961 +#: dwarf.c:10375 dwarf.c:10432 #, c-format msgid " [%3d] 0x%s" msgstr "" -#: dwarf.c:9918 dwarf.c:9974 +#: dwarf.c:10389 dwarf.c:10445 #, c-format msgid "Overlarge Dwarf section index detected: %u\n" msgstr "" -#: dwarf.c:9936 +#: dwarf.c:10407 #, c-format msgid " Size table\n" msgstr " 尺寸表\n" -#: dwarf.c:9989 +#: dwarf.c:10460 #, c-format msgid " Unsupported version (%d)\n" msgstr "" -#: dwarf.c:10061 +#: dwarf.c:10532 #, c-format msgid "Displaying the debug contents of section %s is not yet supported.\n" msgstr "尚不支持显示 %s 节的调试内容。\n" -#: dwarf.c:10092 +#: dwarf.c:10563 #, c-format msgid "" "Attempt to allocate an array with an excessive number of elements: 0x%lx\n" msgstr "" -#: dwarf.c:10110 +#: dwarf.c:10581 #, c-format msgid "" "Attempt to re-allocate an array with an excessive number of elements: 0x%lx\n" msgstr "" -#: dwarf.c:10126 +#: dwarf.c:10597 #, c-format msgid "" "Attempt to allocate a zero'ed array with an excessive number of elements: " "0x%lx\n" msgstr "" -#: dwarf.c:10224 +#: dwarf.c:10695 #, c-format msgid "Unable to reopen separate debug info file: %s\n" msgstr "" -#: dwarf.c:10236 +#: dwarf.c:10707 #, c-format msgid "" "Separate debug info file %s found, but CRC does not match - ignoring\n" msgstr "" -#: dwarf.c:10414 +#: dwarf.c:10879 #, c-format msgid "Corrupt debuglink section: %s\n" msgstr "" -#: dwarf.c:10452 +#: dwarf.c:10917 msgid "Out of memory" msgstr "内存不足" #. Failed to find the file. -#: dwarf.c:10524 +#: dwarf.c:10989 #, c-format msgid "could not find separate debug file '%s'\n" msgstr "" -#: dwarf.c:10525 dwarf.c:10529 dwarf.c:10534 dwarf.c:10537 dwarf.c:10541 -#: dwarf.c:10544 dwarf.c:10547 dwarf.c:10550 +#: dwarf.c:10990 dwarf.c:10994 dwarf.c:10999 dwarf.c:11002 dwarf.c:11006 +#: dwarf.c:11009 dwarf.c:11012 dwarf.c:11015 #, c-format msgid "tried: %s\n" msgstr "" -#: dwarf.c:10558 +#: dwarf.c:11023 #, c-format msgid "tried: DEBUGINFOD_URLS=%s\n" msgstr "" -#: dwarf.c:10574 +#: dwarf.c:11039 #, c-format msgid "failed to open separate debug file: %s\n" msgstr "" #. FIXME: We do not check to see if there are any other separate debug info #. files that would also match. -#: dwarf.c:10582 +#: dwarf.c:11047 #, c-format msgid "" "%s: Found separate debug info file: %s\n" "\n" msgstr "" -#: dwarf.c:10602 +#: dwarf.c:11067 msgid "Out of memory allocating dwo filename\n" msgstr "" -#: dwarf.c:10608 +#: dwarf.c:11073 #, c-format msgid "Unable to load dwo file: %s\n" msgstr "" #. FIXME: We should check the dwo_id. -#: dwarf.c:10615 +#: dwarf.c:11080 #, c-format msgid "" "%s: Found separate debug object file: %s\n" "\n" msgstr "" -#: dwarf.c:10656 +#: dwarf.c:11199 #, c-format msgid "" "The %s section contains link(s) to dwo file(s):\n" "\n" msgstr "" -#: dwarf.c:10661 +#: dwarf.c:11204 #, c-format msgid " Name: %s\n" msgstr "" -#: dwarf.c:10662 +#: dwarf.c:11205 #, c-format msgid " Directory: %s\n" msgstr "" -#: dwarf.c:10662 +#: dwarf.c:11205 msgid "" msgstr "" -#: dwarf.c:10664 +#: dwarf.c:11207 #, c-format msgid " ID: " msgstr "" -#: dwarf.c:10666 +#: dwarf.c:10785 #, c-format msgid " ID: \n" msgstr "" -#: dwarf.c:10683 +#: dwarf.c:11184 msgid "Unexpected DWO INFO type" msgstr "" -#: dwarf.c:10849 dwarf.c:10892 +#: dwarf.c:11372 dwarf.c:11415 #, c-format msgid "Unrecognized debug option '%s'\n" msgstr "无法识别的调试选项“%s”\n" @@ -4054,275 +4054,275 @@ msgid "%s: Warning: " msgstr "%s：警告： " -#: elfcomm.c:92 elfcomm.c:127 elfcomm.c:232 elfcomm.c:342 +#: elfcomm.c:72 elfcomm.c:87 elfcomm.c:197 elfcomm.c:307 #, c-format msgid "Unhandled data length: %d\n" msgstr "未处理的数据长度：%d\n" -#: elfcomm.c:421 elfcomm.c:446 elfcomm.c:920 +#: elfcomm.c:386 elfcomm.c:411 elfcomm.c:885 msgid "Out of memory\n" msgstr "内存不足\n" -#: elfcomm.c:438 +#: elfcomm.c:403 #, c-format msgid "Abnormal length of thin archive member name: %lx\n" msgstr "" -#: elfcomm.c:482 +#: elfcomm.c:447 #, c-format msgid "%s: invalid archive header size: %ld\n" msgstr "" -#: elfcomm.c:495 +#: elfcomm.c:460 #, c-format msgid "%s: failed to skip archive symbol table\n" msgstr "%s：跳过归档符号表失败\n" -#: elfcomm.c:514 +#: elfcomm.c:479 #, c-format msgid "%s: the archive index is empty\n" msgstr "%s: 归档索引空\n" -#: elfcomm.c:522 elfcomm.c:551 +#: elfcomm.c:487 elfcomm.c:516 #, c-format msgid "%s: failed to read archive index\n" msgstr "%s: 读取归档索引失败\n" -#: elfcomm.c:533 +#: elfcomm.c:498 #, c-format msgid "" "%s: the archive index is supposed to have 0x%lx entries of %d bytes, but the " "size is only 0x%lx\n" msgstr "" -#: elfcomm.c:543 +#: elfcomm.c:508 msgid "Out of memory whilst trying to read archive symbol index\n" msgstr "" -#: elfcomm.c:563 +#: elfcomm.c:528 msgid "Out of memory whilst trying to convert the archive symbol index\n" msgstr "" -#: elfcomm.c:576 +#: elfcomm.c:541 #, c-format msgid "%s: the archive has an index but no symbols\n" msgstr "%s: 归档有索引但无符号\n" -#: elfcomm.c:584 +#: elfcomm.c:549 msgid "Out of memory whilst trying to read archive index symbol table\n" msgstr "" -#: elfcomm.c:592 +#: elfcomm.c:557 #, c-format msgid "%s: failed to read archive index symbol table\n" msgstr "%s: 读取归档索引符号表失败\n" -#: elfcomm.c:602 +#: elfcomm.c:567 #, c-format msgid "%s: failed to read archive header following archive index\n" msgstr "%s: 读取归档索引后的标头失败\n" -#: elfcomm.c:635 +#: elfcomm.c:600 #, c-format msgid "%s: failed to seek to first archive header\n" msgstr "%s：搜索至下一个归档标头失败\n" #. PR 24049 - we cannot use filedata->file_name as this will #. have already been freed. -#: elfcomm.c:644 elfcomm.c:878 elfedit.c:590 readelf.c:20590 +#: elfcomm.c:609 elfcomm.c:843 elfedit.c:595 readelf.c:21247 #, c-format msgid "%s: failed to read archive header\n" msgstr "%s：读取归档标头失败\n" -#: elfcomm.c:661 +#: elfcomm.c:626 #, c-format msgid "%s has no archive index\n" msgstr "%s 没有归档索引\n" -#: elfcomm.c:673 +#: elfcomm.c:638 #, c-format msgid "%s: long name table is too small, (size = %ld)\n" msgstr "" -#: elfcomm.c:681 +#: elfcomm.c:646 #, c-format msgid "%s: long name table is too big, (size = 0x%lx)\n" msgstr "" -#: elfcomm.c:692 +#: elfcomm.c:657 msgid "Out of memory reading long symbol names in archive\n" msgstr "" -#: elfcomm.c:700 +#: elfcomm.c:665 #, c-format msgid "%s: failed to read long symbol name string table\n" msgstr "" -#: elfcomm.c:783 +#: elfcomm.c:748 msgid "Archive member uses long names, but no longname table found\n" msgstr "" -#: elfcomm.c:797 +#: elfcomm.c:762 #, c-format msgid "Found long name index (%ld) beyond end of long name table\n" msgstr "" -#: elfcomm.c:816 +#: elfcomm.c:781 msgid "Invalid Thin archive member name\n" msgstr "" -#: elfcomm.c:872 +#: elfcomm.c:837 #, c-format msgid "%s: failed to seek to next file name\n" msgstr "" -#: elfcomm.c:883 elfedit.c:597 readelf.c:20597 +#: elfcomm.c:848 elfedit.c:602 readelf.c:21254 #, c-format msgid "%s: did not find a valid archive header\n" msgstr "" -#: elfedit.c:90 +#: elfedit.c:91 #, c-format msgid "%s: Not an i386 nor x86-64 ELF file\n" msgstr "" -#: elfedit.c:96 +#: elfedit.c:97 #, c-format msgid "%s: stat () failed\n" msgstr "" -#: elfedit.c:104 +#: elfedit.c:105 #, c-format msgid "%s: mmap () failed\n" msgstr "" -#: elfedit.c:243 +#: elfedit.c:244 #, c-format msgid "%s: Invalid PT_NOTE segment\n" msgstr "" -#: elfedit.c:264 +#: elfedit.c:269 #, c-format msgid "Unknown x86 feature: %s\n" msgstr "" -#: elfedit.c:312 +#: elfedit.c:317 #, c-format msgid "%s: Unsupported EI_VERSION: %d is not %d\n" msgstr "" -#: elfedit.c:333 +#: elfedit.c:338 #, c-format msgid "%s: Unmatched input EI_CLASS: %d is not %d\n" msgstr "" -#: elfedit.c:342 +#: elfedit.c:347 #, c-format msgid "%s: Unmatched output EI_CLASS: %d is not %d\n" msgstr "" -#: elfedit.c:351 +#: elfedit.c:356 #, c-format msgid "%s: Unmatched e_machine: %d is not %d\n" msgstr "" -#: elfedit.c:362 +#: elfedit.c:367 #, c-format msgid "%s: Unmatched e_type: %d is not %d\n" msgstr "" -#: elfedit.c:373 +#: elfedit.c:378 #, c-format msgid "%s: Unmatched EI_OSABI: %d is not %d\n" msgstr "" -#: elfedit.c:406 +#: elfedit.c:411 #, c-format msgid "%s: Failed to update ELF header: %s\n" msgstr "" -#: elfedit.c:476 +#: elfedit.c:481 msgid "" "This executable has been built without support for a\n" "64 bit data type and so it cannot process 64 bit ELF files.\n" msgstr "" -#: elfedit.c:517 +#: elfedit.c:522 #, c-format msgid "%s: Failed to read ELF header\n" msgstr "%s：读取 ELF 标头失败\n" -#: elfedit.c:524 +#: elfedit.c:529 #, c-format msgid "%s: Failed to seek to ELF header\n" msgstr "" -#: elfedit.c:581 readelf.c:20578 +#: elfedit.c:586 readelf.c:21235 #, c-format msgid "%s: failed to seek to next archive header\n" msgstr "%s：搜索至下一个归档标头失败\n" -#: elfedit.c:612 elfedit.c:621 readelf.c:20612 readelf.c:20621 +#: elfedit.c:617 elfedit.c:626 readelf.c:21269 readelf.c:21278 #, c-format msgid "%s: bad archive file name\n" msgstr "%s：不当的归档文件名称\n" -#: elfedit.c:644 elfedit.c:742 +#: elfedit.c:649 elfedit.c:746 #, c-format msgid "Input file '%s' is not readable\n" msgstr "" -#: elfedit.c:672 +#: elfedit.c:676 #, c-format msgid "%s: failed to seek to archive member\n" msgstr "" -#: elfedit.c:713 readelf.c:20737 +#: elfedit.c:717 readelf.c:21394 #, c-format msgid "'%s': No such file\n" msgstr "" -#: elfedit.c:715 readelf.c:20739 +#: elfedit.c:719 readelf.c:21396 #, c-format msgid "Could not locate '%s'. System error message: %s\n" msgstr "" -#: elfedit.c:722 readelf.c:20746 +#: elfedit.c:726 readelf.c:21403 #, c-format msgid "'%s' is not an ordinary file\n" msgstr "" -#: elfedit.c:748 readelf.c:20768 +#: elfedit.c:752 readelf.c:21425 #, c-format msgid "%s: Failed to read file's magic number\n" msgstr "" -#: elfedit.c:812 +#: elfedit.c:816 #, c-format msgid "Unknown OSABI: %s\n" msgstr "" -#: elfedit.c:837 +#: elfedit.c:841 #, c-format msgid "Unknown machine type: %s\n" msgstr "" -#: elfedit.c:856 +#: elfedit.c:860 #, c-format msgid "Unknown type: %s\n" msgstr "" -#: elfedit.c:897 +#: elfedit.c:907 #, c-format msgid "Usage: %s elffile(s)\n" msgstr "" -#: elfedit.c:899 +#: elfedit.c:909 #, c-format msgid " Update the ELF header of ELF files\n" msgstr " 更新 ELF 文件的 ELF 头\n" -#: elfedit.c:900 objcopy.c:560 objcopy.c:700 strings.c:700 +#: elfedit.c:910 objcopy.c:561 objcopy.c:701 strings.c:700 #, c-format msgid " The options are:\n" msgstr " 选项为：\n" @@ -4347,7 +4347,7 @@ " Disable x86 feature \n" msgstr "" -#: elfedit.c:915 +#: elfedit.c:932 #, c-format msgid "" " -h --help Display this information\n" @@ -4378,17 +4378,17 @@ msgid "Duplicate symbol entered into keyword list." msgstr "" -#: nm.c:238 size.c:88 strings.c:698 +#: nm.c:248 size.c:88 strings.c:698 #, c-format msgid "Usage: %s [option(s)] [file(s)]\n" msgstr "用法：%s [选项] [文件]\n" -#: nm.c:239 +#: nm.c:249 #, c-format msgid " List symbols in [file(s)] (a.out by default).\n" msgstr " 列举 [文件] 中的符号 (默认为 a.out)。\n" -#: nm.c:240 +#: nm.c:241 #, c-format msgid "" " The options are:\n" @@ -4422,12 +4422,12 @@ " -r, --reverse-sort Reverse the sense of the sort\n" msgstr "" -#: nm.c:265 +#: nm.c:276 #, c-format msgid " --plugin NAME Load the specified plugin\n" msgstr "" -#: nm.c:268 +#: nm.c:279 #, c-format msgid "" " -S, --print-size Print size of defined symbols\n" @@ -4446,37 +4446,37 @@ "\n" msgstr "" -#: nm.c:301 +#: nm.c:312 #, c-format msgid "%s: invalid radix" msgstr "%s：无效的基数" -#: nm.c:327 +#: nm.c:338 #, c-format msgid "%s: invalid output format" msgstr "%s：无效的输出格式" -#: nm.c:352 readelf.c:11567 readelf.c:11610 +#: nm.c:363 readelf.c:11739 readelf.c:11782 #, c-format msgid ": %d" msgstr "<处理器专用>：%d" -#: nm.c:354 readelf.c:11574 readelf.c:11627 +#: nm.c:365 readelf.c:11746 readelf.c:11799 #, c-format msgid ": %d" msgstr "<操作系统专用>：%d" -#: nm.c:356 readelf.c:11577 readelf.c:11630 +#: nm.c:367 readelf.c:11749 readelf.c:11802 #, c-format msgid ": %d" msgstr "<未知>：%d" -#: nm.c:386 +#: nm.c:397 #, c-format msgid ": %d/%d" msgstr "" -#: nm.c:441 +#: nm.c:457 #, c-format msgid "" "\n" @@ -4485,12 +4485,12 @@ "\n" "归档索引：\n" -#: nm.c:495 nm.c:1197 +#: nm.c:511 nm.c:1209 #, c-format msgid "%s: plugin needed to handle lto object" msgstr "" -#: nm.c:1434 +#: nm.c:1446 #, c-format msgid "" "\n" @@ -4503,7 +4503,7 @@ "来自 %s 的未定义符号：\n" "\n" -#: nm.c:1436 +#: nm.c:1448 #, c-format msgid "" "\n" @@ -4516,7 +4516,7 @@ "来自 %s 的符号：\n" "\n" -#: nm.c:1438 nm.c:1489 +#: nm.c:1450 nm.c:1501 #, c-format msgid "" "Name Value Class Type Size Line " @@ -4524,7 +4524,7 @@ "\n" msgstr "" -#: nm.c:1441 nm.c:1492 +#: nm.c:1453 nm.c:1504 #, c-format msgid "" "Name Value Class Type Size " @@ -4532,7 +4532,7 @@ "\n" msgstr "" -#: nm.c:1485 +#: nm.c:1497 #, c-format msgid "" "\n" @@ -4545,7 +4545,7 @@ "来自 %s[%s] 的未定义的符号：\n" "\n" -#: nm.c:1487 +#: nm.c:1499 #, c-format msgid "" "\n" @@ -4558,34 +4558,34 @@ "来自 %s[%s] 的符号：\n" "\n" -#: nm.c:1579 +#: nm.c:1591 #, c-format msgid "Print width has not been initialized (%d)" msgstr "" -#: nm.c:1828 +#: nm.c:1843 msgid "Only -X 32_64 is supported" msgstr "只支持 -X 32_64" -#: nm.c:1856 +#: nm.c:1875 msgid "Using the --size-sort and --undefined-only options together" msgstr "" -#: nm.c:1857 +#: nm.c:1876 msgid "will produce no output, since undefined symbols have no size." msgstr "" -#: objcopy.c:558 srconv.c:1693 +#: objcopy.c:559 srconv.c:1693 #, c-format msgid "Usage: %s [option(s)] in-file [out-file]\n" msgstr "用法：%s [选项] 输入文件 [输出文件]\n" -#: objcopy.c:559 +#: objcopy.c:560 #, c-format msgid " Copies a binary file, possibly transforming it in the process\n" msgstr " 复制二进制文件，可能在此过程中进行变换\n" -#: objcopy.c:561 +#: objcopy.c:562 #, c-format msgid "" " -I --input-target Assume input file is in format \n" @@ -4600,7 +4600,7 @@ "output\n" msgstr "" -#: objcopy.c:569 objcopy.c:708 +#: objcopy.c:570 objcopy.c:709 #, c-format msgid "" " -D --enable-deterministic-archives\n" @@ -4610,7 +4610,7 @@ " Disable -D behavior\n" msgstr "" -#: objcopy.c:575 objcopy.c:714 +#: objcopy.c:576 objcopy.c:715 #, c-format msgid "" " -D --enable-deterministic-archives\n" @@ -4620,7 +4620,7 @@ " Disable -D behavior (default)\n" msgstr "" -#: objcopy.c:580 +#: objcopy.c:581 #, c-format msgid "" " -j --only-section Only copy section into the output\n" @@ -4769,17 +4769,17 @@ "supported\n" msgstr "" -#: objcopy.c:698 +#: objcopy.c:699 #, c-format msgid "Usage: %s in-file(s)\n" msgstr "用法：%s <选项> 输入文件\n" -#: objcopy.c:699 +#: objcopy.c:700 #, c-format msgid " Removes symbols and sections from files\n" msgstr " 从文件中删除符号和节\n" -#: objcopy.c:701 +#: objcopy.c:702 #, c-format msgid "" " -I --input-target= Assume input file is in format \n" @@ -4791,7 +4791,7 @@ "output\n" msgstr "" -#: objcopy.c:719 +#: objcopy.c:720 #, c-format msgid "" " -R --remove-section= Also remove section from the " @@ -4823,164 +4823,164 @@ " -o Place stripped output into \n" msgstr "" -#: objcopy.c:796 +#: objcopy.c:797 #, c-format msgid "unrecognized section flag `%s'" msgstr "不能识别的节标志“%s”" -#: objcopy.c:797 objcopy.c:869 +#: objcopy.c:798 objcopy.c:870 #, c-format msgid "supported flags: %s" msgstr "支持的标志：%s" -#: objcopy.c:868 +#: objcopy.c:869 #, c-format msgid "unrecognized symbol flag `%s'" msgstr "" -#: objcopy.c:927 +#: objcopy.c:928 #, c-format msgid "error: %s both copied and removed" msgstr "错误：%s 既要复制又要删除" -#: objcopy.c:933 +#: objcopy.c:934 #, c-format msgid "error: %s both sets and alters VMA" msgstr "" -#: objcopy.c:939 +#: objcopy.c:940 #, c-format msgid "error: %s both sets and alters LMA" msgstr "" -#: objcopy.c:1091 +#: objcopy.c:1092 #, c-format msgid "cannot open '%s': %s" msgstr "无法打开 '%s'：%s" -#: objcopy.c:1094 objcopy.c:5015 +#: objcopy.c:1095 objcopy.c:5070 #, c-format msgid "%s: fread failed" msgstr "%s：fread 失败" -#: objcopy.c:1167 +#: objcopy.c:1168 #, c-format msgid "%s:%d: Ignoring rubbish found on this line" msgstr "%s:%d: 忽略本行所含无用数据" -#: objcopy.c:1336 +#: objcopy.c:1340 #, c-format msgid "error: section %s matches both remove and copy options" msgstr "" -#: objcopy.c:1339 +#: objcopy.c:1343 #, c-format msgid "error: section %s matches both update and remove options" msgstr "" -#: objcopy.c:1497 +#: objcopy.c:1501 #, c-format msgid "Section %s not found" msgstr "" -#: objcopy.c:1651 +#: objcopy.c:1655 #, c-format msgid "not stripping symbol `%s' because it is named in a relocation" msgstr "" -#: objcopy.c:1711 +#: objcopy.c:1715 #, c-format msgid "'before=%s' not found" msgstr "" -#: objcopy.c:1750 +#: objcopy.c:1754 #, c-format msgid "%s: Multiple redefinition of symbol \"%s\"" msgstr "%s：多次重复定义符号“%s”" -#: objcopy.c:1754 +#: objcopy.c:1758 #, c-format msgid "%s: Symbol \"%s\" is target of more than one redefinition" msgstr "%s：符号“%s”是多次重复定义的标的" -#: objcopy.c:1781 +#: objcopy.c:1785 #, c-format msgid "couldn't open symbol redefinition file %s (error: %s)" msgstr "无法打开符号重定义文件 %s (错误: %s)" -#: objcopy.c:1859 +#: objcopy.c:1863 #, c-format msgid "%s:%d: garbage found at end of line" msgstr "%s:%d: 行尾出现无用字符" -#: objcopy.c:1862 +#: objcopy.c:1866 #, c-format msgid "%s:%d: missing new symbol name" msgstr "" -#: objcopy.c:1872 +#: objcopy.c:1876 #, c-format msgid "%s:%d: premature end of file" msgstr "" -#: objcopy.c:1899 +#: objcopy.c:1903 #, c-format msgid "stat returns negative size for `%s'" msgstr "" -#: objcopy.c:1911 +#: objcopy.c:1915 #, c-format msgid "copy from `%s' [unknown] to `%s' [unknown]\n" msgstr "" -#: objcopy.c:2158 +#: objcopy.c:2162 #, c-format msgid "%s[%s]: Cannot merge - there are relocations against this section" msgstr "" -#: objcopy.c:2180 +#: objcopy.c:2184 msgid "corrupt GNU build attribute note: description size not a factor of 4" msgstr "" -#: objcopy.c:2187 +#: objcopy.c:2191 msgid "corrupt GNU build attribute note: wrong note type" msgstr "" -#: objcopy.c:2193 +#: objcopy.c:2197 msgid "corrupt GNU build attribute note: note too big" msgstr "" -#: objcopy.c:2199 +#: objcopy.c:2203 msgid "corrupt GNU build attribute note: name too small" msgstr "" -#: objcopy.c:2222 +#: objcopy.c:2226 msgid "corrupt GNU build attribute note: unsupported version" msgstr "" -#: objcopy.c:2271 +#: objcopy.c:2275 msgid "corrupt GNU build attribute note: bad description size" msgstr "" -#: objcopy.c:2302 +#: objcopy.c:2306 msgid "corrupt GNU build attribute note: name not NUL terminated" msgstr "" -#: objcopy.c:2314 +#: objcopy.c:2318 msgid "corrupt GNU build attribute notes: excess data at end" msgstr "" -#: objcopy.c:2321 +#: objcopy.c:2325 msgid "bad GNU build attribute notes: no known versions detected" msgstr "" #. This happens with glibc. No idea why. -#: objcopy.c:2325 +#: objcopy.c:2329 #, c-format msgid "%s[%s]: Warning: version note missing - assuming version 3" msgstr "" -#: objcopy.c:2335 +#: objcopy.c:2339 msgid "bad GNU build attribute notes: multiple different versions" msgstr "" @@ -4990,389 +4990,389 @@ msgid "Unable to change endianness of input file(s)" msgstr "" -#: objcopy.c:2619 +#: objcopy.c:2631 #, c-format msgid "error: the input file '%s' has no sections" msgstr "" -#: objcopy.c:2629 +#: objcopy.c:2641 #, c-format msgid "" "--compress-debug-sections=[zlib|zlib-gnu|zlib-gabi] is unsupported on `%s'" msgstr "" -#: objcopy.c:2636 +#: objcopy.c:2648 #, c-format msgid "--elf-stt-common=[yes|no] is unsupported on `%s'" msgstr "" -#: objcopy.c:2643 +#: objcopy.c:2655 #, c-format msgid "copy from `%s' [%s] to `%s' [%s]\n" msgstr "" -#: objcopy.c:2691 +#: objcopy.c:2703 #, c-format msgid "Input file `%s' ignores binary architecture parameter." msgstr "" -#: objcopy.c:2707 +#: objcopy.c:2719 #, c-format msgid "Unable to recognise the format of the input file `%s'" msgstr "" -#: objcopy.c:2710 +#: objcopy.c:2722 #, c-format msgid "Output file cannot represent architecture `%s'" msgstr "" -#: objcopy.c:2773 +#: objcopy.c:2785 #, c-format msgid "warning: file alignment (0x%s) > section alignment (0x%s)" msgstr "" -#: objcopy.c:2847 +#: objcopy.c:2859 #, c-format msgid "can't add section '%s'" msgstr "" -#: objcopy.c:2861 +#: objcopy.c:2873 #, c-format msgid "can't create section `%s'" msgstr "" -#: objcopy.c:2909 +#: objcopy.c:2921 #, c-format msgid "error: %s not found, can't be updated" msgstr "" -#: objcopy.c:2942 +#: objcopy.c:2954 msgid "warning: note section is empty" msgstr "" -#: objcopy.c:2951 +#: objcopy.c:2963 msgid "warning: could not load note section" msgstr "" -#: objcopy.c:2967 +#: objcopy.c:2979 msgid "warning: failed to set merged notes size" msgstr "" -#: objcopy.c:2993 +#: objcopy.c:3005 #, c-format msgid "can't dump section '%s' - it does not exist" msgstr "" -#: objcopy.c:3001 +#: objcopy.c:3013 msgid "can't dump section - it has no contents" msgstr "" -#: objcopy.c:2974 +#: objcopy.c:2804 msgid "can't dump section - it is empty" msgstr "" -#: objcopy.c:3012 +#: objcopy.c:3025 msgid "could not open section dump file" msgstr "" -#: objcopy.c:3020 +#: objcopy.c:3033 #, c-format msgid "error writing section contents to %s (error: %s)" msgstr "" -#: objcopy.c:3030 +#: objcopy.c:3043 msgid "could not retrieve section contents" msgstr "" -#: objcopy.c:3044 +#: objcopy.c:3057 #, c-format msgid "%s: debuglink section already exists" msgstr "" -#: objcopy.c:3056 +#: objcopy.c:3069 #, c-format msgid "cannot create debug link section `%s'" msgstr "" -#: objcopy.c:3150 +#: objcopy.c:3163 msgid "Can't fill gap after section" msgstr "" -#: objcopy.c:3175 +#: objcopy.c:3188 msgid "can't add padding" msgstr "" -#: objcopy.c:3330 +#: objcopy.c:3365 msgid "error: failed to locate merged notes" msgstr "" -#: objcopy.c:3339 +#: objcopy.c:3374 msgid "error: failed to merge notes" msgstr "" -#: objcopy.c:3348 +#: objcopy.c:3383 msgid "error: failed to copy merged notes into output" msgstr "" -#: objcopy.c:3365 +#: objcopy.c:3400 #, c-format msgid "%s: Could not find any mergeable note sections" msgstr "" -#: objcopy.c:3374 +#: objcopy.c:3409 #, c-format msgid "cannot fill debug link section `%s'" msgstr "" -#: objcopy.c:3435 +#: objcopy.c:3470 msgid "error copying private BFD data" msgstr "" -#: objcopy.c:3446 +#: objcopy.c:3481 #, c-format msgid "this target does not support %lu alternative machine codes" msgstr "" -#: objcopy.c:3450 +#: objcopy.c:3485 msgid "treating that number as an absolute e_machine value instead" msgstr "" -#: objcopy.c:3454 +#: objcopy.c:3489 msgid "ignoring the alternative value" msgstr "" -#: objcopy.c:3500 +#: objcopy.c:3535 msgid "sorry: copying thin archives is not currently supported" msgstr "" -#: objcopy.c:3507 objcopy.c:3562 +#: objcopy.c:3542 objcopy.c:3597 #, c-format msgid "cannot create tempdir for archive copying (error: %s)" msgstr "" -#: objcopy.c:3544 +#: objcopy.c:3579 #, c-format msgid "illegal pathname found in archive member: %s" msgstr "" -#: objcopy.c:3595 +#: objcopy.c:3630 msgid "Unable to recognise the format of file" msgstr "" -#: objcopy.c:3728 +#: objcopy.c:3763 #, c-format msgid "error: the input file '%s' is empty" msgstr "" -#: objcopy.c:3801 +#: objcopy.c:3841 #, c-format msgid "--add-gnu-debuglink ignored for archive %s" msgstr "" -#: objcopy.c:3904 +#: objcopy.c:3950 #, c-format msgid "Multiple renames of section %s" msgstr "多次改名节 %s" -#: objcopy.c:3950 +#: objcopy.c:3996 msgid "error in private header data" msgstr "" -#: objcopy.c:4043 +#: objcopy.c:4089 msgid "failed to create output section" msgstr "未能创建输出部分" -#: objcopy.c:4058 +#: objcopy.c:4104 msgid "failed to set size" msgstr "" -#: objcopy.c:4077 +#: objcopy.c:4123 msgid "failed to set vma" msgstr "" -#: objcopy.c:4107 +#: objcopy.c:4153 msgid "failed to set alignment" msgstr "" -#: objcopy.c:4139 +#: objcopy.c:4185 msgid "failed to copy private data" msgstr "" -#: objcopy.c:4296 +#: objcopy.c:4342 msgid "relocation count is negative" msgstr "" #. User must pad the section up in order to do this. -#: objcopy.c:4395 +#: objcopy.c:4441 #, c-format msgid "" "cannot reverse bytes: length of section %s must be evenly divisible by %d" msgstr "" -#: objcopy.c:4604 +#: objcopy.c:4650 msgid "can't create debugging section" msgstr "" -#: objcopy.c:4618 +#: objcopy.c:4664 msgid "can't set debugging section contents" msgstr "" -#: objcopy.c:4627 +#: objcopy.c:4673 #, c-format msgid "don't know how to write debugging information for %s" msgstr "" -#: objcopy.c:4812 +#: objcopy.c:4860 msgid "could not create temporary file to hold stripped copy" msgstr "" -#: objcopy.c:4884 +#: objcopy.c:4939 #, c-format msgid "%s: bad version in PE subsystem" msgstr "" -#: objcopy.c:4914 +#: objcopy.c:4969 #, c-format msgid "unknown PE subsystem: %s" msgstr "" -#: objcopy.c:4968 objcopy.c:5238 objcopy.c:5318 objcopy.c:5459 objcopy.c:5491 -#: objcopy.c:5554 objcopy.c:5558 objcopy.c:5578 +#: objcopy.c:5023 objcopy.c:5294 objcopy.c:5374 objcopy.c:5515 objcopy.c:5547 +#: objcopy.c:5610 objcopy.c:5614 objcopy.c:5634 #, c-format msgid "bad format for %s" msgstr "%s 格式错误" -#: objcopy.c:4997 +#: objcopy.c:5052 #, c-format msgid "cannot open: %s: %s" msgstr "无法打开：%s：%s" -#: objcopy.c:5050 +#: objcopy.c:5106 msgid "byte number must be non-negative" msgstr "字节编号必须是非负数" -#: objcopy.c:5056 +#: objcopy.c:5112 #, c-format msgid "architecture %s unknown" msgstr "未知的体系结构 %s" -#: objcopy.c:5064 +#: objcopy.c:5120 msgid "interleave must be positive" msgstr "" -#: objcopy.c:5073 +#: objcopy.c:5129 msgid "interleave width must be positive" msgstr "" -#: objcopy.c:5391 +#: objcopy.c:5447 #, c-format msgid "unrecognized --compress-debug-sections type `%s'" msgstr "" -#: objcopy.c:5412 +#: objcopy.c:5468 #, c-format msgid "unrecognized --elf-stt-common= option `%s'" msgstr "" -#: objcopy.c:5428 +#: objcopy.c:5484 #, c-format msgid "Warning: truncating gap-fill from 0x%s to 0x%x" msgstr "警告：将间隙填充由 0x%s 截短到 0x%x" -#: objcopy.c:5514 +#: objcopy.c:5570 msgid "bad format for --set-section-alignment: argument needed" msgstr "" -#: objcopy.c:5518 +#: objcopy.c:5574 msgid "bad format for --set-section-alignment: numeric argument needed" msgstr "" #. Number has more than on 1, i.e. wasn't a power of 2. -#: objcopy.c:5530 +#: objcopy.c:5586 msgid "" "bad format for --set-section-alignment: alignment is not a power of two" msgstr "" -#: objcopy.c:5633 +#: objcopy.c:5689 #, c-format msgid "unknown long section names option '%s'" msgstr "" -#: objcopy.c:5656 +#: objcopy.c:5712 msgid "unable to parse alternative machine code" msgstr "" -#: objcopy.c:5705 +#: objcopy.c:5761 msgid "number of bytes to reverse must be positive and even" msgstr "" -#: objcopy.c:5708 +#: objcopy.c:5764 #, c-format msgid "Warning: ignoring previous --reverse-bytes value of %d" msgstr "" -#: objcopy.c:5723 +#: objcopy.c:5779 #, c-format msgid "%s: invalid reserve value for --heap" msgstr "" -#: objcopy.c:5729 +#: objcopy.c:5785 #, c-format msgid "%s: invalid commit value for --heap" msgstr "" -#: objcopy.c:5754 +#: objcopy.c:5810 #, c-format msgid "%s: invalid reserve value for --stack" msgstr "" -#: objcopy.c:5760 +#: objcopy.c:5816 #, c-format msgid "%s: invalid commit value for --stack" msgstr "" -#: objcopy.c:5769 +#: objcopy.c:5825 msgid "verilog data width must be at least 1 byte" msgstr "" -#: objcopy.c:5786 +#: objcopy.c:5842 msgid "--globalize-symbol(s) is incompatible with -G/--keep-global-symbol(s)" msgstr "" -#: objcopy.c:5798 +#: objcopy.c:5854 msgid "interleave start byte must be set with --byte" msgstr "" -#: objcopy.c:5801 +#: objcopy.c:5857 msgid "byte number must be less than interleave" msgstr "" -#: objcopy.c:5804 +#: objcopy.c:5860 msgid "interleave width must be less than or equal to interleave - byte`" msgstr "" -#: objcopy.c:5833 +#: objcopy.c:5889 #, c-format msgid "unknown input EFI target: %s" msgstr "" -#: objcopy.c:5864 +#: objcopy.c:5920 #, c-format msgid "unknown output EFI target: %s" msgstr "" -#: objcopy.c:5877 +#: objcopy.c:5884 #, c-format msgid "warning: could not locate '%s'. System error message: %s" msgstr "" -#: objcopy.c:5889 +#: objcopy.c:5946 #, c-format msgid "" "warning: could not create temporary file whilst copying '%s', (error: %s)" msgstr "" -#: objcopy.c:5922 objcopy.c:5936 +#: objcopy.c:5987 objcopy.c:6001 #, c-format msgid "%s %s%c0x%s never used" msgstr "" @@ -5540,7 +5540,7 @@ msgid "failed to read symbol table from: %s" msgstr "" -#: objdump.c:738 objdump.c:4671 +#: objdump.c:738 objdump.c:4705 msgid "error message was" msgstr "" @@ -5569,7 +5569,7 @@ msgid "disassemble_fn returned length %d" msgstr "" -#: objdump.c:3138 objdump.c:4309 +#: objdump.c:3138 objdump.c:4343 #, c-format msgid "Reading section %s failed because: %s" msgstr "" @@ -5652,74 +5652,73 @@ "\n" "起始地址 0x" -#: objdump.c:4096 readelf.c:14228 +#: objdump.c:4119 readelf.c:14689 #, c-format msgid "" "\n" "CTF archive member: %s:\n" msgstr "" -#: objdump.c:4115 readelf.c:14247 +#: readelf.c:14708 #, c-format msgid "Iteration failed: %s, %s\n" msgstr "" -#: objdump.c:4148 objdump.c:4157 objdump.c:4171 readelf.c:14338 readelf.c:14347 -#: readelf.c:14360 +#: readelf.c:14804 readelf.c:14817 readelf.c:14831 #, c-format msgid "CTF open failure: %s\n" msgstr "" -#: objdump.c:4175 +#: objdump.c:4204 #, c-format msgid "Contents of CTF section %s:\n" msgstr "" -#: objdump.c:4195 +#: objdump.c:4229 #, c-format msgid "warning: private headers incomplete: %s" msgstr "" -#: objdump.c:4213 +#: objdump.c:4247 msgid "option -P/--private not supported by this file" msgstr "" -#: objdump.c:4237 +#: objdump.c:4271 #, c-format msgid "target specific dump '%s' not supported" msgstr "" -#: objdump.c:4301 +#: objdump.c:4335 #, c-format msgid "Contents of section %s:" msgstr "" -#: objdump.c:4303 +#: objdump.c:4337 #, c-format msgid " (Starting at file offset: 0x%lx)" msgstr "" -#: objdump.c:4413 +#: objdump.c:4447 #, c-format msgid "no symbols\n" msgstr "无符号\n" -#: objdump.c:4420 +#: objdump.c:4454 #, c-format msgid "no information for symbol number %ld\n" msgstr "" -#: objdump.c:4423 +#: objdump.c:4457 #, c-format msgid "could not determine the type of symbol number %ld\n" msgstr "" -#: objdump.c:4669 +#: objdump.c:4703 #, c-format msgid "failed to read relocs in: %s" msgstr "" -#: objdump.c:4826 +#: objdump.c:4860 #, c-format msgid "" "\n" @@ -5728,52 +5727,52 @@ "\n" "%s： 文件格式 %s\n" -#: objdump.c:4925 +#: objdump.c:4959 #, c-format msgid "%s: printing debugging information failed" msgstr "%s：打印调试信息失败" -#: objdump.c:5021 +#: objdump.c:5055 #, c-format msgid "In archive %s:\n" msgstr "在归档文件 %s 中：\n" #. Prevent corrupted files from spinning us into an #. infinite loop. 100 is an arbitrary heuristic. -#: objdump.c:5026 +#: objdump.c:5060 msgid "Archive nesting is too deep" msgstr "" -#: objdump.c:5030 +#: objdump.c:5064 #, c-format msgid "In nested archive %s:\n" msgstr "" -#: objdump.c:5195 +#: objdump.c:5229 msgid "error: the start address should be before the end address" msgstr "" -#: objdump.c:5200 +#: objdump.c:5234 msgid "error: the stop address should be after the start address" msgstr "" -#: objdump.c:5212 +#: objdump.c:5246 msgid "error: prefix strip must be non-negative" msgstr "" -#: objdump.c:5217 +#: objdump.c:5251 msgid "error: instruction width must be positive" msgstr "" -#: objdump.c:5238 +#: objdump.c:5272 msgid "unrecognized argument to --visualize-option" msgstr "" -#: objdump.c:5248 +#: objdump.c:5282 msgid "unrecognized -E option" msgstr "无法识别的 -E 选项" -#: objdump.c:5259 +#: objdump.c:5293 #, c-format msgid "unrecognized --endian type `%s'" msgstr "无法识别的 --endian 类型“%s”" @@ -6050,7 +6049,7 @@ msgid " time and date: 0x%08x - " msgstr "" -#: od-xcoff.c:422 readelf.c:18582 +#: od-xcoff.c:422 readelf.c:19232 #, c-format msgid "not set\n" msgstr "未设置\n" @@ -6493,102 +6492,102 @@ msgid "%ld: unexpected .ef\n" msgstr "%ld：意外的 .ef\n" -#: rddbg.c:80 +#: rddbg.c:81 #, c-format msgid "%s: no recognized debugging information" msgstr "%s：未识别的调试信息" -#: rddbg.c:196 +#: rddbg.c:199 #, c-format msgid "%s: %s: stab entry %ld is corrupt, strx = 0x%x, type = %d\n" msgstr "" -#: rddbg.c:220 +#: rddbg.c:223 #, c-format msgid "%s: %s: stab entry %ld is corrupt\n" msgstr "" -#: rddbg.c:389 +#: rddbg.c:392 #, c-format msgid "Last stabs entries before error:\n" msgstr "" -#: readelf.c:335 +#: readelf.c:347 msgid "" msgstr "" -#: readelf.c:336 +#: readelf.c:348 msgid "" msgstr "" -#: readelf.c:422 +#: readelf.c:434 #, c-format msgid "Size truncation prevents reading %s elements of size %s for %s\n" msgstr "" -#: readelf.c:432 +#: readelf.c:444 #, c-format msgid "Size overflow prevents reading %s elements of size %s for %s\n" msgstr "" -#: readelf.c:445 +#: readelf.c:457 #, c-format msgid "Reading %s bytes extends past end of file for %s\n" msgstr "" -#: readelf.c:454 +#: readelf.c:466 #, c-format msgid "Unable to seek to 0x%lx for %s\n" msgstr "" -#: readelf.c:468 +#: readelf.c:480 #, c-format msgid "Out of memory allocating %s bytes for %s\n" msgstr "" -#: readelf.c:479 +#: readelf.c:491 #, c-format msgid "Unable to read in %s bytes of %s\n" msgstr "" -#: readelf.c:928 +#: readelf.c:952 msgid "Don't know about relocations on this machine architecture\n" msgstr "不知道关于本机器体系结构中重定位的情况\n" -#: readelf.c:955 readelf.c:1060 +#: readelf.c:979 readelf.c:1084 msgid "32-bit relocation data" msgstr "" -#: readelf.c:967 readelf.c:997 readelf.c:1071 readelf.c:1100 +#: readelf.c:991 readelf.c:1021 readelf.c:1095 readelf.c:1124 msgid "out of memory parsing relocs\n" msgstr "" -#: readelf.c:985 readelf.c:1089 +#: readelf.c:1009 readelf.c:1113 msgid "64-bit relocation data" msgstr "" -#: readelf.c:1219 +#: readelf.c:1243 #, c-format msgid "" " Offset Info Type Sym. Value Symbol's Name + Addend\n" msgstr " 偏移量 信息 类型 符号值 符号名称 + 加数\n" -#: readelf.c:1221 +#: readelf.c:1245 #, c-format msgid " Offset Info Type Sym.Value Sym. Name + Addend\n" msgstr " 偏移量 信息 类型 符号值 符号名称 + 加数\n" -#: readelf.c:1226 +#: readelf.c:1250 #, c-format msgid " Offset Info Type Sym. Value Symbol's Name\n" msgstr " 偏移量 信息 类型 符号值 符号名称\n" -#: readelf.c:1228 +#: readelf.c:1252 #, c-format msgid " Offset Info Type Sym.Value Sym. Name\n" msgstr " 偏移量 信息 类型 符号值 符号名称\n" -#: readelf.c:1236 +#: readelf.c:1260 #, c-format msgid "" " Offset Info Type Symbol's Value " @@ -6596,14 +6595,14 @@ msgstr "" " 偏移量 信息 类型 符号值 符号名称 + 加数\n" -#: readelf.c:1238 +#: readelf.c:1262 #, c-format msgid "" " Offset Info Type Sym. Value Sym. Name + " "Addend\n" msgstr " 偏移量 信息 类型 符号值 符号名称 + 加数\n" -#: readelf.c:1243 +#: readelf.c:1267 #, c-format msgid "" " Offset Info Type Symbol's Value " @@ -6611,200 +6610,200 @@ msgstr "" " 偏移量 信息 类型 符号值 符号名称\n" -#: readelf.c:1245 +#: readelf.c:1269 #, c-format msgid "" " Offset Info Type Sym. Value Sym. Name\n" msgstr " 偏移量 信息 类型 符号值 符号名称\n" -#: readelf.c:1638 readelf.c:1830 readelf.c:1838 +#: readelf.c:1640 readelf.c:1833 readelf.c:1841 #, c-format msgid "unrecognized: %-7lx" msgstr "不能识别的：%-7lx" -#: readelf.c:1664 +#: readelf.c:1666 #, c-format msgid "" msgstr "" -#: readelf.c:1632 +#: readelf.c:1590 #, c-format msgid " bad symbol index: %08lx in reloc" msgstr "" -#: readelf.c:1775 +#: readelf.c:1778 #, c-format msgid "" msgstr "<字串表索引：%3ld>" -#: readelf.c:1736 +#: readelf.c:1694 #, c-format msgid "" msgstr "<毁损的字串表索引：%3ld>" -#: readelf.c:2282 +#: readelf.c:2286 #, c-format msgid "Processor Specific: %lx" msgstr "处理器特有：%lx" -#: readelf.c:2309 +#: readelf.c:2313 #, c-format msgid "Operating System specific: %lx" msgstr "操作系统特有：%lx" -#: readelf.c:2313 readelf.c:4112 +#: readelf.c:2317 readelf.c:4135 #, c-format msgid ": %lx" msgstr "<未知>：%lx" -#: readelf.c:2326 +#: readelf.c:2330 msgid "NONE (None)" msgstr "NONE (无)" -#: readelf.c:2327 +#: readelf.c:2331 msgid "REL (Relocatable file)" msgstr "REL (可重定位文件)" -#: readelf.c:2328 +#: readelf.c:2332 msgid "EXEC (Executable file)" msgstr "EXEC (可执行文件)" -#: readelf.c:2329 +#: readelf.c:2333 msgid "DYN (Shared object file)" msgstr "DYN (共享目标文件)" -#: readelf.c:2330 +#: readelf.c:2334 msgid "CORE (Core file)" msgstr "CORE (Core 文件)" -#: readelf.c:2334 +#: readelf.c:2338 #, c-format msgid "Processor Specific: (%x)" msgstr "处理器特有：(%x)" -#: readelf.c:2336 +#: readelf.c:2340 #, c-format msgid "OS Specific: (%x)" msgstr "操作系统特有：(%x)" -#: readelf.c:2338 +#: readelf.c:2342 #, c-format msgid ": %x" msgstr "<未知>：%x" #. Please keep this switch table sorted by increasing EM_ value. #. 0 -#: readelf.c:2352 readelf.c:16609 readelf.c:16620 +#: readelf.c:2356 readelf.c:17189 readelf.c:17200 msgid "None" msgstr "无" -#: readelf.c:2584 +#: readelf.c:2603 #, c-format msgid ": 0x%x" msgstr "" -#: readelf.c:2870 +#: readelf.c:2889 msgid ", " msgstr "" -#: readelf.c:3239 readelf.c:9949 +#: readelf.c:3258 readelf.c:10099 msgid "unknown" msgstr "未知" -#: readelf.c:3240 +#: readelf.c:3259 msgid "unknown mac" msgstr "" -#: readelf.c:3308 +#: readelf.c:3327 msgid ", " msgstr "" -#: readelf.c:3318 +#: readelf.c:3337 msgid "" msgstr "" -#: readelf.c:3329 +#: readelf.c:3348 #, c-format msgid ", unknown flags bits: %#x" msgstr "" -#: readelf.c:3338 +#: readelf.c:3357 msgid ", relocatable" msgstr "" -#: readelf.c:3341 +#: readelf.c:3360 msgid ", relocatable-lib" msgstr "" -#: readelf.c:3423 +#: readelf.c:3442 msgid ", unknown v850 architecture variant" msgstr "" -#: readelf.c:3491 +#: readelf.c:3510 msgid ", unknown CPU" msgstr ", 未知 CPU" -#: readelf.c:3506 +#: readelf.c:3525 msgid ", unknown ABI" msgstr ", 未知 ABI" -#: readelf.c:3531 readelf.c:3602 +#: readelf.c:3550 readelf.c:3621 msgid ", unknown ISA" msgstr ", 未知 ISA" -#: readelf.c:3712 +#: readelf.c:3731 #, c-format msgid "Unrecognised IA64 VMS Command Code: %x\n" msgstr "" -#: readelf.c:3778 +#: readelf.c:3797 msgid ": architecture variant: " msgstr "" -#: readelf.c:3797 +#: readelf.c:3816 msgid ": unknown" msgstr ": 未知" -#: readelf.c:3801 +#: readelf.c:3820 msgid ": unknown extra flag bits also present" msgstr "" -#: readelf.c:3815 +#: readelf.c:3834 msgid ", unknown" msgstr "" -#: readelf.c:3867 +#: readelf.c:3886 msgid "Standalone App" msgstr "独立应用程序" -#: readelf.c:3876 +#: readelf.c:3895 msgid "Bare-metal C6000" msgstr "" -#: readelf.c:3886 readelf.c:4897 readelf.c:4913 readelf.c:18014 readelf.c:18114 -#: readelf.c:18145 readelf.c:18200 readelf.c:18227 +#: readelf.c:3905 readelf.c:4986 readelf.c:5002 readelf.c:18599 readelf.c:18699 +#: readelf.c:18730 readelf.c:18767 readelf.c:18828 readelf.c:18855 #, c-format msgid "" msgstr "<未知：%x>" #. This message is probably going to be displayed in a 15 #. character wide field, so put the hex value first. -#: readelf.c:4468 +#: readelf.c:4504 #, c-format msgid "%08x: " msgstr "%08x: <未知>" -#: readelf.c:4541 +#: readelf.c:4588 #, c-format msgid "Usage: readelf elf-file(s)\n" msgstr "用法：readelf <选项> elf-文件\n" -#: readelf.c:4542 +#: readelf.c:4589 #, c-format msgid " Display information about the contents of ELF format files\n" msgstr " 显示关于 ELF 格式文件内容的信息\n" -#: readelf.c:4494 +#: readelf.c:4334 #, c-format msgid "" " Options are:\n" @@ -6848,7 +6847,7 @@ " Display the contents of DWARF debug sections\n" msgstr "" -#: readelf.c:4578 +#: readelf.c:4633 #, c-format msgid "" " --dwarf-depth=N Do not display DIEs at depth N or greater\n" @@ -6856,7 +6855,7 @@ " or deeper\n" msgstr "" -#: readelf.c:4583 +#: readelf.c:4638 #, c-format msgid "" " --ctf= Display CTF info from section \n" @@ -6873,14 +6872,14 @@ "\n" msgstr "" -#: readelf.c:4594 +#: readelf.c:4649 #, c-format msgid "" " -i --instruction-dump=\n" " Disassemble the contents of section \n" msgstr "" -#: readelf.c:4546 +#: readelf.c:4377 #, c-format msgid "" " -I --histogram Display histogram of bucket list lengths\n" @@ -6890,95 +6889,95 @@ " -v --version Display the version number of readelf\n" msgstr "" -#: readelf.c:4629 readelf.c:4660 readelf.c:4664 +#: readelf.c:4684 readelf.c:4715 readelf.c:4719 msgid "Out of memory allocating dump request table.\n" msgstr "" -#: readelf.c:4860 +#: readelf.c:4948 #, c-format msgid "Invalid option '-%c'\n" msgstr "无效的选项“-%c”\n" -#: readelf.c:4893 readelf.c:4909 readelf.c:10987 +#: readelf.c:4982 readelf.c:4998 readelf.c:11159 msgid "none" msgstr "无" -#: readelf.c:4910 +#: readelf.c:4999 msgid "2's complement, little endian" msgstr "2 补码，小端序 (little endian)" -#: readelf.c:4911 +#: readelf.c:5000 msgid "2's complement, big endian" msgstr "2 补码，大端序 (big endian)" -#: readelf.c:4931 +#: readelf.c:5020 msgid "Not an ELF file - it has the wrong magic bytes at the start\n" msgstr "不是 ELF 文件 - 它开头的 magic 字节错误\n" -#: readelf.c:4941 +#: readelf.c:5030 #, c-format msgid "ELF Header:\n" msgstr "ELF 头：\n" -#: readelf.c:4942 +#: readelf.c:5031 #, c-format msgid " Magic: " msgstr " Magic： " -#: readelf.c:4946 +#: readelf.c:5035 #, c-format msgid " Class: %s\n" msgstr " 类别: %s\n" -#: readelf.c:4948 +#: readelf.c:5037 #, c-format msgid " Data: %s\n" msgstr " 数据: %s\n" -#: readelf.c:4950 +#: readelf.c:5039 #, c-format msgid " Version: %d%s\n" msgstr "" -#: readelf.c:4953 +#: readelf.c:5042 msgid " (current)" msgstr "" -#: readelf.c:4955 +#: readelf.c:5044 msgid " " msgstr "" -#: readelf.c:4957 +#: readelf.c:5046 #, c-format msgid " OS/ABI: %s\n" msgstr " OS/ABI: %s\n" -#: readelf.c:4959 +#: readelf.c:5048 #, c-format msgid " ABI Version: %d\n" msgstr " ABI 版本: %d\n" -#: readelf.c:4961 +#: readelf.c:5050 #, c-format msgid " Type: %s\n" msgstr " 类型: %s\n" -#: readelf.c:4963 +#: readelf.c:5052 #, c-format msgid " Machine: %s\n" msgstr " 系统架构: %s\n" -#: readelf.c:4965 +#: readelf.c:5054 #, c-format msgid " Version: 0x%lx\n" msgstr " 版本: 0x%lx\n" -#: readelf.c:4968 +#: readelf.c:5057 #, c-format msgid " Entry point address: " msgstr " 入口点地址： " -#: readelf.c:4970 +#: readelf.c:5059 #, c-format msgid "" "\n" @@ -6987,91 +6986,91 @@ "\n" " 程序头起点： " -#: readelf.c:4972 +#: readelf.c:5061 #, c-format msgid "" " (bytes into file)\n" " Start of section headers: " msgstr "" -#: readelf.c:4974 +#: readelf.c:5063 #, c-format msgid " (bytes into file)\n" msgstr "" -#: readelf.c:4976 +#: readelf.c:5065 #, c-format msgid " Flags: 0x%lx%s\n" msgstr " 标志： 0x%lx%s\n" -#: readelf.c:4979 +#: readelf.c:5068 #, c-format msgid " Size of this header: %u (bytes)\n" msgstr "" -#: readelf.c:4981 +#: readelf.c:5070 #, c-format msgid " Size of program headers: %u (bytes)\n" msgstr "" -#: readelf.c:4983 +#: readelf.c:5072 #, c-format msgid " Number of program headers: %u" msgstr "" -#: readelf.c:4993 +#: readelf.c:5082 #, c-format msgid " Size of section headers: %u (bytes)\n" msgstr "" -#: readelf.c:4995 +#: readelf.c:5084 #, c-format msgid " Number of section headers: %u" msgstr "" -#: readelf.c:5003 +#: readelf.c:5092 #, c-format msgid " Section header string table index: %u" msgstr "" -#: readelf.c:5015 +#: readelf.c:5104 #, c-format msgid " " msgstr "" -#: readelf.c:5056 readelf.c:5103 +#: readelf.c:5145 readelf.c:5192 msgid "" "The e_phentsize field in the ELF header is less than the size of an ELF " "program header\n" msgstr "" -#: readelf.c:5060 readelf.c:5107 +#: readelf.c:5149 readelf.c:5196 msgid "" "The e_phentsize field in the ELF header is larger than the size of an ELF " "program header\n" msgstr "" -#: readelf.c:5063 readelf.c:5110 +#: readelf.c:5152 readelf.c:5199 msgid "program headers" msgstr "程序头" -#: readelf.c:5149 +#: readelf.c:5238 #, c-format msgid "Too many program headers - %#x - the file is not that big\n" msgstr "" -#: readelf.c:5158 +#: readelf.c:5247 #, c-format msgid "Out of memory reading %u program headers\n" msgstr "" -#: readelf.c:5192 +#: readelf.c:5281 msgid "" "possibly corrupt ELF header - it has a non-zero program header offset, but " "no program headers\n" msgstr "" -#: readelf.c:5197 +#: readelf.c:5286 #, c-format msgid "" "\n" @@ -7080,7 +7079,7 @@ "\n" "本文件中没有程序头。\n" -#: readelf.c:5203 +#: readelf.c:5292 #, c-format msgid "" "\n" @@ -7089,19 +7088,19 @@ "\n" "Elf 文件类型为 %s\n" -#: readelf.c:5204 +#: readelf.c:5293 #, c-format msgid "Entry point 0x%s\n" msgstr "" -#: readelf.c:5205 +#: readelf.c:5294 #, c-format msgid "There is %d program header, starting at offset %s\n" msgid_plural "There are %d program headers, starting at offset %s\n" msgstr[0] "" msgstr[1] "" -#: readelf.c:5218 readelf.c:5220 +#: readelf.c:5307 readelf.c:5309 #, c-format msgid "" "\n" @@ -7110,198 +7109,198 @@ "\n" "程序头：\n" -#: readelf.c:5224 +#: readelf.c:5313 #, c-format msgid "" " Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align\n" msgstr "" -#: readelf.c:5227 +#: readelf.c:5316 #, c-format msgid "" " Type Offset VirtAddr PhysAddr FileSiz " "MemSiz Flg Align\n" msgstr "" -#: readelf.c:5231 +#: readelf.c:5320 #, c-format msgid " Type Offset VirtAddr PhysAddr\n" msgstr "" -#: readelf.c:5233 +#: readelf.c:5322 #, c-format msgid "" " FileSiz MemSiz Flags Align\n" msgstr "" -#: readelf.c:5329 +#: readelf.c:5418 msgid "LOAD segments must be sorted in order of increasing VirtAddr\n" msgstr "" -#: readelf.c:5332 +#: readelf.c:5421 msgid "the segment's file size is larger than its memory size\n" msgstr "" -#: readelf.c:5339 +#: readelf.c:5428 msgid "the PHDR segment must occur before any LOAD segment\n" msgstr "" -#: readelf.c:5357 +#: readelf.c:5446 msgid "the PHDR segment is not covered by a LOAD segment\n" msgstr "" -#: readelf.c:5363 +#: readelf.c:5452 msgid "more than one dynamic segment\n" msgstr "多于一个动态段\n" -#: readelf.c:5382 +#: readelf.c:5471 msgid "no .dynamic section in the dynamic segment\n" msgstr "" -#: readelf.c:5326 +#: readelf.c:5126 msgid "the .dynamic section is not contained within the dynamic segment\n" msgstr "" -#: readelf.c:5329 +#: readelf.c:5129 msgid "" "the .dynamic section is not the first section in the dynamic segment.\n" msgstr "" -#: readelf.c:5412 +#: readelf.c:5501 msgid "the dynamic segment offset + size exceeds the size of the file\n" msgstr "" -#: readelf.c:5421 +#: readelf.c:5510 msgid "Unable to find program interpreter name\n" msgstr "无法找到程序解释器名称\n" -#: readelf.c:5428 +#: readelf.c:5517 msgid "" "Internal error: failed to create format string to display program " "interpreter\n" msgstr "" -#: readelf.c:5433 +#: readelf.c:5522 msgid "Unable to read program interpreter name\n" msgstr "" -#: readelf.c:5436 +#: readelf.c:5525 #, c-format msgid " [Requesting program interpreter: %s]\n" msgstr "" -#: readelf.c:5447 +#: readelf.c:5536 #, c-format msgid "" "\n" " Section to Segment mapping:\n" msgstr "" -#: readelf.c:5448 +#: readelf.c:5537 #, c-format msgid " Segment Sections...\n" msgstr " 段节...\n" -#: readelf.c:5484 readelf.c:10309 +#: readelf.c:5573 readelf.c:10459 msgid "Cannot interpret virtual addresses without program headers.\n" msgstr "" -#: readelf.c:5500 +#: readelf.c:5589 #, c-format msgid "Virtual address 0x%lx not located in any PT_LOAD segment.\n" msgstr "" -#: readelf.c:5525 readelf.c:5590 +#: readelf.c:5614 readelf.c:5679 msgid "" "The e_shentsize field in the ELF header is less than the size of an ELF " "section header\n" msgstr "" -#: readelf.c:5529 readelf.c:5595 +#: readelf.c:5618 readelf.c:5684 msgid "" "The e_shentsize field in the ELF header is larger than the size of an ELF " "section header\n" msgstr "" -#: readelf.c:5533 readelf.c:5600 +#: readelf.c:5622 readelf.c:5689 msgid "section headers" msgstr "节头" -#: readelf.c:5543 readelf.c:5610 +#: readelf.c:5632 readelf.c:5699 #, c-format msgid "Out of memory reading %u section headers\n" msgstr "" -#: readelf.c:5563 readelf.c:5630 +#: readelf.c:5652 readelf.c:5719 #, c-format msgid "Section %u has an out of range sh_link value of %u\n" msgstr "" -#: readelf.c:5565 readelf.c:5632 +#: readelf.c:5654 readelf.c:5721 #, c-format msgid "Section %u has an out of range sh_info value of %u\n" msgstr "" -#: readelf.c:5662 readelf.c:5779 +#: readelf.c:5751 readelf.c:5868 #, c-format msgid "Section %s has an invalid sh_entsize of 0x%lx\n" msgstr "" -#: readelf.c:5670 readelf.c:5787 +#: readelf.c:5759 readelf.c:5876 readelf.c:12375 #, c-format msgid "Section %s has an invalid sh_size of 0x%lx\n" msgstr "" -#: readelf.c:5680 readelf.c:5797 +#: readelf.c:5769 readelf.c:5886 #, c-format msgid "" "Size (0x%lx) of section %s is not a multiple of its sh_entsize (0x%lx)\n" msgstr "" -#: readelf.c:5688 readelf.c:5805 readelf.c:14295 +#: readelf.c:5777 readelf.c:5894 readelf.c:14760 msgid "symbols" msgstr "符号" -#: readelf.c:5700 readelf.c:5817 +#: readelf.c:5789 readelf.c:5906 msgid "" "Multiple symbol table index sections associated with the same symbol " "section\n" msgstr "" -#: readelf.c:5707 readelf.c:5824 +#: readelf.c:5796 readelf.c:5913 msgid "symbol table section indices" msgstr "" -#: readelf.c:5714 readelf.c:5831 +#: readelf.c:5803 readelf.c:5920 #, c-format msgid "Index section %s has an sh_size of 0x%lx - expected 0x%lx\n" msgstr "" -#: readelf.c:5726 readelf.c:5843 +#: readelf.c:5815 readelf.c:5932 #, c-format msgid "Out of memory reading %lu symbols\n" msgstr "" -#: readelf.c:6022 readelf.c:6097 readelf.c:6115 readelf.c:6133 +#: readelf.c:6130 readelf.c:6227 readelf.c:6245 readelf.c:6263 msgid "Internal error: not enough buffer room for section flag info" msgstr "" -#: readelf.c:6140 +#: readelf.c:6270 #, c-format msgid "UNKNOWN (%*.*lx)" msgstr "" -#: readelf.c:6159 readelf.c:6174 +#: readelf.c:6289 readelf.c:6304 msgid "Compressed section is too small even for a compression header\n" msgstr "" -#: readelf.c:6213 +#: readelf.c:6343 msgid "" "possibly corrupt ELF file header - it has a non-zero section header offset, " "but no section headers\n" msgstr "" -#: readelf.c:6218 +#: readelf.c:6348 #, c-format msgid "" "\n" @@ -7310,41 +7309,41 @@ "\n" "本文件中没有节。\n" -#: readelf.c:6224 +#: readelf.c:6354 #, c-format msgid "There is %d section header, starting at offset 0x%lx:\n" msgid_plural "There are %d section headers, starting at offset 0x%lx:\n" msgstr[0] "" msgstr[1] "" -#: readelf.c:6253 readelf.c:6907 readelf.c:7092 readelf.c:12216 readelf.c:14668 +#: readelf.c:6383 readelf.c:7037 readelf.c:7223 readelf.c:12638 readelf.c:15143 msgid "string table" msgstr "字符串表" #. Note: coded this way so that there is a single string for translation. -#: readelf.c:6319 +#: readelf.c:6449 #, c-format msgid "Section %d has invalid sh_entsize of %s\n" msgstr "" -#: readelf.c:6320 +#: readelf.c:6450 #, c-format msgid "(Using the expected size of %u for the rest of this dump)\n" msgstr "" -#: readelf.c:6344 +#: readelf.c:6474 msgid "File contains multiple dynamic symbol tables\n" msgstr "文件含有多个动态符号表\n" -#: readelf.c:6359 +#: readelf.c:6489 msgid "File contains multiple dynamic string tables\n" msgstr "文件含有多个动态字符串表\n" -#: readelf.c:6365 +#: readelf.c:6495 msgid "dynamic strings" msgstr "动态字符串" -#: readelf.c:6487 +#: readelf.c:6617 #, c-format msgid "" "\n" @@ -7353,7 +7352,7 @@ "\n" "节头：\n" -#: readelf.c:6489 +#: readelf.c:6619 #, c-format msgid "" "\n" @@ -7362,107 +7361,107 @@ "\n" "节头：\n" -#: readelf.c:6495 readelf.c:6506 readelf.c:6517 +#: readelf.c:6625 readelf.c:6636 readelf.c:6647 #, c-format msgid " [Nr] Name\n" msgstr " [号] 名称\n" -#: readelf.c:6496 +#: readelf.c:6626 #, c-format msgid " Type Addr Off Size ES Lk Inf Al\n" msgstr "" -#: readelf.c:6500 +#: readelf.c:6630 #, c-format msgid "" " [Nr] Name Type Addr Off Size ES Flg Lk " "Inf Al\n" msgstr "" -#: readelf.c:6507 +#: readelf.c:6637 #, c-format msgid "" " Type Address Off Size ES Lk Inf Al\n" msgstr "" -#: readelf.c:6511 +#: readelf.c:6641 #, c-format msgid "" " [Nr] Name Type Address Off Size ES " "Flg Lk Inf Al\n" msgstr "" -#: readelf.c:6518 +#: readelf.c:6648 #, c-format msgid " Type Address Offset Link\n" msgstr " 类型 地址 偏移量 链接\n" -#: readelf.c:6519 +#: readelf.c:6649 #, c-format msgid " Size EntSize Info Align\n" msgstr " 大小 全体大小 信息 对齐\n" -#: readelf.c:6523 +#: readelf.c:6653 #, c-format msgid " [Nr] Name Type Address Offset\n" msgstr " [号] 名称 类型 地址 偏移量\n" -#: readelf.c:6524 +#: readelf.c:6654 #, c-format msgid " Size EntSize Flags Link Info Align\n" msgstr " 大小 全体大小 旗标 链接 信息 对齐\n" -#: readelf.c:6529 +#: readelf.c:6659 #, c-format msgid " Flags\n" msgstr " 旗标\n" -#: readelf.c:6558 +#: readelf.c:6688 #, c-format msgid "[%2u]: Link field (%u) should index a symtab section.\n" msgstr "" -#: readelf.c:6571 +#: readelf.c:6701 #, c-format msgid "[%2u]: Link field (%u) should index a string section.\n" msgstr "" -#: readelf.c:6579 readelf.c:6590 +#: readelf.c:6709 readelf.c:6720 #, c-format msgid "[%2u]: Unexpected value (%u) in link field.\n" msgstr "" -#: readelf.c:6617 +#: readelf.c:6747 #, c-format msgid "[%2u]: Info field (%u) should index a relocatable section.\n" msgstr "" -#: readelf.c:6628 readelf.c:6655 +#: readelf.c:6758 readelf.c:6785 #, c-format msgid "[%2u]: Unexpected value (%u) in info field.\n" msgstr "" -#: readelf.c:6650 +#: readelf.c:6780 #, c-format msgid "[%2u]: Expected link to another section in info field" msgstr "" -#: readelf.c:6665 +#: readelf.c:6795 #, c-format msgid "Size of section %u is larger than the entire file!\n" msgstr "" -#: readelf.c:6734 +#: readelf.c:6864 #, c-format msgid "" "section %u: sh_link value of %u is larger than the number of sections\n" msgstr "" -#: readelf.c:6835 +#: readelf.c:6965 msgid "compression header" msgstr "" -#: readelf.c:6846 +#: readelf.c:6976 #, c-format msgid " [: 0x%x], " msgstr "" @@ -7470,7 +7469,7 @@ #. The ordering of the letters shown here matches the ordering of the #. corresponding SHF_xxx values, and hence the order in which these #. letters will be displayed to the user. -#: readelf.c:6861 +#: readelf.c:6991 #, c-format msgid "" "Key to Flags:\n" @@ -7480,143 +7479,143 @@ " " msgstr "" -#: readelf.c:6868 +#: readelf.c:6998 #, c-format msgid "l (large), " msgstr "" -#: readelf.c:6870 +#: readelf.c:7000 #, c-format msgid "y (purecode), " msgstr "" -#: readelf.c:6872 +#: readelf.c:7002 #, c-format msgid "v (VLE), " msgstr "" -#: readelf.c:6764 +#: readelf.c:6552 #, c-format msgid "[0x%x: " msgstr "" -#: readelf.c:6960 +#: readelf.c:7090 #, c-format msgid "" "\n" "There are no sections to group in this file.\n" msgstr "" -#: readelf.c:6967 +#: readelf.c:7097 msgid "Section headers are not available!\n" msgstr "" -#: readelf.c:6978 +#: readelf.c:7108 #, c-format msgid "Out of memory reading %u section group headers\n" msgstr "" -#: readelf.c:6994 +#: readelf.c:7124 #, c-format msgid "" "\n" "There are no section groups in this file.\n" msgstr "" -#: readelf.c:7004 +#: readelf.c:7134 #, c-format msgid "Out of memory reading %lu groups\n" msgstr "" -#: readelf.c:7034 +#: readelf.c:7164 #, c-format msgid "Bad sh_link in group section `%s'\n" msgstr "" -#: readelf.c:7047 +#: readelf.c:7177 #, c-format msgid "Corrupt header in group section `%s'\n" msgstr "" -#: readelf.c:7053 readelf.c:7064 +#: readelf.c:7183 readelf.c:7194 #, c-format msgid "Bad sh_info in group section `%s'\n" msgstr "" -#: readelf.c:7102 +#: readelf.c:7233 #, c-format msgid "" "Section %s has sh_entsize (0x%lx) which is larger than its size (0x%lx)\n" msgstr "" -#: readelf.c:7111 +#: readelf.c:7242 msgid "section data" msgstr "节输出" -#: readelf.c:7122 +#: readelf.c:7253 #, c-format msgid "" "\n" "%sgroup section [%5u] `%s' [%s] contains %u sections:\n" msgstr "" -#: readelf.c:7125 +#: readelf.c:7256 #, c-format msgid " [Index] Name\n" msgstr "" -#: readelf.c:7143 +#: readelf.c:7274 #, c-format msgid "section [%5u] in group section [%5u] > maximum section [%5u]\n" msgstr "" -#: readelf.c:7146 +#: readelf.c:7277 msgid "" "Further error messages about overlarge group section indices suppressed\n" msgstr "" -#: readelf.c:7159 +#: readelf.c:7290 #, c-format msgid "section [%5u] in group section [%5u] already in group section [%5u]\n" msgstr "" -#: readelf.c:7163 +#: readelf.c:7294 msgid "" "Further error messages about already contained group sections suppressed\n" msgstr "" -#: readelf.c:7175 +#: readelf.c:7306 #, c-format msgid "section 0 in group section [%5u]\n" msgstr "" -#: readelf.c:7242 +#: readelf.c:7373 msgid "dynamic section image fixups" msgstr "" -#: readelf.c:7250 +#: readelf.c:7381 #, c-format msgid "corrupt library name index of 0x%lx found in dynamic entry" msgstr "" -#: readelf.c:7255 +#: readelf.c:7386 #, c-format msgid "" "\n" "Image fixups for needed library #%d: %s - ident: %lx\n" msgstr "" -#: readelf.c:7258 +#: readelf.c:7389 #, c-format msgid "" "Seg Offset Type SymVec DataType\n" msgstr "段 偏移 类型 SymVec 数据类型\n" -#: readelf.c:7292 +#: readelf.c:7423 msgid "dynamic section image relocations" msgstr "" -#: readelf.c:7296 +#: readelf.c:7427 #, c-format msgid "" "\n" @@ -7625,24 +7624,24 @@ "\n" "映像重定位\n" -#: readelf.c:7298 +#: readelf.c:7429 #, c-format msgid "" "Seg Offset Type Addend Seg Sym Off\n" msgstr "" -#: readelf.c:7355 +#: readelf.c:7486 msgid "dynamic string section" msgstr "" -#: readelf.c:7457 +#: readelf.c:7588 #, c-format msgid "" "\n" "'%s' relocation section at offset 0x%lx contains %ld bytes:\n" msgstr "" -#: readelf.c:7476 +#: readelf.c:7607 #, c-format msgid "" "\n" @@ -7651,7 +7650,7 @@ "\n" "本文件中没有动态重定位。\n" -#: readelf.c:7500 +#: readelf.c:7631 #, c-format msgid "" "\n" @@ -7660,28 +7659,28 @@ "\n" "重定位节 " -#: readelf.c:7508 +#: readelf.c:7639 #, c-format msgid " at offset 0x%lx contains %lu entry:\n" msgid_plural " at offset 0x%lx contains %lu entries:\n" msgstr[0] "" msgstr[1] "" -#: readelf.c:7556 +#: readelf.c:7687 #, c-format msgid "" "\n" "There are no static relocations in this file." msgstr "" -#: readelf.c:7557 +#: readelf.c:7688 #, c-format msgid "" "\n" "To see the dynamic relocations add --use-dynamic to the command line.\n" msgstr "" -#: readelf.c:7563 +#: readelf.c:7694 #, c-format msgid "" "\n" @@ -7690,68 +7689,68 @@ "\n" "该文件中没有重定位信息。\n" -#: readelf.c:7730 +#: readelf.c:7861 #, c-format msgid "Invalid section %u in table entry %ld\n" msgstr "" -#: readelf.c:7742 +#: readelf.c:7873 #, c-format msgid "Invalid offset %lx in table entry %ld\n" msgstr "" -#: readelf.c:7760 +#: readelf.c:7891 #, c-format msgid "\tUnknown version.\n" msgstr "\t未知版本。\n" -#: readelf.c:7823 readelf.c:8248 +#: readelf.c:7954 readelf.c:8388 msgid "unwind table" msgstr "" -#: readelf.c:7874 readelf.c:8330 +#: readelf.c:8005 readelf.c:8471 #, c-format msgid "Skipping unknown relocation type: %u\n" msgstr "" -#: readelf.c:7880 readelf.c:8337 +#: readelf.c:8011 readelf.c:8478 #, c-format msgid "Skipping unexpected relocation type: %s\n" msgstr "" -#: readelf.c:7889 readelf.c:8344 +#: readelf.c:8020 readelf.c:8485 #, c-format msgid "Skipping reloc with overlarge offset: %lx\n" msgstr "" -#: readelf.c:7896 readelf.c:8351 +#: readelf.c:8027 readelf.c:8492 #, c-format msgid "Skipping reloc with invalid symbol index: %u\n" msgstr "" -#: readelf.c:7807 readelf.c:8271 +#: readelf.c:7577 readelf.c:8020 msgid "Multiple auxillary string tables encountered\n" msgstr "" -#: readelf.c:7959 readelf.c:8415 readelf.c:9521 +#: readelf.c:8090 readelf.c:8555 readelf.c:9662 #, c-format msgid "" "\n" "There are no unwind sections in this file.\n" msgstr "" -#: readelf.c:8033 +#: readelf.c:8173 #, c-format msgid "" "\n" "Could not find unwind info section for " msgstr "" -#: readelf.c:8045 +#: readelf.c:8185 msgid "unwind info" msgstr "展开信息" -#: readelf.c:8048 +#: readelf.c:8188 #, c-format msgid "" "\n" @@ -7760,12 +7759,12 @@ "\n" "展开节 " -#: readelf.c:8055 +#: readelf.c:8195 #, c-format msgid " at offset 0x%lx contains %lu entries:\n" msgstr " 位于偏移量 0x%lx 含有 %lu 个条目：\n" -#: readelf.c:8423 readelf.c:9528 +#: readelf.c:8564 readelf.c:9669 #, c-format msgid "" "\n" @@ -7776,193 +7775,193 @@ msgstr[0] "" msgstr[1] "" -#: readelf.c:8556 +#: readelf.c:8697 msgid "unwind data" msgstr "展开数据" -#: readelf.c:8629 +#: readelf.c:8770 #, c-format msgid "Skipping unexpected relocation at offset 0x%lx\n" msgstr "" -#: readelf.c:8651 +#: readelf.c:8792 #, c-format msgid "Unknown section relocation type %d encountered\n" msgstr "" -#: readelf.c:8659 +#: readelf.c:8800 #, c-format msgid "Bad symbol index in unwind relocation (%lu > %lu)\n" msgstr "" -#: readelf.c:8674 +#: readelf.c:8815 #, c-format msgid "Skipping unknown ARM relocation type: %d\n" msgstr "" -#: readelf.c:8684 +#: readelf.c:8825 #, c-format msgid "Skipping unexpected ARM relocation type %s\n" msgstr "" -#: readelf.c:8693 +#: readelf.c:8834 #, c-format msgid "Skipping unknown C6000 relocation type: %d\n" msgstr "" -#: readelf.c:8703 +#: readelf.c:8844 #, c-format msgid "Skipping unexpected C6000 relocation type %s\n" msgstr "" #. This function currently only supports ARM and TI unwinders. -#: readelf.c:8712 +#: readelf.c:8853 msgid "Only TI and ARM unwinders are currently supported\n" msgstr "" -#: readelf.c:8775 +#: readelf.c:8916 #, c-format msgid "[Truncated opcode]\n" msgstr "" -#: readelf.c:8823 readelf.c:9039 +#: readelf.c:8964 readelf.c:9180 #, c-format msgid "Refuse to unwind" msgstr "拒绝展开" -#: readelf.c:8846 +#: readelf.c:8987 #, c-format msgid " [Reserved]" msgstr "" -#: readelf.c:8874 +#: readelf.c:9015 #, c-format msgid " finish" msgstr "" -#: readelf.c:8879 readelf.c:8972 +#: readelf.c:9020 readelf.c:9113 #, c-format msgid "[Spare]" msgstr "" -#: readelf.c:8789 +#: readelf.c:8538 msgid "corrupt change to vsp" msgstr "" -#: readelf.c:8994 readelf.c:9151 +#: readelf.c:9135 readelf.c:9292 #, c-format msgid " [unsupported opcode]" msgstr "" -#: readelf.c:9087 +#: readelf.c:9228 #, c-format msgid "pop frame {" msgstr "" -#: readelf.c:9090 +#: readelf.c:9231 #, c-format msgid "*corrupt* - no registers specified" msgstr "" -#: readelf.c:9104 +#: readelf.c:9245 msgid "[pad]" msgstr "" -#: readelf.c:9133 +#: readelf.c:9274 msgid "Corrupt stack pointer adjustment detected\n" msgstr "" -#: readelf.c:9140 +#: readelf.c:9281 #, c-format msgid "sp = sp + %ld" msgstr "" -#: readelf.c:9215 +#: readelf.c:9356 #, c-format msgid " Personality routine: " msgstr "" -#: readelf.c:9247 +#: readelf.c:9388 #, c-format msgid " [Truncated data]\n" msgstr "" -#: readelf.c:9271 +#: readelf.c:9412 #, c-format msgid "Corrupt ARM compact model table entry: %x \n" msgstr "" -#: readelf.c:9276 +#: readelf.c:9417 #, c-format msgid " Compact model index: %d\n" msgstr "" -#: readelf.c:9302 +#: readelf.c:9443 msgid "Unknown ARM compact model index encountered\n" msgstr "" -#: readelf.c:9303 +#: readelf.c:9444 #, c-format msgid " [reserved]\n" msgstr "" -#: readelf.c:9318 +#: readelf.c:9459 #, c-format msgid " Restore stack from frame pointer\n" msgstr "" -#: readelf.c:9320 +#: readelf.c:9461 #, c-format msgid " Stack increment %d\n" msgstr "" -#: readelf.c:9321 +#: readelf.c:9462 #, c-format msgid " Registers restored: " msgstr "" -#: readelf.c:9326 +#: readelf.c:9467 #, c-format msgid " Return register: %s\n" msgstr "" -#: readelf.c:9330 +#: readelf.c:9471 #, c-format msgid " [reserved (%d)]\n" msgstr "" -#: readelf.c:9334 +#: readelf.c:9475 #, c-format msgid "" "Unsupported architecture type %d encountered when decoding unwind table\n" msgstr "" -#: readelf.c:9389 +#: readelf.c:9530 #, c-format msgid "corrupt index table entry: %x\n" msgstr "" -#: readelf.c:9429 +#: readelf.c:9570 #, c-format msgid "Unwind entry contains corrupt offset (0x%lx) into section %s\n" msgstr "" -#: readelf.c:9445 +#: readelf.c:9586 #, c-format msgid "Could not locate .ARM.extab section containing 0x%lx.\n" msgstr "" -#: readelf.c:9489 +#: readelf.c:9630 #, c-format msgid "" "Unsupported architecture type %d encountered when processing unwind table\n" msgstr "" -#: readelf.c:9388 +#: readelf.c:9125 msgid "Multiple string tables found in file.\n" msgstr "" -#: readelf.c:9572 +#: readelf.c:9713 #, c-format msgid "" "\n" @@ -7970,37 +7969,37 @@ "supported.\n" msgstr "" -#: readelf.c:9599 +#: readelf.c:9740 #, c-format msgid "NONE" msgstr "" -#: readelf.c:9624 +#: readelf.c:9765 #, c-format msgid "Interface Version: %s" msgstr "" #. Note: coded this way so that there is a single string for translation. -#: readelf.c:9631 +#: readelf.c:9772 #, c-format msgid "" msgstr "" -#: readelf.c:9649 +#: readelf.c:9790 #, c-format msgid "Time Stamp: %s" msgstr "" -#: readelf.c:9834 readelf.c:9884 +#: readelf.c:9984 readelf.c:10034 msgid "dynamic section" msgstr "" -#: readelf.c:9854 readelf.c:9905 +#: readelf.c:10004 readelf.c:10055 #, c-format msgid "Out of memory allocating space for %lu dynamic entries\n" msgstr "" -#: readelf.c:10257 +#: readelf.c:10407 #, c-format msgid "" "\n" @@ -8008,7 +8007,7 @@ msgstr "" #. See PR 21379 for a reproducer. -#: readelf.c:9880 +#: readelf.c:9597 #, c-format msgid "Invalid DT_SYMTAB entry: %lx" msgstr "" @@ -8017,11 +8016,11 @@ msgid "Multiple dynamic symbol table sections found\n" msgstr "" -#: readelf.c:9903 +#: readelf.c:9615 msgid "Unable to determine the number of symbols to load\n" msgstr "无法确定要读取的符号数量\n" -#: readelf.c:9939 +#: readelf.c:9651 msgid "Unable to determine the length of the dynamic string table\n" msgstr "无法确定动态字符串表的长度\n" @@ -8029,29 +8028,29 @@ msgid "Multiple dynamic string tables found\n" msgstr "" -#: readelf.c:10401 +#: readelf.c:10551 msgid "dynamic string table" msgstr "动态字符串表" -#: readelf.c:10429 +#: readelf.c:10579 #, c-format msgid "Bad value (%d) for SYMINENT entry\n" msgstr "" -#: readelf.c:10448 +#: readelf.c:10598 msgid "symbol information" msgstr "符号信息" -#: readelf.c:10454 +#: readelf.c:10604 msgid "Multiple dynamic symbol information sections found\n" msgstr "" -#: readelf.c:10003 +#: readelf.c:9705 #, c-format msgid "Out of memory allocating %lu byte for dynamic symbol info\n" msgstr "" -#: readelf.c:10482 +#: readelf.c:10632 #, c-format msgid "" "\n" @@ -8062,87 +8061,87 @@ msgstr[0] "" msgstr[1] "" -#: readelf.c:10489 +#: readelf.c:10639 #, c-format msgid " Tag Type Name/Value\n" msgstr " 标记 类型 名称/值\n" -#: readelf.c:10523 +#: readelf.c:10673 #, c-format msgid "Auxiliary library" msgstr "附加库" -#: readelf.c:10527 +#: readelf.c:10677 #, c-format msgid "Filter library" msgstr "过滤器库" -#: readelf.c:10531 +#: readelf.c:10681 #, c-format msgid "Configuration file" msgstr "配置文件" -#: readelf.c:10535 +#: readelf.c:10685 #, c-format msgid "Dependency audit library" msgstr "" -#: readelf.c:10539 +#: readelf.c:10689 #, c-format msgid "Audit library" msgstr "" -#: readelf.c:10558 readelf.c:10586 readelf.c:10614 +#: readelf.c:10708 readelf.c:10736 readelf.c:10764 readelf.c:11098 #, c-format msgid "Flags:" msgstr "标志：" -#: readelf.c:10561 readelf.c:10589 readelf.c:10616 +#: readelf.c:10711 readelf.c:10739 readelf.c:10766 readelf.c:11100 #, c-format msgid " None\n" msgstr " 无\n" -#: readelf.c:10822 +#: readelf.c:10972 #, c-format msgid "Shared library: [%s]" msgstr "共享库：[%s]" -#: readelf.c:10825 +#: readelf.c:10975 #, c-format msgid " program interpreter" msgstr " 程序解释器" -#: readelf.c:10829 +#: readelf.c:10979 #, c-format msgid "Library soname: [%s]" msgstr "" -#: readelf.c:10833 +#: readelf.c:10983 #, c-format msgid "Library rpath: [%s]" msgstr "" -#: readelf.c:10837 +#: readelf.c:10987 #, c-format msgid "Library runpath: [%s]" msgstr "" -#: readelf.c:10871 +#: readelf.c:11021 #, c-format msgid " (bytes)\n" msgstr "" -#: readelf.c:10901 +#: readelf.c:11051 #, c-format msgid "Not needed object: [%s]\n" msgstr "不需要的目标：[%s]\n" -#: readelf.c:10926 +#: readelf.c:11076 #, c-format msgid ": %d" msgstr "" -#: readelf.c:11825 +#: readelf.c:11997 #, c-format msgid ": %x" msgstr "" -#: readelf.c:11865 +#: readelf.c:12037 #, c-format msgid "bad section index[%3d]" msgstr "" -#: readelf.c:9967 +#: readelf.c:10117 #, c-format msgid "Size truncation prevents reading %s elements of size %u\n" msgstr "" -#: readelf.c:9976 +#: readelf.c:10126 #, c-format msgid "Invalid number of dynamic entries: %s\n" msgstr "" -#: readelf.c:9984 +#: readelf.c:10134 #, c-format msgid "Out of memory reading %s dynamic entries\n" msgstr "" -#: readelf.c:9991 +#: readelf.c:10141 #, c-format msgid "Unable to read in %s bytes of dynamic data\n" msgstr "" -#: readelf.c:10000 +#: readelf.c:10150 #, c-format msgid "Out of memory allocating space for %s dynamic entries\n" msgstr "" -#: readelf.c:11479 +#: readelf.c:11127 #, c-format msgid "\n" msgstr "" -#: readelf.c:11511 +#: readelf.c:11159 #, c-format msgid " " msgstr "" -#: readelf.c:11898 +#: readelf.c:12070 msgid "version data" msgstr "版本数据" -#: readelf.c:12010 +#: readelf.c:12182 msgid "version need aux (3)" msgstr "" -#: readelf.c:10040 readelf.c:10094 readelf.c:10118 readelf.c:10151 -#: readelf.c:10177 readelf.c:10196 +#: readelf.c:10190 readelf.c:10244 readelf.c:10268 readelf.c:10301 +#: readelf.c:10327 readelf.c:10346 msgid "Unable to seek to start of dynamic information\n" msgstr "" -#: readelf.c:10046 readelf.c:10100 +#: readelf.c:10196 readelf.c:10250 msgid "Failed to read in number of buckets\n" msgstr "" -#: readelf.c:10052 +#: readelf.c:10202 msgid "Failed to read in number of chains\n" msgstr "" -#: readelf.c:10159 +#: readelf.c:10309 msgid "Failed to determine last chain length\n" msgstr "" -#: readelf.c:11914 +#: readelf.c:11526 #, c-format msgid "" "\n" "Symbol table for image:\n" msgstr "" -#: readelf.c:11916 readelf.c:11943 +#: readelf.c:11528 readelf.c:11554 #, c-format msgid " Num Buc: Value Size Type Bind Vis Ndx Name\n" msgstr "" -#: readelf.c:11918 readelf.c:11945 +#: readelf.c:11530 readelf.c:11556 #, c-format msgid " Num Buc: Value Size Type Bind Vis Ndx Name\n" msgstr "" -#: readelf.c:12271 +#: readelf.c:12693 msgid "histogram chain is corrupt\n" msgstr "" @@ -8470,14 +8469,14 @@ "Symbol table of `%s' for image:\n" msgstr "" -#: readelf.c:12182 +#: readelf.c:12604 #, c-format msgid "" "\n" "Symbol table '%s' has a sh_entsize of zero!\n" msgstr "" -#: readelf.c:12188 +#: readelf.c:12610 #, c-format msgid "" "\n" @@ -8488,29 +8487,29 @@ msgstr[0] "" msgstr[1] "" -#: readelf.c:12151 readelf.c:12195 +#: readelf.c:12573 readelf.c:12617 #, c-format msgid " Num: Value Size Type Bind Vis Ndx Name\n" msgstr "" -#: readelf.c:12153 readelf.c:12197 +#: readelf.c:12575 readelf.c:12619 #, c-format msgid " Num: Value Size Type Bind Vis Ndx Name\n" msgstr "" -#: readelf.c:12079 +#: readelf.c:11687 #, c-format msgid "local symbol %u found at index >= %s's sh_info value of %u\n" msgstr "" -#: readelf.c:12231 +#: readelf.c:12653 #, c-format msgid "" "\n" "Dynamic symbol information is not available for displaying symbols.\n" msgstr "" -#: readelf.c:12244 +#: readelf.c:12666 #, c-format msgid "" "\n" @@ -8521,20 +8520,20 @@ msgstr[0] "" msgstr[1] "" -#: readelf.c:12255 +#: readelf.c:12677 msgid "Out of memory allocating space for histogram buckets\n" msgstr "" -#: readelf.c:12261 readelf.c:12339 +#: readelf.c:12683 readelf.c:12761 #, c-format msgid " Length Number %% of total Coverage\n" msgstr "" -#: readelf.c:12283 +#: readelf.c:12705 msgid "Out of memory allocating space for histogram counts\n" msgstr "" -#: readelf.c:12323 +#: readelf.c:12745 #, c-format msgid "" "\n" @@ -8545,15 +8544,15 @@ msgstr[0] "" msgstr[1] "" -#: readelf.c:12335 +#: readelf.c:12757 msgid "Out of memory allocating space for gnu histogram buckets\n" msgstr "" -#: readelf.c:12362 +#: readelf.c:12784 msgid "Out of memory allocating space for gnu histogram counts\n" msgstr "" -#: readelf.c:12428 +#: readelf.c:12850 #, c-format msgid "" "\n" @@ -8564,149 +8563,149 @@ msgstr[0] "" msgstr[1] "" -#: readelf.c:12435 +#: readelf.c:12857 #, c-format msgid " Num: Name BoundTo Flags\n" msgstr "" -#: readelf.c:12442 +#: readelf.c:12864 #, c-format msgid "" msgstr "" -#: readelf.c:12447 +#: readelf.c:12869 #, c-format msgid "" msgstr "" -#: readelf.c:12542 +#: readelf.c:12966 #, c-format msgid "MSP430 SYM_DIFF reloc contains invalid symbol index %lu\n" msgstr "" -#: readelf.c:12571 +#: readelf.c:13017 #, c-format msgid "MSP430 reloc contains invalid symbol index %lu\n" msgstr "" #. PR 21137 -#: readelf.c:12582 +#: readelf.c:13028 #, c-format msgid "MSP430 sym diff reloc contains invalid offset: 0x%lx\n" msgstr "" -#: readelf.c:12593 +#: readelf.c:13039 msgid "Unhandled MSP430 reloc type found after SYM_DIFF reloc\n" msgstr "" -#: readelf.c:12616 +#: readelf.c:13062 #, c-format msgid "MN10300_SYM_DIFF reloc contains invalid symbol index %lu\n" msgstr "" -#: readelf.c:12630 +#: readelf.c:13076 #, c-format msgid "MN10300 reloc contains invalid symbol index %lu\n" msgstr "" -#: readelf.c:12640 +#: readelf.c:13086 #, c-format msgid "MN10300 sym diff reloc contains invalid offset: 0x%lx\n" msgstr "" -#: readelf.c:12650 +#: readelf.c:13096 msgid "Unhandled MN10300 reloc type found after SYM_DIFF reloc\n" msgstr "" -#: readelf.c:12673 +#: readelf.c:13119 #, c-format msgid "RL78_SYM reloc contains invalid symbol index %lu\n" msgstr "" -#: readelf.c:12692 readelf.c:12701 +#: readelf.c:13138 readelf.c:13147 #, c-format msgid "RL78 sym diff reloc contains invalid offset: 0x%lx\n" msgstr "" -#: readelf.c:12920 +#: readelf.c:13366 #, c-format msgid "" "Missing knowledge of 32-bit reloc types used in DWARF sections of machine " "number %d\n" msgstr "" -#: readelf.c:13603 +#: readelf.c:14049 #, c-format msgid "unable to apply unsupported reloc type %d to section %s\n" msgstr "" -#: readelf.c:13612 +#: readelf.c:14058 #, c-format msgid "skipping invalid relocation offset 0x%lx in section %s\n" msgstr "" -#: readelf.c:13621 +#: readelf.c:14067 #, c-format msgid "skipping invalid relocation symbol index 0x%lx in section %s\n" msgstr "" -#: readelf.c:13644 +#: readelf.c:14090 #, c-format msgid "skipping unexpected symbol type %s in section %s relocation %ld\n" msgstr "" -#: readelf.c:13721 +#: readelf.c:14167 #, c-format msgid "" "\n" "Assembly dump of section %s\n" msgstr "" -#: readelf.c:13739 +#: readelf.c:14185 #, c-format msgid "Section '%s' has no data to dump.\n" msgstr "" -#: readelf.c:13745 +#: readelf.c:14191 msgid "section contents" msgstr "" -#: readelf.c:13820 +#: readelf.c:14266 #, c-format msgid "" "\n" "String dump of section '%s':\n" msgstr "" -#: readelf.c:13840 readelf.c:14056 readelf.c:14438 +#: readelf.c:14286 readelf.c:14496 readelf.c:14913 #, c-format msgid "section '%s' has unsupported compress type: %d\n" msgstr "" -#: readelf.c:13872 readelf.c:14090 readelf.c:14475 +#: readelf.c:14318 readelf.c:14530 readelf.c:14950 #, c-format msgid "Unable to decompress section %s\n" msgstr "" -#: readelf.c:13897 +#: readelf.c:14343 #, c-format msgid "" " Note: This section has relocations against it, but these have NOT been " "applied to this dump.\n" msgstr "" -#: readelf.c:13996 readelf.c:15432 readelf.c:15472 readelf.c:15510 -#: readelf.c:15557 readelf.c:15588 readelf.c:17088 readelf.c:17120 +#: readelf.c:14436 readelf.c:15908 readelf.c:15948 readelf.c:15986 +#: readelf.c:16033 readelf.c:16064 readelf.c:17668 readelf.c:17700 #, c-format msgid "\n" msgstr "" -#: readelf.c:14004 +#: readelf.c:14444 #, c-format msgid " No strings found in this section." msgstr "" -#: readelf.c:14036 +#: readelf.c:14476 #, c-format msgid "" "\n" @@ -8715,49 +8714,49 @@ "\n" "“%s”节的十六进制输出：\n" -#: readelf.c:14123 +#: readelf.c:14563 #, c-format msgid "" " NOTE: This section has relocations against it, but these have NOT been " "applied to this dump.\n" msgstr "" -#: readelf.c:14289 +#: readelf.c:14754 #, c-format msgid "No symbol section named %s\n" msgstr "" -#: readelf.c:14304 +#: readelf.c:14769 #, c-format msgid "No string table section named %s\n" msgstr "" -#: readelf.c:14311 +#: readelf.c:14776 msgid "strings" msgstr "" -#: readelf.c:14320 +#: readelf.c:14785 #, c-format msgid "No CTF parent section named %s\n" msgstr "" -#: readelf.c:14326 +#: readelf.c:14791 msgid "CTF parent" msgstr "" -#: readelf.c:14366 +#: readelf.c:14837 #, c-format msgid "" "\n" "Dump of CTF section '%s':\n" msgstr "" -#: readelf.c:14401 +#: readelf.c:14876 #, c-format msgid "%s section data" msgstr "" -#: readelf.c:14125 +#: readelf.c:13490 #, c-format msgid "compressed section %s is too small to contain a compression header" msgstr "" @@ -8775,12 +8774,12 @@ msgid "debuginfod: note with invalid namesz and/or descsz found\n" msgstr "" -#: readelf.c:19793 +#: readelf.c:20443 #, c-format msgid " type: 0x%lx, namesize: 0x%08lx, descsize: 0x%08lx, alignment: %u\n" msgstr "" -#: readelf.c:14727 +#: readelf.c:15202 #, c-format msgid "" "\n" @@ -8793,533 +8792,533 @@ #. which has the NOBITS type - the bits in the file will be random. #. This can happen when a file containing a .eh_frame section is #. stripped with the --only-keep-debug command line option. -#: readelf.c:14736 +#: readelf.c:15211 #, c-format msgid "section '%s' has the NOBITS type - its contents are unreliable.\n" msgstr "" -#: readelf.c:14786 +#: readelf.c:15261 #, c-format msgid "Unrecognized debug section: %s\n" msgstr "无法识别的调试节：%s\n" -#: readelf.c:14814 +#: readelf.c:15290 #, c-format msgid "Section '%s' was not dumped because it does not exist!\n" msgstr "" -#: readelf.c:14883 +#: readelf.c:15359 #, c-format msgid "Section %d was not dumped because it does not exist!\n" msgstr "" -#: readelf.c:14940 +#: readelf.c:15416 msgid "\n" msgstr "" -#: readelf.c:14955 +#: readelf.c:15431 #, c-format msgid "" msgstr "" -#: readelf.c:14989 +#: readelf.c:15465 #, c-format msgid "Absent/Non standard\n" msgstr "" -#: readelf.c:14992 +#: readelf.c:15468 #, c-format msgid "Bare metal/mwdt\n" msgstr "" -#: readelf.c:14995 +#: readelf.c:15471 #, c-format msgid "Bare metal/newlib\n" msgstr "" -#: readelf.c:14998 +#: readelf.c:15474 #, c-format msgid "Linux/uclibc\n" msgstr "" -#: readelf.c:15001 +#: readelf.c:15477 #, c-format msgid "Linux/glibc\n" msgstr "" -#: readelf.c:15004 readelf.c:15083 +#: readelf.c:15480 readelf.c:15559 #, c-format msgid "Unknown\n" msgstr "" -#: readelf.c:15016 readelf.c:15046 readelf.c:15074 +#: readelf.c:15492 readelf.c:15522 readelf.c:15550 #, c-format msgid "Absent\n" msgstr "" -#: readelf.c:15058 +#: readelf.c:15534 msgid "yes" msgstr "" -#: readelf.c:15058 +#: readelf.c:15534 msgid "no" msgstr "" -#: readelf.c:15095 readelf.c:15102 +#: readelf.c:15571 readelf.c:15578 msgid "default" msgstr "" -#: readelf.c:15096 +#: readelf.c:15572 msgid "smallest" msgstr "" -#: readelf.c:15101 +#: readelf.c:15577 msgid "OPTFP" msgstr "" -#: readelf.c:15299 readelf.c:15312 readelf.c:15330 readelf.c:15851 -#: readelf.c:16130 readelf.c:16142 readelf.c:16154 +#: readelf.c:15775 readelf.c:15788 readelf.c:15806 readelf.c:16327 +#: readelf.c:16606 readelf.c:16618 readelf.c:16630 #, c-format msgid "None\n" msgstr "无\n" -#: readelf.c:15300 +#: readelf.c:15776 #, c-format msgid "Application\n" msgstr "" -#: readelf.c:15301 +#: readelf.c:15777 #, c-format msgid "Realtime\n" msgstr "" -#: readelf.c:15302 +#: readelf.c:15778 #, c-format msgid "Microcontroller\n" msgstr "" -#: readelf.c:15303 +#: readelf.c:15779 #, c-format msgid "Application or Realtime\n" msgstr "" -#: readelf.c:15313 readelf.c:15332 readelf.c:15903 readelf.c:15920 -#: readelf.c:15991 readelf.c:16011 readelf.c:18592 +#: readelf.c:15789 readelf.c:15808 readelf.c:16379 readelf.c:16396 +#: readelf.c:16467 readelf.c:16487 readelf.c:19242 #, c-format msgid "8-byte\n" msgstr "" -#: readelf.c:15314 readelf.c:15994 readelf.c:16014 readelf.c:18591 +#: readelf.c:15790 readelf.c:16470 readelf.c:16490 readelf.c:19241 #, c-format msgid "4-byte\n" msgstr "" -#: readelf.c:15318 readelf.c:15336 +#: readelf.c:15794 readelf.c:15812 #, c-format msgid "8-byte and up to %d-byte extended\n" msgstr "" -#: readelf.c:15331 +#: readelf.c:15807 #, c-format msgid "8-byte, except leaf SP\n" msgstr "" -#: readelf.c:15347 readelf.c:15429 readelf.c:16029 +#: readelf.c:15823 readelf.c:15905 readelf.c:16505 #, c-format msgid "flag = %d, vendor = " msgstr "" -#: readelf.c:15368 +#: readelf.c:15844 #, c-format msgid "True\n" msgstr "真\n" -#: readelf.c:15388 +#: readelf.c:15864 #, c-format msgid "\n" msgstr "" -#: readelf.c:15433 +#: readelf.c:15909 msgid "corrupt vendor attribute\n" msgstr "" -#: readelf.c:15521 +#: readelf.c:15997 #, c-format msgid "unspecified hard/soft float, " msgstr "" -#: readelf.c:15524 +#: readelf.c:16000 #, c-format msgid "hard float, " msgstr "" -#: readelf.c:15527 +#: readelf.c:16003 #, c-format msgid "soft float, " msgstr "" -#: readelf.c:15530 +#: readelf.c:16006 #, c-format msgid "single-precision hard float, " msgstr "" -#: readelf.c:15537 +#: readelf.c:16013 #, c-format msgid "unspecified long double\n" msgstr "" -#: readelf.c:15540 +#: readelf.c:16016 #, c-format msgid "128-bit IBM long double\n" msgstr "" -#: readelf.c:15543 +#: readelf.c:16019 #, c-format msgid "64-bit long double\n" msgstr "" -#: readelf.c:15546 +#: readelf.c:16022 #, c-format msgid "128-bit IEEE long double\n" msgstr "" -#: readelf.c:15568 readelf.c:15599 +#: readelf.c:16044 readelf.c:16075 #, c-format msgid "unspecified\n" msgstr "" -#: readelf.c:15571 +#: readelf.c:16047 #, c-format msgid "generic\n" msgstr "" -#: readelf.c:15605 +#: readelf.c:16081 #, c-format msgid "memory\n" msgstr "" -#: readelf.c:15632 +#: readelf.c:16108 #, c-format msgid "any\n" msgstr "" -#: readelf.c:15635 +#: readelf.c:16111 #, c-format msgid "software\n" msgstr "" -#: readelf.c:15638 +#: readelf.c:16114 #, c-format msgid "hardware\n" msgstr "" -#: readelf.c:15761 +#: readelf.c:16237 #, c-format msgid "Hard or soft float\n" msgstr "硬或软浮点数\n" -#: readelf.c:15764 +#: readelf.c:16240 #, c-format msgid "Hard float (double precision)\n" msgstr "硬浮点 (单精度)\n" -#: readelf.c:15767 +#: readelf.c:16243 #, c-format msgid "Hard float (single precision)\n" msgstr "硬浮点 (双精度)\n" -#: readelf.c:15770 +#: readelf.c:16246 #, c-format msgid "Soft float\n" msgstr "软浮点数\n" -#: readelf.c:15773 +#: readelf.c:16249 #, c-format msgid "Hard float (MIPS32r2 64-bit FPU 12 callee-saved)\n" msgstr "" -#: readelf.c:15776 +#: readelf.c:16252 #, c-format msgid "Hard float (32-bit CPU, Any FPU)\n" msgstr "" -#: readelf.c:15779 +#: readelf.c:16255 #, c-format msgid "Hard float (32-bit CPU, 64-bit FPU)\n" msgstr "" -#: readelf.c:15782 +#: readelf.c:16258 #, c-format msgid "Hard float compat (32-bit CPU, 64-bit FPU)\n" msgstr "" -#: readelf.c:15785 +#: readelf.c:16261 #, c-format msgid "NaN 2008 compatibility\n" msgstr "" -#: readelf.c:15818 +#: readelf.c:16294 #, c-format msgid "Any MSA or not\n" msgstr "" -#: readelf.c:15821 +#: readelf.c:16297 #, c-format msgid "128-bit MSA\n" msgstr "" -#: readelf.c:15883 +#: readelf.c:16359 #, c-format msgid "Not used\n" msgstr "未使用\n" -#: readelf.c:15886 +#: readelf.c:16362 #, c-format msgid "2 bytes\n" msgstr "2 字节\n" -#: readelf.c:15889 +#: readelf.c:16365 #, c-format msgid "4 bytes\n" msgstr "4 字节\n" -#: readelf.c:15906 readelf.c:15923 readelf.c:15997 readelf.c:16017 +#: readelf.c:16382 readelf.c:16399 readelf.c:16473 readelf.c:16493 #, c-format msgid "16-byte\n" msgstr "16 字节\n" -#: readelf.c:15937 +#: readelf.c:16413 #, c-format msgid "DSBT addressing not used\n" msgstr "" -#: readelf.c:15940 +#: readelf.c:16416 #, c-format msgid "DSBT addressing used\n" msgstr "" -#: readelf.c:15954 +#: readelf.c:16430 #, c-format msgid "Data addressing position-dependent\n" msgstr "" -#: readelf.c:15957 +#: readelf.c:16433 #, c-format msgid "Data addressing position-independent, GOT near DP\n" msgstr "" -#: readelf.c:15960 +#: readelf.c:16436 #, c-format msgid "Data addressing position-independent, GOT far from DP\n" msgstr "" -#: readelf.c:15974 +#: readelf.c:16450 #, c-format msgid "Code addressing position-dependent\n" msgstr "" -#: readelf.c:15977 +#: readelf.c:16453 #, c-format msgid "Code addressing position-independent\n" msgstr "" -#: readelf.c:16131 +#: readelf.c:16607 #, c-format msgid "MSP430\n" msgstr "" -#: readelf.c:16132 +#: readelf.c:16608 #, c-format msgid "MSP430X\n" msgstr "" -#: readelf.c:16143 readelf.c:16155 +#: readelf.c:16619 readelf.c:16631 #, c-format msgid "Small\n" msgstr "" -#: readelf.c:16144 readelf.c:16156 +#: readelf.c:16620 readelf.c:16632 #, c-format msgid "Large\n" msgstr "" -#: readelf.c:16157 +#: readelf.c:16633 #, c-format msgid "Restricted Large\n" msgstr "" -#: readelf.c:16163 +#: readelf.c:16639 #, c-format msgid " : " msgstr "" -#: readelf.c:16209 +#: readelf.c:16685 #, c-format msgid "Any Region\n" msgstr "" -#: readelf.c:16212 +#: readelf.c:16688 #, c-format msgid "Lower Region Only\n" msgstr "" -#: readelf.c:16271 +#: readelf.c:16747 #, c-format msgid "%u\n" msgstr "" -#: readelf.c:16278 +#: readelf.c:16754 #, c-format msgid "No unaligned access\n" msgstr "" -#: readelf.c:16281 +#: readelf.c:16757 #, c-format msgid "Unaligned access\n" msgstr "" -#: readelf.c:16287 +#: readelf.c:16763 #, c-format msgid "%u-bytes\n" msgstr "" -#: readelf.c:16322 +#: readelf.c:16902 msgid "attributes" msgstr "" -#: readelf.c:16334 +#: readelf.c:16914 #, c-format msgid "Unknown attributes version '%c'(%d) - expecting 'A'\n" msgstr "" -#: readelf.c:16353 +#: readelf.c:16933 msgid "Tag section ends prematurely\n" msgstr "" -#: readelf.c:16362 +#: readelf.c:16942 #, c-format msgid "Bad attribute length (%u > %u)\n" msgstr "" -#: readelf.c:16370 +#: readelf.c:16950 #, c-format msgid "Attribute length of %u is too small\n" msgstr "" -#: readelf.c:16381 +#: readelf.c:16961 msgid "Corrupt attribute section name\n" msgstr "" -#: readelf.c:16386 +#: readelf.c:16966 #, c-format msgid "Attribute Section: " msgstr "" -#: readelf.c:16413 +#: readelf.c:16993 msgid "Unused bytes at end of section\n" msgstr "" -#: readelf.c:16423 +#: readelf.c:17003 #, c-format msgid "Bad subsection length (%u > %u)\n" msgstr "" -#: readelf.c:16431 +#: readelf.c:17011 #, c-format msgid "Bad subsection length (%u < 6)\n" msgstr "" -#: readelf.c:16446 +#: readelf.c:17026 #, c-format msgid "File Attributes\n" msgstr "" -#: readelf.c:16449 +#: readelf.c:17029 #, c-format msgid "Section Attributes:" msgstr "" -#: readelf.c:16452 +#: readelf.c:17032 #, c-format msgid "Symbol Attributes:" msgstr "" -#: readelf.c:16465 +#: readelf.c:17045 #, c-format msgid "Unknown tag: %d\n" msgstr "" -#: readelf.c:16486 +#: readelf.c:17066 #, c-format msgid " Unknown attribute:\n" msgstr "" -#: readelf.c:16528 +#: readelf.c:17108 msgid "MIPS GOT entry extends beyond the end of available data\n" msgstr "" -#: readelf.c:16611 readelf.c:16680 +#: readelf.c:17191 readelf.c:17260 msgid "Unknown" msgstr "" -#: readelf.c:16727 +#: readelf.c:17307 msgid "Corrupt MIPS ABI Flags section.\n" msgstr "" -#: readelf.c:16733 +#: readelf.c:17313 msgid "MIPS ABI Flags section" msgstr "" -#: readelf.c:16792 readelf.c:17375 +#: readelf.c:17372 readelf.c:17955 msgid "Global Offset Table data" msgstr "" -#: readelf.c:16796 +#: readelf.c:17376 #, c-format msgid "" "\n" "Static GOT:\n" msgstr "" -#: readelf.c:16797 readelf.c:17380 +#: readelf.c:17377 readelf.c:17960 #, c-format msgid " Canonical gp value: " msgstr "" -#: readelf.c:16811 readelf.c:17384 readelf.c:17511 +#: readelf.c:17391 readelf.c:17964 readelf.c:18094 #, c-format msgid " Reserved entries:\n" msgstr "" -#: readelf.c:16812 +#: readelf.c:17392 #, c-format msgid " %*s %10s %*s\n" msgstr "" -#: readelf.c:16813 readelf.c:16843 readelf.c:17386 readelf.c:17414 -#: readelf.c:17432 readelf.c:17513 readelf.c:17522 +#: readelf.c:17393 readelf.c:17423 readelf.c:17966 readelf.c:17994 +#: readelf.c:18012 readelf.c:18096 readelf.c:18105 msgid "Address" msgstr "住址" -#: readelf.c:16813 readelf.c:16843 readelf.c:17386 readelf.c:17414 -#: readelf.c:17433 +#: readelf.c:17393 readelf.c:17423 readelf.c:17966 readelf.c:17994 +#: readelf.c:18013 msgid "Access" msgstr "访问" -#: readelf.c:16814 readelf.c:16844 +#: readelf.c:17394 readelf.c:17424 msgid "Value" msgstr "" -#: readelf.c:16841 readelf.c:17412 +#: readelf.c:17421 readelf.c:17992 #, c-format msgid " Local entries:\n" msgstr "" -#: readelf.c:16923 readelf.c:17628 +#: readelf.c:17503 readelf.c:18211 msgid "liblist section data" msgstr "" -#: readelf.c:16926 +#: readelf.c:17506 #, c-format msgid "" "\n" @@ -9330,42 +9329,42 @@ msgstr[0] "" msgstr[1] "" -#: readelf.c:16930 +#: readelf.c:17510 msgid "" " Library Time Stamp Checksum Version Flags\n" msgstr "" -#: readelf.c:16956 +#: readelf.c:17536 #, c-format msgid "" msgstr "" -#: readelf.c:16961 +#: readelf.c:17541 msgid " NONE" msgstr "" -#: readelf.c:17012 +#: readelf.c:17592 msgid "No MIPS_OPTIONS header found\n" msgstr "" -#: readelf.c:17018 +#: readelf.c:17598 msgid "The MIPS options section is too small.\n" msgstr "" -#: readelf.c:17023 +#: readelf.c:17603 msgid "options" msgstr "选项" -#: readelf.c:16687 +#: readelf.c:15846 msgid "Out of memory allocating space for MIPS options\n" msgstr "" -#: readelf.c:17042 +#: readelf.c:17622 #, c-format msgid "Invalid size (%u) for MIPS option\n" msgstr "" -#: readelf.c:17051 +#: readelf.c:17631 #, c-format msgid "" "\n" @@ -9376,28 +9375,28 @@ msgstr[0] "" msgstr[1] "" -#: readelf.c:17089 readelf.c:17121 +#: readelf.c:17669 readelf.c:17701 msgid "Truncated MIPS REGINFO option\n" msgstr "" -#: readelf.c:17257 +#: readelf.c:17837 msgid "conflict list found without a dynamic symbol table\n" msgstr "" -#: readelf.c:17265 +#: readelf.c:17845 #, c-format msgid "Overlarge number of conflicts detected: %lx\n" msgstr "" -#: readelf.c:17273 +#: readelf.c:17853 msgid "Out of memory allocating space for dynamic conflicts\n" msgstr "" -#: readelf.c:17283 readelf.c:17301 +#: readelf.c:17863 readelf.c:17881 msgid "conflict" msgstr "冲突" -#: readelf.c:17314 +#: readelf.c:17894 #, c-format msgid "" "\n" @@ -9408,124 +9407,124 @@ msgstr[0] "" msgstr[1] "" -#: readelf.c:17318 +#: readelf.c:17898 msgid " Num: Index Value Name" msgstr "" -#: readelf.c:17325 +#: readelf.c:17905 #, c-format msgid "" msgstr "" -#: readelf.c:17336 readelf.c:17462 readelf.c:17547 +#: readelf.c:17916 readelf.c:18042 readelf.c:18130 #, c-format msgid "" msgstr "" -#: readelf.c:17359 +#: readelf.c:17939 #, c-format msgid "" "The GOT symbol offset (%lu) is greater than the symbol table size (%lu)\n" msgstr "" -#: readelf.c:17368 +#: readelf.c:17948 #, c-format msgid "Too many GOT symbols: %lu\n" msgstr "" -#: readelf.c:17379 +#: readelf.c:17959 #, c-format msgid "" "\n" "Primary GOT:\n" msgstr "" -#: readelf.c:17385 +#: readelf.c:17965 #, c-format msgid " %*s %10s %*s Purpose\n" msgstr "" -#: readelf.c:17387 readelf.c:17415 readelf.c:17434 readelf.c:17513 -#: readelf.c:17523 +#: readelf.c:17967 readelf.c:17995 readelf.c:18014 readelf.c:18096 +#: readelf.c:18106 msgid "Initial" msgstr "" -#: readelf.c:17389 +#: readelf.c:17969 #, c-format msgid " Lazy resolver\n" msgstr "" -#: readelf.c:17404 +#: readelf.c:17984 #, c-format msgid " Module pointer (GNU extension)\n" msgstr "" -#: readelf.c:17430 +#: readelf.c:18010 #, c-format msgid " Global entries:\n" msgstr "" -#: readelf.c:17435 readelf.c:17524 +#: readelf.c:18015 readelf.c:18107 msgid "Sym.Val." msgstr "" #. Note for translators: "Ndx" = abbreviated form of "Index". -#: readelf.c:17438 readelf.c:17524 +#: readelf.c:18018 readelf.c:18107 msgid "Ndx" msgstr "" -#: readelf.c:17438 readelf.c:17524 +#: readelf.c:18018 readelf.c:18107 msgid "Name" msgstr "名字" -#: readelf.c:17448 +#: readelf.c:18028 #, c-format msgid "" msgstr "" -#: readelf.c:17465 +#: readelf.c:18045 #, c-format msgid "" msgstr "" -#: readelf.c:17506 +#: readelf.c:18086 msgid "Procedure Linkage Table data" msgstr "" -#: readelf.c:17512 +#: readelf.c:18095 #, c-format msgid " %*s %*s Purpose\n" msgstr "" -#: readelf.c:17515 +#: readelf.c:18098 #, c-format msgid " PLT lazy resolver\n" msgstr "" -#: readelf.c:17517 +#: readelf.c:18100 #, c-format msgid " Module pointer\n" msgstr "" -#: readelf.c:17520 +#: readelf.c:18103 #, c-format msgid " Entries:\n" msgstr "" -#: readelf.c:17534 +#: readelf.c:18117 #, c-format msgid "" msgstr "" -#: readelf.c:17573 +#: readelf.c:18156 msgid "NDS32 elf flags section" msgstr "" -#: readelf.c:17639 +#: readelf.c:18222 msgid "liblist string table" msgstr "" -#: readelf.c:17651 +#: readelf.c:18234 #, c-format msgid "" "\n" @@ -9536,391 +9535,391 @@ msgstr[0] "" msgstr[1] "" -#: readelf.c:17657 +#: readelf.c:18240 msgid "" " Library Time Stamp Checksum Version Flags" msgstr "" -#: readelf.c:17707 +#: readelf.c:18290 msgid "NT_AUXV (auxiliary vector)" msgstr "" -#: readelf.c:17709 +#: readelf.c:18292 msgid "NT_PRSTATUS (prstatus structure)" msgstr "NT_PRSTATUS (prstatus 结构)" -#: readelf.c:17711 +#: readelf.c:18294 msgid "NT_FPREGSET (floating point registers)" msgstr "NT_FPREGSET (浮点寄存器)" -#: readelf.c:17713 +#: readelf.c:18296 msgid "NT_PRPSINFO (prpsinfo structure)" msgstr "NT_PRPSINFO (prpsinfo 结构)" -#: readelf.c:17715 +#: readelf.c:18298 msgid "NT_TASKSTRUCT (task structure)" msgstr "NT_TASKSTRUCT (任务结构)" -#: readelf.c:17717 +#: readelf.c:18300 msgid "NT_PRXFPREG (user_xfpregs structure)" msgstr "NT_PRXFPREG (user_xfpregs 结构)" -#: readelf.c:17719 +#: readelf.c:18302 msgid "NT_PPC_VMX (ppc Altivec registers)" msgstr "" -#: readelf.c:17721 +#: readelf.c:18304 msgid "NT_PPC_VSX (ppc VSX registers)" msgstr "" -#: readelf.c:17723 +#: readelf.c:18306 msgid "NT_PPC_TAR (ppc TAR register)" msgstr "" -#: readelf.c:17725 +#: readelf.c:18308 msgid "NT_PPC_PPR (ppc PPR register)" msgstr "" -#: readelf.c:17727 +#: readelf.c:18310 msgid "NT_PPC_DSCR (ppc DSCR register)" msgstr "" -#: readelf.c:17729 +#: readelf.c:18312 msgid "NT_PPC_EBB (ppc EBB registers)" msgstr "" -#: readelf.c:17731 +#: readelf.c:18314 msgid "NT_PPC_PMU (ppc PMU registers)" msgstr "" -#: readelf.c:17733 +#: readelf.c:18316 msgid "NT_PPC_TM_CGPR (ppc checkpointed GPR registers)" msgstr "" -#: readelf.c:17735 +#: readelf.c:18318 msgid "NT_PPC_TM_CFPR (ppc checkpointed floating point registers)" msgstr "" -#: readelf.c:17737 +#: readelf.c:18320 msgid "NT_PPC_TM_CVMX (ppc checkpointed Altivec registers)" msgstr "" -#: readelf.c:17739 +#: readelf.c:18322 msgid "NT_PPC_TM_CVSX (ppc checkpointed VSX registers)" msgstr "" -#: readelf.c:17741 +#: readelf.c:18324 msgid "NT_PPC_TM_SPR (ppc TM special purpose registers)" msgstr "" -#: readelf.c:17743 +#: readelf.c:18326 msgid "NT_PPC_TM_CTAR (ppc checkpointed TAR register)" msgstr "" -#: readelf.c:17745 +#: readelf.c:18328 msgid "NT_PPC_TM_CPPR (ppc checkpointed PPR register)" msgstr "" -#: readelf.c:17747 +#: readelf.c:18330 msgid "NT_PPC_TM_CDSCR (ppc checkpointed DSCR register)" msgstr "" -#: readelf.c:17749 +#: readelf.c:18332 msgid "NT_386_TLS (x86 TLS information)" msgstr "" -#: readelf.c:17751 +#: readelf.c:18334 msgid "NT_386_IOPERM (x86 I/O permissions)" msgstr "" -#: readelf.c:17753 +#: readelf.c:18336 msgid "NT_X86_XSTATE (x86 XSAVE extended state)" msgstr "" -#: readelf.c:17755 +#: readelf.c:18340 msgid "NT_S390_HIGH_GPRS (s390 upper register halves)" msgstr "" -#: readelf.c:17757 +#: readelf.c:18342 msgid "NT_S390_TIMER (s390 timer register)" msgstr "" -#: readelf.c:17759 +#: readelf.c:18344 msgid "NT_S390_TODCMP (s390 TOD comparator register)" msgstr "" -#: readelf.c:17761 +#: readelf.c:18346 msgid "NT_S390_TODPREG (s390 TOD programmable register)" msgstr "" -#: readelf.c:17763 +#: readelf.c:18348 msgid "NT_S390_CTRS (s390 control registers)" msgstr "" -#: readelf.c:17765 +#: readelf.c:18350 msgid "NT_S390_PREFIX (s390 prefix register)" msgstr "" -#: readelf.c:17767 +#: readelf.c:18352 msgid "NT_S390_LAST_BREAK (s390 last breaking event address)" msgstr "" -#: readelf.c:17769 +#: readelf.c:18354 msgid "NT_S390_SYSTEM_CALL (s390 system call restart data)" msgstr "" -#: readelf.c:17771 +#: readelf.c:18356 msgid "NT_S390_TDB (s390 transaction diagnostic block)" msgstr "" -#: readelf.c:17773 +#: readelf.c:18358 msgid "NT_S390_VXRS_LOW (s390 vector registers 0-15 upper half)" msgstr "" -#: readelf.c:17775 +#: readelf.c:18360 msgid "NT_S390_VXRS_HIGH (s390 vector registers 16-31)" msgstr "" -#: readelf.c:17777 +#: readelf.c:18362 msgid "NT_S390_GS_CB (s390 guarded-storage registers)" msgstr "" -#: readelf.c:17779 +#: readelf.c:18364 msgid "NT_S390_GS_BC (s390 guarded-storage broadcast control)" msgstr "" -#: readelf.c:17781 +#: readelf.c:18366 msgid "NT_ARM_VFP (arm VFP registers)" msgstr "" -#: readelf.c:17783 +#: readelf.c:18368 msgid "NT_ARM_TLS (AArch TLS registers)" msgstr "" -#: readelf.c:17785 +#: readelf.c:18370 msgid "NT_ARM_HW_BREAK (AArch hardware breakpoint registers)" msgstr "" -#: readelf.c:17787 +#: readelf.c:18372 msgid "NT_ARM_HW_WATCH (AArch hardware watchpoint registers)" msgstr "" -#: readelf.c:17791 +#: readelf.c:18376 msgid "NT_PSTATUS (pstatus structure)" msgstr "NT_PSTATUS (pstatus 结构)" -#: readelf.c:17793 +#: readelf.c:18378 msgid "NT_FPREGS (floating point registers)" msgstr "NT_FPREGS (浮点数寄存器)" -#: readelf.c:17795 +#: readelf.c:18380 msgid "NT_PSINFO (psinfo structure)" msgstr "NT_PSINFO (psinfo 结构)" -#: readelf.c:17797 +#: readelf.c:18382 msgid "NT_LWPSTATUS (lwpstatus_t structure)" msgstr "NT_LWPSTATUS (lwpstatus_t 结构)" -#: readelf.c:17799 +#: readelf.c:18384 msgid "NT_LWPSINFO (lwpsinfo_t structure)" msgstr "NT_LWPSINFO (lwpsinfo_t 结构)" -#: readelf.c:17801 +#: readelf.c:18386 msgid "NT_WIN32PSTATUS (win32_pstatus structure)" msgstr "NT_WIN32PSTATUS (win32_pstatus 结构)" -#: readelf.c:17803 +#: readelf.c:18388 msgid "NT_SIGINFO (siginfo_t data)" msgstr "" -#: readelf.c:17805 +#: readelf.c:18390 msgid "NT_FILE (mapped files)" msgstr "" -#: readelf.c:17813 +#: readelf.c:18398 msgid "NT_VERSION (version)" msgstr "NT_VERSION (版本)" -#: readelf.c:17815 +#: readelf.c:18400 msgid "NT_ARCH (architecture)" msgstr "NT_ARCH (系统架构)" -#: readelf.c:17817 +#: readelf.c:18402 msgid "OPEN" msgstr "" -#: readelf.c:17819 +#: readelf.c:18404 msgid "func" msgstr "" -#: readelf.c:17824 readelf.c:17943 readelf.c:18565 readelf.c:18739 -#: readelf.c:18816 readelf.c:18933 +#: readelf.c:18409 readelf.c:18528 readelf.c:19215 readelf.c:19389 +#: readelf.c:19466 readelf.c:19583 #, c-format msgid "Unknown note type: (0x%08x)" msgstr "未知的注释类型：(0x%08x)" -#: readelf.c:17845 +#: readelf.c:18430 #, c-format msgid " Cannot decode 64-bit note in 32-bit build\n" msgstr "" -#: readelf.c:17853 +#: readelf.c:18438 msgid " Malformed note - too short for header\n" msgstr "" -#: readelf.c:17862 +#: readelf.c:18447 msgid " Malformed note - does not end with \\0\n" msgstr "" -#: readelf.c:17875 +#: readelf.c:18460 msgid " Malformed note - too short for supplied file count\n" msgstr "" -#: readelf.c:17879 +#: readelf.c:18464 #, c-format msgid " Page size: " msgstr "" -#: readelf.c:17883 +#: readelf.c:18468 #, c-format msgid " %*s%*s%*s\n" msgstr "" -#: readelf.c:17884 +#: readelf.c:18469 msgid "Start" msgstr "起始点" -#: readelf.c:17885 +#: readelf.c:18470 msgid "End" msgstr "结束点" -#: readelf.c:17886 +#: readelf.c:18471 msgid "Page Offset" msgstr "" -#: readelf.c:17894 +#: readelf.c:18479 msgid " Malformed note - filenames end too early\n" msgstr "" -#: readelf.c:17926 +#: readelf.c:18511 msgid "NT_GNU_ABI_TAG (ABI version tag)" msgstr "" -#: readelf.c:17928 +#: readelf.c:18513 msgid "NT_GNU_HWCAP (DSO-supplied software HWCAP info)" msgstr "" -#: readelf.c:17930 +#: readelf.c:18515 msgid "NT_GNU_BUILD_ID (unique build ID bitstring)" msgstr "" -#: readelf.c:17932 +#: readelf.c:18517 msgid "NT_GNU_GOLD_VERSION (gold version)" msgstr "" -#: readelf.c:17934 +#: readelf.c:18519 msgid "NT_GNU_PROPERTY_TYPE_0" msgstr "" -#: readelf.c:17936 +#: readelf.c:18521 msgid "NT_GNU_BUILD_ATTRIBUTE_OPEN" msgstr "" -#: readelf.c:17938 +#: readelf.c:18523 msgid "NT_GNU_BUILD_ATTRIBUTE_FUNC" msgstr "" -#: readelf.c:18027 readelf.c:18127 readelf.c:18158 +#: readelf.c:18612 readelf.c:18743 readelf.c:18780 #, c-format msgid "" msgstr "" -#: readelf.c:18242 +#: readelf.c:18870 #, c-format msgid " Properties: " msgstr "" -#: readelf.c:18246 +#: readelf.c:18874 #, c-format msgid "\n" msgstr "" -#: readelf.c:18258 +#: readelf.c:18886 #, c-format msgid "\n" msgstr "" -#: readelf.c:18269 +#: readelf.c:18897 #, c-format msgid "\n" msgstr "" -#: readelf.c:18291 readelf.c:18345 +#: readelf.c:18919 readelf.c:18973 readelf.c:18995 #, c-format msgid "x86 ISA used: " msgstr "" -#: readelf.c:18302 readelf.c:18356 +#: readelf.c:18930 readelf.c:18984 readelf.c:19006 #, c-format msgid "x86 ISA needed: " msgstr "" -#: readelf.c:18313 +#: readelf.c:18941 #, c-format msgid "x86 feature: " msgstr "" -#: readelf.c:18324 +#: readelf.c:18952 #, c-format msgid "x86 feature used: " msgstr "" -#: readelf.c:18335 +#: readelf.c:18963 #, c-format msgid "x86 feature needed: " msgstr "" -#: readelf.c:18375 readelf.c:18389 readelf.c:18397 +#: readelf.c:19025 readelf.c:19039 readelf.c:19047 #, c-format msgid " " msgstr "" -#: readelf.c:18387 +#: readelf.c:19037 #, c-format msgid "stack size: " msgstr "" -#: readelf.c:18406 +#: readelf.c:19056 #, c-format msgid "\n" msgstr "" -#: readelf.c:18491 +#: readelf.c:19141 #, c-format msgid " OS: %s, ABI: %ld.%ld.%ld\n" msgstr "" -#: readelf.c:18500 +#: readelf.c:19150 #, c-format msgid " Version: " msgstr "" @@ -9930,490 +9929,490 @@ #. is a series of entries, where each entry is a single byte followed #. by a nul terminated string. The byte gives the bit number to test #. if enabled in the bitmask. -#: readelf.c:18516 +#: readelf.c:19166 #, c-format msgid " Hardware Capabilities: " msgstr "" -#: readelf.c:18519 +#: readelf.c:19169 msgid "\n" msgstr "" -#: readelf.c:18524 +#: readelf.c:19174 #, c-format msgid "num entries: %ld, enabled mask: %lx\n" msgstr "" -#: readelf.c:18540 +#: readelf.c:19190 #, c-format msgid " Description data: " msgstr "" -#: readelf.c:18558 +#: readelf.c:19208 msgid "Alignment of 8-byte objects" msgstr "" -#: readelf.c:18559 +#: readelf.c:19209 msgid "Sizeof double and long double" msgstr "" -#: readelf.c:18560 +#: readelf.c:19210 msgid "Type of FPU support needed" msgstr "" -#: readelf.c:18561 +#: readelf.c:19211 msgid "Use of SIMD instructions" msgstr "" -#: readelf.c:18562 +#: readelf.c:19212 msgid "Use of cache" msgstr "" -#: readelf.c:18563 +#: readelf.c:19213 msgid "Use of MMU" msgstr "" -#: readelf.c:18599 +#: readelf.c:19249 #, c-format msgid "4-bytes\n" msgstr "" -#: readelf.c:18600 +#: readelf.c:19250 #, c-format msgid "8-bytes\n" msgstr "" -#: readelf.c:18607 +#: readelf.c:19257 #, c-format msgid "FPU-2.0\n" msgstr "" -#: readelf.c:18608 +#: readelf.c:19258 #, c-format msgid "FPU-3.0\n" msgstr "" -#: readelf.c:18617 +#: readelf.c:19267 #, c-format msgid "yes\n" msgstr "" -#: readelf.c:18627 +#: readelf.c:19277 #, c-format msgid "unknown value: %x\n" msgstr "" -#: readelf.c:18685 +#: readelf.c:19335 msgid "NT_THRMISC (thrmisc structure)" msgstr "" -#: readelf.c:18687 +#: readelf.c:19337 msgid "NT_PROCSTAT_PROC (proc data)" msgstr "" -#: readelf.c:18689 +#: readelf.c:19339 msgid "NT_PROCSTAT_FILES (files data)" msgstr "" -#: readelf.c:18691 +#: readelf.c:19341 msgid "NT_PROCSTAT_VMMAP (vmmap data)" msgstr "" -#: readelf.c:18693 +#: readelf.c:19343 msgid "NT_PROCSTAT_GROUPS (groups data)" msgstr "" -#: readelf.c:18695 +#: readelf.c:19345 msgid "NT_PROCSTAT_UMASK (umask data)" msgstr "" -#: readelf.c:18697 +#: readelf.c:19347 msgid "NT_PROCSTAT_RLIMIT (rlimit data)" msgstr "" -#: readelf.c:18699 +#: readelf.c:19349 msgid "NT_PROCSTAT_OSREL (osreldate data)" msgstr "" -#: readelf.c:18701 +#: readelf.c:19351 msgid "NT_PROCSTAT_PSSTRINGS (ps_strings data)" msgstr "" -#: readelf.c:18703 +#: readelf.c:19353 msgid "NT_PROCSTAT_AUXV (auxv data)" msgstr "" -#: readelf.c:18705 +#: readelf.c:19355 msgid "NT_PTLWPINFO (ptrace_lwpinfo structure)" msgstr "" #. NetBSD core "procinfo" structure. -#: readelf.c:18719 +#: readelf.c:19369 msgid "NetBSD procinfo structure" msgstr "NetBSD procinfo 结构" -#: readelf.c:18723 +#: readelf.c:19373 msgid "NetBSD ELF auxiliary vector data" msgstr "" -#: readelf.c:18758 readelf.c:18775 readelf.c:18789 +#: readelf.c:19408 readelf.c:19425 readelf.c:19439 msgid "PT_GETREGS (reg structure)" msgstr "PT_GETREGS (reg 结构)" -#: readelf.c:18760 readelf.c:18777 readelf.c:18791 +#: readelf.c:19410 readelf.c:19427 readelf.c:19441 msgid "PT_GETFPREGS (fpreg structure)" msgstr "PT_GETFPREGS (fpreg 结构)" -#: readelf.c:18773 +#: readelf.c:19423 msgid "PT___GETREGS40 (old reg structure)" msgstr "" -#: readelf.c:18810 +#: readelf.c:19460 msgid "NT_STAPSDT (SystemTap probe descriptors)" msgstr "" -#: readelf.c:18878 +#: readelf.c:19528 #, c-format msgid " Provider: %s\n" msgstr "" -#: readelf.c:18879 +#: readelf.c:19529 #, c-format msgid " Name: %s\n" msgstr "" -#: readelf.c:18880 +#: readelf.c:19530 #, c-format msgid " Location: " msgstr "" -#: readelf.c:18882 +#: readelf.c:19532 #, c-format msgid ", Base: " msgstr "" -#: readelf.c:18884 +#: readelf.c:19534 #, c-format msgid ", Semaphore: " msgstr "" -#: readelf.c:18887 +#: readelf.c:19537 #, c-format msgid " Arguments: %s\n" msgstr "" -#: readelf.c:18892 +#: readelf.c:19542 #, c-format msgid " \n" msgstr "" -#: readelf.c:18893 +#: readelf.c:19543 msgid "corrupt stapdt note - the data size is too small\n" msgstr "" -#: readelf.c:18905 +#: readelf.c:19555 msgid "NT_VMS_MHD (module header)" msgstr "" -#: readelf.c:18907 +#: readelf.c:19557 msgid "NT_VMS_LNM (language name)" msgstr "" -#: readelf.c:18909 +#: readelf.c:19559 msgid "NT_VMS_SRC (source files)" msgstr "" -#: readelf.c:18913 +#: readelf.c:19563 msgid "NT_VMS_EIDC (consistency check)" msgstr "" -#: readelf.c:18915 +#: readelf.c:19565 msgid "NT_VMS_FPMODE (FP mode)" msgstr "" -#: readelf.c:18919 +#: readelf.c:19569 msgid "NT_VMS_IMGNAM (image name)" msgstr "" -#: readelf.c:18921 +#: readelf.c:19571 msgid "NT_VMS_IMGID (image id)" msgstr "" -#: readelf.c:18923 +#: readelf.c:19573 msgid "NT_VMS_LINKID (link id)" msgstr "" -#: readelf.c:18925 +#: readelf.c:19575 msgid "NT_VMS_IMGBID (build id)" msgstr "" -#: readelf.c:18927 +#: readelf.c:19577 msgid "NT_VMS_GSTNAM (sym table name)" msgstr "" -#: readelf.c:18954 +#: readelf.c:19604 #, c-format msgid " Creation date : %.17s\n" msgstr "" -#: readelf.c:18955 +#: readelf.c:19605 #, c-format msgid " Last patch date: %.17s\n" msgstr "" -#: readelf.c:18958 +#: readelf.c:19608 #, c-format msgid " Module name : %s\n" msgstr "" -#: readelf.c:18960 +#: readelf.c:19610 #, c-format msgid " Module version : %s\n" msgstr "" -#: readelf.c:18962 readelf.c:18967 +#: readelf.c:19612 readelf.c:19617 #, c-format msgid " Module version : \n" msgstr "" -#: readelf.c:18966 +#: readelf.c:19616 #, c-format msgid " Module name : \n" msgstr "" -#: readelf.c:18972 +#: readelf.c:19622 #, c-format msgid " Language: %.*s\n" msgstr "" -#: readelf.c:18977 +#: readelf.c:19627 #, c-format msgid " Floating Point mode: " msgstr "" -#: readelf.c:18987 +#: readelf.c:19637 #, c-format msgid " Link time: " msgstr "" -#: readelf.c:18998 +#: readelf.c:19648 #, c-format msgid " Patch time: " msgstr "" -#: readelf.c:19012 +#: readelf.c:19662 #, c-format msgid " Major id: %u, minor id: %u\n" msgstr "" -#: readelf.c:19015 +#: readelf.c:19665 #, c-format msgid " Last modified : " msgstr "" -#: readelf.c:19018 +#: readelf.c:19668 #, c-format msgid "" "\n" " Link flags : " msgstr "" -#: readelf.c:19021 +#: readelf.c:19671 #, c-format msgid " Header flags: 0x%08x\n" msgstr "" -#: readelf.c:19023 +#: readelf.c:19673 #, c-format msgid " Image id : %.*s\n" msgstr "" -#: readelf.c:19028 +#: readelf.c:19678 #, c-format msgid " Image name: %.*s\n" msgstr "" -#: readelf.c:19032 +#: readelf.c:19682 #, c-format msgid " Global symbol table name: %.*s\n" msgstr "" -#: readelf.c:19036 +#: readelf.c:19686 #, c-format msgid " Image id: %.*s\n" msgstr "" -#: readelf.c:19040 +#: readelf.c:19690 #, c-format msgid " Linker id: %.*s\n" msgstr "" -#: readelf.c:19050 +#: readelf.c:19700 #, c-format msgid " \n" msgstr "" -#: readelf.c:19051 +#: readelf.c:19701 msgid "corrupt IA64 note: data size is too small\n" msgstr "" -#: readelf.c:19218 readelf.c:19226 +#: readelf.c:19868 readelf.c:19876 #, c-format msgid " Applies to region from %#lx to %#lx\n" msgstr "" -#: readelf.c:19221 readelf.c:19228 +#: readelf.c:19871 readelf.c:19878 #, c-format msgid " Applies to region from %#lx\n" msgstr "" -#: readelf.c:19257 +#: readelf.c:19907 #, c-format msgid " \n" msgstr "" -#: readelf.c:19258 +#: readelf.c:19908 #, c-format msgid " " msgstr "" -#: readelf.c:19284 +#: readelf.c:19934 #, c-format msgid "Gap in build notes detected from %#lx to %#lx\n" msgstr "" -#: readelf.c:19287 readelf.c:19298 +#: readelf.c:19937 readelf.c:19948 #, c-format msgid " Applies to region from %#lx" msgstr "" -#: readelf.c:19292 readelf.c:19303 +#: readelf.c:19942 readelf.c:19953 #, c-format msgid " to %#lx" msgstr "" -#: readelf.c:19309 +#: readelf.c:19959 #, c-format msgid " (%s)" msgstr "" -#: readelf.c:19330 readelf.c:19345 +#: readelf.c:19980 readelf.c:19995 #, c-format msgid "corrupt name field in GNU build attribute note: size = %ld\n" msgstr "" -#: readelf.c:19331 readelf.c:19346 +#: readelf.c:19981 readelf.c:19996 msgid " " msgstr "" -#: readelf.c:19365 +#: readelf.c:20015 #, c-format msgid "unrecognised attribute type in name field: %d\n" msgstr "" -#: readelf.c:19366 +#: readelf.c:20016 msgid "" msgstr "" -#: readelf.c:19376 +#: readelf.c:20026 msgid "" msgstr "" -#: readelf.c:19381 +#: readelf.c:20031 msgid "" msgstr "" -#: readelf.c:19386 +#: readelf.c:20036 msgid "" msgstr "" -#: readelf.c:19391 +#: readelf.c:20041 msgid "" msgstr "" -#: readelf.c:19396 +#: readelf.c:20046 msgid "" msgstr "" -#: readelf.c:19401 +#: readelf.c:20051 msgid "" msgstr "" -#: readelf.c:19406 +#: readelf.c:20056 msgid "" msgstr "" -#: readelf.c:19411 +#: readelf.c:20061 msgid "" msgstr "" -#: readelf.c:19430 +#: readelf.c:20080 #, c-format msgid "unrecognised byte in name field: %d\n" msgstr "" -#: readelf.c:19431 +#: readelf.c:20081 #, c-format msgid "" msgstr "" -#: readelf.c:19443 +#: readelf.c:20093 #, c-format msgid "attribute does not have an expected type (%c)\n" msgstr "" -#: readelf.c:19447 +#: readelf.c:20097 #, c-format msgid "corrupt name field: namesz: %lu but parsing gets to %ld\n" msgstr "" -#: readelf.c:19474 +#: readelf.c:20124 #, c-format msgid "corrupt numeric name field: too many bytes in the value: %x\n" msgstr "" -#: readelf.c:19646 +#: readelf.c:20296 #, c-format msgid " description data: " msgstr "" -#: readelf.c:19688 +#: readelf.c:20338 msgid "notes" msgstr "注释" -#: readelf.c:19696 +#: readelf.c:20346 #, c-format msgid "" "\n" "Displaying notes found in: %s\n" msgstr "" -#: readelf.c:19698 +#: readelf.c:20348 #, c-format msgid "" "\n" "Displaying notes found at file offset 0x%08lx with length 0x%08lx:\n" msgstr "" -#: readelf.c:19710 +#: readelf.c:20360 #, c-format msgid "Corrupt note: alignment %ld, expecting 4 or 8\n" msgstr "" -#: readelf.c:19716 +#: readelf.c:20366 #, c-format msgid " %-20s %-10s\tDescription\n" msgstr "" -#: readelf.c:19716 +#: readelf.c:20366 msgid "Owner" msgstr "所有者" -#: readelf.c:19716 +#: readelf.c:20366 msgid "Data size" msgstr "" -#: readelf.c:19734 readelf.c:19763 +#: readelf.c:20384 readelf.c:20413 #, c-format msgid "Corrupt note: only %ld byte remains, not enough for a full note\n" msgid_plural "" @@ -10421,20 +10420,20 @@ msgstr[0] "" msgstr[1] "" -#: readelf.c:19791 +#: readelf.c:20441 #, c-format msgid "note with invalid namesz and/or descsz found at offset 0x%lx\n" msgstr "" -#: readelf.c:19811 +#: readelf.c:20461 msgid "Out of memory allocating space for inote name\n" msgstr "" -#: readelf.c:19871 +#: readelf.c:20521 msgid "v850 notes" msgstr "" -#: readelf.c:19878 +#: readelf.c:20528 #, c-format msgid "" "\n" @@ -10442,37 +10441,37 @@ "length 0x%lx:\n" msgstr "" -#: readelf.c:19895 +#: readelf.c:20545 #, c-format msgid "Corrupt note: name size is too big: %lx\n" msgstr "" -#: readelf.c:19905 +#: readelf.c:20555 #, c-format msgid "corrupt descsz found in note at offset 0x%lx\n" msgstr "" -#: readelf.c:19907 readelf.c:19920 +#: readelf.c:20557 readelf.c:20570 #, c-format msgid " type: 0x%lx, namesize: 0x%lx, descsize: 0x%lx\n" msgstr "" -#: readelf.c:19918 +#: readelf.c:20568 #, c-format msgid "corrupt namesz found in note at offset 0x%lx\n" msgstr "" -#: readelf.c:19996 +#: readelf.c:20646 #, c-format msgid "No note segments present in the core file.\n" msgstr "core 文件中没有注释段。\n" -#: readelf.c:20004 +#: readelf.c:20654 #, c-format msgid " Unknown GNU attribute: %s\n" msgstr "" -#: readelf.c:20148 +#: readelf.c:20802 msgid "" "This instance of readelf has been built without support for a\n" "64 bit data type and so it cannot read 64 bit ELF files.\n" @@ -10480,12 +10479,12 @@ "本 readelf 实例编译时未加入 64 位数据类型支持，\n" "因而无法读取 64 位 ELF 文件。\n" -#: readelf.c:20271 +#: readelf.c:20925 #, c-format msgid "%s: Failed to read file header\n" msgstr "%s：读取文件头失败\n" -#: readelf.c:20286 +#: readelf.c:20940 #, c-format msgid "" "\n" @@ -10494,27 +10493,27 @@ "\n" "文件：%s\n" -#: readelf.c:20476 +#: readelf.c:21133 #, c-format msgid "%s: unable to dump the index as none was found\n" msgstr "" -#: readelf.c:20483 +#: readelf.c:21140 #, c-format msgid "Index of archive %s: (%lu entries, 0x%lx bytes in the symbol table)\n" msgstr "" -#: readelf.c:20507 +#: readelf.c:21164 #, c-format msgid "Contents of binary %s at offset " msgstr "" -#: readelf.c:20519 +#: readelf.c:21176 #, c-format msgid "%s: end of the symbol table reached before the end of the index\n" msgstr "" -#: readelf.c:20538 +#: readelf.c:21195 #, c-format msgid "" "%s: %ld byte remains in the symbol table, but without corresponding entries " @@ -10525,36 +10524,36 @@ msgstr[0] "" msgstr[1] "" -#: readelf.c:20551 +#: readelf.c:21208 #, c-format msgid "%s: failed to seek back to start of object files in the archive\n" msgstr "" -#: readelf.c:20645 readelf.c:20761 +#: readelf.c:21302 readelf.c:21418 #, c-format msgid "Input file '%s' is not readable.\n" msgstr "" -#: readelf.c:20670 +#: readelf.c:21327 #, c-format msgid "%s: contains corrupt thin archive: %s\n" msgstr "" -#: readelf.c:20688 +#: readelf.c:21345 #, c-format msgid "%s: failed to seek to archive member.\n" msgstr "" -#: readelf.c:20753 +#: readelf.c:21410 msgid "Out of memory allocating file data structure\n" msgstr "" -#: readelf.c:20789 +#: readelf.c:21446 #, c-format msgid "File %s is not an archive so its index cannot be displayed.\n" msgstr "" -#: readelf.c:20862 +#: readelf.c:21519 msgid "Nothing to do.\n" msgstr "无事可做。\n" @@ -10564,12 +10563,12 @@ msgstr "%s：无法设置时间：%s" #. We have to clean up here. -#: rename.c:157 rename.c:195 +#: rename.c:195 rename.c:232 #, c-format msgid "unable to rename '%s'; reason: %s" msgstr "" -#: rename.c:203 +#: rename.c:240 #, c-format msgid "unable to copy file '%s'; reason: %s" msgstr "" @@ -11536,28 +11535,28 @@ msgid ": duplicate value\n" msgstr "：重复的值\n" -#: windres.c:556 +#: windres.c:558 #, c-format msgid "unknown format type `%s'" msgstr "未知的格式类型“%s”" -#: windres.c:557 +#: windres.c:559 #, c-format msgid "%s: supported formats:" msgstr "%s：支持的格式：" #. Otherwise, we give up. -#: windres.c:640 +#: windres.c:642 #, c-format msgid "can not determine type of file `%s'; use the -J option" msgstr "无法确定文件“%s”的类型；请使用 -J 选项" -#: windres.c:652 +#: windres.c:654 #, c-format msgid "Usage: %s [option(s)] [input-file] [output-file]\n" msgstr "用法：%s [选项] [输入文件] [输出文件]\n" -#: windres.c:654 +#: windres.c:656 #, c-format msgid "" " The options are:\n" @@ -11596,12 +11595,12 @@ " --use-temp-file 使用临时文件而非 popen 来读取预处理器输出\n" " --no-use-temp-file 使用 popen（默认）\n" -#: windres.c:672 +#: windres.c:674 #, c-format msgid " --yydebug Turn on parser debugging\n" msgstr " --yydebug 打开解析器调试\n" -#: windres.c:675 +#: windres.c:677 #, c-format msgid "" " -r Ignored for compatibility with rc\n" @@ -11614,7 +11613,7 @@ " -h --help 打印这份说明消息\n" " -V --version 打印版本信息\n" -#: windres.c:680 +#: windres.c:682 #, c-format msgid "" "FORMAT is one of rc, res, or coff, and is deduced from the file name\n" @@ -11625,26 +11624,26 @@ "单个文件名被认为是输入文件。没有输入文件时就使用标准输入，默认格式\n" "为 rc。没有输出文件时就使用标准输出，默认格式为 rc。\n" -#: windres.c:844 +#: windres.c:846 msgid "invalid codepage specified.\n" msgstr "指定了无效的代码页。\n" -#: windres.c:859 +#: windres.c:861 msgid "invalid option -f\n" msgstr "无效的选项“-f”\n" -#: windres.c:864 +#: windres.c:866 msgid "No filename following the -fo option.\n" msgstr "在选项 -fo 之后没有文件名。\n" -#: windres.c:953 +#: windres.c:961 #, c-format msgid "" "Option -I is deprecated for setting the input format, please use -J " "instead.\n" msgstr "选项 -I 用做设置输入格式已过时，请转而使用 -J。\n" -#: windres.c:1066 +#: windres.c:1074 msgid "no resources" msgstr "没有资源" diff -Nru language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/bison-gnulib.po language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/bison-gnulib.po --- language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/bison-gnulib.po 2020-07-10 08:58:49.000000000 +0000 +++ language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/bison-gnulib.po 2021-01-22 11:31:17.000000000 +0000 @@ -17,8 +17,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2020-07-09 20:16+0000\n" -"X-Generator: Launchpad (build 4809fcb62f445aaa3ae919f7f6c3cc7d156ea57a)\n" +"X-Launchpad-Export-Date: 2021-01-21 21:27+0000\n" +"X-Generator: Launchpad (build 2d1d5e352f0d063d660df2300e31f66bed027fa5)\n" "Language: zh_CN\n" "X-Bugs: Report translation errors to the Language-Team address.\n" diff -Nru language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/bison.po language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/bison.po --- language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/bison.po 2020-07-10 08:58:54.000000000 +0000 +++ language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/bison.po 2021-01-22 11:31:22.000000000 +0000 @@ -16,45 +16,45 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2020-07-09 16:56+0000\n" -"X-Generator: Launchpad (build 4809fcb62f445aaa3ae919f7f6c3cc7d156ea57a)\n" +"X-Launchpad-Export-Date: 2021-01-21 17:53+0000\n" +"X-Generator: Launchpad (build 2d1d5e352f0d063d660df2300e31f66bed027fa5)\n" "Language: zh_CN\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -#: src/complain.c:115 +#: src/complain.c:153 msgid "S/R conflicts (enabled by default)" msgstr "" -#: src/complain.c:116 +#: src/complain.c:154 msgid "R/R conflicts (enabled by default)" msgstr "" -#: src/complain.c:117 +#: src/complain.c:156 msgid "string aliases not attached to a symbol" msgstr "" -#: src/complain.c:118 +#: src/complain.c:157 msgid "obsolete constructs" msgstr "" -#: src/complain.c:119 +#: src/complain.c:158 #, c-format msgid "empty rules without %empty" msgstr "" -#: src/complain.c:120 +#: src/complain.c:159 msgid "unset or unused midrule values" msgstr "" -#: src/complain.c:121 +#: src/complain.c:160 msgid "useless precedence and associativity" msgstr "" -#: src/complain.c:122 +#: src/complain.c:161 msgid "incompatibilities with POSIX Yacc" msgstr "" -#: src/complain.c:123 +#: src/complain.c:162 msgid "all other warnings (enabled by default)" msgstr "" @@ -62,157 +62,157 @@ msgid "all the warnings except 'dangling-alias' and 'yacc'" msgstr "" -#: src/complain.c:125 +#: src/complain.c:164 msgid "turn off warnings in CATEGORY" msgstr "" -#: src/complain.c:126 +#: src/complain.c:165 msgid "turn off all the warnings" msgstr "" -#: src/complain.c:127 +#: src/complain.c:166 msgid "treat warnings as errors" msgstr "" -#: src/complain.c:152 +#: src/complain.c:192 msgid "Warning categories include:" msgstr "" -#: src/complain.c:257 +#: src/complain.c:297 msgid "warning" msgstr "警告" -#: src/complain.c:259 +#: src/complain.c:299 msgid "error" msgstr "错误" -#: src/complain.c:261 +#: src/complain.c:301 msgid "fatal error" msgstr "致命错误" -#: src/complain.c:545 +#: src/complain.c:594 #, c-format msgid "POSIX Yacc does not support %s" msgstr "" -#: src/complain.c:554 +#: src/complain.c:603 #, c-format msgid "deprecated directive: %s, use %s" msgstr "已弃用的指令：%s，应使用 %s" -#: src/complain.c:567 +#: src/complain.c:616 #, c-format msgid "duplicate directive" msgstr "" -#: src/complain.c:569 +#: src/complain.c:618 #, c-format msgid "duplicate directive: %s" msgstr "" -#: src/complain.c:570 src/complain.c:579 src/reader.c:133 src/symtab.c:317 -#: src/symtab.c:326 src/symtab.c:557 +#: src/complain.c:619 src/complain.c:628 src/reader.c:133 src/symtab.c:327 +#: src/symtab.c:336 src/symtab.c:566 msgid "previous declaration" msgstr "上次声明" -#: src/complain.c:578 +#: src/complain.c:627 #, c-format msgid "only one %s allowed per rule" msgstr "每个规则只允许一个 %s" -#: src/conflicts.c:81 +#: src/conflicts.c:88 #, c-format msgid "Conflict between rule %d and token %s resolved as shift" msgstr "" -#: src/conflicts.c:91 +#: src/conflicts.c:98 #, c-format msgid "Conflict between rule %d and token %s resolved as reduce" msgstr "" -#: src/conflicts.c:100 +#: src/conflicts.c:107 #, c-format msgid "Conflict between rule %d and token %s resolved as an error" msgstr "" -#: src/conflicts.c:602 +#: src/conflicts.c:610 #, c-format msgid "State %d " msgstr "状态 %d " -#: src/conflicts.c:605 +#: src/conflicts.c:613 #, c-format msgid "conflicts: %d shift/reduce, %d reduce/reduce\n" msgstr "冲突：%d 项偏移/归约，%d 项归约/归约\n" -#: src/conflicts.c:608 +#: src/conflicts.c:616 #, c-format msgid "conflicts: %d shift/reduce\n" msgstr "冲突：%d 项偏移/归约\n" -#: src/conflicts.c:610 +#: src/conflicts.c:618 #, c-format msgid "conflicts: %d reduce/reduce\n" msgstr "冲突：%d 项归约/归约\n" -#: src/conflicts.c:645 +#: src/conflicts.c:661 #, c-format msgid "shift/reduce conflicts for rule %d: %d found, %d expected" msgstr "" -#: src/conflicts.c:651 +#: src/conflicts.c:667 #, c-format msgid "reduce/reduce conflicts for rule %d: %d found, %d expected" msgstr "" -#: src/conflicts.c:669 +#: src/conflicts.c:685 #, c-format msgid "%%expect-rr applies only to GLR parsers" msgstr "%%expect-rr 只适合 GLR 解析器" -#: src/conflicts.c:686 +#: src/conflicts.c:705 #, c-format msgid "shift/reduce conflicts: %d found, %d expected" msgstr "偏移/归约冲突：找到 %d 项，预期为 %d 项" -#: src/conflicts.c:691 +#: src/conflicts.c:714 #, c-format msgid "%d shift/reduce conflict" msgid_plural "%d shift/reduce conflicts" msgstr[0] "%d 项偏移/归约冲突" -#: src/conflicts.c:708 +#: src/conflicts.c:734 #, c-format msgid "reduce/reduce conflicts: %d found, %d expected" msgstr "归约/归约冲突：找到 %d 项，预期为 %d 项" -#: src/conflicts.c:713 +#: src/conflicts.c:743 #, c-format msgid "%d reduce/reduce conflict" msgid_plural "%d reduce/reduce conflicts" msgstr[0] "%d 项归约/归约冲突" -#: src/files.c:124 +#: src/files.c:139 #, c-format msgid "%s: cannot open" msgstr "%s：无法打开" -#: src/files.c:140 +#: src/files.c:155 #, c-format msgid "input/output error" msgstr "输入/输出错误" -#: src/files.c:143 +#: src/files.c:158 #, c-format msgid "cannot close file" msgstr "无法关闭文件" -#: src/files.c:374 +#: src/files.c:456 #, c-format msgid "refusing to overwrite the input file %s" msgstr "拒绝覆盖输入文件 %s" -#: src/files.c:382 +#: src/files.c:464 #, c-format msgid "conflicting outputs to file %s" msgstr "到文件 %s 的输出冲突" @@ -256,77 +256,77 @@ msgid "describe shift/reduce conflicts solving" msgstr "" -#: src/getargs.c:213 +#: src/getargs.c:214 msgid "include all the above information" msgstr "" -#: src/getargs.c:214 +#: src/getargs.c:215 msgid "disable the report" msgstr "" #. TRANSLATORS: Use the same translation for THINGS as in the #. --report=THINGS help message. -#: src/getargs.c:235 +#: src/getargs.c:238 msgid "THINGS is a list of comma separated words that can include:" msgstr "" -#: src/getargs.c:296 +#: src/getargs.c:301 msgid "TRACES is a list of comma separated words that can include:" msgstr "" -#: src/getargs.c:308 +#: src/getargs.c:313 msgid "show errors with carets" msgstr "" -#: src/getargs.c:309 +#: src/getargs.c:314 msgid "show machine-readable fixes" msgstr "" -#: src/getargs.c:310 +#: src/getargs.c:315 msgid "do not generate any file" msgstr "" -#: src/getargs.c:311 +#: src/getargs.c:316 msgid "all of the above" msgstr "" -#: src/getargs.c:312 +#: src/getargs.c:317 msgid "disable all of the above" msgstr "" #. TRANSLATORS: Use the same translation for FEATURES as in the #. --feature=FEATURES help message. -#: src/getargs.c:334 +#: src/getargs.c:339 msgid "FEATURES is a list of comma separated words that can include:" msgstr "" -#: src/getargs.c:348 +#: src/getargs.c:354 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "请尝试运行 %s --help 来获取更多信息。\n" -#: src/getargs.c:357 +#: src/getargs.c:363 #, c-format msgid "Usage: %s [OPTION]... FILE\n" msgstr "用法：%s [选项]... 文件\n" -#: src/getargs.c:358 +#: src/getargs.c:364 msgid "" "Generate a deterministic LR or generalized LR (GLR) parser employing\n" "LALR(1), IELR(1), or canonical LR(1) parser tables.\n" "\n" msgstr "" -#: src/getargs.c:364 +#: src/getargs.c:370 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "长选项的强制参数对短选项也是强制的。\n" -#: src/getargs.c:367 +#: src/getargs.c:373 msgid "The same is true for optional arguments.\n" msgstr "可选项也是如此。\n" -#: src/getargs.c:372 +#: src/getargs.c:378 msgid "" "Operation Modes:\n" " -h, --help display this help and exit\n" @@ -342,7 +342,7 @@ "\n" msgstr "" -#: src/getargs.c:388 +#: src/getargs.c:394 msgid "" "Diagnostics:\n" " -W, --warnings[=CATEGORY] report the warnings falling in CATEGORY\n" @@ -351,7 +351,7 @@ "\n" msgstr "" -#: src/getargs.c:402 +#: src/getargs.c:408 #, c-format msgid "" "Tuning the Parser:\n" @@ -384,17 +384,17 @@ " -x, --xml[=FILE] also output an XML report of the automaton\n" msgstr "" -#: src/getargs.c:438 +#: src/getargs.c:446 #, c-format msgid "Report bugs to <%s>.\n" msgstr "将错误通报给 <%s>。\n" -#: src/getargs.c:439 +#: src/getargs.c:447 #, c-format msgid "%s home page: <%s>.\n" msgstr "%s 首页：<%s>。\n" -#: src/getargs.c:440 +#: src/getargs.c:448 msgid "General help using GNU software: .\n" msgstr "使用 GNU 软件的一般说明：。\n" @@ -403,29 +403,29 @@ #. form one of the URLs at http://translationproject.org/team/. #. Otherwise, replace the entire URL with your translation team's #. email address. -#: src/getargs.c:455 +#: src/getargs.c:463 msgid "Report translation bugs to .\n" msgstr "报告翻译错误给 。\n" -#: src/getargs.c:458 +#: src/getargs.c:466 msgid "For complete documentation, run: info bison.\n" msgstr "要取得完整文档请运行：info bison。\n" -#: src/getargs.c:474 +#: src/getargs.c:482 #, c-format msgid "bison (GNU Bison) %s" msgstr "bison (GNU Bison) %s" -#: src/getargs.c:476 +#: src/getargs.c:484 msgid "Written by Robert Corbett and Richard Stallman.\n" msgstr "由 Robert Corbett 和 Richard Stallman 编写。\n" -#: src/getargs.c:480 +#: src/getargs.c:488 #, c-format msgid "Copyright (C) %d Free Software Foundation, Inc.\n" msgstr "版权所有 (C) %d Free Software Foundation, Inc.\n" -#: src/getargs.c:483 +#: src/getargs.c:491 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" @@ -433,36 +433,36 @@ "这是自由软件；请参考源代码的版权声明。本软件不提供任何保证，甚至不会包括\n" "可售性或适用于任何特定目的的保证。\n" -#: src/getargs.c:505 +#: src/getargs.c:513 #, c-format msgid "multiple skeleton declarations are invalid" msgstr "多重架构声明无效" -#: src/getargs.c:522 +#: src/getargs.c:530 #, c-format msgid "%s: invalid language" msgstr "%s：无效的语言" -#: src/getargs.c:525 +#: src/getargs.c:533 msgid "multiple language declarations are invalid" msgstr "多语言声明是无效的" -#: src/getargs.c:818 +#: src/getargs.c:844 #, c-format msgid "deprecated option: %s, use %s" msgstr "" -#: src/getargs.c:852 +#: src/getargs.c:878 #, c-format msgid "missing operand" msgstr "" -#: src/getargs.c:854 +#: src/getargs.c:880 #, c-format msgid "extra operand %s" msgstr "额外算子 %s" -#: src/gram.c:218 +#: src/gram.c:208 msgid "Grammar" msgstr "语法" @@ -479,17 +479,17 @@ "// 主页：<%s>。\n" "\n" -#: src/location.c:150 src/scan-gram.l:945 +#: src/location.c:138 src/scan-gram.l:957 #, c-format msgid "line number overflow" msgstr "行号溢出" -#: src/location.c:152 +#: src/location.c:140 #, c-format msgid "column number overflow" msgstr "列号溢出" -#: src/location.c:155 +#: src/location.c:143 #, c-format msgid "byte number overflow" msgstr "" @@ -499,143 +499,143 @@ #. language, remembering that "…" (U+2026 HORIZONTAL ELLIPSIS) #. sometimes misdisplays and that "..." (three ASCII periods) is a #. safer choice in some locales. -#: src/location.c:252 +#: src/location.c:242 msgid "..." msgstr "" -#: src/main.c:155 +#: src/main.c:162 msgid "rule useless in parser due to conflicts" msgstr "由于冲突，解析器中的规则不起作用" -#: src/main.c:245 +#: src/main.c:256 #, c-format msgid "fix-its can be applied. Rerun with option '--update'." msgstr "" -#: src/muscle-tab.c:530 +#: src/muscle-tab.c:527 #, c-format msgid "%%define variable %s redefined" msgstr "%%define 变量 %s 被重新定义" -#: src/muscle-tab.c:533 src/symtab.c:337 +#: src/muscle-tab.c:530 src/symtab.c:347 msgid "previous definition" msgstr "上次定义" -#: src/muscle-tab.c:592 src/muscle-tab.c:693 src/muscle-tab.c:752 +#: src/muscle-tab.c:589 src/muscle-tab.c:690 src/muscle-tab.c:749 #, c-format msgid "%s: undefined %%define variable %s" msgstr "%s：未定义的 %%define 变量 %s" -#: src/muscle-tab.c:626 +#: src/muscle-tab.c:623 #, c-format msgid "%%define variable '%s' requires '{...}' values" msgstr "" -#: src/muscle-tab.c:631 +#: src/muscle-tab.c:628 #, c-format msgid "%%define variable '%s' requires keyword values" msgstr "" -#: src/muscle-tab.c:636 +#: src/muscle-tab.c:633 #, c-format msgid "%%define variable '%s' requires '\"...\"' values" msgstr "" -#: src/muscle-tab.c:687 +#: src/muscle-tab.c:684 #, c-format msgid "invalid value for %%define Boolean variable %s" msgstr "无效的值用于 %%define 布尔变量 %s" -#: src/muscle-tab.c:740 +#: src/muscle-tab.c:737 #, c-format msgid "invalid value for %%define variable %s: %s" msgstr "无效的值用于 %%define 变量 %s：%s" -#: src/muscle-tab.c:744 +#: src/muscle-tab.c:741 #, c-format msgid "accepted value: %s" msgstr "被接受的值：%s" -#: src/parse-gram.y:753 +#: src/parse-gram.y:773 #, c-format msgid "character literals cannot be nonterminals" msgstr "" -#: src/parse-gram.y:759 +#: src/parse-gram.y:779 #, c-format msgid "character literals cannot be used together with %s" msgstr "" -#: src/parse-gram.y:762 +#: src/parse-gram.y:782 #, c-format msgid "definition of %s" msgstr "" -#: src/parse-gram.y:913 +#: src/parse-gram.y:933 #, c-format msgid "missing identifier in parameter declaration" msgstr "参数声明中缺少识别符" -#: src/parse-gram.y:1042 +#: src/parse-gram.y:1052 #, c-format msgid "invalid version requirement: %s" msgstr "" -#: src/parse-gram.y:1056 +#: src/parse-gram.y:1063 #, c-format msgid "require bison %s, but have %s" msgstr "" -#: src/print-graph.c:62 src/print.c:345 +#: src/print-graph.c:62 src/print.c:350 #, c-format msgid "State %d" msgstr "状态 %d" -#: src/print.c:136 +#: src/print.c:141 #, c-format msgid "shift, and go to state %d\n" msgstr "偏移，并进入状态 %d\n" -#: src/print.c:138 +#: src/print.c:143 #, c-format msgid "go to state %d\n" msgstr "转到状态 %d\n" -#: src/print.c:173 +#: src/print.c:178 msgid "error (nonassociative)\n" msgstr "错误 (非相联的)\n" -#: src/print.c:195 +#: src/print.c:200 #, c-format msgid "reduce using rule %d (%s)" msgstr "使用规则 %d 以归约 (%s)" -#: src/print.c:198 +#: src/print.c:203 #, c-format msgid "accept" msgstr "接受" -#: src/print.c:235 src/print.c:309 +#: src/print.c:240 src/print.c:314 msgid "$default" msgstr "$default" -#: src/print.c:364 +#: src/print.c:376 msgid "Terminals, with rules where they appear" msgstr "终结语词，附有它们出现处的规则" -#: src/print.c:391 +#: src/print.c:403 msgid "Nonterminals, with rules where they appear" msgstr "非终结语词，附有它们出现处的规则" -#: src/print.c:416 +#: src/print.c:429 msgid "on left:" msgstr "" -#: src/print.c:425 +#: src/print.c:438 msgid "on right:" msgstr "" -#: src/print.c:447 +#: src/print.c:460 msgid "Rules useless in parser due to conflicts" msgstr "由于冲突，解析器中的规则不起作用" @@ -719,7 +719,7 @@ msgid "rule is too long" msgstr "规则过长" -#: src/reader.c:776 +#: src/reader.c:775 #, c-format msgid "no rules in the input grammar" msgstr "输入语法中没有规则" @@ -792,7 +792,7 @@ msgid ", cannot be accessed from midrule action at $%d" msgstr "" -#: src/scan-code.l:422 src/scan-gram.l:867 +#: src/scan-code.l:422 src/scan-gram.l:879 #, c-format msgid "integer out of range: %s" msgstr "整数超出范围：%s" @@ -877,124 +877,124 @@ msgid "invalid null character" msgstr "无效的空字符" -#: src/scan-gram.l:462 +#: src/scan-gram.l:463 #, c-format msgid "unexpected identifier in bracketed name: %s" msgstr "中括号内未预期的识别名称：%s" -#: src/scan-gram.l:486 +#: src/scan-gram.l:487 #, c-format msgid "an identifier expected" msgstr "应有一个标识符" -#: src/scan-gram.l:493 +#: src/scan-gram.l:494 msgid "invalid character in bracketed name" msgid_plural "invalid characters in bracketed name" msgstr[0] "中括号内无效字符" -#: src/scan-gram.l:565 src/scan-gram.l:579 +#: src/scan-gram.l:567 src/scan-gram.l:582 #, c-format msgid "POSIX Yacc does not support string literals" msgstr "" -#: src/scan-gram.l:601 +#: src/scan-gram.l:605 #, c-format msgid "empty character literal" msgstr "空的字符实字" -#: src/scan-gram.l:607 +#: src/scan-gram.l:611 #, c-format msgid "extra characters in character literal" msgstr "额外字符于字符实字" -#: src/scan-gram.l:95 +#: src/scan-gram.l:94 #, c-format msgid "invalid number after \\-escape: %s" msgstr "无效数字于 \\-转义之后：%s" -#: src/scan-gram.l:687 +#: src/scan-gram.l:690 #, c-format msgid "invalid character after \\-escape: %s" msgstr "\\-转义符号之后的无效字符：%s" -#: src/scan-gram.l:860 +#: src/scan-gram.l:872 #, c-format msgid "POSIX Yacc does not support hexadecimal literals" msgstr "" -#: src/scan-gram.l:998 +#: src/scan-gram.l:1010 #, c-format msgid "missing %s at end of file" msgstr "于文件结尾缺少 %s" -#: src/scan-gram.l:1009 +#: src/scan-gram.l:1021 #, c-format msgid "missing %s at end of line" msgstr "于列尾缺少 %s" -#: src/scan-skel.l:140 +#: src/scan-skel.l:141 #, c-format msgid "unclosed %s directive in skeleton" msgstr "在架构中有未关闭的 %s 指令" -#: src/scan-skel.l:251 +#: src/scan-skel.l:252 #, c-format msgid "too few arguments for %s directive in skeleton" msgstr "在架构中的 %s 指令参数太少" -#: src/scan-skel.l:258 +#: src/scan-skel.l:259 #, c-format msgid "too many arguments for %s directive in skeleton" msgstr "在架构中的 %s 指令参数太多" -#: src/symtab.c:124 +#: src/symtab.c:131 #, c-format msgid "POSIX Yacc forbids dashes in symbol names: %s" msgstr "POSIX Yacc 禁止符号名中有破折号：%s" -#: src/symtab.c:135 +#: src/symtab.c:142 #, c-format msgid "too many symbols in input grammar (limit is %d)" msgstr "输入语法中的符号过多(限制为 %d)" -#: src/symtab.c:316 +#: src/symtab.c:326 #, c-format msgid "%s redeclaration for %s" msgstr "%s 重复声明了 %s" -#: src/symtab.c:325 +#: src/symtab.c:335 #, c-format msgid "%s redeclaration for <%s>" msgstr "%s 重复声明了 <%s>" -#: src/symtab.c:334 +#: src/symtab.c:344 #, c-format msgid "symbol %s redeclared as a token" msgstr "" -#: src/symtab.c:335 +#: src/symtab.c:345 #, c-format msgid "symbol %s redeclared as a nonterminal" msgstr "" -#: src/symtab.c:375 +#: src/symtab.c:385 #, c-format msgid "" "symbol %s is used, but is not defined as a token and has no rules; did you " "mean %s?" msgstr "" -#: src/symtab.c:385 +#: src/symtab.c:395 #, c-format msgid "symbol %s is used, but is not defined as a token and has no rules" msgstr "符号 %s 已使用过，但是并未定义为字组也没有规则" -#: src/symtab.c:521 +#: src/symtab.c:534 #, c-format msgid "POSIX yacc reserves %%type to nonterminals" msgstr "" -#: src/symtab.c:555 +#: src/symtab.c:564 #, c-format msgid "symbol %s redeclared" msgstr "符号 %s 重复声明" @@ -1014,32 +1014,32 @@ msgid "user token number of %s too large" msgstr "" -#: src/symtab.c:624 +#: src/symtab.c:631 #, c-format msgid "string literal %s not attached to a symbol" msgstr "" -#: src/symtab.c:652 +#: src/symtab.c:659 #, c-format msgid "useless %s for type <%s>" msgstr "%s 对于类型 <%s> 无作用" -#: src/symtab.c:657 +#: src/symtab.c:664 #, c-format msgid "type <%s> is used, but is not associated to any symbol" msgstr "类型 <%s> 已使用过，但是并未与任何符号相关联" -#: src/symtab.c:702 +#: src/symtab.c:709 #, c-format msgid "nonterminals cannot be given a string alias" msgstr "" -#: src/symtab.c:705 +#: src/symtab.c:712 #, c-format msgid "symbol %s used more than once as a literal string" msgstr "符号 %s 超过一次使用为实字字串" -#: src/symtab.c:708 +#: src/symtab.c:715 #, c-format msgid "symbol %s given more than one literal string" msgstr "符号 %s 给定了超过一个实字字串" @@ -1049,37 +1049,37 @@ msgid "user token number %d redeclaration for %s" msgstr "用户字组数字 %d 被重复声明为 %s" -#: src/symtab.c:745 +#: src/symtab.c:752 #, c-format msgid "previous declaration for %s" msgstr "%s 的前一个声明" -#: src/symtab.c:1078 +#: src/symtab.c:1080 #, c-format msgid "token number too large" msgstr "" -#: src/symtab.c:1149 +#: src/symtab.c:1151 #, c-format msgid "the start symbol %s is undefined" msgstr "起始符号 %s 未定义" -#: src/symtab.c:1153 +#: src/symtab.c:1155 #, c-format msgid "the start symbol %s is a token" msgstr "起始符号 %s 是一项字组" -#: src/symtab.c:1336 +#: src/symtab.c:1338 #, c-format msgid "useless precedence and associativity for %s" msgstr "对于 %s 无作用的优先性与顺序关联性" -#: src/symtab.c:1339 +#: src/symtab.c:1341 #, c-format msgid "useless precedence for %s" msgstr "对于 %s 无作用的优先性" -#: src/symtab.c:1343 +#: src/symtab.c:1345 #, c-format msgid "useless associativity for %s, use %%precedence" msgstr "对于 %s 无作用的顺序关联性，使用 %%precedence" diff -Nru language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/bison-runtime.po language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/bison-runtime.po --- language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/bison-runtime.po 2020-07-10 08:58:51.000000000 +0000 +++ language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/bison-runtime.po 2021-01-22 11:31:19.000000000 +0000 @@ -15,59 +15,59 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2020-07-09 16:56+0000\n" -"X-Generator: Launchpad (build 4809fcb62f445aaa3ae919f7f6c3cc7d156ea57a)\n" +"X-Launchpad-Export-Date: 2021-01-21 17:53+0000\n" +"X-Generator: Launchpad (build 2d1d5e352f0d063d660df2300e31f66bed027fa5)\n" "Language: zh_CN\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -#: data/skeletons/glr.c:893 data/skeletons/yacc.c:706 +#: data/skeletons/glr.c:895 data/skeletons/yacc.c:690 msgid "syntax error: cannot back up" msgstr "语法错误：无法回溯" -#: data/skeletons/glr.c:1808 +#: data/skeletons/glr.c:1810 msgid "syntax is ambiguous" msgstr "语法含糊" -#: data/skeletons/glr.c:2220 data/skeletons/glr.c:2246 -#: data/skeletons/glr.c:2299 data/skeletons/glr.c:2539 -#: data/skeletons/lalr1.cc:1047 data/skeletons/lalr1.cc:1544 -#: data/skeletons/yacc.c:1379 data/skeletons/yacc.c:1897 -#: data/skeletons/yacc.c:1901 +#: data/skeletons/glr.c:2222 data/skeletons/glr.c:2248 +#: data/skeletons/glr.c:2301 data/skeletons/glr.c:2541 +#: data/skeletons/lalr1.cc:1046 data/skeletons/lalr1.cc:1543 +#: data/skeletons/yacc.c:1364 data/skeletons/yacc.c:1899 +#: data/skeletons/yacc.c:1903 msgid "syntax error" msgstr "语法错误" -#: data/skeletons/glr.c:2247 data/skeletons/lalr1.cc:1545 -#: data/skeletons/yacc.c:1380 +#: data/skeletons/glr.c:2249 data/skeletons/lalr1.cc:1544 +#: data/skeletons/yacc.c:1365 #, c-format msgid "syntax error, unexpected %s" msgstr "语法错误，非预期的 %s" -#: data/skeletons/glr.c:2248 data/skeletons/lalr1.cc:1546 -#: data/skeletons/yacc.c:1381 +#: data/skeletons/glr.c:2250 data/skeletons/lalr1.cc:1545 +#: data/skeletons/yacc.c:1366 #, c-format msgid "syntax error, unexpected %s, expecting %s" msgstr "语法错误，非预期的 %s，需要 %s" -#: data/skeletons/glr.c:2249 data/skeletons/lalr1.cc:1547 -#: data/skeletons/yacc.c:1382 +#: data/skeletons/glr.c:2251 data/skeletons/lalr1.cc:1546 +#: data/skeletons/yacc.c:1367 #, c-format msgid "syntax error, unexpected %s, expecting %s or %s" msgstr "语法错误，非预期的 %s，需要 %s 或 %s" -#: data/skeletons/glr.c:2250 data/skeletons/lalr1.cc:1548 -#: data/skeletons/yacc.c:1383 +#: data/skeletons/glr.c:2252 data/skeletons/lalr1.cc:1547 +#: data/skeletons/yacc.c:1368 #, c-format msgid "syntax error, unexpected %s, expecting %s or %s or %s" msgstr "语法错误，非预期的 %s，需要 %s，%s 或 %s" -#: data/skeletons/glr.c:2251 data/skeletons/lalr1.cc:1549 -#: data/skeletons/yacc.c:1384 +#: data/skeletons/glr.c:2253 data/skeletons/lalr1.cc:1548 +#: data/skeletons/yacc.c:1369 #, c-format msgid "syntax error, unexpected %s, expecting %s or %s or %s or %s" msgstr "语法错误，非预期的 %s，需要 %s，%s，%s 或 %s" -#: data/skeletons/glr.c:2598 data/skeletons/yacc.c:1463 -#: data/skeletons/yacc.c:1465 data/skeletons/yacc.c:1640 -#: data/skeletons/yacc.c:2049 +#: data/skeletons/glr.c:2600 data/skeletons/yacc.c:1437 +#: data/skeletons/yacc.c:1439 data/skeletons/yacc.c:1642 +#: data/skeletons/yacc.c:2051 msgid "memory exhausted" msgstr "内存耗尽" diff -Nru language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/bootloader.po language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/bootloader.po --- language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/bootloader.po 2020-07-10 08:58:46.000000000 +0000 +++ language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/bootloader.po 2021-01-22 11:31: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: 2020-07-09 18:22+0000\n" -"X-Generator: Launchpad (build 4809fcb62f445aaa3ae919f7f6c3cc7d156ea57a)\n" +"X-Launchpad-Export-Date: 2021-01-21 19:24+0000\n" +"X-Generator: Launchpad (build 2d1d5e352f0d063d660df2300e31f66bed027fa5)\n" "Language: zh_CN\n" #. ok button label diff -Nru language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/byobu.po language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/byobu.po --- language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/byobu.po 2020-07-10 08:58:56.000000000 +0000 +++ language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/byobu.po 2021-01-22 11:31: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: 2020-07-09 19:07+0000\n" -"X-Generator: Launchpad (build 4809fcb62f445aaa3ae919f7f6c3cc7d156ea57a)\n" +"X-Launchpad-Export-Date: 2021-01-21 20:10+0000\n" +"X-Generator: Launchpad (build 2d1d5e352f0d063d660df2300e31f66bed027fa5)\n" #: bin/menu:34 byobu-config:129 byobu-config:401 byobu-config:409 msgid "Menu" diff -Nru language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/bzr.po language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/bzr.po --- language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/bzr.po 2020-07-10 08:58:57.000000000 +0000 +++ language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/bzr.po 2021-01-22 11:31:25.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: 2020-07-09 18:14+0000\n" -"X-Generator: Launchpad (build 4809fcb62f445aaa3ae919f7f6c3cc7d156ea57a)\n" +"X-Launchpad-Export-Date: 2021-01-21 19:16+0000\n" +"X-Generator: Launchpad (build 2d1d5e352f0d063d660df2300e31f66bed027fa5)\n" #: bzrlib/add.py:93 msgid "skipping {0} (larger than {1} of {2} bytes)" diff -Nru language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/cinder.po language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/cinder.po --- language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/cinder.po 2020-07-10 08:58:53.000000000 +0000 +++ language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/cinder.po 2021-01-22 11:31:20.000000000 +0000 @@ -20,14 +20,14 @@ "Project-Id-Version: cinder 9.0.0.0rc2.dev243\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n" "POT-Creation-Date: 2016-04-27 07:15+0000\n" -"PO-Revision-Date: 2020-06-02 19:32+0000\n" +"PO-Revision-Date: 2021-01-19 21:42+0000\n" "Last-Translator: Eric Lei \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: 2020-07-09 19:37+0000\n" -"X-Generator: Launchpad (build 4809fcb62f445aaa3ae919f7f6c3cc7d156ea57a)\n" +"X-Launchpad-Export-Date: 2021-01-21 20:43+0000\n" +"X-Generator: Launchpad (build 2d1d5e352f0d063d660df2300e31f66bed027fa5)\n" "Language: zh-CN\n" "Generated-By: Babel 2.0\n" diff -Nru language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/colord.po language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/colord.po --- language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/colord.po 2020-07-10 08:58:57.000000000 +0000 +++ language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/colord.po 2021-01-22 11:31:26.000000000 +0000 @@ -22,8 +22,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2020-07-09 19:29+0000\n" -"X-Generator: Launchpad (build 4809fcb62f445aaa3ae919f7f6c3cc7d156ea57a)\n" +"X-Launchpad-Export-Date: 2021-01-21 20:35+0000\n" +"X-Generator: Launchpad (build 2d1d5e352f0d063d660df2300e31f66bed027fa5)\n" "Language: zh_CN\n" #. TRANSLATORS: command line option diff -Nru language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/command-not-found.po language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/command-not-found.po --- language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/command-not-found.po 2020-07-10 08:58:49.000000000 +0000 +++ language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/command-not-found.po 2021-01-22 11:31:17.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: command-not-found\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2020-04-07 07:17+0000\n" +"POT-Creation-Date: 2020-08-26 15:05+0000\n" "PO-Revision-Date: 2009-10-26 08:37+0000\n" "Last-Translator: Kyle WANG \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: 2020-07-09 18:28+0000\n" -"X-Generator: Launchpad (build 4809fcb62f445aaa3ae919f7f6c3cc7d156ea57a)\n" +"X-Launchpad-Export-Date: 2021-01-21 19:29+0000\n" +"X-Generator: Launchpad (build 2d1d5e352f0d063d660df2300e31f66bed027fa5)\n" #: ../CommandNotFound/CommandNotFound.py:156 msgid "Do you want to install it? (N/y)" diff -Nru language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/coreutils.po language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/coreutils.po --- language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/coreutils.po 2020-07-10 08:58:50.000000000 +0000 +++ language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/coreutils.po 2021-01-22 11:31:18.000000000 +0000 @@ -21,22 +21,22 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2020-07-09 17:00+0000\n" -"X-Generator: Launchpad (build 4809fcb62f445aaa3ae919f7f6c3cc7d156ea57a)\n" +"X-Launchpad-Export-Date: 2021-01-21 17:57+0000\n" +"X-Generator: Launchpad (build 2d1d5e352f0d063d660df2300e31f66bed027fa5)\n" "Language: zh_CN\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -#: lib/argmatch.c:134 +#: lib/argmatch.c:132 #, c-format msgid "invalid argument %s for %s" msgstr "%2$s 的参数%1$s 无效" -#: lib/argmatch.c:135 +#: lib/argmatch.c:133 #, c-format msgid "ambiguous argument %s for %s" msgstr "%2$s 的参数%1$s 不明确" -#: lib/argmatch.c:154 +#: lib/argmatch.c:152 lib/argmatch.h:223 msgid "Valid arguments are:" msgstr "有效的参数为：" @@ -44,18 +44,19 @@ msgid "error closing file" msgstr "关闭文件时出错" -#: lib/closeout.c:122 src/base64.c:139 src/base64.c:151 src/base64.c:157 -#: src/base64.c:198 src/base64.c:255 src/cat.c:187 src/cat.c:203 src/cat.c:287 -#: src/cksum.c:251 src/expand.c:150 src/expand.c:175 src/factor.c:2387 -#: src/mktemp.c:339 src/od.c:968 src/paste.c:163 src/seq.c:287 src/shuf.c:590 -#: src/split.c:935 src/split.c:1189 src/split.c:1194 src/tail.c:1267 -#: src/tail.c:1421 src/tail.c:2483 src/tr.c:1587 src/tr.c:1813 src/tr.c:1905 -#: src/unexpand.c:234 src/unexpand.c:250 +#: lib/closeout.c:122 src/basenc.c:945 src/basenc.c:957 src/basenc.c:963 +#: src/basenc.c:1006 src/basenc.c:1071 src/cat.c:187 src/cat.c:203 +#: src/cat.c:287 src/cksum.c:245 src/expand.c:150 src/expand.c:175 +#: src/factor.c:2387 src/mktemp.c:339 src/od.c:970 src/paste.c:163 +#: src/seq.c:295 src/shuf.c:595 src/split.c:936 src/split.c:1190 +#: src/split.c:1195 src/tail.c:1291 src/tail.c:1445 src/tail.c:2507 +#: src/tr.c:1587 src/tr.c:1813 src/tr.c:1905 src/unexpand.c:234 +#: src/unexpand.c:250 #, c-format msgid "write error" msgstr "写入错误" -#: lib/copy-acl.c:54 src/copy.c:1393 src/copy.c:2908 +#: lib/copy-acl.c:54 src/copy.c:1427 src/copy.c:2945 #, c-format msgid "preserving permissions for %s" msgstr "%s 的保留权限" @@ -271,12 +272,12 @@ msgid "%s: option requires an argument -- '%c'\n" msgstr "%s：选项必须带参数 -- \"%c\"\n" -#: lib/mkdir-p.c:179 src/install.c:512 +#: lib/mkdir-p.c:190 src/install.c:512 #, c-format msgid "cannot change permissions of %s" msgstr "无法更改 %s 的权限" -#: lib/mkdir-p.c:189 src/copy.c:2523 src/install.c:740 src/install.c:753 +#: lib/mkdir-p.c:200 src/copy.c:2560 src/install.c:740 src/install.c:753 #, c-format msgid "cannot create directory %s" msgstr "无法创建目录 %s" @@ -331,8 +332,8 @@ msgid "%s: end of file" msgstr "%s：文件结束" -#: lib/randread.c:128 src/du.c:1073 src/md5sum.c:803 src/od.c:952 src/tac.c:251 -#: src/tac.c:357 src/tac.c:515 src/tac.c:596 src/wc.c:803 +#: lib/randread.c:128 src/du.c:1074 src/md5sum.c:803 src/od.c:954 src/tac.c:251 +#: src/tac.c:357 src/tac.c:515 src/tac.c:596 src/wc.c:824 #, c-format msgid "%s: read error" msgstr "%s：读取出错" @@ -405,7 +406,7 @@ msgid "Unmatched ) or \\)" msgstr "未匹配的 ) 或 \\)" -#: lib/regcomp.c:689 +#: lib/regcomp.c:676 msgid "No previous regular expression" msgstr "缺少之前的正则表达式" @@ -444,10 +445,10 @@ msgid "^[nN]" msgstr "^[nN]" -#: lib/set-acl.c:46 src/copy.c:2546 src/cp.c:514 +#: lib/set-acl.c:46 src/copy.c:2583 src/cp.c:514 #, c-format msgid "setting permissions for %s" -msgstr "设置%s 的权限" +msgstr "设置 %s 的权限" #: lib/siglist.h:31 msgid "Hangup" @@ -503,11 +504,11 @@ #: lib/siglist.h:70 msgid "Urgent I/O condition" -msgstr "急需I/O 条件" +msgstr "紧急 I/O 事件" #: lib/siglist.h:73 msgid "Stopped (signal)" -msgstr "已停止(信号)" +msgstr "已停止（信号）" #: lib/siglist.h:76 msgid "Stopped" @@ -523,11 +524,11 @@ #: lib/siglist.h:85 msgid "Stopped (tty input)" -msgstr "已停止(tty 输入)" +msgstr "已停止（tty 输入）" #: lib/siglist.h:88 msgid "Stopped (tty output)" -msgstr "已停止(tty 输出)" +msgstr "已停止（tty 输出）" #: lib/siglist.h:91 msgid "I/O possible" @@ -543,7 +544,7 @@ #: lib/siglist.h:100 msgid "Virtual timer expired" -msgstr "虚拟记时器过期" +msgstr "虚拟定时器过期" #: lib/siglist.h:103 msgid "Profiling timer expired" @@ -563,7 +564,7 @@ #: lib/siglist.h:117 msgid "EMT trap" -msgstr "捕获EMT 信号" +msgstr "捕获 EMT 信号" #: lib/siglist.h:120 msgid "Bad system call" @@ -588,12 +589,12 @@ #: lib/strsignal.c:114 #, c-format msgid "Real-time signal %d" -msgstr "实时信号%d" +msgstr "实时信号 %d" #: lib/strsignal.c:118 #, c-format msgid "Unknown signal %d" -msgstr "未知信号%d" +msgstr "未知信号 %d" #: lib/unicodeio.c:102 msgid "iconv function not usable" @@ -634,12 +635,12 @@ msgid "unable to display error message" msgstr "无法显示错误信息" -#: lib/version-etc.c:74 +#: lib/version-etc.c:73 #, c-format msgid "Packaged by %s (%s)\n" msgstr "由 %s 打包 (%s)\n" -#: lib/version-etc.c:77 +#: lib/version-etc.c:76 #, c-format msgid "Packaged by %s\n" msgstr "由 %s 打包\n" @@ -647,7 +648,7 @@ #. TRANSLATORS: Translate "(C)" to the copyright symbol #. (C-in-a-circle), if this symbol is available in the user's #. locale. Otherwise, do not translate "(C)"; leave it as-is. -#: lib/version-etc.c:84 +#: lib/version-etc.c:83 msgid "(C)" msgstr "(C)" @@ -667,19 +668,19 @@ "\n" #. TRANSLATORS: %s denotes an author name. -#: lib/version-etc.c:102 +#: lib/version-etc.c:105 #, c-format msgid "Written by %s.\n" msgstr "由%s 编写。\n" #. TRANSLATORS: Each %s denotes an author name. -#: lib/version-etc.c:106 +#: lib/version-etc.c:109 #, c-format msgid "Written by %s and %s.\n" msgstr "由%s 和%s 编写。\n" #. TRANSLATORS: Each %s denotes an author name. -#: lib/version-etc.c:110 +#: lib/version-etc.c:113 #, c-format msgid "Written by %s, %s, and %s.\n" msgstr "由%s、%s 和%s 编写。\n" @@ -687,7 +688,7 @@ #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies #. ca. 16 screen columns and that a screen line has ca. 80 columns. -#: lib/version-etc.c:117 +#: lib/version-etc.c:120 #, c-format msgid "" "Written by %s, %s, %s,\n" @@ -699,7 +700,7 @@ #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies #. ca. 16 screen columns and that a screen line has ca. 80 columns. -#: lib/version-etc.c:124 +#: lib/version-etc.c:127 #, c-format msgid "" "Written by %s, %s, %s,\n" @@ -711,7 +712,7 @@ #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies #. ca. 16 screen columns and that a screen line has ca. 80 columns. -#: lib/version-etc.c:131 +#: lib/version-etc.c:134 #, c-format msgid "" "Written by %s, %s, %s,\n" @@ -723,7 +724,7 @@ #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies #. ca. 16 screen columns and that a screen line has ca. 80 columns. -#: lib/version-etc.c:139 +#: lib/version-etc.c:142 #, c-format msgid "" "Written by %s, %s, %s,\n" @@ -735,7 +736,7 @@ #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies #. ca. 16 screen columns and that a screen line has ca. 80 columns. -#: lib/version-etc.c:147 +#: lib/version-etc.c:150 #, c-format msgid "" "Written by %s, %s, %s,\n" @@ -749,7 +750,7 @@ #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies #. ca. 16 screen columns and that a screen line has ca. 80 columns. -#: lib/version-etc.c:156 +#: lib/version-etc.c:159 #, c-format msgid "" "Written by %s, %s, %s,\n" @@ -763,7 +764,7 @@ #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies #. ca. 16 screen columns and that a screen line has ca. 80 columns. -#: lib/version-etc.c:167 +#: lib/version-etc.c:170 #, c-format msgid "" "Written by %s, %s, %s,\n" @@ -787,12 +788,12 @@ "\n" "请向<%s> 报告软件错误。请向 报告翻译错误。\n" -#: lib/version-etc.c:247 +#: lib/version-etc.c:251 #, c-format msgid "Report %s bugs to: %s\n" msgstr "请向 %2$s 报告 %1$s 的错误\n" -#: lib/version-etc.c:251 +#: lib/version-etc.c:255 lib/version-etc.c:257 #, c-format msgid "%s home page: <%s>\n" msgstr "%s 的主页：<%s>\n" @@ -847,7 +848,7 @@ msgstr "%s%s 参数\"%s\"太大" #. This is a proper name. See the gettext manual, section Names. -#: src/base64.c:36 +#: src/basenc.c:37 src/basenc.c:40 msgid "Simon Josefsson" msgstr "Simon Josefsson" @@ -860,7 +861,7 @@ "用法：%s [选项]... [文件]\n" "使用 Base%d 编码/解码文件或标准输入输出。\n" -#: src/base64.c:73 +#: src/basenc.c:140 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -874,7 +875,7 @@ " -w, --wrap=字符数\t在指定的字符数后自动换行(默认为76)，0 为禁用自动换行\n" "\n" -#: src/base64.c:82 +#: src/basenc.c:164 #, c-format msgid "" "\n" @@ -885,51 +886,51 @@ msgstr "" "\n" "数据以 RFC 4648 规定的 %s 字母格式进行编码。\n" -"解码时，输入数据（编码流）可能包含一些非有效 %s 字符的换行符。\n" +"解码时，输入数据（编码流）可能包含一些非有效 %s 字符以及换行符。\n" "可以尝试用 --ignore-garbage 选项来绕过编码流中的无效字符。\n" -#: src/base64.c:201 src/base64.c:239 src/csplit.c:277 src/csplit.c:1468 -#: src/join.c:465 src/shuf.c:233 src/shuf.c:279 src/shuf.c:554 +#: src/basenc.c:1009 src/basenc.c:1055 src/csplit.c:277 src/csplit.c:1468 +#: src/join.c:465 src/shuf.c:233 src/shuf.c:279 src/shuf.c:559 #: src/tac-pipe.c:76 src/tee.c:263 src/tr.c:1611 #, c-format msgid "read error" msgstr "读取错误" -#: src/base64.c:258 +#: src/basenc.c:1074 msgid "invalid input" msgstr "输入无效" -#: src/base64.c:295 +#: src/basenc.c:1121 msgid "invalid wrap size" msgstr "无效的换行字符数" -#: src/base64.c:313 src/basename.c:176 src/comm.c:489 src/cp.c:621 -#: src/date.c:470 src/dircolors.c:449 src/du.c:1018 src/hostid.c:79 -#: src/hostname.c:118 src/id.c:190 src/install.c:985 src/join.c:970 -#: src/link.c:91 src/ln.c:551 src/logname.c:77 src/mknod.c:182 src/mv.c:451 -#: src/nproc.c:115 src/od.c:1865 src/ptx.c:2082 src/seq.c:619 src/shuf.c:491 -#: src/sort.c:4595 src/split.c:1553 src/tr.c:1768 src/tsort.c:566 src/tty.c:113 -#: src/uname.c:252 src/uniq.c:533 src/uniq.c:550 src/unlink.c:87 -#: src/uptime.c:258 src/users.c:152 src/wc.c:737 src/who.c:831 src/whoami.c:85 +#: src/basename.c:176 src/basenc.c:1225 src/comm.c:489 src/cp.c:621 +#: src/date.c:471 src/dircolors.c:449 src/du.c:1019 src/hostid.c:72 +#: src/hostname.c:111 src/install.c:985 src/join.c:969 src/link.c:84 +#: src/ln.c:593 src/logname.c:70 src/mknod.c:182 src/mv.c:451 src/nproc.c:115 +#: src/od.c:1871 src/ptx.c:2082 src/seq.c:639 src/shuf.c:491 src/sort.c:4596 +#: src/split.c:1554 src/tr.c:1768 src/tsort.c:559 src/tty.c:113 src/uname.c:252 +#: src/uniq.c:520 src/uniq.c:537 src/unlink.c:80 src/uptime.c:252 +#: src/users.c:145 src/wc.c:758 src/who.c:831 src/whoami.c:78 #, c-format msgid "extra operand %s" msgstr "额外的操作数 %s" -#: src/base64.c:344 src/cat.c:764 +#: src/basenc.c:1256 src/cat.c:764 msgid "closing standard input" msgstr "关闭标准输入" #. This is a proper name. See the gettext manual, section Names. #: src/basename.c:29 src/chgrp.c:38 src/chmod.c:39 src/chown.c:37 src/comm.c:39 -#: src/cp.c:48 src/csplit.c:45 src/cut.c:46 src/date.c:40 src/dd.c:46 -#: src/df.c:45 src/dirname.c:32 src/du.c:54 src/env.c:36 src/expand.c:49 +#: src/cp.c:48 src/csplit.c:45 src/cut.c:46 src/date.c:40 src/dd.c:45 +#: src/df.c:49 src/dirname.c:32 src/du.c:55 src/env.c:39 src/expand.c:49 #: src/fold.c:36 src/groups.c:36 src/head.c:47 src/id.c:42 src/install.c:51 -#: src/ln.c:43 src/ls.c:131 src/mkdir.c:39 src/mkfifo.c:36 src/mknod.c:37 +#: src/ln.c:52 src/ls.c:137 src/mkdir.c:39 src/mkfifo.c:36 src/mknod.c:37 #: src/mv.c:43 src/nice.c:40 src/nl.c:42 src/paste.c:53 src/pathchk.c:32 #: src/pinky.c:38 src/printenv.c:44 src/printf.c:68 src/rm.c:41 src/rmdir.c:37 -#: src/stty.c:68 src/sum.c:39 src/tac.c:58 src/tail.c:73 src/tee.c:38 -#: src/touch.c:45 src/tty.c:44 src/uname.c:61 src/unexpand.c:50 src/uniq.c:43 -#: src/uptime.c:47 src/users.c:37 src/wc.c:51 src/who.c:51 src/yes.c:33 +#: src/stty.c:68 src/sum.c:39 src/tac.c:58 src/tail.c:77 src/tee.c:38 +#: src/touch.c:45 src/tty.c:44 src/uname.c:61 src/unexpand.c:50 src/uniq.c:41 +#: src/uptime.c:46 src/users.c:36 src/wc.c:51 src/who.c:51 src/yes.c:32 msgid "David MacKenzie" msgstr "David MacKenzie" @@ -947,6 +948,8 @@ "Print NAME with any leading directory components removed.\n" "If specified, also remove a trailing SUFFIX.\n" msgstr "" +"去掉前导的目录部分后打印<名称>。\n" +"如果指定的话，还会去掉尾随的<后缀>。\n" #: src/basename.c:60 msgid "" @@ -954,6 +957,9 @@ " -s, --suffix=SUFFIX remove a trailing SUFFIX; implies -a\n" " -z, --zero end each output line with NUL, not newline\n" msgstr "" +" -a, --multiple 支持接受多个参数，并把每个参数都视作给定的<名称>\n" +" -s, --suffix=SUFFIX 移除尾随的<后缀>；隐含启用 -a 选项\n" +" -z, --zero 以 NUL 字符而非换行符来结束每一个输出行\n" #: src/basename.c:67 #, c-format @@ -965,33 +971,39 @@ " %s -s .h include/stdio.h -> \"stdio\"\n" " %s -a any/str1 any/str2 -> \"str1\" followed by \"str2\"\n" msgstr "" +"\n" +"示例：\n" +" %s /usr/bin/sort -> \"sort\"\n" +" %s include/stdio.h .h -> \"stdio\"\n" +" %s -s .h include/stdio.h -> \"stdio\"\n" +" %s -a any/str1 any/str2 -> \"str1\" followed by \"str2\"\n" -#: src/basename.c:170 src/chcon.c:536 src/chgrp.c:279 src/chmod.c:529 -#: src/chown.c:280 src/chroot.c:278 src/comm.c:481 src/csplit.c:1402 -#: src/dirname.c:116 src/expr.c:454 src/join.c:1160 src/link.c:83 -#: src/mkdir.c:252 src/mkfifo.c:130 src/mknod.c:171 src/nohup.c:114 +#: src/basename.c:170 src/chcon.c:537 src/chgrp.c:279 src/chmod.c:529 +#: src/chown.c:280 src/chroot.c:279 src/comm.c:481 src/csplit.c:1402 +#: src/dirname.c:116 src/expr.c:454 src/join.c:1159 src/link.c:76 +#: src/mkdir.c:252 src/mkfifo.c:130 src/mknod.c:171 src/nohup.c:107 #: src/pathchk.c:147 src/printf.c:693 src/readlink.c:145 src/realpath.c:237 -#: src/rm.c:338 src/rmdir.c:222 src/seq.c:613 src/sleep.c:124 src/stat.c:1663 -#: src/stdbuf.c:370 src/tr.c:1753 src/unlink.c:81 +#: src/rm.c:338 src/rmdir.c:223 src/seq.c:633 src/sleep.c:116 src/stat.c:1885 +#: src/stdbuf.c:371 src/tr.c:1753 src/unlink.c:74 #, c-format msgid "missing operand" msgstr "缺少操作数" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:48 src/cp.c:47 src/df.c:44 src/du.c:53 src/factor.c:129 +#: src/cat.c:48 src/cp.c:47 src/df.c:48 src/du.c:54 src/factor.c:129 #: src/split.c:49 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:49 src/comm.c:38 src/ls.c:130 src/rm.c:42 src/split.c:50 -#: src/tee.c:37 src/uniq.c:42 +#: src/cat.c:49 src/comm.c:38 src/ls.c:136 src/rm.c:42 src/split.c:50 +#: src/tee.c:37 src/uniq.c:40 msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:1458 src/expand.c:69 src/fold.c:66 src/head.c:110 -#: src/ls.c:5131 src/nl.c:176 src/paste.c:436 src/pr.c:2736 src/rm.c:133 -#: src/sum.c:59 src/tac.c:132 src/tail.c:261 src/tee.c:87 src/unexpand.c:78 +#: src/cat.c:88 src/df.c:1511 src/expand.c:69 src/fold.c:66 src/head.c:110 +#: src/ls.c:5342 src/nl.c:176 src/paste.c:436 src/pr.c:2737 src/rm.c:133 +#: src/sum.c:59 src/tac.c:132 src/tail.c:265 src/tee.c:87 src/unexpand.c:78 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" msgstr "用法：%s [选项]... [文件]...\n" @@ -1010,6 +1022,13 @@ " -n, --number number all output lines\n" " -s, --squeeze-blank suppress repeated empty output lines\n" msgstr "" +"\n" +" -A, --show-all 等效于 -vET\n" +" -b, --number-nonblank 对非空输出行编号，同时取消 -n 选项效果\n" +" -e 等效于 -vE\n" +" -E, --show-ends 在每行结束处显示\"$\"\n" +" -n, --number 对输出的所有行编号\n" +" -s, --squeeze-blank 不输出多行空行\n" #: src/cat.c:107 msgid "" @@ -1018,7 +1037,7 @@ " -u (ignored)\n" " -v, --show-nonprinting use ^ and M- notation, except for LFD and TAB\n" msgstr "" -" -t 与-vT 等价\n" +" -t 与 -vT 等效\n" " -T, --show-tabs 将跳格字符显示为^I\n" " -u (被忽略)\n" " -v, --show-nonprinting 使用^ 和M- 引用，除了LFD和 TAB 之外\n" @@ -1041,8 +1060,8 @@ msgid "cannot do ioctl on %s" msgstr "无法在 %s 上执行 ioctrl" -#: src/cat.c:638 src/dd.c:2433 src/sort.c:417 src/tail.c:2420 src/tee.c:207 -#: src/yes.c:131 +#: src/cat.c:638 src/dd.c:2492 src/sort.c:405 src/tail.c:2444 src/tee.c:207 +#: src/yes.c:128 #, c-format msgid "standard output" msgstr "标准输出" @@ -1053,131 +1072,142 @@ msgstr "%s：输入文件是输出文件" #. This is a proper name. See the gettext manual, section Names. -#: src/chcon.c:36 src/runcon.c:57 +#: src/chcon.c:37 src/runcon.c:57 msgid "Russell Coker" msgstr "Russell Coker" #. This is a proper name. See the gettext manual, section Names. -#: src/chcon.c:37 src/chgrp.c:39 src/chmod.c:40 src/chown.c:38 src/cp.c:49 -#: src/cut.c:47 src/dirname.c:33 src/du.c:56 src/head.c:48 src/hostid.c:33 -#: src/hostname.c:34 src/mktemp.c:36 src/mv.c:44 src/nohup.c:35 src/od.c:39 -#: src/pathchk.c:33 src/pwd.c:32 src/rm.c:43 src/sleep.c:35 src/sync.c:33 -#: src/tail.c:75 src/tr.c:38 src/true.c:33 +#: src/chcon.c:38 src/chgrp.c:39 src/chmod.c:40 src/chown.c:38 src/cp.c:49 +#: src/cut.c:47 src/dirname.c:33 src/du.c:57 src/head.c:48 src/hostid.c:32 +#: src/hostname.c:33 src/mktemp.c:36 src/mv.c:44 src/nohup.c:34 src/od.c:40 +#: src/pathchk.c:33 src/pwd.c:32 src/rm.c:43 src/sleep.c:34 src/sync.c:33 +#: src/tail.c:79 src/tr.c:38 src/true.c:33 msgid "Jim Meyering" msgstr "Jim Meyering" -#: src/chcon.c:100 src/runcon.c:202 src/runcon.c:233 +#: src/chcon.c:101 src/runcon.c:202 src/runcon.c:233 #, c-format msgid "failed to create security context: %s" -msgstr "创建安全环境失败：%s" +msgstr "创建安全上下文失败：%s" -#: src/chcon.c:112 +#: src/chcon.c:113 #, c-format msgid "failed to set %s security context component to %s" -msgstr "设置%s 安全环境组件到%s 失败" +msgstr "设置 %s 安全上下文组件到 %s 失败" -#: src/chcon.c:156 src/chcon.c:547 src/copy.c:924 src/runcon.c:216 -#: src/stat.c:793 +#: src/chcon.c:157 src/chcon.c:548 src/copy.c:958 src/runcon.c:216 +#: src/stat.c:833 #, c-format msgid "failed to get security context of %s" -msgstr "无法取得%s 的安全环境" +msgstr "无法取得%s 的安全上下文" -#: src/chcon.c:166 +#: src/chcon.c:167 #, c-format msgid "can't apply partial context to unlabeled file %s" -msgstr "部分关联无法应用于文件%s" +msgstr "无法对未标记的文件 %s 应用部分（不完整的）上下文" -#: src/chcon.c:190 +#: src/chcon.c:191 #, c-format msgid "failed to change context of %s to %s" -msgstr "改变%s 的环境到%s 失败" +msgstr "改变 %s 的上下文到 %s 失败" -#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:324 src/copy.c:725 -#: src/du.c:532 src/ls.c:3241 +#: src/chcon.c:256 src/chmod.c:218 src/chown-core.c:324 src/copy.c:759 +#: src/du.c:533 src/ls.c:3436 #, c-format msgid "cannot access %s" -msgstr "无法访问%s" +msgstr "无法访问 %s" -#: src/chcon.c:266 src/chmod.c:231 src/chown-core.c:337 src/du.c:512 +#: src/chcon.c:267 src/chmod.c:231 src/chown-core.c:337 src/du.c:513 #, c-format msgid "cannot read directory %s" -msgstr "无法读取目录%s" +msgstr "无法读取目录 %s" -#: src/chcon.c:293 +#: src/chcon.c:294 #, c-format msgid "changing security context of %s\n" -msgstr "正在更改%s 的安全环境\n" +msgstr "正在更改 %s 的安全上下文\n" -#: src/chcon.c:327 src/chmod.c:349 src/chown-core.c:538 src/remove.c:601 +#: src/chcon.c:328 src/chmod.c:349 src/chown-core.c:538 src/remove.c:601 #: src/selinux.c:323 #, c-format msgid "fts_read failed" msgstr "fts_read 失败" -#: src/chcon.c:338 src/chmod.c:360 src/chown-core.c:550 src/du.c:713 +#: src/chcon.c:339 src/chmod.c:360 src/chown-core.c:550 src/du.c:714 #: src/remove.c:615 src/selinux.c:334 #, c-format msgid "fts_close failed" msgstr "fts_close 失败" -#: src/chcon.c:352 +#: src/chcon.c:353 #, c-format msgid "" "Usage: %s [OPTION]... CONTEXT FILE...\n" " or: %s [OPTION]... [-u USER] [-r ROLE] [-l RANGE] [-t TYPE] FILE...\n" " or: %s [OPTION]... --reference=RFILE FILE...\n" msgstr "" -"用法: %s [选项]... 环境 文件...\n" +"用法: %s [选项]... 上下文 文件...\n" "　或: %s [选项]... [-u 用户] [-r 角色] [-l 范围] [-t 类型] 文件...\n" "　或: %s [选项]... --reference=参考文件 文件...\n" -#: src/chcon.c:358 +#: src/chcon.c:359 msgid "" "Change the SELinux security context of each FILE to CONTEXT.\n" "With --reference, change the security context of each FILE to that of " "RFILE.\n" msgstr "" +"将每个指定<文件>的安全上下文变更至指定<上下文>。\n" +"使用 --reference 选项时，把指定<文件>的安全上下文设置为与<参考文件>相同。\n" -#: src/chcon.c:365 src/chgrp.c:125 src/chown.c:95 +#: src/chcon.c:366 src/chgrp.c:125 src/chown.c:95 msgid "" " --dereference affect the referent of each symbolic link (this is\n" " the default), rather than the symbolic link itself\n" " -h, --no-dereference affect symbolic links instead of any referenced " "file\n" msgstr "" +" --dereference 影响每个符号链接的原始引用文件（这是默认行为），而非\n" +" 符号链接本身\n" +" -h, --no-dereference 只影响符号链接，而非被引用的任何文件\n" -#: src/chcon.c:370 +#: src/chcon.c:371 msgid "" " -u, --user=USER set user USER in the target security context\n" " -r, --role=ROLE set role ROLE in the target security context\n" " -t, --type=TYPE set type TYPE in the target security context\n" " -l, --range=RANGE set range RANGE in the target security context\n" msgstr "" +" -u, --user=用户 设置指定<用户>的目标安全上下文\n" +" -r, --role=角色 设置指定<角色>的目标安全上下文\n" +" -t, --type=类型 设置指定<类型>的目标安全上下文\n" +" -l, --range=范围 设置指定<范围>的目标安全上下文\n" -#: src/chcon.c:376 src/chgrp.c:134 src/chmod.c:390 src/chown.c:111 +#: src/chcon.c:377 src/chgrp.c:134 src/chmod.c:390 src/chown.c:111 msgid "" " --no-preserve-root do not treat '/' specially (the default)\n" " --preserve-root fail to operate recursively on '/'\n" msgstr "" +" --no-preserve-root 不特殊对待“/”（默认行为）\n" +" --preserve-root 不允许在“/”上递归操作\n" -#: src/chcon.c:380 +#: src/chcon.c:381 msgid "" " --reference=RFILE use RFILE's security context rather than " "specifying\n" " a CONTEXT value\n" -msgstr "" +msgstr " --reference=参考文件 使用指定<参考文件>的安全上下文，而非指定<环境>值\n" -#: src/chcon.c:384 src/chgrp.c:142 src/chown.c:119 +#: src/chcon.c:385 src/chgrp.c:142 src/chown.c:119 msgid "" " -R, --recursive operate on files and directories recursively\n" -msgstr "" +msgstr " -R, --recursive 递归操作文件和目录\n" -#: src/chcon.c:387 +#: src/chcon.c:388 msgid "" " -v, --verbose output a diagnostic for every file processed\n" -msgstr "" +msgstr " -v, --verbose 为每个处理的文件输出诊断信息\n" -#: src/chcon.c:390 src/chgrp.c:145 src/chown.c:122 +#: src/chcon.c:391 src/chgrp.c:145 src/chown.c:122 msgid "" "\n" "The following options modify how a hierarchy is traversed when the -R\n" @@ -1191,38 +1221,47 @@ " -P do not traverse any symbolic links (default)\n" "\n" msgstr "" +"\n" +"以下选项是在指定了 -R 选项时被用于设置如何遍历目录结构体系。\n" +"如果您指定了多于一个选项，那么只有最后一个会生效。\n" +"\n" +" -H 如果命令行参数是一个指向目录的符号链接，则对其\n" +" 进行遍历\n" +" -L 遍历每一个遇到的指向目录的符号链接\n" +" -P 不遍历任何符号链接（默认）\n" +"\n" -#: src/chcon.c:517 src/chgrp.c:266 src/chown.c:267 +#: src/chcon.c:518 src/chgrp.c:266 src/chown.c:267 msgid "-R --dereference requires either -H or -L" msgstr "-R --dereference 需要-H 或-L 其中之一" -#: src/chcon.c:523 +#: src/chcon.c:524 msgid "-R -h requires -P" msgstr "-R -h 需要-P" -#: src/chcon.c:538 src/chgrp.c:281 src/chmod.c:531 src/chown.c:282 -#: src/comm.c:483 src/csplit.c:1404 src/join.c:1162 src/link.c:85 +#: src/chcon.c:539 src/chgrp.c:281 src/chmod.c:531 src/chown.c:282 +#: src/comm.c:483 src/csplit.c:1404 src/join.c:1161 src/link.c:78 #: src/mknod.c:173 src/tr.c:1756 #, c-format msgid "missing operand after %s" msgstr "%s 后缺少操作数" -#: src/chcon.c:561 src/runcon.c:250 +#: src/chcon.c:563 src/runcon.c:250 #, c-format msgid "invalid context: %s" -msgstr "无效模式：%s" +msgstr "无效上下文：%s" -#: src/chcon.c:567 +#: src/chcon.c:569 #, c-format msgid "conflicting security context specifiers given" -msgstr "给出的安全环境说明冲突" +msgstr "给出的安全上下文说明冲突" -#: src/chcon.c:576 src/chgrp.c:289 src/chgrp.c:307 src/chmod.c:539 +#: src/chcon.c:578 src/chgrp.c:289 src/chgrp.c:307 src/chmod.c:539 #: src/chmod.c:558 src/chown.c:290 src/chown.c:319 src/cp.c:422 src/cp.c:489 #: src/mv.c:99 src/pwd.c:276 src/rm.c:348 src/touch.c:348 #, c-format msgid "failed to get attributes of %s" -msgstr "无法取得%s 的属性" +msgstr "无法取得 %s 的属性" #: src/chgrp.c:93 #, c-format @@ -1244,6 +1283,9 @@ "With --reference, change the group of each FILE to that of RFILE.\n" "\n" msgstr "" +"将每个指定<文件>的属组变更至指定<用户组>。\n" +"使用 --reference 选项时，把指定<文件>的属组设置为与<参考文件>相同。\n" +"\n" #: src/chgrp.c:120 src/chmod.c:385 src/chown.c:90 msgid "" @@ -1251,18 +1293,25 @@ " -f, --silent, --quiet suppress most error messages\n" " -v, --verbose output a diagnostic for every file processed\n" msgstr "" +" -c, --changes 类似 verbose 选项，但仅在做出修改时进行报告\n" +" -f, --silent, --quiet 不显示大多数错误消息\n" +" -v, --verbose 输出各个处理的文件的诊断信息\n" #: src/chgrp.c:130 src/chown.c:100 msgid "" " (useful only on systems that can change the\n" " ownership of a symlink)\n" msgstr "" +" (仅当系统支持更改符号链接的所有者时，\n" +" 该选项才有用）\n" #: src/chgrp.c:138 msgid "" " --reference=RFILE use RFILE's group rather than specifying a\n" " GROUP value\n" msgstr "" +" --reference=参考文件 使用<参考文件>的属组信息而非指定一个\n" +" <用户组>的值\n" #: src/chgrp.c:160 #, c-format @@ -1285,37 +1334,37 @@ #: src/chmod.c:151 src/chown-core.c:146 #, c-format msgid "neither symbolic link %s nor referent has been changed\n" -msgstr "符号链接%s 和该链接所指示的对象都未被更改\n" +msgstr "符号链接 %s 和该链接所指示的对象都未被更改\n" #: src/chmod.c:165 #, c-format msgid "mode of %s changed from %04lo (%s) to %04lo (%s)\n" -msgstr "" +msgstr "%s 的权限模式已由 %04lo (%s) 更改为 %04lo (%s)\n" #: src/chmod.c:168 #, c-format msgid "failed to change mode of %s from %04lo (%s) to %04lo (%s)\n" -msgstr "" +msgstr "将 %s 的权限模式从 %04lo (%s) 更改为 %04lo (%s) 时失败\n" #: src/chmod.c:171 #, c-format msgid "mode of %s retained as %04lo (%s)\n" -msgstr "%s 的权限模式保留为%04lo (%s)\n" +msgstr "%s 的权限模式保留为 %04lo (%s)\n" #: src/chmod.c:238 #, c-format msgid "cannot operate on dangling symlink %s" -msgstr "无法创建符号链接%s" +msgstr "无法对已断开的符号链接 %s 进行操作" #: src/chmod.c:278 #, c-format msgid "changing permissions of %s" -msgstr "更改%s 的权限" +msgstr "正在更改 %s 的权限" #: src/chmod.c:314 #, c-format msgid "%s: new permissions are %s, not %s" -msgstr "%s：新的权限为%s，而非%s" +msgstr "%s：新的权限为 %s，而非 %s" #: src/chmod.c:374 #, c-format @@ -1450,6 +1499,10 @@ "RFILE.\n" "\n" msgstr "" +"修改每个<文件>的所有者和/或所属组为给定的<所有者>和/或<组>。\n" +"如同时使用 --reference，将每个给定<文件>的所有者和属组修改为<参考文件>\n" +"所具有的对应值。\n" +"\n" #: src/chown.c:104 msgid "" @@ -1471,6 +1524,8 @@ " --reference=RFILE use RFILE's owner and group rather than\n" " specifying OWNER:GROUP values\n" msgstr "" +" --reference=<参考文件> 使用指定<参考文件>的所有者和所属组信息，而非\n" +" 手工指定 所有者:组 的值\n" #: src/chown.c:137 msgid "" @@ -1479,6 +1534,10 @@ "to login group if implied by a ':' following a symbolic OWNER.\n" "OWNER and GROUP may be numeric as well as symbolic.\n" msgstr "" +"\n" +"如果没有指定所有者，则不会更改所有者信息。若所属组若没有指定也不会对其更改，\n" +"但当加上 ':' 时 GROUP 会更改为指定所有者的主要组。所有者和所属组可以是\n" +"数字或名称。\n" #: src/chown.c:143 #, c-format @@ -1500,17 +1559,17 @@ msgid "Roland McGrath" msgstr "Roland McGrath" -#: src/chroot.c:138 src/install.c:608 +#: src/chroot.c:139 src/install.c:608 #, c-format msgid "invalid group %s" msgstr "无效的组%s" -#: src/chroot.c:153 +#: src/chroot.c:154 #, c-format msgid "invalid group list %s" msgstr "无效的组列表%s" -#: src/chroot.c:186 +#: src/chroot.c:187 #, c-format msgid "" "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n" @@ -1519,85 +1578,87 @@ "用法：%s [选项] 新根 [命令 [参数]...]\n" "　或：%s 选项\n" -#: src/chroot.c:191 +#: src/chroot.c:192 msgid "" "Run COMMAND with root directory set to NEWROOT.\n" "\n" msgstr "" -"以指定的新根为运行指定命令时的的根目录。\n" +"以指定的<新根>作为运行指定<命令>时的的根目录。\n" "\n" -#: src/chroot.c:196 +#: src/chroot.c:197 msgid "" " --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" -msgstr "" +msgstr " --groups=组列表 指定附加用户组，形如 组1,组2,组3...,组N\n" -#: src/chroot.c:199 +#: src/chroot.c:200 msgid " --userspec=USER:GROUP specify user and group (ID or name) to use\n" -msgstr "" +msgstr " --userspec=用户:组 指定用户及用户组（可使用编号或名称）\n" -#: src/chroot.c:202 +#: src/chroot.c:203 #, c-format msgid " --skip-chdir do not change working directory to %s\n" -msgstr "" +msgstr " --skip-chdir 不要将工作目录变更为 %s\n" -#: src/chroot.c:208 +#: src/chroot.c:209 msgid "" "\n" "If no command is given, run '\"$SHELL\" -i' (default: '/bin/sh -i').\n" msgstr "" +"\n" +"如果没有给定命令，则运行 '\"${SHELL}\" -i'）（默认：'/bin/sh -i'）。\n" -#: src/chroot.c:287 +#: src/chroot.c:288 #, c-format msgid "option --skip-chdir only permitted if NEWROOT is old %s" -msgstr "" +msgstr "选项 --skip-chdir 只能在指定<新根>为旧有的 %s 时使用" -#: src/chroot.c:330 +#: src/chroot.c:331 #, c-format msgid "cannot change root directory to %s" -msgstr "无法进入目录%s" +msgstr "无法将根目录更改为 %s" -#: src/chroot.c:334 +#: src/chroot.c:335 msgid "cannot chdir to root directory" msgstr "无法切换到根目录" -#: src/chroot.c:376 +#: src/chroot.c:377 #, c-format msgid "no group specified for unknown uid: %d" msgstr "没有为未知 UID 指定组：%d" -#: src/chroot.c:401 +#: src/chroot.c:402 msgid "failed to get supplemental groups" -msgstr "" +msgstr "获取附加组失败" -#: src/chroot.c:413 +#: src/chroot.c:414 msgid "failed to set supplemental groups" -msgstr "" +msgstr "设置附加组失败" -#: src/chroot.c:419 +#: src/chroot.c:420 msgid "failed to set group-ID" msgstr "设置组ID 失败" -#: src/chroot.c:422 +#: src/chroot.c:423 msgid "failed to set user-ID" msgstr "设置用户ID 失败" -#: src/chroot.c:428 src/nohup.c:229 src/stdbuf.c:391 src/timeout.c:519 +#: src/chroot.c:429 src/nohup.c:222 src/stdbuf.c:392 src/timeout.c:519 #, c-format msgid "failed to run command %s" -msgstr "无法运行命令%s" +msgstr "无法运行命令 %s" #. This is a proper name. See the gettext manual, section Names. #: src/cksum.c:40 msgid "Q. Frank Xia" msgstr "Q. Frank Xia" -#: src/cksum.c:216 +#: src/cksum.c:210 #, c-format msgid "%s: file too long" msgstr "%s：文件太大" -#: src/cksum.c:263 +#: src/cksum.c:257 #, c-format msgid "" "Usage: %s [FILE]...\n" @@ -1606,7 +1667,7 @@ "用法：%s [文件]...\n" "　或：%s [选项]\n" -#: src/cksum.c:268 +#: src/cksum.c:262 msgid "" "Print CRC checksum and byte counts of each FILE.\n" "\n" @@ -1628,6 +1689,8 @@ "\n" "When FILE1 or FILE2 (not both) is -, read standard input.\n" msgstr "" +"\n" +"如果<文件1>或<文件2>是\"-\"时（不含两者均为\"-\"的情况），将从标准输入读取。\n" #: src/comm.c:123 msgid "" @@ -1668,10 +1731,10 @@ #: src/comm.c:144 msgid " --total output a summary\n" -msgstr "" +msgstr " --total 输出一份摘要信息\n" #: src/comm.c:147 src/cut.c:178 src/head.c:134 src/numfmt.c:945 src/paste.c:452 -#: src/tail.c:308 +#: src/tail.c:312 msgid " -z, --zero-terminated line delimiter is NUL, not newline\n" msgstr " -z, --zero-terminated 以 NUL 字符而非换行符作为行尾分隔符\n" @@ -1680,6 +1743,8 @@ "\n" "Note, comparisons honor the rules specified by 'LC_COLLATE'.\n" msgstr "" +"\n" +"注意，比较操作遵从“LC_COLLATE”所指定的规则。\n" #: src/comm.c:156 #, c-format @@ -1699,335 +1764,335 @@ msgid "file %d is not in sorted order" msgstr "文件%d 没有被正确排序" -#: src/comm.c:402 src/du.c:1136 src/ls.c:2872 src/wc.c:864 +#: src/comm.c:402 src/du.c:1137 src/ls.c:3067 src/wc.c:885 msgid "total" msgstr "总用量" #: src/comm.c:458 msgid "multiple output delimiters specified" -msgstr "" +msgstr "指定了多个输出分隔符" -#: src/copy.c:194 src/copy.c:465 +#: src/copy.c:230 src/copy.c:499 #, c-format msgid "cannot lseek %s" msgstr "无法lseek %s" -#: src/copy.c:204 src/copy.c:571 +#: src/copy.c:240 src/copy.c:605 #, c-format msgid "error deallocating %s" -msgstr "" +msgstr "取消分配 %s 时出错" -#: src/copy.c:242 src/dd.c:1864 src/dd.c:2200 src/du.c:1133 src/head.c:156 -#: src/head.c:307 src/head.c:389 src/head.c:585 src/head.c:667 src/head.c:736 -#: src/head.c:786 src/head.c:809 src/tail.c:441 src/tail.c:534 src/tail.c:583 -#: src/tail.c:676 src/tail.c:804 src/tail.c:852 src/tail.c:889 src/tail.c:2013 -#: src/tail.c:2046 src/uniq.c:473 +#: src/copy.c:278 src/dd.c:1928 src/dd.c:2264 src/du.c:1134 src/head.c:157 +#: src/head.c:308 src/head.c:390 src/head.c:586 src/head.c:668 src/head.c:737 +#: src/head.c:787 src/head.c:810 src/tail.c:464 src/tail.c:557 src/tail.c:606 +#: src/tail.c:699 src/tail.c:827 src/tail.c:875 src/tail.c:912 src/tail.c:2037 +#: src/tail.c:2070 src/uniq.c:461 #, c-format msgid "error reading %s" -msgstr "读取%s 时出错" +msgstr "读取 %s 时出错" -#: src/copy.c:275 src/dd.c:2263 src/dd.c:2325 src/head.c:184 src/tail.c:415 +#: src/copy.c:311 src/dd.c:2327 src/dd.c:2389 src/head.c:185 src/tail.c:438 #, c-format msgid "error writing %s" -msgstr "写入%s 出错" +msgstr "写入 %s 出错" -#: src/copy.c:306 +#: src/copy.c:340 #, c-format msgid "overflow reading %s" -msgstr "" +msgstr "读取 %s 时溢出" -#: src/copy.c:419 +#: src/copy.c:453 #, c-format msgid "%s: failed to get extents info" msgstr "%s：无法获得 extent 信息" -#: src/copy.c:491 +#: src/copy.c:525 #, c-format msgid "%s: write failed" msgstr "%s：写入失败" -#: src/copy.c:564 src/copy.c:1308 +#: src/copy.c:598 src/copy.c:1342 #, c-format msgid "failed to extend %s" msgstr "扩展%s 失败" -#: src/copy.c:806 +#: src/copy.c:840 #, c-format msgid "clearing permissions for %s" msgstr "清除%s 的权限" -#: src/copy.c:841 src/copy.c:2754 src/cp.c:318 +#: src/copy.c:875 src/copy.c:2791 src/cp.c:318 #, c-format msgid "failed to preserve ownership for %s" msgstr "无法保留%s 的所有者" -#: src/copy.c:867 +#: src/copy.c:901 #, c-format msgid "failed to lookup file %s" msgstr "查阅文件%s 失败" -#: src/copy.c:872 +#: src/copy.c:906 #, c-format msgid "failed to preserve authorship for %s" msgstr "保留%s 的作者失败" -#: src/copy.c:909 src/cp.c:1205 src/install.c:961 src/mkdir.c:269 +#: src/copy.c:943 src/cp.c:1205 src/install.c:961 src/mkdir.c:269 #: src/mkfifo.c:144 src/mknod.c:200 #, c-format msgid "failed to set default file creation context to %s" -msgstr "无法取得%s 的创建环境" +msgstr "无法设置默认文件创建上下文至 %s" -#: src/copy.c:939 +#: src/copy.c:973 #, c-format msgid "failed to set default file creation context for %s" -msgstr "" +msgstr "无法设置 %s 的默认文件创建上下文" -#: src/copy.c:965 +#: src/copy.c:999 #, c-format msgid "failed to set the security context of %s" -msgstr "" +msgstr "设置 %s 的安全上下文失败" -#: src/copy.c:1038 src/csplit.c:655 src/du.c:1025 src/fmt.c:439 src/head.c:888 -#: src/split.c:1569 src/tail.c:1987 src/wc.c:749 +#: src/copy.c:1072 src/csplit.c:655 src/du.c:1026 src/fmt.c:439 src/head.c:889 +#: src/split.c:1570 src/tail.c:2011 src/wc.c:770 #, c-format msgid "cannot open %s for reading" msgstr "无法打开%s 读取数据" -#: src/copy.c:1044 src/copy.c:1197 src/dd.c:1789 src/dd.c:2337 src/dd.c:2477 -#: src/head.c:847 src/tail.c:1827 src/tail.c:1890 src/truncate.c:114 +#: src/copy.c:1078 src/copy.c:1231 src/dd.c:1853 src/dd.c:2401 src/dd.c:2536 +#: src/head.c:848 src/tail.c:1851 src/tail.c:1914 src/truncate.c:114 #, c-format msgid "cannot fstat %s" msgstr "无法获取%s 的文件状态(fstat)" -#: src/copy.c:1054 +#: src/copy.c:1088 #, c-format msgid "skipping file %s, as it was replaced while being copied" msgstr "跳过文件%s，因为在准备复制时它已被其它文件取代" -#: src/copy.c:1094 src/copy.c:2184 src/remove.c:263 src/remove.c:280 +#: src/copy.c:1128 src/copy.c:2221 src/remove.c:263 src/remove.c:280 #: src/remove.c:406 src/remove.c:432 #, c-format msgid "cannot remove %s" -msgstr "无法删除%s" +msgstr "无法删除 %s" -#: src/copy.c:1099 src/copy.c:1796 src/copy.c:2189 src/remove.c:376 +#: src/copy.c:1133 src/copy.c:1830 src/copy.c:2226 src/remove.c:376 #, c-format msgid "removed %s\n" -msgstr "已删除%s\n" +msgstr "已删除 %s\n" -#: src/copy.c:1151 +#: src/copy.c:1185 #, c-format msgid "not writing through dangling symlink %s" msgstr "无法通过符号链接%s 进行操作" -#: src/copy.c:1189 +#: src/copy.c:1223 #, c-format msgid "cannot create regular file %s" msgstr "无法创建普通文件%s" -#: src/copy.c:1210 +#: src/copy.c:1244 #, c-format msgid "failed to clone %s from %s" -msgstr "" +msgstr "克隆 %s（从 %s 进行）失败" -#: src/copy.c:1323 src/copy.c:2829 +#: src/copy.c:1357 src/copy.c:2866 #, c-format msgid "preserving times for %s" msgstr "正在保留 %s 的时间" -#: src/copy.c:1403 src/copy.c:1409 src/head.c:896 src/sync.c:162 -#: src/touch.c:173 src/truncate.c:392 +#: src/copy.c:1437 src/copy.c:1443 src/head.c:897 src/sync.c:164 +#: src/touch.c:173 src/truncate.c:381 #, c-format msgid "failed to close %s" -msgstr "" +msgstr "关闭 %s 失败" -#: src/copy.c:1685 +#: src/copy.c:1719 #, c-format msgid "%s: replace %s, overriding mode %04lo (%s)? " -msgstr "" +msgstr "%s：是否替换 %s，而忽略模式 %04lo (%s)？ " -#: src/copy.c:1686 +#: src/copy.c:1720 #, c-format msgid "%s: unwritable %s (mode %04lo, %s); try anyway? " msgstr "%s：%s 不可写(权限%04lo，%s)；依然尝试？ " -#: src/copy.c:1693 +#: src/copy.c:1727 #, c-format msgid "%s: overwrite %s? " msgstr "%s：是否覆盖%s？ " -#: src/copy.c:1763 +#: src/copy.c:1797 #, c-format msgid " (backup: %s)" msgstr " (备份：%s)" -#: src/copy.c:1773 +#: src/copy.c:1807 msgid "failed to restore the default file creation context" -msgstr "恢复默认文件创建环境失败" +msgstr "恢复默认文件创建上下文失败" -#: src/copy.c:1791 +#: src/copy.c:1825 #, c-format msgid "cannot create hard link %s to %s" msgstr "无法创建指向%2$s 的硬链接%1$s" -#: src/copy.c:1891 src/copy.c:1963 src/copy.c:2534 src/copy.c:2895 -#: src/find-mount-point.c:84 src/install.c:702 src/realpath.c:146 -#: src/stat.c:1389 src/truncate.c:338 +#: lib/mkdir-p.c:162 src/copy.c:1927 src/copy.c:1999 src/copy.c:2571 +#: src/copy.c:2932 src/find-mount-point.c:84 src/install.c:702 +#: src/realpath.c:146 src/stat.c:1440 src/truncate.c:327 #, c-format msgid "cannot stat %s" msgstr "无法获取%s 的文件状态(stat)" -#: src/copy.c:1900 +#: src/copy.c:1936 #, c-format msgid "-r not specified; omitting directory %s" msgstr "未指定 -r；略过目录%s" -#: src/copy.c:1901 +#: src/copy.c:1937 #, c-format msgid "omitting directory %s" msgstr "略过目录 %s" -#: src/copy.c:1924 +#: src/copy.c:1960 #, c-format msgid "warning: source file %s specified more than once" msgstr "警告：指定来源文件%s 多于一次" -#: src/copy.c:1979 src/ln.c:263 +#: src/copy.c:2015 src/ln.c:275 #, c-format msgid "%s and %s are the same file" msgstr "%s 与%s 为同一文件" -#: src/copy.c:2069 +#: src/copy.c:2105 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "无法以目录%2$s 来覆盖非目录%1$s" -#: src/copy.c:2087 src/ln.c:231 +#: src/copy.c:2123 src/ln.c:246 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "不会以%2$s 覆盖刚创建的%1$s" -#: src/copy.c:2105 +#: src/copy.c:2141 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "无法以非目录来覆盖目录%s" -#: src/copy.c:2119 +#: src/copy.c:2155 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "无法将目录移动至非目录：%s -> %s" -#: src/copy.c:2146 +#: src/copy.c:2182 #, c-format msgid "backing up %s might destroy source; %s not moved" msgstr "备份 %s 可能破坏源文件；未移动 %s" -#: src/copy.c:2147 +#: src/copy.c:2183 #, c-format msgid "backing up %s might destroy source; %s not copied" msgstr "备份 %s 可能破坏源文件；未复制 %s" -#: src/copy.c:2168 src/ln.c:293 +#: src/copy.c:2205 src/ln.c:305 #, c-format msgid "cannot backup %s" msgstr "无法备份 %s" -#: src/copy.c:2223 +#: src/copy.c:2260 #, c-format msgid "will not copy %s through just-created symlink %s" msgstr "不会以%s 覆盖刚创建的%s" -#: src/copy.c:2303 +#: src/copy.c:2340 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "无法将目录%s 复制到自己%s" -#: src/copy.c:2311 +#: src/copy.c:2348 #, c-format msgid "warning: source directory %s specified more than once" msgstr "警告：指定来源目录 %s 多于一次" -#: src/copy.c:2337 +#: src/copy.c:2374 #, c-format msgid "will not create hard link %s to directory %s" msgstr "不会创建指向目录%2$s 的硬链接%1$s" -#: src/copy.c:2361 +#: src/copy.c:2398 #, c-format msgid "renamed " -msgstr "" +msgstr "已重命名 " -#: src/copy.c:2399 +#: src/copy.c:2436 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "无法将目录%s 移动至自身的子目录%s 下" -#: src/copy.c:2442 +#: src/copy.c:2479 #, c-format msgid "cannot move %s to %s" msgstr "无法将%s 移动至%s" -#: src/copy.c:2458 +#: src/copy.c:2495 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "无法进行跨设备的移动：%s 至%s；无法删除目标" -#: src/copy.c:2466 +#: src/copy.c:2503 #, c-format msgid "copied " -msgstr "" +msgstr "已复制 " -#: src/copy.c:2503 +#: src/copy.c:2540 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "无法复制循环的符号链接%s" -#: src/copy.c:2565 +#: src/copy.c:2602 #, c-format msgid "created directory %s\n" msgstr "已创建目录 %s\n" -#: src/copy.c:2628 +#: src/copy.c:2665 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "%s：只能于当前目录中创建相对的符号链接" -#: src/copy.c:2637 +#: src/copy.c:2675 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "无法创建指向%2$s 的符号链接%1$s" -#: src/copy.c:2691 src/mkfifo.c:170 +#: src/copy.c:2729 src/mkfifo.c:170 #, c-format msgid "cannot create fifo %s" msgstr "无法创建先进先出文件%s" -#: src/copy.c:2700 +#: src/copy.c:2738 #, c-format msgid "cannot create special file %s" msgstr "无法创建特殊文件%s" -#: src/copy.c:2711 src/ls.c:3455 src/stat.c:1071 +#: src/copy.c:2749 src/ls.c:3648 src/stat.c:1477 #, c-format msgid "cannot read symbolic link %s" msgstr "无法读取符号链接%s" -#: src/copy.c:2738 +#: src/copy.c:2775 #, c-format msgid "cannot create symbolic link %s" msgstr "无法创建符号链接%s" -#: src/copy.c:2770 +#: src/copy.c:2807 #, c-format msgid "%s has unknown file type" msgstr "%s 的文件类型不详" -#: src/copy.c:2935 src/ln.c:362 +#: src/copy.c:2972 src/ln.c:393 #, c-format msgid "cannot un-backup %s" msgstr "无法将%s 的备份还原" -#: src/copy.c:2939 +#: src/copy.c:2976 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (还原备份)\n" @@ -2035,18 +2100,20 @@ #. This is a proper name. See the gettext manual, section Names. #: src/coreutils.c:48 msgid "Alex Deymo" -msgstr "" +msgstr "Alex Deymo" #: src/coreutils.c:65 #, c-format msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n" -msgstr "" +msgstr "用法：%s --coreutils-prog=程序名称 [参数]... \n" #: src/coreutils.c:68 msgid "" "Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n" "\n" msgstr "" +"使用给定<参数>执行指定<程序名称>对应的内建程序。\n" +"\n" #: src/coreutils.c:86 #, c-format @@ -2054,6 +2121,8 @@ "\n" "Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n" msgstr "" +"\n" +"使用：'%s --coreutils-prog=程序名称 --help' 以获取独立程序的帮助信息。\n" #: src/coreutils.c:178 src/coreutils.c:203 #, c-format @@ -2073,7 +2142,7 @@ #: src/cp.c:154 msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" -msgstr "" +msgstr "将指定<源文件>复制至<目标文件>，或将多个<源文件>复制至<目标目录>。\n" #: src/cp.c:160 msgid "" @@ -2107,12 +2176,18 @@ " option)\n" " -H follow command-line symbolic links in SOURCE\n" msgstr "" +" -f, --force 如果有已存在的目标文件且无法打开，则将其删除并重试\n" +" （该选项在与 -n 选项同时使用时将被忽略）\n" +" -i, --interactive 覆盖前询问（使前面的 -n 选项失效）\n" +" -H 跟随源文件中的命令行符号链接\n" #: src/cp.c:178 msgid "" " -l, --link hard link files instead of copying\n" " -L, --dereference always follow symbolic links in SOURCE\n" msgstr "" +" -l, --link 硬链接文件以代替复制\n" +" -L, --dereference 总是跟随源文件中的符号链接\n" #: src/cp.c:182 msgid "" @@ -2134,7 +2209,7 @@ msgstr "" " -p\t\t\t\t等于--preserve=模式,所有权,时间戳\n" " --preserve[=属性列表\t保持指定的属性(默认：模式,所有权,时间戳)，如果\n" -"\t\t\t\t\t可能保持附加属性：环境、链接、xattr 等\n" +"\t\t\t\t\t可能保持附加属性：上下文、链接、xattr 等\n" #: src/cp.c:195 msgid "" @@ -2201,6 +2276,9 @@ " --context[=CTX] like -Z, or if CTX is specified then set the\n" " SELinux or SMACK security context to CTX\n" msgstr "" +" -Z 设置目标文件的 SELinux 安全上下文为默认类型\n" +" --context[=上下文] 类似 -Z；如果指定了上下文，则将 SELinux 或\n" +" SMACK 安全上下文设置为指定值\n" #: src/cp.c:231 msgid "" @@ -2213,11 +2291,10 @@ "Use --sparse=never to inhibit creation of sparse files.\n" msgstr "" "\n" -"默认情况下，源文件的稀疏性仅仅通过简单的方法判断，对应的目标文件目标文件也\n" -"被为稀疏。这是因为默认情况下使用了--sparse=auto 参数。如果明确使用\n" -"--sparse=always 参数则不论源文件是否包含足够长的0 序列也将目标文件创文\n" -"建为稀疏件。\n" -"使用--sparse=never 参数禁止创建稀疏文件。\n" +"默认情况下，源文件的稀疏性仅仅通过简单的方法判断，对应的目标文件目标文件\n" +"也将设为稀疏。这是因为默认情况下使用了--sparse=auto 参数。如果明确使用\n" +"--sparse=always 参数，则不论源文件是否包含足够长的 0 序列，都会将目标文件\n" +"创建为稀疏文件。使用 --sparse=never 参数可以禁止创建稀疏文件。\n" #: src/cp.c:239 msgid "" @@ -2228,6 +2305,10 @@ "fails, or if --reflink=auto is specified, fall back to a standard copy.\n" "Use --reflink=never to ensure a standard copy is performed.\n" msgstr "" +"\n" +"当指定了 --reflink[=always] 参数时，将进行轻量级复制，此时数据块只在被修改时\n" +"进行复制，如果无法如此操作则复制将会失败。或者如果指定了 --reflink=auto，程序\n" +"将会回退到标准复制操作。使用 --reflink=never 可以确保永远进行标准复制。\n" #: src/cp.c:247 msgid "" @@ -2243,36 +2324,36 @@ #: src/cp.c:306 #, c-format msgid "failed to preserve times for %s" -msgstr "无法保留%s 的时间" +msgstr "无法保留 %s 的时间" #: src/cp.c:337 #, c-format msgid "failed to preserve permissions for %s" -msgstr "保留%s 的权限失败" +msgstr "保留 %s 的权限失败" #: src/cp.c:473 #, c-format msgid "cannot make directory %s" -msgstr "无法创建目录%s" +msgstr "无法创建目录 %s" #: src/cp.c:522 src/cp.c:553 #, c-format msgid "%s exists but is not a directory" msgstr "%s 存在但并非目录" -#: src/cp.c:585 src/cp.c:1087 src/install.c:407 src/install.c:942 src/ln.c:134 -#: src/ln.c:198 src/ln.c:219 src/ln.c:503 src/mv.c:160 src/mv.c:393 +#: src/cp.c:585 src/cp.c:1087 src/install.c:407 src/install.c:942 src/ln.c:204 +#: src/ln.c:231 src/ln.c:536 src/mv.c:160 src/mv.c:393 #, c-format msgid "failed to access %s" -msgstr "访问%s 失败" +msgstr "访问 %s 失败" -#: src/cp.c:606 src/install.c:970 src/ln.c:534 src/mv.c:436 src/shred.c:1283 -#: src/touch.c:430 src/truncate.c:329 +#: src/cp.c:606 src/install.c:970 src/ln.c:567 src/mv.c:436 src/shred.c:1251 +#: src/touch.c:430 src/truncate.c:318 #, c-format msgid "missing file operand" msgstr "缺少了文件操作数" -#: src/cp.c:608 src/install.c:972 src/ln.c:548 src/mv.c:438 +#: src/cp.c:608 src/install.c:972 src/ln.c:590 src/mv.c:438 #, c-format msgid "missing destination file operand after %s" msgstr "在%s 后缺少了要操作的目标文件" @@ -2282,8 +2363,7 @@ msgstr "无法同时使用--target-directory (-t) 和--no-target-directory (-T) 选项" #: src/cp.c:635 src/cp.c:1090 src/install.c:409 src/install.c:945 -#: src/install.c:994 src/ln.c:136 src/ln.c:506 src/ln.c:562 src/mv.c:396 -#: src/mv.c:468 +#: src/install.c:994 src/ln.c:539 src/mv.c:396 src/mv.c:468 #, c-format msgid "target %s is not a directory" msgstr "目标%s 不是目录" @@ -2293,14 +2373,14 @@ msgid "with --parents, the destination must be a directory" msgstr "当跟随--parents 选项时，目的地必须是目录" -#: src/cp.c:1082 src/install.c:882 src/ln.c:498 src/mv.c:388 +#: src/cp.c:1082 src/install.c:882 src/ln.c:531 src/mv.c:388 msgid "multiple target directories specified" msgstr "指定了多个目标目录" #: src/cp.c:1124 src/install.c:918 #, c-format msgid "warning: ignoring --context; it requires an SELinux-enabled kernel" -msgstr "" +msgstr "警告：忽略 --context 参数；它需要启用 SELinux 的内核" #: src/cp.c:1145 #, c-format @@ -2317,17 +2397,17 @@ msgid "--reflink can be used only with --sparse=auto" msgstr "--reflink 只能与--sparse=auto 一起用" -#: src/cp.c:1166 src/install.c:950 src/ln.c:567 src/mv.c:483 +#: src/cp.c:1166 src/install.c:950 src/ln.c:637 src/mv.c:483 msgid "backup type" msgstr "备份方式" #: src/cp.c:1190 src/install.c:957 msgid "cannot set target context and preserve it" -msgstr "" +msgstr "无法设置目标上下文并将其保存" #: src/cp.c:1194 msgid "cannot preserve security context without an SELinux-enabled kernel" -msgstr "无法在未启用SELinux 支持的内核上使用安全环境" +msgstr "无法在未启用 SELinux 支持的内核上保存安全上下文" #: src/cp.c:1210 msgid "" @@ -2335,7 +2415,7 @@ msgstr "无法保留扩展属性，当前使用的 cp 副本编译时没有启用 xattr 支持" #. This is a proper name. See the gettext manual, section Names. -#: src/csplit.c:44 src/dd.c:47 +#: src/csplit.c:44 src/dd.c:46 msgid "Stuart Kemp" msgstr "Stuart Kemp" @@ -2363,7 +2443,7 @@ msgid "%s: %s: match not found" msgstr "%s：%s：无匹配" -#: src/csplit.c:838 src/csplit.c:878 src/nl.c:361 src/tac.c:286 +#: src/csplit.c:838 src/csplit.c:878 src/nl.c:357 src/tac.c:286 #, c-format msgid "error in regular expression search" msgstr "正则表达式搜索时出错" @@ -2381,17 +2461,17 @@ #: src/csplit.c:1106 #, c-format msgid "%s: '}' is required in repeat count" -msgstr "" +msgstr "%s：在重复计数中需要\"}\"字符" #: src/csplit.c:1117 #, c-format msgid "%s}: integer required between '{' and '}'" -msgstr "" +msgstr "%s}：在\"{\"和\"}\"之间需要一个整数声明" #: src/csplit.c:1144 #, c-format msgid "%s: closing delimiter '%c' missing" -msgstr "" +msgstr "%s：闭合分界符“%c”缺失" #: src/csplit.c:1161 #, c-format @@ -2447,7 +2527,7 @@ msgid "missing %% conversion specification in suffix" msgstr "下标中丢失了%% 转换规格字符" -#: src/csplit.c:1375 src/dd.c:1499 src/nproc.c:105 src/tail.c:2140 +#: src/csplit.c:1375 src/dd.c:1563 src/nproc.c:105 src/tail.c:2164 msgid "invalid number" msgstr "无效的数字" @@ -2461,6 +2541,8 @@ "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n" "and output byte counts of each piece to standard output.\n" msgstr "" +"按照指定的格式将文件分块为\"xx00\"、\"xx01\"...并输出。\n" +"同时每个分块文件的字节数也将被输出到标准输出。\n" #: src/csplit.c:1490 msgid "" @@ -2477,10 +2559,13 @@ " -f, --prefix=PREFIX use PREFIX instead of 'xx'\n" " -k, --keep-files do not remove output files on errors\n" msgstr "" +" -b, --suffix-format=格式 使用 sprintf 格式字符串代替 %02d\n" +" -f, --prefix=前缀 使用指定前缀代替\"xx\"\n" +" -k, --keep-files 不移除错误的输出文件\n" #: src/csplit.c:1502 msgid " --suppress-matched suppress the lines matching PATTERN\n" -msgstr "" +msgstr " --suppress-matched 不显示匹配格式字符串的行\n" #: src/csplit.c:1505 msgid "" @@ -2504,6 +2589,15 @@ "\n" "A line OFFSET is a required '+' or '-' followed by a positive integer.\n" msgstr "" +"\n" +"每个指定的格式可以为：\n" +" 整数 复制至指定行号（不包括该行）\n" +" /正则/[偏移量] 复制至匹配行（不包括该行）\n" +" %正则%[偏移量] 跳过直至匹配行（不包括该行）\n" +" {整数} 将之前指定的模式重复指定的次数\n" +" {*} 将之前指定的模式重复尽可能多的次数\n" +"\n" +"一个行的偏移量需要在正整数值之前声明 '+' 或 '-'。\n" #. This is a proper name. See the gettext manual, section Names. #: src/cut.c:45 src/paste.c:52 @@ -2517,7 +2611,7 @@ #: src/cut.c:151 msgid "Print selected parts of lines from each FILE to standard output.\n" -msgstr "" +msgstr "从每个输入<文件>中输出指定部分到标准输出。\n" #: src/cut.c:158 msgid "" @@ -2576,6 +2670,11 @@ " N-M from N'th to M'th (included) byte, character or field\n" " -M from first to M'th (included) byte, character or field\n" msgstr "" +"每种参数格式表示范围如下：\n" +" N 从第1个开始数的第N个字节、字符或域\n" +" N- 从第N个开始到所在行结束的所有字符、字节或域\n" +" N-M 从第N个开始到第M个之间(包括第M个)的所有字符、字节或域\n" +" -M 从第1个开始到第M个之间(包括第M个)的所有字符、字节或域\n" #: src/cut.c:511 src/cut.c:519 msgid "only one type of list may be specified" @@ -2613,23 +2712,26 @@ #: src/date.c:135 msgid "" "Display the current time in the given FORMAT, or set the system date.\n" -msgstr "" +msgstr "以给定<格式>字符串的形式显示当前时间，或者设置系统日期。\n" #: src/date.c:141 msgid "" " -d, --date=STRING display time described by STRING, not 'now'\n" -msgstr "" +msgstr " -d, --date=字符串 显示给定<字符串>描述的时间，而非“当前时间”\n" #: src/date.c:144 msgid "" " --debug annotate the parsed date,\n" " and warn about questionable usage to stderr\n" msgstr "" +" --debug 对解析的日期添加注释，\n" +" 对不规范的使用方式进行警告，并输出警告信息到\n" +" 标准错误\n" #: src/date.c:148 msgid "" " -f, --file=DATEFILE like --date; once for each line of DATEFILE\n" -msgstr "" +msgstr " -f, --file=日期文件 类似 --date；使用给定<日期文件>，一次处理一行\n" #: src/date.c:151 msgid "" @@ -2640,12 +2742,19 @@ "precision.\n" " Example: 2006-08-14T02:34:56-06:00\n" msgstr "" +" -I[FMT], --iso-8601[=FMT] 以 ISO 8601 格式输出日期/时间。\n" +" FMT='date' 时只输出日期（默认行为），\n" +" 当其为 'hours'、'minutes'、'seconds' 或 'ns' 时\n" +" 则按照所指示的精确度显示日期和时间。\n" +" 示例：2006-08-14T02:34:56-06:00\n" #: src/date.c:158 msgid "" " -R, --rfc-email output date and time in RFC 5322 format.\n" " Example: Mon, 14 Aug 2006 02:34:56 -0600\n" msgstr "" +" -R, --rfc-email 以 RFC 5322 格式输出日期和时间。\n" +" 例如：Mon, 14 Aug 2006 02:34:56 -0600\n" #: src/date.c:162 msgid "" @@ -2655,17 +2764,23 @@ "precision.\n" " Example: 2006-08-14 02:34:56-06:00\n" msgstr "" +" --rfc-3339=格式 以 RFC 3339 格式输出日期/时间。\n" +" <格式>字符串可以是'date'、'seconds' 或 'ns'，\n" +" 用于指定日期和时间显示的精确度。\n" +" 例如：2006-08-14 02:34:56-06:00\n" #: src/date.c:168 msgid "" " -r, --reference=FILE display the last modification time of FILE\n" -msgstr "" +msgstr " -r, --reference=文件 显示指定<文件>的最后修改时间\n" #: src/date.c:171 msgid "" " -s, --set=STRING set time described by STRING\n" " -u, --utc, --universal print or set Coordinated Universal Time (UTC)\n" msgstr "" +" -s, --set=字符串 按照给定<字符串>描述的时间来设置时间\n" +" -u, --utc, --universal 按照协调世界时（UTC）显示或设置时间\n" #: src/date.c:177 msgid "" @@ -2734,6 +2849,10 @@ " %m month (01..12)\n" " %M minute (00..59)\n" msgstr "" +" %k 小时，空格补充空白位（ 0..23）；与 %_H 相同\n" +" %l 小时，空格补充空白位（ 1..12）；与 %_I 相同\n" +" %m 月份（01..12）\n" +" %M 分钟（00..59）\n" #: src/date.c:213 msgid "" @@ -2746,6 +2865,14 @@ " %R 24-hour hour and minute; same as %H:%M\n" " %s seconds since 1970-01-01 00:00:00 UTC\n" msgstr "" +" %n 换行\n" +" %N 纳秒（000000000..999999999）\n" +" %p 当前地区时间设置中 AM 或 PM 的等效值（“上午”或“下午”），未知则为空\n" +" %P 类似 %p，但使用小写\n" +" %q 一年中的季度（1..4）\n" +" %r 当前地区时间中十二小时制钟表时间（例如，下午 11时11分04秒）\n" +" %R 24 小时制的时间和分钟；和 %H:%M 相同\n" +" %s 1970-01-01 00:00:00 UTC 以来的秒数\n" #: src/date.c:223 msgid "" @@ -2813,7 +2940,7 @@ " # use opposite case if possible\n" msgstr "" -#: src/date.c:259 +#: src/date.c:260 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -2826,7 +2953,7 @@ "作为一个可选的修饰声明，它可以是E，在可能的情况下使用本地环境关联的\n" "表示方式；或者是O，在可能的情况下使用本地环境关联的数字符号。\n" -#: src/date.c:266 +#: src/date.c:267 msgid "" "\n" "Examples:\n" @@ -2839,58 +2966,71 @@ "Show the local time for 9AM next Friday on the west coast of the US\n" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" msgstr "" +"\n" +"示例：\n" +"将 epoch（1970-01-01 UTC）以来的秒数转换为日期\n" +" $ date --date='@2147483647'\n" +"\n" +"显示美国东海岸的当前时间（请使用 tzselect(1) 来查询 TZ 的具体数值）\n" +" $ TZ='America/Los_Angeles' date\n" +"\n" +"显示美国东海岸下一个星期五当地时间早上九点\n" +" $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" -#: src/date.c:300 src/dd.c:2416 src/head.c:880 src/md5sum.c:672 -#: src/md5sum.c:1107 src/od.c:913 src/od.c:1978 src/pr.c:1148 src/pr.c:1347 -#: src/pr.c:1470 src/stty.c:1368 src/tac.c:574 src/tail.c:364 src/tee.c:174 -#: src/tr.c:1911 src/tsort.c:541 src/wc.c:205 +#: src/date.c:301 src/dd.c:2475 src/head.c:881 src/md5sum.c:672 +#: src/md5sum.c:1107 src/od.c:915 src/od.c:1984 src/pr.c:1149 src/pr.c:1348 +#: src/pr.c:1471 src/stty.c:1368 src/tac.c:574 src/tail.c:387 src/tee.c:174 +#: src/tr.c:1911 src/tsort.c:535 src/wc.c:223 msgid "standard input" msgstr "标准输入" -#: src/date.c:329 src/date.c:557 +#: src/date.c:330 src/date.c:558 #, c-format msgid "invalid date %s" -msgstr "无效的日期%s" +msgstr "无效的日期 %s" -#: src/date.c:443 src/date.c:477 +#: src/date.c:444 src/date.c:478 msgid "multiple output formats specified" msgstr "指定了多种输出格式" -#: src/date.c:455 +#: src/date.c:456 #, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "被指定的这几种日期显示选项是相互抵触的" -#: src/date.c:462 +#: src/date.c:463 #, c-format msgid "the options to print and set the time may not be used together" msgstr "显示与设置时间的选项不能同时使用" -#: src/date.c:483 +#: src/date.c:484 #, c-format msgid "" "the argument %s lacks a leading '+';\n" "when using an option to specify date(s), any non-option\n" "argument must be a format string beginning with '+'" msgstr "" +"参数 %s 缺少前导的\"+\"；\n" +"当使用选项来描述日期时，任何非选项参数都必须以\"+\"所引导\n" +"的字符串出现" -#: src/date.c:565 +#: src/date.c:566 #, c-format msgid "cannot set date" msgstr "无法设置日期" -#: src/date.c:599 src/du.c:388 +#: src/date.c:600 src/du.c:389 #, c-format msgid "time %s is out of range" msgstr "时间%s 超出范围" #. This is a proper name. See the gettext manual, section Names. -#: src/dd.c:45 src/factor.c:128 src/rm.c:40 src/tail.c:72 src/touch.c:42 +#: src/dd.c:44 src/factor.c:128 src/rm.c:40 src/tail.c:76 src/touch.c:42 #: src/wc.c:50 msgid "Paul Rubin" msgstr "Paul Rubin" -#: src/dd.c:564 +#: src/dd.c:558 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -2899,7 +3039,7 @@ "用法：%s [操作数] ...\n" "　或：%s 选项\n" -#: src/dd.c:569 +#: src/dd.c:563 msgid "" "Copy a file, converting and formatting according to the operands.\n" "\n" @@ -2911,8 +3051,16 @@ " count=N copy only N input blocks\n" " ibs=BYTES read up to BYTES bytes at a time (default: 512)\n" msgstr "" +"复制文件，依照指定操作数转换并格式化。\n" +"\n" +" bs=字节数 一次读写的比特数（默认：512）；\n" +" 会覆盖 ibs 和 obs 选项\n" +" cbs=字节数 一次转换的字节数\n" +" conv=CONVS 依照每个逗号分割的符号列表转换文件\n" +" count=块数 只将复制指定数量的输入块\n" +" ibs=字节数 一次读取的字节数（默认：512)\n" -#: src/dd.c:579 +#: src/dd.c:573 msgid "" " if=FILE read from FILE instead of stdin\n" " iflag=FLAGS read as per the comma separated symbol list\n" @@ -2926,6 +3074,17 @@ " 'noxfer' suppresses the final transfer statistics,\n" " 'progress' shows periodic transfer statistics\n" msgstr "" +" if=文件 从指定文件而非标准输入来进行读取\n" +" iflag=标志 按照以逗号分隔的符号列表指定的方式读取\n" +" obs=字节数 一次写入指定字节数（默认：512）\n" +" of=文件 写入到指定文件而非标准输出\n" +" oflag=标志 按照以逗号分隔的符号列表指定的方式写入\n" +" seek=块数 在输出开始处跳过指定的 obs 大小的块数\n" +" skip=块数 在输入开始处跳过指定的 ibs 大小的块数\n" +" status=等级 要输出到标准错误的信息等级；\n" +" 'none' 将仅输出错误信息，\n" +" 'noxfer' 将不输出最终传输统计信息，\n" +" 'progress' 将显示周期性的传输统计信息\n" #: src/dd.c:592 msgid "" @@ -2953,7 +3112,7 @@ " with block or unblock, pad with spaces rather than NULs\n" msgstr "" -#: src/dd.c:614 +#: src/dd.c:609 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -2962,14 +3121,14 @@ " fdatasync physically write output file data before finishing\n" " fsync likewise, but also write metadata\n" msgstr "" -" excl\t\tfail if the output file already exists\n" -" nocreat\tdo not create the output file\n" -" notrunc\t不截断输出文件\n" -" noerror\t读取数据发生错误后仍然继续\n" -" fdatasync\t结束前将输出文件数据写入磁盘\n" -" fsync\t类似上面，但是元数据也一同写入\n" +" excl 如果输出文件已存在则认为操作失败\n" +" nocreat 不要创建输出文件\n" +" notrunc 不要截断输出文件\n" +" noerror 读取数据发生错误后仍然继续\n" +" fdatasync 结束前将输出文件数据物理上写入磁盘\n" +" fsync 与上者类似，但也将元数据一同写入\n" -#: src/dd.c:622 +#: src/dd.c:617 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -2982,75 +3141,75 @@ "\n" " append\t追加模式(仅对输出有意义；隐含了conv=notrunc)\n" -#: src/dd.c:629 +#: src/dd.c:624 msgid " cio use concurrent I/O for data\n" -msgstr " cio\t使用并行I/O 存取模式\n" +msgstr " cio 使用并行 I/O 存取数据\n" -#: src/dd.c:631 +#: src/dd.c:626 msgid " direct use direct I/O for data\n" -msgstr " direct\t使用直接I/O 存取模式\n" +msgstr " direct 使用直接I/O 存取模式\n" -#: src/dd.c:633 +#: src/dd.c:628 msgid " directory fail unless a directory\n" -msgstr " directory\t除非是目录，否则 directory 失败\n" +msgstr " directory 除非是目录，否则操作失败\n" -#: src/dd.c:635 +#: src/dd.c:630 msgid " dsync use synchronized I/O for data\n" -msgstr " dsync\t\t使用同步I/O 存取模式\n" +msgstr " dsync 使用同步 I/O 存取模式\n" -#: src/dd.c:637 +#: src/dd.c:632 msgid " sync likewise, but also for metadata\n" -msgstr " sync\t\t与上者类似，但同时也对元数据生效\n" +msgstr " sync 与上者类似，但同时也对元数据生效\n" -#: src/dd.c:638 +#: src/dd.c:633 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr " fullblock\t为输入积累完整块(仅iflag)\n" -#: src/dd.c:641 +#: src/dd.c:636 msgid " nonblock use non-blocking I/O\n" msgstr " nonblock\t使用无阻塞I/O 存取模式\n" -#: src/dd.c:643 +#: src/dd.c:638 msgid " noatime do not update access time\n" -msgstr " noatime\t不更新存取时间\n" +msgstr " noatime 不更新访问时间\n" -#: src/dd.c:646 +#: src/dd.c:641 msgid " nocache Request to drop cache. See also oflag=sync\n" -msgstr "" +msgstr " nocache 请求不使用缓存。参见 oflag=sync\n" -#: src/dd.c:650 +#: src/dd.c:645 msgid " noctty do not assign controlling terminal from file\n" msgstr " noctty\t不根据文件指派控制终端\n" -#: src/dd.c:653 +#: src/dd.c:648 msgid " nofollow do not follow symlinks\n" -msgstr " nofollow\t不跟随链接文件\n" +msgstr " nofollow 不跟随链接文件\n" -#: src/dd.c:655 +#: src/dd.c:650 msgid " nolinks fail if multiply-linked\n" msgstr " nolinks\t如果有多重链接，则nolinks 失败\n" -#: src/dd.c:657 +#: src/dd.c:652 msgid " binary use binary I/O for data\n" -msgstr " binary\t使用二进制I/O 存取模式\n" +msgstr " binary 使用二进制 I/O 存取模式\n" -#: src/dd.c:659 +#: src/dd.c:654 msgid " text use text I/O for data\n" -msgstr " text\t使用文本I/O 存取模式\n" +msgstr " text 使用文本 I/O 存取模式\n" -#: src/dd.c:661 +#: src/dd.c:656 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" -msgstr "" +msgstr " count_bytes 把 'count=N' 看作字节计数（仅 iflag）\n" -#: src/dd.c:664 +#: src/dd.c:659 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" -msgstr "" +msgstr " skip_bytes 把 'skip=N' 看作字节计数（仅 iflag）\n" -#: src/dd.c:667 +#: src/dd.c:662 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" -msgstr "" +msgstr " seek_bytes 把 'seek=N' 看作字节计数（仅 oflag）\n" -#: src/dd.c:671 +#: src/dd.c:666 #, c-format msgid "" "\n" @@ -3060,39 +3219,44 @@ "Options are:\n" "\n" msgstr "" +"\n" +"向正在运行的 'dd' 进程发送 %s 信号可以令其向标准错误输出 I/O\n" +"统计数据并继续进行复制。\n" +"\n" +"选项有：\n" +"\n" -#: src/dd.c:707 +#: src/dd.c:702 #, c-format msgid "memory exhausted by input buffer of size % bytes (%s)" -msgstr "" +msgstr "% 字节的输入缓冲导致内存耗尽（%s）" -#: src/dd.c:735 +#: src/dd.c:730 #, c-format msgid "memory exhausted by output buffer of size % bytes (%s)" -msgstr "" +msgstr "% 字节的输出缓冲导致内存耗尽（%s）" -#: src/dd.c:803 src/du.c:400 +#: src/dd.c:798 src/du.c:401 msgid "Infinity" -msgstr "" +msgstr "无穷量" -#: src/dd.c:822 +#: src/dd.c:817 #, c-format msgid "% byte copied, %s, %s" msgid_plural "% bytes copied, %s, %s" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%字节已复制，%s，%s" -#: src/dd.c:828 +#: src/dd.c:823 #, c-format msgid "% bytes (%s) copied, %s, %s" -msgstr "" +msgstr "%字节（%s）已复制，%s，%s" -#: src/dd.c:831 +#: src/dd.c:826 #, c-format msgid "% bytes (%s, %s) copied, %s, %s" -msgstr "" +msgstr "%字节（%s，%s）已复制，%s，%s" -#: src/dd.c:863 +#: src/dd.c:858 #, c-format msgid "" "%+% records in\n" @@ -3101,79 +3265,79 @@ "记录了%+% 的读入\n" "记录了%+% 的写出\n" -#: src/dd.c:869 +#: src/dd.c:864 #, c-format msgid "% truncated record\n" msgid_plural "% truncated records\n" msgstr[0] "% 个被截断了的块\n" -#: src/dd.c:954 +#: src/dd.c:966 #, c-format msgid "closing input file %s" msgstr "正在关闭输入文件%s" -#: src/dd.c:961 +#: src/dd.c:973 #, c-format msgid "closing output file %s" msgstr "正在关闭输出文件%s" -#: src/dd.c:1194 +#: src/dd.c:1207 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "无法关闭O_DIRECT：%s" -#: src/dd.c:1269 src/dd.c:2138 +#: src/dd.c:1282 src/dd.c:2202 #, c-format msgid "writing to %s" msgstr "正在写入%s" -#: src/dd.c:1388 +#: src/dd.c:1452 #, c-format msgid "warning: %s is a zero multiplier; use %s if that is intended" -msgstr "" +msgstr "警告：%s 是一个零乘数；如这与意图相同，请使用 %s" -#: src/dd.c:1426 src/dd.c:1487 +#: src/dd.c:1490 src/dd.c:1551 #, c-format msgid "unrecognized operand %s" -msgstr "无法识别的操作数%s" +msgstr "无法识别的操作数 %s" -#: src/dd.c:1438 +#: src/dd.c:1502 msgid "invalid conversion" msgstr "转换无效" -#: src/dd.c:1441 src/dd.c:1530 +#: src/dd.c:1505 src/dd.c:1594 msgid "invalid input flag" msgstr "输入标志无效" -#: src/dd.c:1444 src/dd.c:1524 src/dd.c:1536 +#: src/dd.c:1508 src/dd.c:1588 src/dd.c:1600 msgid "invalid output flag" msgstr "输出标志无效" -#: src/dd.c:1447 +#: src/dd.c:1511 msgid "invalid status level" -msgstr "" +msgstr "状态等级无效" -#: src/dd.c:1582 +#: src/dd.c:1646 msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "不可将{ascii、ebcdic、idm}中的任意两个结合使用" -#: src/dd.c:1584 +#: src/dd.c:1648 msgid "cannot combine block and unblock" msgstr "不可将block 和unblock 结合使用" -#: src/dd.c:1586 +#: src/dd.c:1650 msgid "cannot combine lcase and ucase" msgstr "不可将lcase 和ucase 结合使用" -#: src/dd.c:1588 +#: src/dd.c:1652 msgid "cannot combine excl and nocreat" msgstr "不可将excl 和nocreat 结合使用" -#: src/dd.c:1591 +#: src/dd.c:1655 msgid "cannot combine direct and nocache" msgstr "不可将direct 和nocreat 结合使用" -#: src/dd.c:1748 +#: src/dd.c:1812 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3182,176 +3346,176 @@ "警告：暂时避免有关文件%s 的lseek 内核错误\n" " 错误地址在mt_type=0x%0lx -- 有关mt_type 类型的列表请参考" -#: src/dd.c:1836 +#: src/dd.c:1900 #, c-format msgid "%s: cannot skip" msgstr "%s：无法跳过" -#: src/dd.c:1838 src/dd.c:1869 src/dd.c:1930 +#: src/dd.c:1902 src/dd.c:1933 src/dd.c:1994 #, c-format msgid "%s: cannot seek" msgstr "%s：无法搜索" -#: src/dd.c:1910 +#: src/dd.c:1974 #, c-format msgid "offset overflow while reading file %s" msgstr "读入文件%s 时偏移量溢出" -#: src/dd.c:1922 +#: src/dd.c:1986 #, c-format msgid "warning: invalid file offset after failed read" msgstr "警告：文件读取失败后偏移错误" -#: src/dd.c:1926 +#: src/dd.c:1990 #, c-format msgid "cannot work around kernel bug after all" msgstr "无法避免内核的错误" -#: src/dd.c:2065 +#: src/dd.c:2129 #, c-format msgid "setting flags for %s" msgstr "正在设置%s 的标记" -#: src/dd.c:2119 +#: src/dd.c:2183 #, c-format msgid "%s: cannot skip to specified offset" msgstr "%s：无法跳至指定偏移量" -#: src/dd.c:2348 +#: src/dd.c:2412 #, c-format msgid "failed to truncate to % bytes in output file %s" -msgstr "" +msgstr "无法针对输出文件 %2$s 的 %1$ 字节处实施截断" -#: src/dd.c:2361 +#: src/dd.c:2425 #, c-format msgid "fdatasync failed for %s" msgstr "%s 的fdatasync 失败" -#: src/dd.c:2371 +#: src/dd.c:2433 #, c-format msgid "fsync failed for %s" msgstr "%s 的fsync 失败" -#: src/dd.c:2422 src/dd.c:2452 src/nohup.c:164 src/nohup.c:166 +#: src/dd.c:2481 src/dd.c:2511 src/nohup.c:157 src/nohup.c:159 #, c-format msgid "failed to open %s" msgstr "打开%s 失败" -#: src/dd.c:2462 +#: src/dd.c:2521 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=% (%lu-byte) " "blocks" msgstr "偏移量过大：无法在seek=% (%lu-字节) 块的长度上实施截断" -#: src/dd.c:2483 +#: src/dd.c:2542 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "无法针对输出文件%2$s 的%1$ 字节处实施截断" -#: src/dd.c:2500 src/dd.c:2506 +#: src/dd.c:2559 src/dd.c:2565 #, c-format msgid "failed to discard cache for: %s" msgstr "无法丢弃缓存：%s" #. This is a proper name. See the gettext manual, section Names. -#: src/df.c:46 src/du.c:55 src/expr.c:153 src/kill.c:34 src/pathchk.c:31 -#: src/shuf.c:41 src/sleep.c:36 src/sort.c:67 +#: src/df.c:50 src/du.c:56 src/expr.c:153 src/kill.c:34 src/pathchk.c:31 +#: src/shuf.c:41 src/sleep.c:35 src/sort.c:68 msgid "Paul Eggert" msgstr "Paul Eggert" # ## Proof reading to here. -#: src/df.c:178 +#: src/df.c:182 msgid "Filesystem" msgstr "文件系统" -#: src/df.c:181 +#: src/df.c:185 msgid "Type" msgstr "类型" -#: src/df.c:184 src/df.c:551 +#: src/df.c:188 src/df.c:602 msgid "blocks" msgstr "块" -#: src/df.c:187 +#: src/df.c:191 msgid "Used" msgstr "已用" -#: src/df.c:190 +#: src/df.c:194 msgid "Available" msgstr "可用" -#: src/df.c:193 +#: src/df.c:197 msgid "Use%" msgstr "已用%" -#: src/df.c:196 +#: src/df.c:200 msgid "Inodes" -msgstr "Inode" +msgstr "Inodes" -#: src/df.c:199 +#: src/df.c:203 msgid "IUsed" msgstr "已用(I)" -#: src/df.c:202 +#: src/df.c:206 msgid "IFree" msgstr "可用(I)" -#: src/df.c:205 +#: src/df.c:209 msgid "IUse%" msgstr "已用(I)%" -#: src/df.c:208 +#: src/df.c:212 msgid "Mounted on" msgstr "挂载点" -#: src/df.c:211 +#: src/df.c:215 msgid "File" msgstr "文件" -#: src/df.c:391 +#: src/df.c:442 #, c-format msgid "option --output: field %s unknown" -msgstr "" +msgstr "选项 --output：字段 %s 未知" -#: src/df.c:398 +#: src/df.c:449 #, c-format msgid "option --output: field %s used more than once" -msgstr "" +msgstr "选项 --output：字段 %s 使用了超过一次" -#: src/df.c:419 src/df.c:458 +#: src/df.c:470 src/df.c:509 msgid "Size" msgstr "容量" -#: src/df.c:423 src/df.c:460 +#: src/df.c:474 src/df.c:511 msgid "Avail" msgstr "可用" -#: src/df.c:483 +#: src/df.c:534 msgid "Capacity" msgstr "配额" #. TRANSLATORS: this is the "1K-blocks" header in "df" output. #. TRANSLATORS: this is the "1024-blocks" header in "df -P". -#: src/df.c:554 src/df.c:563 +#: src/df.c:605 src/df.c:614 #, c-format msgid "%s-%s" msgstr "%s-%s" -#: src/df.c:1290 +#: src/df.c:1343 #, c-format msgid "cannot access %s: over-mounted by another device" -msgstr "" +msgstr "无法访问 %s：已由另一个设备挂载" -#: src/df.c:1459 +#: src/df.c:1512 msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" -msgstr "" +msgstr "显示每个指定文件所在的文件系统的信息，默认是显示所有文件系统。\n" #. TRANSLATORS: The thousands and decimal separators are best #. adjusted to an appropriate default for your locale. -#: src/df.c:1468 +#: src/df.c:1521 msgid "" " -a, --all include pseudo, duplicate, inaccessible file " "systems\n" @@ -3361,8 +3525,14 @@ " -h, --human-readable print sizes in powers of 1024 (e.g., 1023M)\n" " -H, --si print sizes in powers of 1000 (e.g., 1.1G)\n" msgstr "" +" -a, --all 包含虚拟、重复和无法访问的文件系统\n" +" -B, --block-size=大小 使用指定字节数的块。例如，'-BM' 将以\n" +" 1,048,576 字节为单位显示大小。\n" +" 参见 SIZE 格式。\n" +" -h, --human-readable 以 1024 为基底显示大小（例如：1023M）\n" +" -H, --si 以 1000 为基底显示大小（例如，1.1G）\n" -#: src/df.c:1476 +#: src/df.c:1529 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3375,7 +3545,7 @@ " -l, --local\t\t只显示本机的文件系统\n" " --no-sync\t\t取得使用量数据前不进行同步动作(默认)\n" -#: src/df.c:1483 +#: src/df.c:1536 msgid "" " --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" " or print all fields if FIELD_LIST is " @@ -3383,48 +3553,60 @@ " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" msgstr "" +" --output[=域列表] 使用给定域列表定义的输出格式，\n" +" 或者在缺省情况下输出所有域。\n" +" -P, --portability 使用 POSIX 兼容的输出格式\n" +" --sync 取得使用量数据前先调用同步（sync）动作\n" -#: src/df.c:1489 +#: src/df.c:1542 msgid "" " --total elide all entries insignificant to available space,\n" " and produce a grand total\n" -msgstr "" +msgstr " --total 省略所有对可用空间无显著影响的项并生成总计值\n" -#: src/df.c:1493 +#: src/df.c:1546 msgid "" " -t, --type=TYPE limit listing to file systems of type TYPE\n" " -T, --print-type print file system type\n" " -x, --exclude-type=TYPE limit listing to file systems not of type TYPE\n" " -v (ignored)\n" msgstr "" +" -t, --type=类型 只显示指定文件系统为指定类型的信息\n" +" -T, --print-type 显示文件系统类型\n" +" -x, --exclude-type=类型 只显示文件系统不是指定类型的信息\n" +" -v （忽略）\n" -#: src/df.c:1503 +#: src/df.c:1556 msgid "" "\n" "FIELD_LIST is a comma-separated list of columns to be included. Valid\n" "field names are: 'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent',\n" "'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n" msgstr "" +"\n" +"“域列表”是由逗号分隔的列表，指示需要包含在内的列。有效的域名称包括：\n" +"'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent', 'size',\n" +"'used', 'avail', 'pcent', 'file' 和 'target'（请参考 info 信息页）。\n" -#: src/df.c:1540 +#: src/df.c:1593 #, c-format msgid "options %s and %s are mutually exclusive" -msgstr "" +msgstr "选项 %s 和 %s 是互斥的" -#: src/df.c:1690 +#: src/df.c:1743 #, c-format msgid "file system type %s both selected and excluded" -msgstr "不能同时选择和排除文件系统类型%s" +msgstr "不能同时选择和排除文件系统类型 %s" -#: src/df.c:1749 +#: src/df.c:1802 msgid "Warning: " msgstr "警告： " -#: src/df.c:1751 src/stat.c:904 +#: src/df.c:1804 src/stat.c:944 msgid "cannot read table of mounted file systems" msgstr "%s 无法读取已挂载上的文件系统的目录" -#: src/df.c:1788 +#: src/df.c:1841 msgid "no file systems processed" msgstr "未处理文件系统" @@ -3433,7 +3615,7 @@ msgid "H. Peter Anvin" msgstr "H. Peter Anvin" -#: src/dircolors.c:99 src/uptime.c:204 src/users.c:111 +#: src/basenc.c:101 src/dircolors.c:99 src/uptime.c:199 src/users.c:105 #, c-format msgid "Usage: %s [OPTION]... [FILE]\n" msgstr "用法：%s [选项]... [文件]\n" @@ -3461,6 +3643,10 @@ "file types and extensions. Otherwise, a precompiled database is used.\n" "For details on the format of these files, run 'dircolors --print-database'.\n" msgstr "" +"\n" +"如果指定了文件，则读取该文件的数据来决定文件类型及扩展名相应的颜色。\n" +"否则，会使用默认的数据库。如要了解此文件格式的细节，请执行：\n" +"\"dircolors --print-database\"。\n" #: src/dircolors.c:288 #, c-format @@ -3505,10 +3691,13 @@ "directory).\n" "\n" msgstr "" +"输出已经去除了尾部的\"/\"字符之后部分和最末尾斜线的名称；\n" +"如果名称中不包含\"/\"，则显示\".\"（表示当前目录）。\n" +"\n" #: src/dirname.c:59 msgid " -z, --zero end each output line with NUL, not newline\n" -msgstr "" +msgstr " -z, --zero 以 NUL 空字符而非换行符结束每一输出行\n" #: src/dirname.c:64 #, c-format @@ -3519,8 +3708,13 @@ " %s dir1/str dir2/str -> \"dir1\" followed by \"dir2\"\n" " %s stdio.h -> \".\"\n" msgstr "" +"\n" +"示例：\n" +" %s /usr/bin/ -> \"/usr\"\n" +" %s dir1/str dir2/str -> \"dir1\" 后接 \"dir2\"\n" +" %s stdio.h -> \".\"\n" -#: src/du.c:284 src/sort.c:427 src/wc.c:115 +#: src/du.c:285 src/sort.c:415 src/wc.c:118 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3529,12 +3723,12 @@ "用法：%s [选项]... [文件]...\n" "　或：%s [选项]... --files0-from=F\n" -#: src/du.c:288 +#: src/du.c:289 msgid "" "Summarize disk usage of the set of FILEs, recursively for directories.\n" -msgstr "" +msgstr "计算每个文件的磁盘用量，目录则取总用量。\n" -#: src/du.c:294 +#: src/du.c:295 msgid "" " -0, --null end each output line with NUL, not newline\n" " -a, --all write counts for all files, not just directories\n" @@ -3544,8 +3738,13 @@ " larger due to holes in ('sparse') files, internal\n" " fragmentation, indirect blocks, and the like\n" msgstr "" +" -0, --null 每行输出使用 NUL 空字符结尾而非使用换行符\n" +" -a, --all 输出所有文件的磁盘用量，不仅仅是目录\n" +" --apparent-size 显示表面用量，而并非是磁盘用量；虽然表面用量通常会\n" +" 小一些，但有时它会因为稀疏文件间的“洞”、内部碎\n" +" 片、非直接引用的块等原因显得更大一些。\n" -#: src/du.c:303 +#: src/du.c:304 msgid "" " -B, --block-size=SIZE scale sizes by SIZE before printing them; e.g.,\n" " '-BM' prints sizes in units of 1,048,576 bytes;\n" @@ -3560,8 +3759,17 @@ " line argument; --max-depth=0 is the same as\n" " --summarize\n" msgstr "" +" -B, --block-size=大小 以指定大小为单位对块大小进行输出；例如，\n" +" 'BM' 以 1,048,576 字节为单位输出大小；\n" +" 详情请参见下方的“SIZE 格式”部分\n" +" -b, --bytes 等效于 '--apparent-size --block-size=1'\n" +" -c, --total 显示总计信息\n" +" -D, --dereference-args 只在符号链接显式在命令行列出时对其进行解引用\n" +" -d, --max-depth=N 仅当目录（或在 --all 选项启用时包括文件）层级不高于\n" +" 命令行参数指定的 N 层时输出对应目录或文件的对应大小；\n" +" --max-depth=0 等效于 --summarize\n" -#: src/du.c:316 +#: src/du.c:317 msgid "" " --files0-from=F summarize disk usage of the\n" " NUL-terminated file names specified in file F;\n" @@ -3571,16 +3779,26 @@ "2G)\n" " --inodes list inode usage information instead of block usage\n" msgstr "" +" --files0-from=F 统计由文件 F 给出的由 NUL 空字符结束的文件名列表\n" +" 所对应各个文件的信息；如果 F 是 -，则从标准输入\n" +" 读取文件名列表\n" +" -H 等效于 --dereference-args (-D)\n" +" -h, --human-readable 以人类可读的格式输出大小（例如，1K 234M 2G）\n" +" --inodes 列出 inode 使用信息而非块使用信息\n" -#: src/du.c:325 +#: src/du.c:326 msgid "" " -k like --block-size=1K\n" " -L, --dereference dereference all symbolic links\n" " -l, --count-links count sizes many times if hard linked\n" " -m like --block-size=1M\n" msgstr "" +" -k 等效于 --block-size=1K\n" +" -L, --dereference 解引用所有符号链接\n" +" -l, --count-links 如果是硬连接，则重复计算其尺寸\n" +" -m 等效于 --block-size=1M\n" -#: src/du.c:331 +#: src/du.c:332 msgid "" " -P, --no-dereference don't follow any symbolic links (this is the " "default)\n" @@ -3589,8 +3807,12 @@ " --si like -h, but use powers of 1000 not 1024\n" " -s, --summarize display only a total for each argument\n" msgstr "" +" -P, --no-dereference 不跟随任何符号链接（默认行为）\n" +" -S, --separate-dirs 不包括子目录的占用量\n" +" --si 类似 -h，但使用 1000 的倍数，而非 1024\n" +" -s, --summarize 只分别计算命令列中每个参数所占的总用量\n" -#: src/du.c:337 +#: src/du.c:338 msgid "" " -t, --threshold=SIZE exclude entries smaller than SIZE if positive,\n" " or entries greater than SIZE if negative\n" @@ -3603,72 +3825,83 @@ " full-iso, long-iso, iso, or +FORMAT;\n" " FORMAT is interpreted like in 'date'\n" msgstr "" +" -t, --threshold=大小 如果指定大小为正值，排除比该值更小的项，\n" +" 或者在值为负时排除更大的项\n" +" --time 显示目录中或其子目录下所有文件的最后修改时间\n" +" --time=关键字 显示指定关键字对应的时间而非最后修改时间：\n" +" atime, access, use, ctime 或 status\n" +" --time-style=格式 使用指定格式显示时间，格式可以为：\n" +" full-iso, long-iso, iso 或 +FORMAT；\n" +" FORMAT 字符串以与 'date' 工具类似的方式解读\n" -#: src/du.c:348 +#: src/du.c:349 msgid "" " -X, --exclude-from=FILE exclude files that match any pattern in FILE\n" " --exclude=PATTERN exclude files that match PATTERN\n" " -x, --one-file-system skip directories on different file systems\n" msgstr "" +" -X, --exclude-from=文件 排除所有与指定<文件>所提供模式匹配的文件\n" +" --exclude=模式 排除所有与所给<模式>匹配的文件\n" +" -x, --one-file-system 跳过位于不同文件系统上的目录\n" -#: src/du.c:695 +#: src/du.c:696 #, c-format msgid "fts_read failed: %s" msgstr "fts_read 失败：%s" -#: src/du.c:819 +#: src/du.c:820 #, c-format msgid "invalid maximum depth %s" msgstr "目录最大深度%s 无效" -#: src/du.c:848 +#: src/du.c:849 msgid "invalid --threshold argument '-0'" -msgstr "" +msgstr "无效的 --threshold 参数 '-0'" -#: src/du.c:931 +#: src/du.c:932 #, c-format msgid "cannot both summarize and show all entries" msgstr "不能既显示总用量，同时又显示每个项目" -#: src/du.c:938 +#: src/du.c:939 #, c-format msgid "warning: summarizing is the same as using --max-depth=0" msgstr "警告：显示总用量等价于使用--max-depth=0" -#: src/du.c:944 +#: src/du.c:945 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "警告：显示总用量的选项和--max-depth=%lu 互斥" -#: src/du.c:955 +#: src/du.c:956 #, c-format msgid "warning: options --apparent-size and -b are ineffective with --inodes" -msgstr "" +msgstr "警告：选项 --apparent-size 和 -b 对 --inodes 无效" -#: src/du.c:1020 src/sort.c:4597 src/wc.c:739 +#: src/du.c:1021 src/sort.c:4598 src/wc.c:760 msgid "file operands cannot be combined with --files0-from" msgstr "文件操作数不能于--files0-from 参数一起使用" -#: src/du.c:1087 src/sort.c:4618 src/wc.c:817 +#: src/du.c:1088 src/sort.c:4619 src/wc.c:838 #, c-format msgid "when reading file names from stdin, no file name of %s allowed" msgstr "当从标准输入读取时，不允许指定文件名%s" -#: src/du.c:1104 src/du.c:1112 src/wc.c:830 src/wc.c:838 +#: src/du.c:1105 src/du.c:1113 src/wc.c:851 src/wc.c:859 msgid "invalid zero-length file name" msgstr "无效的零长度文件名" #. This is a proper name. See the gettext manual, section Names. -#: src/echo.c:26 +#: src/echo.c:27 msgid "Brian Fox" msgstr "Brian Fox" #. This is a proper name. See the gettext manual, section Names. -#: src/echo.c:27 +#: src/echo.c:28 msgid "Chet Ramey" msgstr "Chet Ramey" -#: src/echo.c:41 +#: src/echo.c:42 #, c-format msgid "" "Usage: %s [SHORT-OPTION]... [STRING]...\n" @@ -3677,7 +3910,7 @@ "用法：%s [短选项]... [字符串]...\n" "　或：%s 长选项\n" -#: src/echo.c:45 +#: src/echo.c:46 msgid "" "Echo the STRING(s) to standard output.\n" "\n" @@ -3687,7 +3920,7 @@ "\n" " -n\t\t不尾随换行符\n" -#: src/echo.c:51 +#: src/echo.c:52 msgid "" " -e enable interpretation of backslash escapes (default)\n" " -E disable interpretation of backslash escapes\n" @@ -3695,7 +3928,7 @@ " -e\t\t启用解释反斜杠的转义功能(默认)\n" " -E\t\t禁用解释反斜杠的转义功能\n" -#: src/echo.c:54 +#: src/echo.c:55 msgid "" " -e enable interpretation of backslash escapes\n" " -E disable interpretation of backslash escapes (default)\n" @@ -3703,7 +3936,7 @@ " -e\t\t启用解释反斜杠的转义功能\n" " -E\t\t禁用解释反斜杠的转义功能(默认)\n" -#: src/echo.c:60 +#: src/echo.c:61 msgid "" "\n" "If -e is in effect, the following sequences are recognized:\n" @@ -3713,7 +3946,7 @@ "若-e 可用，则以下序列即可识别：\n" "\n" -#: src/echo.c:65 src/printf.c:110 +#: src/echo.c:66 src/printf.c:110 msgid "" " \\\\ backslash\n" " \\a alert (BEL)\n" @@ -3737,7 +3970,7 @@ " \\t 水平制表符\n" " \\v 竖直制表符\n" -#: src/echo.c:77 +#: src/echo.c:78 msgid "" " \\0NNN byte with octal value NNN (1 to 3 digits)\n" " \\xHH byte with hexadecimal value HH (1 to 2 digits)\n" @@ -3746,32 +3979,35 @@ " \\xHH 字节数以十六进制数 HH (1至2位)表示\n" #. This is a proper name. See the gettext manual, section Names. -#: src/env.c:35 src/printenv.c:45 src/whoami.c:36 +#: src/env.c:38 src/printenv.c:45 src/whoami.c:35 msgid "Richard Mlynarik" msgstr "Richard Mlynarik" #. This is a proper name. See the gettext manual, section Names. -#: src/env.c:37 src/numfmt.c:43 +#: src/basenc.c:38 src/env.c:40 src/numfmt.c:43 msgid "Assaf Gordon" -msgstr "" +msgstr "Assaf Gordon" -#: src/env.c:73 +#: src/env.c:112 #, c-format msgid "Usage: %s [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]\n" msgstr "用法：%s [选项]... [-] [名称=值]... [命令 [参数]...]\n" -#: src/env.c:76 +#: src/env.c:115 msgid "Set each NAME to VALUE in the environment and run COMMAND.\n" -msgstr "" +msgstr "在环境中设置每个给定变量<名称>的值为给定<值>，并运行给定<命令>。\n" -#: src/env.c:82 +#: src/env.c:121 msgid "" " -i, --ignore-environment start with an empty environment\n" " -0, --null end each output line with NUL, not newline\n" " -u, --unset=NAME remove variable from the environment\n" msgstr "" +" -i, --ignore-environment 以空环境启动\n" +" -0, --null 以 NUL 空字符而非换行符结束每一输出行\n" +" -u, --unset=名称 从当前环境中移除一个变量\n" -#: src/env.c:87 +#: src/env.c:126 msgid " -C, --chdir=DIR change working directory to DIR\n" msgstr " -C, --chdir=目录 将工作目录变更为指定目录\n" @@ -3782,7 +4018,7 @@ " -v, --debug print verbose information for each processing step\n" msgstr "" -#: src/env.c:97 +#: src/env.c:150 msgid "" "\n" "A mere - implies -i. If no COMMAND, print the resulting environment.\n" @@ -3790,62 +4026,62 @@ "\n" "单纯的 - 意味着 -i。如果没有命令，则打印结果环境。\n" -#: src/env.c:122 +#: src/env.c:181 #, c-format msgid "cannot unset %s" -msgstr "无法撤消 %s" +msgstr "无法取消设置 %s" -#: src/env.c:256 +#: src/env.c:315 msgid "'\\c' must not appear in double-quoted -S string" -msgstr "" +msgstr "'\\c' 不能出现在双引号括起的 -S 字符串中" -#: src/env.c:260 +#: src/env.c:319 msgid "invalid backslash at end of string in -S" -msgstr "" +msgstr "-S 中字符串末尾无效的反斜杠" -#: src/env.c:263 +#: src/env.c:322 #, c-format msgid "invalid sequence '\\%c' in -S" -msgstr "" +msgstr "-S 中的无效序列 '\\%c'" -#: src/env.c:277 +#: src/env.c:336 #, c-format msgid "only ${VARNAME} expansion is supported, error at: %s" -msgstr "" +msgstr "只支持 ${VARNAME} 扩展，错误位于：%s" -#: src/env.c:288 +#: src/env.c:347 msgid "no terminating quote in -S string" -msgstr "" +msgstr "-S 字符串中没有结束的引号" -#: src/env.c:573 +#: src/env.c:857 #, c-format msgid "invalid option -- '%c'" -msgstr "" +msgstr "无效的选项 -- \"%c\"" -#: src/env.c:574 src/env.c:658 +#: src/env.c:858 src/env.c:949 #, c-format msgid "use -[v]S to pass options in shebang lines" -msgstr "" +msgstr "使用 -[v]S 以在 shebang 行中传递选项" -#: src/env.c:607 +#: src/env.c:891 #, c-format msgid "cannot set %s" msgstr "无法设定 %s" -#: src/env.c:617 +#: src/env.c:901 #, c-format msgid "cannot specify --null (-0) with command" msgstr "无法以命令指定--null (-0)" -#: src/env.c:623 +#: src/env.c:907 #, c-format msgid "must specify command with --chdir (-C)" -msgstr "" +msgstr "必须带 --chdir (-C) 指定命令" -#: src/env.c:641 +#: src/env.c:932 #, c-format msgid "cannot change directory to %s" -msgstr "" +msgstr "无法变更目录为 %s" #: src/expand-common.c:90 msgid "tabs are too far apart" @@ -3854,22 +4090,22 @@ #: src/expand-common.c:103 #, c-format msgid "'/' specifier only allowed with the last value" -msgstr "" +msgstr "‘/’符号只允许与最后一个值合用" #: src/expand-common.c:120 #, c-format msgid "'+' specifier only allowed with the last value" -msgstr "" +msgstr "‘+’符号只允许与最后一个值合用" #: src/expand-common.c:172 #, c-format msgid "'/' specifier not at start of number: %s" -msgstr "" +msgstr "‘/’符号没有位于数字之前：%s" #: src/expand-common.c:183 #, c-format msgid "'+' specifier not at start of number: %s" -msgstr "" +msgstr "‘+’符号没有位于数字之前：%s" #: src/expand-common.c:204 #, c-format @@ -3891,11 +4127,11 @@ #: src/expand-common.c:251 msgid "'/' specifier is mutually exclusive with '+'" -msgstr "" +msgstr "‘/’符号和‘+’符号不能同时使用" #: src/expand-common.c:390 msgid " -t, --tabs=LIST use comma separated list of tab positions\n" -msgstr "" +msgstr " -t, --tabs=列表 指定制表符位置列表，用逗号分隔\n" #: src/expand-common.c:393 msgid "" @@ -3906,23 +4142,29 @@ " the last specified tab stop instead of the first " "column\n" msgstr "" +" 最后的指定位置可以前缀加上‘/’符号以声明在最后一个\n" +" 明确指定制表符位置的声明之后对应位置的倍数均为制表符。\n" +" 另外，还可以使用‘+’的前缀以声明在最后一个明确指定\n" +" 位置的制表符之后每隔多少的位置间距是一个制表符\n" #: src/expand.c:73 msgid "Convert tabs in each FILE to spaces, writing to standard output.\n" -msgstr "" +msgstr "将每个指定文件中的制表符转换为空格，写到标准输出。\n" #: src/expand.c:80 msgid "" " -i, --initial do not convert tabs after non blanks\n" " -t, --tabs=N have tabs N characters apart, not 8\n" msgstr "" +" -i, --initial 不转换非空白字符后的制表符\n" +" -t, --tabs=数字 设置每个制表符为指定数字的宽度，而不是默认的 8\n" #: src/expand.c:146 src/expand.c:165 src/unexpand.c:181 src/unexpand.c:226 msgid "input line is too long" msgstr "输入行太长" #. This is a proper name. See the gettext manual, section Names. -#: src/expr.c:151 src/ln.c:42 src/mv.c:42 src/tee.c:36 +#: src/expr.c:151 src/ln.c:51 src/mv.c:42 src/tee.c:36 msgid "Mike Parker" msgstr "Mike Parker" @@ -4024,6 +4266,10 @@ "\n" " ( EXPRESSION ) value of EXPRESSION\n" msgstr "" +" + 记号 将给定记号解析为字符串，即使它是一个类似\n" +" “match”或运算符\"/\"那样的关键字\n" +"\n" +" ( 表达式 ) 给定<表达式>的值\n" #: src/expr.c:399 msgid "" @@ -4054,12 +4300,12 @@ #: src/expr.c:462 #, c-format msgid "syntax error: unexpected argument %s" -msgstr "" +msgstr "语法错误：未预期的参数 %s" #: src/expr.c:665 #, c-format msgid "syntax error: missing argument after %s" -msgstr "" +msgstr "语法错误：%s 后缺少参数" #: src/expr.c:748 src/ptx.c:289 msgid "error in regular expression matcher" @@ -4068,29 +4314,29 @@ #: src/expr.c:776 #, c-format msgid "syntax error: expecting ')' after %s" -msgstr "" +msgstr "语法错误：期望在 %s 后得到“)”" #: src/expr.c:779 #, c-format msgid "syntax error: expecting ')' instead of %s" -msgstr "" +msgstr "语法错误：期望得到“)”而非 %s" #: src/expr.c:785 msgid "syntax error: unexpected ')'" -msgstr "" +msgstr "语法错误：未预期的“)”" #: src/expr.c:931 src/expr.c:968 msgid "non-integer argument" msgstr "非整数参数" -#: src/expr.c:933 src/truncate.c:289 +#: src/expr.c:933 src/truncate.c:278 msgid "division by zero" msgstr "除以零" -#: src/expr.c:1027 src/sort.c:2113 +#: src/expr.c:1027 src/sort.c:2119 #, c-format msgid "set LC_ALL='C' to work around the problem" -msgstr "请设置LC_ALL='C' 以避免出现问题。" +msgstr "请设置 LC_ALL='C' 以避免出现问题" #: src/expr.c:1029 #, c-format @@ -4100,23 +4346,23 @@ #. This is a proper name. See the gettext manual, section Names. #: src/factor.c:130 msgid "Niels Moller" -msgstr "" +msgstr "Niels Moller" #: src/factor.c:1276 src/factor.c:1376 src/factor.c:1452 #, c-format msgid "Lucas prime test failure. This should not happen" -msgstr "" +msgstr "Lucas 素数测试失败。这不应该发生" #: src/factor.c:2103 msgid "squfof queue overflow" -msgstr "" +msgstr "squfof 队列溢出" #: src/factor.c:2525 #, c-format msgid "%s is not a valid positive integer" msgstr "%s 不是有效的正整数" -#: src/factor.c:2549 src/od.c:1691 src/od.c:1772 +#: src/factor.c:2549 src/od.c:1697 src/od.c:1778 #, c-format msgid "%s is too large" msgstr "%s 太大" @@ -4148,7 +4394,7 @@ #: src/find-mount-point.c:92 #, c-format msgid "cannot change to directory %s" -msgstr "无法进入目录%s" +msgstr "无法变更目录为 %s" #: src/find-mount-point.c:70 #, c-format @@ -4170,6 +4416,8 @@ "Reformat each paragraph in the FILE(s), writing to standard output.\n" "The option -WIDTH is an abbreviated form of --width=DIGITS.\n" msgstr "" +"对给定<文件>的每一段进行重新格式化，写入到标准输出。\n" +"选项“-宽度”是“--width=宽度数字”的缩写。\n" #: src/fmt.c:278 msgid "" @@ -4178,10 +4426,10 @@ " reattaching the prefix to reformatted lines\n" " -s, --split-only split long lines, but do not refill\n" msgstr "" -" -c --crown-margin\t\t保持前两行的缩进\n" -" -p, --prefix=字符串\t\t只对以指定字符串开头的行重新格式化，\n" -"\t\t\t\t将前缀重新附着到被重新格式化的行上\n" -" -s, --split-only\t\t分割过长的行，但不自动补足\n" +" -c, --crown-margin 保持前两行的缩进\n" +" -p, --prefix=字符串 只对以指定字符串开头的行重新格式化，\n" +" 将前缀重新附着到被重新格式化的行上\n" +" -s, --split-only 分割过长的行，但不自动补足\n" #: src/fmt.c:287 #, no-c-format @@ -4191,6 +4439,10 @@ " -w, --width=WIDTH maximum line width (default of 75 columns)\n" " -g, --goal=WIDTH goal width (default of 93% of width)\n" msgstr "" +" -t, --tagged-paragraph 对第一行进行缩进以和第二行区分\n" +" -u, --uniform-spacing 单词间保留一个空格，每句之后保留两个空格\n" +" -w, --width=宽度 最大行宽（默认为 75 列）\n" +" -g, --goal=目标宽度 目标宽度（默认为上述最大行宽的 93%）\n" #: src/fmt.c:355 #, c-format @@ -4201,11 +4453,11 @@ #: src/fmt.c:399 src/fmt.c:406 msgid "invalid width" -msgstr "" +msgstr "无效的宽度" #: src/fold.c:70 msgid "Wrap input lines in each FILE, writing to standard output.\n" -msgstr "" +msgstr "对每个指定的文件设置自动换行（折行），并将重新排版后的结果输出到标准输出。\n" #: src/fold.c:77 msgid "" @@ -4217,9 +4469,9 @@ " -s, --spaces\t\t在空格处断行\n" " -w, --width=宽度\t使用指定的列宽度代替默认的80\n" -#: src/fold.c:284 src/pr.c:840 +#: src/fold.c:284 src/pr.c:841 msgid "invalid number of columns" -msgstr "" +msgstr "无效的列数" #. This is a proper name. See the gettext manual, section Names. #: src/getlimits.c:30 src/md5sum.c:107 src/realpath.c:33 src/stdbuf.c:38 @@ -4240,12 +4492,12 @@ "为Shell 脚本格式输出基于操作平台的限制参数。\n" "\n" -#: src/group-list.c:68 src/id.c:414 +#: src/group-list.c:68 src/id.c:401 #, c-format msgid "failed to get groups for user %s" -msgstr "获取用户%s 的属组失败" +msgstr "获取用户 %s 的属组失败" -#: src/group-list.c:73 src/id.c:417 +#: src/group-list.c:73 src/id.c:404 #, c-format msgid "failed to get groups for the current process" msgstr "获取当前进程用户组失败" @@ -4253,7 +4505,7 @@ #: src/group-list.c:113 #, c-format msgid "cannot find name for group ID %lu" -msgstr "无法找到ID 为%lu 的用户的属组" +msgstr "无法找到 ID 为 %lu 的用户的属组" #: src/groups.c:54 #, c-format @@ -4267,19 +4519,19 @@ "the current process (which may differ if the groups database has changed).\n" msgstr "显示每个输入的用户名所在的全部组，如果没有指定用户名则默认为当前进程用户(当用户组数据库发生变更时可能导致差异)。\n" -#: src/groups.c:106 src/id.c:277 +#: src/groups.c:106 src/id.c:289 msgid "cannot get real UID" -msgstr "" +msgstr "无法获取真实 UID" -#: src/groups.c:111 src/id.c:285 +#: src/groups.c:111 src/id.c:297 msgid "cannot get effective GID" -msgstr "" +msgstr "无法获取有效 GID" -#: src/groups.c:116 src/id.c:290 +#: src/groups.c:116 src/id.c:302 msgid "cannot get real GID" -msgstr "" +msgstr "无法获取真实 UID" -#: src/groups.c:130 src/id.c:249 +#: src/groups.c:130 src/id.c:255 #, c-format msgid "%s: no such user" msgstr "%s：无此用户" @@ -4290,6 +4542,8 @@ "Print the first %d lines of each FILE to standard output.\n" "With more than one FILE, precede each with a header giving the file name.\n" msgstr "" +"将每个指定文件的前 %d 行输出到标准输出。\n" +"如果指定了多于一个文件，在每块输出之前附加文件名称作为头部。\n" #: src/head.c:122 #, c-format @@ -4302,6 +4556,12 @@ " with the leading '-', print all but the last\n" " NUM lines of each file\n" msgstr "" +" -c, --bytes=[-]K 显示每个文件的前 K 字节内容；\n" +" 如果数字前附加“-”字符，则除了每个文件的\n" +" 最后 K 字节数据外显示其余全部内容\n" +" -n, --lines=[-]K 显示每个文件的前 K 行内容而非前 %d 行内容；\n" +" 如果数字前附加“-”字符，则除了每个文件的\n" +" 最后 K 行数据外显示其余全部内容\n" #: src/head.c:130 msgid "" @@ -4319,41 +4579,41 @@ "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n" msgstr "" -#: src/head.c:159 +#: src/head.c:160 #, c-format msgid "%s: file has shrunk too much" msgstr "%s：文件被过度收缩" -#: src/head.c:231 src/tail.c:484 +#: src/head.c:232 src/tail.c:507 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s：无法检索到偏移量%s" -#: src/head.c:232 src/tail.c:488 +#: src/head.c:233 src/tail.c:511 #, c-format msgid "%s: cannot seek to relative offset %s" msgstr "%s：无法检索相对偏移量 %s" -#: src/head.c:274 +#: src/head.c:275 #, c-format msgid "%s: number of bytes is too large" msgstr "%s：字节数过大" -#: src/head.c:912 src/split.c:1367 src/split.c:1534 src/tail.c:2181 +#: src/head.c:913 src/split.c:1368 src/split.c:1535 src/tail.c:2205 msgid "invalid number of lines" -msgstr "无效的号码%s" +msgstr "无效的行数" -#: src/head.c:913 src/head.c:1077 src/split.c:1359 src/split.c:1375 -#: src/tail.c:2182 +#: src/head.c:914 src/head.c:1078 src/split.c:1360 src/split.c:1376 +#: src/tail.c:2206 msgid "invalid number of bytes" -msgstr "无效的号码%s" +msgstr "无效的字节数" -#: src/head.c:1003 src/head.c:1065 +#: src/head.c:1004 src/head.c:1066 #, c-format msgid "invalid trailing option -- %c" -msgstr "无效的加附选项 -- %c" +msgstr "无效的附加选项 -- %c" -#: src/hostid.c:47 +#: src/hostid.c:41 #, c-format msgid "" "Usage: %s [OPTION]\n" @@ -4364,7 +4624,7 @@ "显示当前主机的数字标识符(十六进制)。\n" "\n" -#: src/hostname.c:62 +#: src/hostname.c:56 #, c-format msgid "" "Usage: %s [NAME]\n" @@ -4377,16 +4637,16 @@ "显示或设置当前系统的主机名。\n" "\n" -#: src/hostname.c:100 +#: src/hostname.c:93 #, c-format msgid "cannot set name to %s" msgstr "无法设置主机名为%s" -#: src/hostname.c:104 +#: src/hostname.c:97 msgid "cannot set hostname; this system lacks the functionality" msgstr "无法设置主机名，此系统似乎不具备此功能" -#: src/hostname.c:112 +#: src/hostname.c:105 msgid "cannot determine hostname" msgstr "无法确定主机名" @@ -4398,7 +4658,7 @@ #: src/id.c:85 #, c-format msgid "Usage: %s [OPTION]... [USER]\n" -msgstr "" +msgstr "用法: %s [选项]... [用户]\n" #: src/id.c:86 msgid "" @@ -4407,7 +4667,7 @@ "\n" msgstr "" -#: src/id.c:91 +#: src/id.c:102 msgid "" " -a ignore, for compatibility with other versions\n" " -Z, --context print only the security context of the process\n" @@ -4419,8 +4679,16 @@ " -z, --zero delimit entries with NUL characters, not whitespace;\n" " not permitted in default format\n" msgstr "" +" -a 忽略，仅为与其他版本相兼容而设计\n" +" -Z, --context 仅显示当前用户的安全上下文\n" +" -g, --group 仅显示有效用户组ID\n" +" -G, --groups 显示所有组ID\n" +" -n, --name 显示组名称而非数字，与 -ugG 一起使用\n" +" -r, --real 显示真实ID 而非有效ID，与 -ugG 一起使用\n" +" -u, --user 仅显示有效用户ID\n" +" -z, --zero 使用 NUL 字符而非空格来分隔各个条目，在默认格式下不可使用\n" -#: src/id.c:104 +#: src/id.c:115 msgid "" "\n" "Without any OPTION, print some useful set of identified information.\n" @@ -4428,126 +4696,126 @@ "\n" "如果不附带任何选项，程序会显示一些可供识别用户身份的有用信息。\n" -#: src/id.c:152 +#: src/id.c:153 msgid "--context (-Z) works only on an SELinux/SMACK-enabled kernel" -msgstr "" +msgstr "--context (-Z) 选项只能在开启 SELinux/SMACK 支持的内核上使用" -#: src/id.c:157 +#: src/id.c:158 msgid "--context (-Z) works only on an SELinux-enabled kernel" -msgstr "--context (-Z) 选项只能在开启SELinux 支持的内核上使用" +msgstr "--context (-Z) 选项只能在开启 SELinux 支持的内核上使用" -#: src/id.c:196 +#: src/id.c:192 msgid "cannot print security context when user specified" -msgstr "不能显示特定用户的安全环境" +msgstr "不能显示特定用户的安全上下文" -#: src/id.c:199 +#: src/id.c:195 msgid "cannot print \"only\" of more than one choice" msgstr "有多种选择，无法输出唯一的" -#: src/id.c:208 +#: src/id.c:204 msgid "cannot print only names or real IDs in default format" -msgstr "以默认格式无法只显示名称或只显示真实ID。" +msgstr "以默认格式无法只显示名称或只显示真实ID" -#: src/id.c:212 +#: src/id.c:208 msgid "option --zero not permitted in default format" -msgstr "" +msgstr "默认格式不允许使用选项 --zero" -#: src/id.c:228 +#: src/id.c:224 msgid "can't get process context" -msgstr "不能得到进程环境" +msgstr "不能得到进程上下文" -#: src/id.c:268 +#: src/id.c:280 msgid "cannot get effective UID" -msgstr "" +msgstr "无法获取有效 UID" -#: src/id.c:357 +#: src/id.c:344 #, c-format msgid "cannot find name for user ID %s" -msgstr "" +msgstr "无法找到 ID 为 %s 的用户的名称" -#: src/id.c:375 +#: src/id.c:362 #, c-format msgid "uid=%s" -msgstr "" +msgstr "用户id=%s" -#: src/id.c:380 +#: src/id.c:367 #, c-format msgid " gid=%s" -msgstr "" +msgstr " 组id=%s" -#: src/id.c:387 +#: src/id.c:374 #, c-format msgid " euid=%s" -msgstr "" +msgstr " 有效用户id=%s" -#: src/id.c:395 +#: src/id.c:382 #, c-format msgid " egid=%s" -msgstr "" +msgstr " 有效组id=%s" -#: src/id.c:423 +#: src/id.c:410 msgid " groups=" msgstr " 组=" -#: src/id.c:439 +#: src/id.c:426 #, c-format msgid " context=%s" -msgstr " 环境=%s" +msgstr " 上下文=%s" #: src/install.c:378 #, c-format msgid "warning: %s: failed to change context to %s" -msgstr "警告：%s：切换到%s 用户环境失败" +msgstr "警告：%s：切换上下文至 %s 失败" #: src/install.c:420 #, c-format msgid "creating directory %s" -msgstr "正在创建目录%s" +msgstr "正在创建目录 %s" #: src/install.c:432 src/mkdir.c:128 src/mkdir.c:161 #, c-format msgid "failed to set default creation context for %s" -msgstr "" +msgstr "设置 %s 的默认创建上下文失败" #: src/install.c:462 src/mkdir.c:181 #, c-format msgid "failed to restore context for %s" -msgstr "" +msgstr "恢复 %s 的上下文失败" #: src/install.c:510 #, c-format msgid "cannot change ownership of %s" -msgstr "无法更改%s 的所有权" +msgstr "无法更改 %s 的所有权" #: src/install.c:534 #, c-format msgid "cannot set timestamps for %s" -msgstr "" +msgstr "无法设置 %s 的时间戳" -#: src/install.c:556 src/split.c:522 src/timeout.c:506 +#: src/install.c:556 src/split.c:523 src/timeout.c:506 #, c-format msgid "fork system call failed" -msgstr "创建系统进程(fork)出错" +msgstr "fork 系统调用失败" #: src/install.c:560 #, c-format msgid "cannot run %s" -msgstr "无法运行%s" +msgstr "无法运行 %s" #: src/install.c:563 #, c-format msgid "waiting for strip" -msgstr "等待拆解" +msgstr "正在等待 strip" #: src/install.c:565 #, c-format msgid "strip process terminated abnormally" -msgstr "拆解过程非正常中止" +msgstr "strip 进程非正常中止" #: src/install.c:589 #, c-format msgid "invalid user %s" -msgstr "无效的用户%s" +msgstr "无效的用户 %s" #: src/install.c:627 #, c-format @@ -4575,6 +4843,14 @@ "the existing DIRECTORY, while setting permission modes and owner/group.\n" "In the 4th form, create all components of the given DIRECTORY(ies).\n" msgstr "" +"\n" +"本 install 程序将文件（通常是刚编译生成的文件）复制到您所选择的目标\n" +"位置。如果您希望在 GNU/Linux 操作系统上下载并安装一个即时可用的软件包，\n" +"您应当使用诸如 yum(1) 和 apt-get(1) 的软件包管理器而非本程序。\n" +"\n" +"在前三种形式中，将指定<源文件>复制到<目标文件>或将多个<源文件>复制到一个\n" +"已存在的<目录>中，同时设置其所有权和权限模式。在第四种形式中，\n" +"创建给出目标<目录>中的所有组件。\n" #: src/install.c:648 msgid "" @@ -4587,11 +4863,11 @@ " -d, --directory treat all arguments as directory names; create all\n" " components of the specified directories\n" msgstr "" -" --backup[=CONTROL]\t为每个已存在的文件创建备份\n" -" -b\t\t\t类似--backup 但不接受参数\n" -" -c\t\t\t(忽略)\n" -" -C, --compare\t\t比较每组源文件和目标文件，在一些情况下不修改目标文件\n" -" -d, --directory\t将所有参数视为目录名称；为指定的目录创建所有组件\n" +" --backup[=CONTROL] 为每个已存在的文件创建备份\n" +" -b 类似--backup 但不接受参数\n" +" -c （被忽略）\n" +" -C, --compare 比较每组源文件和目标文件，在一些情况下不修改目标文件\n" +" -d, --directory 将所有参数视为目录名称；为指定的目录创建所有组件\n" #: src/install.c:657 msgid "" @@ -4605,6 +4881,12 @@ "x\n" " -o, --owner=OWNER set ownership (super-user only)\n" msgstr "" +" -D 创建<目标文件>的所有必要的父目录，或者\n" +" --target-directory 路径的所有部分，\n" +" 然后将<源文件>复制为给定的<目标文件>\n" +" -g, --group=组 显式设置文件所属组，而不是进程目前的所属组\n" +" -m, --mode=模式 显式设置权限模式（如 chmod），而非 rwxr-xr-x\n" +" -o, --owner=所有者 显式设置所有者（适用于超级用户）\n" #: src/install.c:665 msgid "" @@ -4635,11 +4917,16 @@ " --context[=CTX] like -Z, or if CTX is specified then set the\n" " SELinux or SMACK security context to CTX\n" msgstr "" +" --preserve-context 保持 SELinux 安全上下文\n" +" -Z 设置每个创建的目录和目标文件的 SELinux 安全上下文\n" +" 为默认格式\n" +" --context[=上下文] 类似 -Z，或者如果指定了上下文，则将 SELinux 或\n" +" SMACK 安全上下文设置为给定的值\n" -#: src/install.c:711 src/unlink.c:92 +#: src/install.c:711 src/unlink.c:85 #, c-format msgid "cannot unlink %s" -msgstr "无法清除%s 的链接" +msgstr "无法清除 %s 的链接（unlink 失败）" #: src/install.c:892 #, c-format @@ -4655,7 +4942,7 @@ msgid "target directory not allowed when installing a directory" msgstr "安装目录时不能用目标目录选项" -#: src/install.c:1002 src/mkdir.c:284 src/stdbuf.c:351 +#: src/install.c:1002 src/mkdir.c:284 src/stdbuf.c:352 #, c-format msgid "invalid mode %s" msgstr "无效模式%s" @@ -4685,7 +4972,7 @@ msgstr "当您使用不允许的比特数指定模式是--compare (-C) 选项被忽略" #. This is a proper name. See the gettext manual, section Names. -#: src/join.c:41 src/sort.c:66 +#: src/join.c:41 src/sort.c:67 msgid "Mike Haertel" msgstr "Mike Haertel" @@ -4694,6 +4981,8 @@ "For each pair of input lines with identical join fields, write a line to\n" "standard output. The default join field is the first, delimited by blanks.\n" msgstr "" +"对具有相同的合并域的每一对输入行，在标准输出写出一行信息。默认的合并\n" +"域是第一列的内容，使用空白字符分隔。\n" #: src/join.c:205 msgid "" @@ -4702,6 +4991,10 @@ " FILENUM is 1 or 2, corresponding to FILE1 or FILE2\n" " -e EMPTY replace missing input fields with EMPTY\n" msgstr "" +"\n" +" -a 文件编号 文件编号的值可以是1或2，分别对应<文件1>和<文件2>。\n" +" 此选项用于根据指定文件编号输出不成对的行目。\n" +" -e 填充字符 将缺失的输入区块替换为指定字符\n" #: src/join.c:211 msgid "" @@ -4710,6 +5003,10 @@ " -o FORMAT obey FORMAT while constructing output line\n" " -t CHAR use CHAR as input and output field separator\n" msgstr "" +" -i, --ignore-case 比较各个域时忽略大小写\n" +" -j 域 等效于 \"-1 域 -2 域\"\n" +" -o 格式 按照指定格式构造输出行\n" +" -t 字符 使用指定字符作为输入和输出域的分隔符\n" #: src/join.c:217 msgid "" @@ -4729,9 +5026,9 @@ " --nocheck-order \t不检查输入是否正确排序\n" " --header \t将首行视作域的头部，直接输出而不对其进行匹配\n" -#: src/join.c:227 src/shuf.c:83 src/sort.c:512 src/uniq.c:206 +#: src/join.c:227 src/shuf.c:83 src/sort.c:500 src/uniq.c:201 msgid " -z, --zero-terminated line delimiter is NUL, not newline\n" -msgstr "" +msgstr " -z, --zero-terminated 以 NUL 空字符而非换行符作为行尾分隔符\n" #: src/join.c:232 msgid "" @@ -4751,46 +5048,57 @@ "If the input is not sorted and some lines cannot be joined, a\n" "warning message will be given.\n" msgstr "" +"\n" +"除非使用了“-t 字符串”选项，否则前导空格分隔的域将被忽略，如果指定了\n" +"字符串，则使用指定字符串分隔任意的域并从 1 开始计数的域编号。可以指定的\n" +"格式是由一个或多个逗号活空格所分隔的描述，其形式为“文件编号.域”或者\n" +"“0”。默认的格式输出合并后的域、文件1和文件2剩下的域，均由该指定字符\n" +"串分隔。\n" +"\n" +"重要提示：<文件1>和<文件2>必须在合并域中排序。\n" +"例如，如果“join”后没有选项，使用“sort -k 1b,1”。\n" +"注意，所进行的比较遵从“LC_COLLATE”所指定的的规则。\n" +"如果输入没有被排序并导致某些行无法合并，将会显示警告信息。\n" #: src/join.c:417 #, c-format msgid "%s:%: is not sorted: %.*s" -msgstr "" +msgstr "%s:%：未排序：%.*s" -#: src/join.c:849 src/join.c:1047 +#: src/join.c:848 src/join.c:1046 #, c-format msgid "invalid field number: %s" msgstr "无效的区块编号%s" -#: src/join.c:870 src/join.c:879 +#: src/join.c:869 src/join.c:878 #, c-format msgid "invalid field specifier: %s" msgstr "无效的区块定义符：%s" -#: src/join.c:886 +#: src/join.c:885 #, c-format msgid "invalid file number in field spec: %s" msgstr "在区块定义中出现无效的文件编号：%s" -#: src/join.c:930 +#: src/join.c:929 #, c-format msgid "incompatible join fields %lu, %lu" msgstr "不兼容的连接区块%lu，%lu" -#: src/join.c:1058 +#: src/join.c:1057 msgid "conflicting empty-field replacement strings" msgstr "有冲突的空区块替换字符串" -#: src/join.c:1110 src/sort.c:4534 +#: src/join.c:1109 src/sort.c:4535 #, c-format msgid "multi-character tab %s" msgstr "多字符标签%s" -#: src/join.c:1114 src/sort.c:4539 +#: src/join.c:1113 src/sort.c:4540 msgid "incompatible tabs" msgstr "不兼容的标签" -#: src/join.c:1187 +#: src/join.c:1186 msgid "both files cannot be standard input" msgstr "不能从标准输入同时读取两个文件" @@ -4807,7 +5115,7 @@ #: src/kill.c:83 msgid "Send signals to processes, or list signals.\n" -msgstr "" +msgstr "向进程发送信号，或是列出可用信号。\n" #: src/kill.c:89 msgid "" @@ -4829,6 +5137,10 @@ "or the exit status of a process terminated by a signal.\n" "PID is an integer; if negative it identifies a process group.\n" msgstr "" +"\n" +"参数中的信号可以是类似\"HUP\"的信号名称，也可以是如\"1\"这样的信号编码，\n" +"或者进程被信号终止后的退出状态号。\n" +"进程号（PID）是一个整数，如果为负数则表示一个进程组。\n" #: src/kill.c:206 #, c-format @@ -4860,27 +5172,27 @@ msgid "no process ID specified" msgstr "未指定进程号" -#: src/libstdbuf.c:112 +#: src/libstdbuf.c:120 #, c-format msgid "failed to allocate a % byte stdio buffer\n" msgstr "分配 % 字节标准输入输出(stdio)缓冲区失败\n" -#: src/libstdbuf.c:119 +#: src/libstdbuf.c:108 #, c-format msgid "invalid buffering mode %s for %s\n" msgstr "%2$s 的缓冲模式%1$s 无效\n" -#: src/libstdbuf.c:127 +#: src/libstdbuf.c:130 #, c-format msgid "could not set buffering of %s to mode %s\n" msgstr "无法将%2$s 的缓冲模式设置为%1$s\n" #. This is a proper name. See the gettext manual, section Names. -#: src/link.c:37 src/unlink.c:37 src/who.c:52 +#: src/link.c:36 src/unlink.c:36 src/who.c:52 msgid "Michael Stone" msgstr "Michael Ston" -#: src/link.c:51 +#: src/link.c:45 #, c-format msgid "" "Usage: %s FILE1 FILE2\n" @@ -4889,7 +5201,7 @@ "用法：%s 文件1 文件2\n" "　或：%s 选项\n" -#: src/link.c:54 +#: src/link.c:48 msgid "" "Call the link function to create a link named FILE2 to an existing FILE1.\n" "\n" @@ -4897,52 +5209,52 @@ "调用 link 函数创建从既存的文件1 到文件2 的链接。\n" "\n" -#: src/link.c:96 +#: src/link.c:89 #, c-format msgid "cannot create link %s to %s" msgstr "无法创建指向%2$s 的链接%1$s" -#: src/ln.c:207 +#: src/ln.c:213 #, c-format msgid "%s: hard link not allowed for directory" msgstr "%s: 不允许将硬链接指向目录" -#: src/ln.c:272 +#: src/ln.c:238 #, c-format msgid "%s: cannot overwrite directory" msgstr "%s：无法覆盖目录" -#: src/ln.c:277 +#: src/ln.c:285 #, c-format msgid "%s: replace %s? " msgstr "%s：是否替换%s？ " -#: src/ln.c:349 +#: src/ln.c:380 #, c-format msgid "failed to create symbolic link %s" -msgstr "无法创建符号链接%s" +msgstr "无法创建符号链接 %s" -#: src/ln.c:350 +#: src/ln.c:381 #, c-format msgid "failed to create symbolic link %s -> %s" -msgstr "无法创建符号链接%s -> %s" +msgstr "无法创建符号链接 %s -> %s" -#: src/ln.c:352 +#: src/ln.c:383 #, c-format msgid "failed to create hard link to %.0s%s" msgstr "无法创建硬链接%.0s%s" -#: src/ln.c:355 +#: src/ln.c:386 #, c-format msgid "failed to create hard link %s" -msgstr "无法创建硬链接%s" +msgstr "无法创建硬链接 %s" -#: src/ln.c:356 +#: src/ln.c:387 #, c-format msgid "failed to create hard link %s => %s" -msgstr "无法创建硬链接%s => %s" +msgstr "无法创建硬链接 %s => %s" -#: src/ln.c:378 +#: src/ln.c:409 #, c-format msgid "" "Usage: %s [OPTION]... [-T] TARGET LINK_NAME\n" @@ -4950,8 +5262,12 @@ " or: %s [OPTION]... TARGET... DIRECTORY\n" " or: %s [OPTION]... -t DIRECTORY TARGET...\n" msgstr "" +"用法：%s [选项]... [-T] 目标 链接名\n" +"　或：%s [选项]... 目标\n" +"　或：%s [选项]... 目标... 目录\n" +"　或：%s [选项]... -t 目录 目标...\n" -#: src/ln.c:385 +#: src/ln.c:416 msgid "" "In the 1st form, create a link to TARGET with the name LINK_NAME.\n" "In the 2nd form, create a link to TARGET in the current directory.\n" @@ -4962,8 +5278,15 @@ "can hold arbitrary text; if later resolved, a relative link is\n" "interpreted in relation to its parent directory.\n" msgstr "" +"在第一种格式中，创建具有指定<链接名>且指向指定<目标>的链接。\n" +"在第二种格式中，在当前目录创建指向<目标>位置的链接。\n" +"在第三、四种格式中，在指定<目录>中创建指向指定<目标>的链接。\n" +"默认创建硬链接，当使用--symbolic 时创建符号链接。\n" +"默认情况下，创建每个目标时不应存在与新链接的名称相同的文件。\n" +"创建硬链接时，每个指定的<目标>都必须存在。符号链接可以指向任意的位置；\n" +"当链接解析正常时，将其解析为一个相对于其父目录的相对链接。\n" -#: src/ln.c:398 +#: src/ln.c:429 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -4975,12 +5298,13 @@ "superuser)\n" " -f, --force remove existing destination files\n" msgstr "" -" --backup[=CONTROL]\t为每个已存在的目标文件创建备份文件\n" -" -b\t\t\t\t类似--backup，但不接受任何参数\n" -" -d, -F, --directory\t\t创建指向目录的硬链接(只适用于超级用户)\n" -" -f, --force\t\t\t强行删除任何已存在的目标文件\n" +" --backup[=CONTROL] 为每个已存在的目标文件创建备份文件\n" +" -b 类似--backup，但不接受任何参数\n" +" -d, -F, --directory 允许超级用户尝试创建指向目录的硬链接\n" +" （注意：此操作可能因系统限制而失败)\n" +" -f, --force 强行删除任何已存在的目标文件\n" -#: src/ln.c:406 +#: src/ln.c:437 msgid "" " -i, --interactive prompt whether to remove destinations\n" " -L, --logical dereference TARGETs that are symbolic links\n" @@ -4991,8 +5315,15 @@ "location\n" " -s, --symbolic make symbolic links instead of hard links\n" msgstr "" +" -i, --interactive 删除目标文件前进行确认\n" +" -L, --logical 如目标为符号链接，本次创建链接时将其解引用\n" +" -n, --no-dereference 如果给定<链接名>是一个链接至某目录的符号链接，\n" +" 将其作为普通文件处理\n" +" -P, --physical 创建直接指向符号链接文件的硬链接\n" +" -r, --relative 创建相对于链接位置的符号链接\n" +" -s, --symbolic 创建符号链接而非硬链接\n" -#: src/ln.c:415 +#: src/ln.c:446 msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" " -t, --target-directory=DIRECTORY specify the DIRECTORY in which to " @@ -5001,34 +5332,41 @@ " -T, --no-target-directory treat LINK_NAME as a normal file always\n" " -v, --verbose print name of each linked file\n" msgstr "" +" -S, --suffix=后缀 自行指定备份文件的后缀\n" +" -t, --target-directory=目录 在指定<目录>中创建链接\n" +" -T, --no-target-directory 总是将给定的<链接名>当作普通文件\n" +" -v, --verbose 列出每个链接的文件名称\n" -#: src/ln.c:425 +#: src/ln.c:456 #, c-format msgid "" "\n" "Using -s ignores -L and -P. Otherwise, the last option specified controls\n" "behavior when a TARGET is a symbolic link, defaulting to %s.\n" msgstr "" +"\n" +"使用 -s 选项会忽略 -L 和 -P。\n" +"否则当<目标>为一个符号链接（默认为 %s）时，会由最后一个指定的选项来控制行为。\n" -#: src/ln.c:542 +#: src/ln.c:584 msgid "cannot combine --target-directory and --no-target-directory" msgstr "无法同时使用 --target-directory 和 --no-target-directory" -#: src/ln.c:574 +#: src/ln.c:572 msgid "cannot do --relative without --symbolic" -msgstr "" +msgstr "无 --symbolic 选项时无法启用 --relative" #. This is a proper name. See the gettext manual, section Names. -#: src/logname.c:31 +#: src/logname.c:30 msgid "FIXME: unknown" msgstr "FIXME：未知" -#: src/logname.c:45 +#: src/logname.c:39 #, c-format msgid "Usage: %s [OPTION]\n" msgstr "用法：%s [选项]\n" -#: src/logname.c:46 +#: src/logname.c:40 msgid "" "Print the name of the current user.\n" "\n" @@ -5036,7 +5374,7 @@ "显示当前用户的名称。\n" "\n" -#: src/logname.c:85 +#: src/logname.c:78 msgid "no login name" msgstr "无登录名" @@ -5045,107 +5383,109 @@ #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:770 +#: src/ls.c:777 msgid "%b %e %Y" -msgstr "%b %e %Y" +msgstr "%b %e %Y" #. TRANSLATORS: ls output needs to be aligned for ease of reading, #. so be wary of using variable width fields from the locale. #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:783 +#: src/ls.c:790 msgid "%b %e %H:%M" msgstr "%b %e %H:%M" -#: src/ls.c:1751 +#: src/ls.c:1930 #, c-format msgid "ignoring invalid width in environment variable COLUMNS: %s" msgstr "忽略无效的环境变量 COLUMNS 所示的宽度值：%s" -#: src/ls.c:1779 +#: src/ls.c:1955 #, c-format msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "忽略无效的环境变量 TABSIZE 所示的制表符尺寸值：%s" -#: src/ls.c:1898 +#: src/ls.c:2074 msgid "invalid line width" -msgstr "" +msgstr "无效的行宽" -#: src/ls.c:1966 +#: src/ls.c:2142 msgid "invalid tab size" -msgstr "" +msgstr "无效的制表符" -#: src/ls.c:2199 +#: src/ls.c:2376 #, c-format msgid "invalid time style format %s" msgstr "无效的日期时间格式%s" -#: src/ls.c:2223 +#: src/ls.c:2400 msgid "Valid arguments are:\n" msgstr "有效的参数为：\n" -#: src/ls.c:2227 +#: src/ls.c:2404 msgid " - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n" -msgstr "" +msgstr " - +格式字符串（例如，+%H:%M）使用类似“date”风格的格式\n" -#: src/ls.c:2601 +#: src/ls.c:2778 #, c-format msgid "unrecognized prefix: %s" msgstr "无法识别的前缀：%s" -#: src/ls.c:2631 +#: src/ls.c:2808 #, c-format msgid "unparsable value for LS_COLORS environment variable" -msgstr "LS_COLORS 环境变量中存在无法解些的值" +msgstr "LS_COLORS 环境变量中存在无法解析的值" -#: src/ls.c:2661 src/stat.c:1038 +#: src/ls.c:2838 src/stat.c:1046 #, c-format msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" msgstr "忽略无效的环境变量QUOTING_STYLE 的键值：%s" -#: src/ls.c:2727 src/pwd.c:164 +#: src/ls.c:2905 src/pwd.c:164 #, c-format msgid "cannot open directory %s" -msgstr "无法打开目录%s" +msgstr "无法打开目录 %s" -#: src/ls.c:2742 +#: src/ls.c:2920 #, c-format msgid "cannot determine device and inode of %s" msgstr "无法决定%s 所在的设备及inode" -#: src/ls.c:2751 +#: src/ls.c:2929 #, c-format msgid "%s: not listing already-listed directory" msgstr "%s：不会再列出已经列出的目录" -#: src/ls.c:2776 src/ls.c:3195 src/selinux.c:127 src/selinux.c:300 +#: src/ls.c:2954 src/ls.c:3390 src/selinux.c:127 src/selinux.c:300 #, c-format msgid "error canonicalizing %s" -msgstr "" +msgstr "标准化 %s 出错" -#: src/ls.c:2838 src/pwd.c:232 +#: src/ls.c:3017 src/ls.c:3032 src/pwd.c:232 #, c-format msgid "reading directory %s" -msgstr "正在读取目录%s" +msgstr "正在读取目录 %s" -#: src/ls.c:2853 +#: src/ls.c:3048 #, c-format msgid "closing directory %s" -msgstr "关闭目录%s" +msgstr "正在关闭目录 %s" -#: src/ls.c:3572 +#: src/ls.c:3765 #, c-format msgid "cannot compare file names %s and %s" -msgstr "无法比较文件名%s 和 %s" +msgstr "无法比较文件名 %s 和 %s" -#: src/ls.c:5132 +#: src/ls.c:5343 msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" msgstr "" +"列出给定文件（默认为当前目录）的信息。\n" +"如果不指定 -cftuvSUX 中任意一个或--sort 选项，则根据字母大小排序。\n" -#: src/ls.c:5139 +#: src/ls.c:5350 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -5153,20 +5493,23 @@ " -b, --escape print C-style escapes for nongraphic " "characters\n" msgstr "" -" -a, --all\t\t\t不隐藏任何以. 开始的项目\n" -" -A, --almost-all\t\t列出除. 及.. 以外的任何项目\n" -" --author\t\t\t与-l 同时使用时列出每个文件的作者\n" -" -b, --escape\t\t\t以八进制溢出序列表示不可打印的字符\n" +" -a, --all 不隐藏任何以 . 开始的项目\n" +" -A, --almost-all 列出除 . 及 .. 以外的任何项目\n" +" --author 与 -l 同时使用时，列出每个文件的作者\n" +" -b, --escape 以 C 风格的转义序列表示不可打印的字符\n" -#: src/ls.c:5145 +#: src/ls.c:5356 msgid "" " --block-size=SIZE with -l, scale sizes by SIZE when printing " "them;\n" " e.g., '--block-size=M'; see SIZE format " "below\n" msgstr "" +" --block-size=大小 与 -l 同时使用时，将文件大小以此处给定的大小为\n" +" 单位进行缩放；例如：“--block-size=M”；\n" +" 请参考下文的大小格式说明\n" -#: src/ls.c:5149 +#: src/ls.c:5360 msgid "" " -B, --ignore-backups do not list implied entries ending with ~\n" " -c with -lt: sort by, and show, ctime (time of " @@ -5175,8 +5518,13 @@ " with -l: show ctime and sort by name;\n" " otherwise: sort by ctime, newest first\n" msgstr "" +" -B, --ignore-backups 不列出任何以 ~ 字符结束的项目\n" +" -c 与 -lt 共同使用时：根据 ctime 排序并显示\n" +" ctime（文件状态最后更改的时间）；\n" +" 与 -l 共同使用时：显示 ctime 并按照名称排序；\n" +" 其它情况：按照 ctime 排序，最新的最前\n" -#: src/ls.c:5156 +#: src/ls.c:5367 msgid "" " -C list entries by columns\n" " --color[=WHEN] colorize the output; WHEN can be 'always' " @@ -5187,8 +5535,14 @@ "contents\n" " -D, --dired generate output designed for Emacs' dired mode\n" msgstr "" +" -C 每栏由上至下列出项目\n" +" --color[=WHEN] 控制是否使用带颜色的输出；WHEN 可以是\n" +" “always”（默认缺省值）、“auto”或\n" +" “never”；更多信息请见下文\n" +" -d, --directory 当遇到目录时列出目录本身而非目录内的文件\n" +" -D, --dired 产生适合 Emacs 的 dired 模式使用的结果\n" -#: src/ls.c:5165 +#: src/ls.c:5376 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -5197,12 +5551,18 @@ " single-column -1, verbose -l, vertical -C\n" " --full-time like -l --time-style=full-iso\n" msgstr "" +" -f 不进行排序，-aU 选项生效，禁用 -ls --color\n" +" -F, --classify 加上文件类型的指示符号（*/=@| 其中一个）\n" +" --file-type 类似，但不后缀‘*’字符\n" +" --format=关键字 交错 -x，逗号分隔 -m，水平 -x，长 -l，\n" +" 单栏 -1，详细 -l，垂直 -C\n" +" --full-time 类似 -l --time-style=full-iso\n" -#: src/ls.c:5173 +#: src/ls.c:5384 msgid " -g like -l, but do not list owner\n" -msgstr " -g\t\t\t\t类似-l，但不列出所有者\n" +msgstr " -g 类似 -l，但不列出所有者\n" -#: src/ls.c:5176 +#: src/ls.c:5387 msgid "" " --group-directories-first\n" " group directories before files;\n" @@ -5210,20 +5570,27 @@ "any\n" " use of --sort=none (-U) disables grouping\n" msgstr "" +" --group-directories-first\n" +" 在文件前分组目录；\n" +" 此选项可与--sort 一起使用，但是一旦使用\n" +" --sort=none (-U) 将禁用分组\n" -#: src/ls.c:5182 +#: src/ls.c:5393 msgid "" " -G, --no-group in a long listing, don't print group names\n" -msgstr "" +msgstr " -G, --no-group 以一个长列表的形式，不输出组名\n" -#: src/ls.c:5185 +#: src/ls.c:5396 msgid "" " -h, --human-readable with -l and -s, print sizes like 1K 234M 2G " "etc.\n" " --si likewise, but use powers of 1000 not 1024\n" msgstr "" +" -h, --human-readable 与 -l 和 -s 一起，以易于阅读的格式输出文件\n" +" 大小（例如 1K 234M 2G等）\n" +" --si 同上面类似，但是使用 1000 为基底而非 1024\n" -#: src/ls.c:5189 +#: src/ls.c:5400 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -5235,14 +5602,23 @@ "PATTERN\n" " (overridden by -a or -A)\n" msgstr "" +" -H, --dereference-command-line\n" +" 跟随命令行列出的符号链接\n" +" --dereference-command-line-symlink-to-dir\n" +" 跟随命令行列出的指向目录的符号链接\n" +" --hide=PATTERN 隐藏符合 shell PATTERN 模式的项目\n" +" （-a 或 -A 将覆盖此选项）\n" -#: src/ls.c:5199 +#: src/ls.c:5410 msgid "" " --hyperlink[=WHEN] hyperlink file names; WHEN can be 'always'\n" " (default if omitted), 'auto', or 'never'\n" msgstr "" +" --hyperlink[=WHEN] 文件名使用超链接；WHEN 可以是“always”\n" +" （缺省时的默认选项）、“auto”或\n" +" “never”\n" -#: src/ls.c:5203 +#: src/ls.c:5414 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -5252,14 +5628,21 @@ " -I, --ignore=PATTERN do not list implied entries matching shell " "PATTERN\n" msgstr "" +" --indicator-style=方式 指定在每个项目名称后加上指示符号方式：\n" +" none（默认）、slash（-p）、\n" +" file-type（--file-type）以及 classify（-F）\n" +" -i, --inode 显示每个文件的索引编号（inode 号）\n" +" -I, --ignore=模式 不显示任何匹配指定 shell <模式>的项目\n" -#: src/ls.c:5212 +#: src/ls.c:5423 msgid "" " -k, --kibibytes default to 1024-byte blocks for disk usage;\n" " used only with -s and per directory totals\n" msgstr "" +" -k, --kibibytes 默认使用 1024 字节的块显示磁盘使用量；\n" +" 只用于 -s 和每个目录的总计\n" -#: src/ls.c:5216 +#: src/ls.c:5427 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5273,7 +5656,7 @@ "\t\t\t\t的对象而并非符号链接本身的信息\n" " -m\t\t\t\t所有项目以逗号分隔，并填满整行行宽\n" -#: src/ls.c:5224 +#: src/ls.c:5435 msgid "" " -n, --numeric-uid-gid like -l, but list numeric user and group IDs\n" " -N, --literal print entry names without quoting\n" @@ -5281,8 +5664,13 @@ " -p, --indicator-style=slash\n" " append / indicator to directories\n" msgstr "" +" -n, --numeric-uid-gid 类似 -l，但列出用户和组的 ID 号\n" +" -N, --literal 输出未经引号括起的项目名称\n" +" -o 类似 -l，但不列出有关组的信息\n" +" -p, --indicator-style=slash\n" +" 对目录附加“/”作为指示符号\n" -#: src/ls.c:5231 +#: src/ls.c:5442 msgid "" " -q, --hide-control-chars print ? instead of nongraphic characters\n" " --show-control-chars show nongraphic characters as-is (the default,\n" @@ -5295,8 +5683,16 @@ " (overrides QUOTING_STYLE environment " "variable)\n" msgstr "" +" -q, --hide-control-chars 以“?”字符代替无法打印的字符\n" +" --show-control-chars 原样显示无法打印的字符（这是默认行为，除非被调用\n" +" 本程序的名称是“ls”而且是在终端中进行输出）\n" +" -Q, --quote-name 将条目名称括上双引号\n" +" --quoting-style=方式 使用指定引用的方式显示条目的名称：\n" +" literal, locale, shell, shell-always,\n" +" shell-escape, shell-escape-always, c, escape\n" +" （该选项优先于 QUOTING_STYLE 环境变量的配置）\n" -#: src/ls.c:5242 +#: src/ls.c:5453 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -5321,11 +5717,13 @@ " as sort key if --sort=time (newest first)\n" msgstr "" -#: src/ls.c:5258 +#: src/ls.c:5470 msgid "" " --time-style=TIME_STYLE time/date format with -l; see TIME_STYLE " "below\n" msgstr "" +" --time-style=TIME_STYLE 使用 -l 时显示的时间/日期格式；请见下面\n" +" TIME_STYLE 的相关内容\n" #: src/ls.c:5261 msgid "" @@ -5333,7 +5731,7 @@ " -T, --tabsize=COLS assume tab stops at each COLS instead of 8\n" msgstr "" -#: src/ls.c:5265 +#: src/ls.c:5477 msgid "" " -u with -lt: sort by, and show, access time;\n" " with -l: show access time and sort by name;\n" @@ -5341,8 +5739,13 @@ " -U do not sort; list entries in directory order\n" " -v natural sort of (version) numbers within text\n" msgstr "" +" -u 同 -lt 一起使用：按照访问时间排序并显示；\n" +" 同 -l 一起使用：显示访问时间并按文件名排序\n" +" 其它：按照访问时间排序，最新的最靠前\n" +" -U 不进行排序；按照目录顺序列出项目\n" +" -v 在文本中进行数字（版本）的自然排序\n" -#: src/ls.c:5272 +#: src/ls.c:5484 msgid "" " -w, --width=COLS set output width to COLS. 0 means no limit\n" " -x list entries by lines instead of by columns\n" @@ -5351,8 +5754,13 @@ " -1 list one file per line. Avoid '\\n' with -q or " "-b\n" msgstr "" +" -w, --width=COLS 设置输出宽度为 COLS 对应的值。0 代表无限制\n" +" -x 逐行列出项目而不是逐栏列出\n" +" -X 根据扩展名按字母顺序排序\n" +" -Z, --context 输出每个文件的所有安全上下文信息\n" +" -1 每行只列出一个文件。与 -q 或 -b 共用时避免 '\\n'\n" -#: src/ls.c:5283 +#: src/ls.c:5495 msgid "" "\n" "The TIME_STYLE argument can be full-iso, long-iso, iso, locale, or +FORMAT.\n" @@ -5363,8 +5771,15 @@ "locale.\n" "Also the TIME_STYLE environment variable sets the default style to use.\n" msgstr "" +"\n" +"TIME_STYLE 参数可以是 full-iso、long-iso、iso、locale 或 +格式。\n" +"这里的格式字符串按照类似 date(1) 的方式进行解读。如果格式字符串是\n" +"格式1<换行符>格式2 的形式的话，格式1对应的字符串将应用于不是最近使用的文件\n" +"而格式2对应的字符串将应用于最近使用的文件。TIME_STYLE 如果带有“posix-”\n" +"前缀，它只会在 POSIX locale 之外发挥作用。另外，TIME_STYLE 环境变量如果存在\n" +"则会作为默认使用的格式。\n" -#: src/ls.c:5291 +#: src/ls.c:5503 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -5377,7 +5792,7 @@ "使用 --color=auto 选项，ls 只在标准输出被连至终端时才生成颜色代码。\n" "LS_COLORS 环境变量可改变此设置，可使用 dircolors 命令来设置。\n" -#: src/ls.c:5298 +#: src/ls.c:5510 msgid "" "\n" "Exit status:\n" @@ -5394,10 +5809,10 @@ #. This is a proper name. See the gettext manual, section Names. #: src/md5sum.c:108 msgid "Samuel Neves" -msgstr "" +msgstr "Samuel Neves" #. This is a proper name. See the gettext manual, section Names. -#: src/md5sum.c:111 src/seq.c:43 +#: src/md5sum.c:111 src/seq.c:48 msgid "Ulrich Drepper" msgstr "Ulrich Drepper" @@ -5448,6 +5863,8 @@ "for\n" " the blake2 algorithm and must be a multiple of 8\n" msgstr "" +" -l, --length 摘要长度，以比特位计算；不能超过 blake2 算法的最大值\n" +" 且必须是 8 的倍数\n" #: src/md5sum.c:258 msgid " --tag create a BSD-style checksum\n" @@ -5467,6 +5884,8 @@ " -z, --zero end each output line with NUL, not newline,\n" " and disable file name escaping\n" msgstr "" +" -z, --zero 以 NUL 空字符而非换行符结束每一输出行，\n" +" 同时禁用文件名转义\n" #: src/md5sum.c:273 msgid "" @@ -5480,6 +5899,14 @@ " -w, --warn warn about improperly formatted checksum lines\n" "\n" msgstr "" +"\n" +"以下五个选项在进行校验时非常有用：\n" +" --ignore-missing 不要为缺失的文件进行报告或者返回失败状态\n" +" --quiet 不为校验成功的文件输出 OK\n" +" --status 不输出任何内容，使用退出状态号显示成功\n" +" --strict 为格式不准确的校验和行返回非零状态\n" +" -w, --warn 对格式不准确的校验和行进行警告\n" +"\n" #: src/md5sum.c:285 #, c-format @@ -5504,7 +5931,7 @@ #: src/md5sum.c:752 msgid "FAILED open or read" -msgstr "" +msgstr "打开或读取失败" #: src/md5sum.c:790 msgid "FAILED" @@ -5540,35 +5967,35 @@ #: src/md5sum.c:848 #, c-format msgid "%s: no file was verified" -msgstr "" +msgstr "%s：未验证任何文件" #: src/md5sum.c:898 msgid "invalid length" -msgstr "" +msgstr "无效的长度" #: src/md5sum.c:902 src/md5sum.c:954 #, c-format msgid "invalid length: %s" -msgstr "" +msgstr "无效的长度：%s" #: src/md5sum.c:903 msgid "length is not a multiple of 8" -msgstr "" +msgstr "长度不是 8 的倍数" #: src/md5sum.c:956 #, c-format msgid "maximum digest length for %s is % bits" -msgstr "" +msgstr "%s 最大摘要长度为 % 比特" #: src/md5sum.c:974 #, c-format msgid "--tag does not support --text mode" -msgstr "--tag 不支持--text 模式" +msgstr "--tag 不支持 --text 模式" #: src/md5sum.c:980 #, c-format msgid "the --zero option is not supported when verifying checksums" -msgstr "" +msgstr "在校验时不支持 --zero 选项" #: src/md5sum.c:987 #, c-format @@ -5585,36 +6012,36 @@ #, c-format msgid "" "the --ignore-missing option is meaningful only when verifying checksums" -msgstr "" +msgstr "仅在校验时 --ignore-missing 选项有意义" #: src/md5sum.c:1010 #, c-format msgid "the --status option is meaningful only when verifying checksums" -msgstr "仅在校验时--status 选项有意义" +msgstr "仅在校验时 --status 选项有意义" #: src/md5sum.c:1017 #, c-format msgid "the --warn option is meaningful only when verifying checksums" -msgstr "仅在校验时--warn 选项才有意义" +msgstr "仅在校验时 --warn 选项才有意义" #: src/md5sum.c:1024 #, c-format msgid "the --quiet option is meaningful only when verifying checksums" -msgstr "只有在校验时--quiet 选项才有意义" +msgstr "只有在校验时 --quiet 选项才有意义" #: src/md5sum.c:1031 #, c-format msgid "the --strict option is meaningful only when verifying checksums" -msgstr "" +msgstr "只有在校验时 --strict 选项才有意义" -#: src/mkdir.c:59 src/rmdir.c:163 +#: src/mkdir.c:59 src/rmdir.c:164 #, c-format msgid "Usage: %s [OPTION]... DIRECTORY...\n" msgstr "用法：%s [选项]... 目录...\n" #: src/mkdir.c:60 msgid "Create the DIRECTORY(ies), if they do not already exist.\n" -msgstr "" +msgstr "若指定<目录>不存在则创建目录。\n" #: src/mkdir.c:66 msgid "" @@ -5622,6 +6049,10 @@ " -p, --parents no error if existing, make parent directories as needed\n" " -v, --verbose print a message for each created directory\n" msgstr "" +" -m, --mode=模式 设置权限模式（类似chmod），而不是 a=rwx 减 umask\n" +" -p, --parents 需要时创建目标目录的上层目录，但即使这些目录已存在\n" +" 也不当作错误处理\n" +" -v, --verbose 每次创建新目录都显示信息\n" #: src/mkdir.c:71 msgid "" @@ -5631,6 +6062,9 @@ " --context[=CTX] like -Z, or if CTX is specified then set the SELinux\n" " or SMACK security context to CTX\n" msgstr "" +" -Z 设置每个创建的目录的 SELinux 安全上下文为默认类型\n" +" --context[=CTX] 类似 -Z，或如果指定了 CTX，则将 SELinux 或 SMACK 安全\n" +" 上下文设置为 CTX 对应的值\n" #: src/mkdir.c:221 #, c-format @@ -5641,7 +6075,7 @@ #, c-format msgid "" "warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel" -msgstr "" +msgstr "警告：忽略 --context 参数；它需要启用 SELinux/SMARK 的内核" #: src/mkfifo.c:54 src/pathchk.c:88 #, c-format @@ -5650,7 +6084,7 @@ #: src/mkfifo.c:55 msgid "Create named pipes (FIFOs) with the given NAMEs.\n" -msgstr "" +msgstr "以指定的<名称>创建命名管道（FIFO）。\n" #: src/mkfifo.c:61 src/mknod.c:63 msgid "" @@ -5663,6 +6097,9 @@ " --context[=CTX] like -Z, or if CTX is specified then set the SELinux\n" " or SMACK security context to CTX\n" msgstr "" +" -Z 设置 SELinux 安全上下文为默认类型\n" +" --context[=CTX] 类似 -Z，或者如果指定了 CTX 则设置 SELinux 或\n" +" SMACK 安全上下文为给定的 CTX 值\n" #: src/mkfifo.c:154 src/mknod.c:151 msgid "invalid mode" @@ -5675,7 +6112,7 @@ #: src/mkfifo.c:175 src/mknod.c:271 #, c-format msgid "cannot set permissions of %s" -msgstr "无法设定 %s 的权限" +msgstr "无法设置 %s 的权限" #: src/mknod.c:55 #, c-format @@ -5684,7 +6121,7 @@ #: src/mknod.c:57 msgid "Create the special file NAME of the given TYPE.\n" -msgstr "" +msgstr "以指定的名称和指定的类型创建特殊文件。\n" #: src/mknod.c:73 msgid "" @@ -5756,7 +6193,7 @@ #: src/mktemp.c:67 #, c-format msgid "Usage: %s [OPTION]... [TEMPLATE]\n" -msgstr "用法：%s [选项]... [TEMPLATE]\n" +msgstr "用法：%s [选项]... [模板]\n" #: src/mktemp.c:68 msgid "" @@ -5764,11 +6201,14 @@ "TEMPLATE must contain at least 3 consecutive 'X's in last component.\n" "If TEMPLATE is not specified, use tmp.XXXXXXXXXX, and --tmpdir is implied.\n" msgstr "" +"安全地创建一个临时文件或目录，并且输出它的名字。\n" +"<模板>的最后部分必须含有至少 3 个连续的 'X'。\n" +"如果没有指定<模板>，将会使用 tmp.XXXXXXXXXX，同时隐含启用 --tmpdir 选项。\n" #: src/mktemp.c:73 msgid "" "Files are created u+rw, and directories u+rwx, minus umask restrictions.\n" -msgstr "" +msgstr "文件创建时采用 u+rw 权限，对目录则使用 u+rwx；同时会减去 umask 限制所给定的值。\n" #: src/mktemp.c:77 msgid "" @@ -5777,7 +6217,7 @@ " -q, --quiet suppress diagnostics about file/dir-creation failure\n" msgstr "" " -d, --directory 创建一个目录而非文件\n" -" -u, --dry-run 不创建任何东西，仅打印出名字。(仅供测试)\n" +" -u, --dry-run 不创建任何东西，仅打印出名字。（不安全）\n" " -q, --quiet 不显示任何有关文件或目录创建错误信息\n" #: src/mktemp.c:82 @@ -5787,6 +6227,8 @@ " This option is implied if TEMPLATE does not end in " "X\n" msgstr "" +" --suffix=后缀 将给定的<后缀>添加至<模板>字符串之后。后缀字符串中不能带斜杠。\n" +" 所先前所给<模板>字符串不以 X 结尾，则隐含启用该选项。\n" #: src/mktemp.c:86 msgid "" @@ -5796,6 +6238,11 @@ " unlike with -t, TEMPLATE may contain slashes, but\n" " mktemp creates only the final component\n" msgstr "" +" -p 目录, --tmpdir[=目录] 将<模板>解释为相对于给定<目录>；如果未指定\n" +" <目录>，在设置了 $TMPDIR 变量时使用这个变量的值，\n" +" 否则使用 /tmp。使用该选项时，<模板>不能是绝对路径；\n" +" 与 -t 不同，<模板>字符串可以包含斜线，但此时\n" +" mktemp 只会创建斜线后的部分\n" #: src/mktemp.c:93 msgid "" @@ -5803,6 +6250,9 @@ " relative to a directory: $TMPDIR, if set; else the\n" " directory specified via -p; else /tmp [deprecated]\n" msgstr "" +" -t 将<模板>解释为相对与一个目录的单个文件名部分：该目录\n" +" 在 $TMPDIR 变量已设置时取该变量的值，否则使用 -p\n" +" 参数指定的目录，再次将回退至使用 /tmp [不推荐]\n" #: src/mktemp.c:211 #, c-format @@ -5814,7 +6264,7 @@ msgid "with --suffix, template %s must end in X" msgstr "使用 --suffix，模板 %s 必须以 X 结尾" -#: src/mktemp.c:256 src/split.c:1344 +#: src/mktemp.c:256 src/split.c:1345 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "无效后缀 %s，含有目录分隔符" @@ -5822,7 +6272,7 @@ #: src/mktemp.c:261 #, c-format msgid "too few X's in template %s" -msgstr "模板%s 中X 太少" +msgstr "模板 %s 中的 X 太少" #: src/mktemp.c:277 #, c-format @@ -5837,16 +6287,16 @@ #: src/mktemp.c:312 #, c-format msgid "failed to create directory via template %s" -msgstr "无法通过模板%s 创建目录" +msgstr "无法通过模板 %s 创建目录" #: src/mktemp.c:323 #, c-format msgid "failed to create file via template %s" -msgstr "无法通过模板%s 创建文件" +msgstr "无法通过模板 %s 创建文件" #: src/mv.c:298 msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" -msgstr "" +msgstr "将<源文件>重命名为<目标文件>，或将<源文件>移动至指定<目录>。\n" #: src/mv.c:304 msgid "" @@ -5889,6 +6339,13 @@ " -Z, --context set SELinux security context of destination\n" " file to default type\n" msgstr "" +" -t, --target-directory=目录 将所有<源文件>移动至指定的<目录>中\n" +" -T, --no-target-directory 将参数中所有<目标文件>部分视为普通文件\n" +" -u, --update 仅在<源文件>比目标文件更新，或者目标文件\n" +" 不存在时进行移动操作\n" +" -v, --verbose 对正在发生的操作给出解释\n" +" -Z, --context 将目标文件的 SELinux 安全上下文设置为\n" +" 默认类型\n" #: src/nice.c:73 #, c-format @@ -5902,10 +6359,13 @@ "With no COMMAND, print the current niceness. Niceness values range from\n" "%d (most favorable to the process) to %d (least favorable to the process).\n" msgstr "" +"以指定的优先级运行命令，这会影响相应进程的调度。\n" +"如果不指定命令，程序会显示当前的优先级。优先级的范围是从 %d\n" +"（最大优先级）到 %d（最小优先级）。\n" #: src/nice.c:83 msgid " -n, --adjustment=N add integer N to the niceness (default 10)\n" -msgstr "" +msgstr " -n, --adjustment=N 在优先级数值上加上数字 N（默认为 10）\n" #: src/nice.c:173 #, c-format @@ -5933,7 +6393,7 @@ #: src/nl.c:180 msgid "Write each FILE to standard output, with line numbers added.\n" -msgstr "" +msgstr "将指定的各个<文件>添加行号标注后写到标准输出。\n" #: src/nl.c:187 msgid "" @@ -5941,6 +6401,9 @@ " -d, --section-delimiter=CC use CC for logical page delimiters\n" " -f, --footer-numbering=STYLE use STYLE for numbering footer lines\n" msgstr "" +" -b, --body-numbering=样式 使用指定样式编号文件的正文行目\n" +" -d, --section-delimiter=CC 使用指定的 CC 作为逻辑页分隔符\n" +" -f, --footer-numbering=样式 使用指定样式编号文件的页脚行目\n" #: src/nl.c:192 msgid "" @@ -5968,6 +6431,11 @@ "CC are two delimiter characters used to construct logical page delimiters;\n" "a missing second character implies ':'.\n" msgstr "" +"\n" +"默认的选项设置是：-bt -d'\\:' -fn -hn -i1 -l1 -n'rn' -s -v1 -w6\n" +"\n" +"CC 是用于构建逻辑分页符的两个分界符号；如第二个符号缺失，则认为默认\n" +"使用 \":\"。\n" #: src/nl.c:213 msgid "" @@ -5991,48 +6459,55 @@ " rz right justified, leading zeros\n" "\n" msgstr "" +"\n" +"格式字符串取下面列表中的任一项：\n" +"\n" +" ln 左对齐，空格不用 0 填充\n" +" rn 右对齐，空格不用 0 填充\n" +" rz 右对齐，空格用 0 填充\n" +"\n" -#: src/nl.c:284 +#: src/nl.c:281 msgid "line number overflow" msgstr "行号溢出" -#: src/nl.c:488 +#: src/nl.c:484 #, c-format msgid "invalid header numbering style: %s" msgstr "无效的页眉号样式：%s" -#: src/nl.c:496 +#: src/nl.c:492 #, c-format msgid "invalid body numbering style: %s" msgstr "无效的正文号样式：%s" -#: src/nl.c:504 +#: src/nl.c:500 #, c-format msgid "invalid footer numbering style: %s" msgstr "无效的页脚号样式：%s" -#: src/nl.c:511 +#: src/nl.c:507 msgid "invalid starting line number" -msgstr "" +msgstr "无效的起始行号" -#: src/nl.c:516 +#: src/nl.c:512 msgid "invalid line number increment" -msgstr "" +msgstr "无效的行号递增值" -#: src/nl.c:523 +#: src/nl.c:519 msgid "invalid line number of blank lines" -msgstr "" +msgstr "无效的空行数" -#: src/nl.c:530 +#: src/nl.c:526 msgid "invalid line number field width" -msgstr "" +msgstr "无效的行宽数值" -#: src/nl.c:541 +#: src/nl.c:537 #, c-format msgid "invalid line numbering format: %s" msgstr "无效的编号格式：%s" -#: src/nohup.c:56 +#: src/nohup.c:50 #, c-format msgid "" "Usage: %s COMMAND [ARG]...\n" @@ -6041,7 +6516,7 @@ "用法：%s 命令 [参数]...\n" "　或：%s 选项\n" -#: src/nohup.c:62 +#: src/nohup.c:56 msgid "" "Run COMMAND, ignoring hangup signals.\n" "\n" @@ -6049,7 +6524,7 @@ "忽略挂起信号运行指定的命令。\n" "\n" -#: src/nohup.c:68 +#: src/nohup.c:62 #, c-format msgid "" "\n" @@ -6059,38 +6534,44 @@ "If standard error is a terminal, redirect it to standard output.\n" "To save output to FILE, use '%s COMMAND > FILE'.\n" msgstr "" +"\n" +"如果标准输入是一个终端，则将其重定向为使用一个无法读取的文件。\n" +"如果标准输出是一个终端，在可能的情况下将输出附加到“nohup.out”，\n" +"否则使用“$HOME/nohup.out”文件。\n" +"如果标准错误输出是一个终端，重定向它到标准输出。\n" +"要保存输出内容到一个文件，使用 \"%s COMMAND > FILE\" 形式的命令。\n" -#: src/nohup.c:130 +#: src/nohup.c:123 #, c-format msgid "failed to render standard input unusable" msgstr "标准输入不可用，无法重定向" -#: src/nohup.c:132 +#: src/nohup.c:125 #, c-format msgid "ignoring input" msgstr "忽略输入" -#: src/nohup.c:176 +#: src/nohup.c:169 #, c-format msgid "ignoring input and appending output to %s" msgstr "忽略输入并把输出追加到%s" -#: src/nohup.c:177 +#: src/nohup.c:170 #, c-format msgid "appending output to %s" -msgstr "把输出追加到%s" +msgstr "把输出追加到 %s" -#: src/nohup.c:195 +#: src/nohup.c:188 #, c-format msgid "ignoring input and redirecting stderr to stdout" msgstr "忽略输入重定向错误到标准输出端" -#: src/nohup.c:196 +#: src/nohup.c:189 #, c-format msgid "redirecting stderr to stdout" msgstr "重定向标准错误到标准输出" -#: src/nohup.c:200 +#: src/nohup.c:193 #, c-format msgid "failed to redirect standard error" msgstr "重定向标准错误失败" @@ -6100,7 +6581,7 @@ msgid "Giuseppe Scrivano" msgstr "Giuseppe Scrivano" -#: src/nproc.c:57 src/pwd.c:57 src/tty.c:65 src/uname.c:121 src/whoami.c:50 +#: src/nproc.c:57 src/pwd.c:57 src/tty.c:65 src/uname.c:121 src/whoami.c:44 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "用法：%s [选项]...\n" @@ -6120,61 +6601,63 @@ " --all print the number of installed processors\n" " --ignore=N if possible, exclude N processing units\n" msgstr "" +" --all 打印所拥有的处理器数目\n" +" --ignore=N 可能的话，排除 N 个处理单元\n" #: src/numfmt.c:694 #, c-format msgid "value too large to be converted: %s" -msgstr "" +msgstr "值过大而无法转换：%s" #: src/numfmt.c:698 #, c-format msgid "invalid number: %s" -msgstr "" +msgstr "无效的数字：%s" #: src/numfmt.c:702 #, c-format msgid "rejecting suffix in input: %s (consider using --from)" -msgstr "" +msgstr "拒绝输入中的后缀：%s（请考虑使用 --from）" #: src/numfmt.c:706 #, c-format msgid "invalid suffix in input: %s" -msgstr "" +msgstr "输入中存在无效后缀：%s" #: src/numfmt.c:710 #, c-format msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)" -msgstr "" +msgstr "输入中缺少 'i' 后缀：%s（例如，Ki/Mi/Gi）" #: src/numfmt.c:757 src/numfmt.c:809 #, c-format msgid "failed to prepare value '%Lf' for printing" -msgstr "" +msgstr "为输出准备值“%Lf”失败" #: src/numfmt.c:858 #, c-format msgid "invalid unit size: %s" -msgstr "" +msgstr "无效的单位大小：%s" #: src/numfmt.c:884 #, c-format msgid "Usage: %s [OPTION]... [NUMBER]...\n" -msgstr "" +msgstr "用法: %s [选项]... [数字]...\n" #: src/numfmt.c:887 msgid "" "Reformat NUMBER(s), or the numbers from standard input if none are " "specified.\n" -msgstr "" +msgstr "对参数给出的数字进行格式化，或者在参数未给出数字的情况下从标准输入获取数字。\n" #: src/numfmt.c:891 msgid " --debug print warnings about invalid input\n" -msgstr "" +msgstr " --debug 对无效输入内容打印警告信息\n" #: src/numfmt.c:894 msgid "" " -d, --delimiter=X use X instead of whitespace for field delimiter\n" -msgstr "" +msgstr " -d, --delimiter=X 使用 X 替代空白作为域定界符\n" #: src/numfmt.c:897 msgid "" @@ -6182,12 +6665,16 @@ "(default=1)\n" " see FIELDS below\n" msgstr "" +" --field=域 将这些输入域中的数字进行替换（默认=1)\n" +" 请见下面给出的域的详细信息\n" #: src/numfmt.c:901 msgid "" " --format=FORMAT use printf style floating-point FORMAT;\n" " see FORMAT below for details\n" msgstr "" +" --format=格式 使用 printf 风格的浮点格式；参见下文的“格式”\n" +" 部分以了解细节\n" #: src/numfmt.c:905 msgid "" @@ -6195,12 +6682,14 @@ "'none';\n" " see UNIT below\n" msgstr "" +" --from=UNIT 将输入数字自动使用指定的单位进行缩放；默认为 none；\n" +" 详情请见下面的“单位”相关内容\n" #: src/numfmt.c:909 msgid "" " --from-unit=N specify the input unit size (instead of the default " "1)\n" -msgstr "" +msgstr " --from-unit=N 指定输入的单位大小（默认为 1）\n" #: src/numfmt.c:912 msgid "" @@ -6209,18 +6698,24 @@ " (which means it has no effect in the C/POSIX " "locale)\n" msgstr "" +" --grouping 使用时间和区域设置所定义的方法对数字进行分组，例如\n" +" 1,000,000（即该设置在 C/POSIX 的区域设置下无作用）\n" #: src/numfmt.c:916 msgid "" " --header[=N] print (without converting) the first N header lines;\n" " N defaults to 1 if not specified\n" msgstr "" +" --header[=N] 原样输出起始的 N 行头部内容（不进行转换）；\n" +" 如未指定 N，默认取值为 1\n" #: src/numfmt.c:920 msgid "" " --invalid=MODE failure mode for invalid numbers: MODE can be:\n" " abort (default), fail, warn, ignore\n" msgstr "" +" --invalid=模式 遇到无效数字时的处理模式：给定的模式可以是：\n" +" abort（默认）, fail, warn, ignore\n" #: src/numfmt.c:924 msgid "" @@ -6238,33 +6733,39 @@ " up, down, from-zero (default), towards-zero, " "nearest\n" msgstr "" +" --round=方法 缩放时使用指定方法四舍五入；指定的方法可以是：\n" +" up, down, from-zero（默认）, towards-zero, nearest\n" #: src/numfmt.c:935 msgid "" " --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" " SUFFIX in input numbers\n" msgstr "" +" --suffix=后缀 将指定的后缀添加到输出数字之后，并接受输入数字中\n" +" 存在该后缀的情况\n" #: src/numfmt.c:939 msgid "" " --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" -msgstr "" +msgstr " --to=UNIT 将输出数字使用指定单位自动缩放；详见下方“单位”内容\n" #: src/numfmt.c:942 msgid "" " --to-unit=N the output unit size (instead of the default 1)\n" -msgstr "" +msgstr " --to-unit=N 输出单位大小（默认值为 1)\n" #: src/numfmt.c:951 msgid "" "\n" "UNIT options:\n" msgstr "" +"\n" +"单位选项：\n" #: src/numfmt.c:954 msgid "" " none no auto-scaling is done; suffixes will trigger an error\n" -msgstr "" +msgstr " none 不进行自动缩放；带后缀会触发错误\n" #: src/numfmt.c:957 msgid "" @@ -6274,6 +6775,11 @@ " 1M = 1000000,\n" " 1Mi = 1048576,\n" msgstr "" +" auto 接受可选的单字符或双字符后缀：\n" +" 1K = 1000,\n" +" 1Ki = 1024,\n" +" 1M = 1000000,\n" +" 1Mi = 1048576,\n" #: src/numfmt.c:963 msgid "" @@ -6282,6 +6788,10 @@ " 1M = 1000000,\n" " ...\n" msgstr "" +" si 接受可选的单字符后缀：\n" +" 1K = 1000,\n" +" 1M = 1000000,\n" +" ...\n" #: src/numfmt.c:968 msgid "" @@ -6290,6 +6800,10 @@ " 1M = 1048576,\n" " ...\n" msgstr "" +" iec 接受可选的单字符后缀：\n" +" 1K = 1024,\n" +" 1M = 1048576,\n" +" ...\n" #: src/numfmt.c:973 msgid "" @@ -6298,6 +6812,10 @@ " 1Mi = 1048576,\n" " ...\n" msgstr "" +" iec-i 接受可选的双字符后缀：\n" +" 1Ki = 1024,\n" +" 1Mi = 1048576,\n" +" ...\n" #: src/numfmt.c:979 msgid "" @@ -6310,6 +6828,14 @@ " - all fields\n" "Multiple fields/ranges can be separated with commas\n" msgstr "" +"\n" +"参数中的域支持 cut(1) 风格的域范围：\n" +" N 从第 1 个开始数的第 N 个域\n" +" N- 从第 N 个开始到所在行结束的域\n" +" N-M 从第 N 个开始到第 M 个之间（包括头尾）的域\n" +" -M 从第 1 个开始到第 M 个之间（包括头尾）的域\n" +" - 所有域\n" +"多个域/范围可以使用逗号分隔\n" #: src/numfmt.c:989 #, c-format @@ -6355,8 +6881,24 @@ " $ ls -lh | %s --header --field 5 --from=iec --padding=10\n" " $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n" msgstr "" +"\n" +"示例：\n" +" $ %s --to=si 1000\n" +" -> \"1.0K\"\n" +" $ %s --to=iec 2048\n" +" -> \"2.0K\"\n" +" $ %s --to=iec-i 4096\n" +" -> \"4.0Ki\"\n" +" $ echo 1K | %s --from=si\n" +" -> \"1000\"\n" +" $ echo 1K | %s --from=iec\n" +" -> \"1024\"\n" +" $ df -B1 | %s --header --field 2-4 --to=si\n" +" $ ls -l | %s --header --field 5 --to=iec\n" +" $ ls -lh | %s --header --field 5 --from=iec --padding=10\n" +" $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n" -#: src/numfmt.c:1059 src/seq.c:240 +#: src/numfmt.c:1059 src/seq.c:248 #, c-format msgid "format %s has no %% directive" msgstr "格式%s 没有%% 指令" @@ -6364,29 +6906,29 @@ #: src/numfmt.c:1086 #, c-format msgid "invalid format %s (width overflow)" -msgstr "" +msgstr "无效的格式 %s（宽度溢出）" #: src/numfmt.c:1091 #, c-format msgid "--format padding overriding --padding" -msgstr "" +msgstr "--format 的填充值将覆盖 --padding" -#: src/numfmt.c:1110 src/seq.c:257 +#: src/numfmt.c:1110 src/seq.c:265 #, c-format msgid "format %s ends in %%" -msgstr "格式%s 以%% 结束" +msgstr "格式 %s 以 %% 结束" #: src/numfmt.c:1126 #, c-format msgid "invalid precision in format %s" -msgstr "" +msgstr "格式 %s 中存在无效的精度" #: src/numfmt.c:1132 #, c-format msgid "invalid format %s, directive must be %%[0]['][-][N][.][N]f" -msgstr "" +msgstr "无效的格式 %s，指令必须为 %%[0]['][-][N][.][N]f" -#: src/numfmt.c:1140 src/seq.c:264 +#: src/numfmt.c:1140 src/seq.c:272 #, c-format msgid "format %s has too many %% directives" msgstr "格式%s 中%% 指令过多" @@ -6394,83 +6936,83 @@ #: src/numfmt.c:1183 #, c-format msgid "invalid suffix in input %s: %s" -msgstr "" +msgstr "在输入 %s:%s 中有无效后缀" #: src/numfmt.c:1212 #, c-format msgid "" "value/precision too large to be printed: '%Lg/%' (consider using --" "to)" -msgstr "" +msgstr "值/精确度过大无法打印：“%Lg/%”（请考虑使用 --to）" #: src/numfmt.c:1216 #, c-format msgid "value too large to be printed: '%Lg' (consider using --to)" -msgstr "" +msgstr "值过大无法输出：'%Lg'（请考虑使用 --to）" #: src/numfmt.c:1225 #, c-format msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" -msgstr "" +msgstr "值过大无法输出：'%Lg'（无法处理 > 999Y 的值）" #: src/numfmt.c:1311 #, c-format msgid "large input value %s: possible precision loss" -msgstr "" +msgstr "较大的输入值 %s：可能出现精度丢失" #: src/numfmt.c:1500 #, c-format msgid "invalid padding value %s" -msgstr "" +msgstr "无效的填充值 %s" #: src/numfmt.c:1513 msgid "multiple field specifications" -msgstr "" +msgstr "无效的域规格" #: src/numfmt.c:1547 #, c-format msgid "invalid header value %s" -msgstr "" +msgstr "无效的头部值 %s" #: src/numfmt.c:1574 msgid "--grouping cannot be combined with --format" -msgstr "" +msgstr "--grouping 不能与 --format 结合使用" -#: src/numfmt.c:1577 src/sort.c:4685 +#: src/numfmt.c:1577 src/sort.c:4686 #, c-format msgid "failed to set locale" -msgstr "" +msgstr "设置区域语言 locale 失败" #: src/numfmt.c:1582 #, c-format msgid "no conversion option specified" -msgstr "" +msgstr "未指定转换选项" #: src/numfmt.c:1590 msgid "grouping cannot be combined with --to" -msgstr "" +msgstr "分组操作不能和 --to 共同使用" #: src/numfmt.c:1592 #, c-format msgid "grouping has no effect in this locale" -msgstr "" +msgstr "当前区域设置下分组没有效果" #: src/numfmt.c:1605 #, c-format msgid "--header ignored with command-line input" -msgstr "" +msgstr "在命令行输入下 --header 已被忽略" #: src/numfmt.c:1632 #, c-format msgid "error reading input" -msgstr "" +msgstr "读取输入时出错" #: src/numfmt.c:1643 #, c-format msgid "failed to convert some of the input numbers" -msgstr "" +msgstr "转换某些输入数字时失败" -#: src/od.c:322 +#: src/od.c:323 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -6482,15 +7024,18 @@ "　或：%s [-abcdfilosx]... [文件] [[+]偏移量[.][b]]\n" "　或：%s --traditional [选项]... [文件] [[+]偏移量[.][b] [+][标签][.][b]]\n" -#: src/od.c:328 +#: src/od.c:329 msgid "" "\n" "Write an unambiguous representation, octal bytes by default,\n" "of FILE to standard output. With more than one FILE argument,\n" "concatenate them in the listed order to form the input.\n" msgstr "" +"\n" +"以无歧义的表示方式将指定文件输出至标准输出，默认为八进制字节形式。\n" +"如果指定了多于一个文件，将它们以列出的顺序连接起来作为输入。\n" -#: src/od.c:336 +#: src/od.c:337 msgid "" "\n" "If first and second call formats both apply, the second format is assumed\n" @@ -6507,7 +7052,7 @@ "随着累积过程递增。偏移量和标签如果冠以\"0x\"或\"0X\"前缀则\n" "表示十六进制数；后缀\".\"代表八进制数，后缀\"b\"表示乘以 512。\n" -#: src/od.c:348 +#: src/od.c:349 msgid "" " -A, --address-radix=RADIX output format for file offsets; RADIX is one\n" " of [doxn], for Decimal, Octal, Hex or None\n" @@ -6516,7 +7061,7 @@ " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" msgstr "" -#: src/od.c:354 +#: src/od.c:355 msgid "" " -N, --read-bytes=BYTES limit dump to BYTES input bytes\n" " -S BYTES, --strings[=BYTES] output strings of at least BYTES graphic " @@ -6529,7 +7074,7 @@ " --traditional accept arguments in third form above\n" msgstr "" -#: src/od.c:367 +#: src/od.c:368 msgid "" "\n" "\n" @@ -6539,8 +7084,15 @@ " -c same as -t c, select printable characters or backslash escapes\n" " -d same as -t u2, select unsigned decimal 2-byte units\n" msgstr "" +"\n" +"\n" +"传统格式命令可混合使用，不同的格式可叠加：\n" +" -a 即 -t a， 使用命名的字符，忽略高阶位\n" +" -b 即 -t o1，使用八进制单字节字符\n" +" -c 即 -t c， 使用可打印字符或者反斜杠转义的特殊字符\n" +" -d 即 -t u2，使用无符号十进制双字节字符\n" -#: src/od.c:376 +#: src/od.c:377 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -6556,7 +7108,7 @@ " -s\t即 -t d2，指定双字节单位十进制数的对照输出格式\n" " -x\t即 -t x2，指定双字节单位十六进制数的对照输出格式\n" -#: src/od.c:384 +#: src/od.c:385 msgid "" "\n" "\n" @@ -6565,7 +7117,7 @@ " c printable character or backslash escape\n" msgstr "" -#: src/od.c:391 +#: src/od.c:392 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per float\n" @@ -6574,7 +7126,7 @@ " x[SIZE] hexadecimal, SIZE bytes per integer\n" msgstr "" -#: src/od.c:398 +#: src/od.c:399 msgid "" "\n" "SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" @@ -6583,7 +7135,7 @@ "for sizeof(double) or L for sizeof(long double).\n" msgstr "" -#: src/od.c:405 +#: src/od.c:406 msgid "" "\n" "Adding a z suffix to any type displays printable characters at the end of\n" @@ -6603,12 +7155,12 @@ "and so on for G, T, P, E, Z, Y.\n" msgstr "" -#: src/od.c:683 src/od.c:803 +#: src/od.c:685 src/od.c:805 #, c-format msgid "invalid type string %s" msgstr "无效类型的字符串%s" -#: src/od.c:693 +#: src/od.c:695 #, c-format msgid "" "invalid type string %s;\n" @@ -6617,7 +7169,7 @@ "无效的类型字符串%s；\n" "系统无法提供对%lu-字节整形类型数值的支持" -#: src/od.c:814 +#: src/od.c:816 #, c-format msgid "" "invalid type string %s;\n" @@ -6626,39 +7178,39 @@ "无效的类型字符串%s；\n" "系统无法提供对%lu-字节浮点类型数值的支持" -#: src/od.c:872 +#: src/od.c:874 #, c-format msgid "invalid character '%c' in type string %s" -msgstr "" +msgstr "无效字符“%c”出现在类型字符串 %s 中" -#: src/od.c:1104 +#: src/od.c:1110 msgid "cannot skip past end of combined input" msgstr "无法略过输入内容的报尾" -#: src/od.c:1654 +#: src/od.c:1660 #, c-format msgid "" "invalid output address radix '%c'; it must be one character from [doxn]" -msgstr "" +msgstr "无效的输出地址基数\"%c\"；它必须是 [doxn] 四个字符中的一个" -#: src/od.c:1792 +#: src/od.c:1798 msgid "no type may be specified when dumping strings" msgstr "在转储字符串时不能指定类型" -#: src/od.c:1867 +#: src/od.c:1873 msgid "compatibility mode supports at most one file" msgstr "兼容模式最多支持一个文件" -#: src/od.c:1888 +#: src/od.c:1894 msgid "skip-bytes + read-bytes is too large" msgstr "略过字节数+ 读入字节数的值过大" -#: src/od.c:1931 +#: src/od.c:1937 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "警告：无效的宽度值%lu，已使用%d 代替" -#: src/operand2sig.c:88 +#: src/env.c:613 src/env.c:702 src/operand2sig.c:88 #, c-format msgid "%s: invalid signal" msgstr "%s：无效的信号" @@ -6671,7 +7223,7 @@ msgid "" "Write lines consisting of the sequentially corresponding lines from\n" "each FILE, separated by TABs, to standard output.\n" -msgstr "" +msgstr "将每个指定文件里的各行整合到对应一行里写到标准输出，之间用制表符分隔。\n" #: src/paste.c:448 msgid "" @@ -6703,7 +7255,7 @@ #: src/pathchk.c:169 #, c-format msgid "leading '-' in a component of file name %s" -msgstr "" +msgstr "文件名 %s 以\"-\"符号开头" #: src/pathchk.c:195 #, c-format @@ -6731,12 +7283,12 @@ msgstr "文件名成分%3$s 的长度%2$lu 超出限值%1$lu" #. This is a proper name. See the gettext manual, section Names. -#: src/pinky.c:37 src/uptime.c:46 src/users.c:36 src/who.c:50 +#: src/pinky.c:37 src/uptime.c:45 src/users.c:35 src/who.c:50 msgid "Joseph Arceneaux" msgstr "Joseph Arceneaux" #. This is a proper name. See the gettext manual, section Names. -#: src/pinky.c:39 src/uptime.c:48 +#: src/pinky.c:39 src/uptime.c:47 msgid "Kaveh Ghazi" msgstr "Kaveh Ghazi" @@ -6809,7 +7361,7 @@ msgid "Where" msgstr "来自" -#: src/pinky.c:489 +#: src/id.c:96 src/pinky.c:489 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "用法: %s [选项]... [用户]...\n" @@ -6860,84 +7412,84 @@ msgstr "没有指定用户名，当使用 -l 选项时至少需要指定一个" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:331 +#: src/pr.c:332 msgid "Pete TerMaat" msgstr "Pete TerMaat" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:332 +#: src/pr.c:333 msgid "Roland Huebner" msgstr "Roland Huebner" -#: src/pr.c:777 +#: src/pr.c:778 msgid "integer overflow" msgstr "整数溢出" -#: src/pr.c:916 +#: src/pr.c:917 msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" -msgstr "" +msgstr "\"--pages=首页[:末页]\" 缺失参数" -#: src/pr.c:918 +#: src/pr.c:919 #, c-format msgid "invalid page range %s" msgstr "页码范围%s 无效" -#: src/pr.c:978 +#: src/pr.c:979 msgid "'-l PAGE_LENGTH' invalid number of lines" -msgstr "" +msgstr "“-l 页长”中含有无效的行号" -#: src/pr.c:993 +#: src/pr.c:994 msgid "'-N NUMBER' invalid starting line number" -msgstr "" +msgstr "“-N 编号”中含有无效的起始行号" -#: src/pr.c:997 +#: src/pr.c:998 msgid "'-o MARGIN' invalid line offset" -msgstr "" +msgstr "“-o 页边距”中含有无效的行偏移量" -#: src/pr.c:1034 +#: src/pr.c:1035 msgid "'-w PAGE_WIDTH' invalid number of characters" -msgstr "" +msgstr "\"-w 页面宽度\" 中含有无效的字符数" -#: src/pr.c:1043 +#: src/pr.c:1044 msgid "'-W PAGE_WIDTH' invalid number of characters" -msgstr "" +msgstr "\"-w 页面宽度\" 中含有无效的字符数" -#: src/pr.c:1072 +#: src/pr.c:1073 msgid "cannot specify number of columns when printing in parallel" msgstr "在平行输出参数时不能指定栏数" -#: src/pr.c:1076 +#: src/pr.c:1077 msgid "cannot specify both printing across and printing in parallel" msgstr "无法同时指定相交输出和平行输出参数" -#: src/pr.c:1179 +#: src/pr.c:1180 #, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" -msgstr "" +msgstr "“-%c”有多余字符或无效数字出现在参数中：%s" -#: src/pr.c:1281 +#: src/pr.c:1282 msgid "page width too narrow" -msgstr "过窄" +msgstr "页宽过窄" -#: src/pr.c:2337 +#: src/pr.c:2338 #, c-format msgid "starting page number % exceeds page count %" msgstr "起始页码% 超出了最大页数%" -#: src/pr.c:2364 +#: src/pr.c:2365 msgid "page number overflow" msgstr "页码溢出" -#: src/pr.c:2369 +#: src/pr.c:2370 #, c-format msgid "Page %" msgstr "第 % 页" -#: src/pr.c:2741 +#: src/pr.c:2742 msgid "Paginate or columnate FILE(s) for printing.\n" -msgstr "" +msgstr "对给定文件进行分页或分栏以便后续打印使用。\n" -#: src/pr.c:2748 +#: src/pr.c:2749 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -6952,7 +7504,7 @@ "\t\t\t输出指定的列数。如果指定了-a 选项，则从上到下列印。\n" "\t\t\t程序会自动在每一页均衡每列占用的行数。\n" -#: src/pr.c:2756 +#: src/pr.c:2757 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -6966,7 +7518,7 @@ "\t\t\t使用头标(^G)和八进制反斜杠标记\n" " -d, --double-space\t加倍输出空白区域\n" -#: src/pr.c:2764 +#: src/pr.c:2765 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -6984,7 +7536,7 @@ " -F, -f, --form-feed\t使用出纸页页标代替新行作为页面间的分隔符\n" "\t\t\t(使用-F 选项时报头为3 行,不使用时为5 行)\n" -#: src/pr.c:2774 +#: src/pr.c:2775 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -7003,21 +7555,27 @@ " -J, --join-lines\t合并整个行，关闭-W 选项的行截断，不使用栏调整，使用\n" "\t\t\t\t--sep-string[=字符串] 设置分隔符\n" -#: src/pr.c:2783 +#: src/pr.c:2784 msgid "" " -l, --length=PAGE_LENGTH\n" " set the page length to PAGE_LENGTH (66) lines\n" " (default number of lines of text 56, and with -F 63).\n" " implies -t if PAGE_LENGTH <= 10\n" msgstr "" +" -l, --length=页长\n" +" 使用指定页长的行数（默认为66）\n" +" (默认文本行数为 56,当启用 -F 时为 63)\n" +" 如果指定页长小于等于 10 则隐含启用 -t\n" -#: src/pr.c:2789 +#: src/pr.c:2790 msgid "" " -m, --merge print all files in parallel, one in each column,\n" " truncate lines, but join lines of full length with -J\n" msgstr "" +" -m, --merge 在同一行显示所有文件，每个文件占用一栏，分割行，但是当\n" +" 使用 -J 时将行合并到完整长度\n" -#: src/pr.c:2793 +#: src/pr.c:2794 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -7032,7 +7590,7 @@ " -N, --first-line-number=数字\n" "\t\t\t从首页的首行以指定数字开始计数(参看\"+首页\")\n" -#: src/pr.c:2801 +#: src/pr.c:2802 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -7046,7 +7604,7 @@ " -r, --no-file-warnings\n" "\t\t\t当文件无法打开时忽略警告\n" -#: src/pr.c:2808 +#: src/pr.c:2809 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -7057,7 +7615,7 @@ " options (-COLUMN|-a -COLUMN|-m) except -w is set\n" msgstr "" -#: src/pr.c:2816 +#: src/pr.c:2817 msgid "" " -S[STRING], --sep-string[=STRING]\n" " separate columns by STRING,\n" @@ -7066,13 +7624,15 @@ "options\n" msgstr "" -#: src/pr.c:2822 +#: src/pr.c:2823 msgid "" " -t, --omit-header omit page headers and trailers;\n" " implied if PAGE_LENGTH <= 10\n" msgstr "" +" -t, --omit-header 省略页面头部和尾部；\n" +" 在所指定<页长>小于等于 10 时默认启用\n" -#: src/pr.c:2826 +#: src/pr.c:2827 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -7093,7 +7653,7 @@ "\t\t\t为多栏页面输出将设置为指定的字符数(默认72)，\n" "\t\t\t仅当-s[char] 选项不启用时有效(即保持默认值 72)。\n" -#: src/pr.c:2836 +#: src/pr.c:2837 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -7120,7 +7680,7 @@ #: src/printenv.c:69 msgid " -0, --null end each output line with NUL, not newline\n" -msgstr "" +msgstr " -0, --null 以空字符而非换行符结束每一输出行\n" #: src/printf.c:84 #, c-format @@ -7195,7 +7755,7 @@ #: src/printf.c:254 src/printf.c:281 msgid "missing hexadecimal number in escape" -msgstr "Escape 中缺失十六进制数" +msgstr "在 escape 中缺失十六进制数" #: src/printf.c:293 #, c-format @@ -7238,7 +7798,7 @@ #: src/ptx.c:823 #, c-format msgid "error: regular expression has a match of length zero: %s" -msgstr "" +msgstr "错误：正则表达式匹配的长度为零：%s" #: src/ptx.c:1814 #, c-format @@ -7260,6 +7820,8 @@ " -A, --auto-reference output automatically generated references\n" " -G, --traditional behave more like System V 'ptx'\n" msgstr "" +" -A, --auto-reference 输出自动生成的引用\n" +" -G, --traditional 行为类似 System V 的“ptx”\n" #: src/ptx.c:1829 msgid "" @@ -7334,11 +7896,13 @@ "\n" "If no option is specified, -P is assumed.\n" msgstr "" +"\n" +"如果没有指定任何选项，则假定启用 -P。\n" #: src/pwd.c:169 #, c-format msgid "failed to chdir to %s" -msgstr "无法切换到目录%s" +msgstr "无法切换到目录 %s" #: src/pwd.c:173 src/pwd.c:280 src/split.c:469 #, c-format @@ -7360,7 +7924,7 @@ msgid "Dmitry V. Levin" msgstr "Dmitry V. Levin" -#: src/readlink.c:62 src/realpath.c:71 src/shred.c:170 src/stat.c:1497 +#: src/readlink.c:62 src/realpath.c:71 src/shred.c:170 src/stat.c:1691 #: src/touch.c:213 #, c-format msgid "Usage: %s [OPTION]... FILE...\n" @@ -7404,11 +7968,18 @@ " -v, --verbose report error messages\n" " -z, --zero end each output line with NUL, not newline\n" msgstr "" +" -m, --canonicalize-missing 递归跟随给出文件名的所有符号链接以标准化，\n" +" 但不对各组件的存在性作出要求\n" +" -n, --no-newline 不输出末尾的新行\n" +" -q, --quiet,\n" +" -s, --silent 缩减大多数的错误消息（默认启用）\n" +" -v, --verbose 报告错误消息\n" +" -z, --zero 以空字符（NUL）而非换行符结束每个输出行\n" #: src/readlink.c:152 #, c-format msgid "ignoring --no-newline with multiple arguments" -msgstr "" +msgstr "忽略带有多个参数时的 --no-newline 选项" #: src/realpath.c:72 msgid "" @@ -7416,6 +7987,9 @@ "all but the last component must exist\n" "\n" msgstr "" +"打印经过解析的绝对路径文件名；\n" +"路径各部分中除最后一部分以外其它各部分必须存在\n" +"\n" #: src/realpath.c:77 msgid "" @@ -7434,7 +8008,7 @@ #: src/relpath.c:130 msgid "generating relative path" -msgstr "" +msgstr "正在生成相对路径" #: src/remove.c:273 #, c-format @@ -7464,27 +8038,27 @@ #: src/remove.c:375 #, c-format msgid "removed directory %s\n" -msgstr "" +msgstr "已删除目录 %s\n" #: src/remove.c:447 #, c-format msgid "refusing to remove %s or %s directory: skipping %s" -msgstr "" +msgstr "拒绝删除 %s 或 %s 目录：跳过 %s" #: src/remove.c:476 #, c-format msgid "failed to stat %s: skipping %s" -msgstr "" +msgstr "获取 %s 的文件状态失败(stat)：跳过 %s" #: src/remove.c:489 src/remove.c:539 #, c-format msgid "skipping %s, since it's on a different device" -msgstr "跳过%s，因为它位于不同的设备上" +msgstr "跳过 %s，因为它位于不同的设备上" #: src/remove.c:491 #, c-format msgid "and --preserve-root=all is in effect" -msgstr "" +msgstr "且 --preserve-root=all 正在生效" #: src/remove.c:559 #, c-format @@ -7503,7 +8077,7 @@ #: src/rm.c:117 #, c-format msgid "Try '%s ./%s' to remove the file %s.\n" -msgstr "" +msgstr "尝试使用\"%s ./%s\"删除文件 %s。\n" #: src/rm.c:134 msgid "" @@ -7513,6 +8087,10 @@ "prompt\n" " -i prompt before every removal\n" msgstr "" +"删除（unlink）指定<文件>。\n" +"\n" +" -f, --force 强制删除。忽略不存在的文件，不提示确认\n" +" -i 每次删除前提示确认\n" #: src/rm.c:140 msgid "" @@ -7525,6 +8103,13 @@ " --interactive[=WHEN] prompt according to WHEN: never, once (-I), or\n" " always (-i); without WHEN, prompt always\n" msgstr "" +" -I 在删除超过三个文件或者递归删除前提示一次并要求确认；\n" +" 此选项比 -i 提示内容更少，但同样可以阻止大多数\n" +" 错误发生\n" +" --interactive[=场景] 根据指定的<场景>进行确认提示：never（从不）、\n" +" once（一次，等效于使用 -I）或者 always（总是，\n" +" 等效于使用 -i）。如果使用此参数没有指定<场景>则\n" +" 总是提示\n" #: src/rm.c:147 msgid "" @@ -7542,6 +8127,10 @@ " with 'all', reject any command line argument\n" " on a separate device from its parent\n" msgstr "" +" --no-preserve-root 不要对“/”特殊处理\n" +" --preserve-root[=all] 不要删除“/”（默认行为）；\n" +" 如添加了“all”参数，将拒绝处理与父目录位于\n" +" 不同设备上的命令行参数\n" #: src/rm.c:158 msgid "" @@ -7549,6 +8138,9 @@ " -d, --dir remove empty directories\n" " -v, --verbose explain what is being done\n" msgstr "" +" -r, -R, --recursive 递归删除目录及其内容\n" +" -d, --dir 删除空目录\n" +" -v, --verbose 详细显示进行的步骤\n" #: src/rm.c:165 msgid "" @@ -7571,6 +8163,12 @@ "\n" " %s ./-foo\n" msgstr "" +"\n" +"要删除文件名第一个字符为“-”的文件（例如“-foo”），请使用\n" +"以下方法之一：\n" +" %s -- -foo\n" +"\n" +" %s ./-foo\n" #: src/rm.c:179 msgid "" @@ -7585,38 +8183,36 @@ #: src/rm.c:297 msgid "you may not abbreviate the --no-preserve-root option" -msgstr "" +msgstr "您不能使用缩写的 --no-preserve-root 选项" #: src/rm.c:309 #, c-format msgid "unrecognized --preserve-root argument: %s" -msgstr "" +msgstr "无法识别的 --preserve-root 参数：%s" #: src/rm.c:359 #, c-format msgid "%s: remove % argument recursively? " msgid_plural "%s: remove % arguments recursively? " -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%s：递归删除 % 个参数？ " #: src/rm.c:362 #, c-format msgid "%s: remove % argument? " msgid_plural "%s: remove % arguments? " -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%s：删除 % 个参数？ " -#: src/rmdir.c:133 src/rmdir.c:232 +#: src/rmdir.c:133 src/rmdir.c:233 #, c-format msgid "removing directory, %s" -msgstr "正在删除目录 %s" +msgstr "正在删除目录，%s" -#: src/rmdir.c:147 +#: src/rmdir.c:148 #, c-format msgid "failed to remove directory %s" msgstr "删除目录 %s 失败" -#: src/rmdir.c:164 +#: src/rmdir.c:165 msgid "" "Remove the DIRECTORY(ies), if they are empty.\n" "\n" @@ -7627,17 +8223,20 @@ "删除指定的空目录。\n" "\n" " --ignore-fail-on-non-empty\n" -"\t\t\t忽略仅由目录非空产生的所有错误\n" +" 忽略仅由目录非空产生的所有错误\n" -#: src/rmdir.c:171 +#: src/rmdir.c:172 msgid "" " -p, --parents remove DIRECTORY and its ancestors; e.g., 'rmdir -p a/b/c' " "is\n" " similar to 'rmdir a/b/c a/b a'\n" " -v, --verbose output a diagnostic for every directory processed\n" msgstr "" +" -p, --parents 删除指定目录及其各个上级文件夹，例如“rmdir -p a/b/c'”\n" +" 与“rmdir a/b/c a/b a'”类似\n" +" -v, --verbose 输出每个被处理目录的详情和诊断信息\n" -#: src/rmdir.c:241 +#: src/rmdir.c:243 #, c-format msgid "failed to remove %s" msgstr "删除 %s 失败" @@ -7648,7 +8247,7 @@ "Usage: %s CONTEXT COMMAND [args]\n" " or: %s [ -c ] [-u USER] [-r ROLE] [-t TYPE] [-l RANGE] COMMAND [args]\n" msgstr "" -"用法: %s 环境 命令 [参数]\n" +"用法: %s 上下文 命令 [参数]\n" "　或: %s [ -c ] [-u 用户] [-r 角色] [-t 类型] [-l 范围] 命令 [参数]\n" #: src/runcon.c:82 @@ -7656,6 +8255,8 @@ "Run a program in a different SELinux security context.\n" "With neither CONTEXT nor COMMAND, print the current security context.\n" msgstr "" +"在不同的 SELinux 安全上下文中运行程序。\n" +"若未指定上下文和命令，输出当前安全上下文。\n" #: src/runcon.c:89 msgid "" @@ -7667,6 +8268,13 @@ " -l, --range=RANGE levelrange\n" "\n" msgstr "" +" 上下文 完整的安全上下文描述\n" +" -c, --compute 在更改前计算环境变化\n" +" -t, --type=类型 类型（与父进程角色相同）\n" +" -u, --user=用户 用户身份\n" +" -r, --role=角色 角色\n" +" -l, --range=范围 级别范围\n" +"\n" #: src/runcon.c:139 msgid "multiple roles" @@ -7686,12 +8294,12 @@ #: src/runcon.c:172 src/runcon.c:208 msgid "failed to get current context" -msgstr "无法获得当前安全环境" +msgstr "无法获得当前上下文" #: src/runcon.c:182 #, c-format msgid "you must specify -c, -t, -u, -l, -r, or context" -msgstr "您必须指定-c，-t，-u，-l，-r 或环境" +msgstr "您必须指定-c，-t，-u，-l，-r 或上下文" #: src/runcon.c:190 #, c-format @@ -7701,38 +8309,38 @@ #: src/runcon.c:195 #, c-format msgid "%s may be used only on a SELinux kernel" -msgstr "%s 只能用于启用了SELinux 支持的内核" +msgstr "%s 只能用于启用了 SELinux 支持的内核" #: src/runcon.c:222 msgid "failed to compute a new context" -msgstr "计算新的环境失败" +msgstr "计算新的上下文失败" #: src/runcon.c:236 #, c-format msgid "failed to set new user: %s" -msgstr "" +msgstr "设置新用户失败：%s" #: src/runcon.c:239 #, c-format msgid "failed to set new type: %s" -msgstr "" +msgstr "设置新类型失败：%s" #: src/runcon.c:242 #, c-format msgid "failed to set new range: %s" -msgstr "" +msgstr "设置新范围失败：%s" #: src/runcon.c:245 #, c-format msgid "failed to set new role: %s" -msgstr "" +msgstr "设置新角色失败：%s" #: src/runcon.c:254 #, c-format msgid "unable to set security context %s" -msgstr "无法设置安全环境%s" +msgstr "无法设置安全上下文 %s" -#: src/seq.c:72 +#: src/seq.c:80 #, c-format msgid "" "Usage: %s [OPTION]... LAST\n" @@ -7743,18 +8351,21 @@ "　或：%s [选项]... 首数 尾数\n" "　或：%s [选项]... 首数 增量 尾数\n" -#: src/seq.c:77 +#: src/seq.c:85 msgid "Print numbers from FIRST to LAST, in steps of INCREMENT.\n" -msgstr "" +msgstr "从给定首数到尾数依次进行打印，每两个数字之间的增量等于给定增量。\n" -#: src/seq.c:83 +#: src/seq.c:91 msgid "" " -f, --format=FORMAT use printf style floating-point FORMAT\n" " -s, --separator=STRING use STRING to separate numbers (default: \\n)\n" " -w, --equal-width equalize width by padding with leading zeroes\n" msgstr "" +" -f, --format=格式 使用 printf 样式的浮点格式\n" +" -s, --separator=字符串 使用指定<字符串>分隔数字（默认使用：\\n）\n" +" -w, --equal-width 在列前添加 0 使得宽度相同\n" -#: src/seq.c:90 +#: src/seq.c:98 msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" @@ -7767,53 +8378,53 @@ "INCREMENT must not be 0; none of FIRST, INCREMENT and LAST may be NaN.\n" msgstr "" -#: src/seq.c:101 +#: src/seq.c:109 msgid "" "FORMAT must be suitable for printing one argument of type 'double';\n" "it defaults to %.PRECf if FIRST, INCREMENT, and LAST are all fixed point\n" "decimal numbers with maximum precision PREC, and to %g otherwise.\n" msgstr "" -#: src/seq.c:147 +#: src/seq.c:155 #, c-format msgid "invalid floating point argument: %s" msgstr "无效的浮点参数：%s" -#: src/seq.c:153 +#: src/seq.c:161 #, c-format msgid "invalid %s argument: %s" msgstr "无效的 %s 参数：%s" -#: src/seq.c:260 +#: src/seq.c:268 #, c-format msgid "format %s has unknown %%%c directive" msgstr "格式%s 中包含未知%%%c 指令" -#: src/seq.c:628 +#: src/seq.c:648 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "当输出等宽字符串时不应再指定格式字符串" -#: src/seq.c:665 +#: src/seq.c:693 #, c-format msgid "invalid Zero increment value: %s" msgstr "" #: src/set-fields.c:167 msgid "invalid byte or character range" -msgstr "" +msgstr "无效的字节或自负范围" #: src/set-fields.c:168 msgid "invalid field range" -msgstr "" +msgstr "无效的字段范围" #: src/set-fields.c:175 src/set-fields.c:221 msgid "byte/character positions are numbered from 1" -msgstr "" +msgstr "字节/字符位置从 1 开始计数" #: src/set-fields.c:176 src/set-fields.c:222 msgid "fields are numbered from 1" -msgstr "" +msgstr "序号从 1 开始计数" #: src/set-fields.c:196 msgid "invalid range with no endpoint: -" @@ -7826,7 +8437,7 @@ #: src/set-fields.c:259 #, c-format msgid "byte/character offset %s is too large" -msgstr "" +msgstr "字节/字符偏移量 %s 过大" #: src/set-fields.c:260 #, c-format @@ -7836,16 +8447,16 @@ #: src/set-fields.c:271 #, c-format msgid "invalid byte/character position %s" -msgstr "" +msgstr "无效的字节/字符位置 %s" #: src/set-fields.c:272 #, c-format msgid "invalid field value %s" -msgstr "" +msgstr "无效的字段值 %s" #: src/set-fields.c:280 msgid "missing list of byte/character positions" -msgstr "" +msgstr "缺少字节/字符位置列表" #: src/set-fields.c:281 msgid "missing list of fields" @@ -7860,13 +8471,15 @@ msgid "" "Overwrite the specified FILE(s) repeatedly, in order to make it harder\n" "for even very expensive hardware probing to recover the data.\n" -msgstr "" +msgstr "多次覆盖指定文件，使得即使是昂贵的硬件探测仪器也难以将数据复原。\n" #: src/shred.c:175 msgid "" "\n" "If FILE is -, shred standard output.\n" msgstr "" +"\n" +"如果指定<文件>是 -，则对标准输出进行 shred 操作。\n" #: src/shred.c:182 #, c-format @@ -7982,122 +8595,122 @@ "包含不能被删除的文件副本，这将会\n" "允许碎片文件被恢复。\n" -#: src/shred.c:344 +#: src/shred.c:310 #, c-format msgid "%s: fdatasync failed" msgstr "%s：fadatsync 失败" -#: src/shred.c:355 +#: src/shred.c:321 #, c-format msgid "%s: fsync failed" msgstr "%s：fsync 失败" -#: src/shred.c:472 +#: src/shred.c:438 #, c-format msgid "%s: cannot rewind" msgstr "%s：无法反绕操作" -#: src/shred.c:492 +#: src/shred.c:458 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s：第%lu 次，共%lu 次 (%s)..." -#: src/shred.c:543 +#: src/shred.c:509 #, c-format msgid "%s: error writing at offset %s" msgstr "%s：在位置%s 写入时出现错误" -#: src/shred.c:564 +#: src/shred.c:530 #, c-format msgid "%s: lseek failed" msgstr "%s：lseek 失败" -#: src/shred.c:576 +#: src/shred.c:542 #, c-format msgid "%s: file too large" msgstr "%s：文件过大" -#: src/shred.c:600 +#: src/shred.c:566 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s：第%lu 次，共%lu 次 (%s)...%s" -#: src/shred.c:616 +#: src/shred.c:582 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s：第%lu 次，共%lu 次 (%s)...%s/%s %d%%" -#: src/shred.c:874 +#: src/shred.c:840 #, c-format msgid "%s: fstat failed" msgstr "%s：获取文件状态失败(fstat)" -#: src/shred.c:885 +#: src/shred.c:851 #, c-format msgid "%s: invalid file type" msgstr "%s：无效的文件类型" -#: src/shred.c:890 +#: src/shred.c:856 #, c-format msgid "%s: file has negative size" msgstr "%s：文件的大小为负数" -#: src/shred.c:984 src/sort.c:967 src/split.c:474 +#: src/shred.c:952 src/sort.c:972 src/split.c:475 #, c-format msgid "%s: error truncating" msgstr "%s：截断文件时出错" -#: src/shred.c:1003 +#: src/shred.c:971 #, c-format msgid "%s: fcntl failed" msgstr "%s：文件控制操作失败(fcntl)" -#: src/shred.c:1008 +#: src/shred.c:976 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "%s：不能对只可追加数据的文件描述符(file descriptor) 进行粉碎" -#: src/shred.c:1091 +#: src/shred.c:1059 #, c-format msgid "%s: removing" msgstr "%s：正在删除" -#: src/shred.c:1116 +#: src/shred.c:1084 #, c-format msgid "%s: renamed to %s" msgstr "%s：名称已更改为 %s" -#: src/shred.c:1125 +#: src/shred.c:1093 #, c-format msgid "%s: failed to remove" msgstr "%s：删除失败" -#: src/shred.c:1129 +#: src/shred.c:1097 #, c-format msgid "%s: removed" msgstr "%s：已删除" -#: src/shred.c:1136 src/shred.c:1179 +#: src/shred.c:1104 src/shred.c:1147 #, c-format msgid "%s: failed to close" msgstr "%s：无法关闭" -#: src/shred.c:1172 +#: src/shred.c:1140 #, c-format msgid "%s: failed to open for writing" msgstr "%s：无法以写模式打开" -#: src/shred.c:1235 +#: src/shred.c:1203 msgid "invalid number of passes" -msgstr "" +msgstr "覆盖次数无效" -#: src/shred.c:1240 src/shuf.c:462 src/sort.c:4507 +#: src/shred.c:1208 src/shuf.c:462 src/sort.c:4508 msgid "multiple random sources specified" msgstr "指定了多个随机源" -#: src/shred.c:1254 +#: src/shred.c:1222 msgid "invalid file size" -msgstr "" +msgstr "无效的文件大小" #: src/shuf.c:62 #, c-format @@ -8112,7 +8725,7 @@ #: src/shuf.c:68 msgid "Write a random permutation of the input lines to standard output.\n" -msgstr "" +msgstr "把输入行按随机顺序输出到标准输出。\n" #: src/shuf.c:75 msgid "" @@ -8124,25 +8737,31 @@ " --random-source=FILE get random bytes from FILE\n" " -r, --repeat output lines can be repeated\n" msgstr "" +" -e, --echo 将每个参数视为输入行\n" +" -i, --input-range=LO-HI 将 LO 到 HI 的每个数字视为输入行\n" +" -n, --head-count=行数 最多输出指定的行数\n" +" -o, --output=文件 将结果输出到指定文件而非标准输出\n" +" --random-source=文件 从指定文件获得随机字节\n" +" -r, --repeat 输出行可以重复\n" #: src/shuf.c:226 msgid "too many input lines" -msgstr "" +msgstr "输入行过多" #: src/shuf.c:418 msgid "multiple -i options specified" -msgstr "指定了多个-i 选项" +msgstr "指定了多个 -i 选项" #: src/shuf.c:425 src/shuf.c:431 src/shuf.c:436 msgid "invalid input range" -msgstr "" +msgstr "无效的输入范围" #: src/shuf.c:449 #, c-format msgid "invalid line count: %s" -msgstr "" +msgstr "无效的行数：%s" -#: src/shuf.c:456 src/sort.c:4501 +#: src/shuf.c:456 src/sort.c:4502 msgid "multiple output files specified" msgstr "指定了多个输出文件" @@ -8151,9 +8770,9 @@ msgid "cannot combine -e and -i options" msgstr "不能同时指定-e 和-i 选项" -#: src/shuf.c:570 +#: src/shuf.c:575 msgid "no lines to repeat" -msgstr "" +msgstr "没有可重复的行" #: src/sleep.c:50 #, c-format @@ -8169,20 +8788,20 @@ "\n" msgstr "" -#: src/sleep.c:140 src/timeout.c:332 +#: src/sleep.c:132 src/timeout.c:332 #, c-format msgid "invalid time interval %s" msgstr "无效的时间间隔%s" -#: src/sleep.c:151 src/tail.c:1287 +#: src/sleep.c:143 src/tail.c:1311 msgid "cannot read realtime clock" msgstr "无法读取实时时钟" -#: src/sort.c:432 +#: src/sort.c:420 msgid "Write sorted concatenation of all FILE(s) to standard output.\n" -msgstr "" +msgstr "串联排序所有指定文件并将结果写到标准输出。\n" -#: src/sort.c:439 +#: src/sort.c:427 msgid "" "Ordering options:\n" "\n" @@ -8190,7 +8809,7 @@ "排序选项：\n" "\n" -#: src/sort.c:443 +#: src/sort.c:431 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -8201,19 +8820,19 @@ " -d, --dictionary-order\t只考虑空白区域和字母字符\n" " -f, --ignore-case\t\t忽略字母大小写\n" -#: src/sort.c:449 +#: src/sort.c:437 msgid "" " -g, --general-numeric-sort compare according to general numerical value\n" " -i, --ignore-nonprinting consider only printable characters\n" " -M, --month-sort compare (unknown) < 'JAN' < ... < 'DEC'\n" msgstr "" -#: src/sort.c:454 +#: src/sort.c:442 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:457 +#: src/sort.c:445 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort shuffle, but group identical keys. See " @@ -8222,7 +8841,7 @@ " -r, --reverse reverse the result of comparisons\n" msgstr "" -#: src/sort.c:463 +#: src/sort.c:451 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -8237,7 +8856,7 @@ " -V, --version-sort\t\t在文本内进行自然版本排序\n" "\n" -#: src/sort.c:471 +#: src/sort.c:459 msgid "" "Other options:\n" "\n" @@ -8245,7 +8864,7 @@ "其他选项：\n" "\n" -#: src/sort.c:475 +#: src/sort.c:463 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" @@ -8253,7 +8872,7 @@ " --batch-size=NMERGE\t一次最多合并NMERGE 个输入；如果输入更多\n" "\t\t\t\t\t则使用临时文件\n" -#: src/sort.c:479 +#: src/sort.c:467 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 " @@ -8266,7 +8885,7 @@ " --compress-program=程序\t使用指定程序压缩临时文件；使用该程序\n" "\t\t\t\t\t的-d 参数解压缩文件\n" -#: src/sort.c:486 +#: src/sort.c:474 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -8279,13 +8898,13 @@ " --files0-from=文件\t从指定文件读取以NUL 终止的名称，如果该文件被\n" "\t\t\t\t\t指定为\"-\"则从标准输入读文件名\n" -#: src/sort.c:493 +#: src/sort.c:481 msgid "" " -k, --key=KEYDEF sort via a key; KEYDEF gives location and type\n" " -m, --merge merge already sorted files; do not sort\n" msgstr "" -#: src/sort.c:497 +#: src/sort.c:485 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -8296,7 +8915,7 @@ " -s, --stable\t\t\t禁用last-resort 比较以稳定比较算法\n" " -S, --buffer-size=大小\t指定主内存缓存大小\n" -#: src/sort.c:503 +#: src/sort.c:491 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -8316,7 +8935,7 @@ " --parallel=N\t\t将同时运行的排序数改变为N\n" " -u, --unique\t\t配合-c，严格校验排序；不配合-c，则只输出一次排序结果\n" -#: src/sort.c:517 +#: src/sort.c:505 msgid "" "\n" "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is " @@ -8335,7 +8954,7 @@ "SIZE may be followed by the following multiplicative suffixes:\n" msgstr "" -#: src/sort.c:530 +#: src/sort.c:518 msgid "" "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n" "\n" @@ -8351,210 +8970,209 @@ "如果希望以字节的自然值获得最传统的排序结果，\n" "请设置环境变量 LC_ALL=C。\n" -#: src/sort.c:728 +#: src/sort.c:716 #, c-format msgid "waiting for %s [-d]" msgstr "等待 %s [-d]" -#: src/sort.c:733 +#: src/sort.c:721 #, c-format msgid "%s [-d] terminated abnormally" msgstr "%s [-d] 不正常结束" -#: src/sort.c:888 +#: src/sort.c:876 #, c-format msgid "cannot create temporary file in %s" msgstr "无法在%s 创建临时文件" -#: src/sort.c:985 src/sort.c:2094 src/sort.c:3131 src/sort.c:3779 -#: src/sort.c:3870 src/sort.c:3873 +#: src/sort.c:991 src/sort.c:2100 src/sort.c:3137 src/sort.c:3780 +#: src/sort.c:3871 src/sort.c:3874 msgid "open failed" msgstr "打开失败" -#: src/sort.c:1005 +#: src/sort.c:1011 msgid "fflush failed" msgstr "冲洗流失败(fflush)" -#: src/sort.c:1010 src/sort.c:2097 src/sort.c:4776 +#: src/sort.c:1016 src/sort.c:2103 src/sort.c:4778 msgid "close failed" msgstr "关闭失败" -#: src/sort.c:1149 +#: src/sort.c:1155 msgid "couldn't create temporary file" msgstr "无法创建临时文件" -#: src/sort.c:1188 +#: src/sort.c:1194 #, c-format msgid "couldn't create process for %s -d" msgstr "无法创建进程%s -d" -#: src/sort.c:1261 +#: src/sort.c:1267 #, c-format msgid "warning: cannot remove: %s" msgstr "警告：无法删除：%s" -#: src/sort.c:1347 +#: src/sort.c:1353 #, c-format msgid "invalid --%s argument %s" msgstr "无效的 --%s 参数%s" -#: src/sort.c:1350 +#: src/sort.c:1356 #, c-format msgid "minimum --%s argument is %s" msgstr "最小 --%s 参数是%s" -#: src/sort.c:1365 +#: src/sort.c:1371 #, c-format msgid "--%s argument %s too large" msgstr "--%s 参数%s 太长" -#: src/sort.c:1368 +#: src/sort.c:1374 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "最大 --%s 参数在当前资源限制(rlimit)设置下是%s" -#: src/sort.c:1450 +#: src/sort.c:1456 msgid "number in parallel must be nonzero" msgstr "单个的数字必须不为零" -#: src/sort.c:1533 +#: src/sort.c:1539 msgid "stat failed" msgstr "获取文件状态失败(stat)" -#: src/sort.c:1795 +#: src/sort.c:1801 msgid "read failed" msgstr "读取失败" -#: src/sort.c:2112 +#: src/sort.c:2118 #, c-format msgid "string transformation failed" msgstr "字符串转换失败" -#: src/sort.c:2115 +#: src/sort.c:2121 #, c-format msgid "the untransformed string was %s" msgstr "未转换的字符串为%s" -#: src/sort.c:2278 +#: src/sort.c:2284 #, c-format msgid "^ no match for key\n" msgstr "^ 没有匹配项\n" -#: src/sort.c:2450 +#: src/sort.c:2456 #, c-format msgid "obsolescent key %s used; consider %s instead" -msgstr "" +msgstr "使用了旧的值 %s；考虑转为使用 %s" -#: src/sort.c:2457 +#: src/sort.c:2463 #, c-format msgid "key %lu has zero width and will be ignored" -msgstr "值%lu 宽度为零，忽略" +msgstr "值 %lu 宽度为零，忽略" -#: src/sort.c:2466 +#: src/sort.c:2472 #, c-format msgid "" "leading blanks are significant in key %lu; consider also specifying 'b'" -msgstr "" +msgstr "值 %lu 开头有大量空格，考虑同时指定\"b\"" -#: src/sort.c:2479 +#: src/sort.c:2485 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "值%lu 为数字且跨多个域" -#: src/sort.c:2511 +#: src/sort.c:2517 #, c-format msgid "option '-%s' is ignored" msgid_plural "options '-%s' are ignored" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "选项\"-%s\"被忽略" -#: src/sort.c:2517 +#: src/sort.c:2523 #, c-format msgid "option '-r' only applies to last-resort comparison" -msgstr "" +msgstr "选项 '-r' 仅用于 last-resort 比较" -#: src/sort.c:2791 src/sort.c:2800 +#: src/sort.c:2797 src/sort.c:2806 msgid "write failed" msgstr "写入失败" -#: src/sort.c:2843 +#: src/sort.c:2849 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s：%s:%s：无序： " -#: src/sort.c:2846 +#: src/sort.c:2852 msgid "standard error" msgstr "标准错误" -#: src/sort.c:3763 +#: src/sort.c:3764 msgid "cannot read" msgstr "无法读取" -#: src/sort.c:4042 +#: src/sort.c:4043 #, c-format msgid "%s: invalid field specification %s" msgstr "%s：无效的区块规格%s" -#: src/sort.c:4052 +#: src/sort.c:4053 #, c-format msgid "options '-%s' are incompatible" -msgstr "" +msgstr "选项\"-%s\"不兼容" -#: src/sort.c:4102 +#: src/sort.c:4103 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s：在%s 处的计数无效" -#: src/sort.c:4361 +#: src/sort.c:4362 msgid "invalid number after '-'" -msgstr "" +msgstr "在\"-\"后的编号无效" -#: src/sort.c:4368 src/sort.c:4454 src/sort.c:4482 +#: src/sort.c:4369 src/sort.c:4455 src/sort.c:4483 msgid "invalid number after '.'" -msgstr "" +msgstr "在\".\"后的编号无效" -#: src/sort.c:4381 src/sort.c:4487 +#: src/sort.c:4382 src/sort.c:4488 msgid "stray character in field spec" msgstr "区块中有孤立字符" -#: src/sort.c:4428 +#: src/sort.c:4429 msgid "multiple compress programs specified" msgstr "指定了多个压缩程序" -#: src/sort.c:4445 +#: src/sort.c:4446 msgid "invalid number at field start" msgstr "区块起始处的编号无效" -#: src/sort.c:4449 src/sort.c:4477 +#: src/sort.c:4450 src/sort.c:4478 msgid "field number is zero" msgstr "区块编号为零" -#: src/sort.c:4458 +#: src/sort.c:4459 msgid "character offset is zero" msgstr "字符偏移量为零" -#: src/sort.c:4473 +#: src/sort.c:4474 msgid "invalid number after ','" -msgstr "" +msgstr "在\",\"后的编号无效" -#: src/sort.c:4523 +#: src/sort.c:4524 msgid "empty tab" msgstr "空标签" -#: src/sort.c:4606 src/wc.c:763 +#: src/sort.c:4607 src/wc.c:784 #, c-format msgid "cannot read file names from %s" msgstr "无法从%s 中读取文件名" -#: src/sort.c:4628 +#: src/sort.c:4629 #, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "%s：%lu：无效的 0 长度文件名" -#: src/sort.c:4634 +#: src/sort.c:4635 #, c-format msgid "no input from %s" -msgstr "没有来自%s 的输入" +msgstr "没有来自 %s 的输入" #: src/sort.c:4687 #, c-format @@ -8565,7 +9183,7 @@ msgid "using simple byte comparison" msgstr "使用简单字节比较" -#: src/sort.c:4722 +#: src/sort.c:4724 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "不允许额外的操作数%s 与-%c 一起使用" @@ -8573,18 +9191,20 @@ #: src/split.c:209 #, c-format msgid "the suffix length needs to be at least %" -msgstr "" +msgstr "后缀长度至少应为 %" #: src/split.c:226 #, c-format msgid "Usage: %s [OPTION]... [FILE [PREFIX]]\n" -msgstr "" +msgstr "用法：%s [选项]... [文件 [前缀]]\n" #: src/split.c:230 msgid "" "Output pieces of FILE to PREFIXaa, PREFIXab, ...;\n" "default size is 1000 lines, and default PREFIX is 'x'.\n" msgstr "" +"将文件拆分并输出为“前缀aa”、“前缀ab”等等文件；\n" +"默认以 1000 行为拆分单位，默认前缀为“x”。\n" #: src/split.c:238 #, c-format @@ -8640,172 +9260,172 @@ #: src/split.c:471 #, c-format msgid "%s would overwrite input; aborting" -msgstr "" +msgstr "%s 将会覆写输入；中止" -#: src/split.c:487 +#: src/split.c:488 msgid "failed to set FILE environment variable" -msgstr "" +msgstr "设置 FILE 环境变量失败" -#: src/split.c:489 +#: src/split.c:490 #, c-format msgid "executing with FILE=%s\n" -msgstr "" +msgstr "正在带 FILE=%s 执行\n" -#: src/split.c:491 +#: src/split.c:492 msgid "failed to create pipe" -msgstr "" +msgstr "创建管道失败" -#: src/split.c:505 +#: src/split.c:506 msgid "closing prior pipe" -msgstr "" +msgstr "正在关闭先前的管道" -#: src/split.c:507 +#: src/split.c:508 msgid "closing output pipe" -msgstr "" +msgstr "正在关闭输出管道" -#: src/split.c:511 +#: src/split.c:512 msgid "moving input pipe" -msgstr "" +msgstr "正在移动输入管道" -#: src/split.c:513 +#: src/split.c:514 msgid "closing input pipe" -msgstr "" +msgstr "正在关闭输入管道" -#: src/split.c:518 +#: src/split.c:519 #, c-format msgid "failed to run command: \"%s -c %s\"" -msgstr "" +msgstr "运行命令失败：“%s -c %s”" -#: src/split.c:524 +#: src/split.c:525 msgid "failed to close input pipe" -msgstr "" +msgstr "关闭输入管道失败" -#: src/split.c:560 +#: src/split.c:561 msgid "waiting for child process" -msgstr "" +msgstr "正在等待子进程" -#: src/split.c:570 +#: src/split.c:571 #, c-format msgid "with FILE=%s, signal %s from command: %s" -msgstr "" +msgstr "带 FILE=%s，信号 %s 来自命令：%s" -#: src/split.c:578 +#: src/split.c:579 #, c-format msgid "with FILE=%s, exit %d from command: %s" -msgstr "" +msgstr "带 FILE=%s，退出状态 %d 来自命令：%s" -#: src/split.c:585 +#: src/split.c:586 #, c-format msgid "unknown status from command (0x%X)" msgstr "来自命令的未知状态 (0x%X)" -#: src/split.c:1273 +#: src/split.c:1274 #, c-format msgid "cannot split in more than one way" msgstr "无法以多于一种的方式切分输入" -#: src/split.c:1285 src/split.c:1400 src/split.c:1601 +#: src/split.c:1286 src/split.c:1401 src/split.c:1602 msgid "invalid number of chunks" -msgstr "" +msgstr "无效的块数" -#: src/split.c:1290 +#: src/split.c:1291 msgid "invalid chunk number" -msgstr "" +msgstr "无效块数" -#: src/split.c:1337 +#: src/split.c:1338 msgid "invalid suffix length" -msgstr "" +msgstr "无效的后缀长度" -#: src/split.c:1411 +#: src/split.c:1412 msgid "empty record separator" -msgstr "" +msgstr "空的记录分隔符" -#: src/split.c:1422 +#: src/split.c:1423 #, c-format msgid "multi-character separator %s" -msgstr "" +msgstr "多字符分隔符 %s" -#: src/split.c:1430 +#: src/split.c:1431 msgid "multiple separator characters specified" -msgstr "" +msgstr "指定了多个分隔用字符" -#: src/split.c:1461 +#: src/split.c:1462 #, c-format msgid "line count option -%s%c... is too large" msgstr "行数选项-%s%c... 过大" -#: src/split.c:1478 +#: src/split.c:1479 #, c-format msgid "%s: invalid start value for numerical suffix" msgstr "" -#: src/split.c:1479 +#: src/split.c:1480 #, c-format msgid "%s: invalid start value for hexadecimal suffix" msgstr "" -#: src/split.c:1503 +#: src/split.c:1504 msgid "invalid IO block size" -msgstr "" +msgstr "无效的 IO 块大小" -#: src/split.c:1521 +#: src/split.c:1522 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "" -#: src/split.c:1561 +#: src/split.c:1562 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1593 +#: src/split.c:1594 #, c-format msgid "%s: cannot determine file size" msgstr "%s：无法确定文件大小" #. This is a proper name. See the gettext manual, section Names. -#: src/stat.c:190 +#: src/stat.c:197 msgid "Michael Meskes" msgstr "Michael Meskes" -#: src/stat.c:949 +#: src/stat.c:989 #, c-format msgid "failed to canonicalize %s" msgstr "规范化%s 失败" -#: src/stat.c:1217 +#: src/stat.c:1092 #, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "警告：无法识别的转义字符“\\%c”" -#: src/stat.c:1272 +#: src/stat.c:1153 #, c-format msgid "%s: invalid directive" msgstr "%s：无效指令" -#: src/stat.c:1319 +#: src/stat.c:1200 #, c-format msgid "warning: backslash at end of format" msgstr "警告：格式末尾出现反斜杠" -#: src/stat.c:1350 +#: src/stat.c:1231 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "用 %s 进行标准输入在文件系统模式下无法工作" -#: src/stat.c:1357 +#: src/stat.c:1238 #, c-format msgid "cannot read file system information for %s" msgstr "无法为 %s 读取文件系统信息" -#: src/stat.c:1378 +#: src/stat.c:1362 src/stat.c:1429 #, 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:1414 +#: src/stat.c:1608 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -8821,7 +9441,7 @@ #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1435 +#: src/stat.c:1629 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -8831,30 +9451,30 @@ #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1445 +#: src/stat.c:1639 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:1453 +#: src/stat.c:1647 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:1462 +#: src/stat.c:1656 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:1472 +#: src/stat.c:1666 #, c-format msgid "Context: %C\n" msgstr "环境：%C\n" -#: src/stat.c:1480 +#: src/stat.c:1674 msgid "" "Access: %x\n" "Modify: %y\n" @@ -8866,11 +9486,11 @@ "最近改动：%z\n" "创建时间：%w\n" -#: src/stat.c:1498 +#: src/stat.c:1692 msgid "Display file or file system status.\n" msgstr "显示文件或文件系统的状态。\n" -#: src/stat.c:1504 +#: src/stat.c:1698 msgid "" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" @@ -8878,7 +9498,7 @@ " -L, --dereference 跟随链接\n" " -f, --file-system 显示文件系统状态而非文件状态\n" -#: src/stat.c:1508 +#: src/stat.c:1706 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -8900,7 +9520,7 @@ " %C SELinux security context string\n" msgstr "" -#: src/stat.c:1528 +#: src/stat.c:1733 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -8910,7 +9530,7 @@ " %G group name of owner\n" msgstr "" -#: src/stat.c:1536 +#: src/stat.c:1741 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -8923,7 +9543,7 @@ " %T minor device type in hex, for character/block device special files\n" msgstr "" -#: src/stat.c:1547 +#: src/stat.c:1752 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -8938,7 +9558,7 @@ "\n" msgstr "" -#: src/stat.c:1561 +#: src/stat.c:1766 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -8949,7 +9569,7 @@ " %f free blocks in file system\n" msgstr "" -#: src/stat.c:1570 +#: src/stat.c:1775 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -8960,20 +9580,25 @@ " %T file system type in human readable form\n" msgstr "" -#: src/stat.c:1580 +#: src/stat.c:1785 #, c-format msgid "" "\n" "--terse is equivalent to the following FORMAT:\n" " %s" msgstr "" +"\n" +"--terse 和下列<格式>等效：:\n" +" %s" -#: src/stat.c:1591 +#: src/stat.c:1796 #, c-format msgid "" "--terse --file-system is equivalent to the following FORMAT:\n" " %s" msgstr "" +"--terse --file-system 与下列<格式>等效：\n" +" %s" #: src/stdbuf.c:91 #, c-format @@ -9027,7 +9652,7 @@ "KB 1000，K 1024，MB 1000*1000，M 1024*1024，以及 G、T、P、E、Z、Y。\n" "在此情况下，相应的流将缓冲由 MODE 指定大小的缓冲字节。\n" -#: src/stdbuf.c:117 +#: src/stdbuf.c:118 msgid "" "\n" "NOTE: If COMMAND adjusts the buffering of its standard streams ('tee' does\n" @@ -9041,22 +9666,22 @@ "还有某些过滤器程序（如 \"dd\" 和 \"cat\" 之类）不使用输入输出流，\n" "因此不受 \"stdbuf\" 设置的影响。\n" -#: src/stdbuf.c:242 +#: src/stdbuf.c:243 #, c-format msgid "failed to find %s" msgstr "查找 %s 失败" -#: src/stdbuf.c:266 src/stdbuf.c:299 +#: src/stdbuf.c:267 src/stdbuf.c:300 #, c-format msgid "failed to update the environment with %s" msgstr "更新 %s 的环境失败" -#: src/stdbuf.c:345 +#: src/stdbuf.c:346 #, c-format msgid "line buffering stdin is meaningless" msgstr "对标准输入进行行缓冲无意义" -#: src/stdbuf.c:376 +#: src/stdbuf.c:377 #, c-format msgid "you must specify a buffering mode option" msgstr "您必须指定一个缓冲模式选项" @@ -9074,7 +9699,7 @@ #: src/stty.c:537 msgid "Print or change terminal characteristics.\n" -msgstr "" +msgstr "输出或变更终端特性。\n" #: src/stty.c:543 msgid "" @@ -9082,6 +9707,9 @@ " -g, --save print all current settings in a stty-readable form\n" " -F, --file=DEVICE open and use the specified DEVICE instead of stdin\n" msgstr "" +" -a, --all 以可读性较好的格式输出全部当前设置\n" +" -g, --save 以 stty 可读取的格式输出当前全部设置\n" +" -F, --file=设备 打开并使用指定<设备>代替标准输入\n" #: src/stty.c:550 msgid "" @@ -9098,6 +9726,8 @@ "\n" "Special characters:\n" msgstr "" +"\n" +"特殊字符：\n" #: src/stty.c:559 msgid " * discard CHAR CHAR will toggle discarding of output\n" @@ -9174,7 +9804,7 @@ msgid "" " * [-]drain wait for transmission before applying settings (%s by " "default)\n" -msgstr "" +msgstr " * [-]drain 应用设置前等待传输（默认 %s）\n" #: src/stty.c:628 msgid "on" @@ -9186,7 +9816,7 @@ #: src/stty.c:629 msgid " ispeed N set the input speed to N\n" -msgstr "" +msgstr " ispeed N 设置输入速度为 N\n" #: src/stty.c:633 msgid " * line N use line discipline N\n" @@ -9219,18 +9849,22 @@ " [-]clocal disable modem control signals\n" " [-]cread allow input to be received\n" msgstr "" +"\n" +"控制设置：\n" +" [-]clocal 禁用调制解调器控制信号\n" +" [-]cread 允许接收输入\n" #: src/stty.c:658 msgid " * [-]crtscts enable RTS/CTS handshaking\n" -msgstr "" +msgstr " * [-]crtscts 启用 RTS/CTS 握手\n" #: src/stty.c:663 msgid " * [-]cdtrdsr enable DTR/DSR handshaking\n" -msgstr "" +msgstr " * [-]cdtrdsr 启用 DTR/DSR 握手\n" #: src/stty.c:667 msgid " csN set character size to N bits, N in [5..8]\n" -msgstr "" +msgstr " csN 将字符大小设置为 N 比特，N 取值在 [5..8] 之间\n" #: src/stty.c:670 msgid "" @@ -9275,7 +9909,7 @@ #: src/stty.c:707 msgid " * [-]iuclc translate uppercase characters to lowercase\n" -msgstr "" +msgstr " * [-]iuclc 将大写字符转换为小写\n" #: src/stty.c:712 msgid "" @@ -9295,10 +9929,12 @@ "\n" "Output settings:\n" msgstr "" +"\n" +"输出设置：\n" #: src/stty.c:727 msgid " * bsN backspace delay style, N in [0..1]\n" -msgstr "" +msgstr " * bsN 退格延迟风格，N 取值在 [0..1] 范围内\n" #: src/stty.c:732 msgid " * crN carriage return delay style, N in [0..3]\n" @@ -9310,7 +9946,7 @@ #: src/stty.c:742 msgid " * nlN newline delay style, N in [0..1]\n" -msgstr "" +msgstr " * nlN 新行延迟风格，N 取值在 [0..1] 范围内\n" #: src/stty.c:747 msgid " * [-]ocrnl translate carriage return to newline\n" @@ -9344,7 +9980,7 @@ #: src/stty.c:781 msgid " [-]opost postprocess output\n" -msgstr "" +msgstr " [-]opost 对输出进行后处理\n" #: src/stty.c:785 msgid "" @@ -9363,6 +9999,9 @@ "Local settings:\n" " [-]crterase echo erase characters as backspace-space-backspace\n" msgstr "" +"\n" +"本地设置：\n" +" [-]crterase 将清除字符回显输出为退格-空格-退格\n" #: src/stty.c:802 msgid "" @@ -9376,11 +10015,11 @@ #: src/stty.c:812 msgid " [-]echo echo input characters\n" -msgstr "" +msgstr " [-]echo 对输入字符进行回显\n" #: src/stty.c:816 msgid " * [-]echoctl same as [-]ctlecho\n" -msgstr "" +msgstr " * [-]echoctl 和 [-]ctlecho 相同\n" #: src/stty.c:820 msgid "" @@ -9390,7 +10029,7 @@ #: src/stty.c:825 msgid " * [-]echoke same as [-]crtkill\n" -msgstr "" +msgstr " * [-]echoke 与 [-]crtkill 相同\n" #: src/stty.c:829 msgid " [-]echonl echo newline even if not echoing other characters\n" @@ -9404,11 +10043,11 @@ #: src/stty.c:838 msgid "" " * [-]extproc enable \"LINEMODE\"; useful with high latency links\n" -msgstr "" +msgstr " * [-]extproc 启用“行模式”（LINEMODE）；在高延迟连接下有用\n" #: src/stty.c:843 msgid " * [-]flusho discard output\n" -msgstr "" +msgstr " * [-]flusho 丢弃输出\n" #: src/stty.c:847 #, c-format @@ -9416,6 +10055,8 @@ " [-]icanon enable special characters: %s\n" " [-]iexten enable non-POSIX special characters\n" msgstr "" +" [-]icanon 启用特殊字符：%s\n" +" [-]iexten 启用非 POSIX 特殊字符\n" #: src/stty.c:858 msgid "" @@ -9426,12 +10067,12 @@ #: src/stty.c:863 msgid " * [-]prterase same as [-]echoprt\n" -msgstr "" +msgstr " * [-]prterase 与 [-]echoprt 相同\n" #: src/stty.c:868 msgid "" " * [-]tostop stop background jobs that try to write to the terminal\n" -msgstr "" +msgstr " * [-]tostop 停止尝试写入终端的后台任务\n" #: src/stty.c:873 msgid "" @@ -9443,16 +10084,20 @@ "\n" "Combination settings:\n" msgstr "" +"\n" +"组合设置：\n" #: src/stty.c:882 msgid " * [-]LCASE same as [-]lcase\n" -msgstr "" +msgstr " * [-]LCASE 与 [-]lcase 相同\n" #: src/stty.c:886 msgid "" " cbreak same as -icanon\n" " -cbreak same as icanon\n" msgstr "" +" cbreak 与 -icanon 相同\n" +" -cbreak 与 icanon 相同\n" #: src/stty.c:890 msgid "" @@ -9464,7 +10109,7 @@ #: src/stty.c:895 #, c-format msgid " crt same as %s\n" -msgstr "" +msgstr " crt 与 %s 相同\n" #: src/stty.c:905 #, c-format @@ -9475,7 +10120,7 @@ #: src/stty.c:920 msgid " * [-]decctlq same as [-]ixany\n" -msgstr "" +msgstr " * [-]decctlq 与 [-]ixany 相同\n" #: src/stty.c:924 msgid "" @@ -9493,6 +10138,8 @@ " litout same as -parenb -istrip -opost cs8\n" " -litout same as parenb istrip opost cs7\n" msgstr "" +" litout 与 -parenb -istrip -opost cs8 相同\n" +" -litout 与 parenb istrip opost cs7 相同\n" #: src/stty.c:938 #, c-format @@ -9500,6 +10147,8 @@ " nl same as %s\n" " -nl same as %s\n" msgstr "" +" nl 与 %s 相同\n" +" -nl 与 %s 相同\n" #: src/stty.c:956 msgid "" @@ -9523,6 +10172,10 @@ " -isig%s min 1 time 0\n" " -raw same as cooked\n" msgstr "" +" raw 等效于 -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" +" -inlcr -igncr -icrnl -ixon -ixoff -icanon -opost\n" +" -isig%s min 1 time 0\n" +" -raw 等效于 cooked\n" #: src/stty.c:982 #, c-format @@ -9534,6 +10187,12 @@ " %s,\n" " all special characters to their default values\n" msgstr "" +" sane 等效于 cread -ignbrk brkint -inlcr -igncr icrnl\n" +" icanon iexten echo echoe echok -echonl -noflsh\n" +" %s\n" +" %s\n" +" %s，\n" +" 所有特殊字符均为其默认值\n" #: src/stty.c:1068 msgid "" @@ -9608,7 +10267,7 @@ #: src/sum.c:63 msgid "Print checksum and block counts for each FILE.\n" -msgstr "" +msgstr "输出每个指定文件的校验值和块计数。\n" #: src/sum.c:69 msgid "" @@ -9616,6 +10275,9 @@ " -r use BSD sum algorithm, use 1K blocks\n" " -s, --sysv use System V sum algorithm, use 512 bytes blocks\n" msgstr "" +"\n" +" -r 使用 BSD 加和算法，以1 KB 为一个块\n" +" -s, --sysv 使用System V 加和算法，以512字节为一个块\n" #: src/sync.c:64 #, c-format @@ -9630,40 +10292,44 @@ "or their containing file systems.\n" "\n" msgstr "" +"将缓存数据写入持久存储设备中\n" +"\n" +"如果指定了一个或多个文件，则只同步这些文件（或包含它们的文件系统）。\n" +"\n" #: src/sync.c:73 msgid " -d, --data sync only file data, no unneeded metadata\n" -msgstr "" +msgstr " -d, --data 仅同步文件数据，不处理无需同步的元数据\n" #: src/sync.c:76 msgid "" " -f, --file-system sync the file systems that contain the files\n" -msgstr "" +msgstr " -f, --file-system 对包含文件的文件系统也进行同步\n" -#: src/sync.c:114 +#: src/sync.c:115 #, c-format msgid "error opening %s" -msgstr "" +msgstr "打开 %s 时出错" -#: src/sync.c:124 +#: src/sync.c:126 #, c-format msgid "couldn't reset non-blocking mode %s" -msgstr "" +msgstr "无法重置非阻塞模式 %s" -#: src/sync.c:155 +#: src/sync.c:157 #, c-format msgid "error syncing %s" -msgstr "" +msgstr "同步 %s 时出错" -#: src/sync.c:213 +#: src/sync.c:215 msgid "cannot specify both --data and --file-system" -msgstr "" +msgstr "无法同时指定 --data 和 --file-system" -#: src/sync.c:217 +#: src/sync.c:219 msgid "--data needs at least one argument" -msgstr "" +msgstr "--data 需要至少一个参数" -#: src/system.h:344 +#: src/system.h:347 #, c-format msgid "" "\n" @@ -9675,15 +10341,15 @@ "注意：您的shell 可能内置了自己的%s 程序版本，它会覆盖这里所提及的相应\n" "版本。请查阅您的shell 文档获知它所支持的选项。\n" -#: src/system.h:350 +#: src/system.h:353 msgid " --help display this help and exit\n" msgstr " --help\t\t显示此帮助信息并退出\n" -#: src/system.h:352 +#: src/system.h:355 msgid " --version output version information and exit\n" msgstr " --version\t\t显示版本信息并退出\n" -#: src/system.h:580 +#: src/system.h:583 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -9691,7 +10357,7 @@ "\n" "如果没有指定文件，或者文件为\"-\"，则从标准输入读取。\n" -#: src/system.h:587 +#: src/system.h:590 msgid "" "\n" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -9707,7 +10373,7 @@ "Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n" msgstr "" -#: src/system.h:604 +#: src/system.h:608 #, c-format msgid "" "\n" @@ -9720,7 +10386,7 @@ "及 BLOCKSIZE 环境变量中第一个可用的 SIZE 单位。\n" "否则，默认单位是 1024 字节(或是 512，若设定 POSIXLY_CORRECT 的话)。\n" -#: src/system.h:614 +#: src/system.h:618 msgid "" "\n" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -9729,8 +10395,13 @@ "the VERSION_CONTROL environment variable. Here are the values:\n" "\n" msgstr "" +"\n" +"备份文件的后缀为\"~\"，除非以--suffix 选项或是 SIMPLE_BACKUP_SUFFIX\n" +"环境变量指定。版本控制的方式可通过--backup 选项或 VERSION_CONTROL 环境\n" +"变量来选择。以下是可用的变量值：\n" +"\n" -#: src/system.h:621 +#: src/system.h:625 msgid "" " none, off never make backups (even if --backup is given)\n" " numbered, t make numbered backups\n" @@ -9742,7 +10413,7 @@ " existing, nil 若有数字的备份文件已经存在则使用数字，否则使用普通方式备份\n" " simple, never 永远使用普通方式备份\n" -#: src/system.h:651 +#: src/system.h:655 #, c-format msgid "" "\n" @@ -9766,17 +10437,17 @@ msgid "Full documentation at: <%s%s>\n" msgstr "完整文档请见：<%s%s>\n" -#: src/system.h:667 +#: src/system.h:671 #, c-format msgid "or available locally via: info '(coreutils) %s%s'\n" msgstr "或者在本地使用：info '(coreutils) %s%s'\n" -#: src/system.h:678 +#: src/system.h:682 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "请尝试执行 \"%s --help\" 来获取更多信息。\n" -#: src/system.h:722 +#: src/system.h:726 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -9798,7 +10469,7 @@ #: src/tac.c:136 msgid "Write each FILE to standard output, last line first.\n" -msgstr "" +msgstr "将每个指定文件按行倒置并写到标准输出。\n" #: src/tac.c:143 msgid "" @@ -9832,7 +10503,7 @@ #: src/tac.c:484 #, c-format msgid "failed to rewind stream for %s" -msgstr "" +msgstr "为 %s 进行流 rewind 操作时失败" #: src/tac.c:521 src/tac.c:533 #, c-format @@ -9849,32 +10520,40 @@ msgstr "分隔符不能为空" #. This is a proper name. See the gettext manual, section Names. -#: src/tail.c:74 +#: src/tail.c:78 msgid "Ian Lance Taylor" msgstr "Ian Lance Taylor" -#: src/tail.c:265 +#: src/tail.c:269 #, c-format msgid "" "Print the last %d lines of each FILE to standard output.\n" "With more than one FILE, precede each with a header giving the file name.\n" msgstr "" +"显示每个指定文件的最后 %d 行并输出至标准输出。\n" +"若指定了多于一个文件，程序会在每段输出的开始添加相应文件名作为头。\n" -#: src/tail.c:273 +#: src/tail.c:277 msgid "" " -c, --bytes=[+]NUM output the last NUM bytes; or use -c +NUM to\n" " output starting with byte NUM of each file\n" msgstr "" +" -c, --bytes=[+]NUM 输出最后 NUM 字节；或者使用 -c +NUM 以输出\n" +" 每个文件第 NUM 个字节之后的全部内容\n" -#: src/tail.c:277 +#: src/tail.c:281 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" " an absent option argument means 'descriptor'\n" " -F same as --follow=name --retry\n" msgstr "" +" -f, --follow[={name|descriptor}]\n" +" 随文件增长即时输出新增数据；\n" +" 若未给定选项参数，则默认使用 'descriptor'\n" +" -F 和 --follow=name --retry 相同\n" -#: src/tail.c:283 +#: src/tail.c:287 #, c-format msgid "" " -n, --lines=[+]NUM output the last NUM lines, instead of the last " @@ -9889,14 +10568,17 @@ " with inotify, this option is rarely useful\n" msgstr "" -#: src/tail.c:296 +#: src/tail.c:300 msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" " -q, --quiet, --silent never output headers giving file names\n" " --retry keep trying to open a file if it is inaccessible\n" msgstr "" +" --pid=PID 同 -f 一起使用，当所指定对应的进程死去后终止\n" +" -q, --quiet, --silent 不输出给出文件名的头\n" +" --retry 即使目标文件不可访问依然重复试图打开\n" -#: src/tail.c:301 +#: src/tail.c:305 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations;\n" @@ -9914,7 +10596,7 @@ "\n" msgstr "" -#: src/tail.c:320 +#: src/tail.c:325 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" @@ -9927,162 +10609,162 @@ "的程序动作并不如您所愿。在这种场合可以使用--follow=name 选项，它会使\n" "tail 定期追踪打开给定名称的文件，以确认它是否被删除或被其它某些程序重新创建过。\n" -#: src/tail.c:393 +#: src/tail.c:416 #, c-format msgid "closing %s (fd=%d)" msgstr "正在关闭 %s (fd=%d)" -#: src/tail.c:492 +#: src/tail.c:515 #, c-format msgid "%s: cannot seek to end-relative offset %s" msgstr "%s：无法检索相对偏移量的末尾 %s" -#: src/tail.c:927 +#: src/tail.c:951 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "无法定位 %s 的位置，回归为 polling 机制" -#: src/tail.c:983 +#: src/tail.c:1007 #, c-format msgid "%s has been replaced with an untailable symbolic link" -msgstr "" +msgstr "%s 已被替换为 tail 无法处理的符号链接" -#: src/tail.c:998 +#: src/tail.c:1022 #, c-format msgid "%s has become inaccessible" msgstr "%s 已不可访问" -#: src/tail.c:1016 +#: src/tail.c:1040 #, c-format msgid "%s has been replaced with an untailable file%s" -msgstr "" +msgstr "%s 已被替换为 tail 无法处理的文件 %s" -#: src/tail.c:1018 src/tail.c:2024 +#: src/tail.c:1042 src/tail.c:2048 msgid "; giving up on this name" -msgstr "" +msgstr "；放弃处理该名称" -#: src/tail.c:1024 +#: src/tail.c:1048 #, c-format msgid "%s has been replaced with an untailable remote file" -msgstr "" +msgstr "%s 已被替换为 tail 无法处理的远程文件" -#: src/tail.c:1045 +#: src/tail.c:1069 #, c-format msgid "%s has become accessible" msgstr "%s 已经可以访问" -#: src/tail.c:1057 +#: src/tail.c:1081 #, c-format msgid "%s has appeared; following new file" -msgstr "" +msgstr "%s 已被建立；正在跟随新文件的末尾" -#: src/tail.c:1067 +#: src/tail.c:1091 #, c-format msgid "%s has been replaced; following new file" -msgstr "" +msgstr "%s 已被替换；正在跟随新文件的末尾" -#: src/tail.c:1182 +#: src/tail.c:1206 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s：无法更改非阻塞模式" -#: src/tail.c:1228 src/tail.c:1403 +#: src/tail.c:1252 src/tail.c:1427 #, c-format msgid "%s: file truncated" msgstr "%s：文件已截断" -#: src/tail.c:1262 src/tail.c:1604 +#: src/tail.c:1286 src/tail.c:1628 #, c-format msgid "no files remaining" msgstr "没有剩余文件" -#: src/tail.c:1498 +#: src/tail.c:1522 #, c-format msgid "cannot watch parent directory of %s" -msgstr "无法监视%s 的上级目录" +msgstr "无法监视 %s 的上级目录" -#: src/tail.c:1501 src/tail.c:1518 src/tail.c:1728 +#: src/tail.c:1525 src/tail.c:1542 src/tail.c:1752 #, c-format msgid "inotify resources exhausted" msgstr "inotify 资源耗尽" -#: src/tail.c:1522 src/tail.c:1736 +#: src/tail.c:1546 src/tail.c:1760 #, c-format msgid "cannot watch %s" msgstr "无法监视 %s" -#: src/tail.c:1571 +#: src/tail.c:1595 #, c-format msgid "%s was replaced" msgstr "%s 已被替换" -#: src/tail.c:1643 +#: src/tail.c:1667 msgid "error waiting for inotify and output events" -msgstr "" +msgstr "等待 inotify 和输出事件时出错" -#: src/tail.c:1671 +#: src/tail.c:1695 msgid "error reading inotify event" -msgstr "读取inotify 事件出错" +msgstr "读取 inotify 事件出错" -#: src/tail.c:1690 +#: src/tail.c:1714 #, c-format msgid "directory containing watched file was removed" -msgstr "" +msgstr "包含所监视文件的目录已被删除" -#: src/tail.c:2022 +#: src/tail.c:2046 #, c-format msgid "%s: cannot follow end of this type of file%s" -msgstr "" +msgstr "%s：无法跟随此类型文件的末尾 %s" -#: src/tail.c:2203 +#: src/tail.c:2227 msgid "invalid maximum number of unchanged stats between opens" msgstr "" -#: src/tail.c:2211 +#: src/tail.c:2235 msgid "invalid PID" msgstr "无效的进程号（PID）" -#: src/tail.c:2227 +#: src/tail.c:2251 #, c-format msgid "invalid number of seconds: %s" msgstr "无效的秒数：%s" -#: src/tail.c:2246 +#: src/tail.c:2270 #, c-format msgid "option used in invalid context -- %c" -msgstr "在未定义环境中的无效选项 -- %c" +msgstr "在无效上下文中使用选项 -- %c" -#: src/tail.c:2258 +#: src/tail.c:2282 #, c-format msgid "warning: --retry ignored; --retry is useful only when following" msgstr "警告：已忽略 --retry；只有在跟随模式下 --retry 选项才是有用的" -#: src/tail.c:2262 +#: src/tail.c:2286 #, c-format msgid "warning: --retry only effective for the initial open" -msgstr "" +msgstr "警告：--retry 仅对初次打开文件有效" -#: src/tail.c:2267 +#: src/tail.c:2291 #, c-format msgid "warning: PID ignored; --pid=PID is useful only when following" -msgstr "警告：已忽略进程号，只有在跟随模式下--pid=PID 选项才是有用的" +msgstr "警告：已忽略进程号，只有在跟随模式下 --pid=PID 选项才是有用的" -#: src/tail.c:2270 +#: src/tail.c:2294 #, c-format msgid "warning: --pid=PID is not supported on this system" -msgstr "警告：此系统不支持--pid=PID" +msgstr "警告：此系统不支持 --pid=PID" -#: src/tail.c:2376 +#: src/tail.c:2400 #, c-format msgid "cannot follow %s by name" -msgstr "无法按名称跟随%s" +msgstr "无法按名称跟随 %s" -#: src/tail.c:2391 +#: src/tail.c:2415 #, c-format msgid "warning: following standard input indefinitely is ineffective" -msgstr "警告：无限期跟随标准输入是无用的" +msgstr "警告：无限期跟随标准输入是" -#: src/tail.c:2488 +#: src/tail.c:2512 #, c-format msgid "inotify cannot be used, reverting to polling" msgstr "无法使用 inotify 机制，回退为轮询（polling）机制" @@ -10130,54 +10812,54 @@ "当 --output-error 没有给出时，默认的操作是在向管道写入出错时立刻退出，\n" "且在向非管道写入出错时对问题进行诊断。\n" -#: src/test.c:127 +#: src/test.c:126 #, c-format msgid "missing argument after %s" msgstr "%s 后缺少参数" -#: src/test.c:163 +#: src/test.c:162 #, c-format msgid "invalid integer %s" msgstr "无效的整数 %s" -#: src/test.c:245 +#: src/test.c:244 #, c-format msgid "%s expected" msgstr "预期得到 %s" -#: src/test.c:248 +#: src/test.c:247 #, c-format msgid "%s expected, found %s" msgstr "预期得到 %s，实际得到 %s" -#: src/test.c:265 src/test.c:623 +#: src/test.c:396 #, c-format msgid "%s: unary operator expected" msgstr "%s: 预期为单目运算符" -#: src/test.c:334 +#: src/test.c:328 msgid "-nt does not accept -l" msgstr "-nt 不能与-l 同时使用" -#: src/test.c:347 +#: src/test.c:341 msgid "-ef does not accept -l" msgstr "-ef 不能与-l 同时使用" -#: src/test.c:363 +#: src/test.c:357 msgid "-ot does not accept -l" msgstr "-ot 不能于-l 同时使用" -#: src/test.c:372 +#: src/test.c:366 #, c-format msgid "%s: unknown binary operator" msgstr "%s：未知双目运算符" -#: src/test.c:651 +#: src/test.c:632 #, c-format msgid "%s: binary operator expected" msgstr "%s: 预期为双目运算符" -#: src/test.c:709 +#: src/test.c:690 msgid "" "Usage: test EXPRESSION\n" " or: test\n" @@ -10191,7 +10873,7 @@ "　或：[ ]\n" "　或：[ 选项\n" -#: src/test.c:716 +#: src/test.c:697 msgid "" "Exit with the status determined by EXPRESSION.\n" "\n" @@ -10199,7 +10881,7 @@ "退出状态值取决于表达式。\n" "\n" -#: src/test.c:722 +#: src/test.c:703 msgid "" "\n" "An omitted EXPRESSION defaults to false. Otherwise,\n" @@ -10209,7 +10891,7 @@ "被省略的表达式的值默认为假，否则可能为真也可能为假，\n" "并会被设为退出状态值。有效的表达式应属于下列之一：\n" -#: src/test.c:727 +#: src/test.c:708 msgid "" "\n" " ( EXPRESSION ) EXPRESSION is true\n" @@ -10223,7 +10905,7 @@ " 表达式1 -a 表达式2\t两个表达式的值都为真时结果为真(与)\n" " 表达式1 -o 表达式2\t两个表达式中任一的值为真时结果为真(或)\n" -#: src/test.c:734 +#: src/test.c:715 msgid "" "\n" " -n STRING the length of STRING is nonzero\n" @@ -10239,7 +10921,7 @@ " 字符串1 = 字符串2\t两个字符串相等\n" " 字符串1 != 字符串2\t两个字符串不等\n" -#: src/test.c:742 +#: src/test.c:723 msgid "" "\n" " INTEGER1 -eq INTEGER2 INTEGER1 is equal to INTEGER2\n" @@ -10257,7 +10939,7 @@ " 整数1 -lt 整数2\t整数1 小于 整数2\n" " 整数1 -ne 整数2\t整数1 不等于整数2\n" -#: src/test.c:751 +#: src/test.c:732 msgid "" "\n" " FILE1 -ef FILE2 FILE1 and FILE2 have the same device and inode numbers\n" @@ -10269,7 +10951,7 @@ " 文件1 -nt 文件2\t文件1 的上次修改时间新于文件2\n" " 文件1 -ot 文件2\t文件1 的上次修改时间旧于文件2\n" -#: src/test.c:757 +#: src/test.c:738 msgid "" "\n" " -b FILE FILE exists and is block special\n" @@ -10283,7 +10965,7 @@ " -d 文件\t\t指定文件存在且为目录\n" " -e 文件\t\t指定文件存在\n" -#: src/test.c:764 +#: src/test.c:745 msgid "" " -f FILE FILE exists and is a regular file\n" " -g FILE FILE exists and is set-group-ID\n" @@ -10311,7 +10993,7 @@ " -r 文件\t\t指定文件存在且具备读取权限\n" " -s 文件\t\t指定文件存在且其大小大于0\n" -#: src/test.c:778 +#: src/test.c:760 msgid "" " -S FILE FILE exists and is a socket\n" " -t FD file descriptor FD is opened on a terminal\n" @@ -10325,7 +11007,7 @@ " -w 文件\t\t指定文件存在且具备写入权限\n" " -x 文件\t\t指定文件存在且具备执行或搜索(针对目录)权限\n" -#: src/test.c:785 +#: src/test.c:767 msgid "" "\n" "Except for -h and -L, all FILE-related tests dereference symbolic links.\n" @@ -10338,14 +11020,17 @@ "请留心您在必要时需由shell 转义圆括号字符(例如使用反斜杠)。\n" "指定整数也可用\"-l 字符串\"表示，这会估算相应字符串的长度。\n" -#: src/test.c:791 +#: src/test.c:773 msgid "" "\n" "NOTE: Binary -a and -o are inherently ambiguous. Use 'test EXPR1 && test\n" "EXPR2' or 'test EXPR1 || test EXPR2' instead.\n" msgstr "" +"\n" +"注意：二元运算符 -a 和 -o 从本质上是具有歧义的。请使用“test 表达式1 &&\n" +"test 表达式2”或者“test 表达式1 || test 表达式2”进行替代。\n" -#: src/test.c:796 +#: src/test.c:778 msgid "" "\n" "NOTE: [ honors the --help and --version options, but test does not.\n" @@ -10355,26 +11040,26 @@ "注意：[ 服从 --help 和 --version 选项但 test 不同。\n" "test 将其和其他非空字符串同能对待。\n" -#: src/test.c:801 +#: src/test.c:783 msgid "test and/or [" msgstr "test 和/或[" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:813 +#: src/test.c:795 msgid "Kevin Braunsdorf" msgstr "Kevin Braunsdorf" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:814 +#: src/test.c:796 msgid "Matthew Bradburn" msgstr "Matthew Bradburn" -#: src/test.c:868 +#: src/test.c:850 #, c-format msgid "missing %s" msgstr "缺少 %s" -#: src/test.c:882 +#: src/test.c:864 #, c-format msgid "extra argument %s" msgstr "多余的参数 %s" @@ -10424,10 +11109,24 @@ " SIGNAL may be a name like 'HUP' or a number;\n" " see 'kill -l' for a list of signals\n" msgstr "" +" --preserve-status\n" +" 退出时返回值与所运行命令的返回值保持相同，即使命令超时也\n" +" 这样设置\n" +" --foreground\n" +" 当 timeout 不是直接从 shell 命令行开始运行时，允许所运行的\n" +" 命令从 TTY 读取输入并获取 TTY 信号；在此模式下，所运行的\n" +" 命令的子进程不会受超时的影响\n" +" -k, --kill-after=持续时间\n" +" 如果所运行命令在初始信号发出后再经过所指定持续时间以后仍然\n" +" 在运行，则对其发送 KILL 信号\n" +" -s, --signal=信号\n" +" 指定超时发生时要发送的信号；\n" +" 所指定的信号可以是如“HUP”这样的名称，或是一个数字；\n" +" 请参见“kill -l”以获取可用信号列表\n" #: src/timeout.c:260 msgid " -v, --verbose diagnose to stderr any signal sent upon timeout\n" -msgstr "" +msgstr " -v, --verbose 对任何超时后发送的信号，向标准错误输出诊断信息\n" #: src/timeout.c:266 msgid "" @@ -10437,6 +11136,10 @@ "days.\n" "A duration of 0 disables the associated timeout.\n" msgstr "" +"\n" +"指定的持续时间应是一个附加有下列后缀的浮点数：\n" +"“s”代表秒（默认值），“m”代表分，“h”代表小时，“d”代表天数。\n" +"若持续时间设置为0,将禁用所关联的超时配置。\n" #: src/timeout.c:271 msgid "" @@ -10448,6 +11151,12 @@ "to use the KILL (9) signal, since this signal cannot be caught, in which\n" "case the exit status is 128+9 rather than 124.\n" msgstr "" +"\n" +"如果命令超时且未设置 --preserve-status，程序退出的状态值将为 124。\n" +"否则将使用所运行程序的退出状态值作为退出状态值。\n" +"如果没有指定信号则默认使用 TERM 信号。TERM 信号在进程没有捕获此信号时将\n" +"杀死进程。对于另一些进程可能需要使用 KILL (9)信号。因此信号无法被捕获，\n" +"退出返回值将为 128+9 而非 124。\n" #: src/timeout.c:346 src/timeout.c:403 #, c-format @@ -10457,7 +11166,7 @@ #: src/timeout.c:425 #, c-format msgid "warning: disabling core dumps failed" -msgstr "" +msgstr "警告：禁用核心转储失败" #: src/timeout.c:544 #, c-format @@ -10509,6 +11218,12 @@ "A FILE argument string of - is handled specially and causes touch to\n" "change the times of the file associated with standard output.\n" msgstr "" +"将所指定的每个文件的访问时间和修改时间更改为当前时间。\n" +"\n" +"除非提供 -c 或 -h 选项，否则指定不存在的文件将会被创建为空文件。\n" +"\n" +"如果所指定文件名为 - 则特殊处理，程序将更改与标准输出相关联的文件的\n" +"访问时间。\n" #: src/touch.c:226 msgid "" @@ -10542,6 +11257,11 @@ " WORD is access, atime, or use: equivalent to -a\n" " WORD is modify or mtime: equivalent to -m\n" msgstr "" +" -r, --reference=文件 使用指定文件的时间属性而非当前时间\n" +" -t 时间戳 使用给定 [[CC]YY]MMDDhhmm[.ss] 的时间戳而非当前时间\n" +" --time=类型 修改指定类型的时间：\n" +" 若所指定类型是 access、atime 或 use：与 -a 等效\n" +" 若所指定类型是 modify 或 mtime：与 -m 等效\n" #: src/touch.c:247 msgid "" @@ -10560,7 +11280,7 @@ #, c-format msgid "" "warning: 'touch %s' is obsolete; use 'touch -t %04ld%02d%02d%02d%02d.%02d'" -msgstr "" +msgstr "警告：\"touch %s\" 已过时；请使用 \"touch -t %04ld%02d%02d%02d%02d.%02d\" 代替" #: src/tr.c:287 #, c-format @@ -10686,12 +11406,12 @@ #: src/tr.c:888 #, c-format msgid "missing character class name '[::]'" -msgstr "" +msgstr "缺失字符种类名\"[::]\"" #: src/tr.c:891 #, c-format msgid "missing equivalence class character '[==]'" -msgstr "" +msgstr "缺失类型等值的字符\"[==]\"" #: src/tr.c:906 #, c-format @@ -10772,11 +11492,11 @@ #: src/true.c:45 msgid "Exit with a status code indicating success." -msgstr "以表示成功的状态值退出" +msgstr "以表示成功的状态值退出。" #: src/true.c:46 msgid "Exit with a status code indicating failure." -msgstr "以表示失败的状态值退出" +msgstr "以表示失败的状态值退出。" #: src/truncate.c:70 #, c-format @@ -10822,12 +11542,12 @@ msgid "overflow in % * % byte blocks for file %s" msgstr "在文件%3$s 的%1$ * %2$ 字节块中溢出" -#: src/truncate.c:147 +#: src/truncate.c:145 #, c-format msgid "%s has unusable, apparently negative size" msgstr "%s 的文件大小为负数，无法使用" -#: src/truncate.c:157 src/truncate.c:359 +#: src/truncate.c:155 src/truncate.c:348 #, c-format msgid "cannot get the size of %s" msgstr "无法获得%s 的大小" @@ -10837,68 +11557,70 @@ msgid "overflow rounding up size of file %s" msgstr "处理大于等于文件%s 的指定大小的最大倍数时溢出" -#: src/truncate.c:189 +#: src/truncate.c:179 #, c-format msgid "overflow extending size of file %s" msgstr "扩展文件%s 大小时溢出" -#: src/truncate.c:204 +#: src/truncate.c:193 #, c-format msgid "failed to truncate %s at % bytes" msgstr "在%2$ 字节处截断%1$s 失败" -#: src/truncate.c:277 +#: src/truncate.c:266 #, c-format msgid "multiple relative modifiers specified" msgstr "指定了多个相关修饰符" -#: src/truncate.c:286 +#: src/truncate.c:275 msgid "Invalid number" msgstr "无效的数字" -#: src/truncate.c:308 +#: src/truncate.c:297 #, c-format msgid "you must specify either %s or %s" msgstr "您必须在 %s 或 %s 中指定一个" -#: src/truncate.c:315 +#: src/truncate.c:304 #, c-format msgid "you must specify a relative %s with %s" msgstr "您必须为 %2$s 中指定一个相关的 %1$s" -#: src/truncate.c:322 +#: src/truncate.c:311 #, c-format msgid "%s was specified but %s was not" msgstr "已指定 %s 但未指定 %s" -#: src/truncate.c:379 +#: src/truncate.c:368 #, c-format msgid "cannot open %s for writing" msgstr "无法打开 %s 以写入数据" #. This is a proper name. See the gettext manual, section Names. -#: src/tsort.c:41 +#: src/tsort.c:40 msgid "Mark Kettenis" msgstr "Mark Kettenis" -#: src/tsort.c:88 +#: src/tsort.c:82 #, c-format msgid "" "Usage: %s [OPTION] [FILE]\n" "Write totally ordered list consistent with the partial ordering in FILE.\n" msgstr "" +"用法：%s [选项] [文件]\n" +"对不完全排序的给定<文件>实行完整的列表排序。\n" -#: src/tsort.c:95 src/uptime.c:218 +#: src/tsort.c:89 src/uptime.c:213 #, c-format msgid "\n" msgstr "\n" -#: src/tsort.c:481 +#: src/tsort.c:475 #, c-format msgid "%s: input contains an odd number of tokens" msgstr "%s：输入内容的行数为奇数" -#: src/tsort.c:527 +#: src/tsort.c:521 #, c-format msgid "%s: input contains a loop:" msgstr "%s：输入内容中含有循环段落：" @@ -10979,12 +11701,12 @@ msgid "tab stop value is too large" msgstr "制表符限长过大" -#: src/uniq.c:171 +#: src/uniq.c:166 #, c-format msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n" msgstr "用法：%s [选项]... [文件]\n" -#: src/uniq.c:175 +#: src/uniq.c:170 msgid "" "Filter adjacent matching lines from INPUT (or standard input),\n" "writing to OUTPUT (or standard output).\n" @@ -10992,13 +11714,13 @@ "With no options, matching lines are merged to the first occurrence.\n" msgstr "" -#: src/uniq.c:184 +#: src/uniq.c:179 msgid "" " -c, --count prefix lines by the number of occurrences\n" " -d, --repeated only print duplicate lines, one for each group\n" msgstr "" -#: src/uniq.c:188 +#: src/uniq.c:183 msgid "" " -D print all duplicate lines\n" " --all-repeated[=METHOD] like -D, but allow separating groups\n" @@ -11006,29 +11728,32 @@ " METHOD={none(default),prepend,separate}\n" msgstr "" -#: src/uniq.c:194 +#: src/uniq.c:189 msgid " -f, --skip-fields=N avoid comparing the first N fields\n" -msgstr "" +msgstr " -f, --skip-fields=N 不要比较前 N 个域\n" -#: src/uniq.c:197 +#: src/uniq.c:192 msgid "" " --group[=METHOD] show all items, separating groups with an empty " "line;\n" " METHOD={separate(default),prepend,append,both}\n" msgstr "" -#: src/uniq.c:201 +#: src/uniq.c:196 msgid "" " -i, --ignore-case ignore differences in case when comparing\n" " -s, --skip-chars=N avoid comparing the first N characters\n" " -u, --unique only print unique lines\n" msgstr "" +" -i, --ignore-case 比较时忽略大小写差异\n" +" -s, --skip-chars=N 不要比较起始 N 个字符\n" +" -u, --unique 只输出不重复（内容唯一）的行\n" -#: src/uniq.c:209 +#: src/uniq.c:204 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:214 +#: src/uniq.c:209 msgid "" "\n" "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n" @@ -11049,38 +11774,38 @@ "您也许需要事先对输入排序，或使用 \"sort -u\" 而非 \"uniq\"。\n" "另外，比较操作将服从 \"LC_COLLATE\" 环境变量所指定的规则。\n" -#: src/uniq.c:437 +#: src/uniq.c:425 msgid "too many repeated lines" msgstr "重复行过多" -#: src/uniq.c:613 +#: src/uniq.c:600 msgid "invalid number of fields to skip" msgstr "要略过的区块数量无效" -#: src/uniq.c:622 +#: src/uniq.c:609 msgid "invalid number of bytes to skip" msgstr "要略过的字节数量无效" -#: src/uniq.c:632 +#: src/uniq.c:619 msgid "invalid number of bytes to compare" msgstr "要对照的字节数量无效" -#: src/uniq.c:654 +#: src/uniq.c:641 #, c-format msgid "--group is mutually exclusive with -c/-d/-D/-u" -msgstr "" +msgstr "--group 和 -c/-d/-D/-u 不兼容" -#: src/uniq.c:661 +#: src/uniq.c:648 #, c-format msgid "grouping and printing repeat counts is meaningless" msgstr "" -#: src/uniq.c:668 +#: src/uniq.c:655 #, c-format msgid "printing all duplicated lines and repeat counts is meaningless" msgstr "同时输出重复的行和重复计数是没有意义的" -#: src/unlink.c:51 +#: src/unlink.c:45 #, c-format msgid "" "Usage: %s FILE\n" @@ -11089,7 +11814,7 @@ "用法：%s 文件\n" "　或：%s 选项\n" -#: src/unlink.c:54 +#: src/unlink.c:48 msgid "" "Call the unlink function to remove the specified FILE.\n" "\n" @@ -11097,48 +11822,48 @@ "调用 unlink 函数删除指定的文件。\n" "\n" -#: src/uptime.c:131 +#: src/uptime.c:126 msgid "couldn't get boot time" msgstr "无法获取启动时间" #. TRANSLATORS: This prints the current clock time. -#: src/uptime.c:142 +#: src/uptime.c:137 msgid " %H:%M:%S " msgstr " %H:%M:%S " -#: src/uptime.c:144 +#: src/uptime.c:139 #, c-format msgid " ??:???? " msgstr " ??:???? " -#: src/uptime.c:146 +#: src/uptime.c:141 #, c-format msgid "up ???? days ??:??, " msgstr "已启动 ???? 天 ??:??， " -#: src/uptime.c:150 +#: src/uptime.c:145 #, c-format msgid "up %ld day %2d:%02d, " msgid_plural "up %ld days %2d:%02d, " msgstr[0] "已启动 %ld 天%2d:%02d， " -#: src/uptime.c:155 +#: src/uptime.c:150 #, c-format msgid "up %2d:%02d, " msgstr "已启动 %2d:%02d， " -#: src/uptime.c:157 +#: src/uptime.c:152 #, c-format msgid "%lu user" msgid_plural "%lu users" msgstr[0] "%lu 个用户" -#: src/uptime.c:167 +#: src/uptime.c:162 #, c-format msgid ", load average: %.2f" msgstr "，平均负载：%.2f" -#: src/uptime.c:205 +#: src/uptime.c:200 #, c-format msgid "" "Print the current time, the length of time the system has been up,\n" @@ -11148,14 +11873,14 @@ "输出当前时间，系统启动时间，当前登录用户数以及最近1、5 和15 分钟系统运行\n" "队列中的平均任务数。" -#: src/uptime.c:214 +#: src/uptime.c:209 #, c-format msgid "" " Processes in\n" "an uninterruptible sleep state also contribute to the load average.\n" msgstr " 处于不可中断睡眠状态的程序同样影响系统平均负载。\n" -#: src/uptime.c:220 +#: src/uptime.c:215 #, c-format msgid "" "If FILE is not specified, use %s. %s as FILE is common.\n" @@ -11164,7 +11889,7 @@ "如果文件没有指定，则使用%s，%s 是通用的相关文件。\n" "\n" -#: src/users.c:112 +#: src/users.c:106 #, c-format msgid "" "Output who is currently logged in according to FILE.\n" @@ -11175,14 +11900,17 @@ "如果文件未予指定，则使用%s，%s 是通用的相关文件。\n" "\n" -#: src/wc.c:120 +#: src/wc.c:123 msgid "" "Print newline, word, and byte counts for each FILE, and a total line if\n" "more than one FILE is specified. A word is a non-zero-length sequence of\n" "characters delimited by white space.\n" msgstr "" +"打印对每个给定文件的新行、单词和字节计数的结果；如果指定了超过\n" +"一个文件，则还会打印一个总行数。此处的一个单词是指由空白字符分隔的\n" +"长度大于零的字符序列。\n" -#: src/wc.c:128 +#: src/wc.c:131 msgid "" "\n" "The options below may be used to select which counts are printed, always in\n" @@ -11191,8 +11919,15 @@ " -m, --chars print the character counts\n" " -l, --lines print the newline counts\n" msgstr "" +"\n" +"输出每个指定文件的行数、单词计数和字节数，如果指定了\n" +"多于一个文件，继续给出所有相关数据的总计。如果没有指定\n" +"文件，或者文件为\"-\"，则从标准输入读取数据。\n" +" -c, --bytes\t\t输出字节数统计\n" +" -m, --chars\t\t输出字符数统计\n" +" -l, --lines\t\t输出行数统计\n" -#: src/wc.c:136 +#: src/wc.c:139 msgid "" " --files0-from=F read input from the files specified by\n" " NUL-terminated names in file F;\n" @@ -11200,6 +11935,10 @@ " -L, --max-line-length print the maximum display width\n" " -w, --words print the word counts\n" msgstr "" +" --files0-from=文件 从指定文件读取以空字符（NUL）终止的名称；\n" +" 如果该文件被指定为 - 则从标准输入读文件名\n" +" -L, --max-line-length 显示最长行的长度\n" +" -w, --words 显示单词计数\n" #: src/who.c:213 msgid " old " @@ -11341,8 +12080,12 @@ "If FILE is not specified, use %s. %s as FILE is common.\n" "If ARG1 ARG2 given, -m presumed: 'am i' or 'mom likes' are usual.\n" msgstr "" +"\n" +"如果文件未被指定，则使用%s。%s 是通用的相关文件。\n" +"如果给定了参数1和参数2，则假定同时启用了 -m 参数：常见的参数例子如\n" +"\"am i\" 或 \"mom likes\"。\n" -#: src/whoami.c:51 +#: src/whoami.c:45 msgid "" "Print the user name associated with the current effective user ID.\n" "Same as id -un.\n" @@ -11352,12 +12095,12 @@ "与id -un 相同。\n" "\n" -#: src/whoami.c:93 +#: src/whoami.c:86 #, c-format msgid "cannot find name for user ID %lu" msgstr "无法找到 ID 为 %lu 的用户的名称" -#: src/yes.c:47 +#: src/yes.c:41 #, c-format msgid "" "Usage: %s [STRING]...\n" @@ -11366,8 +12109,10 @@ "用法：%s [字符串]...\n" "　或：%s 选项\n" -#: src/yes.c:53 +#: src/yes.c:47 msgid "" "Repeatedly output a line with all specified STRING(s), or 'y'.\n" "\n" msgstr "" +"重复输出一行指定的字符串，或者重复输出\"y\"。\n" +"\n" diff -Nru language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/cpio.po language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/cpio.po --- language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/cpio.po 2020-07-10 08:58:47.000000000 +0000 +++ language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/cpio.po 2021-01-22 11:31:14.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: 2020-07-09 17:00+0000\n" -"X-Generator: Launchpad (build 4809fcb62f445aaa3ae919f7f6c3cc7d156ea57a)\n" +"X-Launchpad-Export-Date: 2021-01-21 17:58+0000\n" +"X-Generator: Launchpad (build 2d1d5e352f0d063d660df2300e31f66bed027fa5)\n" "Language: zh_CN\n" "X-Bugs: Report translation errors to the Language-Team address.\n" diff -Nru language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/cpplib.po language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/cpplib.po --- language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/cpplib.po 2020-07-10 08:58:56.000000000 +0000 +++ language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/cpplib.po 2021-01-22 11:31:24.000000000 +0000 @@ -8,14 +8,14 @@ "Project-Id-Version: cpplib 4.6.0\n" "Report-Msgid-Bugs-To: https://gcc.gnu.org/bugs/\n" "POT-Creation-Date: 2020-02-07 22:33+0000\n" -"PO-Revision-Date: 2020-04-13 02:31+0000\n" +"PO-Revision-Date: 2020-10-07 14:33+0000\n" "Last-Translator: Meng Jie \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: 2020-07-09 20:15+0000\n" -"X-Generator: Launchpad (build 4809fcb62f445aaa3ae919f7f6c3cc7d156ea57a)\n" +"X-Launchpad-Export-Date: 2021-01-21 21:26+0000\n" +"X-Generator: Launchpad (build 2d1d5e352f0d063d660df2300e31f66bed027fa5)\n" "X-Poedit-Country: CHINA\n" "Language: zh_CN\n" "X-Bugs: Report translation errors to the Language-Team address.\n" diff -Nru language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/cracklib.po language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/cracklib.po --- language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/cracklib.po 2020-07-10 08:58:50.000000000 +0000 +++ language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/cracklib.po 2021-01-22 11:31:18.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: 2020-07-09 17:00+0000\n" -"X-Generator: Launchpad (build 4809fcb62f445aaa3ae919f7f6c3cc7d156ea57a)\n" +"X-Launchpad-Export-Date: 2021-01-21 17:58+0000\n" +"X-Generator: Launchpad (build 2d1d5e352f0d063d660df2300e31f66bed027fa5)\n" "Language: \n" #: lib/fascist.c:516 diff -Nru language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/cryptsetup-luks.po language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/cryptsetup-luks.po --- language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/cryptsetup-luks.po 2020-07-10 08:58:56.000000000 +0000 +++ language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/cryptsetup-luks.po 2021-01-22 11:31: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: 2020-07-09 18:00+0000\n" -"X-Generator: Launchpad (build 4809fcb62f445aaa3ae919f7f6c3cc7d156ea57a)\n" +"X-Launchpad-Export-Date: 2021-01-21 19:01+0000\n" +"X-Generator: Launchpad (build 2d1d5e352f0d063d660df2300e31f66bed027fa5)\n" #: luks/keyencryption.c:61 #, c-format diff -Nru language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/cryptsetup.po language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/cryptsetup.po --- language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/cryptsetup.po 2020-07-10 08:58:51.000000000 +0000 +++ language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/cryptsetup.po 2021-01-22 11:31:18.000000000 +0000 @@ -14,65 +14,66 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2020-07-09 18:00+0000\n" -"X-Generator: Launchpad (build 4809fcb62f445aaa3ae919f7f6c3cc7d156ea57a)\n" +"X-Launchpad-Export-Date: 2021-01-21 19:01+0000\n" +"X-Generator: Launchpad (build 2d1d5e352f0d063d660df2300e31f66bed027fa5)\n" -#: lib/libdevmapper.c:399 +#: lib/libdevmapper.c:405 msgid "Cannot initialize device-mapper, running as non-root user." msgstr "" -#: lib/libdevmapper.c:402 +#: lib/libdevmapper.c:408 msgid "Cannot initialize device-mapper. Is dm_mod kernel module loaded?" msgstr "" -#: lib/libdevmapper.c:1131 +#: lib/libdevmapper.c:1149 msgid "Requested deferred flag is not supported." msgstr "" -#: lib/libdevmapper.c:1198 +#: lib/libdevmapper.c:1216 #, c-format msgid "DM-UUID for device %s was truncated." msgstr "" -#: lib/libdevmapper.c:1520 +#: lib/libdevmapper.c:1547 msgid "Unknown dm target type." msgstr "" -#: lib/libdevmapper.c:1623 lib/libdevmapper.c:1679 +#: lib/libdevmapper.c:1660 lib/libdevmapper.c:1665 lib/libdevmapper.c:1725 +#: lib/libdevmapper.c:1728 msgid "Requested dm-crypt performance options are not supported." msgstr "" -#: lib/libdevmapper.c:1630 +#: lib/libdevmapper.c:1672 lib/libdevmapper.c:1676 msgid "" "Requested dm-verity data corruption handling options are not supported." msgstr "" -#: lib/libdevmapper.c:1634 +#: lib/libdevmapper.c:1680 msgid "Requested dm-verity FEC options are not supported." msgstr "" -#: lib/libdevmapper.c:1638 +#: lib/libdevmapper.c:1684 msgid "Requested data integrity options are not supported." msgstr "" -#: lib/libdevmapper.c:1640 +#: lib/libdevmapper.c:1686 msgid "Requested sector_size option is not supported." msgstr "" -#: lib/libdevmapper.c:1645 +#: lib/libdevmapper.c:1691 msgid "Requested automatic recalculation of integrity tags is not supported." msgstr "" -#: lib/libdevmapper.c:1653 +#: lib/libdevmapper.c:1699 msgid "Requested dm-integrity bitmap mode is not supported." msgstr "" -#: lib/libdevmapper.c:1649 lib/libdevmapper.c:1682 lib/libdevmapper.c:1685 -#: lib/luks2/luks2_json_metadata.c:2160 +#: lib/libdevmapper.c:1695 lib/libdevmapper.c:1731 lib/libdevmapper.c:1734 +#: lib/luks2/luks2_json_metadata.c:2170 msgid "Discard/TRIM is not supported." msgstr "" -#: lib/libdevmapper.c:2607 +#: lib/libdevmapper.c:2663 #, c-format msgid "Failed to query dm-%s segment." msgstr "" @@ -176,7 +177,7 @@ msgstr "" #: lib/setup.c:1427 lib/setup.c:2544 lib/setup.c:2616 lib/setup.c:2628 -#: lib/setup.c:2777 lib/setup.c:4512 +#: lib/setup.c:2777 lib/setup.c:4517 #, c-format msgid "Device %s is not active." msgstr "" @@ -199,7 +200,7 @@ msgstr "" #: lib/setup.c:1549 lib/setup.c:1739 lib/luks2/luks2_reencrypt.c:2308 -#: src/cryptsetup.c:1226 src/cryptsetup.c:3923 +#: src/cryptsetup.c:1238 src/cryptsetup.c:3945 msgid "Unsupported encryption sector size." msgstr "" @@ -249,7 +250,7 @@ msgid "WARNING: LUKS2 keyslots area size changed to % bytes.\n" msgstr "" -#: lib/setup.c:1882 lib/utils_device.c:828 lib/luks1/keyencryption.c:255 +#: lib/setup.c:1882 lib/utils_device.c:834 lib/luks1/keyencryption.c:255 #: lib/luks2/luks2_reencrypt.c:2356 lib/luks2/luks2_reencrypt.c:3367 #, c-format msgid "Device %s is too small." @@ -415,8 +416,8 @@ msgid "Failed to swap new key slot." msgstr "" -#: lib/setup.c:3282 lib/setup.c:3648 lib/setup.c:4309 lib/setup.c:4322 -#: lib/setup.c:4330 lib/setup.c:4343 lib/setup.c:4693 lib/setup.c:5839 +#: lib/setup.c:3282 lib/setup.c:3648 lib/setup.c:4314 lib/setup.c:4327 +#: lib/setup.c:4335 lib/setup.c:4348 lib/setup.c:4698 lib/setup.c:5844 msgid "Volume key does not match the volume." msgstr "" @@ -425,7 +426,7 @@ msgid "Key slot %d is invalid." msgstr "" -#: lib/setup.c:3675 src/cryptsetup.c:1572 src/cryptsetup.c:1917 +#: lib/setup.c:3675 src/cryptsetup.c:1584 src/cryptsetup.c:1929 #, c-format msgid "Keyslot %d is not active." msgstr "" @@ -438,7 +439,7 @@ msgid "Reencryption in-progress. Cannot activate device." msgstr "" -#: lib/setup.c:3983 lib/luks2/luks2_json_metadata.c:2243 +#: lib/setup.c:3983 lib/luks2/luks2_json_metadata.c:2253 #: lib/luks2/luks2_reencrypt.c:2836 msgid "Failed to get reencryption lock." msgstr "" @@ -451,63 +452,63 @@ msgid "Device type is not properly initialised." msgstr "" -#: lib/setup.c:4171 +#: lib/setup.c:4182 #, c-format msgid "Cannot use device %s, name is invalid or still in use." msgstr "" -#: lib/setup.c:4174 +#: lib/setup.c:4175 #, c-format msgid "Device %s already exists." msgstr "" -#: lib/setup.c:4296 +#: lib/setup.c:4301 msgid "Incorrect volume key specified for plain device." msgstr "" -#: lib/setup.c:4405 +#: lib/setup.c:4410 msgid "Incorrect root hash specified for verity device." msgstr "" -#: lib/setup.c:4491 lib/setup.c:4507 lib/luks2/luks2_json_metadata.c:2296 -#: src/cryptsetup.c:2664 +#: lib/setup.c:4496 lib/setup.c:4512 lib/luks2/luks2_json_metadata.c:2306 +#: src/cryptsetup.c:2676 #, c-format msgid "Device %s is still in use." msgstr "" -#: lib/setup.c:4516 +#: lib/setup.c:4521 #, c-format msgid "Invalid device %s." msgstr "" -#: lib/setup.c:4632 +#: lib/setup.c:4637 msgid "Volume key buffer too small." msgstr "" -#: lib/setup.c:4640 +#: lib/setup.c:4645 msgid "Cannot retrieve volume key for plain device." msgstr "" -#: lib/setup.c:4659 +#: lib/setup.c:4664 #, c-format msgid "This operation is not supported for %s crypt device." msgstr "" -#: lib/setup.c:4865 +#: lib/setup.c:4870 msgid "Dump operation is not supported for this device type." msgstr "" -#: lib/setup.c:5190 +#: lib/setup.c:5195 #, c-format msgid "Data offset is not multiple of %u bytes." msgstr "" -#: lib/setup.c:5475 +#: lib/setup.c:5480 #, c-format msgid "Cannot convert device %s which is still in use." msgstr "" -#: lib/setup.c:5772 +#: lib/setup.c:5777 #, c-format msgid "Failed to assign keyslot %u as the new volume key." msgstr "" @@ -516,25 +517,25 @@ msgid "Failed to initialise default LUKS2 keyslot parameters." msgstr "" -#: lib/setup.c:5851 +#: lib/setup.c:5856 #, c-format msgid "Failed to assign keyslot %d to digest." msgstr "" -#: lib/setup.c:4438 lib/setup.c:5915 +#: lib/setup.c:4443 lib/setup.c:5920 msgid "Failed to load key in kernel keyring." msgstr "" -#: lib/setup.c:5982 +#: lib/setup.c:5987 msgid "Kernel keyring is not supported by the kernel." msgstr "" -#: lib/setup.c:5992 lib/luks2/luks2_reencrypt.c:2952 +#: lib/setup.c:5997 lib/luks2/luks2_reencrypt.c:2952 #, c-format msgid "Failed to read passphrase from keyring (error %d)." msgstr "" -#: lib/setup.c:6016 +#: lib/setup.c:6021 msgid "Failed to acquire global memory-hard access serialization lock." msgstr "" @@ -594,42 +595,42 @@ msgid "Device %s is not compatible." msgstr "" -#: lib/utils_device.c:642 +#: lib/utils_device.c:648 #, c-format msgid "Device %s is too small. Need at least % bytes." msgstr "" -#: lib/utils_device.c:723 +#: lib/utils_device.c:729 #, c-format msgid "Cannot use device %s which is in use (already mapped or mounted)." msgstr "" -#: lib/utils_device.c:727 +#: lib/utils_device.c:733 #, c-format msgid "Cannot use device %s, permission denied." msgstr "" -#: lib/utils_device.c:730 +#: lib/utils_device.c:736 #, c-format msgid "Cannot get info about device %s." msgstr "" -#: lib/utils_device.c:753 +#: lib/utils_device.c:759 msgid "Cannot use a loopback device, running as non-root user." msgstr "" -#: lib/utils_device.c:763 +#: lib/utils_device.c:769 msgid "" "Attaching loopback device failed (loop device with autoclear flag is " "required)." msgstr "" -#: lib/utils_device.c:809 +#: lib/utils_device.c:815 #, c-format msgid "Requested offset is beyond real size of device %s." msgstr "" -#: lib/utils_device.c:817 +#: lib/utils_device.c:823 #, c-format msgid "Device %s has zero size." msgstr "" @@ -742,7 +743,7 @@ #: lib/luks1/keyencryption.c:97 lib/luks1/keymanage.c:344 #: lib/luks1/keymanage.c:635 lib/luks1/keymanage.c:1080 -#: lib/luks2/luks2_json_metadata.c:1252 lib/luks2/luks2_keyslot.c:734 +#: lib/luks2/luks2_json_metadata.c:1260 lib/luks2/luks2_keyslot.c:734 #, c-format msgid "Cannot write to device %s, permission denied." msgstr "" @@ -765,7 +766,7 @@ #: lib/verity/verity.c:80 lib/verity/verity.c:178 lib/verity/verity_hash.c:311 #: lib/verity/verity_hash.c:322 lib/verity/verity_hash.c:342 #: lib/verity/verity_fec.c:241 lib/verity/verity_fec.c:253 -#: lib/verity/verity_fec.c:258 lib/luks2/luks2_json_metadata.c:1255 +#: lib/verity/verity_fec.c:258 lib/luks2/luks2_json_metadata.c:1263 #: src/cryptsetup_reencrypt.c:200 src/cryptsetup_reencrypt.c:212 #, c-format msgid "Cannot open device %s." @@ -788,27 +789,27 @@ msgstr "" #: lib/luks1/keymanage.c:228 lib/luks1/keymanage.c:472 -#: lib/luks2/luks2_json_metadata.c:1083 src/cryptsetup.c:1433 -#: src/cryptsetup.c:1559 src/cryptsetup.c:1616 src/cryptsetup.c:1672 -#: src/cryptsetup.c:1739 src/cryptsetup.c:1842 src/cryptsetup.c:1906 -#: src/cryptsetup.c:2136 src/cryptsetup.c:2331 src/cryptsetup.c:2391 -#: src/cryptsetup.c:2457 src/cryptsetup.c:2621 src/cryptsetup.c:3271 -#: src/cryptsetup.c:3280 src/cryptsetup_reencrypt.c:1388 +#: lib/luks2/luks2_json_metadata.c:1091 src/cryptsetup.c:1445 +#: src/cryptsetup.c:1571 src/cryptsetup.c:1628 src/cryptsetup.c:1684 +#: src/cryptsetup.c:1751 src/cryptsetup.c:1854 src/cryptsetup.c:1918 +#: src/cryptsetup.c:2148 src/cryptsetup.c:2343 src/cryptsetup.c:2403 +#: src/cryptsetup.c:2469 src/cryptsetup.c:2633 src/cryptsetup.c:3291 +#: src/cryptsetup.c:3300 src/cryptsetup_reencrypt.c:1388 #, c-format msgid "Device %s is not a valid LUKS device." msgstr "" -#: lib/luks1/keymanage.c:246 lib/luks2/luks2_json_metadata.c:1100 +#: lib/luks1/keymanage.c:246 lib/luks2/luks2_json_metadata.c:1108 #, c-format msgid "Requested header backup file %s already exists." msgstr "" -#: lib/luks1/keymanage.c:248 lib/luks2/luks2_json_metadata.c:1102 +#: lib/luks1/keymanage.c:248 lib/luks2/luks2_json_metadata.c:1110 #, c-format msgid "Cannot create header backup file %s." msgstr "" -#: lib/luks1/keymanage.c:255 lib/luks2/luks2_json_metadata.c:1109 +#: lib/luks1/keymanage.c:255 lib/luks2/luks2_json_metadata.c:1117 #, c-format msgid "Cannot write header backup file %s." msgstr "" @@ -818,12 +819,12 @@ msgstr "" #: lib/luks1/keymanage.c:299 lib/luks1/keymanage.c:549 -#: lib/luks2/luks2_json_metadata.c:1182 +#: lib/luks2/luks2_json_metadata.c:1190 #, c-format msgid "Cannot open header backup file %s." msgstr "" -#: lib/luks1/keymanage.c:307 lib/luks2/luks2_json_metadata.c:1190 +#: lib/luks1/keymanage.c:307 lib/luks2/luks2_json_metadata.c:1198 #, c-format msgid "Cannot read header backup file %s." msgstr "" @@ -849,7 +850,7 @@ "keyslots." msgstr "" -#: lib/luks1/keymanage.c:328 lib/luks2/luks2_json_metadata.c:1224 +#: lib/luks1/keymanage.c:328 lib/luks2/luks2_json_metadata.c:1232 msgid "" "\n" "WARNING: real device header has different UUID than backup!" @@ -900,7 +901,7 @@ msgid "Requested LUKS hash %s is not supported." msgstr "" -#: lib/luks1/keymanage.c:509 src/cryptsetup.c:1133 +#: lib/luks1/keymanage.c:509 src/cryptsetup.c:1145 msgid "No known problems detected for LUKS header." msgstr "" @@ -920,8 +921,8 @@ msgstr "" #: lib/luks1/keymanage.c:755 lib/luks1/keymanage.c:825 -#: lib/luks2/luks2_json_format.c:283 lib/luks2/luks2_json_metadata.c:1001 -#: src/cryptsetup.c:2784 +#: lib/luks2/luks2_json_format.c:283 lib/luks2/luks2_json_metadata.c:1009 +#: src/cryptsetup.c:2796 msgid "Wrong LUKS UUID format provided." msgstr "" @@ -985,11 +986,11 @@ msgid "PBKDF2 hash algorithm %s not available, skipping." msgstr "" -#: lib/tcrypt/tcrypt.c:611 src/cryptsetup.c:1010 +#: lib/tcrypt/tcrypt.c:611 src/cryptsetup.c:1022 msgid "Required kernel crypto interface not available." msgstr "" -#: lib/tcrypt/tcrypt.c:613 src/cryptsetup.c:1012 +#: lib/tcrypt/tcrypt.c:613 src/cryptsetup.c:1024 msgid "Ensure you have algif_skcipher kernel module loaded." msgstr "" @@ -1002,7 +1003,7 @@ msgid "Kernel doesn't support activation for this TCRYPT legacy mode." msgstr "" -#: lib/tcrypt/tcrypt.c:793 +#: lib/tcrypt/tcrypt.c:790 #, c-format msgid "Activating TCRYPT system encryption for partition %s." msgstr "" @@ -1011,7 +1012,7 @@ msgid "Kernel doesn't support TCRYPT compatible mapping." msgstr "" -#: lib/tcrypt/tcrypt.c:1093 +#: lib/tcrypt/tcrypt.c:1090 msgid "This function is not supported without TCRYPT header load." msgstr "" @@ -1152,8 +1153,8 @@ msgid "Kernel doesn't support dm-integrity mapping." msgstr "" -#: lib/luks2/luks2_disk_metadata.c:383 lib/luks2/luks2_json_metadata.c:959 -#: lib/luks2/luks2_json_metadata.c:1244 +#: lib/luks2/luks2_disk_metadata.c:383 lib/luks2/luks2_json_metadata.c:967 +#: lib/luks2/luks2_json_metadata.c:1252 #, c-format msgid "Failed to acquire write lock on device %s." msgstr "" @@ -1180,95 +1181,95 @@ "keyslot count is very limited.\n" msgstr "" -#: lib/luks2/luks2_json_metadata.c:946 lib/luks2/luks2_json_metadata.c:1074 -#: lib/luks2/luks2_json_metadata.c:1150 lib/luks2/luks2_keyslot_luks2.c:92 +#: lib/luks2/luks2_json_metadata.c:954 lib/luks2/luks2_json_metadata.c:1082 +#: lib/luks2/luks2_json_metadata.c:1158 lib/luks2/luks2_keyslot_luks2.c:92 #: lib/luks2/luks2_keyslot_luks2.c:114 #, c-format msgid "Failed to acquire read lock on device %s." msgstr "" -#: lib/luks2/luks2_json_metadata.c:1167 +#: lib/luks2/luks2_json_metadata.c:1175 #, c-format msgid "Forbidden LUKS2 requirements detected in backup %s." msgstr "" -#: lib/luks2/luks2_json_metadata.c:1208 +#: lib/luks2/luks2_json_metadata.c:1216 msgid "Data offset differ on device and backup, restore failed." msgstr "" -#: lib/luks2/luks2_json_metadata.c:1214 +#: lib/luks2/luks2_json_metadata.c:1222 msgid "" "Binary header with keyslot areas size differ on device and backup, restore " "failed." msgstr "" -#: lib/luks2/luks2_json_metadata.c:1221 +#: lib/luks2/luks2_json_metadata.c:1229 #, c-format msgid "Device %s %s%s%s%s" msgstr "" -#: lib/luks2/luks2_json_metadata.c:1222 +#: lib/luks2/luks2_json_metadata.c:1230 msgid "" "does not contain LUKS2 header. Replacing header can destroy data on that " "device." msgstr "" -#: lib/luks2/luks2_json_metadata.c:1223 +#: lib/luks2/luks2_json_metadata.c:1231 msgid "" "already contains LUKS2 header. Replacing header will destroy existing " "keyslots." msgstr "" -#: lib/luks2/luks2_json_metadata.c:1225 +#: lib/luks2/luks2_json_metadata.c:1233 msgid "" "\n" "WARNING: unknown LUKS2 requirements detected in real device header!\n" "Replacing header with backup may corrupt the data on that device!" msgstr "" -#: lib/luks2/luks2_json_metadata.c:1227 +#: lib/luks2/luks2_json_metadata.c:1235 msgid "" "\n" "WARNING: Unfinished offline reencryption detected on the device!\n" "Replacing header with backup may corrupt data." msgstr "" -#: lib/luks2/luks2_json_metadata.c:1323 +#: lib/luks2/luks2_json_metadata.c:1333 #, c-format msgid "Ignored unknown flag %s." msgstr "" -#: lib/luks2/luks2_json_metadata.c:2010 lib/luks2/luks2_reencrypt.c:1746 +#: lib/luks2/luks2_json_metadata.c:2020 lib/luks2/luks2_reencrypt.c:1746 #, c-format msgid "Missing key for dm-crypt segment %u" msgstr "" -#: lib/luks2/luks2_json_metadata.c:2022 lib/luks2/luks2_reencrypt.c:1764 +#: lib/luks2/luks2_json_metadata.c:2032 lib/luks2/luks2_reencrypt.c:1764 msgid "Failed to set dm-crypt segment." msgstr "" -#: lib/luks2/luks2_json_metadata.c:2028 lib/luks2/luks2_reencrypt.c:1770 +#: lib/luks2/luks2_json_metadata.c:2038 lib/luks2/luks2_reencrypt.c:1770 msgid "Failed to set dm-linear segment." msgstr "" -#: lib/luks2/luks2_json_metadata.c:2155 +#: lib/luks2/luks2_json_metadata.c:2165 msgid "Unsupported device integrity configuration." msgstr "" -#: lib/luks2/luks2_json_metadata.c:2241 +#: lib/luks2/luks2_json_metadata.c:2251 msgid "Reencryption in-progress. Cannot deactivate device." msgstr "" -#: lib/luks2/luks2_json_metadata.c:2252 lib/luks2/luks2_reencrypt.c:3190 +#: lib/luks2/luks2_json_metadata.c:2262 lib/luks2/luks2_reencrypt.c:3190 #, c-format msgid "Failed to replace suspended device %s with dm-error target." msgstr "" -#: lib/luks2/luks2_json_metadata.c:2332 +#: lib/luks2/luks2_json_metadata.c:2342 msgid "Failed to read LUKS2 requirements." msgstr "" -#: lib/luks2/luks2_json_metadata.c:2339 +#: lib/luks2/luks2_json_metadata.c:2349 msgid "Unmet LUKS2 requirements detected." msgstr "" @@ -1310,7 +1311,7 @@ msgid "Unable to move keyslot area. Not enough space." msgstr "" -#: lib/luks2/luks2_luks1_convert.c:605 lib/luks2/luks2_luks1_convert.c:887 +#: lib/luks2/luks2_luks1_convert.c:605 lib/luks2/luks2_luks1_convert.c:889 msgid "Unable to move keyslot area." msgstr "" @@ -1577,385 +1578,385 @@ msgid "Failed to create builtin token %s." msgstr "" -#: src/cryptsetup.c:164 +#: src/cryptsetup.c:166 msgid "Can't do passphrase verification on non-tty inputs." msgstr "" -#: src/cryptsetup.c:221 +#: src/cryptsetup.c:229 msgid "Keyslot encryption parameters can be set only for LUKS2 device." msgstr "" -#: src/cryptsetup.c:251 src/cryptsetup.c:959 src/cryptsetup.c:1269 -#: src/cryptsetup.c:3145 src/cryptsetup_reencrypt.c:723 +#: src/cryptsetup.c:259 src/cryptsetup.c:971 src/cryptsetup.c:1281 +#: src/cryptsetup.c:3157 src/cryptsetup_reencrypt.c:723 #: src/cryptsetup_reencrypt.c:793 msgid "No known cipher specification pattern detected." msgstr "" -#: src/cryptsetup.c:259 +#: src/cryptsetup.c:267 msgid "" "WARNING: The --hash parameter is being ignored in plain mode with keyfile " "specified.\n" msgstr "" -#: src/cryptsetup.c:267 +#: src/cryptsetup.c:275 msgid "" "WARNING: The --keyfile-size option is being ignored, the read size is the " "same as the encryption key size.\n" msgstr "" -#: src/cryptsetup.c:307 +#: src/cryptsetup.c:315 #, c-format msgid "" "Detected device signature(s) on %s. Proceeding further may damage existing " "data." msgstr "" -#: src/cryptsetup.c:313 src/cryptsetup.c:1090 src/cryptsetup.c:1142 -#: src/cryptsetup.c:1246 src/cryptsetup.c:1319 src/cryptsetup.c:1974 -#: src/cryptsetup.c:2682 src/cryptsetup.c:2805 src/integritysetup.c:233 +#: src/cryptsetup.c:321 src/cryptsetup.c:1102 src/cryptsetup.c:1154 +#: src/cryptsetup.c:1258 src/cryptsetup.c:1331 src/cryptsetup.c:1986 +#: src/cryptsetup.c:2694 src/cryptsetup.c:2817 src/integritysetup.c:233 msgid "Operation aborted.\n" msgstr "" -#: src/cryptsetup.c:381 +#: src/cryptsetup.c:389 msgid "Option --key-file is required." msgstr "" -#: src/cryptsetup.c:434 +#: src/cryptsetup.c:442 msgid "Enter VeraCrypt PIM: " msgstr "" -#: src/cryptsetup.c:443 +#: src/cryptsetup.c:451 msgid "Invalid PIM value: parse error." msgstr "" -#: src/cryptsetup.c:446 +#: src/cryptsetup.c:454 msgid "Invalid PIM value: 0." msgstr "" -#: src/cryptsetup.c:449 +#: src/cryptsetup.c:457 msgid "Invalid PIM value: outside of range." msgstr "" -#: src/cryptsetup.c:472 +#: src/cryptsetup.c:480 msgid "No device header detected with this passphrase." msgstr "" -#: src/cryptsetup.c:576 +#: src/cryptsetup.c:584 msgid "" "Header dump with volume key is sensitive information\n" "which allows access to encrypted partition without passphrase.\n" "This dump should be always stored encrypted on safe place." msgstr "" -#: src/cryptsetup.c:673 +#: src/cryptsetup.c:681 #, c-format msgid "Device %s is still active and scheduled for deferred removal.\n" msgstr "" -#: src/cryptsetup.c:701 +#: src/cryptsetup.c:709 msgid "" "Resize of active device requires volume key in keyring but --disable-keyring " "option is set." msgstr "" -#: src/cryptsetup.c:838 +#: src/cryptsetup.c:850 msgid "Benchmark interrupted." msgstr "" -#: src/cryptsetup.c:859 +#: src/cryptsetup.c:871 #, c-format msgid "PBKDF2-%-9s N/A\n" msgstr "" -#: src/cryptsetup.c:861 +#: src/cryptsetup.c:873 #, c-format msgid "PBKDF2-%-9s %7u iterations per second for %zu-bit key\n" msgstr "" -#: src/cryptsetup.c:875 +#: src/cryptsetup.c:887 #, c-format msgid "%-10s N/A\n" msgstr "" -#: src/cryptsetup.c:877 +#: src/cryptsetup.c:889 #, c-format msgid "" "%-10s %4u iterations, %5u memory, %1u parallel threads (CPUs) for %zu-bit " "key (requested %u ms time)\n" msgstr "" -#: src/cryptsetup.c:901 +#: src/cryptsetup.c:913 msgid "Result of benchmark is not reliable." msgstr "" -#: src/cryptsetup.c:951 +#: src/cryptsetup.c:963 msgid "# Tests are approximate using memory only (no storage IO).\n" msgstr "" #. TRANSLATORS: The string is header of a table and must be exactly (right side) aligned. -#: src/cryptsetup.c:971 +#: src/cryptsetup.c:983 #, c-format msgid "#%*s Algorithm | Key | Encryption | Decryption\n" msgstr "" -#: src/cryptsetup.c:985 +#: src/cryptsetup.c:923 #, c-format msgid "Cipher %s is not available." msgstr "" #. TRANSLATORS: The string is header of a table and must be exactly (right side) aligned. -#: src/cryptsetup.c:994 +#: src/cryptsetup.c:1006 msgid "# Algorithm | Key | Encryption | Decryption\n" msgstr "" -#: src/cryptsetup.c:1003 +#: src/cryptsetup.c:1015 msgid "N/A" msgstr "" -#: src/cryptsetup.c:1083 +#: src/cryptsetup.c:1095 msgid "" "Seems device does not require reencryption recovery.\n" "Do you want to proceed anyway?" msgstr "" -#: src/cryptsetup.c:1089 +#: src/cryptsetup.c:1101 msgid "Really proceed with LUKS2 reencryption recovery?" msgstr "" -#: src/cryptsetup.c:1098 +#: src/cryptsetup.c:1110 msgid "Enter passphrase for reencryption recovery: " msgstr "" -#: src/cryptsetup.c:1141 +#: src/cryptsetup.c:1153 msgid "Really try to repair LUKS device header?" msgstr "" -#: src/cryptsetup.c:1160 src/integritysetup.c:146 +#: src/cryptsetup.c:1172 src/integritysetup.c:146 msgid "" "Wiping device to initialize integrity checksum.\n" "You can interrupt this by pressing CTRL+c (rest of not wiped device will " "contain invalid checksum).\n" msgstr "" -#: src/cryptsetup.c:1182 src/integritysetup.c:168 +#: src/cryptsetup.c:1194 src/integritysetup.c:168 #, c-format msgid "Cannot deactivate temporary device %s." msgstr "" -#: src/cryptsetup.c:1231 +#: src/cryptsetup.c:1243 msgid "Integrity option can be used only for LUKS2 format." msgstr "" -#: src/cryptsetup.c:1236 src/cryptsetup.c:1296 +#: src/cryptsetup.c:1248 src/cryptsetup.c:1308 msgid "Unsupported LUKS2 metadata size options." msgstr "" -#: src/cryptsetup.c:1253 +#: src/cryptsetup.c:1265 #, c-format msgid "Cannot create header file %s." msgstr "" -#: src/cryptsetup.c:1276 src/integritysetup.c:195 src/integritysetup.c:204 +#: src/cryptsetup.c:1288 src/integritysetup.c:195 src/integritysetup.c:204 #: src/integritysetup.c:213 src/integritysetup.c:284 src/integritysetup.c:293 #: src/integritysetup.c:303 msgid "No known integrity specification pattern detected." msgstr "" -#: src/cryptsetup.c:1289 +#: src/cryptsetup.c:1301 #, c-format msgid "Cannot use %s as on-disk header." msgstr "" -#: src/cryptsetup.c:1313 src/integritysetup.c:227 +#: src/cryptsetup.c:1325 src/integritysetup.c:227 #, c-format msgid "This will overwrite data on %s irrevocably." msgstr "这将不能取消地在 %s 上覆盖数据" -#: src/cryptsetup.c:1354 src/cryptsetup.c:1688 src/cryptsetup.c:1755 -#: src/cryptsetup.c:1857 src/cryptsetup.c:1923 src/cryptsetup_reencrypt.c:553 +#: src/cryptsetup.c:1366 src/cryptsetup.c:1700 src/cryptsetup.c:1767 +#: src/cryptsetup.c:1869 src/cryptsetup.c:1935 src/cryptsetup_reencrypt.c:553 msgid "Failed to set pbkdf parameters." msgstr "" -#: src/cryptsetup.c:1439 +#: src/cryptsetup.c:1451 msgid "Reduced data offset is allowed only for detached LUKS header." msgstr "" -#: src/cryptsetup.c:1450 src/cryptsetup.c:1761 +#: src/cryptsetup.c:1462 src/cryptsetup.c:1773 msgid "" "Cannot determine volume key size for LUKS without keyslots, please use --key-" "size option." msgstr "" -#: src/cryptsetup.c:1488 +#: src/cryptsetup.c:1500 msgid "Device activated but cannot make flags persistent." msgstr "" -#: src/cryptsetup.c:1569 src/cryptsetup.c:1639 +#: src/cryptsetup.c:1581 src/cryptsetup.c:1651 #, c-format msgid "Keyslot %d is selected for deletion." msgstr "" -#: src/cryptsetup.c:1581 src/cryptsetup.c:1642 +#: src/cryptsetup.c:1593 src/cryptsetup.c:1654 msgid "" "This is the last keyslot. Device will become unusable after purging this key." msgstr "这是最后的 keyslot. 设备将不可用在清除这个密钥后." -#: src/cryptsetup.c:1582 +#: src/cryptsetup.c:1594 msgid "Enter any remaining passphrase: " msgstr "" -#: src/cryptsetup.c:1583 src/cryptsetup.c:1644 +#: src/cryptsetup.c:1595 src/cryptsetup.c:1656 msgid "Operation aborted, the keyslot was NOT wiped.\n" msgstr "" -#: src/cryptsetup.c:1621 +#: src/cryptsetup.c:1633 msgid "Enter passphrase to be deleted: " msgstr "" -#: src/cryptsetup.c:1702 src/cryptsetup.c:1776 src/cryptsetup.c:1810 +#: src/cryptsetup.c:1714 src/cryptsetup.c:1788 src/cryptsetup.c:1822 msgid "Enter new passphrase for key slot: " msgstr "" -#: src/cryptsetup.c:1793 src/cryptsetup_reencrypt.c:1343 +#: src/cryptsetup.c:1805 src/cryptsetup_reencrypt.c:1343 #, c-format msgid "Enter any existing passphrase: " msgstr "" -#: src/cryptsetup.c:1861 +#: src/cryptsetup.c:1873 msgid "Enter passphrase to be changed: " msgstr "" -#: src/cryptsetup.c:1877 src/cryptsetup_reencrypt.c:1329 +#: src/cryptsetup.c:1889 src/cryptsetup_reencrypt.c:1329 msgid "Enter new passphrase: " msgstr "" -#: src/cryptsetup.c:1927 +#: src/cryptsetup.c:1939 msgid "Enter passphrase for keyslot to be converted: " msgstr "" -#: src/cryptsetup.c:1951 +#: src/cryptsetup.c:1963 msgid "Only one device argument for isLuks operation is supported." msgstr "" -#: src/cryptsetup.c:2207 src/cryptsetup.c:2228 +#: src/cryptsetup.c:2219 src/cryptsetup.c:2240 msgid "Option --header-backup-file is required." msgstr "" -#: src/cryptsetup.c:2258 +#: src/cryptsetup.c:2270 #, c-format msgid "%s is not cryptsetup managed device." msgstr "" -#: src/cryptsetup.c:2269 +#: src/cryptsetup.c:2281 #, c-format msgid "Refresh is not supported for device type %s" msgstr "" -#: src/cryptsetup.c:2311 +#: src/cryptsetup.c:2323 #, c-format msgid "Unrecognized metadata device type %s." msgstr "" -#: src/cryptsetup.c:2314 +#: src/cryptsetup.c:2326 msgid "Command requires device and mapped name as arguments." msgstr "" -#: src/cryptsetup.c:2336 +#: src/cryptsetup.c:2348 #, c-format msgid "" "This operation will erase all keyslots on device %s.\n" "Device will become unusable after this operation." msgstr "" -#: src/cryptsetup.c:2343 +#: src/cryptsetup.c:2355 msgid "Operation aborted, keyslots were NOT wiped.\n" msgstr "" -#: src/cryptsetup.c:2380 +#: src/cryptsetup.c:2392 msgid "Invalid LUKS type, only luks1 and luks2 are supported." msgstr "" -#: src/cryptsetup.c:2398 +#: src/cryptsetup.c:2410 #, c-format msgid "Device is already %s type." msgstr "" -#: src/cryptsetup.c:2403 +#: src/cryptsetup.c:2415 #, c-format msgid "This operation will convert %s to %s format.\n" msgstr "" -#: src/cryptsetup.c:2409 +#: src/cryptsetup.c:2421 msgid "Operation aborted, device was NOT converted.\n" msgstr "" -#: src/cryptsetup.c:2449 +#: src/cryptsetup.c:2461 msgid "Option --priority, --label or --subsystem is missing." msgstr "" -#: src/cryptsetup.c:2483 src/cryptsetup.c:2516 src/cryptsetup.c:2539 +#: src/cryptsetup.c:2495 src/cryptsetup.c:2528 src/cryptsetup.c:2551 #, c-format msgid "Token %d is invalid." msgstr "" -#: src/cryptsetup.c:2486 src/cryptsetup.c:2542 +#: src/cryptsetup.c:2498 src/cryptsetup.c:2554 #, c-format msgid "Token %d in use." msgstr "" -#: src/cryptsetup.c:2493 +#: src/cryptsetup.c:2505 #, c-format msgid "Failed to add luks2-keyring token %d." msgstr "" -#: src/cryptsetup.c:2502 src/cryptsetup.c:2564 +#: src/cryptsetup.c:2514 src/cryptsetup.c:2576 #, c-format msgid "Failed to assign token %d to keyslot %d." msgstr "" -#: src/cryptsetup.c:2519 +#: src/cryptsetup.c:2531 #, c-format msgid "Token %d is not in use." msgstr "" -#: src/cryptsetup.c:2554 +#: src/cryptsetup.c:2566 msgid "Failed to import token from file." msgstr "" -#: src/cryptsetup.c:2579 +#: src/cryptsetup.c:2591 #, c-format msgid "Failed to get token %d for export." msgstr "" -#: src/cryptsetup.c:2594 +#: src/cryptsetup.c:2606 msgid "--key-description parameter is mandatory for token add action." msgstr "" -#: src/cryptsetup.c:2600 src/cryptsetup.c:2608 +#: src/cryptsetup.c:2612 src/cryptsetup.c:2620 msgid "Action requires specific token. Use --token-id parameter." msgstr "" -#: src/cryptsetup.c:2613 +#: src/cryptsetup.c:2625 #, c-format msgid "Invalid token operation %s." msgstr "" -#: src/cryptsetup.c:2668 +#: src/cryptsetup.c:2680 #, c-format msgid "Auto-detected active dm device '%s' for data device %s.\n" msgstr "" -#: src/cryptsetup.c:2672 +#: src/cryptsetup.c:2684 #, c-format msgid "Device %s is not a block device.\n" msgstr "" -#: src/cryptsetup.c:2674 +#: src/cryptsetup.c:2686 #, c-format msgid "Failed to auto-detect device %s holders." msgstr "" -#: src/cryptsetup.c:2676 +#: src/cryptsetup.c:2688 #, c-format msgid "" "Unable to decide if device %s is activated or not.\n" @@ -1964,45 +1965,45 @@ "To run reencryption in online mode, use --active-name parameter instead.\n" msgstr "" -#: src/cryptsetup.c:2756 +#: src/cryptsetup.c:2768 msgid "Invalid LUKS device type." msgstr "" -#: src/cryptsetup.c:2761 +#: src/cryptsetup.c:2773 msgid "" "Encryption without detached header (--header) is not possible without data " "device size reduction (--reduce-device-size)." msgstr "" -#: src/cryptsetup.c:2766 +#: src/cryptsetup.c:2778 msgid "" "Requested data offset must be less than or equal to half of --reduce-device-" "size parameter." msgstr "" -#: src/cryptsetup.c:2775 +#: src/cryptsetup.c:2787 #, c-format msgid "" "Adjusting --reduce-device-size value to twice the --offset % " "(sectors).\n" msgstr "" -#: src/cryptsetup.c:2779 +#: src/cryptsetup.c:2791 msgid "Encryption is supported only for LUKS2 format." msgstr "" -#: src/cryptsetup.c:2801 +#: src/cryptsetup.c:2813 #, c-format msgid "" "Detected LUKS device on %s. Do you want to encrypt that LUKS device again?" msgstr "" -#: src/cryptsetup.c:2816 +#: src/cryptsetup.c:2828 #, c-format msgid "Temporary header file %s already exists. Aborting." msgstr "" -#: src/cryptsetup.c:2818 src/cryptsetup.c:2825 +#: src/cryptsetup.c:2830 src/cryptsetup.c:2837 #, c-format msgid "Cannot create temporary header file %s." msgstr "" @@ -2012,194 +2013,194 @@ msgid "%s/%s is now active and ready for online encryption." msgstr "" -#: src/cryptsetup.c:3053 src/cryptsetup.c:3059 +#: src/cryptsetup.c:3065 src/cryptsetup.c:3071 msgid "Not enough free keyslots for reencryption." msgstr "" -#: src/cryptsetup.c:3079 src/cryptsetup_reencrypt.c:1294 +#: src/cryptsetup.c:3091 src/cryptsetup_reencrypt.c:1294 msgid "" "Key file can be used only with --key-slot or with exactly one key slot " "active." msgstr "" -#: src/cryptsetup.c:3088 src/cryptsetup_reencrypt.c:1341 +#: src/cryptsetup.c:3100 src/cryptsetup_reencrypt.c:1341 #: src/cryptsetup_reencrypt.c:1352 #, c-format msgid "Enter passphrase for key slot %d: " msgstr "" -#: src/cryptsetup.c:3096 +#: src/cryptsetup.c:3108 #, c-format msgid "Enter passphrase for key slot %u: " msgstr "" -#: src/cryptsetup.c:3263 +#: src/cryptsetup.c:3283 msgid "Command requires device as argument." msgstr "" -#: src/cryptsetup.c:3285 +#: src/cryptsetup.c:3305 msgid "" "Only LUKS2 format is currently supported. Please use cryptsetup-reencrypt " "tool for LUKS1." msgstr "" -#: src/cryptsetup.c:3297 +#: src/cryptsetup.c:3317 msgid "" "Legacy offline reencryption already in-progress. Use cryptsetup-reencrypt " "utility." msgstr "" -#: src/cryptsetup.c:3307 src/cryptsetup_reencrypt.c:178 +#: src/cryptsetup.c:3327 src/cryptsetup_reencrypt.c:178 msgid "Reencryption of device with integrity profile is not supported." msgstr "" -#: src/cryptsetup.c:3315 +#: src/cryptsetup.c:3335 msgid "LUKS2 reencryption already initialized. Aborting operation." msgstr "" -#: src/cryptsetup.c:3319 +#: src/cryptsetup.c:3339 msgid "LUKS2 device is not in reencryption." msgstr "" -#: src/cryptsetup.c:3346 +#: src/cryptsetup.c:3366 msgid " [--type ] []" msgstr "" -#: src/cryptsetup.c:3346 src/veritysetup.c:394 src/integritysetup.c:480 +#: src/cryptsetup.c:3366 src/veritysetup.c:399 src/integritysetup.c:480 msgid "open device as " msgstr "" -#: src/cryptsetup.c:3347 src/cryptsetup.c:3348 src/cryptsetup.c:3349 -#: src/veritysetup.c:395 src/veritysetup.c:396 src/integritysetup.c:481 +#: src/cryptsetup.c:3367 src/cryptsetup.c:3368 src/cryptsetup.c:3369 +#: src/veritysetup.c:400 src/veritysetup.c:401 src/integritysetup.c:481 #: src/integritysetup.c:482 msgid "" msgstr "<名称>" -#: src/cryptsetup.c:3347 src/veritysetup.c:395 src/integritysetup.c:481 +#: src/cryptsetup.c:3367 src/veritysetup.c:400 src/integritysetup.c:481 msgid "close device (remove mapping)" msgstr "" -#: src/cryptsetup.c:3348 +#: src/cryptsetup.c:3368 msgid "resize active device" msgstr "改变激活分区大小" -#: src/cryptsetup.c:3349 +#: src/cryptsetup.c:3369 msgid "show device status" msgstr "显示设备状态" -#: src/cryptsetup.c:3350 +#: src/cryptsetup.c:3370 msgid "[--cipher ]" msgstr "" -#: src/cryptsetup.c:3350 +#: src/cryptsetup.c:3370 msgid "benchmark cipher" msgstr "" -#: src/cryptsetup.c:3351 src/cryptsetup.c:3352 src/cryptsetup.c:3353 -#: src/cryptsetup.c:3354 src/cryptsetup.c:3355 src/cryptsetup.c:3362 -#: src/cryptsetup.c:3363 src/cryptsetup.c:3364 src/cryptsetup.c:3365 -#: src/cryptsetup.c:3366 src/cryptsetup.c:3367 src/cryptsetup.c:3368 -#: src/cryptsetup.c:3369 src/cryptsetup.c:3370 +#: src/cryptsetup.c:3371 src/cryptsetup.c:3372 src/cryptsetup.c:3373 +#: src/cryptsetup.c:3374 src/cryptsetup.c:3375 src/cryptsetup.c:3382 +#: src/cryptsetup.c:3383 src/cryptsetup.c:3384 src/cryptsetup.c:3385 +#: src/cryptsetup.c:3386 src/cryptsetup.c:3387 src/cryptsetup.c:3388 +#: src/cryptsetup.c:3389 src/cryptsetup.c:3390 msgid "" msgstr "<设备>" -#: src/cryptsetup.c:3351 +#: src/cryptsetup.c:3371 msgid "try to repair on-disk metadata" msgstr "" -#: src/cryptsetup.c:3352 +#: src/cryptsetup.c:3372 msgid "reencrypt LUKS2 device" msgstr "" -#: src/cryptsetup.c:3353 +#: src/cryptsetup.c:3373 msgid "erase all keyslots (remove encryption key)" msgstr "" -#: src/cryptsetup.c:3354 +#: src/cryptsetup.c:3374 msgid "convert LUKS from/to LUKS2 format" msgstr "" -#: src/cryptsetup.c:3355 +#: src/cryptsetup.c:3375 msgid "set permanent configuration options for LUKS2" msgstr "" -#: src/cryptsetup.c:3356 src/cryptsetup.c:3357 +#: src/cryptsetup.c:3376 src/cryptsetup.c:3377 msgid " []" msgstr "<设备> [<新密钥文件>]" -#: src/cryptsetup.c:3356 +#: src/cryptsetup.c:3376 msgid "formats a LUKS device" msgstr "格式化成一个LUKS设备" -#: src/cryptsetup.c:3357 +#: src/cryptsetup.c:3377 msgid "add key to LUKS device" msgstr "添加密钥到LUKS设备" -#: src/cryptsetup.c:3358 src/cryptsetup.c:3359 src/cryptsetup.c:3360 +#: src/cryptsetup.c:3378 src/cryptsetup.c:3379 src/cryptsetup.c:3380 msgid " []" msgstr "" -#: src/cryptsetup.c:3358 +#: src/cryptsetup.c:3378 msgid "removes supplied key or key file from LUKS device" msgstr "" -#: src/cryptsetup.c:3359 +#: src/cryptsetup.c:3379 msgid "changes supplied key or key file of LUKS device" msgstr "" -#: src/cryptsetup.c:3360 +#: src/cryptsetup.c:3380 msgid "converts a key to new pbkdf parameters" msgstr "" -#: src/cryptsetup.c:3361 +#: src/cryptsetup.c:3381 msgid " " msgstr "<设备> " -#: src/cryptsetup.c:3361 +#: src/cryptsetup.c:3381 msgid "wipes key with number from LUKS device" msgstr "从LUKS 设备用数字清除密钥" -#: src/cryptsetup.c:3362 +#: src/cryptsetup.c:3382 msgid "print UUID of LUKS device" msgstr "显示LUKS设备的UUID" -#: src/cryptsetup.c:3363 +#: src/cryptsetup.c:3383 msgid "tests for LUKS partition header" msgstr "为LUKS分区头检测<设备>" -#: src/cryptsetup.c:3364 +#: src/cryptsetup.c:3384 msgid "dump LUKS partition information" msgstr "复制LUKS分区信息" -#: src/cryptsetup.c:3365 +#: src/cryptsetup.c:3385 msgid "dump TCRYPT device information" msgstr "" -#: src/cryptsetup.c:3367 +#: src/cryptsetup.c:3387 msgid "Suspend LUKS device and wipe key (all IOs are frozen)" msgstr "" -#: src/cryptsetup.c:3368 +#: src/cryptsetup.c:3388 msgid "Resume suspended LUKS device" msgstr "" -#: src/cryptsetup.c:3369 +#: src/cryptsetup.c:3389 msgid "Backup LUKS device header and keyslots" msgstr "" -#: src/cryptsetup.c:3370 +#: src/cryptsetup.c:3390 msgid "Restore LUKS device header and keyslots" msgstr "" -#: src/cryptsetup.c:3371 +#: src/cryptsetup.c:3391 msgid " " msgstr "" -#: src/cryptsetup.c:3371 +#: src/cryptsetup.c:3391 msgid "Manipulate LUKS2 tokens" msgstr "" -#: src/cryptsetup.c:3389 src/veritysetup.c:412 src/integritysetup.c:498 +#: src/cryptsetup.c:3409 src/veritysetup.c:417 src/integritysetup.c:498 msgid "" "\n" " is one of:\n" @@ -2215,7 +2216,7 @@ "\tclose: remove (plainClose), luksClose, loopaesClose, tcryptClose\n" msgstr "" -#: src/cryptsetup.c:3399 +#: src/cryptsetup.c:3419 #, c-format msgid "" "\n" @@ -2230,14 +2231,14 @@ " 是 LUKS key slot 数字去设置\n" " optional key file for the new key for luksAddKey action\n" -#: src/cryptsetup.c:3406 +#: src/cryptsetup.c:3426 #, c-format msgid "" "\n" "Default compiled-in metadata format is %s (for luksFormat action).\n" msgstr "" -#: src/cryptsetup.c:3411 +#: src/cryptsetup.c:3431 #, c-format msgid "" "\n" @@ -2249,7 +2250,7 @@ "\tIteration time: %d, Memory required: %dkB, Parallel threads: %d\n" msgstr "" -#: src/cryptsetup.c:3422 +#: src/cryptsetup.c:3442 #, c-format msgid "" "\n" @@ -2259,220 +2260,220 @@ "\tLUKS: %s, Key: %d bits, LUKS header hashing: %s, RNG: %s\n" msgstr "" -#: src/cryptsetup.c:3431 +#: src/cryptsetup.c:3451 msgid "" "\tLUKS: Default keysize with XTS mode (two internal keys) will be doubled.\n" msgstr "" -#: src/cryptsetup.c:3447 src/veritysetup.c:569 src/integritysetup.c:642 +#: src/cryptsetup.c:3467 src/veritysetup.c:575 src/integritysetup.c:642 #, c-format msgid "%s: requires %s as arguments" msgstr "%s: requires %s 作为参数" -#: src/cryptsetup.c:3480 src/veritysetup.c:457 src/integritysetup.c:536 +#: src/cryptsetup.c:3500 src/veritysetup.c:462 src/integritysetup.c:536 #: src/cryptsetup_reencrypt.c:1607 msgid "Show this help message" msgstr "显示该帮助信息" -#: src/cryptsetup.c:3481 src/veritysetup.c:458 src/integritysetup.c:537 +#: src/cryptsetup.c:3501 src/veritysetup.c:463 src/integritysetup.c:537 #: src/cryptsetup_reencrypt.c:1608 msgid "Display brief usage" msgstr "显示简短用法" -#: src/cryptsetup.c:3482 src/veritysetup.c:459 src/integritysetup.c:538 +#: src/cryptsetup.c:3502 src/veritysetup.c:464 src/integritysetup.c:538 #: src/cryptsetup_reencrypt.c:1609 msgid "Print package version" msgstr "显示包版本" -#: src/cryptsetup.c:3486 src/veritysetup.c:463 src/integritysetup.c:542 +#: src/cryptsetup.c:3506 src/veritysetup.c:468 src/integritysetup.c:542 #: src/cryptsetup_reencrypt.c:1613 msgid "Help options:" msgstr "帮助选项" -#: src/cryptsetup.c:3487 src/veritysetup.c:464 src/integritysetup.c:543 +#: src/cryptsetup.c:3507 src/veritysetup.c:469 src/integritysetup.c:543 #: src/cryptsetup_reencrypt.c:1614 msgid "Shows more detailed error messages" msgstr "显示更多的详细错误信息" -#: src/cryptsetup.c:3488 src/veritysetup.c:465 src/integritysetup.c:544 +#: src/cryptsetup.c:3508 src/veritysetup.c:470 src/integritysetup.c:544 #: src/cryptsetup_reencrypt.c:1615 msgid "Show debug messages" msgstr "" -#: src/cryptsetup.c:3489 +#: src/cryptsetup.c:3509 msgid "Show debug messages including JSON metadata" msgstr "" -#: src/cryptsetup.c:3490 src/cryptsetup_reencrypt.c:1617 +#: src/cryptsetup.c:3510 src/cryptsetup_reencrypt.c:1617 msgid "The cipher used to encrypt the disk (see /proc/crypto)" msgstr "这个密码用于加密这个磁盘(参看 /proc/crypto)" -#: src/cryptsetup.c:3491 src/cryptsetup_reencrypt.c:1619 +#: src/cryptsetup.c:3511 src/cryptsetup_reencrypt.c:1619 msgid "The hash used to create the encryption key from the passphrase" msgstr "hash用于从密钥中创建加密密钥" -#: src/cryptsetup.c:3492 +#: src/cryptsetup.c:3512 msgid "Verifies the passphrase by asking for it twice" msgstr "通过两次来校验密钥" -#: src/cryptsetup.c:3493 src/cryptsetup_reencrypt.c:1621 +#: src/cryptsetup.c:3513 src/cryptsetup_reencrypt.c:1621 msgid "Read the key from a file" msgstr "" -#: src/cryptsetup.c:3494 +#: src/cryptsetup.c:3514 msgid "Read the volume (master) key from file." msgstr "" -#: src/cryptsetup.c:3495 +#: src/cryptsetup.c:3515 msgid "Dump volume (master) key instead of keyslots info" msgstr "" -#: src/cryptsetup.c:3496 src/cryptsetup_reencrypt.c:1618 +#: src/cryptsetup.c:3516 src/cryptsetup_reencrypt.c:1618 msgid "The size of the encryption key" msgstr "加密密码的长度" -#: src/cryptsetup.c:3496 src/cryptsetup.c:3557 src/integritysetup.c:562 +#: src/cryptsetup.c:3516 src/cryptsetup.c:3579 src/integritysetup.c:562 #: src/integritysetup.c:566 src/integritysetup.c:570 #: src/cryptsetup_reencrypt.c:1618 msgid "BITS" msgstr "位数" -#: src/cryptsetup.c:3497 src/cryptsetup_reencrypt.c:1634 +#: src/cryptsetup.c:3517 src/cryptsetup_reencrypt.c:1634 msgid "Limits the read from keyfile" msgstr "" -#: src/cryptsetup.c:3497 src/cryptsetup.c:3498 src/cryptsetup.c:3499 -#: src/cryptsetup.c:3500 src/cryptsetup.c:3503 src/cryptsetup.c:3554 -#: src/cryptsetup.c:3555 src/cryptsetup.c:3563 src/cryptsetup.c:3564 -#: src/veritysetup.c:468 src/veritysetup.c:469 src/veritysetup.c:470 -#: src/veritysetup.c:473 src/veritysetup.c:474 src/integritysetup.c:551 +#: src/cryptsetup.c:3517 src/cryptsetup.c:3518 src/cryptsetup.c:3519 +#: src/cryptsetup.c:3520 src/cryptsetup.c:3523 src/cryptsetup.c:3576 +#: src/cryptsetup.c:3577 src/cryptsetup.c:3585 src/cryptsetup.c:3586 +#: src/veritysetup.c:473 src/veritysetup.c:474 src/veritysetup.c:475 +#: src/veritysetup.c:478 src/veritysetup.c:479 src/integritysetup.c:551 #: src/integritysetup.c:557 src/integritysetup.c:558 #: src/cryptsetup_reencrypt.c:1633 src/cryptsetup_reencrypt.c:1634 #: src/cryptsetup_reencrypt.c:1635 src/cryptsetup_reencrypt.c:1636 msgid "bytes" msgstr "" -#: src/cryptsetup.c:3498 src/cryptsetup_reencrypt.c:1633 +#: src/cryptsetup.c:3518 src/cryptsetup_reencrypt.c:1633 msgid "Number of bytes to skip in keyfile" msgstr "" -#: src/cryptsetup.c:3499 +#: src/cryptsetup.c:3519 msgid "Limits the read from newly added keyfile" msgstr "" -#: src/cryptsetup.c:3500 +#: src/cryptsetup.c:3520 msgid "Number of bytes to skip in newly added keyfile" msgstr "" -#: src/cryptsetup.c:3501 +#: src/cryptsetup.c:3521 msgid "Slot number for new key (default is first free)" msgstr "" -#: src/cryptsetup.c:3502 +#: src/cryptsetup.c:3522 msgid "The size of the device" msgstr "设备尺寸" -#: src/cryptsetup.c:3502 src/cryptsetup.c:3504 src/cryptsetup.c:3505 -#: src/cryptsetup.c:3511 src/integritysetup.c:552 src/integritysetup.c:559 +#: src/cryptsetup.c:3522 src/cryptsetup.c:3524 src/cryptsetup.c:3525 +#: src/cryptsetup.c:3531 src/integritysetup.c:552 src/integritysetup.c:559 msgid "SECTORS" msgstr "扇区数" -#: src/cryptsetup.c:3503 src/cryptsetup_reencrypt.c:1636 +#: src/cryptsetup.c:3523 src/cryptsetup_reencrypt.c:1636 msgid "Use only specified device size (ignore rest of device). DANGEROUS!" msgstr "" -#: src/cryptsetup.c:3504 +#: src/cryptsetup.c:3524 msgid "The start offset in the backend device" msgstr "在后台设备中的开始偏移量" -#: src/cryptsetup.c:3505 +#: src/cryptsetup.c:3525 msgid "How many sectors of the encrypted data to skip at the beginning" msgstr "加密数据在开始跳过多少扇区" -#: src/cryptsetup.c:3506 +#: src/cryptsetup.c:3526 msgid "Create a readonly mapping" msgstr "创建一个只读映射" -#: src/cryptsetup.c:3507 src/integritysetup.c:545 +#: src/cryptsetup.c:3527 src/integritysetup.c:545 #: src/cryptsetup_reencrypt.c:1624 msgid "Do not ask for confirmation" msgstr "不询问确认" -#: src/cryptsetup.c:3508 +#: src/cryptsetup.c:3528 msgid "Timeout for interactive passphrase prompt (in seconds)" msgstr "交互密钥提示的时间限制(秒数)" -#: src/cryptsetup.c:3508 src/cryptsetup.c:3509 src/integritysetup.c:546 +#: src/cryptsetup.c:3528 src/cryptsetup.c:3529 src/integritysetup.c:546 #: src/cryptsetup_reencrypt.c:1625 msgid "secs" msgstr "秒" -#: src/cryptsetup.c:3509 src/integritysetup.c:546 +#: src/cryptsetup.c:3529 src/integritysetup.c:546 #: src/cryptsetup_reencrypt.c:1625 msgid "Progress line update (in seconds)" msgstr "" -#: src/cryptsetup.c:3510 src/cryptsetup_reencrypt.c:1626 +#: src/cryptsetup.c:3530 src/cryptsetup_reencrypt.c:1626 msgid "How often the input of the passphrase can be retried" msgstr "多久能重试再输入密钥" -#: src/cryptsetup.c:3511 +#: src/cryptsetup.c:3531 msgid "Align payload at sector boundaries - for luksFormat" msgstr "为luksFormat排列有效负荷在扇区边界" -#: src/cryptsetup.c:3512 +#: src/cryptsetup.c:3532 msgid "File with LUKS header and keyslots backup" msgstr "" -#: src/cryptsetup.c:3513 src/cryptsetup_reencrypt.c:1627 +#: src/cryptsetup.c:3533 src/cryptsetup_reencrypt.c:1627 msgid "Use /dev/random for generating volume key" msgstr "" -#: src/cryptsetup.c:3514 src/cryptsetup_reencrypt.c:1628 +#: src/cryptsetup.c:3534 src/cryptsetup_reencrypt.c:1628 msgid "Use /dev/urandom for generating volume key" msgstr "" -#: src/cryptsetup.c:3515 +#: src/cryptsetup.c:3535 msgid "Share device with another non-overlapping crypt segment" msgstr "" -#: src/cryptsetup.c:3516 src/veritysetup.c:477 +#: src/cryptsetup.c:3536 src/veritysetup.c:482 msgid "UUID for device to use" msgstr "" -#: src/cryptsetup.c:3517 src/integritysetup.c:579 +#: src/cryptsetup.c:3537 src/integritysetup.c:579 msgid "Allow discards (aka TRIM) requests for device" msgstr "" -#: src/cryptsetup.c:3518 src/cryptsetup_reencrypt.c:1645 +#: src/cryptsetup.c:3538 src/cryptsetup_reencrypt.c:1645 msgid "Device or file with separated LUKS header" msgstr "" -#: src/cryptsetup.c:3519 +#: src/cryptsetup.c:3539 msgid "Do not activate device, just check passphrase" msgstr "" -#: src/cryptsetup.c:3520 +#: src/cryptsetup.c:3540 msgid "Use hidden header (hidden TCRYPT device)" msgstr "" -#: src/cryptsetup.c:3521 +#: src/cryptsetup.c:3541 msgid "Device is system TCRYPT drive (with bootloader)" msgstr "" -#: src/cryptsetup.c:3522 +#: src/cryptsetup.c:3542 msgid "Use backup (secondary) TCRYPT header" msgstr "" -#: src/cryptsetup.c:3523 +#: src/cryptsetup.c:3543 msgid "Scan also for VeraCrypt compatible device" msgstr "" -#: src/cryptsetup.c:3524 +#: src/cryptsetup.c:3544 msgid "Personal Iteration Multiplier for VeraCrypt compatible device" msgstr "" -#: src/cryptsetup.c:3525 +#: src/cryptsetup.c:3545 msgid "Query Personal Iteration Multiplier for VeraCrypt compatible device" msgstr "" @@ -2480,237 +2481,237 @@ msgid "Type of device metadata: luks, luks1, luks2, plain, loopaes, tcrypt" msgstr "" -#: src/cryptsetup.c:3527 +#: src/cryptsetup.c:3547 msgid "Disable password quality check (if enabled)" msgstr "" -#: src/cryptsetup.c:3528 +#: src/cryptsetup.c:3548 msgid "Use dm-crypt same_cpu_crypt performance compatibility option" msgstr "" -#: src/cryptsetup.c:3529 +#: src/cryptsetup.c:3549 msgid "Use dm-crypt submit_from_crypt_cpus performance compatibility option" msgstr "" -#: src/cryptsetup.c:3530 +#: src/cryptsetup.c:3552 msgid "Device removal is deferred until the last user closes it" msgstr "" -#: src/cryptsetup.c:3531 +#: src/cryptsetup.c:3553 msgid "Use global lock to serialize memory hard PBKDF (OOM workaround)" msgstr "" -#: src/cryptsetup.c:3532 +#: src/cryptsetup.c:3554 msgid "PBKDF iteration time for LUKS (in ms)" msgstr "" -#: src/cryptsetup.c:3532 src/cryptsetup_reencrypt.c:1623 +#: src/cryptsetup.c:3554 src/cryptsetup_reencrypt.c:1623 msgid "msecs" msgstr "毫秒" -#: src/cryptsetup.c:3533 src/cryptsetup_reencrypt.c:1641 +#: src/cryptsetup.c:3555 src/cryptsetup_reencrypt.c:1641 msgid "PBKDF algorithm (for LUKS2): argon2i, argon2id, pbkdf2" msgstr "" -#: src/cryptsetup.c:3534 src/cryptsetup_reencrypt.c:1642 +#: src/cryptsetup.c:3556 src/cryptsetup_reencrypt.c:1642 msgid "PBKDF memory cost limit" msgstr "" -#: src/cryptsetup.c:3534 src/cryptsetup_reencrypt.c:1642 +#: src/cryptsetup.c:3556 src/cryptsetup_reencrypt.c:1642 msgid "kilobytes" msgstr "" -#: src/cryptsetup.c:3535 src/cryptsetup_reencrypt.c:1643 +#: src/cryptsetup.c:3557 src/cryptsetup_reencrypt.c:1643 msgid "PBKDF parallel cost" msgstr "" -#: src/cryptsetup.c:3535 src/cryptsetup_reencrypt.c:1643 +#: src/cryptsetup.c:3557 src/cryptsetup_reencrypt.c:1643 msgid "threads" msgstr "" -#: src/cryptsetup.c:3536 src/cryptsetup_reencrypt.c:1644 +#: src/cryptsetup.c:3558 src/cryptsetup_reencrypt.c:1644 msgid "PBKDF iterations cost (forced, disables benchmark)" msgstr "" -#: src/cryptsetup.c:3537 +#: src/cryptsetup.c:3559 msgid "Keyslot priority: ignore, normal, prefer" msgstr "" -#: src/cryptsetup.c:3538 +#: src/cryptsetup.c:3560 msgid "Disable locking of on-disk metadata" msgstr "" -#: src/cryptsetup.c:3539 +#: src/cryptsetup.c:3561 msgid "Disable loading volume keys via kernel keyring" msgstr "" -#: src/cryptsetup.c:3540 +#: src/cryptsetup.c:3562 msgid "Data integrity algorithm (LUKS2 only)" msgstr "" -#: src/cryptsetup.c:3541 src/integritysetup.c:573 +#: src/cryptsetup.c:3563 src/integritysetup.c:573 msgid "Disable journal for integrity device" msgstr "" -#: src/cryptsetup.c:3542 src/integritysetup.c:547 +#: src/cryptsetup.c:3564 src/integritysetup.c:547 msgid "Do not wipe device after format" msgstr "" -#: src/cryptsetup.c:3544 +#: src/cryptsetup.c:3566 msgid "Do not ask for passphrase if activation by token fails" msgstr "" -#: src/cryptsetup.c:3545 +#: src/cryptsetup.c:3567 msgid "Token number (default: any)" msgstr "" -#: src/cryptsetup.c:3546 +#: src/cryptsetup.c:3568 msgid "Key description" msgstr "" -#: src/cryptsetup.c:3547 +#: src/cryptsetup.c:3569 msgid "Encryption sector size (default: 512 bytes)" msgstr "" -#: src/cryptsetup.c:3549 +#: src/cryptsetup.c:3571 msgid "Set activation flags persistent for device" msgstr "" -#: src/cryptsetup.c:3550 +#: src/cryptsetup.c:3572 msgid "Set label for the LUKS2 device" msgstr "" -#: src/cryptsetup.c:3551 +#: src/cryptsetup.c:3573 msgid "Set subsystem label for the LUKS2 device" msgstr "" -#: src/cryptsetup.c:3490 +#: src/cryptsetup.c:3417 msgid "Create unbound (no assigned data segment) LUKS2 keyslot" msgstr "" -#: src/cryptsetup.c:3553 +#: src/cryptsetup.c:3575 msgid "Read or write the json from or to a file" msgstr "" -#: src/cryptsetup.c:3554 +#: src/cryptsetup.c:3576 msgid "LUKS2 header metadata area size" msgstr "" -#: src/cryptsetup.c:3555 +#: src/cryptsetup.c:3577 msgid "LUKS2 header keyslots area size" msgstr "" -#: src/cryptsetup.c:3556 +#: src/cryptsetup.c:3578 msgid "Refresh (reactivate) device with new parameters" msgstr "" -#: src/cryptsetup.c:3557 +#: src/cryptsetup.c:3579 msgid "LUKS2 keyslot: The size of the encryption key" msgstr "" -#: src/cryptsetup.c:3558 +#: src/cryptsetup.c:3580 msgid "LUKS2 keyslot: The cipher used for keyslot encryption" msgstr "" -#: src/cryptsetup.c:3559 +#: src/cryptsetup.c:3581 msgid "Encrypt LUKS2 device (in-place encryption)." msgstr "" -#: src/cryptsetup.c:3560 +#: src/cryptsetup.c:3582 msgid "Decrypt LUKS2 device (remove encryption)." msgstr "" -#: src/cryptsetup.c:3561 +#: src/cryptsetup.c:3583 msgid "Initialize LUKS2 reencryption in metadata only." msgstr "" -#: src/cryptsetup.c:3562 +#: src/cryptsetup.c:3584 msgid "Resume initialized LUKS2 reencryption only." msgstr "" -#: src/cryptsetup.c:3563 src/cryptsetup_reencrypt.c:1635 +#: src/cryptsetup.c:3585 src/cryptsetup_reencrypt.c:1635 msgid "Reduce data device size (move data offset). DANGEROUS!" msgstr "" -#: src/cryptsetup.c:3564 +#: src/cryptsetup.c:3586 msgid "Maximal reencryption hotzone size." msgstr "" -#: src/cryptsetup.c:3565 +#: src/cryptsetup.c:3587 msgid "Reencryption hotzone resilience type (checksum,journal,none)" msgstr "" -#: src/cryptsetup.c:3566 +#: src/cryptsetup.c:3588 msgid "Reencryption hotzone checksums hash" msgstr "" -#: src/cryptsetup.c:3567 +#: src/cryptsetup.c:3589 msgid "Override device autodetection of dm device to be reencrypted" msgstr "" -#: src/cryptsetup.c:3583 src/veritysetup.c:499 src/integritysetup.c:595 +#: src/cryptsetup.c:3605 src/veritysetup.c:505 src/integritysetup.c:595 msgid "[OPTION...] " msgstr "" -#: src/cryptsetup.c:3634 src/veritysetup.c:533 src/integritysetup.c:606 +#: src/cryptsetup.c:3656 src/veritysetup.c:539 src/integritysetup.c:606 msgid "Argument missing." msgstr "缺少参数." -#: src/cryptsetup.c:3703 src/veritysetup.c:564 src/integritysetup.c:637 +#: src/cryptsetup.c:3725 src/veritysetup.c:570 src/integritysetup.c:637 msgid "Unknown action." msgstr "未知参数" -#: src/cryptsetup.c:3651 +#: src/cryptsetup.c:3572 msgid "Parameter --refresh is only allowed with open or refresh commands.\n" msgstr "" -#: src/cryptsetup.c:3656 +#: src/cryptsetup.c:3577 msgid "Options --refresh and --test-passphrase are mutually exclusive.\n" msgstr "" -#: src/cryptsetup.c:3661 +#: src/cryptsetup.c:3582 msgid "Option --deferred is allowed only for close command.\n" msgstr "" -#: src/cryptsetup.c:3666 +#: src/cryptsetup.c:3587 msgid "Option --shared is allowed only for open of plain device.\n" msgstr "" -#: src/cryptsetup.c:3671 +#: src/cryptsetup.c:3592 msgid "Option --allow-discards is allowed only for open operation.\n" msgstr "" -#: src/cryptsetup.c:3676 +#: src/cryptsetup.c:3597 msgid "Option --persistent is allowed only for open operation.\n" msgstr "" -#: src/cryptsetup.c:3681 +#: src/cryptsetup.c:3602 msgid "" "Option --serialize-memory-hard-pbkdf is allowed only for open operation.\n" msgstr "" -#: src/cryptsetup.c:3686 +#: src/cryptsetup.c:3607 msgid "Option --persistent is not allowed with --test-passphrase.\n" msgstr "" -#: src/cryptsetup.c:3753 +#: src/cryptsetup.c:3775 msgid "" "Option --key-size is allowed only for luksFormat, luksAddKey,\n" "open and benchmark actions. To limit read from keyfile use --keyfile-" "size=(bytes)." msgstr "" -#: src/cryptsetup.c:3702 +#: src/cryptsetup.c:3623 msgid "Option --integrity is allowed only for luksFormat (LUKS2).\n" msgstr "" -#: src/cryptsetup.c:3707 +#: src/cryptsetup.c:3628 msgid "" "Option --integrity-no-wipe can be used only for format action with integrity " "extension.\n" msgstr "" -#: src/cryptsetup.c:3713 +#: src/cryptsetup.c:3634 msgid "" "Options --label and --subsystem are allowed only for luksFormat and config " "LUKS2 operations.\n" @@ -2722,244 +2723,244 @@ "devices.\n" msgstr "" -#: src/cryptsetup.c:3781 src/cryptsetup_reencrypt.c:1708 +#: src/cryptsetup.c:3803 src/cryptsetup_reencrypt.c:1708 msgid "Key size must be a multiple of 8 bits" msgstr "密码长度必须是8的倍数" -#: src/cryptsetup.c:3787 src/cryptsetup_reencrypt.c:1394 +#: src/cryptsetup.c:3809 src/cryptsetup_reencrypt.c:1394 #: src/cryptsetup_reencrypt.c:1713 msgid "Key slot is invalid." msgstr "" -#: src/cryptsetup.c:3794 +#: src/cryptsetup.c:3816 msgid "Option --key-file takes precedence over specified key file argument." msgstr "" -#: src/cryptsetup.c:3801 src/veritysetup.c:576 src/integritysetup.c:663 +#: src/cryptsetup.c:3823 src/veritysetup.c:582 src/integritysetup.c:663 #: src/cryptsetup_reencrypt.c:1687 msgid "Negative number for option not permitted." msgstr "" -#: src/cryptsetup.c:3805 +#: src/cryptsetup.c:3827 msgid "Only one --key-file argument is allowed." msgstr "" -#: src/cryptsetup.c:3809 src/cryptsetup_reencrypt.c:1679 +#: src/cryptsetup.c:3831 src/cryptsetup_reencrypt.c:1679 #: src/cryptsetup_reencrypt.c:1717 msgid "Only one of --use-[u]random options is allowed." msgstr "" -#: src/cryptsetup.c:3813 +#: src/cryptsetup.c:3835 msgid "Option --use-[u]random is allowed only for luksFormat." msgstr "" -#: src/cryptsetup.c:3817 +#: src/cryptsetup.c:3839 msgid "Option --uuid is allowed only for luksFormat and luksUUID." msgstr "" -#: src/cryptsetup.c:3821 +#: src/cryptsetup.c:3843 msgid "Option --align-payload is allowed only for luksFormat." msgstr "" -#: src/cryptsetup.c:3825 +#: src/cryptsetup.c:3847 msgid "" "Options --luks2-metadata-size and --opt-luks2-keyslots-size are allowed only " "for luksFormat with LUKS2." msgstr "" -#: src/cryptsetup.c:3830 +#: src/cryptsetup.c:3852 msgid "Invalid LUKS2 metadata size specification." msgstr "" -#: src/cryptsetup.c:3834 +#: src/cryptsetup.c:3856 msgid "Invalid LUKS2 keyslots size specification." msgstr "" -#: src/cryptsetup.c:3838 +#: src/cryptsetup.c:3860 msgid "Options --align-payload and --offset cannot be combined." msgstr "" -#: src/cryptsetup.c:3787 +#: src/cryptsetup.c:3708 msgid "" "Option --skip is supported only for open of plain and loopaes devices.\n" msgstr "" -#: src/cryptsetup.c:3794 +#: src/cryptsetup.c:3715 msgid "" "Option --offset is supported only for open of plain and loopaes devices, " "luksFormat and device reencryption.\n" msgstr "" -#: src/cryptsetup.c:3800 +#: src/cryptsetup.c:3721 msgid "" "Option --tcrypt-hidden, --tcrypt-system or --tcrypt-backup is supported only " "for TCRYPT device.\n" msgstr "" -#: src/cryptsetup.c:3805 +#: src/cryptsetup.c:3726 msgid "Option --tcrypt-hidden cannot be combined with --allow-discards.\n" msgstr "" -#: src/cryptsetup.c:3810 +#: src/cryptsetup.c:3731 msgid "Option --veracrypt is supported only for TCRYPT device type.\n" msgstr "" -#: src/cryptsetup.c:3816 +#: src/cryptsetup.c:3737 msgid "Invalid argument for parameter --veracrypt-pim supplied.\n" msgstr "" -#: src/cryptsetup.c:3820 +#: src/cryptsetup.c:3741 msgid "" "Option --veracrypt-pim is supported only for VeraCrypt compatible devices.\n" msgstr "" -#: src/cryptsetup.c:3828 +#: src/cryptsetup.c:3749 msgid "" "Option --veracrypt-query-pim is supported only for VeraCrypt compatible " "devices.\n" msgstr "" -#: src/cryptsetup.c:3832 +#: src/cryptsetup.c:3753 msgid "" "The options --veracrypt-pim and --veracrypt-query-pim are mutually " "exclusive.\n" msgstr "" -#: src/cryptsetup.c:3839 +#: src/cryptsetup.c:3760 msgid "Option --priority can be only ignore/normal/prefer.\n" msgstr "" -#: src/cryptsetup.c:3844 +#: src/cryptsetup.c:3765 msgid "Keyslot specification is required.\n" msgstr "" -#: src/cryptsetup.c:3849 src/cryptsetup_reencrypt.c:1686 +#: src/cryptsetup.c:3770 src/cryptsetup_reencrypt.c:1677 msgid "" "Password-based key derivation function (PBKDF) can be only pbkdf2 or " "argon2i/argon2id.\n" msgstr "" -#: src/cryptsetup.c:3854 src/cryptsetup_reencrypt.c:1691 +#: src/cryptsetup.c:3775 src/cryptsetup_reencrypt.c:1682 msgid "" "PBKDF forced iterations cannot be combined with iteration time option.\n" msgstr "" -#: src/cryptsetup.c:3860 +#: src/cryptsetup.c:3781 msgid "Sector size option is not supported for this command.\n" msgstr "" -#: src/cryptsetup.c:3866 +#: src/cryptsetup.c:3787 msgid "Unsupported encryption sector size.\n" msgstr "" -#: src/cryptsetup.c:3871 +#: src/cryptsetup.c:3792 msgid "Key size is required with --unbound option.\n" msgstr "" -#: src/cryptsetup.c:3876 +#: src/cryptsetup.c:3797 msgid "Option --unbound may be used only with luksAddKey action.\n" msgstr "" -#: src/cryptsetup.c:3881 +#: src/cryptsetup.c:3802 msgid "Option --refresh may be used only with open action.\n" msgstr "" -#: src/cryptsetup.c:3892 +#: src/cryptsetup.c:3813 msgid "Cannot disable metadata locking.\n" msgstr "" -#: src/cryptsetup.c:3970 +#: src/cryptsetup.c:3992 msgid "Invalid max reencryption hotzone size specification." msgstr "" -#: src/cryptsetup.c:3978 src/cryptsetup_reencrypt.c:1722 +#: src/cryptsetup.c:4000 src/cryptsetup_reencrypt.c:1722 #: src/cryptsetup_reencrypt.c:1727 msgid "Invalid device size specification." msgstr "" -#: src/cryptsetup.c:3981 +#: src/cryptsetup.c:4003 msgid "Maximum device reduce size is 1 GiB." msgstr "" -#: src/cryptsetup.c:3984 src/cryptsetup_reencrypt.c:1733 +#: src/cryptsetup.c:4006 src/cryptsetup_reencrypt.c:1733 msgid "Reduce size must be multiple of 512 bytes sector." msgstr "" -#: src/cryptsetup.c:3989 +#: src/cryptsetup.c:4011 msgid "Invalid data size specification." msgstr "" -#: src/cryptsetup.c:3994 +#: src/cryptsetup.c:4016 msgid "Reduce size overflow." msgstr "" -#: src/cryptsetup.c:3998 +#: src/cryptsetup.c:4020 msgid "LUKS2 decryption requires option --header." msgstr "" -#: src/cryptsetup.c:4002 +#: src/cryptsetup.c:4024 msgid "Device size must be multiple of 512 bytes sector." msgstr "" -#: src/cryptsetup.c:4006 +#: src/cryptsetup.c:4028 msgid "Options --reduce-device-size and --data-size cannot be combined." msgstr "" -#: src/cryptsetup.c:4010 +#: src/cryptsetup.c:4032 msgid "Options --device-size and --size cannot be combined." msgstr "" -#: src/veritysetup.c:66 +#: src/veritysetup.c:67 msgid "Invalid salt string specified." msgstr "" -#: src/veritysetup.c:97 +#: src/veritysetup.c:98 #, c-format msgid "Cannot create hash image %s for writing." msgstr "" -#: src/veritysetup.c:107 +#: src/veritysetup.c:108 #, c-format msgid "Cannot create FEC image %s for writing." msgstr "" -#: src/veritysetup.c:179 +#: src/veritysetup.c:182 msgid "Invalid root hash string specified." msgstr "" -#: src/veritysetup.c:392 +#: src/veritysetup.c:397 msgid " " msgstr "" -#: src/veritysetup.c:392 src/integritysetup.c:479 +#: src/veritysetup.c:397 src/integritysetup.c:479 msgid "format device" msgstr "" -#: src/veritysetup.c:393 +#: src/veritysetup.c:398 msgid " " msgstr "" -#: src/veritysetup.c:393 +#: src/veritysetup.c:398 msgid "verify device" msgstr "" -#: src/veritysetup.c:394 +#: src/veritysetup.c:399 msgid " " msgstr "" -#: src/veritysetup.c:396 src/integritysetup.c:482 +#: src/veritysetup.c:401 src/integritysetup.c:482 msgid "show active device status" msgstr "" -#: src/veritysetup.c:397 +#: src/veritysetup.c:402 msgid "" msgstr "" -#: src/veritysetup.c:397 src/integritysetup.c:483 +#: src/veritysetup.c:402 src/integritysetup.c:483 msgid "show on-disk information" msgstr "" -#: src/veritysetup.c:416 +#: src/veritysetup.c:421 #, c-format msgid "" "\n" @@ -2969,7 +2970,7 @@ " hash of the root node on \n" msgstr "" -#: src/veritysetup.c:423 +#: src/veritysetup.c:428 #, c-format msgid "" "\n" @@ -2978,93 +2979,93 @@ "Hash format: %u\n" msgstr "" -#: src/veritysetup.c:466 +#: src/veritysetup.c:471 msgid "Do not use verity superblock" msgstr "" -#: src/veritysetup.c:467 +#: src/veritysetup.c:472 msgid "Format type (1 - normal, 0 - original Chrome OS)" msgstr "" -#: src/veritysetup.c:467 +#: src/veritysetup.c:472 msgid "number" msgstr "" -#: src/veritysetup.c:468 +#: src/veritysetup.c:473 msgid "Block size on the data device" msgstr "" -#: src/veritysetup.c:469 +#: src/veritysetup.c:474 msgid "Block size on the hash device" msgstr "" -#: src/veritysetup.c:470 +#: src/veritysetup.c:475 msgid "FEC parity bytes" msgstr "" -#: src/veritysetup.c:471 +#: src/veritysetup.c:476 msgid "The number of blocks in the data file" msgstr "" -#: src/veritysetup.c:471 +#: src/veritysetup.c:476 msgid "blocks" msgstr "" -#: src/veritysetup.c:472 +#: src/veritysetup.c:477 msgid "Path to device with error correction data" msgstr "" -#: src/veritysetup.c:472 src/integritysetup.c:549 +#: src/veritysetup.c:477 src/integritysetup.c:549 msgid "path" msgstr "" -#: src/veritysetup.c:473 +#: src/veritysetup.c:478 msgid "Starting offset on the hash device" msgstr "" -#: src/veritysetup.c:474 +#: src/veritysetup.c:479 msgid "Starting offset on the FEC device" msgstr "" -#: src/veritysetup.c:475 +#: src/veritysetup.c:480 msgid "Hash algorithm" msgstr "" -#: src/veritysetup.c:475 +#: src/veritysetup.c:480 msgid "string" msgstr "" -#: src/veritysetup.c:476 +#: src/veritysetup.c:481 msgid "Salt" msgstr "" -#: src/veritysetup.c:476 +#: src/veritysetup.c:481 msgid "hex string" msgstr "" -#: src/veritysetup.c:479 +#: src/veritysetup.c:484 msgid "Restart kernel if corruption is detected" msgstr "" -#: src/veritysetup.c:480 +#: src/veritysetup.c:486 msgid "Ignore corruption, log it only" msgstr "" -#: src/veritysetup.c:481 +#: src/veritysetup.c:487 msgid "Do not verify zeroed blocks" msgstr "" -#: src/veritysetup.c:482 +#: src/veritysetup.c:488 msgid "Verify data block only the first time it is read" msgstr "" -#: src/veritysetup.c:582 +#: src/veritysetup.c:545 msgid "" "Option --ignore-corruption, --restart-on-corruption or --ignore-zero-blocks " "is allowed only for open operation.\n" msgstr "" -#: src/veritysetup.c:592 +#: src/veritysetup.c:550 msgid "" "Option --ignore-corruption and --restart-on-corruption cannot be used " "together.\n" @@ -3209,7 +3210,7 @@ msgid "Option --integrity-recalculate can be used only for open action." msgstr "" -#: src/integritysetup.c:656 +#: src/integritysetup.c:655 msgid "" "Options --journal-size, --interleave-sectors, --sector-size, --tag-size and -" "-no-wipe can be used only for format action.\n" diff -Nru language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/cups.po language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/cups.po --- language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/cups.po 2020-07-10 08:58:46.000000000 +0000 +++ language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/cups.po 2021-01-22 11:31:14.000000000 +0000 @@ -9,8 +9,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2020-07-09 18:59+0000\n" -"X-Generator: Launchpad (build 4809fcb62f445aaa3ae919f7f6c3cc7d156ea57a)\n" +"X-Launchpad-Export-Date: 2021-01-21 20:03+0000\n" +"X-Generator: Launchpad (build 2d1d5e352f0d063d660df2300e31f66bed027fa5)\n" "Language: \n" #: systemv/lpstat.c:1871 systemv/lpstat.c:1990 diff -Nru language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/cwidget.po language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/cwidget.po --- language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/cwidget.po 2020-07-10 08:58:54.000000000 +0000 +++ language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/cwidget.po 2021-01-22 11:31:21.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: 2020-07-09 18:52+0000\n" -"X-Generator: Launchpad (build 4809fcb62f445aaa3ae919f7f6c3cc7d156ea57a)\n" +"X-Launchpad-Export-Date: 2021-01-21 19:54+0000\n" +"X-Generator: Launchpad (build 2d1d5e352f0d063d660df2300e31f66bed027fa5)\n" #: src/cwidget/config/column_definition.cc:273 msgid "Bad format parameter" diff -Nru language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/dctrl-tools.po language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/dctrl-tools.po --- language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/dctrl-tools.po 2020-07-10 08:58:52.000000000 +0000 +++ language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/dctrl-tools.po 2021-01-22 11:31:19.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: 2020-07-09 18:27+0000\n" -"X-Generator: Launchpad (build 4809fcb62f445aaa3ae919f7f6c3cc7d156ea57a)\n" +"X-Launchpad-Export-Date: 2021-01-21 19:29+0000\n" +"X-Generator: Launchpad (build 2d1d5e352f0d063d660df2300e31f66bed027fa5)\n" #: lib/paragraph.c:172 msgid "warning: expected a colon" diff -Nru language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/debconf.po language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/debconf.po --- language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/debconf.po 2020-07-10 08:58:55.000000000 +0000 +++ language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/debconf.po 2021-01-22 11:31:23.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: 2020-07-09 17:01+0000\n" -"X-Generator: Launchpad (build 4809fcb62f445aaa3ae919f7f6c3cc7d156ea57a)\n" +"X-Launchpad-Export-Date: 2021-01-21 17:58+0000\n" +"X-Generator: Launchpad (build 2d1d5e352f0d063d660df2300e31f66bed027fa5)\n" "Language: zh_CN\n" #: ../Debconf/AutoSelect.pm:88 diff -Nru language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/debian-tasks.po language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/debian-tasks.po --- language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/debian-tasks.po 2020-07-10 08:58:54.000000000 +0000 +++ language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/debian-tasks.po 2021-01-22 11:31:21.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: 2020-07-09 18:12+0000\n" -"X-Generator: Launchpad (build 4809fcb62f445aaa3ae919f7f6c3cc7d156ea57a)\n" +"X-Launchpad-Export-Date: 2021-01-21 19:14+0000\n" +"X-Generator: Launchpad (build 2d1d5e352f0d063d660df2300e31f66bed027fa5)\n" "Language: \n" #. Description diff -Nru language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/debianutils.po language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/debianutils.po --- language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/debianutils.po 2020-07-10 08:58:48.000000000 +0000 +++ language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/debianutils.po 2021-01-22 11:31:16.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: 2020-07-09 17:01+0000\n" -"X-Generator: Launchpad (build 4809fcb62f445aaa3ae919f7f6c3cc7d156ea57a)\n" +"X-Launchpad-Export-Date: 2021-01-21 17:58+0000\n" +"X-Generator: Launchpad (build 2d1d5e352f0d063d660df2300e31f66bed027fa5)\n" #. type: TH #: ../add-shell.8:1 diff -Nru language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/desktop_kubuntu-driver-manager.po language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/desktop_kubuntu-driver-manager.po --- language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/desktop_kubuntu-driver-manager.po 2020-07-10 08:58:52.000000000 +0000 +++ language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/desktop_kubuntu-driver-manager.po 2021-01-22 11:31:19.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: 2020-07-09 19:47+0000\n" -"X-Generator: Launchpad (build 4809fcb62f445aaa3ae919f7f6c3cc7d156ea57a)\n" +"X-Launchpad-Export-Date: 2021-01-21 20:54+0000\n" +"X-Generator: Launchpad (build 2d1d5e352f0d063d660df2300e31f66bed027fa5)\n" #: src/kcm_driver_manager.desktop:11 msgctxt "X-KDE-Keywords" diff -Nru language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/desktop_kubuntu-notification-helper.po language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/desktop_kubuntu-notification-helper.po --- language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/desktop_kubuntu-notification-helper.po 2020-07-10 08:58:48.000000000 +0000 +++ language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/desktop_kubuntu-notification-helper.po 2021-01-22 11:31:16.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: 2020-07-09 19:16+0000\n" -"X-Generator: Launchpad (build 4809fcb62f445aaa3ae919f7f6c3cc7d156ea57a)\n" +"X-Launchpad-Export-Date: 2021-01-21 20:19+0000\n" +"X-Generator: Launchpad (build 2d1d5e352f0d063d660df2300e31f66bed027fa5)\n" #: src/daemon/notificationhelper.desktop:2 msgctxt "Name" diff -Nru language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/desktop_kubuntu-web-shortcuts.po language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/desktop_kubuntu-web-shortcuts.po --- language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/desktop_kubuntu-web-shortcuts.po 2020-07-10 08:58:50.000000000 +0000 +++ language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/desktop_kubuntu-web-shortcuts.po 2021-01-22 11:31:18.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: 2020-07-09 19:26+0000\n" -"X-Generator: Launchpad (build 4809fcb62f445aaa3ae919f7f6c3cc7d156ea57a)\n" +"X-Launchpad-Export-Date: 2021-01-21 20:31+0000\n" +"X-Generator: Launchpad (build 2d1d5e352f0d063d660df2300e31f66bed027fa5)\n" #: searchproviders/brainstorm.desktop:5 msgctxt "Name" diff -Nru language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/devscripts.po language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/devscripts.po --- language-pack-zh-hans-base-20.04+20200709/data/zh_CN/LC_MESSAGES/devscripts.po 2020-07-10 08:58:52.000000000 +0000 +++ language-pack-zh-hans-base-20.04+20210121/data/zh_CN/LC_MESSAGES/devscripts.po 2021-01-22 11:31:20.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: 2020-07-09 17:02+0000\n" -"X-Generator: Launchpad (build 4809fcb62f445aaa3ae919f7f6c3cc7d156ea57a)\n" +"X-Launchpad-Export-Date: 2021-01-21 17:59+0000\n" +"X-Generator: Launchpad (build 2d1d5e352f0d063d660df2300e31f66bed027fa5)\n" #. type: TH #: ../scripts/annotate-output.1:1 @@ -214,7 +214,7 @@ #: ../scripts/hardening-check.pl:589 ../scripts/list-unreleased.1:12 #: ../scripts/ltnu.pod:27 ../scripts/manpage-alert.1:12 #: ../scripts/mass-bug.pl:59 ../scripts/mk-build-deps.pl:44 -#: ../scripts/mk-origtargz.pl:62 ../scripts/nmudiff.1:24 +#: ../scripts/mk-origtargz.pl:64 ../scripts/nmudiff.1:24 #: ../scripts/origtargz.pl:96 ../scripts/plotchangelog.1:43 #: ../scripts/pts-subscribe.1:18 ../scripts/rc-alert.1:17 #: ../scripts/rmadison.pl:278 ../scripts/sadt.pod:42 ../scripts/salsa.pl:409 @@ -325,12 +325,12 @@ #. type: SH #: ../scripts/annotate-output.1:47 ../scripts/bts.pl:4346 -#: ../scripts/checkbashisms.1:63 ../scripts/cowpoke.1:379 +#: ../scripts/checkbashisms.1:66 ../scripts/cowpoke.1:379 #: ../scripts/cvs-debc.1:58 ../scripts/cvs-debi.1:62 #: ../scripts/cvs-debrelease.1:64 ../scripts/cvs-debuild.1:53 #: ../scripts/dcmd.1:107 ../scripts/debc.1:125 ../scripts/debchange.1:482 #: ../scripts/debcheckout.pl:231 ../scripts/debclean.1:110 -#: ../scripts/debcommit.pl:949 ../scripts/debdiff.1:234 +#: ../scripts/debcommit.pl:949 ../scripts/debdiff.1:238 #: ../scripts/debdiff-apply.1:111 ../scripts/debi.1:132 #: ../scripts/debrepro.pod:152 ../scripts/debrelease.1:132 #: ../scripts/deb-reversion.dbk:247 ../scripts/deb-why-removed.pl:247 @@ -341,11 +341,11 @@ #: ../scripts/dscverify.1:76 ../scripts/git-deborig.pl:79 #: ../scripts/grep-excuses.1:58 ../scripts/hardening-check.pl:676 #: ../scripts/list-unreleased.1:19 ../scripts/ltnu.pod:105 -#: ../scripts/mk-origtargz.pl:207 ../scripts/nmudiff.1:121 +#: ../scripts/mk-origtargz.pl:209 ../scripts/nmudiff.1:121 #: ../scripts/origtargz.pl:158 ../scripts/plotchangelog.1:124 #: ../scripts/pts-subscribe.1:51 ../scripts/rc-alert.1:121 -#: ../scripts/rmadison.pl:399 ../scripts/sadt.pod:69 ../scripts/salsa.pl:838 -#: ../scripts/tagpending.pl:149 ../scripts/uscan.pl:2070 +#: ../scripts/rmadison.pl:399 ../scripts/sadt.pod:69 ../scripts/salsa.pl:852 +#: ../scripts/tagpending.pl:149 ../scripts/uscan.pl:2101 #: ../scripts/uupdate.1:189 ../doc/what-patch.1:35 #: ../scripts/who-permits-upload.pl:167 ../scripts/wnpp-alert.1:29 #: ../scripts/wnpp-check.1:26 ../doc/devscripts.conf.5:54 @@ -374,13 +374,13 @@ #. type: SH #: ../scripts/annotate-output.1:55 ../scripts/archpath.1:54 -#: ../scripts/build-rdeps.pl:547 ../scripts/checkbashisms.1:65 +#: ../scripts/build-rdeps.pl:547 ../scripts/checkbashisms.1:68 #: ../scripts/cowpoke.1:385 ../scripts/cvs-debc.1:63 ../scripts/cvs-debi.1:67 #: ../scripts/cvs-debrelease.1:68 ../scripts/cvs-debuild.1:58 #: ../scripts/dcmd.1:110 ../scripts/dd-list.1:107 ../scripts/debc.1:129 #: ../scripts/debchange.1:488 ../scripts/debcheckout.pl:236 #: ../scripts/debclean.1:113 ../scripts/debcommit.pl:945 -#: ../scripts/debdiff.1:242 ../scripts/debi.1:135 ../scripts/debpkg.1:23 +#: ../scripts/debdiff.1:246 ../scripts/debi.1:135 ../scripts/debpkg.1:23 #: ../scripts/debrepro.pod:156 ../scripts/debrelease.1:136 #: ../scripts/deb-reversion.dbk:292 ../scripts/debrsign.1:70 #: ../scripts/debsign.1:144 ../scripts/debuild.1:459 @@ -392,12 +392,12 @@ #: ../scripts/hardening-check.pl:664 ../scripts/list-unreleased.1:21 #: ../scripts/manpage-alert.1:28 ../scripts/mass-bug.pl:566 #: ../scripts/mergechanges.1:28 ../scripts/mk-build-deps.pl:141 -#: ../scripts/mk-origtargz.pl:211 ../scripts/namecheck.pl:24 +#: ../scripts/mk-origtargz.pl:213 ../scripts/namecheck.pl:24 #: ../scripts/nmudiff.1:125 ../scripts/origtargz.pl:162 #: ../scripts/plotchangelog.1:126 ../scripts/pts-subscribe.1:56 -#: ../scripts/rc-alert.1:125 ../scripts/rmadison.pl:403 ../scripts/salsa.pl:842 +#: ../scripts/rc-alert.1:125 ../scripts/rmadison.pl:403 ../scripts/salsa.pl:856 #: ../scripts/svnpath.pl:96 ../scripts/transition-check.pl:81 -#: ../scripts/uscan.pl:2074 ../scripts/uupdate.1:196 ../scripts/whodepends.1:19 +#: ../scripts/uscan.pl:2105 ../scripts/uupdate.1:196 ../scripts/whodepends.1:19 #: ../scripts/who-uploads.1:71 ../scripts/who-permits-upload.pl:162 #: ../scripts/wnpp-alert.1:31 ../scripts/wnpp-check.1:36 #: ../doc/devscripts.conf.5:58 @@ -1066,19 +1066,19 @@ #. type: TP #: ../scripts/bts.pl:463 ../scripts/cvs-debrelease.1:57 #: ../scripts/cvs-debuild.1:38 ../scripts/debc.1:95 ../scripts/debchange.1:390 -#: ../scripts/debclean.1:80 ../scripts/debdiff.1:154 ../scripts/debi.1:102 +#: ../scripts/debclean.1:80 ../scripts/debdiff.1:158 ../scripts/debi.1:102 #: ../scripts/debrelease.1:95 ../scripts/debsign.1:95 ../scripts/debuild.1:258 #: ../scripts/dpkg-depcheck.1:92 ../scripts/dscverify.1:24 #: ../scripts/grep-excuses.1:15 ../scripts/mass-bug.pl:121 #: ../scripts/nmudiff.1:72 ../scripts/rmadison.pl:341 ../scripts/salsa.pl:454 -#: ../scripts/uscan.pl:1536 ../scripts/uupdate.1:56 ../scripts/who-uploads.1:40 +#: ../scripts/uscan.pl:1566 ../scripts/uupdate.1:56 ../scripts/who-uploads.1:40 #, no-wrap msgid "B<--no-conf>, B<--noconf>" msgstr "" #. type: Plain text #: ../scripts/bts.pl:465 ../scripts/cvs-debrelease.1:61 ../scripts/debc.1:99 -#: ../scripts/debchange.1:394 ../scripts/debclean.1:84 ../scripts/debdiff.1:158 +#: ../scripts/debchange.1:394 ../scripts/debclean.1:84 ../scripts/debdiff.1:162 #: ../scripts/debi.1:106 ../scripts/debrelease.1:99 ../scripts/debsign.1:99 #: ../scripts/debuild.1:262 ../scripts/dpkg-depcheck.1:96 #: ../scripts/dscverify.1:28 ../scripts/grep-excuses.1:19 @@ -2390,7 +2390,7 @@ #. type: SH #: ../scripts/bts.pl:4243 ../scripts/debc.1:102 ../scripts/debchange.1:405 #: ../scripts/debcheckout.pl:180 ../scripts/debclean.1:93 -#: ../scripts/debcommit.pl:104 ../scripts/debdiff.1:176 ../scripts/debi.1:109 +#: ../scripts/debcommit.pl:104 ../scripts/debdiff.1:180 ../scripts/debi.1:109 #: ../scripts/debrelease.1:105 ../scripts/debrsign.1:57 #: ../scripts/debsign.1:105 ../scripts/debuild.1:327 ../scripts/dget.pl:687 #: ../scripts/dpkg-depcheck.1:102 ../scripts/dscverify.1:43 @@ -2833,7 +2833,7 @@ #: ../scripts/debclean.1:87 ../scripts/diff2patches.1:22 #: ../scripts/grep-excuses.1:23 ../scripts/mass-bug.pl:126 #: ../scripts/nmudiff.1:86 ../scripts/plotchangelog.1:92 -#: ../scripts/uscan.pl:1745 +#: ../scripts/uscan.pl:1779 #, no-wrap msgid "B<--help>" msgstr "" @@ -2852,7 +2852,7 @@ #: ../scripts/dscverify.1:40 ../scripts/grep-excuses.1:26 #: ../scripts/mass-bug.pl:130 ../scripts/nmudiff.1:89 #: ../scripts/plotchangelog.1:95 ../scripts/pts-subscribe.1:31 -#: ../scripts/rmadison.pl:337 ../scripts/uscan.pl:1749 ../scripts/uupdate.1:104 +#: ../scripts/rmadison.pl:337 ../scripts/uscan.pl:1783 ../scripts/uupdate.1:104 #: ../scripts/who-uploads.1:47 #, no-wrap msgid "B<--version>" @@ -2962,7 +2962,7 @@ #. type: textblock #: ../scripts/chdist.pl:51 ../scripts/deb-reversion.dbk:239 -#: ../scripts/mass-bug.pl:132 ../scripts/uscan.pl:1751 +#: ../scripts/mass-bug.pl:132 ../scripts/uscan.pl:1785 msgid "Display version information." msgstr "" @@ -3196,7 +3196,7 @@ #. type: TP #: ../scripts/checkbashisms.1:24 ../scripts/debchange.1:399 -#: ../scripts/debdiff.1:164 ../scripts/debrelease.1:99 ../scripts/debsign.1:99 +#: ../scripts/debdiff.1:168 ../scripts/debrelease.1:99 ../scripts/debsign.1:99 #: ../scripts/dep3changelog.1:16 ../scripts/dscverify.1:37 #: ../scripts/pts-subscribe.1:28 ../scripts/rc-alert.1:21 #: ../scripts/uupdate.1:101 ../scripts/whodepends.1:11 @@ -3207,7 +3207,7 @@ msgstr "" #. type: Plain text -#: ../scripts/checkbashisms.1:27 ../scripts/debdiff.1:167 +#: ../scripts/checkbashisms.1:27 ../scripts/debdiff.1:171 #: ../scripts/manpage-alert.1:16 ../scripts/mk-build-deps.pl:113 #: ../scripts/rc-alert.1:24 ../scripts/wnpp-alert.1:26 #: ../scripts/wnpp-check.1:20 @@ -3270,7 +3270,7 @@ msgstr "" #. type: TP -#: ../scripts/checkbashisms.1:46 ../scripts/debdiff.1:167 +#: ../scripts/checkbashisms.1:49 ../scripts/debdiff.1:171 #: ../scripts/rc-alert.1:24 ../scripts/whodepends.1:14 #: ../scripts/wnpp-alert.1:26 ../scripts/wnpp-check.1:20 #, no-wrap @@ -3278,7 +3278,7 @@ msgstr "" #. type: Plain text -#: ../scripts/checkbashisms.1:49 ../scripts/debdiff.1:170 +#: ../scripts/checkbashisms.1:52 ../scripts/debdiff.1:174 #: ../scripts/getbuildlog.1:31 ../scripts/grep-excuses.1:29 #: ../scripts/manpage-alert.1:19 ../scripts/mk-build-deps.pl:117 #: ../scripts/rc-alert.1:27 ../scripts/whodepends.1:17 @@ -3287,61 +3287,61 @@ msgstr "" #. type: SH -#: ../scripts/checkbashisms.1:49 ../scripts/debdiff.1:230 +#: ../scripts/checkbashisms.1:52 ../scripts/debdiff.1:234 #, no-wrap msgid "EXIT VALUES" msgstr "" #. type: Plain text -#: ../scripts/checkbashisms.1:53 +#: ../scripts/checkbashisms.1:56 msgid "" "The exit value will be 0 if no possible bashisms or other problems were " "detected. Otherwise it will be the sum of the following error values:" msgstr "" #. type: TP -#: ../scripts/checkbashisms.1:53 ../scripts/dscextract.1:24 +#: ../scripts/checkbashisms.1:56 ../scripts/dscextract.1:24 #: ../scripts/wnpp-check.1:32 #, no-wrap msgid "1" msgstr "" #. type: Plain text -#: ../scripts/checkbashisms.1:56 +#: ../scripts/checkbashisms.1:59 msgid "A possible bashism was detected." msgstr "" #. type: TP -#: ../scripts/checkbashisms.1:56 ../scripts/dscextract.1:27 +#: ../scripts/checkbashisms.1:59 ../scripts/dscextract.1:27 #, no-wrap msgid "2" msgstr "" #. type: Plain text -#: ../scripts/checkbashisms.1:60 +#: ../scripts/checkbashisms.1:63 msgid "" "A file was skipped for some reason, for example, because it was unreadable " "or not found. The warning message will give details." msgstr "" #. type: TP -#: ../scripts/checkbashisms.1:60 +#: ../scripts/checkbashisms.1:63 #, no-wrap msgid "4" msgstr "" #. type: Plain text -#: ../scripts/checkbashisms.1:63 +#: ../scripts/checkbashisms.1:66 msgid "No bashisms were detected in a bash script." msgstr "" #. type: Plain text -#: ../scripts/checkbashisms.1:65 +#: ../scripts/checkbashisms.1:68 msgid "B(1)" msgstr "" #. type: Plain text -#: ../scripts/checkbashisms.1:68 +#: ../scripts/checkbashisms.1:71 msgid "" "B was originally written as a shell script by Yann Dirson " "EIE and rewritten in Perl with many more features " @@ -5125,7 +5125,7 @@ #. type: =head2 #: ../scripts/debc.1:28 ../scripts/debchange.1:109 ../scripts/debclean.1:27 #: ../scripts/debi.1:29 ../scripts/debrelease.1:20 ../scripts/debuild.1:51 -#: ../scripts/uscan.pl:1956 +#: ../scripts/uscan.pl:1986 #, no-wrap msgid "Directory name checking" msgstr "" @@ -5147,14 +5147,14 @@ #. type: textblock #: ../scripts/debc.1:41 ../scripts/debchange.1:122 ../scripts/debclean.1:40 #: ../scripts/debi.1:42 ../scripts/debrelease.1:33 ../scripts/debuild.1:65 -#: ../scripts/uscan.pl:1971 +#: ../scripts/uscan.pl:2001 msgid "B can take the following values:" msgstr "" #. type: =item #: ../scripts/debc.1:41 ../scripts/debchange.1:122 ../scripts/debclean.1:40 #: ../scripts/debi.1:42 ../scripts/debrelease.1:33 ../scripts/debuild.1:65 -#: ../scripts/uscan.pl:1898 ../scripts/uscan.pl:1975 +#: ../scripts/uscan.pl:1932 ../scripts/uscan.pl:2005 #, no-wrap msgid "B<0>" msgstr "" @@ -5162,14 +5162,14 @@ #. type: textblock #: ../scripts/debc.1:44 ../scripts/debchange.1:125 ../scripts/debclean.1:43 #: ../scripts/debi.1:45 ../scripts/debrelease.1:36 ../scripts/debuild.1:68 -#: ../scripts/uscan.pl:1977 +#: ../scripts/uscan.pl:2007 msgid "Never check the directory name." msgstr "" #. type: =item #: ../scripts/debc.1:44 ../scripts/debchange.1:125 ../scripts/debclean.1:43 #: ../scripts/debi.1:45 ../scripts/debrelease.1:36 ../scripts/debuild.1:68 -#: ../scripts/uscan.pl:1903 ../scripts/uscan.pl:1979 +#: ../scripts/uscan.pl:1937 ../scripts/uscan.pl:2009 #, no-wrap msgid "B<1>" msgstr "" @@ -5185,7 +5185,7 @@ #. type: =item #: ../scripts/debc.1:48 ../scripts/debchange.1:129 ../scripts/debclean.1:47 #: ../scripts/debi.1:49 ../scripts/debrelease.1:40 ../scripts/debuild.1:72 -#: ../scripts/uscan.pl:1986 +#: ../scripts/uscan.pl:2016 #, no-wrap msgid "B<2>" msgstr "" @@ -5193,7 +5193,7 @@ #. type: textblock #: ../scripts/debc.1:51 ../scripts/debchange.1:132 ../scripts/debclean.1:50 #: ../scripts/debi.1:52 ../scripts/debrelease.1:43 ../scripts/debuild.1:75 -#: ../scripts/uscan.pl:1988 +#: ../scripts/uscan.pl:2018 msgid "Always check the directory name." msgstr "" @@ -5215,7 +5215,7 @@ msgstr "" #. type: TP -#: ../scripts/debc.1:71 ../scripts/debdiff.1:158 ../scripts/debi.1:72 +#: ../scripts/debc.1:71 ../scripts/debdiff.1:162 ../scripts/debi.1:72 #: ../scripts/debrelease.1:81 #, no-wrap msgid "B<--debs-dir> I" @@ -5232,7 +5232,7 @@ #. type: =item #: ../scripts/debc.1:77 ../scripts/debchange.1:382 ../scripts/debclean.1:72 #: ../scripts/debi.1:87 ../scripts/debrelease.1:87 ../scripts/debuild.1:313 -#: ../scripts/uscan.pl:1626 +#: ../scripts/uscan.pl:1660 #, no-wrap msgid "B<--check-dirname-level> I" msgstr "" @@ -5250,7 +5250,7 @@ #. type: =item #: ../scripts/debc.1:81 ../scripts/debchange.1:386 ../scripts/debclean.1:76 #: ../scripts/debi.1:91 ../scripts/debrelease.1:91 ../scripts/debuild.1:317 -#: ../scripts/uscan.pl:1630 +#: ../scripts/uscan.pl:1664 #, no-wrap msgid "B<--check-dirname-regex> I" msgstr "" @@ -5298,7 +5298,7 @@ msgstr "" #. type: TP -#: ../scripts/debc.1:108 ../scripts/debdiff.1:220 ../scripts/debi.1:115 +#: ../scripts/debc.1:108 ../scripts/debdiff.1:224 ../scripts/debi.1:115 #: ../scripts/debrelease.1:116 ../scripts/debsign.1:123 #, no-wrap msgid "B" @@ -5668,8 +5668,8 @@ msgstr "" #. type: =item -#: ../scripts/debchange.1:218 ../scripts/mk-origtargz.pl:70 -#: ../scripts/uscan.pl:1657 +#: ../scripts/debchange.1:218 ../scripts/mk-origtargz.pl:72 +#: ../scripts/uscan.pl:1691 #, no-wrap msgid "B<--package> I" msgstr "" @@ -7160,7 +7160,7 @@ msgstr "" #. type: =item -#: ../scripts/debcommit.pl:158 ../scripts/uscan.pl:376 +#: ../scripts/debcommit.pl:158 ../scripts/uscan.pl:397 msgid "B" msgstr "" @@ -7480,7 +7480,7 @@ msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:120 ../scripts/debdiff.1:137 +#: ../scripts/debdiff.1:120 ../scripts/debdiff.1:141 msgid "" "The default behaviour; can be used to override a configuration file setting." msgstr "" @@ -7514,41 +7514,41 @@ msgstr "" #. type: TP -#: ../scripts/debdiff.1:130 +#: ../scripts/debdiff.1:134 #, no-wrap msgid "B<--diffstat>" msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:133 +#: ../scripts/debdiff.1:137 msgid "Include the result of B before the generated diff." msgstr "" #. type: TP -#: ../scripts/debdiff.1:133 +#: ../scripts/debdiff.1:137 #, no-wrap msgid "B<--no-diffstat>" msgstr "" #. type: TP -#: ../scripts/debdiff.1:137 +#: ../scripts/debdiff.1:141 #, no-wrap msgid "B<--auto-ver-sort>" msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:140 +#: ../scripts/debdiff.1:144 msgid "When comparing source packages, do so in version order." msgstr "" #. type: TP -#: ../scripts/debdiff.1:140 +#: ../scripts/debdiff.1:144 #, no-wrap msgid "B<--no-auto-ver-sort>" msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:146 +#: ../scripts/debdiff.1:150 msgid "" "Compare source packages in the order they were passed on the command-line, " "even if that means comparing a package with a higher version against one " @@ -7556,13 +7556,13 @@ msgstr "" #. type: TP -#: ../scripts/debdiff.1:146 +#: ../scripts/debdiff.1:150 #, no-wrap msgid "B<--unpack-tarballs>" msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:151 +#: ../scripts/debdiff.1:155 msgid "" "When comparing source packages, also unpack tarballs found in the top level " "source directory to compare their contents along with the other files. This " @@ -7570,18 +7570,18 @@ msgstr "" #. type: TP -#: ../scripts/debdiff.1:151 +#: ../scripts/debdiff.1:155 #, no-wrap msgid "B<--no-unpack-tarballs>" msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:154 +#: ../scripts/debdiff.1:158 msgid "Do not unpack tarballs inside source packages." msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:164 +#: ../scripts/debdiff.1:168 msgid "" "Look for the I<.dsc> files in I instead of the parent of the " "source directory. This should either be an absolute path or relative to the " @@ -7589,29 +7589,29 @@ msgstr "" #. type: =item -#: ../scripts/debdiff.1:170 ../scripts/hardening-check.pl:617 +#: ../scripts/debdiff.1:174 ../scripts/hardening-check.pl:617 #, no-wrap msgid "B<--quiet>, B<-q>" msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:173 +#: ../scripts/debdiff.1:177 msgid "Be quiet if no differences were found." msgstr "" #. type: TP -#: ../scripts/debdiff.1:173 +#: ../scripts/debdiff.1:177 #, no-wrap msgid "B<--ignore-space>, B<-w>" msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:176 +#: ../scripts/debdiff.1:180 msgid "Ignore whitespace in diffs." msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:182 +#: ../scripts/debdiff.1:186 msgid "" "The two configuration files I and I<~/.devscripts> are " "sourced by a shell in that order to set configuration variables. Command " @@ -7621,124 +7621,124 @@ msgstr "" #. type: TP -#: ../scripts/debdiff.1:182 +#: ../scripts/debdiff.1:186 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:186 +#: ../scripts/debdiff.1:190 msgid "" "If this is set to I, then it is the same as the B<--dirs> command line " "parameter being used." msgstr "" #. type: TP -#: ../scripts/debdiff.1:186 +#: ../scripts/debdiff.1:190 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:191 +#: ../scripts/debdiff.1:195 msgid "" "If this is set to I, then it is the same as the B<--nocontrol> command " "line parameter being used. The default is I." msgstr "" #. type: TP -#: ../scripts/debdiff.1:191 +#: ../scripts/debdiff.1:195 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:196 +#: ../scripts/debdiff.1:200 msgid "" "Which control files to compare, corresponding to the B<--controlfiles> " "command line option. The default is I." msgstr "" #. type: TP -#: ../scripts/debdiff.1:196 +#: ../scripts/debdiff.1:200 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:200 +#: ../scripts/debdiff.1:204 msgid "" "If this is set to I, then it is the same as the B<--show-moved> command " "line parameter being used." msgstr "" #. type: TP -#: ../scripts/debdiff.1:200 +#: ../scripts/debdiff.1:204 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:204 +#: ../scripts/debdiff.1:208 msgid "" "This option will be passed to B; it should be one of B<-p>, B<-l> or " "B<-t>." msgstr "" #. type: TP -#: ../scripts/debdiff.1:204 +#: ../scripts/debdiff.1:208 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:208 +#: ../scripts/debdiff.1:212 msgid "" "If this is set to I, then it is the same as the B<--diffstat> command " "line parameter being used." msgstr "" #. type: TP -#: ../scripts/debdiff.1:208 +#: ../scripts/debdiff.1:212 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:212 +#: ../scripts/debdiff.1:216 msgid "" "If this is set to I, then it is the same as the B<--wdiff-source-" "control> command line parameter being used." msgstr "" #. type: TP -#: ../scripts/debdiff.1:212 +#: ../scripts/debdiff.1:216 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:216 +#: ../scripts/debdiff.1:220 msgid "" "If this is set to I, then it is the same as the B<--auto-ver-sort> " "command line parameter being used." msgstr "" #. type: TP -#: ../scripts/debdiff.1:216 +#: ../scripts/debdiff.1:220 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:220 +#: ../scripts/debdiff.1:224 msgid "" "If this is set to I, then it is the same as the B<--no-unpack-tarballs> " "command line parameter being used." msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:230 +#: ../scripts/debdiff.1:234 msgid "" "This specifies the directory in which to look for the I<.dsc> and files, and " "is either an absolute path or relative to the top of the source tree. This " @@ -7749,21 +7749,21 @@ msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:234 +#: ../scripts/debdiff.1:238 msgid "" "Normally the exit value will be 0 if no differences are reported and 1 if " "any are reported. If there is some fatal error, the exit code will be 255." msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:242 +#: ../scripts/debdiff.1:246 msgid "" "B(1), B(1), B(1), B(1), " "B(1), B(5), B(1)" msgstr "" #. type: Plain text -#: ../scripts/debdiff.1:247 +#: ../scripts/debdiff.1:251 msgid "" "B was originally written as a shell script by Yann Dirson " "Edirson@debian.orgE and rewritten in Perl with many more features by " @@ -8429,7 +8429,7 @@ #. type: SH #: ../scripts/debrepro.pod:125 ../scripts/debsnap.1:102 #: ../scripts/dscextract.1:20 ../scripts/transition-check.pl:54 -#: ../scripts/uscan.pl:1890 ../scripts/wnpp-check.1:28 +#: ../scripts/uscan.pl:1924 ../scripts/wnpp-check.1:28 #, no-wrap msgid "EXIT STATUS" msgstr "" @@ -10996,26 +10996,26 @@ msgstr "" #. type: IP -#: ../doc/devscripts.1:55 +#: ../doc/devscripts.1:57 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:57 +#: ../doc/devscripts.1:59 msgid "" "List contents of current package. Do this after a successful \"debuild\" to " "see if the package looks all right." msgstr "" #. type: IP -#: ../doc/devscripts.1:57 +#: ../doc/devscripts.1:59 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:59 +#: ../doc/devscripts.1:61 msgid "" "Modifies debian/changelog and manages version numbers for you. It will " "either increment the version number or add an entry for the current version, " @@ -11024,24 +11024,24 @@ msgstr "" #. type: IP -#: ../doc/devscripts.1:59 +#: ../doc/devscripts.1:61 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:61 +#: ../doc/devscripts.1:63 msgid "checkout the development repository of a Debian package. *" msgstr "" #. type: IP -#: ../doc/devscripts.1:61 +#: ../doc/devscripts.1:63 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:63 +#: ../doc/devscripts.1:65 msgid "" "Clean a Debian source tree. Debclean will clean all Debian source trees " "below the current directory, and if requested, also remove all files that " @@ -11051,13 +11051,13 @@ msgstr "" #. type: IP -#: ../doc/devscripts.1:63 +#: ../doc/devscripts.1:65 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:65 +#: ../doc/devscripts.1:67 msgid "" "Commits changes to cvs, darcs, svn, svk, tla, bzr, git, or hg, using new " "entries in debian/changelog as the commit message. Also supports tagging " @@ -11066,13 +11066,13 @@ msgstr "" #. type: IP -#: ../doc/devscripts.1:65 +#: ../doc/devscripts.1:67 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:67 +#: ../doc/devscripts.1:69 msgid "" "A program which examines two .deb files or two .changes files and reports on " "any difference found in their file lists. Useful for ensuring that no files " @@ -11082,13 +11082,13 @@ msgstr "" #. type: IP -#: ../doc/devscripts.1:67 +#: ../doc/devscripts.1:69 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:69 +#: ../doc/devscripts.1:71 msgid "" "Apply unified diffs of two Debian source packages, such as those generated " "by debdiff, to a target Debian source package. Any changes to " @@ -11099,13 +11099,13 @@ msgstr "" #. type: IP -#: ../doc/devscripts.1:69 +#: ../doc/devscripts.1:71 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:71 +#: ../doc/devscripts.1:73 msgid "" "Installs the current package by using the setuid root debpkg script " "described below. It assumes that the current package has just been built " @@ -11116,13 +11116,13 @@ msgstr "" #. type: IP -#: ../doc/devscripts.1:71 +#: ../doc/devscripts.1:73 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:73 +#: ../doc/devscripts.1:75 msgid "" "A wrapper for dpkg used by debi to allow convenient testing of packages. " "For debpkg to work, it needs to be made setuid root, and this needs to be " @@ -11136,13 +11136,13 @@ msgstr "" #. type: IP -#: ../doc/devscripts.1:73 +#: ../doc/devscripts.1:75 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:75 +#: ../doc/devscripts.1:77 msgid "" "A wrapper around dupload or dput which figures out which version to upload, " "and then calls dupload or dput to actually perform the upload. [dupload | " @@ -11150,13 +11150,13 @@ msgstr "" #. type: IP -#: ../doc/devscripts.1:77 +#: ../doc/devscripts.1:79 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:79 +#: ../doc/devscripts.1:81 msgid "" "A script that tests reproducibility of Debian packages. It will build a " "given source directory twice, with a set of variation between the first and " @@ -11167,13 +11167,13 @@ msgstr "" #. type: IP -#: ../doc/devscripts.1:79 +#: ../doc/devscripts.1:81 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:81 +#: ../doc/devscripts.1:83 msgid "" "This transfers a .changes/.dsc pair to a remote machine for signing, and " "runs debsign on the remote machine over an SSH connection. [gnupg | gnupg2, " @@ -11181,13 +11181,13 @@ msgstr "" #. type: IP -#: ../doc/devscripts.1:81 +#: ../doc/devscripts.1:83 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:83 +#: ../doc/devscripts.1:85 msgid "" "Use GNU Privacy Guard to sign the changes (and possibly dsc) files created " "by running dpkg-buildpackage with no-sign options. Useful if you are " @@ -11197,25 +11197,25 @@ msgstr "" #. type: IP -#: ../doc/devscripts.1:83 +#: ../doc/devscripts.1:85 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:85 +#: ../doc/devscripts.1:87 msgid "" "grab packages from https://snapshot.debian.org [libwww-perl, libjson-perl]" msgstr "" #. type: IP -#: ../doc/devscripts.1:85 +#: ../doc/devscripts.1:87 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:87 +#: ../doc/devscripts.1:89 msgid "" "A wrapper for building a package (i.e., dpkg-buildpackage) to avoid problems " "with insufficient permissions and wrong paths etc. Debuild will set up the " @@ -11229,62 +11229,62 @@ msgstr "" #. type: IP -#: ../doc/devscripts.1:87 +#: ../doc/devscripts.1:89 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:89 +#: ../doc/devscripts.1:91 msgid "" "increases a binary package version number and repacks the package, useful " "for porters and the like." msgstr "" #. type: IP -#: ../doc/devscripts.1:89 +#: ../doc/devscripts.1:91 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:91 +#: ../doc/devscripts.1:93 msgid "" "shows the reason a package was removed from the archive. [libdpkg-perl]" msgstr "" #. type: IP -#: ../doc/devscripts.1:91 +#: ../doc/devscripts.1:93 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:93 +#: ../doc/devscripts.1:95 msgid "generate a changelog entry from a DEP3-style patch header." msgstr "" #. type: IP -#: ../doc/devscripts.1:93 +#: ../doc/devscripts.1:95 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:95 +#: ../doc/devscripts.1:97 msgid "" "given a freedesktop.org desktop file, generate a skeleton for a menu file. " "[libfile-desktopentry-perl]" msgstr "" #. type: IP -#: ../doc/devscripts.1:95 +#: ../doc/devscripts.1:97 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:97 +#: ../doc/devscripts.1:99 msgid "" "Downloads Debian source and binary packages. Point at a .changes or .dsc to " "download all references files. Specify a package name to download it from " @@ -11292,26 +11292,26 @@ msgstr "" #. type: IP -#: ../doc/devscripts.1:97 +#: ../doc/devscripts.1:99 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:99 +#: ../doc/devscripts.1:101 msgid "" "extracts patches from a .diff.gz file placing them under debian/ or, if " "present, debian/patches. [patchutils]" msgstr "" #. type: IP -#: ../doc/devscripts.1:99 +#: ../doc/devscripts.1:101 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:101 +#: ../doc/devscripts.1:103 msgid "" "Runs a specified command (such as debian/rules build) or dpkg-buildpackage, " "respectively, to determine the packages used during the build process. This " @@ -11321,61 +11321,61 @@ msgstr "" #. type: IP -#: ../doc/devscripts.1:101 +#: ../doc/devscripts.1:103 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:103 +#: ../doc/devscripts.1:105 msgid "extract a single file from a Debian source package. [patchutils]" msgstr "" #. type: IP -#: ../doc/devscripts.1:103 +#: ../doc/devscripts.1:105 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:105 +#: ../doc/devscripts.1:107 msgid "" "check the signature and MD5 sums of a dsc file against the most current " "Debian keyring on your system. [gnupg | gnupg2, debian-keyring]" msgstr "" #. type: IP -#: ../doc/devscripts.1:105 +#: ../doc/devscripts.1:107 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:107 +#: ../doc/devscripts.1:109 msgid "" "add/edit a patch for a source package and commit the changes. [quilt | " "dpatch | cdbs]" msgstr "" #. type: IP -#: ../doc/devscripts.1:107 +#: ../doc/devscripts.1:109 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:109 +#: ../doc/devscripts.1:111 msgid "download package build logs from Debian auto-builders. [wget]" msgstr "" #. type: IP -#: ../doc/devscripts.1:109 +#: ../doc/devscripts.1:111 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:111 +#: ../doc/devscripts.1:113 msgid "" "try to produce Debian orig.tar using git-archive(1). [libdpkg-perl, libgit-" "wrapper-perl, liblist-compare-perl, libstring-shellquote-perl, libtry-tiny-" @@ -11383,96 +11383,96 @@ msgstr "" #. type: IP -#: ../doc/devscripts.1:111 +#: ../doc/devscripts.1:113 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:113 +#: ../doc/devscripts.1:115 msgid "" "grep britney's excuses to find out what is happening to your packages. " "[libdbd-pg-perl, libterm-size-perl, libyaml-syck-perl, wget, w3m]" msgstr "" #. type: IP -#: ../doc/devscripts.1:113 +#: ../doc/devscripts.1:115 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:115 +#: ../doc/devscripts.1:117 msgid "report the hardening characteristics of a set of binaries." msgstr "" #. type: IP -#: ../doc/devscripts.1:115 +#: ../doc/devscripts.1:117 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:117 +#: ../doc/devscripts.1:119 msgid "searches for packages marked UNRELEASED in their changelog." msgstr "" #. type: IP -#: ../doc/devscripts.1:117 +#: ../doc/devscripts.1:119 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:119 +#: ../doc/devscripts.1:121 msgid "" "List all uploads of packages by the given uploader or maintainer and display " "them ordered by the last upload of that package, oldest uploads first." msgstr "" #. type: IP -#: ../doc/devscripts.1:119 +#: ../doc/devscripts.1:121 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:121 +#: ../doc/devscripts.1:123 msgid "locate binaries without corresponding manpages. [man-db]" msgstr "" #. type: IP -#: ../doc/devscripts.1:121 +#: ../doc/devscripts.1:123 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:123 +#: ../doc/devscripts.1:125 msgid "mass-file bug reports. [bsd-mailx | mailx]" msgstr "" #. type: IP -#: ../doc/devscripts.1:123 +#: ../doc/devscripts.1:125 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:125 +#: ../doc/devscripts.1:127 msgid "" "merge .changes files from the same release but built on different " "architectures." msgstr "" #. type: IP -#: ../doc/devscripts.1:125 +#: ../doc/devscripts.1:127 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:127 +#: ../doc/devscripts.1:129 msgid "" "Given a package name and/or control file, generate a binary package which " "may be installed to satisfy the build-dependencies of the given package. " @@ -11480,37 +11480,37 @@ msgstr "" #. type: IP -#: ../doc/devscripts.1:127 +#: ../doc/devscripts.1:129 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:129 +#: ../doc/devscripts.1:131 msgid "" "Rename upstream tarball, optionally changing the compression and removing " "unwanted files. [libfile-which-perl, unzip, xz-utils, file]" msgstr "" #. type: IP -#: ../doc/devscripts.1:129 +#: ../doc/devscripts.1:131 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:131 +#: ../doc/devscripts.1:133 msgid "Check project names are not already taken." msgstr "" #. type: IP -#: ../doc/devscripts.1:131 +#: ../doc/devscripts.1:133 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:133 +#: ../doc/devscripts.1:135 msgid "" "prepare a diff of this version (presumably an NMU against the previously " "released version (as per the changelog) and submit the diff to the BTS. " @@ -11518,7 +11518,7 @@ msgstr "" #. type: IP -#: ../doc/devscripts.1:133 +#: ../doc/devscripts.1:135 #, no-wrap msgid "I(1)" msgstr "" @@ -11531,99 +11531,99 @@ msgstr "" #. type: IP -#: ../doc/devscripts.1:135 +#: ../doc/devscripts.1:137 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:137 +#: ../doc/devscripts.1:139 msgid "" "display information from a changelog graphically using gnuplot. [libtimedate-" "perl, gnuplot]" msgstr "" #. type: IP -#: ../doc/devscripts.1:137 +#: ../doc/devscripts.1:139 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:139 +#: ../doc/devscripts.1:141 msgid "" "subscribe to the PTS (Package Tracking System) for a limited period of time. " "[bsd-mailx | mailx, at]" msgstr "" #. type: IP -#: ../doc/devscripts.1:139 +#: ../doc/devscripts.1:141 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:141 +#: ../doc/devscripts.1:143 msgid "" "list installed packages which have release-critical bugs. [wget | curl]" msgstr "" #. type: IP -#: ../doc/devscripts.1:143 +#: ../doc/devscripts.1:145 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:145 +#: ../doc/devscripts.1:147 msgid "" "remotely query the Debian archive database about packages. [liburi-perl, " "wget | curl]" msgstr "" #. type: IP -#: ../doc/devscripts.1:145 +#: ../doc/devscripts.1:147 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:147 +#: ../doc/devscripts.1:149 msgid "run DEP-8 tests. [python3-debian]" msgstr "" #. type: IP -#: ../doc/devscripts.1:147 +#: ../doc/devscripts.1:149 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:149 +#: ../doc/devscripts.1:151 msgid "" "manipulates salsa.debian.org repositories and users [libgitlab-api-v4-perl]" msgstr "" #. type: IP -#: ../doc/devscripts.1:149 +#: ../doc/devscripts.1:151 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:151 +#: ../doc/devscripts.1:153 msgid "" "output a list of files which are not common source files. [python3-magic]" msgstr "" #. type: IP -#: ../doc/devscripts.1:151 +#: ../doc/devscripts.1:153 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:153 +#: ../doc/devscripts.1:155 msgid "" "Prints the path to the Subversion repository of a Subversion checkout. Also " "supports calculating the paths for branches and tags in a repository " @@ -11631,33 +11631,33 @@ msgstr "" #. type: IP -#: ../doc/devscripts.1:153 +#: ../doc/devscripts.1:155 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:155 +#: ../doc/devscripts.1:157 msgid "" "runs from a Debian source tree and tags bugs that are to be closed in the " "latest changelog as pending. [libsoap-lite-perl]" msgstr "" #. type: IP -#: ../doc/devscripts.1:155 +#: ../doc/devscripts.1:157 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:157 +#: ../doc/devscripts.1:159 msgid "" "Check a list of source packages for involvement in transitions for which " "uploads to unstable are currently blocked. [libwww-perl, libyaml-syck-perl]" msgstr "" #. type: IP -#: ../doc/devscripts.1:157 +#: ../doc/devscripts.1:159 #, no-wrap msgid "I(1)" msgstr "" @@ -11675,13 +11675,13 @@ msgstr "" #. type: IP -#: ../doc/devscripts.1:159 +#: ../doc/devscripts.1:161 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:161 +#: ../doc/devscripts.1:163 msgid "" "Update the package with an archive or patches from an upstream author. This " "will be of help if you have to update your package. It will try to apply " @@ -11689,87 +11689,87 @@ msgstr "" #. type: IP -#: ../doc/devscripts.1:161 +#: ../doc/devscripts.1:163 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:163 +#: ../doc/devscripts.1:165 msgid "" "determine what patch system, if any, a source package is using. [patchutils]" msgstr "" #. type: IP -#: ../doc/devscripts.1:163 +#: ../doc/devscripts.1:165 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:165 +#: ../doc/devscripts.1:167 msgid "check which maintainers' packages depend on a package." msgstr "" #. type: IP -#: ../doc/devscripts.1:165 +#: ../doc/devscripts.1:167 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:167 +#: ../doc/devscripts.1:169 msgid "" "Retrieve information about Debian Maintainer access control lists. [gnupg | " "gnupg2, libencode-locale-perl, libwww-perl, debian-keyring]" msgstr "" #. type: IP -#: ../doc/devscripts.1:167 +#: ../doc/devscripts.1:169 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:169 +#: ../doc/devscripts.1:171 msgid "" "determine the most recent uploaders of a package to the Debian archive. " "[gnupg | gnupg2, debian-keyring, debian-maintainers, wget]" msgstr "" #. type: IP -#: ../doc/devscripts.1:169 +#: ../doc/devscripts.1:171 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:171 +#: ../doc/devscripts.1:173 msgid "" "list installed packages which are orphaned or up for adoption. [wget | curl]" msgstr "" #. type: IP -#: ../doc/devscripts.1:171 +#: ../doc/devscripts.1:173 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:173 +#: ../doc/devscripts.1:175 msgid "" "check whether there is an open request for packaging or intention to package " "bug for a package. [wget | curl]" msgstr "" #. type: IP -#: ../doc/devscripts.1:173 +#: ../doc/devscripts.1:175 #, no-wrap msgid "I(1)" msgstr "" #. type: Plain text -#: ../doc/devscripts.1:174 +#: ../doc/devscripts.1:176 msgid "wrap long lines and sort items in packaging files. [python3-debian]" msgstr "" @@ -13426,7 +13426,7 @@ msgstr "" #. type: =item -#: ../scripts/hardening-check.pl:621 ../scripts/uscan.pl:1545 +#: ../scripts/hardening-check.pl:621 ../scripts/uscan.pl:1575 msgid "B<--verbose>, B<-v>" msgstr "" @@ -13523,7 +13523,7 @@ msgstr "" #. type: =head1 -#: ../scripts/hardening-check.pl:668 ../scripts/salsa.pl:846 +#: ../scripts/hardening-check.pl:668 ../scripts/salsa.pl:860 msgid "COPYRIGHT AND LICENSE" msgstr "" @@ -14381,7 +14381,7 @@ msgstr "" #. type: textblock -#: ../scripts/mk-origtargz.pl:51 +#: ../scripts/mk-origtargz.pl:53 msgid "" "The archive type for B is detected by \"B\" command. So any B type archives such as B are " @@ -14390,32 +14390,32 @@ msgstr "" #. type: textblock -#: ../scripts/mk-origtargz.pl:56 +#: ../scripts/mk-origtargz.pl:58 msgid "" "If the package name is given via the B<--package> option, no information is " "read from F, and the result file is placed in the current directory." msgstr "" #. type: textblock -#: ../scripts/mk-origtargz.pl:59 +#: ../scripts/mk-origtargz.pl:61 msgid "" "B is commonly called via B, which first obtains the " "upstream tarball." msgstr "" #. type: =head2 -#: ../scripts/mk-origtargz.pl:64 +#: ../scripts/mk-origtargz.pl:66 msgid "Metadata options" msgstr "" #. type: textblock -#: ../scripts/mk-origtargz.pl:66 +#: ../scripts/mk-origtargz.pl:68 msgid "" "The following options extend or replace information taken from F." msgstr "" #. type: textblock -#: ../scripts/mk-origtargz.pl:72 +#: ../scripts/mk-origtargz.pl:74 msgid "" "Use I as the name of the Debian source package, and do not require " "or use a F directory. This option can only be used together with B<-" @@ -14423,50 +14423,50 @@ msgstr "" #. type: textblock -#: ../scripts/mk-origtargz.pl:76 +#: ../scripts/mk-origtargz.pl:78 msgid "" "The default is to use the package name of the first entry in " "F." msgstr "" #. type: =item -#: ../scripts/mk-origtargz.pl:78 +#: ../scripts/mk-origtargz.pl:80 msgid "B<-v>, B<--version> I" msgstr "" #. type: textblock -#: ../scripts/mk-origtargz.pl:80 +#: ../scripts/mk-origtargz.pl:82 msgid "" "Use I as the version of the package. This needs to be the upstream " "version portion of a full Debian version, i.e. no Debian revision, no epoch." msgstr "" #. type: textblock -#: ../scripts/mk-origtargz.pl:83 +#: ../scripts/mk-origtargz.pl:85 msgid "" "The default is to use the upstream portion of the version of the first entry " "in F." msgstr "" #. type: =item -#: ../scripts/mk-origtargz.pl:86 +#: ../scripts/mk-origtargz.pl:88 msgid "B<--exclude-file> I" msgstr "" #. type: textblock -#: ../scripts/mk-origtargz.pl:88 +#: ../scripts/mk-origtargz.pl:90 msgid "" "Remove files matching the given I from the tarball, as if it was " "listed in B." msgstr "" #. type: =item -#: ../scripts/mk-origtargz.pl:91 +#: ../scripts/mk-origtargz.pl:93 msgid "B<--copyright-file> I" msgstr "" #. type: textblock -#: ../scripts/mk-origtargz.pl:93 +#: ../scripts/mk-origtargz.pl:95 msgid "" "Remove files matching the patterns found in I, which should have " "the format of a Debian F file (B and B<--copyright-file> options amend the list of " "patterns found in F. If you do not want to read that file, " @@ -14492,42 +14492,42 @@ msgstr "" #. type: =item -#: ../scripts/mk-origtargz.pl:107 +#: ../scripts/mk-origtargz.pl:109 msgid "B<--signature> I" msgstr "" #. type: textblock -#: ../scripts/mk-origtargz.pl:109 +#: ../scripts/mk-origtargz.pl:111 msgid "Set I:" msgstr "" #. type: =item -#: ../scripts/mk-origtargz.pl:113 +#: ../scripts/mk-origtargz.pl:115 msgid "0 for no signature" msgstr "" #. type: =item -#: ../scripts/mk-origtargz.pl:115 +#: ../scripts/mk-origtargz.pl:117 msgid "1 for normal detached signature" msgstr "" #. type: =item -#: ../scripts/mk-origtargz.pl:117 +#: ../scripts/mk-origtargz.pl:119 msgid "2 for signature on decompressed" msgstr "" #. type: =item -#: ../scripts/mk-origtargz.pl:119 +#: ../scripts/mk-origtargz.pl:121 msgid "3 for self signature" msgstr "" #. type: =item -#: ../scripts/mk-origtargz.pl:123 +#: ../scripts/mk-origtargz.pl:125 msgid "B<--signature-file> I" msgstr "" #. type: textblock -#: ../scripts/mk-origtargz.pl:125 +#: ../scripts/mk-origtargz.pl:127 msgid "" "Use I as the signature file corresponding to the Debian " "source package to create a B (post-stretch) compatible " @@ -14535,31 +14535,31 @@ msgstr "" #. type: =head2 -#: ../scripts/mk-origtargz.pl:131 +#: ../scripts/mk-origtargz.pl:133 msgid "Action options" msgstr "" #. type: textblock -#: ../scripts/mk-origtargz.pl:133 +#: ../scripts/mk-origtargz.pl:135 msgid "" "These options specify what exactly B should do. The options B<-" "-copy>, B<--rename> and B<--symlink> are mutually exclusive." msgstr "" #. type: =item -#: ../scripts/mk-origtargz.pl:138 ../scripts/uscan.pl:1759 +#: ../scripts/mk-origtargz.pl:140 ../scripts/uscan.pl:1793 msgid "B<--symlink>" msgstr "" #. type: textblock -#: ../scripts/mk-origtargz.pl:140 +#: ../scripts/mk-origtargz.pl:142 msgid "" "Make the resulting file a symlink to the given original file. (This is the " "default behaviour.)" msgstr "" #. type: textblock -#: ../scripts/mk-origtargz.pl:143 +#: ../scripts/mk-origtargz.pl:145 msgid "" "If the file has to be modified (because it is a B, or B file, " "because of B<--repack> or B), this option behaves like B<--" @@ -14567,29 +14567,29 @@ msgstr "" #. type: =item -#: ../scripts/mk-origtargz.pl:146 ../scripts/uscan.pl:1764 +#: ../scripts/mk-origtargz.pl:148 ../scripts/uscan.pl:1798 msgid "B<--copy>" msgstr "" #. type: textblock -#: ../scripts/mk-origtargz.pl:148 +#: ../scripts/mk-origtargz.pl:150 msgid "" "Make the resulting file a copy of the original file (unless it has to be " "modified, of course)." msgstr "" #. type: =item -#: ../scripts/mk-origtargz.pl:151 ../scripts/uscan.pl:1768 +#: ../scripts/mk-origtargz.pl:153 ../scripts/uscan.pl:1802 msgid "B<--rename>" msgstr "" #. type: textblock -#: ../scripts/mk-origtargz.pl:153 +#: ../scripts/mk-origtargz.pl:155 msgid "Rename the original file." msgstr "" #. type: textblock -#: ../scripts/mk-origtargz.pl:155 +#: ../scripts/mk-origtargz.pl:157 msgid "" "If the file has to be modified (because it is a B, or B file, " "because of B<--repack> or B), this implies that the original " @@ -14597,48 +14597,48 @@ msgstr "" #. type: =item -#: ../scripts/mk-origtargz.pl:159 ../scripts/uscan.pl:1772 +#: ../scripts/mk-origtargz.pl:161 ../scripts/uscan.pl:1806 msgid "B<--repack>" msgstr "" #. type: textblock -#: ../scripts/mk-origtargz.pl:161 +#: ../scripts/mk-origtargz.pl:163 msgid "" "If the given file is not compressed using the desired format (see B<--" "compression>), recompress it." msgstr "" #. type: =item -#: ../scripts/mk-origtargz.pl:164 +#: ../scripts/mk-origtargz.pl:166 msgid "B<-S>, B<--repack-suffix> I" msgstr "" #. type: textblock -#: ../scripts/mk-origtargz.pl:166 +#: ../scripts/mk-origtargz.pl:168 msgid "" "If the file has to be modified, because of B, append " "I to the upstream version." msgstr "" #. type: =item -#: ../scripts/mk-origtargz.pl:169 +#: ../scripts/mk-origtargz.pl:171 msgid "B<--force-repack>" msgstr "" #. type: textblock -#: ../scripts/mk-origtargz.pl:171 +#: ../scripts/mk-origtargz.pl:173 msgid "" "Recompress even if file is compressed using the desired format and no files " "were deleted." msgstr "" #. type: =item -#: ../scripts/mk-origtargz.pl:174 +#: ../scripts/mk-origtargz.pl:176 msgid "B<-c>, B<--component> I" msgstr "" #. type: textblock -#: ../scripts/mk-origtargz.pl:176 +#: ../scripts/mk-origtargz.pl:178 msgid "" "Use as the component name for the secondary upstream " "tarball. Set I as the component name. This is used only for " @@ -14647,13 +14647,13 @@ msgstr "" #. type: =item -#: ../scripts/mk-origtargz.pl:181 +#: ../scripts/mk-origtargz.pl:183 msgid "" "B<--compression> [ B | B | B | B | B ]" msgstr "" #. type: textblock -#: ../scripts/mk-origtargz.pl:183 +#: ../scripts/mk-origtargz.pl:185 msgid "" "The default method is B. When mk-origtargz is launched in a debian " "source repository which format is \"1.0\" or undefined, the method switches " @@ -14661,34 +14661,34 @@ msgstr "" #. type: =item -#: ../scripts/mk-origtargz.pl:186 +#: ../scripts/mk-origtargz.pl:188 msgid "B<-C>, B<--directory> I" msgstr "" #. type: textblock -#: ../scripts/mk-origtargz.pl:188 +#: ../scripts/mk-origtargz.pl:190 msgid "Put the resulting file in the given directory." msgstr "" #. type: =item -#: ../scripts/mk-origtargz.pl:190 +#: ../scripts/mk-origtargz.pl:192 msgid "B<--unzipopt> I" msgstr "" #. type: textblock -#: ../scripts/mk-origtargz.pl:192 +#: ../scripts/mk-origtargz.pl:194 msgid "" "Add the extra options to use with the B command such as B<-a>, B<-" "aa>, and B<-b>." msgstr "" #. type: textblock -#: ../scripts/mk-origtargz.pl:209 +#: ../scripts/mk-origtargz.pl:211 msgid "B(1), B(1)" msgstr "" #. type: textblock -#: ../scripts/mk-origtargz.pl:213 +#: ../scripts/mk-origtargz.pl:215 msgid "" "B and this manpage have been written by Joachim Breitner " ">." @@ -17222,12 +17222,12 @@ msgstr "" #. type: =item -#: ../scripts/salsa.pl:432 ../scripts/uscan.pl:1516 +#: ../scripts/salsa.pl:432 ../scripts/uscan.pl:1546 msgid "B<--conffile>, B<--conf-file>" msgstr "" #. type: textblock -#: ../scripts/salsa.pl:434 ../scripts/uscan.pl:1518 +#: ../scripts/salsa.pl:434 ../scripts/uscan.pl:1548 msgid "" "Add or replace default configuration files (C and " "C<~/.devscripts>). This can only be used as the first option given on the " @@ -17235,7 +17235,7 @@ msgstr "" #. type: =item -#: ../scripts/salsa.pl:440 ../scripts/uscan.pl:1524 +#: ../scripts/salsa.pl:440 ../scripts/uscan.pl:1554 msgid "replace:" msgstr "" @@ -17249,7 +17249,7 @@ msgstr "" #. type: =item -#: ../scripts/salsa.pl:445 ../scripts/uscan.pl:1528 +#: ../scripts/salsa.pl:445 ../scripts/uscan.pl:1558 msgid "add:" msgstr "" @@ -17263,13 +17263,13 @@ msgstr "" #. type: textblock -#: ../scripts/salsa.pl:450 ../scripts/uscan.pl:1532 +#: ../scripts/salsa.pl:450 ../scripts/uscan.pl:1562 msgid "" "If one B<--conf-file> has no C<+>, default configuration files are ignored." msgstr "" #. type: textblock -#: ../scripts/salsa.pl:456 ../scripts/uscan.pl:1538 +#: ../scripts/salsa.pl:456 ../scripts/uscan.pl:1568 msgid "" "Don't read any configuration files. This can only be used as the first " "option given on the command-line." @@ -17507,27 +17507,27 @@ msgstr "" #. type: =head2 -#: ../scripts/salsa.pl:563 +#: ../scripts/salsa.pl:577 msgid "Update/create repo options" msgstr "" #. type: =item -#: ../scripts/salsa.pl:567 +#: ../scripts/salsa.pl:581 msgid "B<--all>" msgstr "" #. type: textblock -#: ../scripts/salsa.pl:569 +#: ../scripts/salsa.pl:583 msgid "When set, all project of group/user are affected by command." msgstr "" #. type: =item -#: ../scripts/salsa.pl:573 +#: ../scripts/salsa.pl:587 msgid "B<--skip>: ignore project with B<--all>. Example:" msgstr "" #. type: verbatim -#: ../scripts/salsa.pl:575 +#: ../scripts/salsa.pl:589 #, no-wrap msgid "" " salsa update_repo --tagpending --all --skip qa --skip devscripts\n" @@ -17535,14 +17535,14 @@ msgstr "" #. type: textblock -#: ../scripts/salsa.pl:577 +#: ../scripts/salsa.pl:591 msgid "" "C<.devscripts> value: B. To set multiples values, use spaces. " "Example" msgstr "" #. type: verbatim -#: ../scripts/salsa.pl:580 +#: ../scripts/salsa.pl:594 #, no-wrap msgid "" " SALSA_SKIP=qa devscripts\n" @@ -17550,12 +17550,12 @@ msgstr "" #. type: =item -#: ../scripts/salsa.pl:582 +#: ../scripts/salsa.pl:596 msgid "B<--skip-file>: ignore projects in this file (1 project per line)" msgstr "" #. type: verbatim -#: ../scripts/salsa.pl:584 +#: ../scripts/salsa.pl:598 #, no-wrap msgid "" " salsa update_repo --tagpending --all --skip-file ~/.skip\n" @@ -17563,23 +17563,23 @@ msgstr "" #. type: textblock -#: ../scripts/salsa.pl:586 +#: ../scripts/salsa.pl:600 msgid "C<.devscripts> value: B" msgstr "" #. type: =item -#: ../scripts/salsa.pl:590 +#: ../scripts/salsa.pl:604 msgid "B<--ci-config-path>" msgstr "" #. type: textblock -#: ../scripts/salsa.pl:592 +#: ../scripts/salsa.pl:606 msgid "" "Configure configuration file path of GitLab CI. Default: empty. Example:" msgstr "" #. type: verbatim -#: ../scripts/salsa.pl:594 +#: ../scripts/salsa.pl:608 #, no-wrap msgid "" " salsa update_safe --ci-config-path debian/.gitlab-ci.yml " @@ -17588,32 +17588,32 @@ msgstr "" #. type: textblock -#: ../scripts/salsa.pl:596 +#: ../scripts/salsa.pl:610 msgid "C<.devscripts> value: B" msgstr "" #. type: =item -#: ../scripts/salsa.pl:598 +#: ../scripts/salsa.pl:612 msgid "B<--desc> B<--no-desc>" msgstr "" #. type: textblock -#: ../scripts/salsa.pl:600 +#: ../scripts/salsa.pl:614 msgid "Configure repo description using pattern given in B" msgstr "" #. type: textblock -#: ../scripts/salsa.pl:602 +#: ../scripts/salsa.pl:616 msgid "C<.devscripts> value: B (yes/no)" msgstr "" #. type: =item -#: ../scripts/salsa.pl:604 +#: ../scripts/salsa.pl:618 msgid "B<--desc-pattern>" msgstr "" #. type: textblock -#: ../scripts/salsa.pl:606 +#: ../scripts/salsa.pl:620 msgid "" "Repo description pattern. Default to \"Debian package %p\". \"%p\" is " "replaced by repo name, while \"%P\" is replaced by repo name given in " @@ -17621,37 +17621,37 @@ msgstr "" #. type: textblock -#: ../scripts/salsa.pl:610 +#: ../scripts/salsa.pl:624 msgid "C<.devscripts> value: B" msgstr "" #. type: =item -#: ../scripts/salsa.pl:612 +#: ../scripts/salsa.pl:626 msgid "B<--email>, B<--no-email>, B<--disable-email>" msgstr "" #. type: textblock -#: ../scripts/salsa.pl:614 +#: ../scripts/salsa.pl:628 msgid "Enable, ignore or disable email-on-push." msgstr "" #. type: textblock -#: ../scripts/salsa.pl:616 +#: ../scripts/salsa.pl:630 msgid "C<.devscripts> value: B (yes/ignore/no, default: ignore)" msgstr "" #. type: =item -#: ../scripts/salsa.pl:618 +#: ../scripts/salsa.pl:632 msgid "B<--email-recipient>" msgstr "" #. type: textblock -#: ../scripts/salsa.pl:620 +#: ../scripts/salsa.pl:634 msgid "Email-on-push recipient. Can be multi valued:" msgstr "" #. type: verbatim -#: ../scripts/salsa.pl:622 +#: ../scripts/salsa.pl:636 #, no-wrap msgid "" " $ salsa update_safe myrepo \\\n" @@ -17661,67 +17661,67 @@ msgstr "" #. type: textblock -#: ../scripts/salsa.pl:626 +#: ../scripts/salsa.pl:640 msgid "If recipient value contains \"%p\", it is replaced by project name." msgstr "" #. type: textblock -#: ../scripts/salsa.pl:628 +#: ../scripts/salsa.pl:642 msgid "" "C<.devscripts> value: B (use spaces to separate " "multiples recipients)" msgstr "" #. type: =item -#: ../scripts/salsa.pl:631 +#: ../scripts/salsa.pl:645 msgid "" "B<--enable-issues>, B<--no-enable-issues>, B<--disable-issues>, B<--no-" "disable-issues>" msgstr "" #. type: textblock -#: ../scripts/salsa.pl:634 +#: ../scripts/salsa.pl:648 msgid "Enable, ignore or disable issues." msgstr "" #. type: textblock -#: ../scripts/salsa.pl:636 +#: ../scripts/salsa.pl:650 msgid "" "C<.devscripts> values: B (yes/ignore/no, default: " "ignore)" msgstr "" #. type: =item -#: ../scripts/salsa.pl:638 +#: ../scripts/salsa.pl:652 msgid "" "B<--enable-mr>, B<--no-enable-mr>, B<--disable-mr>, B<--no-disable-mr>" msgstr "" #. type: textblock -#: ../scripts/salsa.pl:640 +#: ../scripts/salsa.pl:654 msgid "Enable, ignore or disable merge requests." msgstr "" #. type: textblock -#: ../scripts/salsa.pl:642 +#: ../scripts/salsa.pl:656 msgid "" "C<.devscripts> values: B (yes/ignore/no, default: ignore)" msgstr "" #. type: =item -#: ../scripts/salsa.pl:644 +#: ../scripts/salsa.pl:658 msgid "B<--irc-channel>" msgstr "" #. type: textblock -#: ../scripts/salsa.pl:646 +#: ../scripts/salsa.pl:660 msgid "" "IRC channel for KGB or Irker. Can be used more than one time only with B<--" "irker>." msgstr "" #. type: textblock -#: ../scripts/salsa.pl:649 +#: ../scripts/salsa.pl:663 msgid "" "B: channel must not include the first \"#\". If salsa finds a " "channel starting with \"#\", it will consider that the channel starts with 2 " @@ -17729,17 +17729,17 @@ msgstr "" #. type: textblock -#: ../scripts/salsa.pl:652 +#: ../scripts/salsa.pl:666 msgid "C<.devscript> value: B." msgstr "" #. type: textblock -#: ../scripts/salsa.pl:654 +#: ../scripts/salsa.pl:668 msgid "Multiple values must be space separated." msgstr "" #. type: textblock -#: ../scripts/salsa.pl:656 +#: ../scripts/salsa.pl:670 msgid "" "Since configuration files are read using B, be careful when using \"#\": " "you must enclose the channel with quotes, else B will consider it as a " @@ -17747,68 +17747,68 @@ msgstr "" #. type: =item -#: ../scripts/salsa.pl:660 +#: ../scripts/salsa.pl:674 msgid "B<--irker>, B<--no-irker>, B<--disable-irker>" msgstr "" #. type: textblock -#: ../scripts/salsa.pl:662 +#: ../scripts/salsa.pl:676 msgid "Enable, ignore or disable Irker service" msgstr "" #. type: textblock -#: ../scripts/salsa.pl:664 +#: ../scripts/salsa.pl:678 msgid "" "C<.devscripts> values: B (yes/ignore/no, default: ignore)" msgstr "" #. type: =item -#: ../scripts/salsa.pl:666 +#: ../scripts/salsa.pl:680 msgid "B<--irker-host>" msgstr "" #. type: textblock -#: ../scripts/salsa.pl:668 +#: ../scripts/salsa.pl:682 msgid "Irker host. Default: ruprecht.snow-crash.org" msgstr "" #. type: textblock -#: ../scripts/salsa.pl:670 +#: ../scripts/salsa.pl:684 msgid "C<.devscripts> value: B" msgstr "" #. type: =item -#: ../scripts/salsa.pl:672 +#: ../scripts/salsa.pl:686 msgid "B<--irker-port>" msgstr "" #. type: textblock -#: ../scripts/salsa.pl:674 +#: ../scripts/salsa.pl:688 msgid "Irker port. Default: empty (default value)" msgstr "" #. type: textblock -#: ../scripts/salsa.pl:676 +#: ../scripts/salsa.pl:690 msgid "C<.devscripts> value: B" msgstr "" #. type: =item -#: ../scripts/salsa.pl:678 +#: ../scripts/salsa.pl:692 msgid "B<--kgb>, B<--no-kgb>, B<--disable-kgb>" msgstr "" #. type: textblock -#: ../scripts/salsa.pl:680 +#: ../scripts/salsa.pl:694 msgid "Enable, ignore or disable KGB webhook." msgstr "" #. type: textblock -#: ../scripts/salsa.pl:682 +#: ../scripts/salsa.pl:696 msgid "C<.devscripts> value: B (yes/ignore/no, default: ignore)" msgstr "" #. type: =item -#: ../scripts/salsa.pl:684 +#: ../scripts/salsa.pl:698 msgid "B<--kgb-options>" msgstr "" @@ -17821,7 +17821,7 @@ msgstr "" #. type: verbatim -#: ../scripts/salsa.pl:690 +#: ../scripts/salsa.pl:704 #, no-wrap msgid "" " $ salsa update_safe debian/devscripts --kgb --irc-channel devscripts \\\n" @@ -17831,7 +17831,7 @@ msgstr "" #. type: textblock -#: ../scripts/salsa.pl:693 +#: ../scripts/salsa.pl:707 msgid "" "List of available options: confidential_comments_events, " "confidential_issues_events, confidential_note_events, " @@ -17840,130 +17840,130 @@ msgstr "" #. type: textblock -#: ../scripts/salsa.pl:698 +#: ../scripts/salsa.pl:712 msgid "C<.devscripts> value: B" msgstr "" #. type: =item -#: ../scripts/salsa.pl:700 +#: ../scripts/salsa.pl:714 msgid "B<--no-fail>" msgstr "" #. type: textblock -#: ../scripts/salsa.pl:702 +#: ../scripts/salsa.pl:716 msgid "Don't stop on error when using B with B<--all>." msgstr "" #. type: textblock -#: ../scripts/salsa.pl:704 +#: ../scripts/salsa.pl:718 msgid "C<.devscripts> value: B (yes/no)" msgstr "" #. type: =item -#: ../scripts/salsa.pl:706 +#: ../scripts/salsa.pl:720 msgid "B<--rename-head>, B<--no-rename-head>" msgstr "" #. type: textblock -#: ../scripts/salsa.pl:708 +#: ../scripts/salsa.pl:722 msgid "" "Rename HEAD branch given by B<--source-branch> into B<--dest-branch> and " "change \"default branch\" of project. Works only with B." msgstr "" #. type: textblock -#: ../scripts/salsa.pl:711 +#: ../scripts/salsa.pl:725 msgid "C<.devscripts> value: B (yes/no)" msgstr "" #. type: =item -#: ../scripts/salsa.pl:715 +#: ../scripts/salsa.pl:729 msgid "B<--source-branch>: default \"master\"" msgstr "" #. type: textblock -#: ../scripts/salsa.pl:717 +#: ../scripts/salsa.pl:731 msgid "C<.devscripts> value: B" msgstr "" #. type: =item -#: ../scripts/salsa.pl:719 +#: ../scripts/salsa.pl:733 msgid "B<--dest-branch>: default \"debian/master\"" msgstr "" #. type: textblock -#: ../scripts/salsa.pl:721 +#: ../scripts/salsa.pl:735 msgid "C<.devscripts> value: B" msgstr "" #. type: =item -#: ../scripts/salsa.pl:725 +#: ../scripts/salsa.pl:739 msgid "B<--tagpending>, B<--no-tagpending>, B<--disable-tagpending>" msgstr "" #. type: textblock -#: ../scripts/salsa.pl:727 +#: ../scripts/salsa.pl:741 msgid "Enable, ignore or disable \"tagpending\" webhook." msgstr "" #. type: textblock -#: ../scripts/salsa.pl:729 +#: ../scripts/salsa.pl:743 msgid "" "C<.devscripts> value: B (yes/ignore/no, default: ignore)" msgstr "" #. type: =head2 -#: ../scripts/salsa.pl:733 +#: ../scripts/salsa.pl:747 msgid "Merge requests options" msgstr "" #. type: =item -#: ../scripts/salsa.pl:737 +#: ../scripts/salsa.pl:751 msgid "B<--mr-title>" msgstr "" #. type: textblock -#: ../scripts/salsa.pl:739 +#: ../scripts/salsa.pl:753 msgid "Title for merge request. Default: last commit title." msgstr "" #. type: =item -#: ../scripts/salsa.pl:741 +#: ../scripts/salsa.pl:755 msgid "B<--mr-desc>" msgstr "" #. type: textblock -#: ../scripts/salsa.pl:743 +#: ../scripts/salsa.pl:757 msgid "Description of new MR. Default:" msgstr "" #. type: =item -#: ../scripts/salsa.pl:747 +#: ../scripts/salsa.pl:761 msgid "empty if B<--mr-title> is set" msgstr "" #. type: =item -#: ../scripts/salsa.pl:749 +#: ../scripts/salsa.pl:763 msgid "last commit description if any" msgstr "" #. type: =item -#: ../scripts/salsa.pl:753 +#: ../scripts/salsa.pl:767 msgid "B<--mr-dst-branch> (or second command line argument)" msgstr "" #. type: textblock -#: ../scripts/salsa.pl:755 +#: ../scripts/salsa.pl:769 msgid "Destination branch. Default to \"master\"." msgstr "" #. type: =item -#: ../scripts/salsa.pl:757 +#: ../scripts/salsa.pl:771 msgid "B<--mr-dst-project> (or first command line argument)" msgstr "" #. type: textblock -#: ../scripts/salsa.pl:759 +#: ../scripts/salsa.pl:773 msgid "" "Destination project. Default: project from which the current project was " "forked; or, if not found, \"upstream\" value found using B is set to B, salsa will use source project as " "destination." msgstr "" #. type: =item -#: ../scripts/salsa.pl:766 +#: ../scripts/salsa.pl:780 msgid "B<--mr-src-branch>" msgstr "" #. type: textblock -#: ../scripts/salsa.pl:768 +#: ../scripts/salsa.pl:782 msgid "Source branch. Default: current branch." msgstr "" #. type: =item -#: ../scripts/salsa.pl:770 +#: ../scripts/salsa.pl:784 msgid "B<--mr-src-project>" msgstr "" #. type: textblock -#: ../scripts/salsa.pl:772 +#: ../scripts/salsa.pl:786 msgid "" "Source project. Default: current project found using B." msgstr "" #. type: =item -#: ../scripts/salsa.pl:775 +#: ../scripts/salsa.pl:789 msgid "B<--mr-allow-squash>, B<--no-mr-allow-squash>" msgstr "" #. type: textblock -#: ../scripts/salsa.pl:777 +#: ../scripts/salsa.pl:791 msgid "Allow upstream project to squash your commits, this is the default." msgstr "" #. type: textblock -#: ../scripts/salsa.pl:779 +#: ../scripts/salsa.pl:793 msgid "C<.devscripts> value: B (yes/no)" msgstr "" #. type: =item -#: ../scripts/salsa.pl:781 +#: ../scripts/salsa.pl:795 msgid "B<--mr-remove-source-branch>, B<--no-mr-remove-source-branch>" msgstr "" #. type: textblock -#: ../scripts/salsa.pl:783 +#: ../scripts/salsa.pl:797 msgid "Remove source branch if merge request is accepted. Default: no." msgstr "" #. type: textblock -#: ../scripts/salsa.pl:785 +#: ../scripts/salsa.pl:799 msgid "C<.devscripts> value: B (yes/no)" msgstr "" #. type: =head2 -#: ../scripts/salsa.pl:789 +#: ../scripts/salsa.pl:803 msgid "Options to manage other Gitlab instances" msgstr "" #. type: =item -#: ../scripts/salsa.pl:793 +#: ../scripts/salsa.pl:807 msgid "B<--api-url>" msgstr "" #. type: textblock -#: ../scripts/salsa.pl:795 +#: ../scripts/salsa.pl:809 msgid "GitLab API. Default: L." msgstr "" #. type: textblock -#: ../scripts/salsa.pl:797 +#: ../scripts/salsa.pl:811 msgid "C<.devscripts> value: B" msgstr "" #. type: =item -#: ../scripts/salsa.pl:799 +#: ../scripts/salsa.pl:813 msgid "B<--git-server-url>" msgstr "" #. type: textblock -#: ../scripts/salsa.pl:801 +#: ../scripts/salsa.pl:815 msgid "Default to \"git@salsa.debian.org:\"" msgstr "" #. type: textblock -#: ../scripts/salsa.pl:803 +#: ../scripts/salsa.pl:817 msgid "C<.devscripts> value: B" msgstr "" #. type: =item -#: ../scripts/salsa.pl:805 +#: ../scripts/salsa.pl:819 msgid "B<--irker-server-url>" msgstr "" #. type: textblock -#: ../scripts/salsa.pl:807 +#: ../scripts/salsa.pl:821 msgid "Default to \"ircs://irc.oftc.net:6697/\"" msgstr "" #. type: textblock -#: ../scripts/salsa.pl:809 +#: ../scripts/salsa.pl:823 msgid "C<.devscripts> value: B" msgstr "" #. type: =item -#: ../scripts/salsa.pl:811 +#: ../scripts/salsa.pl:825 msgid "B<--kgb-server-url>" msgstr "" #. type: textblock -#: ../scripts/salsa.pl:813 +#: ../scripts/salsa.pl:827 msgid "Default to L" msgstr "" #. type: textblock -#: ../scripts/salsa.pl:815 +#: ../scripts/salsa.pl:829 msgid "C<.devscripts> value: B" msgstr "" #. type: =item -#: ../scripts/salsa.pl:817 +#: ../scripts/salsa.pl:831 msgid "B<--tagpending-server-url>" msgstr "" #. type: textblock -#: ../scripts/salsa.pl:819 +#: ../scripts/salsa.pl:833 msgid "Default to L" msgstr "" #. type: textblock -#: ../scripts/salsa.pl:821 +#: ../scripts/salsa.pl:835 msgid "C<.devscripts> value: B" msgstr "" #. type: =head3 -#: ../scripts/salsa.pl:825 +#: ../scripts/salsa.pl:839 msgid "Configuration file example" msgstr "" #. type: textblock -#: ../scripts/salsa.pl:827 +#: ../scripts/salsa.pl:841 msgid "" "Example to use salsa with L (group \"lemonldap-ng\"):" msgstr "" #. type: verbatim -#: ../scripts/salsa.pl:829 +#: ../scripts/salsa.pl:843 #, no-wrap msgid "" " SALSA_TOKEN=`cat ~/.ow2-gitlab-token`\n" @@ -18132,12 +18132,12 @@ msgstr "" #. type: textblock -#: ../scripts/salsa.pl:834 +#: ../scripts/salsa.pl:848 msgid "Then to use it, add something like this in your C<.bashrc> file:" msgstr "" #. type: verbatim -#: ../scripts/salsa.pl:836 +#: ../scripts/salsa.pl:850 #, no-wrap msgid "" " alias llng_admin='salsa --conffile ~/.salsa-ow2.conf'\n" @@ -18145,29 +18145,29 @@ msgstr "" #. type: textblock -#: ../scripts/salsa.pl:840 +#: ../scripts/salsa.pl:854 msgid "B" msgstr "" #. type: textblock -#: ../scripts/salsa.pl:844 +#: ../scripts/salsa.pl:858 msgid "Xavier Guimard Eyadd@debian.orgE" msgstr "" #. type: textblock -#: ../scripts/salsa.pl:848 +#: ../scripts/salsa.pl:862 msgid "Copyright (C) 2018, Xavier Guimard Eyadd@debian.orgE" msgstr "" #. type: textblock -#: ../scripts/salsa.pl:850 +#: ../scripts/salsa.pl:864 msgid "" "It contains code formerly found in L I<(pkg-perl-tools)> " "copyright 2018, gregor herrmann Egregoa@debian.orgE." msgstr "" #. type: textblock -#: ../scripts/salsa.pl:853 +#: ../scripts/salsa.pl:867 msgid "" "This library is free software; you can redistribute it and/or modify it " "under the terms of the GNU General Public License as published by the Free " @@ -18176,7 +18176,7 @@ msgstr "" #. type: textblock -#: ../scripts/salsa.pl:858 +#: ../scripts/salsa.pl:872 msgid "" "This program is distributed in the hope that it will be useful, but WITHOUT " "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " @@ -18185,7 +18185,7 @@ msgstr "" #. type: textblock -#: ../scripts/salsa.pl:863 +#: ../scripts/salsa.pl:877 msgid "" "You should have received a copy of the GNU General Public License along with " "this program. If not, see L." @@ -18640,55 +18640,55 @@ msgstr "" #. type: =item -#: ../scripts/uscan.pl:50 +#: ../scripts/uscan.pl:56 msgid "" "* B reads the first entry in F to determine the " "source package name I<< >> and the last upstream version." msgstr "" #. type: =item -#: ../scripts/uscan.pl:53 +#: ../scripts/uscan.pl:59 msgid "" "* B process the watch lines F from the top to the " "bottom in a single pass." msgstr "" #. type: =item -#: ../scripts/uscan.pl:58 +#: ../scripts/uscan.pl:64 msgid "" "* B downloads a web page from the specified I in F." msgstr "" #. type: =item -#: ../scripts/uscan.pl:61 +#: ../scripts/uscan.pl:67 msgid "" "* B extracts hrefs pointing to the upstream tarball(s) from the web " "page using the specified I in F." msgstr "" #. type: =item -#: ../scripts/uscan.pl:64 +#: ../scripts/uscan.pl:70 msgid "" "* B downloads the upstream tarball with the highest version newer " "than the last upstream version." msgstr "" #. type: =item -#: ../scripts/uscan.pl:67 +#: ../scripts/uscan.pl:73 msgid "" "* B saves the downloaded tarball to the parent B<../> directory: I<< " "../-.tar.gz >>" msgstr "" #. type: =item -#: ../scripts/uscan.pl:70 +#: ../scripts/uscan.pl:76 msgid "" "* B invokes B to create the source tarball: I<< " "../_.orig.tar.gz >>" msgstr "" #. type: =item -#: ../scripts/uscan.pl:75 +#: ../scripts/uscan.pl:81 msgid "" "* For a multiple upstream tarball (MUT) package, the secondary upstream " "tarball will instead be named I<< ../_.orig-" @@ -18696,24 +18696,24 @@ msgstr "" #. type: =item -#: ../scripts/uscan.pl:80 +#: ../scripts/uscan.pl:86 msgid "* Repeat until all lines in F are processed." msgstr "" #. type: =item -#: ../scripts/uscan.pl:84 +#: ../scripts/uscan.pl:90 msgid "" "* B invokes B to create the Debianized source tree: I<< " "../-/* >>" msgstr "" #. type: textblock -#: ../scripts/uscan.pl:89 +#: ../scripts/uscan.pl:95 msgid "Please note the following." msgstr "" #. type: =item -#: ../scripts/uscan.pl:93 +#: ../scripts/uscan.pl:99 msgid "" "* For simplicity, the compression method used in examples is B with " "B<.gz> suffix. Other methods such as B, B, and B with " @@ -18721,7 +18721,7 @@ msgstr "" #. type: =item -#: ../scripts/uscan.pl:97 +#: ../scripts/uscan.pl:103 msgid "" "* The new B enables handling of multiple upstream tarball (MUT) " "packages but this is a rare case for Debian packaging. For a single " @@ -18730,21 +18730,21 @@ msgstr "" #. type: =item -#: ../scripts/uscan.pl:102 +#: ../scripts/uscan.pl:108 msgid "" "* B with the B<--verbose> option produces a human readable report of " "B's execution." msgstr "" #. type: =item -#: ../scripts/uscan.pl:105 +#: ../scripts/uscan.pl:111 msgid "" "* B with the B<--debug> option produces a human readable report of " "B's execution including internal variable states." msgstr "" #. type: =item -#: ../scripts/uscan.pl:108 +#: ../scripts/uscan.pl:118 msgid "" "* B with the B<--dehs> option produces an upstream package status " "report in XML format for other programs such as the Debian External Health " @@ -18752,7 +18752,7 @@ msgstr "" #. type: =item -#: ../scripts/uscan.pl:112 +#: ../scripts/uscan.pl:122 msgid "" "* The primary objective of B is to help identify if the latest " "version upstream tarball is used or not; and to download the latest upstream " @@ -18760,7 +18760,7 @@ msgstr "" #. type: =item -#: ../scripts/uscan.pl:116 +#: ../scripts/uscan.pl:126 msgid "" "* B with the B<--safe> option limits the functionality of B to " "its primary objective. Both the repacking of downloaded files and updating " @@ -18769,33 +18769,33 @@ msgstr "" #. type: =head1 -#: ../scripts/uscan.pl:123 +#: ../scripts/uscan.pl:133 msgid "FORMAT OF THE WATCH FILE" msgstr "" #. type: textblock -#: ../scripts/uscan.pl:125 +#: ../scripts/uscan.pl:135 msgid "" "The current version 4 format of F can be summarized as follows:" msgstr "" #. type: =item -#: ../scripts/uscan.pl:129 +#: ../scripts/uscan.pl:139 msgid "* Leading spaces and tabs are dropped." msgstr "" #. type: =item -#: ../scripts/uscan.pl:131 +#: ../scripts/uscan.pl:141 msgid "* Empty lines are dropped." msgstr "" #. type: =item -#: ../scripts/uscan.pl:133 +#: ../scripts/uscan.pl:143 msgid "* A line started by B<#> (hash) is a comment line and dropped." msgstr "" #. type: =item -#: ../scripts/uscan.pl:135 +#: ../scripts/uscan.pl:145 msgid "" "* A single B<\\> (back slash) at the end of a line is dropped and the next " "line is concatenated after removing leading spaces and tabs. The " @@ -18804,29 +18804,29 @@ msgstr "" #. type: =item -#: ../scripts/uscan.pl:140 +#: ../scripts/uscan.pl:150 msgid "* The first non-comment line is:" msgstr "" #. type: =item -#: ../scripts/uscan.pl:144 +#: ../scripts/uscan.pl:154 msgid "B" msgstr "" #. type: textblock -#: ../scripts/uscan.pl:148 +#: ../scripts/uscan.pl:158 msgid "This is a required line and the recommended version number." msgstr "" #. type: textblock -#: ../scripts/uscan.pl:150 +#: ../scripts/uscan.pl:160 msgid "" "If you use \"B\" instead here, some features may not work as " "documented here. See L." msgstr "" #. type: =item -#: ../scripts/uscan.pl:153 +#: ../scripts/uscan.pl:163 msgid "" "* The following non-comment lines (watch lines) specify the rules for the " "selection of the candidate upstream tarball URLs and are in one of the " @@ -18834,53 +18834,53 @@ msgstr "" #. type: =item -#: ../scripts/uscan.pl:159 +#: ../scripts/uscan.pl:169 msgid "" "* B I<...> B<\"> BI I [I " "[I