Binary files /tmp/V4qABjShJI/language-pack-zh-hans-base-12.04+20120508/data/extra.tar and /tmp/6JQYpLXULL/language-pack-zh-hans-base-12.04+20130128/data/extra.tar differ diff -Nru language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/FontForge.po language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/FontForge.po --- language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/FontForge.po 2012-05-08 22:47:29.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/FontForge.po 2013-01-29 09:37:12.000000000 +0000 @@ -18,8 +18,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2012-05-08 02:27+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2013-01-28 11:12+0000\n" +"X-Generator: Launchpad (build 16451)\n" # #: alignment.c:297 anchorsaway.c:1274 combinations.c:1115 cvhints.c:483 @@ -58,79 +58,78 @@ # #: alignment.c:419 anchorsaway.c:1421 autowidth2dlg.c:281 basedlg.c:342 -#: basedlg.c:852 bdfinfo.c:862 bitmapdlg.c:524 charinfo.c:339 charinfo.c:1146 -#: charinfo.c:2065 charinfo.c:4840 charinfo.c:5121 charview.c:8030 -#: combinations.c:1181 contextchain.c:1243 cvexportdlg.c:154 cvgetinfo.c:587 +#: basedlg.c:852 bdfinfo.c:862 bitmapdlg.c:524 charinfo.c:340 charinfo.c:1147 +#: charinfo.c:2385 charinfo.c:5163 charinfo.c:5444 charview.c:8053 +#: combinations.c:1181 contextchain.c:2114 cvexportdlg.c:154 cvgetinfo.c:587 #: cvgetinfo.c:700 cvgetinfo.c:1621 cvgetinfo.c:3205 cvgetinfo.c:3635 #: cvgridfit.c:356 cvhints.c:566 cvhints.c:807 cvimportdlg.c:351 -#: cvpalettes.c:538 cvpointer.c:1546 cvstroke.c:1092 cvstroke.c:1792 -#: cvstroke.c:2334 cvstroke.c:3297 cvundoes.c:2014 cvundoes.c:2819 +#: cvpalettes.c:538 cvpointer.c:1549 cvstroke.c:1092 cvstroke.c:1792 +#: cvstroke.c:2341 cvstroke.c:3304 cvundoes.c:2014 cvundoes.c:2819 #: deltaui.c:337 deltaui.c:1045 displayfonts.c:482 effectsui.c:275 -#: effectsui.c:483 fontinfo.c:2534 fontinfo.c:2823 fontinfo.c:4210 -#: fontinfo.c:4240 fontinfo.c:5219 fontinfo.c:6982 fontinfo.c:10781 -#: fontview.c:1030 fontview.c:1840 fontview.c:2102 fontview.c:3066 -#: fontview.c:7839 fvfontsdlg.c:220 fvfontsdlg.c:399 fvimportbdf.c:1885 -#: fvmetricsdlg.c:210 gotodlg.c:242 groupsdlg.c:1314 groupsdlg.c:1549 -#: histograms.c:966 justifydlg.c:251 justifydlg.c:458 justifydlg.c:774 -#: justifydlg.c:970 kernclass.c:2461 kernclass.c:2836 layer2layer.c:292 -#: lookupui.c:850 lookupui.c:1137 lookupui.c:1906 lookupui.c:2281 -#: lookupui.c:4562 lookupui.c:5444 lookupui.c:5879 lookupui.c:6256 -#: macencui.c:507 macencui.c:857 macencui.c:1203 math.c:796 math.c:1181 -#: math.c:1997 metricsview.c:2859 mmdlg.c:684 mmdlg.c:748 mmdlg.c:1042 -#: mmdlg.c:2540 nonlineartransui.c:136 nonlineartransui.c:537 -#: openfontdlg.c:365 openfontdlg.c:688 prefs.c:1501 prefs.c:2309 -#: problems.c:2626 problems.c:4120 problems.c:5423 savefontdlg.c:871 -#: savefontdlg.c:1057 scriptingdlg.c:313 scstylesui.c:271 scstylesui.c:1716 -#: scstylesui.c:2204 scstylesui.c:2814 scstylesui.c:2985 showatt.c:2832 -#: showatt.c:3319 simplifydlg.c:418 statemachine.c:752 statemachine.c:1462 -#: tilepath.c:1210 tilepath.c:1880 transform.c:730 ttfinstrsui.c:764 -#: ttfinstrsui.c:1462 ttfinstrsui.c:1601 ttfinstrsui.c:1917 -#: ../gdraw/gaskdlg.c:1196 ../gdraw/gaskdlg.c:1233 ../gdraw/gaskdlg.c:1270 -#: ../gdraw/gaskdlg.c:1326 ../gdraw/gaskdlg.c:1587 ../gdraw/gaskdlg.c:1646 -#: ../gdraw/gcolor.c:673 ../gdraw/gfiledlg.c:123 ../gdraw/gmatrixedit.c:1112 -#: ../gdraw/gresedit.c:2249 +#: effectsui.c:483 fontinfo.c:2567 fontinfo.c:3987 fontinfo.c:4017 +#: fontinfo.c:4996 fontinfo.c:6761 fontinfo.c:10523 fontview.c:1034 +#: fontview.c:1844 fontview.c:2106 fontview.c:3070 fontview.c:7869 +#: fvfontsdlg.c:220 fvfontsdlg.c:399 fvimportbdf.c:1885 fvmetricsdlg.c:210 +#: gotodlg.c:244 groupsdlg.c:1314 groupsdlg.c:1549 histograms.c:966 +#: justifydlg.c:251 justifydlg.c:458 justifydlg.c:774 justifydlg.c:970 +#: kernclass.c:2526 kernclass.c:2901 layer2layer.c:292 lookupui.c:850 +#: lookupui.c:1137 lookupui.c:1906 lookupui.c:2281 lookupui.c:4562 +#: lookupui.c:5444 lookupui.c:5879 lookupui.c:6256 macencui.c:507 +#: macencui.c:857 macencui.c:1203 math.c:796 math.c:1181 math.c:1997 +#: metricsview.c:2888 mmdlg.c:684 mmdlg.c:748 mmdlg.c:1042 mmdlg.c:2540 +#: nonlineartransui.c:136 nonlineartransui.c:537 openfontdlg.c:365 +#: openfontdlg.c:688 prefs.c:1503 prefs.c:2311 problems.c:2626 problems.c:4120 +#: problems.c:5423 savefontdlg.c:871 savefontdlg.c:1057 scriptingdlg.c:313 +#: scstylesui.c:271 scstylesui.c:1716 scstylesui.c:2204 scstylesui.c:2814 +#: scstylesui.c:2985 showatt.c:2839 showatt.c:3326 simplifydlg.c:418 +#: statemachine.c:752 statemachine.c:1462 tilepath.c:1210 tilepath.c:1880 +#: transform.c:730 ttfinstrsui.c:764 ttfinstrsui.c:1462 ttfinstrsui.c:1601 +#: ttfinstrsui.c:1917 ../gdraw/gaskdlg.c:1196 ../gdraw/gaskdlg.c:1233 +#: ../gdraw/gaskdlg.c:1270 ../gdraw/gaskdlg.c:1326 ../gdraw/gaskdlg.c:1587 +#: ../gdraw/gaskdlg.c:1646 ../gdraw/gcolor.c:673 ../gdraw/gfiledlg.c:123 +#: ../gdraw/gmatrixedit.c:1206 ../gdraw/gresedit.c:2249 msgid "_OK" msgstr "确定(_O)" # #: alignment.c:430 anchorsaway.c:1432 autowidth2dlg.c:290 basedlg.c:350 -#: basedlg.c:860 bdfinfo.c:873 bitmapdlg.c:536 charinfo.c:350 charinfo.c:934 -#: charinfo.c:944 charinfo.c:1146 charinfo.c:2074 charinfo.c:4851 -#: charinfo.c:5132 charview.c:8041 charview.c:8282 combinations.c:1192 -#: contextchain.c:1273 cvexportdlg.c:166 cvexportdlg.c:307 cvexportdlg.c:554 -#: cvgetinfo.c:277 cvgetinfo.c:598 cvgetinfo.c:1633 cvgetinfo.c:3217 -#: cvgetinfo.c:3647 cvgetinfo.c:3735 cvgetinfo.c:3810 cvgridfit.c:368 -#: cvhints.c:575 cvhints.c:819 cvimportdlg.c:714 cvpalettes.c:549 -#: cvpointer.c:1556 cvstroke.c:1111 cvstroke.c:1800 cvstroke.c:2342 -#: cvstroke.c:3308 cvundoes.c:2820 deltaui.c:347 displayfonts.c:493 -#: displayfonts.c:2182 effectsui.c:286 effectsui.c:494 encodingui.c:151 -#: fontinfo.c:2543 fontinfo.c:2823 fontinfo.c:4210 fontinfo.c:4240 -#: fontinfo.c:4465 fontinfo.c:5229 fontinfo.c:6325 fontinfo.c:6561 -#: fontinfo.c:6982 fontinfo.c:7022 fontinfo.c:7024 fontinfo.c:10792 -#: fontview.c:506 fontview.c:1031 fontview.c:1848 fontview.c:2110 -#: fontview.c:3076 fontview.c:3661 fontview.c:4697 fontview.c:4792 -#: fontview.c:7847 fontviewbase.c:991 fontviewbase.c:1630 fvfontsdlg.c:60 +#: basedlg.c:860 bdfinfo.c:873 bitmapdlg.c:536 charinfo.c:351 charinfo.c:935 +#: charinfo.c:945 charinfo.c:1147 charinfo.c:1357 charinfo.c:2394 +#: charinfo.c:5174 charinfo.c:5455 charview.c:8064 charview.c:8305 +#: combinations.c:1192 contextchain.c:2144 cvexportdlg.c:166 cvexportdlg.c:307 +#: cvexportdlg.c:554 cvgetinfo.c:277 cvgetinfo.c:598 cvgetinfo.c:1633 +#: cvgetinfo.c:3217 cvgetinfo.c:3647 cvgetinfo.c:3735 cvgetinfo.c:3810 +#: cvgridfit.c:368 cvhints.c:575 cvhints.c:819 cvimportdlg.c:714 +#: cvpalettes.c:549 cvpointer.c:1559 cvstroke.c:1111 cvstroke.c:1800 +#: cvstroke.c:2349 cvstroke.c:3315 cvundoes.c:2820 deltaui.c:347 +#: displayfonts.c:493 displayfonts.c:2182 effectsui.c:286 effectsui.c:494 +#: encodingui.c:151 fontinfo.c:2567 fontinfo.c:3987 fontinfo.c:4017 +#: fontinfo.c:4242 fontinfo.c:5006 fontinfo.c:6104 fontinfo.c:6340 +#: fontinfo.c:6761 fontinfo.c:6801 fontinfo.c:6803 fontinfo.c:10534 +#: fontview.c:506 fontview.c:1035 fontview.c:1852 fontview.c:2114 +#: fontview.c:3080 fontview.c:3665 fontview.c:4701 fontview.c:4796 +#: fontview.c:7877 fontviewbase.c:991 fontviewbase.c:1630 fvfontsdlg.c:60 #: fvfontsdlg.c:231 fvfontsdlg.c:410 fvimportbdf.c:1886 fvmetricsdlg.c:219 -#: gotodlg.c:251 groupsdlg.c:1324 groupsdlg.c:1559 histograms.c:975 +#: gotodlg.c:253 groupsdlg.c:1324 groupsdlg.c:1559 histograms.c:975 #: justifydlg.c:262 justifydlg.c:469 justifydlg.c:785 justifydlg.c:981 -#: kernclass.c:2473 kernclass.c:2847 layer2layer.c:301 lookupui.c:862 +#: kernclass.c:2538 kernclass.c:2912 layer2layer.c:301 lookupui.c:862 #: lookupui.c:1148 lookupui.c:1917 lookupui.c:2119 lookupui.c:2292 #: lookupui.c:3724 lookupui.c:4572 lookupui.c:5452 lookupui.c:5550 #: lookupui.c:5887 lookupui.c:6264 macencui.c:518 macencui.c:868 -#: macencui.c:1214 math.c:804 math.c:1189 metricsview.c:2016 -#: metricsview.c:2438 metricsview.c:2867 mmdlg.c:694 mmdlg.c:758 mmdlg.c:1052 +#: macencui.c:1214 math.c:804 math.c:1189 metricsview.c:2045 +#: metricsview.c:2467 metricsview.c:2896 mmdlg.c:694 mmdlg.c:758 mmdlg.c:1052 #: mmdlg.c:2574 nonlineartransui.c:147 nonlineartransui.c:548 -#: openfontdlg.c:376 openfontdlg.c:725 parsettf.c:5503 prefs.c:1511 -#: prefs.c:2321 problems.c:4132 savefont.c:755 savefontdlg.c:882 +#: openfontdlg.c:376 openfontdlg.c:725 parsettf.c:5503 prefs.c:1513 +#: prefs.c:2323 problems.c:4132 savefont.c:755 savefontdlg.c:882 #: savefontdlg.c:1069 savefontdlg.c:1436 savefontdlg.c:1627 savefontdlg.c:2329 #: scriptingdlg.c:325 scstylesui.c:282 scstylesui.c:1737 scstylesui.c:2215 -#: scstylesui.c:2822 scstylesui.c:2996 searchview.c:842 showatt.c:3329 +#: scstylesui.c:2822 scstylesui.c:2996 searchview.c:842 showatt.c:3336 #: simplifydlg.c:430 splinechar.c:1014 statemachine.c:762 statemachine.c:1473 #: tilepath.c:1218 tilepath.c:1888 transform.c:751 ttfinstrsui.c:774 #: ttfinstrsui.c:1473 ttfinstrsui.c:1602 ttfinstrsui.c:1928 #: ../gdraw/gaskdlg.c:1197 ../gdraw/gaskdlg.c:1234 ../gdraw/gaskdlg.c:1588 #: ../gdraw/gaskdlg.c:1647 ../gdraw/gcolor.c:682 ../gdraw/gfilechooser.c:919 -#: ../gdraw/gfiledlg.c:153 ../gdraw/gmatrixedit.c:1125 +#: ../gdraw/gfiledlg.c:153 ../gdraw/gmatrixedit.c:1219 #: ../gdraw/gresedit.c:2265 ../gdraw/gsavefiledlg.c:287 msgid "_Cancel" msgstr "取消(_C)" @@ -232,7 +231,7 @@ msgstr "" # -#: anchorsaway.c:851 charview.c:7878 +#: anchorsaway.c:851 charview.c:7901 msgid "Out of Range" msgstr "超出范围" @@ -480,8 +479,8 @@ msgstr "" # -#: autowidth2dlg.c:63 charinfo.c:1239 cvpointer.c:1357 cvstroke.c:1971 -#: cvstroke.c:2087 math.c:134 tilepath.c:1547 tilepath.c:1588 tilepath.c:1625 +#: autowidth2dlg.c:63 charinfo.c:1437 cvpointer.c:1360 cvstroke.c:1978 +#: cvstroke.c:2094 math.c:134 tilepath.c:1547 tilepath.c:1588 tilepath.c:1625 msgid "Height" msgstr "高度" @@ -516,7 +515,7 @@ msgstr "" # -#: autowidth2dlg.c:237 cvpointer.c:1524 +#: autowidth2dlg.c:237 cvpointer.c:1527 msgid "_Height:" msgstr "高度(_H)：" @@ -525,16 +524,16 @@ msgstr "" # -#: basedlg.c:71 fontinfo.c:1226 fontinfo.c:1231 justifydlg.c:51 showatt.c:1125 -#: showatt.c:1272 +#: basedlg.c:71 fontinfo.c:1226 fontinfo.c:1231 fontinfo.c:1236 +#: justifydlg.c:51 showatt.c:1132 showatt.c:1279 msgid "Language" msgstr "语言" -#: basedlg.c:72 basedlg.c:78 basedlg.c:154 charinfo.c:4654 cvgetinfo.c:510 +#: basedlg.c:72 basedlg.c:78 basedlg.c:154 charinfo.c:4977 cvgetinfo.c:510 msgid "Min" msgstr "最小" -#: basedlg.c:73 basedlg.c:79 basedlg.c:155 charinfo.c:4671 cvgetinfo.c:517 +#: basedlg.c:73 basedlg.c:79 basedlg.c:155 charinfo.c:4994 cvgetinfo.c:517 msgid "Max" msgstr "最大" @@ -584,9 +583,13 @@ #. GT: and the cursive handwriting style. Here we mean the general writing system. #. GT: See the long comment at "Property|New" #. GT: The msgstr should contain a translation of "Script", ignore "writing system|" +#. GT: English uses "script" to mean a general writing style (latin, greek, kanji) +#. GT: and the cursive handwriting style. Here we mean the general writing system. +#. GT: See the long comment at "Property|New" +#. GT: The msgstr should contain a translation of "Script", ignore "writing system|" #. GT: English uses "script" to me a general writing style (latin, greek, kanji) #. GT: and the cursive handwriting style. Here we mean the general writing system. -#: basedlg.c:412 justifydlg.c:62 lookupui.c:686 showatt.c:1861 showatt.c:1899 +#: basedlg.c:412 justifydlg.c:62 lookupui.c:686 showatt.c:1868 showatt.c:1906 msgid "writing system|Script" msgstr "文字" @@ -606,12 +609,10 @@ msgstr "" #: basedlg.c:722 -#, c-format msgid "Vertical Baselines" msgstr "垂直基准" #: basedlg.c:722 -#, c-format msgid "Horizontal Baselines" msgstr "水平基准" @@ -700,10 +701,10 @@ msgstr "取值字符均应为ASCII码" # -#: bdfinfo.c:177 bitmapview.c:1939 cvstroke.c:2512 deltaui.c:67 deltaui.c:98 -#: deltaui.c:101 deltaui.c:104 fontview.c:1137 fontview.c:1991 fontview.c:3214 -#: fontview.c:3729 fontview.c:4662 fvimportbdf.c:1875 kernclass.c:368 -#: macencui.c:724 macencui.c:1024 prefs.c:1373 prefs.c:1379 scstylesui.c:2291 +#: bdfinfo.c:177 bitmapview.c:1939 cvstroke.c:2519 deltaui.c:67 deltaui.c:98 +#: deltaui.c:101 deltaui.c:104 fontview.c:1141 fontview.c:1995 fontview.c:3218 +#: fontview.c:3733 fontview.c:4666 fvimportbdf.c:1875 kernclass.c:368 +#: macencui.c:724 macencui.c:1024 prefs.c:1375 prefs.c:1381 scstylesui.c:2291 #: ttfinstrsui.c:1040 ttfinstrsui.c:1083 ../gdraw/gresedit.c:752 #: ../gdraw/gresedit.c:783 ../gdraw/gresedit.c:795 ../gdraw/gresedit.c:875 #: ../gdraw/gresedit.c:901 ../gdraw/gresedit.c:915 @@ -748,8 +749,8 @@ msgstr "Strike 信息： %.90s" # -#: bdfinfo.c:809 cvstroke.c:2778 cvstroke.c:2826 cvstroke.c:2974 -#: cvstroke.c:3022 fontinfo.c:3300 ../gdraw/gmatrixedit.c:1998 +#: bdfinfo.c:809 cvstroke.c:2785 cvstroke.c:2833 cvstroke.c:2981 +#: cvstroke.c:3029 fontinfo.c:3044 ../gdraw/gmatrixedit.c:2053 msgid "Delete" msgstr "删除" @@ -871,7 +872,7 @@ # #. GT: X is a coordinate -#: bitmapdlg.c:375 cvgetinfo.c:3381 cvpointer.c:1343 +#: bitmapdlg.c:375 cvgetinfo.c:3381 cvpointer.c:1346 msgid "X" msgstr "X" @@ -881,12 +882,12 @@ msgstr "Win" # -#: bitmapdlg.c:395 fontinfo.c:10742 prefs.c:2285 +#: bitmapdlg.c:395 fontinfo.c:10484 prefs.c:2287 msgid "Mac" msgstr "Mac" # -#: bitmapdlg.c:492 kernclass.c:2300 +#: bitmapdlg.c:492 kernclass.c:2365 msgid "Use FreeType" msgstr "采用FreeType" @@ -918,7 +919,7 @@ msgstr "设置垂直宽度…" # -#: bitmapview.c:1933 cvstroke.c:2037 +#: bitmapview.c:1933 cvstroke.c:2044 msgid "Skew" msgstr "倾斜" @@ -928,531 +929,531 @@ msgstr "斜率" # -#: bitmapview.c:2067 charview.c:9283 fontview.c:5373 metricsview.c:3004 +#: bitmapview.c:2072 charview.c:9306 fontview.c:5403 metricsview.c:3033 msgid "New O_utline Window" msgstr "新字形窗口(_u)" # -#: bitmapview.c:2068 charview.c:9284 fontview.c:5374 metricsview.c:3005 +#: bitmapview.c:2073 charview.c:9307 fontview.c:5404 metricsview.c:3034 msgid "New _Bitmap Window" msgstr "新位图窗口(_B)" # -#: bitmapview.c:2069 charview.c:9285 fontview.c:5375 metricsview.c:3006 +#: bitmapview.c:2074 charview.c:9308 fontview.c:5405 metricsview.c:3035 msgid "New _Metrics Window" msgstr "新尺寸窗口(_M)" # -#: bitmapview.c:2071 charview.c:9287 fontview.c:5377 metricsview.c:3008 +#: bitmapview.c:2076 charview.c:9310 fontview.c:5407 metricsview.c:3037 #: uiutil.c:781 msgid "Warnings" msgstr "警告" # -#: bitmapview.c:2092 +#: bitmapview.c:2097 msgid "Flip Horizontally" msgstr "水平翻转" # -#: bitmapview.c:2092 +#: bitmapview.c:2097 msgid "Flip Vertically" msgstr "垂直翻转" # #. GT: "CW" means Clockwise -#: bitmapview.c:2094 +#: bitmapview.c:2099 msgid "Rotate 90° CW" msgstr "顺时针转九十度" # #. GT: "CW" means Counter-Clockwise -#: bitmapview.c:2096 +#: bitmapview.c:2101 msgid "Rotate 90° CCW" msgstr "逆时针转九十度" # -#: bitmapview.c:2097 +#: bitmapview.c:2102 msgid "Rotate 180°" msgstr "转一百八十度" # -#: bitmapview.c:2098 transform.c:101 +#: bitmapview.c:2103 transform.c:101 msgid "Skew..." msgstr "倾斜…" # -#: bitmapview.c:2100 bitmapview.c:2102 charview.c:9317 charview.c:9319 -#: fontview.c:4292 fontview.c:4299 metricsview.c:3041 metricsview.c:3043 +#: bitmapview.c:2105 bitmapview.c:2107 charview.c:9340 charview.c:9342 +#: fontview.c:4296 fontview.c:4303 metricsview.c:3070 metricsview.c:3072 #: openfontdlg.c:700 msgid "Font|_New" msgstr "新建(_N)" # -#: bitmapview.c:2103 charview.c:9320 fontview.c:4303 metricsview.c:3044 +#: bitmapview.c:2108 charview.c:9343 fontview.c:4307 metricsview.c:3073 msgid "_Open" msgstr "打开(_O)" # -#: bitmapview.c:2104 charview.c:9321 fontview.c:4305 metricsview.c:3045 +#: bitmapview.c:2109 charview.c:9344 fontview.c:4309 metricsview.c:3074 msgid "Recen_t" msgstr "最近的(_T)" # -#: bitmapview.c:2105 charview.c:9322 fontview.c:4306 metricsview.c:3046 +#: bitmapview.c:2110 charview.c:9345 fontview.c:4310 metricsview.c:3075 msgid "_Close" msgstr "关闭(_C)" # -#: bitmapview.c:2107 charview.c:9325 cvexportdlg.c:535 fontview.c:504 -#: fontview.c:4308 metricsview.c:3048 savefontdlg.c:1501 savefontdlg.c:2306 +#: bitmapview.c:2112 charview.c:9348 cvexportdlg.c:535 fontview.c:504 +#: fontview.c:4312 metricsview.c:3077 savefontdlg.c:1501 savefontdlg.c:2306 #: ../gdraw/gsavefiledlg.c:240 msgid "_Save" msgstr "保存(_S)" # -#: bitmapview.c:2108 charview.c:9326 fontview.c:4309 metricsview.c:3049 +#: bitmapview.c:2113 charview.c:9349 fontview.c:4313 metricsview.c:3078 msgid "S_ave as..." msgstr "另存为(_A)…" # -#: bitmapview.c:2109 charview.c:9327 fontview.c:4311 metricsview.c:3050 +#: bitmapview.c:2114 charview.c:9350 fontview.c:4315 metricsview.c:3079 msgid "_Generate Fonts..." msgstr "生成字体(_G)…" # -#: bitmapview.c:2110 charview.c:9328 fontview.c:4312 metricsview.c:3051 +#: bitmapview.c:2115 charview.c:9351 fontview.c:4316 metricsview.c:3080 msgid "Generate Mac _Family..." msgstr "生成Mac族(_F)…" -#: bitmapview.c:2111 charview.c:9329 fontview.c:4313 metricsview.c:3052 +#: bitmapview.c:2116 charview.c:9352 fontview.c:4317 metricsview.c:3081 msgid "Generate TTC..." msgstr "" # -#: bitmapview.c:2112 +#: bitmapview.c:2117 msgid "Expor_t..." msgstr "导出(_T)…" # -#: bitmapview.c:2114 charview.c:9332 fontinfo.c:7077 fontview.c:4315 +#: bitmapview.c:2119 charview.c:9355 fontinfo.c:6856 fontview.c:4319 #: sftextfield.c:972 msgid "_Import..." msgstr "导入(_I)…" # -#: bitmapview.c:2115 charview.c:9333 fontview.c:4317 +#: bitmapview.c:2120 charview.c:9356 fontview.c:4321 msgid "_Revert File" msgstr "恢复文件(_R)" # -#: bitmapview.c:2117 charview.c:9342 fontview.c:4334 metricsview.c:3058 +#: bitmapview.c:2122 charview.c:9365 fontview.c:4338 metricsview.c:3087 msgid "Pr_eferences..." msgstr "选项(_E)…" -#: bitmapview.c:2118 charview.c:9343 fontview.c:4335 metricsview.c:3059 +#: bitmapview.c:2123 charview.c:9366 fontview.c:4339 metricsview.c:3088 msgid "_X Resource Editor..." msgstr "_X 坐标编辑器..." # -#: bitmapview.c:2120 charview.c:9345 fontview.c:4337 metricsview.c:3061 +#: bitmapview.c:2125 charview.c:9368 fontview.c:4341 metricsview.c:3090 msgid "_Quit" msgstr "退出(_Q)" # -#: bitmapview.c:2125 charview.c:9374 fontview.c:4390 metricsview.c:3066 +#: bitmapview.c:2130 charview.c:9397 fontview.c:4394 metricsview.c:3095 #: sftextfield.c:965 ../gdraw/gtextfield.c:1294 msgid "_Undo" msgstr "撤销(_U)" # -#: bitmapview.c:2126 charview.c:9375 fontview.c:4391 metricsview.c:3067 +#: bitmapview.c:2131 charview.c:9398 fontview.c:4395 metricsview.c:3096 msgid "_Redo" msgstr "重做(_R)" # -#: bitmapview.c:2128 charview.c:9377 fontview.c:4393 fontview.c:5417 -#: metricsview.c:3069 sftextfield.c:967 uiutil.c:651 +#: bitmapview.c:2133 charview.c:9400 fontview.c:4397 fontview.c:5447 +#: metricsview.c:3098 sftextfield.c:967 uiutil.c:651 #: ../gdraw/gtextfield.c:1295 msgid "Cu_t" msgstr "剪切(_T)" # -#: bitmapview.c:2129 charview.c:9378 fontview.c:4394 fontview.c:5418 -#: metricsview.c:3070 sftextfield.c:968 uiutil.c:652 +#: bitmapview.c:2134 charview.c:9401 fontview.c:4398 fontview.c:5448 +#: metricsview.c:3099 sftextfield.c:968 uiutil.c:652 #: ../gdraw/gtextfield.c:1296 msgid "_Copy" msgstr "复制(_C)" # -#: bitmapview.c:2130 charview.c:9379 fontview.c:4395 fontview.c:5419 -#: metricsview.c:3071 +#: bitmapview.c:2135 charview.c:9402 fontview.c:4399 fontview.c:5449 +#: metricsview.c:3100 msgid "C_opy Reference" msgstr "复制参照(_O)" # -#: bitmapview.c:2131 charview.c:9384 fontview.c:4401 fontview.c:5421 -#: metricsview.c:3076 sftextfield.c:969 uiutil.c:653 +#: bitmapview.c:2136 charview.c:9407 fontview.c:4405 fontview.c:5451 +#: metricsview.c:3105 sftextfield.c:969 uiutil.c:653 #: ../gdraw/gtextfield.c:1297 msgid "_Paste" msgstr "粘贴(_P)" # -#: bitmapview.c:2132 charview.c:9385 combinations.c:897 fontview.c:4407 -#: fontview.c:5422 metricsview.c:3077 uiutil.c:654 +#: bitmapview.c:2137 charview.c:9408 combinations.c:897 fontview.c:4411 +#: fontview.c:5452 metricsview.c:3106 uiutil.c:654 msgid "C_lear" msgstr "清除(_L)" # -#: bitmapview.c:2134 charview.c:9350 fontview.c:4365 metricsview.c:3080 +#: bitmapview.c:2139 charview.c:9373 fontview.c:4369 metricsview.c:3109 #: ../gdraw/gaskdlg.c:1476 msgid "Select _All" msgstr "选择全部(_A)" # -#: bitmapview.c:2136 charview.c:9398 fontview.c:4422 +#: bitmapview.c:2141 charview.c:9421 fontview.c:4426 msgid "Remo_ve Undoes" msgstr "清除修改历史" # -#: bitmapview.c:2138 charview.c:9396 fontview.c:4418 fontview.c:5424 -#: metricsview.c:3083 +#: bitmapview.c:2143 charview.c:9419 fontview.c:4422 fontview.c:5454 +#: metricsview.c:3112 msgid "U_nlink Reference" msgstr "断开参照(_N)" # -#: bitmapview.c:2143 +#: bitmapview.c:2148 msgid "Flip _Horizontally" msgstr "水平翻转(_T)" # -#: bitmapview.c:2144 +#: bitmapview.c:2149 msgid "Flip _Vertically" msgstr "垂直翻转(_F)" # -#: bitmapview.c:2145 +#: bitmapview.c:2150 msgid "_Rotate 90° CW" msgstr "顺时针转九十度(_R)" # -#: bitmapview.c:2146 +#: bitmapview.c:2151 msgid "Rotate _90° CCW" msgstr "逆时针转九十度(_9)" # -#: bitmapview.c:2147 +#: bitmapview.c:2152 msgid "Rotate _180°" msgstr "转一百八十度(_1)" # -#: bitmapview.c:2148 +#: bitmapview.c:2153 msgid "_Skew..." msgstr "倾斜(_S)..." # -#: bitmapview.c:2153 charview.c:9586 fontview.c:4525 metricsview.c:3138 +#: bitmapview.c:2158 charview.c:9609 fontview.c:4529 metricsview.c:3167 msgid "_Font Info..." msgstr "字体信息(_F)…" # -#: bitmapview.c:2154 fontview.c:5426 metricsview.c:3139 +#: bitmapview.c:2159 fontview.c:5456 metricsview.c:3168 msgid "Glyph _Info..." msgstr "字形信息(_I)…" # -#: bitmapview.c:2155 +#: bitmapview.c:2160 msgid "BDF Info..." msgstr "BDF信息…" # -#: bitmapview.c:2157 fontview.c:4530 metricsview.c:3143 +#: bitmapview.c:2162 fontview.c:4534 metricsview.c:3172 msgid "Bitm_ap Strikes Available..." msgstr "可用位图部件(_A)…" # -#: bitmapview.c:2158 charview.c:9593 fontview.c:4531 metricsview.c:3144 +#: bitmapview.c:2163 charview.c:9616 fontview.c:4535 metricsview.c:3173 msgid "Regenerate _Bitmap Glyphs..." msgstr "再生位图字形(_B)…" # -#: bitmapview.c:2159 +#: bitmapview.c:2164 msgid "Remove This Glyph" msgstr "移除字形(_Y)" # -#: bitmapview.c:2161 charview.c:9597 fontview.c:4535 +#: bitmapview.c:2166 charview.c:9620 fontview.c:4539 msgid "_Transformations" msgstr "变换(_T)" # -#: bitmapview.c:2166 charview.c:9714 charview.c:10017 charview.c:10035 -#: fontview.c:5448 +#: bitmapview.c:2171 charview.c:9737 charview.c:10040 charview.c:10058 +#: fontview.c:5478 msgid "_Tools" msgstr "工具(_T)" # -#: bitmapview.c:2167 charview.c:9715 fontview.c:5024 metricsview.c:3289 +#: bitmapview.c:2172 charview.c:9738 fontview.c:5028 metricsview.c:3318 msgid "_Layers" msgstr "层(_L)" # -#: bitmapview.c:2168 +#: bitmapview.c:2173 msgid "_Shades" msgstr "渲染(_S)" # -#: bitmapview.c:2170 charview.c:9717 +#: bitmapview.c:2175 charview.c:9740 msgid "_Docked Palettes" msgstr "停靠的工具栏(_D)" # -#: bitmapview.c:2175 charview.c:9842 +#: bitmapview.c:2180 charview.c:9865 msgid "_Fit" msgstr "适合(_F)" # -#: bitmapview.c:2176 charview.c:9843 metricsview.c:3277 +#: bitmapview.c:2181 charview.c:9866 metricsview.c:3306 msgid "Z_oom out" msgstr "缩小(_O)" # -#: bitmapview.c:2177 charview.c:9844 metricsview.c:3278 +#: bitmapview.c:2182 charview.c:9867 metricsview.c:3307 msgid "Zoom _in" msgstr "放大(_I)" # -#: bitmapview.c:2179 charview.c:9850 fontview.c:5018 metricsview.c:3283 +#: bitmapview.c:2184 charview.c:9873 fontview.c:5022 metricsview.c:3312 msgid "_Next Glyph" msgstr "下一字形(_N)" # -#: bitmapview.c:2180 charview.c:9851 fontview.c:5019 metricsview.c:3284 +#: bitmapview.c:2185 charview.c:9874 fontview.c:5023 metricsview.c:3313 msgid "_Prev Glyph" msgstr "上一字形(_P)" # -#: bitmapview.c:2181 charview.c:9852 fontview.c:5020 metricsview.c:3285 +#: bitmapview.c:2186 charview.c:9875 fontview.c:5024 metricsview.c:3314 msgid "Next _Defined Glyph" msgstr "下一定义的字形(_D)" # -#: bitmapview.c:2182 charview.c:9853 fontview.c:5021 metricsview.c:3286 +#: bitmapview.c:2187 charview.c:9876 fontview.c:5025 metricsview.c:3315 msgid "Prev Defined Gl_yph" msgstr "上一定义的字形(_Y)" # -#: bitmapview.c:2183 charview.c:9855 fontview.c:5022 +#: bitmapview.c:2188 charview.c:9878 fontview.c:5026 msgid "_Goto" msgstr "转到(_G)" # -#: bitmapview.c:2184 charview.c:9856 metricsview.c:3287 +#: bitmapview.c:2189 charview.c:9879 metricsview.c:3316 msgid "Find In Font _View" msgstr "在字体视窗中查找(_V)" # -#: bitmapview.c:2186 +#: bitmapview.c:2191 msgid "_Bigger Pixel Size" msgstr "增大像素大小(_B)" # -#: bitmapview.c:2187 +#: bitmapview.c:2192 msgid "_Smaller Pixel Size" msgstr "减小像素大小(_S)" # -#: bitmapview.c:2189 +#: bitmapview.c:2194 msgid "_Palettes" msgstr "工具栏(_P)" # -#: bitmapview.c:2194 charview.c:9700 cvpalettes.c:3168 fontview.c:5213 -#: fontview.c:5438 +#: bitmapview.c:2199 charview.c:9723 cvpalettes.c:3168 fontview.c:5217 +#: fontview.c:5468 msgid "Set _Width..." msgstr "设置宽度(_W)…" # -#: bitmapview.c:2195 +#: bitmapview.c:2200 msgid "Set _Vertical Width..." msgstr "设置垂直宽度(_V)…" # -#: bitmapview.c:2200 charview.c:10012 charview.c:10030 fontview.c:5444 -#: metricsview.c:3575 +#: bitmapview.c:2205 charview.c:10035 charview.c:10053 fontview.c:5474 +#: metricsview.c:3604 msgid "_File" msgstr "文件(_F)" # -#: bitmapview.c:2201 charview.c:10013 charview.c:10031 fontview.c:5445 -#: metricsview.c:3576 ttfinstrsui.c:783 +#: bitmapview.c:2206 charview.c:10036 charview.c:10054 fontview.c:5475 +#: metricsview.c:3605 ttfinstrsui.c:783 msgid "_Edit" msgstr "编辑(_E)" # -#: bitmapview.c:2202 charview.c:10015 charview.c:10033 fontview.c:5446 -#: metricsview.c:3577 +#: bitmapview.c:2207 charview.c:10038 charview.c:10056 fontview.c:5476 +#: metricsview.c:3606 msgid "E_lement" msgstr "基础(_L)" # -#: bitmapview.c:2203 charview.c:9954 charview.c:10020 charview.c:10038 -#: fontview.c:5452 metricsview.c:3578 +#: bitmapview.c:2208 charview.c:9977 charview.c:10043 charview.c:10061 +#: fontview.c:5482 metricsview.c:3607 msgid "_View" msgstr "查看(_V)" # -#: bitmapview.c:2204 charview.c:10021 charview.c:10039 fontview.c:5453 -#: metricsview.c:3579 +#: bitmapview.c:2209 charview.c:10044 charview.c:10062 fontview.c:5483 +#: metricsview.c:3608 msgid "_Metrics" msgstr "尺寸(_M)" # -#: bitmapview.c:2205 charview.c:10024 charview.c:10040 fontview.c:5457 -#: metricsview.c:3580 +#: bitmapview.c:2210 charview.c:10047 charview.c:10063 fontview.c:5487 +#: metricsview.c:3609 msgid "_Window" msgstr "窗口(_W)" # -#: bitmapview.c:2206 charview.c:10025 charview.c:10041 fontview.c:5408 -#: fontview.c:5458 metricsview.c:3581 +#: bitmapview.c:2211 charview.c:10048 charview.c:10064 fontview.c:5438 +#: fontview.c:5488 metricsview.c:3610 msgid "_Help" msgstr "帮助(_H)" # -#: bitmapview.c:2318 +#: bitmapview.c:2323 msgid "Recalculate Bitmaps" msgstr "再算位图" # -#: charinfo.c:146 fontinfo.c:10252 +#: charinfo.c:147 fontinfo.c:9994 msgid "Automatic" msgstr "自动" # -#: charinfo.c:147 +#: charinfo.c:148 msgid "No Class" msgstr "无类属" # -#: charinfo.c:148 cvgetinfo.c:1456 +#: charinfo.c:149 cvgetinfo.c:1456 msgid "Base Glyph" msgstr "基本字形" # -#: charinfo.c:149 cvgetinfo.c:1467 +#: charinfo.c:150 cvgetinfo.c:1467 msgid "Base Lig" msgstr "基础连字符" # -#: charinfo.c:150 charview.c:1692 cvgetinfo.c:1445 showatt.c:1409 +#: charinfo.c:151 charview.c:1692 cvgetinfo.c:1445 showatt.c:1416 msgid "Mark" msgstr "标记" # -#: charinfo.c:151 showatt.c:1410 +#: charinfo.c:152 showatt.c:1417 msgid "Component" msgstr "组成" -#: charinfo.c:158 fontview.c:4352 fontview.c:4492 groupsdlg.c:44 +#: charinfo.c:159 fontview.c:4356 fontview.c:4496 groupsdlg.c:44 msgid "Color|Choose..." msgstr "颜色| 选择..." # -#: charinfo.c:159 fontview.c:4353 fontview.c:4493 groupsdlg.c:45 +#: charinfo.c:160 fontview.c:4357 fontview.c:4497 groupsdlg.c:45 msgid "Color|Default" msgstr "默认" # -#: charinfo.c:171 +#: charinfo.c:172 msgid "New Positioning" msgstr "新位置" # -#: charinfo.c:171 +#: charinfo.c:172 msgid "New Pair Position" msgstr "新对位置" # -#: charinfo.c:172 +#: charinfo.c:173 msgid "New Substitution Variant" msgstr "新替换变量" # -#: charinfo.c:173 +#: charinfo.c:174 msgid "New Alternate List" msgstr "新替代列表" # -#: charinfo.c:173 +#: charinfo.c:174 msgid "New Multiple List" msgstr "新多重替代列表" # -#: charinfo.c:173 +#: charinfo.c:174 msgid "New Ligature" msgstr "新连写" # -#: charinfo.c:303 +#: charinfo.c:304 msgid "New Counter Mask" msgstr "新计数蒙版" # -#: charinfo.c:303 +#: charinfo.c:304 msgid "Edit Counter Mask" msgstr "编辑计数蒙版" # -#: charinfo.c:319 +#: charinfo.c:320 msgid "Select hints between which counters are formed" msgstr "选择消隐" # -#: charinfo.c:506 charinfo.c:4032 +#: charinfo.c:507 charinfo.c:4355 msgid "Unicode _Value:" msgstr "统一码值(_V)：" # -#: charinfo.c:531 charinfo.c:933 charinfo.c:943 charview.c:2804 -#: contextchain.c:551 contextchain.c:830 cvgetinfo.c:979 cvpalettes.c:1365 -#: cvpointer.c:1156 cvundoes.c:2022 cvundoes.c:2243 cvundoes.c:3559 -#: fontviewbase.c:103 fontviewbase.c:1404 fvfontsdlg.c:60 fvmetricsdlg.c:59 -#: lookupui.c:3723 metricsview.c:2015 mmdlg.c:1976 parsettfbmf.c:483 -#: prefs.c:1388 problems.c:2734 savefont.c:754 savefontdlg.c:1336 -#: savefontdlg.c:1435 splinechar.c:1005 splinechar.c:1014 splinefont.c:1238 -#: tottf.c:1376 tottf.c:6119 +#: charinfo.c:532 charinfo.c:934 charinfo.c:944 charinfo.c:1357 +#: charview.c:2808 contextchain.c:661 contextchain.c:983 cvgetinfo.c:979 +#: cvpalettes.c:1365 cvpointer.c:1159 cvundoes.c:2022 cvundoes.c:2243 +#: cvundoes.c:3559 fontviewbase.c:103 fontviewbase.c:1404 fvfontsdlg.c:60 +#: fvmetricsdlg.c:59 lookupui.c:3723 metricsview.c:2044 mmdlg.c:1976 +#: parsettfbmf.c:483 prefs.c:1390 problems.c:2734 savefont.c:754 +#: savefontdlg.c:1336 savefontdlg.c:1435 splinechar.c:1005 splinechar.c:1014 +#: splinefont.c:1238 tottf.c:1466 tottf.c:6209 msgid "_Yes" msgstr "是(_Y)" # -#: charinfo.c:531 charview.c:2805 charview.c:8281 contextchain.c:551 -#: contextchain.c:830 cvgetinfo.c:979 cvpalettes.c:1365 cvpointer.c:1157 +#: charinfo.c:532 charview.c:2809 charview.c:8304 contextchain.c:661 +#: contextchain.c:983 cvgetinfo.c:979 cvpalettes.c:1365 cvpointer.c:1160 #: cvundoes.c:2025 cvundoes.c:2243 cvundoes.c:3562 fontviewbase.c:107 -#: fontviewbase.c:1405 fvfontsdlg.c:60 fvmetricsdlg.c:60 metricsview.c:2437 -#: mmdlg.c:1976 parsettfbmf.c:484 prefs.c:1389 problems.c:2735 -#: savefontdlg.c:1337 splinechar.c:1005 splinefont.c:1238 tottf.c:1379 -#: tottf.c:6119 +#: fontviewbase.c:1405 fvfontsdlg.c:60 fvmetricsdlg.c:60 metricsview.c:2466 +#: mmdlg.c:1976 parsettfbmf.c:484 prefs.c:1391 problems.c:2735 +#: savefontdlg.c:1337 splinechar.c:1005 splinefont.c:1238 tottf.c:1469 +#: tottf.c:6209 msgid "_No" msgstr "否(_N)" # -#: charinfo.c:536 charinfo.c:539 charinfo.c:542 charinfo.c:557 charinfo.c:560 -#: fontinfo.c:2285 +#: charinfo.c:537 charinfo.c:540 charinfo.c:543 charinfo.c:558 charinfo.c:561 +#: fontinfo.c:2286 msgid "Bad Name" msgstr "不良名称" # -#: charinfo.c:536 +#: charinfo.c:537 msgid "Glyph names are limitted to 31 characters" msgstr "字形名称最长31个字符" # -#: charinfo.c:542 +#: charinfo.c:543 msgid "A glyph name may not start with a digit nor a full stop (period)" msgstr "字形名称不能以数字或句号点开头" # -#: charinfo.c:557 +#: charinfo.c:558 #, c-format msgid "" "A glyph name must be ASCII, without spaces and may not contain the " @@ -1464,7 +1465,7 @@ "只能用字母、句点或下划线。" # -#: charinfo.c:560 +#: charinfo.c:561 msgid "" "A glyph name should contain only alphanumerics, periods and underscores\n" "Do you want to use this name in spite of that?" @@ -1473,11 +1474,11 @@ "你想用其他字符么？" # -#: charinfo.c:877 +#: charinfo.c:878 msgid "Duplicate Ligature" msgstr "复制连写组合" -#: charinfo.c:877 +#: charinfo.c:878 #, c-format msgid "" "There are two ligature entries with the same components (%.80s) in the same " @@ -1485,11 +1486,11 @@ msgstr "" # -#: charinfo.c:890 +#: charinfo.c:891 msgid "Duplicate Kern data" msgstr "复制缩合信息" -#: charinfo.c:890 +#: charinfo.c:891 #, c-format msgid "" "There are two kerning entries for the same glyph (%.80s) in the same lookup " @@ -1497,32 +1498,32 @@ msgstr "" # -#: charinfo.c:908 charinfo.c:1287 lookupui.c:3769 +#: charinfo.c:909 charinfo.c:1485 lookupui.c:3769 msgid "Bad Device Table Adjustment" msgstr "不良设备表调整" -#: charinfo.c:908 lookupui.c:3769 +#: charinfo.c:909 lookupui.c:3769 #, c-format msgid "A device table adjustment specified for %.80s is invalid" msgstr "" # -#: charinfo.c:924 lookupui.c:3713 +#: charinfo.c:925 lookupui.c:3713 msgid "Missing glyph name" msgstr "缺字形名称" -#: charinfo.c:924 +#: charinfo.c:925 #, c-format msgid "You must specify a glyph name for subtable %s" msgstr "你必须为子表%s指定一个符号名" # -#: charinfo.c:936 cvundoes.c:2799 cvundoes.c:2938 kernclass.c:1875 -#: lookupui.c:3701 lookupui.c:3726 +#: charinfo.c:937 cvundoes.c:2799 cvundoes.c:2938 kernclass.c:1875 +#: kernclass.c:1940 lookupui.c:3701 lookupui.c:3726 msgid "Missing glyph" msgstr "缺字形" -#: charinfo.c:936 +#: charinfo.c:937 #, c-format msgid "" "In lookup subtable %.30s you refer to a glyph named %.80s, which is not in " @@ -1530,11 +1531,11 @@ msgstr "" # -#: charinfo.c:946 +#: charinfo.c:947 msgid "Substitution generates itself" msgstr "替代自身" -#: charinfo.c:946 +#: charinfo.c:947 #, c-format msgid "" "In lookup subtable %.30s you replace a glyph with itself. Was this " @@ -1542,20 +1543,20 @@ msgstr "" # -#: charinfo.c:1135 +#: charinfo.c:1136 msgid "Unicode out of range" msgstr "统一码超出范围" -#: charinfo.c:1135 +#: charinfo.c:1136 msgid "Bad unicode value for an alternate unicode / variation selector" msgstr "" # -#: charinfo.c:1147 +#: charinfo.c:1148 msgid "Unexpected Variation Selector" msgstr "未预期的变差选择" -#: charinfo.c:1148 +#: charinfo.c:1149 #, c-format msgid "" "Variation selectors are normally between\n" @@ -1566,108 +1567,108 @@ msgstr "" # -#: charinfo.c:1240 +#: charinfo.c:1438 msgid "Depth" msgstr "深度" # -#: charinfo.c:1241 lookups.c:40 math.c:70 math.c:157 +#: charinfo.c:1439 lookups.c:41 math.c:70 math.c:157 msgid "Italic Correction" msgstr "斜体修正值" -#: charinfo.c:1242 +#: charinfo.c:1440 msgid "Top Accent Horizontal Pos" msgstr "上重音符号水平位置" # -#: charinfo.c:1245 +#: charinfo.c:1443 msgid "Horizontal Extension Italic Correction" msgstr "水平间距倾斜修正" # -#: charinfo.c:1246 +#: charinfo.c:1444 msgid "Vertical Extension Italic Correction" msgstr "垂直间距倾斜修正" -#: charinfo.c:1254 +#: charinfo.c:1452 msgid "Tile Margin" msgstr "" -#: charinfo.c:1256 +#: charinfo.c:1454 msgid "Tile Min X" msgstr "" -#: charinfo.c:1257 +#: charinfo.c:1455 msgid "Tile Min Y" msgstr "" -#: charinfo.c:1258 +#: charinfo.c:1456 msgid "Tile Max X" msgstr "" -#: charinfo.c:1259 +#: charinfo.c:1457 msgid "Tile Max Y" msgstr "" # -#: charinfo.c:1268 +#: charinfo.c:1466 msgid "Ligature Caret Count" msgstr "连写位计数" -#: charinfo.c:1272 +#: charinfo.c:1470 msgid "Bad Lig. Caret Count" msgstr "不良连写位计数" -#: charinfo.c:1272 +#: charinfo.c:1470 msgid "Unreasonable ligature caret count" msgstr "不良连写位计数" -#: charinfo.c:1287 +#: charinfo.c:1485 msgid "A device table adjustment specified for the MATH table is invalid" msgstr "" # -#: charinfo.c:1860 +#: charinfo.c:2180 msgid "Only a single character allowed" msgstr "只许单一字符" # -#: charinfo.c:1899 +#: charinfo.c:2219 msgid "Pixel Size" msgstr "像素大小" # -#: charinfo.c:1900 +#: charinfo.c:2220 msgid "Correction" msgstr "修正值" # -#: charinfo.c:1962 +#: charinfo.c:2282 msgid "Bad correction" msgstr "不良修正值" -#: charinfo.c:1962 +#: charinfo.c:2282 #, c-format msgid "" "The correction on line %d is too big. It must be between -128 and 127" msgstr "" # -#: charinfo.c:1966 +#: charinfo.c:2286 msgid "Bad pixel size" msgstr "不良像素" -#: charinfo.c:1966 +#: charinfo.c:2286 #, c-format msgid "The pixel size on line %d is out of bounds." msgstr "" # -#: charinfo.c:2039 +#: charinfo.c:2359 msgid "Device Table Adjustments" msgstr "设备表调整" -#: charinfo.c:2055 +#: charinfo.c:2375 msgid "" "At small pixel sizes (screen font sizes)\n" "the rounding errors that occur may be\n" @@ -1677,33 +1678,33 @@ msgstr "" # -#: charinfo.c:2101 +#: charinfo.c:2421 msgid "PixelSize|New" msgstr "新建" # -#: charinfo.c:2127 charinfo.c:2132 charinfo.c:2137 charinfo.c:2142 -#: charinfo.c:2148 charinfo.c:2164 charinfo.c:2186 charinfo.c:2194 +#: charinfo.c:2447 charinfo.c:2452 charinfo.c:2457 charinfo.c:2462 +#: charinfo.c:2468 charinfo.c:2484 charinfo.c:2506 charinfo.c:2514 msgid "Subtable" msgstr "替代表" # -#: charinfo.c:2128 lookupui.c:2546 +#: charinfo.c:2448 lookupui.c:2546 msgid "Replacement Glyph Name" msgstr "替换字形名称" # -#: charinfo.c:2133 lookupui.c:2551 +#: charinfo.c:2453 lookupui.c:2551 msgid "Source Glyph Names" msgstr "源字形名称" # -#: charinfo.c:2138 charinfo.c:2143 lookupui.c:2556 +#: charinfo.c:2458 charinfo.c:2463 lookupui.c:2556 msgid "Replacement Glyph Names" msgstr "替换字形名称" # -#: charinfo.c:2149 charinfo.c:2187 lookupui.c:2574 lookupui.c:2624 +#: charinfo.c:2469 charinfo.c:2507 lookupui.c:2574 lookupui.c:2624 msgid "∆x" msgstr "∆x" @@ -1712,9 +1713,9 @@ #. GT: concept which allows small corrections for small pixel sizes where #. GT: rounding errors (in kerning for example) may smush too glyphs together #. GT: or space them too far apart. Generally not a problem for big pixelsizes -#: charinfo.c:2154 charinfo.c:2156 charinfo.c:2158 charinfo.c:2160 -#: charinfo.c:2167 charinfo.c:2169 charinfo.c:2171 charinfo.c:2173 -#: charinfo.c:2175 charinfo.c:2177 charinfo.c:2179 charinfo.c:2181 +#: charinfo.c:2474 charinfo.c:2476 charinfo.c:2478 charinfo.c:2480 +#: charinfo.c:2487 charinfo.c:2489 charinfo.c:2491 charinfo.c:2493 +#: charinfo.c:2495 charinfo.c:2497 charinfo.c:2499 charinfo.c:2501 #: lookupui.c:2579 lookupui.c:2581 lookupui.c:2583 lookupui.c:2585 #: lookupui.c:2592 lookupui.c:2594 lookupui.c:2596 lookupui.c:2598 #: lookupui.c:2600 lookupui.c:2602 lookupui.c:2604 lookupui.c:2606 math.c:72 @@ -1723,177 +1724,177 @@ msgstr "调整" # -#: charinfo.c:2155 charinfo.c:2188 lookupui.c:2580 lookupui.c:2625 +#: charinfo.c:2475 charinfo.c:2508 lookupui.c:2580 lookupui.c:2625 msgid "∆y" msgstr "∆y" # -#: charinfo.c:2157 charinfo.c:2189 lookupui.c:2582 lookupui.c:2626 +#: charinfo.c:2477 charinfo.c:2509 lookupui.c:2582 lookupui.c:2626 msgid "∆x_adv" msgstr "∆x_adv" # -#: charinfo.c:2159 charinfo.c:2190 lookupui.c:2584 lookupui.c:2627 +#: charinfo.c:2479 charinfo.c:2510 lookupui.c:2584 lookupui.c:2627 msgid "∆y_adv" msgstr "∆y_adv" # -#: charinfo.c:2165 charinfo.c:2195 lookupui.c:2590 lookupui.c:2632 +#: charinfo.c:2485 charinfo.c:2515 lookupui.c:2590 lookupui.c:2632 msgid "Second Glyph Name" msgstr "次字形名称" # -#: charinfo.c:2166 charinfo.c:2196 lookupui.c:2591 lookupui.c:2633 +#: charinfo.c:2486 charinfo.c:2516 lookupui.c:2591 lookupui.c:2633 msgid "∆x #1" msgstr "∆x #1" # -#: charinfo.c:2168 charinfo.c:2197 lookupui.c:2593 lookupui.c:2634 +#: charinfo.c:2488 charinfo.c:2517 lookupui.c:2593 lookupui.c:2634 msgid "∆y #1" msgstr "∆y #1" # -#: charinfo.c:2170 charinfo.c:2198 lookupui.c:2595 lookupui.c:2635 +#: charinfo.c:2490 charinfo.c:2518 lookupui.c:2595 lookupui.c:2635 msgid "∆x_adv #1" msgstr "∆x_adv #1" # -#: charinfo.c:2172 charinfo.c:2199 lookupui.c:2597 lookupui.c:2636 +#: charinfo.c:2492 charinfo.c:2519 lookupui.c:2597 lookupui.c:2636 msgid "∆y_adv #1" msgstr "∆y_adv #1" # -#: charinfo.c:2174 charinfo.c:2200 lookupui.c:2599 lookupui.c:2637 +#: charinfo.c:2494 charinfo.c:2520 lookupui.c:2599 lookupui.c:2637 msgid "∆x #2" msgstr "∆x #2" # -#: charinfo.c:2176 charinfo.c:2201 lookupui.c:2601 lookupui.c:2638 +#: charinfo.c:2496 charinfo.c:2521 lookupui.c:2601 lookupui.c:2638 msgid "∆y #2" msgstr "∆y #2" # -#: charinfo.c:2178 charinfo.c:2202 lookupui.c:2603 lookupui.c:2639 +#: charinfo.c:2498 charinfo.c:2522 lookupui.c:2603 lookupui.c:2639 msgid "∆x_adv #2" msgstr "∆x_adv #2" # -#: charinfo.c:2180 charinfo.c:2203 lookupui.c:2605 lookupui.c:2640 +#: charinfo.c:2500 charinfo.c:2523 lookupui.c:2605 lookupui.c:2640 msgid "∆y_adv #2" msgstr "∆y_adv #2" # -#: charinfo.c:3253 math.c:58 +#: charinfo.c:3573 math.c:58 msgid "false" msgstr "假" # -#: charinfo.c:3254 math.c:59 +#: charinfo.c:3574 math.c:59 msgid "true" msgstr "真" # -#: charinfo.c:3258 charview.c:3109 math.c:63 math.c:69 math.c:78 math.c:87 +#: charinfo.c:3578 charview.c:3113 math.c:63 math.c:69 math.c:78 math.c:87 #: math.c:93 math.c:104 math.c:122 msgid "Glyph" msgstr "字形" # -#: charinfo.c:3259 math.c:123 +#: charinfo.c:3579 math.c:123 msgid "Extender" msgstr "扩展" # #. GT: "Len" is an abreviation for "Length" -#: charinfo.c:3261 math.c:125 +#: charinfo.c:3581 math.c:125 msgid "StartLen" msgstr "起始长度" # -#: charinfo.c:3262 math.c:126 +#: charinfo.c:3582 math.c:126 msgid "EndLen" msgstr "终止长度" # -#: charinfo.c:3263 math.c:127 +#: charinfo.c:3583 math.c:127 msgid "FullLen" msgstr "全长" # -#: charinfo.c:3379 charinfo.c:4705 deltaui.c:404 groupsdlg.c:1260 +#: charinfo.c:3702 charinfo.c:5028 deltaui.c:404 groupsdlg.c:1260 #: parsettf.c:4472 msgid "Unicode" msgstr "统一码" -#: charinfo.c:3380 +#: charinfo.c:3703 msgid "Variation Selector (or 0)" msgstr "变形选择(或 0)" -#: charinfo.c:3577 cvstroke.c:2589 fontview.c:1959 fontview.c:2375 +#: charinfo.c:3900 cvstroke.c:2596 fontview.c:1963 fontview.c:2379 #: groupsdlg.c:1006 ../gdraw/gbuttons.c:199 msgid "Pick a color" msgstr "选取颜色" # -#: charinfo.c:3612 +#: charinfo.c:3935 #, c-format msgid "Glyph Info for %.40s" msgstr "字形信息：%.40s" # -#: charinfo.c:3613 +#: charinfo.c:3936 msgid "Glyph Info..." msgstr "字形信息…" # -#: charinfo.c:3721 +#: charinfo.c:4044 msgid "No components" msgstr "无组成" # -#: charinfo.c:3722 charinfo.c:4290 +#: charinfo.c:4045 charinfo.c:4613 msgid "Accented glyph composed of:" msgstr "重音字形合成自：" # -#: charinfo.c:3723 +#: charinfo.c:4046 msgid "Glyph composed of:" msgstr "字形合成自：" # -#: charinfo.c:3888 displayfonts.c:2027 kernclass.c:3131 math.c:2005 +#: displayfonts.c:2027 kernclass.c:3196 math.c:2005 msgid "_Done" msgstr "完成" # -#: charinfo.c:3999 +#: charinfo.c:4322 msgid "Glyph Info" msgstr "字形信息" -#: charinfo.c:4014 +#: charinfo.c:4337 msgid "Glyph _Name:" msgstr "字形名称(_N):" # -#: charinfo.c:4050 +#: charinfo.c:4373 msgid "Unicode C_har:" msgstr "统一码字符(_C):" # -#: charinfo.c:4070 +#: charinfo.c:4393 msgid "Set From N_ame" msgstr "按名称(_A)" # -#: charinfo.c:4081 +#: charinfo.c:4404 msgid "Set From Val_ue" msgstr "按值(_U)" -#: charinfo.c:4096 +#: charinfo.c:4419 msgid "Alternate Unicode Encodings / Variation Selectors" msgstr "替代统一码 /变形选择" -#: charinfo.c:4100 +#: charinfo.c:4423 msgid "" "Some glyphs may be used for more than one\n" "unicode code point -- I don't recommend\n" @@ -1912,15 +1913,15 @@ msgstr "" # -#: charinfo.c:4124 +#: charinfo.c:4447 msgid "OT _Glyph Class:" msgstr "OT字形类(_G)" -#: charinfo.c:4139 +#: charinfo.c:4462 msgid "Mark for Unlink, Remove Overlap Before Save" msgstr "标记未连接的，保存前移除重叠者" -#: charinfo.c:4144 +#: charinfo.c:4467 msgid "" "A few glyphs, like Aring, Ccedilla, Eogonek\n" "are composed of two overlapping references.\n" @@ -1936,21 +1937,21 @@ msgstr "" # -#: charinfo.c:4159 charinfo.c:4710 fontinfo.c:10711 ttfinstrsui.c:1366 +#: charinfo.c:4482 charinfo.c:5033 fontinfo.c:10453 ttfinstrsui.c:1366 msgid "Comment" msgstr "说明" # -#: charinfo.c:4175 cvstroke.c:2670 cvstroke.c:2865 +#: charinfo.c:4498 cvstroke.c:2677 cvstroke.c:2872 msgid "Color:" msgstr "颜色" # -#: charinfo.c:4214 lookupui.c:4267 +#: charinfo.c:4537 lookupui.c:4267 msgid "_Hide Unused Columns" msgstr "隐藏不用的列(_H)" -#: charinfo.c:4220 +#: charinfo.c:4543 msgid "" "Don't display columns of 0s.\n" "The OpenType lookup allows for up to 8 kinds\n" @@ -1959,29 +1960,29 @@ msgstr "" # -#: charinfo.c:4242 +#: charinfo.c:4565 msgid "CounterHint|_New..." msgstr "新建(_N)…" # -#: charinfo.c:4254 cvgetinfo.c:1564 encoding.c:1175 encoding.c:1610 -#: encodingui.c:162 fontinfo.c:10182 groupsdlg.c:1202 kernclass.c:3097 -#: macencui.c:663 macencui.c:1181 macencui.c:1375 mmdlg.c:2971 prefs.c:1928 +#: charinfo.c:4577 cvgetinfo.c:1564 encoding.c:1175 encoding.c:1610 +#: encodingui.c:162 groupsdlg.c:1202 kernclass.c:3162 macencui.c:663 +#: macencui.c:1181 macencui.c:1375 mmdlg.c:2971 prefs.c:1930 msgid "_Delete" msgstr "删除" # -#: charinfo.c:4266 fontinfo.c:10194 kernclass.c:3109 macencui.c:674 -#: macencui.c:1192 macencui.c:1387 mmdlg.c:2982 prefs.c:1940 +#: charinfo.c:4589 kernclass.c:3174 macencui.c:674 macencui.c:1192 +#: macencui.c:1387 mmdlg.c:2982 prefs.c:1942 msgid "_Edit..." msgstr "编辑(_E)…" # -#: charinfo.c:4314 cvstroke.c:2226 metricsview.c:639 tilepath.c:1811 +#: charinfo.c:4637 cvstroke.c:2233 metricsview.c:644 tilepath.c:1811 msgid "Height:" msgstr "高:" -#: charinfo.c:4319 +#: charinfo.c:4642 msgid "" "The height and depth fields are the metrics fields used\n" "by TeX, they are corrected for optical distortion.\n" @@ -1989,21 +1990,21 @@ msgstr "" # -#: charinfo.c:4331 charinfo.c:4358 charinfo.c:4385 charinfo.c:4423 +#: charinfo.c:4654 charinfo.c:4681 charinfo.c:4708 charinfo.c:4746 msgid "Guess" msgstr "猜测" # -#: charinfo.c:4341 +#: charinfo.c:4664 msgid "Depth:" msgstr "深:" # -#: charinfo.c:4368 +#: charinfo.c:4691 msgid "Italic Correction:" msgstr "斜体修正值：" -#: charinfo.c:4374 +#: charinfo.c:4697 msgid "" "The Italic correction field is used by both TeX and the MS 'MATH'\n" "table. It is used when joining slanted text (italic) to upright.\n" @@ -2011,7 +2012,7 @@ "will not run into the upright text." msgstr "" -#: charinfo.c:4399 +#: charinfo.c:4722 msgid "" "A device table for italic correction.\n" "Expects a comma separated list of \":\"\n" @@ -2019,29 +2020,29 @@ msgstr "" # -#: charinfo.c:4405 +#: charinfo.c:4728 msgid "Top Accent Pos:" msgstr "上升部位置:" -#: charinfo.c:4412 +#: charinfo.c:4735 msgid "" "In the MS 'MATH' table this value specifies where (horizontally)\n" "an accent should be placed above the glyph. Vertical placement\n" "is handled by other means" msgstr "" -#: charinfo.c:4437 +#: charinfo.c:4760 msgid "" "A device table for horizontal accent positioning.\n" "Expects a comma separated list of \":\"\n" "As \"9:-1,12:1,13:1\"" msgstr "" -#: charinfo.c:4443 math.c:64 +#: charinfo.c:4766 math.c:64 msgid "Is Extended Shape" msgstr "扩展形" -#: charinfo.c:4450 +#: charinfo.c:4773 msgid "" "Is this an extended shape (like a tall parenthesis)?\n" "Extended shapes need special attention for vertical\n" @@ -2049,22 +2050,22 @@ msgstr "" # -#: charinfo.c:4454 math.c:1925 +#: charinfo.c:4777 math.c:1925 msgid "Math Kerning" msgstr "数学压缩" -#: charinfo.c:4460 +#: charinfo.c:4783 msgid "" "Brings up a dialog which gives fine control over\n" "horizontal positioning of subscripts and superscripts\n" "depending on their vertical positioning." msgstr "" -#: charinfo.c:4481 +#: charinfo.c:4804 msgid "Default Ligature Caret Count" msgstr "" -#: charinfo.c:4487 charinfo.c:4499 charinfo.c:4506 +#: charinfo.c:4810 charinfo.c:4822 charinfo.c:4829 msgid "" "Ligature caret locations are used by a text editor\n" "when it needs to draw a text edit caret inside a\n" @@ -2076,26 +2077,26 @@ "appropriate place)." msgstr "" -#: charinfo.c:4493 +#: charinfo.c:4816 msgid "Ligature Caret Count:" msgstr "连写位计数：" # -#: charinfo.c:4522 +#: charinfo.c:4845 msgid "Variant Glyphs:" msgstr "变化字形：" -#: charinfo.c:4528 +#: charinfo.c:4851 msgid "" "A list of the names of pre defined glyphs which represent\n" "bigger versions of the current glyph." msgstr "" -#: charinfo.c:4537 +#: charinfo.c:4860 msgid "Glyph Extension Components" msgstr "字形扩展部件" -#: charinfo.c:4542 +#: charinfo.c:4865 msgid "" "A really big version of this glyph may be made up of the\n" "following component glyphs. They will be stacked either\n" @@ -2109,17 +2110,17 @@ # #. GT: "Cor" is an abbreviation for correction -#: charinfo.c:4547 +#: charinfo.c:4870 msgid "Italic Cor:" msgstr "斜体修正：" -#: charinfo.c:4552 +#: charinfo.c:4875 msgid "" "The italic correction of the composed glyph. Should be independent of glyph " "size" msgstr "" -#: charinfo.c:4595 +#: charinfo.c:4918 msgid "" "If this glyph is used as a pattern to tile\n" "some other glyph then it is useful to specify\n" @@ -2129,159 +2130,159 @@ "explicitly." msgstr "" -#: charinfo.c:4608 +#: charinfo.c:4931 msgid "Tile Margin:" msgstr "" -#: charinfo.c:4629 +#: charinfo.c:4952 msgid "Tile Bounding Box:" msgstr "" # #. GT: X is a coordinate, the leading spaces help to align it -#: charinfo.c:4640 fontinfo.c:8953 +#: charinfo.c:4963 fontinfo.c:8732 msgid " X" msgstr " X" -#: charinfo.c:4647 +#: charinfo.c:4970 msgid " Y" msgstr "" # -#: charinfo.c:4715 fontinfo.c:9111 +#: charinfo.c:5038 fontinfo.c:8890 msgid "Pos" msgstr "位置" # -#: charinfo.c:4717 +#: charinfo.c:5040 msgid "Positionings" msgstr "定位" # -#: charinfo.c:4723 +#: charinfo.c:5046 msgid "Pair" msgstr "对" # -#: charinfo.c:4725 +#: charinfo.c:5048 msgid "Pairwise Pos" msgstr "配对位置" # -#: charinfo.c:4731 +#: charinfo.c:5054 msgid "Subs" msgstr "替代" # -#: charinfo.c:4733 +#: charinfo.c:5056 msgid "Substitutions" msgstr "替代" # -#: charinfo.c:4738 +#: charinfo.c:5061 msgid "Alt Subs" msgstr "交换替代" # -#: charinfo.c:4742 +#: charinfo.c:5065 msgid "Mult Subs" msgstr "多重替代" # -#: charinfo.c:4747 showatt.c:1408 +#: charinfo.c:5070 showatt.c:1415 msgid "Ligature" msgstr "连体" # -#: charinfo.c:4749 combinations.c:116 showatt.c:648 +#: charinfo.c:5072 combinations.c:116 showatt.c:655 msgid "Ligatures" msgstr "连体" # -#: charinfo.c:4754 +#: charinfo.c:5077 msgid "Components" msgstr "组成" # -#: charinfo.c:4760 +#: charinfo.c:5083 msgid "Lig. Carets" msgstr "连写位" # -#: charinfo.c:4765 scstylesui.c:2674 +#: charinfo.c:5088 scstylesui.c:2674 msgid "Counters" msgstr "计数" # -#: charinfo.c:4769 +#: charinfo.c:5092 msgid "ΤεΧ & Math" msgstr "ΤεΧ 及数学符号" # #. GT: "Vert." is an abbreviation for Vertical -#: charinfo.c:4775 math.c:160 +#: charinfo.c:5098 math.c:160 msgid "Vert. Variants" msgstr "垂直变形" # #. GT: "Horiz." is an abbreviation for Horizontal -#: charinfo.c:4781 +#: charinfo.c:5104 msgid "Horiz. Variants" msgstr "水平变形" -#: charinfo.c:4788 +#: charinfo.c:5111 msgid "Tile Size" msgstr "" # -#: charinfo.c:4811 contextchain.c:1253 cvgetinfo.c:1582 cvgetinfo.c:3154 +#: charinfo.c:5134 contextchain.c:2124 cvgetinfo.c:1582 cvgetinfo.c:3154 #: cvgetinfo.c:3570 cvhints.c:534 mmdlg.c:2552 msgid "< _Prev" msgstr "<前(_P)" # -#: charinfo.c:4823 contextchain.c:1263 cvgetinfo.c:1595 cvgetinfo.c:3166 +#: charinfo.c:5146 contextchain.c:2134 cvgetinfo.c:1595 cvgetinfo.c:3166 #: cvgetinfo.c:3581 cvhints.c:545 mmdlg.c:2563 msgid "_Next >" msgstr "后(_N)>" # -#: charinfo.c:4966 +#: charinfo.c:5289 msgid "Select By ATT..." msgstr "按ATT选择…" # -#: charinfo.c:4966 +#: charinfo.c:5289 msgid "No glyphs matched" msgstr "无匹配字形" # -#: charinfo.c:5043 cvundoes.c:2866 +#: charinfo.c:5366 cvundoes.c:2866 msgid "No Lookups" msgstr "无查找" # -#: charinfo.c:5043 +#: charinfo.c:5366 msgid "No applicable lookup subtables" msgstr "无可用查找子表" # -#: charinfo.c:5060 +#: charinfo.c:5383 msgid "Select By Lookup Subtable" msgstr "按子表搜索选择" # -#: charinfo.c:5072 +#: charinfo.c:5395 msgid "Select Glyphs in lookup subtable" msgstr "在查找替代表中选择字形" # -#: charinfo.c:5088 fontview.c:1805 fontview.c:2067 +#: charinfo.c:5411 fontview.c:1809 fontview.c:2071 msgid "Select Results" msgstr "选择结果" # -#: charinfo.c:5093 +#: charinfo.c:5416 msgid "" "Set the selection of the font view to the glyphs\n" "found by this search" @@ -2290,12 +2291,12 @@ "搜到的字形" # -#: charinfo.c:5098 fontview.c:1813 fontview.c:2075 +#: charinfo.c:5421 fontview.c:1817 fontview.c:2079 msgid "Merge Results" msgstr "混成结果" # -#: charinfo.c:5103 +#: charinfo.c:5426 msgid "" "Expand the selection of the font view to include\n" "all the glyphs found by this search" @@ -2304,12 +2305,12 @@ "此次搜索到的所有字形" # -#: charinfo.c:5108 fontview.c:1821 fontview.c:2083 +#: charinfo.c:5431 fontview.c:1825 fontview.c:2087 msgid "Restrict Selection" msgstr "限制选择" # -#: charinfo.c:5113 +#: charinfo.c:5436 msgid "" "Only search the selected glyphs, and unselect\n" "any characters which do not match this search" @@ -2675,7 +2676,7 @@ msgstr "" # -#: charview.c:1692 showatt.c:1407 +#: charview.c:1692 showatt.c:1414 msgid "Base" msgstr "基本" @@ -2709,16 +2710,16 @@ #. GT: $1 is the name of the glyph #. GT: $2 is the glyph's encoding #. GT: $3 is the font name -#: charview.c:2738 +#: charview.c:2742 #, c-format msgid "%1$.80s at %2$d from %3$.90s" msgstr "%1$.80s , %2$d : %3$.90s" -#: charview.c:2807 tottf.c:1382 +#: charview.c:2811 tottf.c:1472 msgid "Bad Point Numbering" msgstr "" -#: charview.c:2807 tottf.c:1382 +#: charview.c:2811 tottf.c:1472 #, c-format msgid "" "The points in %s are not numbered properly. This means that any instructions " @@ -2726,19 +2727,19 @@ "Would you like me to remove the instructions?" msgstr "" -#: charview.c:2903 charview.c:2905 charview.c:10219 charview.c:10221 +#: charview.c:2907 charview.c:2909 charview.c:10242 charview.c:10244 #: cvpalettes.c:1005 cvpalettes.c:1007 msgid "You may not use spiros" msgstr "" -#: charview.c:2903 charview.c:10219 +#: charview.c:2907 charview.c:10242 msgid "" "This glyph should display spiro points, but unfortunately this version of " "fontforge was not linked with the spiro library, so only normal bezier " "points will be displayed." msgstr "" -#: charview.c:2905 charview.c:10221 +#: charview.c:2909 charview.c:10244 msgid "" "This glyph should display spiro points, but unfortunately FontForge was " "unable to load libspiro, spiros are not available for use, and normal bezier " @@ -2747,13 +2748,13 @@ # #. GT: Guide layer, make it short -#: charview.c:3100 cvpalettes.c:1332 +#: charview.c:3104 cvpalettes.c:1332 msgid "Guide" msgstr "引导层" # #. GT: Background, make it short -#: charview.c:3102 cvpalettes.c:1332 cvstroke.c:606 cvstroke.c:1539 +#: charview.c:3106 cvpalettes.c:1332 cvstroke.c:606 cvstroke.c:1539 #: diffstubs.c:638 math.c:1880 searchview.c:618 splinefont.c:1951 #: splineutil2.c:4069 tilepath.c:1021 msgid "Back" @@ -2761,112 +2762,112 @@ # #. GT: Foreground, make it short -#: charview.c:3104 cvstroke.c:608 cvstroke.c:1541 diffstubs.c:640 math.c:1882 +#: charview.c:3108 cvstroke.c:608 cvstroke.c:1541 diffstubs.c:640 math.c:1882 #: searchview.c:620 splineutil2.c:4071 tilepath.c:1023 msgid "Fore" msgstr "前景" # -#: charview.c:3108 +#: charview.c:3112 msgid "'fpgm'" msgstr "'fpgm'" # -#: charview.c:3109 +#: charview.c:3113 msgid "'prep'" msgstr "'prep'" -#: charview.c:4296 +#: charview.c:4319 msgid "Not Guides" msgstr "" -#: charview.c:4296 +#: charview.c:4319 msgid "References may not be dragged into the guidelines layer" msgstr "" # -#: charview.c:4810 charview.c:7826 +#: charview.c:4833 charview.c:7849 msgid "Name this contour" msgstr "命名此轮廓" -#: charview.c:4811 +#: charview.c:4834 msgid "You may attach a text label to this guideline if you wish to" msgstr "" # -#: charview.c:5288 fontviewbase.c:1758 +#: charview.c:5311 fontviewbase.c:1758 msgid "Old sfd file" msgstr "旧SFD文件" -#: charview.c:5288 fontviewbase.c:1758 +#: charview.c:5311 fontviewbase.c:1758 msgid "" "This font comes from an old format sfd file. Not all aspects of it can be " "reverted successfully." msgstr "" # -#: charview.c:5292 fontviewbase.c:1770 +#: charview.c:5315 fontviewbase.c:1770 msgid "Can't Find Glyph" msgstr "未找到字形" # -#: charview.c:5292 fontviewbase.c:1770 +#: charview.c:5315 fontviewbase.c:1770 #, c-format msgid "The glyph, %.80s, can't be found in the sfd file" msgstr "字形%.80s未能在此sfd文件中找到" -#: charview.c:5543 +#: charview.c:5566 msgid "Define \"Almost Horizontal\"" msgstr "" -#: charview.c:5544 +#: charview.c:5567 msgid "" "A line is \"almost\" horizontal (or vertical)\n" "if the coordinates are within this many em-units" msgstr "" -#: charview.c:5550 +#: charview.c:5573 msgid "Bad number" msgstr "" -#: charview.c:7181 +#: charview.c:7204 msgid "No Intersections" msgstr "" # -#: charview.c:7827 +#: charview.c:7850 msgid "Please name this contour" msgstr "请为此轮廓命名" # -#: charview.c:7878 +#: charview.c:7901 #, c-format msgid "The spline does not reach %g" msgstr "样条线不到 %g" # -#: charview.c:7981 +#: charview.c:8004 msgid "Insert a point on the given spline at either..." msgstr "在样条线上插入一点" # -#: charview.c:7991 cvgetinfo.c:1379 cvgetinfo.c:3462 cvgridfit.c:302 -#: cvpointer.c:1439 +#: charview.c:8014 cvgetinfo.c:1379 cvgetinfo.c:3462 cvgridfit.c:302 +#: cvpointer.c:1442 msgid "_X:" msgstr "_X:" # -#: charview.c:8002 cvgetinfo.c:1398 cvgetinfo.c:3479 cvpointer.c:1452 +#: charview.c:8025 cvgetinfo.c:1398 cvgetinfo.c:3479 cvpointer.c:1455 msgid "_Y:" msgstr "_Y:" # -#: charview.c:8201 cvgetinfo.c:1046 +#: charview.c:8224 cvgetinfo.c:1046 msgid "Make a new anchor class" msgstr "生成新的锚类属" # -#: charview.c:8201 cvgetinfo.c:1046 +#: charview.c:8224 cvgetinfo.c:1046 msgid "" "I cannot find an unused anchor class\n" "to assign a new point to. If you\n" @@ -2881,1022 +2882,1022 @@ "基础->字体信息" # -#: charview.c:8280 metricsview.c:2014 metricsview.c:2436 +#: charview.c:8303 metricsview.c:2043 metricsview.c:2465 msgid "_Unlink" msgstr "断开链接(_U)" # -#: charview.c:8284 fontviewbase.c:993 metricsview.c:2440 +#: charview.c:8307 fontviewbase.c:993 metricsview.c:2469 msgid "Flipped Reference" msgstr "翻转参照" -#: charview.c:8284 fontviewbase.c:993 metricsview.c:2440 +#: charview.c:8307 fontviewbase.c:993 metricsview.c:2469 #, c-format msgid "" "%.50s contains a flipped reference. This cannot be corrected as is. Would " "you like me to unlink it and then correct it?" msgstr "" -#: charview.c:8617 fontviewbase.c:1254 fontviewbase.c:1256 +#: charview.c:8640 fontviewbase.c:1254 fontviewbase.c:1256 msgid "Things could be better..." msgstr "情形应该会好些..." -#: charview.c:8617 +#: charview.c:8640 #, c-format msgid "" "Glyph, %s, has no hints. FontForge will not produce many instructions." msgstr "" # -#: charview.c:8896 +#: charview.c:8919 msgid "Deselect Width" msgstr "不选宽度" # -#: charview.c:8896 cvpointer.c:1356 cvstroke.c:1943 cvstroke.c:2086 +#: charview.c:8919 cvpointer.c:1359 cvstroke.c:1950 cvstroke.c:2093 #: displayfonts.c:620 displayfonts.c:1214 tilepath.c:1541 tilepath.c:1555 #: tilepath.c:1587 tilepath.c:1624 ../gdraw/ggadgets.c:109 msgid "Width" msgstr "宽度" # -#: charview.c:8905 +#: charview.c:8928 msgid "Deselect VWidth" msgstr "不选垂直宽度" # -#: charview.c:8905 +#: charview.c:8928 msgid "VWidth" msgstr "垂直宽度" -#: charview.c:9323 +#: charview.c:9346 msgid "C_lose Tab" msgstr "" -#: charview.c:9330 +#: charview.c:9353 msgid "E_xport..." msgstr "" # -#: charview.c:9334 fontview.c:4319 +#: charview.c:9357 fontview.c:4323 msgid "Revert Gl_yph" msgstr "恢复字形(_Y)" # -#: charview.c:9336 fontview.c:4321 metricsview.c:3056 +#: charview.c:9359 fontview.c:4325 metricsview.c:3085 msgid "_Print..." msgstr "打印(_P)…" # -#: charview.c:9339 fontview.c:4324 fontview.c:4326 +#: charview.c:9362 fontview.c:4328 fontview.c:4330 msgid "E_xecute Script..." msgstr "执行脚本(_x)…" # -#: charview.c:9351 fontview.c:4366 +#: charview.c:9374 fontview.c:4370 msgid "_Invert Selection" msgstr "反选(_I)" # -#: charview.c:9352 fontview.c:4367 metricsview.c:3081 +#: charview.c:9375 fontview.c:4371 metricsview.c:3110 msgid "_Deselect All" msgstr "不选全部(_D)" # -#: charview.c:9354 +#: charview.c:9377 msgid "_First Point" msgstr "第一点(_F)" # -#: charview.c:9355 +#: charview.c:9378 msgid "First P_oint, Next Contour" msgstr "第一点，下一曲线(_O)" # -#: charview.c:9356 +#: charview.c:9379 msgid "_Next Point" msgstr "下一点(_N)" # -#: charview.c:9357 +#: charview.c:9380 msgid "_Prev Point" msgstr "上一点(_P)" # -#: charview.c:9358 +#: charview.c:9381 msgid "Ne_xt Control Point" msgstr "下一控制点(_X)" # -#: charview.c:9359 +#: charview.c:9382 msgid "P_rev Control Point" msgstr "上一控制点(_R)" # -#: charview.c:9360 +#: charview.c:9383 msgid "Points on Selected _Contours" msgstr "曲线上的全部点(_C)" # -#: charview.c:9361 +#: charview.c:9384 msgid "Point A_t" msgstr "点位于(_T)" # -#: charview.c:9363 +#: charview.c:9386 msgid "Select All _Points & Refs" msgstr "选择全部点及参照(_P)" # -#: charview.c:9364 +#: charview.c:9387 msgid "Select Open Contours" msgstr "选择已打开的轮廓" # -#: charview.c:9365 +#: charview.c:9388 msgid "Select Anc_hors" msgstr "选择锚点(_H)" # -#: charview.c:9366 cvstroke.c:2484 +#: charview.c:9389 cvstroke.c:2491 msgid "_Width" msgstr "宽度(_W)" # -#: charview.c:9367 +#: charview.c:9390 msgid "_VWidth" msgstr "垂直宽度(_V)" # -#: charview.c:9369 +#: charview.c:9392 msgid "Select Points Affected by HM" msgstr "选择受HM影响的点" -#: charview.c:9380 +#: charview.c:9403 msgid "Copy Loo_kup Data" msgstr "复制查找数据(_K)" # -#: charview.c:9381 fontview.c:4397 fontview.c:5420 metricsview.c:3072 +#: charview.c:9404 fontview.c:4401 fontview.c:5450 metricsview.c:3101 msgid "Copy _Width" msgstr "复制宽度(_W)" # -#: charview.c:9382 fontview.c:4399 metricsview.c:3074 +#: charview.c:9405 fontview.c:4403 metricsview.c:3103 msgid "Co_py LBearing" msgstr "复制左边位(_p)" # -#: charview.c:9383 fontview.c:4400 metricsview.c:3075 +#: charview.c:9406 fontview.c:4404 metricsview.c:3104 msgid "Copy RBearin_g" msgstr "复制右边位(_g)" # -#: charview.c:9386 fontview.c:4408 +#: charview.c:9409 fontview.c:4412 msgid "Clear _Background" msgstr "清除背景(_B)" # -#: charview.c:9387 +#: charview.c:9410 msgid "points|_Merge" msgstr "混成(_M)" # -#: charview.c:9389 fontview.c:4411 metricsview.c:3078 +#: charview.c:9412 fontview.c:4415 metricsview.c:3107 msgid "_Join" msgstr "连接(_J)" # -#: charview.c:9390 fontview.c:4409 fontview.c:5423 +#: charview.c:9413 fontview.c:4413 fontview.c:5453 msgid "Copy _Fg To Bg" msgstr "复制前景到背景(_F)" -#: charview.c:9391 +#: charview.c:9414 msgid "Cop_y Layer To Layer..." msgstr "" # -#: charview.c:9392 +#: charview.c:9415 msgid "Copy Gri_d Fit" msgstr "复制网格填充(_d)" # -#: charview.c:9394 fontview.c:4413 +#: charview.c:9417 fontview.c:4417 msgid "_Select" msgstr "选择(_S)" # -#: charview.c:9406 cvpalettes.c:231 +#: charview.c:9429 cvpalettes.c:231 msgid "_Curve" msgstr "曲线(_C)" # -#: charview.c:9407 cvpalettes.c:232 +#: charview.c:9430 cvpalettes.c:232 msgid "_HVCurve" msgstr "水平垂直曲线(_H)" # -#: charview.c:9408 charview.c:9437 cvpalettes.c:233 cvpalettes.c:262 +#: charview.c:9431 charview.c:9460 cvpalettes.c:233 cvpalettes.c:262 #: cvpalettes.c:627 msgid "C_orner" msgstr "角(_O)" # -#: charview.c:9409 cvpalettes.c:234 simplifydlg.c:84 +#: charview.c:9432 cvpalettes.c:234 simplifydlg.c:84 msgid "_Tangent" msgstr "相切(_T)" # #. GT: Make this (selected) point the first point in the glyph -#: charview.c:9412 charview.c:9442 +#: charview.c:9435 charview.c:9465 msgid "_Make First" msgstr "设为第一点(_M)" # -#: charview.c:9414 +#: charview.c:9437 msgid "Can Be _Interpolated" msgstr "可插值(_I)" -#: charview.c:9415 +#: charview.c:9438 msgid "Can't _Be Interpolated" msgstr "" -#: charview.c:9416 +#: charview.c:9439 msgid "Center Bet_ween Control Points" msgstr "" # -#: charview.c:9418 charview.c:9444 +#: charview.c:9441 charview.c:9467 msgid "_Add Anchor" msgstr "增加锚点(_A)" -#: charview.c:9420 +#: charview.c:9443 msgid "Acceptable _Extrema" msgstr "可接受的极值(_E)" # -#: charview.c:9422 +#: charview.c:9445 msgid "Make _Line" msgstr "画线(_L)" -#: charview.c:9423 +#: charview.c:9446 msgid "Ma_ke Arc" msgstr "" -#: charview.c:9424 +#: charview.c:9447 msgid "Inse_rt Point On Spline At..." msgstr "" # -#: charview.c:9425 charview.c:9446 +#: charview.c:9448 charview.c:9469 msgid "_Name Contour" msgstr "命名轮廓(_N)" -#: charview.c:9427 +#: charview.c:9450 msgid "Make Clip _Path" msgstr "" -#: charview.c:9430 charview.c:9448 +#: charview.c:9453 charview.c:9471 msgid "Tool_s" msgstr "" # -#: charview.c:9435 +#: charview.c:9458 msgid "G4 _Curve" msgstr "G4曲线(_C)" # -#: charview.c:9436 +#: charview.c:9459 msgid "_G2 Curve" msgstr "G2曲线(_G)" # -#: charview.c:9438 +#: charview.c:9461 msgid "_Left Constraint" msgstr "左约束(_L)" # -#: charview.c:9439 +#: charview.c:9462 msgid "_Right Constraint" msgstr "右约束(_R)" # #. GT: Align these points to their average position -#: charview.c:9454 +#: charview.c:9477 msgid "_Average Points" msgstr "平均点(_A)" # -#: charview.c:9455 +#: charview.c:9478 msgid "_Space Points" msgstr "空点(_S)" # -#: charview.c:9456 +#: charview.c:9479 msgid "Space _Regions..." msgstr "空白区域(_R)…" # -#: charview.c:9458 +#: charview.c:9481 msgid "Make _Parallel..." msgstr "使平行(_P)…" # -#: charview.c:9463 charview.c:9604 fontview.c:4427 fontview.c:4542 -#: metricsview.c:3088 metricsview.c:3151 +#: charview.c:9486 charview.c:9627 fontview.c:4431 fontview.c:4546 +#: metricsview.c:3117 metricsview.c:3180 msgid "_Simplify" msgstr "简化(_S)" # -#: charview.c:9464 fontview.c:4428 metricsview.c:3089 +#: charview.c:9487 fontview.c:4432 metricsview.c:3118 msgid "Simplify More..." msgstr "简化更多…" # -#: charview.c:9465 fontview.c:4429 metricsview.c:3090 +#: charview.c:9488 fontview.c:4433 metricsview.c:3119 msgid "Clea_nup Glyph" msgstr "清理字形(_N)" # -#: charview.c:9466 fontview.c:4430 +#: charview.c:9489 fontview.c:4434 msgid "Canonical Start _Point" msgstr "正则起点(_P)" # -#: charview.c:9467 fontview.c:4431 +#: charview.c:9490 fontview.c:4435 msgid "Canonical _Contours" msgstr "正则轮廓(_C)" # -#: charview.c:9495 cvpalettes.c:1441 encoding.c:644 +#: charview.c:9518 cvpalettes.c:1441 encoding.c:644 msgid "_First" msgstr "首先(_F)" # -#: charview.c:9496 cvpalettes.c:1441 +#: charview.c:9519 cvpalettes.c:1441 msgid "_Earlier" msgstr "早先(_E)" # -#: charview.c:9497 cvpalettes.c:1441 +#: charview.c:9520 cvpalettes.c:1441 msgid "L_ater" msgstr "后来(_A)" # -#: charview.c:9498 cvpalettes.c:1441 +#: charview.c:9521 cvpalettes.c:1441 msgid "_Last" msgstr "最后(_L)" # -#: charview.c:9537 fontview.c:4436 metricsview.c:3095 metricsview.c:3150 +#: charview.c:9560 fontview.c:4440 metricsview.c:3124 metricsview.c:3179 msgid "_Remove Overlap" msgstr "合并重叠(_R)" # -#: charview.c:9538 fontview.c:4437 metricsview.c:3096 +#: charview.c:9561 fontview.c:4441 metricsview.c:3125 msgid "_Intersect" msgstr "交叠(_I)" # -#: charview.c:9539 +#: charview.c:9562 msgid "_Exclude" msgstr "去除(_E)" # -#: charview.c:9540 fontview.c:4438 metricsview.c:3097 +#: charview.c:9563 fontview.c:4442 metricsview.c:3126 msgid "_Find Intersections" msgstr "寻找交叠(_F)" # -#: charview.c:9545 fontview.c:4443 +#: charview.c:9568 fontview.c:4447 msgid "Change _Weight..." msgstr "更改粗细(_W)..." -#: charview.c:9546 fontview.c:4444 +#: charview.c:9569 fontview.c:4448 msgid "_Italic..." msgstr "" -#: charview.c:9547 fontview.c:4445 +#: charview.c:9570 fontview.c:4449 msgid "Obli_que..." msgstr "" -#: charview.c:9548 fontview.c:4446 +#: charview.c:9571 fontview.c:4450 msgid "_Condense/Extend..." msgstr "压缩/扩展(_C)..." -#: charview.c:9549 fontview.c:4447 +#: charview.c:9572 fontview.c:4451 msgid "Change _X-Height..." msgstr "" -#: charview.c:9550 fontview.c:4448 +#: charview.c:9573 fontview.c:4452 msgid "Change _Glyph..." msgstr "" -#: charview.c:9552 fontview.c:4453 +#: charview.c:9575 fontview.c:4457 msgid "In_line..." msgstr "" -#: charview.c:9553 fontview.c:4454 +#: charview.c:9576 fontview.c:4458 msgid "_Outline..." msgstr "" -#: charview.c:9554 fontview.c:4455 +#: charview.c:9577 fontview.c:4459 msgid "S_hadow..." msgstr "" -#: charview.c:9555 fontview.c:4456 +#: charview.c:9578 fontview.c:4460 msgid "_Wireframe..." msgstr "" # -#: charview.c:9560 fontview.c:4461 metricsview.c:3110 +#: charview.c:9583 fontview.c:4465 metricsview.c:3139 msgid "_Build Accented Glyph" msgstr "生成首饰字形(_B)" # -#: charview.c:9561 fontview.c:4462 metricsview.c:3111 +#: charview.c:9584 fontview.c:4466 metricsview.c:3140 msgid "Build _Composite Glyph" msgstr "生成组合字形(_C)" # -#: charview.c:9566 fontview.c:4472 +#: charview.c:9589 fontview.c:4476 msgid "_References..." msgstr "参照(_R)…" # -#: charview.c:9567 fontview.c:4473 +#: charview.c:9590 fontview.c:4477 msgid "_Substitutions..." msgstr "替换(_S)…" # -#: charview.c:9572 fontview.c:4478 fontview.c:5427 metricsview.c:3146 +#: charview.c:9595 fontview.c:4482 fontview.c:5457 metricsview.c:3175 msgid "_Transform..." msgstr "变换(_T)…" # -#: charview.c:9573 fontview.c:4479 +#: charview.c:9596 fontview.c:4483 msgid "_Point of View Projection..." msgstr "投影视点(_P)…" # -#: charview.c:9574 fontview.c:4480 +#: charview.c:9597 fontview.c:4484 msgid "_Non Linear Transform..." msgstr "非线性变换(_N)…" # -#: charview.c:9579 fontview.c:4485 fontview.c:5432 metricsview.c:3153 +#: charview.c:9602 fontview.c:4489 fontview.c:5462 metricsview.c:3182 msgid "To _Int" msgstr "到整点(_I)" # -#: charview.c:9580 fontview.c:4486 +#: charview.c:9603 fontview.c:4490 msgid "To _Hundredths" msgstr "到百分点(_H)" # -#: charview.c:9581 fontview.c:4487 +#: charview.c:9604 fontview.c:4491 msgid "_Cluster" msgstr "簇(_C)" -#: charview.c:9587 fontview.c:4526 +#: charview.c:9610 fontview.c:4530 msgid "_Glyph Info..." msgstr "" # -#: charview.c:9588 +#: charview.c:9611 msgid "Get _Info..." msgstr "查看信息(_I)…" # -#: charview.c:9589 metricsview.c:3140 +#: charview.c:9612 metricsview.c:3169 msgid "S_how Dependent" msgstr "显示依赖(_H)" -#: charview.c:9590 +#: charview.c:9613 msgid "Find Proble_ms..." msgstr "" # -#: charview.c:9592 +#: charview.c:9615 msgid "Bitm_ap strikes Available..." msgstr "可用位图部件(_A)…" # -#: charview.c:9594 fontview.c:4532 +#: charview.c:9617 fontview.c:4536 msgid "Remove Bitmap Glyphs..." msgstr "移除位图字形…" -#: charview.c:9596 +#: charview.c:9619 msgid "St_yles" msgstr "" # -#: charview.c:9598 fontview.c:4536 fontview.c:5428 +#: charview.c:9621 fontview.c:4540 fontview.c:5458 msgid "_Expand Stroke..." msgstr "扩展重音符(_E)…" # -#: charview.c:9600 fontview.c:4538 metricsview.c:3148 +#: charview.c:9623 fontview.c:4542 metricsview.c:3177 msgid "Tile _Path..." msgstr "铺垫路径(_P)…" -#: charview.c:9601 fontview.c:4539 +#: charview.c:9624 fontview.c:4543 msgid "Tile Pattern..." msgstr "" # -#: charview.c:9603 fontview.c:4541 +#: charview.c:9626 fontview.c:4545 msgid "O_verlap" msgstr "重叠(_V)" # -#: charview.c:9605 fontview.c:4543 metricsview.c:3152 +#: charview.c:9628 fontview.c:4547 metricsview.c:3181 msgid "Add E_xtrema" msgstr "增加极点(_X)" # -#: charview.c:9606 fontview.c:4545 metricsview.c:3155 +#: charview.c:9629 fontview.c:4549 metricsview.c:3184 msgid "Autot_race" msgstr "自动循迹(_R)" # -#: charview.c:9608 +#: charview.c:9631 msgid "A_lign" msgstr "对齐(_L)" # -#: charview.c:9609 fontview.c:4544 +#: charview.c:9632 fontview.c:4548 msgid "Roun_d" msgstr "取整(_D)" -#: charview.c:9610 +#: charview.c:9633 msgid "_Order" msgstr "" -#: charview.c:9612 +#: charview.c:9635 msgid "Check Self-Intersection" msgstr "" -#: charview.c:9613 +#: charview.c:9636 msgid "Glyph Self-Intersects" msgstr "" -#: charview.c:9614 +#: charview.c:9637 msgid "Cloc_kwise" msgstr "" # -#: charview.c:9615 +#: charview.c:9638 msgid "Cou_nter Clockwise" msgstr "逆时针(_N)" # -#: charview.c:9616 cvimportdlg.c:315 fontview.c:4547 fontview.c:5433 -#: metricsview.c:3157 +#: charview.c:9639 cvimportdlg.c:315 fontview.c:4551 fontview.c:5463 +#: metricsview.c:3186 msgid "_Correct Direction" msgstr "正确方向(_C)" -#: charview.c:9617 +#: charview.c:9640 msgid "Reverse Direction" msgstr "" -#: charview.c:9619 +#: charview.c:9642 msgid "Insert Text Outlines..." msgstr "" # -#: charview.c:9621 fontview.c:4549 metricsview.c:3159 +#: charview.c:9644 fontview.c:4553 metricsview.c:3188 msgid "B_uild" msgstr "生成(_U)" -#: charview.c:9623 fontview.c:4554 +#: charview.c:9646 fontview.c:4558 msgid "Compare Layers..." msgstr "" # -#: charview.c:9628 fontview.c:5188 fontview.c:5435 +#: charview.c:9651 fontview.c:5192 fontview.c:5465 msgid "Auto_Hint" msgstr "自动消隐(_H)" # -#: charview.c:9629 fontview.c:5189 +#: charview.c:9652 fontview.c:5193 msgid "Hint _Substitution Pts" msgstr "消隐替换点(_S)" # -#: charview.c:9630 fontview.c:5190 +#: charview.c:9653 fontview.c:5194 msgid "Auto _Counter Hint" msgstr "自动计数消隐(_C)" # -#: charview.c:9631 fontview.c:5191 +#: charview.c:9654 fontview.c:5195 msgid "_Don't AutoHint" msgstr "不自动消隐(_D)" # -#: charview.c:9633 fontview.c:5193 +#: charview.c:9656 fontview.c:5197 msgid "Auto_Instr" msgstr "自动指令(_I)" # -#: charview.c:9634 fontview.c:5194 +#: charview.c:9657 fontview.c:5198 msgid "_Edit Instructions..." msgstr "编辑指令(_E)…" # -#: charview.c:9635 +#: charview.c:9658 msgid "_Debug..." msgstr "调试(_D)…" -#: charview.c:9636 fontview.c:5200 +#: charview.c:9659 fontview.c:5204 msgid "S_uggest Deltas..." msgstr "" # -#: charview.c:9638 +#: charview.c:9661 msgid "_Clear HStem" msgstr "清除水平项(_C)" # -#: charview.c:9639 +#: charview.c:9662 msgid "Clear _VStem" msgstr "清除垂直项(_V)" # -#: charview.c:9640 +#: charview.c:9663 msgid "Clear DStem" msgstr "清除DStem" # -#: charview.c:9641 fontview.c:5204 +#: charview.c:9664 fontview.c:5208 msgid "Clear Instructions" msgstr "清除指令" # -#: charview.c:9643 +#: charview.c:9666 msgid "_Add HHint" msgstr "增加水平消隐(_A)" # -#: charview.c:9644 +#: charview.c:9667 msgid "Add VHi_nt" msgstr "增加垂直消隐(_N)" # -#: charview.c:9645 +#: charview.c:9668 msgid "Add DHint" msgstr "增加对角消隐" # -#: charview.c:9646 +#: charview.c:9669 msgid "Crea_te HHint..." msgstr "创建水平消隐(_T)…" # -#: charview.c:9647 +#: charview.c:9670 msgid "Cr_eate VHint..." msgstr "创建垂直消隐(_T)…" # -#: charview.c:9649 +#: charview.c:9672 msgid "_Review Hints..." msgstr "查看消隐(_R)…" # #. GT: In the next few lines the "%s" is the name of an anchor class, and the #. GT: rest of the string identifies the type of the anchor -#: charview.c:9677 +#: charview.c:9700 #, c-format msgid "%s at ligature pos %d" msgstr "%s 于连写组合位 %d" # -#: charview.c:9680 +#: charview.c:9703 #, c-format msgid "%s exit" msgstr "%s 退出" # -#: charview.c:9681 +#: charview.c:9704 #, c-format msgid "%s entry" msgstr "%s 入口" # -#: charview.c:9682 +#: charview.c:9705 #, c-format msgid "%s mark" msgstr "%s 标记" # -#: charview.c:9683 +#: charview.c:9706 #, c-format msgid "%s base" msgstr "%s 基础" # -#: charview.c:9698 fontview.c:5211 fontview.c:5437 metricsview.c:3341 +#: charview.c:9721 fontview.c:5215 fontview.c:5467 metricsview.c:3370 msgid "_Center in Width" msgstr "宽度中心(_C)" # -#: charview.c:9699 fontview.c:5212 metricsview.c:3342 +#: charview.c:9722 fontview.c:5216 metricsview.c:3371 msgid "_Thirds in Width" msgstr "宽度三分之一(_T)" # -#: charview.c:9701 fontview.c:5214 +#: charview.c:9724 fontview.c:5218 msgid "Set _LBearing..." msgstr "设置左边位(_L)…" # -#: charview.c:9702 fontview.c:5215 +#: charview.c:9725 fontview.c:5219 msgid "Set _RBearing..." msgstr "设置右边位(_R)…" -#: charview.c:9703 fontview.c:5216 +#: charview.c:9726 fontview.c:5220 msgid "Set Both Bearings..." msgstr "" # -#: charview.c:9705 fontview.c:5218 fontview.c:5439 +#: charview.c:9728 fontview.c:5222 fontview.c:5469 msgid "Set _Vertical Advance..." msgstr "设置垂直间距(_V)…" # -#: charview.c:9707 +#: charview.c:9730 msgid "Remove Kern _Pairs" msgstr "移除压缩对(_P)" # -#: charview.c:9708 +#: charview.c:9731 msgid "Remove VKern Pairs" msgstr "移除垂直压缩对" # -#: charview.c:9709 fontview.c:5223 metricsview.c:3349 +#: charview.c:9732 fontview.c:5227 metricsview.c:3378 msgid "Kern Pair Closeup..." msgstr "压缩对详览…" # -#: charview.c:9722 +#: charview.c:9745 msgid "_Detach" msgstr "分离(_D)" # -#: charview.c:9781 fontview.c:4575 metricsview.c:3180 +#: charview.c:9804 fontview.c:4579 metricsview.c:3209 msgid "_Kern Pairs" msgstr "压缩对(_K)" # -#: charview.c:9782 fontview.c:4576 metricsview.c:3181 +#: charview.c:9805 fontview.c:4580 metricsview.c:3210 msgid "_Anchored Pairs" msgstr "锚点对(_A)" # -#: charview.c:9783 +#: charview.c:9806 msgid "_Anchor Control..." msgstr "锚点控制(_A)…" # -#: charview.c:9784 +#: charview.c:9807 msgid "Anchor _Glyph at Point" msgstr "字形锚点(_G)" # -#: charview.c:9785 fontview.c:4577 metricsview.c:3182 +#: charview.c:9808 fontview.c:4581 metricsview.c:3211 msgid "_Ligatures" msgstr "连写组合字(_L)" # -#: charview.c:9790 +#: charview.c:9813 msgid "PointNumbers|_None" msgstr "无(_N)" # -#: charview.c:9791 openfontdlg.c:125 savefontdlg.c:164 +#: charview.c:9814 openfontdlg.c:125 savefontdlg.c:164 msgid "TrueType" msgstr "TrueType" # -#: charview.c:9792 savefontdlg.c:564 +#: charview.c:9815 savefontdlg.c:564 msgid "PostScript®" msgstr "PostScript®" # -#: charview.c:9793 cvexportdlg.c:245 cvimportdlg.c:413 cvimportdlg.c:434 +#: charview.c:9816 cvexportdlg.c:245 cvimportdlg.c:413 cvimportdlg.c:434 #: openfontdlg.c:136 msgid "SVG" msgstr "SVG" -#: charview.c:9798 +#: charview.c:9821 msgid "Show _Grid Fit..." msgstr "" -#: charview.c:9799 metricsview.c:3300 +#: charview.c:9822 metricsview.c:3329 msgid "_Bigger Point Size" msgstr "" -#: charview.c:9800 metricsview.c:3301 +#: charview.c:9823 metricsview.c:3330 msgid "_Smaller Point Size" msgstr "" # -#: charview.c:9801 fontview.c:5044 metricsview.c:3294 +#: charview.c:9824 fontview.c:5048 metricsview.c:3323 msgid "_Anti Alias" msgstr "抗锯齿(_A)" -#: charview.c:9802 +#: charview.c:9825 msgid "_Off" msgstr "" -#: charview.c:9807 +#: charview.c:9830 msgid "_Points" msgstr "" -#: charview.c:9808 +#: charview.c:9831 msgid "_Control Point Info" msgstr "" -#: charview.c:9809 +#: charview.c:9832 msgid "_Extrema" msgstr "" -#: charview.c:9810 +#: charview.c:9833 msgid "Points of _Inflection" msgstr "" -#: charview.c:9811 +#: charview.c:9834 msgid "Almost Horizontal/Vertical Lines" msgstr "" -#: charview.c:9812 +#: charview.c:9835 msgid "Almost Horizontal/Vertical Curves" msgstr "" -#: charview.c:9813 +#: charview.c:9836 msgid "(Define \"Almost\")" msgstr "" -#: charview.c:9814 +#: charview.c:9837 msgid "_Side Bearings" msgstr "" -#: charview.c:9815 +#: charview.c:9838 msgid "Reference Names" msgstr "" -#: charview.c:9816 +#: charview.c:9839 msgid "_Fill" msgstr "" -#: charview.c:9818 +#: charview.c:9841 msgid "Pale_ttes" msgstr "" -#: charview.c:9819 +#: charview.c:9842 msgid "_Glyph Tabs" msgstr "" -#: charview.c:9820 +#: charview.c:9843 msgid "_Rulers" msgstr "" -#: charview.c:9822 +#: charview.c:9845 msgid "_Horizontal Hints" msgstr "" -#: charview.c:9823 +#: charview.c:9846 msgid "_Vertical Hints" msgstr "" -#: charview.c:9824 +#: charview.c:9847 msgid "_Diagonal Hints" msgstr "" #. GT: You might not want to translate this, it's a keyword in PostScript font files -#: charview.c:9826 +#: charview.c:9849 msgid "_BlueValues" msgstr "" #. GT: You might not want to translate this, it's a keyword in PostScript font files -#: charview.c:9828 +#: charview.c:9851 msgid "FamilyBl_ues" msgstr "" -#: charview.c:9830 +#: charview.c:9853 msgid "_Anchors" msgstr "" -#: charview.c:9832 +#: charview.c:9855 msgid "Debug Raster Cha_nges" msgstr "" -#: charview.c:9834 +#: charview.c:9857 msgid "Hori_zontal Metric Lines" msgstr "" -#: charview.c:9835 +#: charview.c:9858 msgid "Vertical _Metric Lines" msgstr "" -#: charview.c:9837 +#: charview.c:9860 msgid "Snap Outlines to Pi_xel Grid" msgstr "" # -#: charview.c:9847 +#: charview.c:9870 msgid "_Display Compositions..." msgstr "显示组成(_D)…" # -#: charview.c:9854 +#: charview.c:9877 msgid "Form_er Glyph" msgstr "上一字形(_E)" -#: charview.c:9858 +#: charview.c:9881 msgid "N_umber Points" msgstr "" -#: charview.c:9859 +#: charview.c:9882 msgid "Grid Fi_t" msgstr "" -#: charview.c:9860 +#: charview.c:9883 msgid "Sho_w" msgstr "" # -#: charview.c:9862 fontview.c:5028 metricsview.c:3291 +#: charview.c:9885 fontview.c:5032 metricsview.c:3320 msgid "Com_binations" msgstr "组合(_B)" # -#: charview.c:9883 +#: charview.c:9906 msgid "SubFonts|_All" msgstr "全部(_A)" # -#: charview.c:9884 +#: charview.c:9907 msgid "SubFonts|_None" msgstr "无(_N)" # -#: charview.c:9947 mm.c:671 mm.c:673 mm.c:984 mm.c:987 mm.c:998 mm.c:1006 +#: charview.c:9970 mm.c:671 mm.c:673 mm.c:984 mm.c:987 mm.c:998 mm.c:1006 #: mm.c:1011 mm.c:1019 mm.c:1027 mm.c:1041 mm.c:1044 mm.c:1054 mm.c:1064 #: mm.c:1072 mm.c:1079 mm.c:1086 mm.c:1093 mm.c:1100 mm.c:1107 mm.c:1116 #: mm.c:1126 mm.c:1133 mm.c:1143 mm.c:1159 mm.c:1172 mm.c:1179 mmdlg.c:934 #: mmdlg.c:1777 mmdlg.c:2135 mmdlg.c:2147 mmdlg.c:2159 mmdlg.c:2162 -#: mmdlg.c:2367 mmdlg.c:2370 splineutil.c:2621 splineutil.c:2670 -#: splineutil.c:2672 +#: mmdlg.c:2367 mmdlg.c:2370 splineutil.c:2623 splineutil.c:2672 +#: splineutil.c:2674 msgid "Bad Multiple Master Font" msgstr "不良字体集" # #. GT: Here (and following) MM means "MultiMaster" -#: charview.c:9952 +#: charview.c:9975 msgid "MM _Reblend" msgstr "字体集再混成(_R)" # -#: charview.c:10014 charview.c:10032 +#: charview.c:10037 charview.c:10055 msgid "_Point" msgstr "点(_P)" # -#: charview.c:10019 charview.c:10037 fontview.c:5450 +#: charview.c:10042 charview.c:10060 fontview.c:5480 msgid "H_ints" msgstr "消隐(_I)" # #. GT: Here (and following) MM means "MultiMaster" -#: charview.c:10023 fontview.c:5456 +#: charview.c:10046 fontview.c:5486 msgid "MM" msgstr "字体集" -#: charview.c:10736 +#: charview.c:10759 msgid "Outline View 2" msgstr "" -#: charview.c:10737 +#: charview.c:10760 msgid "This window displays a single outline glyph (more data)" msgstr "" -#: charview.c:10748 +#: charview.c:10771 msgid "Outline View" msgstr "" -#: charview.c:10749 +#: charview.c:10772 msgid "This window displays a single outline glyph" msgstr "" # -#: combinations.c:46 kernclass.c:2191 +#: combinations.c:46 kernclass.c:2256 msgid "First Char" msgstr "第一个字符" # -#: combinations.c:47 kernclass.c:2191 +#: combinations.c:47 kernclass.c:2256 msgid "Second Char" msgstr "第二个字符" @@ -3911,7 +3912,7 @@ msgstr "选看连体" # -#: combinations.c:898 kernclass.c:3228 +#: combinations.c:898 kernclass.c:3293 msgid "Kern Pair Closeup" msgstr "压缩对关闭" @@ -3936,7 +3937,7 @@ msgstr "锚点对" # -#: combinations.c:1133 fontinfo.c:9617 +#: combinations.c:1133 fontinfo.c:9396 msgid "Sort By:" msgstr "排序：" @@ -3973,28 +3974,28 @@ msgstr "不良前循类属编码" # -#: contextchain.c:560 contextchain.c:597 contextchain.c:902 +#: contextchain.c:672 contextchain.c:722 contextchain.c:1053 msgid "No Sequence/Lookups" msgstr "无排序/查找" -#: contextchain.c:562 contextchain.c:599 contextchain.c:904 +#: contextchain.c:674 contextchain.c:724 contextchain.c:1055 msgid "" "There are no entries in the Sequence/Lookup List, was this intentional?" msgstr "" # -#: contextchain.c:578 contextchain.c:610 contextchain.c:924 +#: contextchain.c:702 contextchain.c:735 contextchain.c:1075 msgid "Bad Sequence/Lookup List" msgstr "不良顺序、查找列表" -#: contextchain.c:578 contextchain.c:925 +#: contextchain.c:702 contextchain.c:1076 #, c-format msgid "" "Sequence number out of bounds, must be less than %d (number of classes in " "list above)" msgstr "" -#: contextchain.c:610 +#: contextchain.c:735 #, c-format msgid "" "Sequence number out of bounds, must be less than %d (number of glyphs, " @@ -4005,61 +4006,62 @@ #. GT: The string "{Everything Else}" is used in the context of a list #. GT: of classes (a set of kerning classes) where class 0 designates the #. GT: default class containing all glyphs not specified in the other classes -#: contextchain.c:639 contextchain.c:1763 fontview.c:7897 kernclass.c:185 -#: kernclass.c:1393 kernclass.c:1405 kernclass.c:2210 metricsview.c:1022 -#: metricsview.c:1023 statemachine.c:1342 +#: contextchain.c:765 contextchain.c:2817 contextchain.c:2994 fontview.c:7927 +#: kernclass.c:185 kernclass.c:1393 kernclass.c:1405 kernclass.c:2275 +#: metricsview.c:1027 metricsview.c:1028 statemachine.c:1342 msgid "{Everything Else}" msgstr "{其他}" # -#: contextchain.c:837 contextchain.c:850 +#: contextchain.c:989 contextchain.c:1002 contextchain.c:1087 msgid "Missing rules" msgstr "缺规则" # -#: contextchain.c:837 contextchain.c:850 +#: contextchain.c:989 contextchain.c:1002 contextchain.c:1087 msgid " There must be at least one contextual rule" msgstr " 至少要一项相关规则" # -#: contextchain.c:883 contextchain.c:888 +#: contextchain.c:1034 contextchain.c:1039 contextchain.c:1167 +#: contextchain.c:1178 contextchain.c:1184 msgid "Bad Coverage Table" msgstr "不当范围表" -#: contextchain.c:883 +#: contextchain.c:1034 contextchain.c:1167 msgid "There must be at least one match coverage table" msgstr "" -#: contextchain.c:888 +#: contextchain.c:1039 msgid "" "In a Reverse Chaining Substitution there must be exactly one coverage table " "to match" msgstr "" # -#: contextchain.c:894 +#: contextchain.c:1045 contextchain.c:1188 msgid "Replacement mismatch" msgstr "替换不匹配" -#: contextchain.c:894 +#: contextchain.c:1045 contextchain.c:1188 msgid "" "In a Reverse Chaining Substitution there must be exactly as many " "replacements as there are glyph names in the match coverage table" msgstr "" -#: contextchain.c:1136 kernclass.c:2176 statemachine.c:1322 +#: kernclass.c:2241 statemachine.c:1322 msgid "Glyphs in the classes" msgstr "" -#: contextchain.c:1139 +#: contextchain.c:1937 contextchain.c:1950 contextchain.c:1956 msgid "Glyphs in the coverage tables" msgstr "" -#: contextchain.c:1142 +#: contextchain.c:1940 contextchain.c:1951 msgid "Apply lookup" msgstr "" -#: contextchain.c:1143 +#: contextchain.c:1941 msgid "at position" msgstr "" @@ -4067,57 +4069,57 @@ msgid "Matching rules based on a list glyphs" msgstr "" -#: contextchain.c:1149 +#: contextchain.c:1947 contextchain.c:1963 msgid "Matching rules based on a list of classes" msgstr "" # -#: contextchain.c:1157 +#: contextchain.c:1999 msgid "Edit Contextual Position" msgstr "编辑上下文位置" # -#: contextchain.c:1157 statemachine.c:1326 +#: contextchain.c:1999 statemachine.c:1326 msgid "Edit Contextual Substitution" msgstr "编辑上下文替换" # -#: contextchain.c:1158 +#: contextchain.c:2000 msgid "Edit Chaining Position" msgstr "编辑链位置" # -#: contextchain.c:1158 +#: contextchain.c:2000 msgid "Edit Chaining Substitution" msgstr "编辑链替换" # -#: contextchain.c:1159 +#: contextchain.c:2001 msgid "Edit Reverse Chaining Substitution" msgstr "编辑逆向链替换" # -#: contextchain.c:1161 +#: contextchain.c:2003 msgid "New Contextual Position" msgstr "新建上下文位置" # -#: contextchain.c:1161 statemachine.c:1327 +#: contextchain.c:2003 statemachine.c:1327 msgid "New Contextual Substitution" msgstr "新建上下文替换" # -#: contextchain.c:1162 +#: contextchain.c:2004 msgid "New Chaining Position" msgstr "新建链位置" # -#: contextchain.c:1162 +#: contextchain.c:2004 msgid "New Chaining Substitution" msgstr "新建链替换" # -#: contextchain.c:1163 +#: contextchain.c:2005 msgid "New Reverse Chaining Substitution" msgstr "新建逆向链替换" @@ -4136,79 +4138,79 @@ msgstr "" # -#: contextchain.c:1344 +#: contextchain.c:2217 msgid "By Glyphs" msgstr "按字形" # -#: contextchain.c:1353 +#: contextchain.c:2226 msgid "By Classes" msgstr "按类属" # -#: contextchain.c:1362 +#: contextchain.c:2235 msgid "By Coverage" msgstr "按范围" -#: contextchain.c:1427 contextchain.c:1602 +#: contextchain.c:2402 contextchain.c:2577 msgid "Set From Selection" msgstr "" -#: contextchain.c:1430 contextchain.c:1605 +#: contextchain.c:2405 contextchain.c:2580 msgid "Set this glyph list from a selection." msgstr "" -#: contextchain.c:1444 contextchain.c:1549 contextchain.c:1862 +#: contextchain.c:2419 contextchain.c:2524 contextchain.c:3121 msgid "An ordered list of lookups and positions" msgstr "" # -#: contextchain.c:1473 contextchain.c:1898 layer2layer.c:98 layer2layer.c:123 +#: contextchain.c:2448 contextchain.c:3157 layer2layer.c:98 layer2layer.c:123 msgid "Match" msgstr "匹配" # -#: contextchain.c:1478 contextchain.c:1899 +#: contextchain.c:2453 contextchain.c:3158 msgid "Backtrack" msgstr "回溯" # -#: contextchain.c:1483 contextchain.c:1900 +#: contextchain.c:2458 contextchain.c:3159 msgid "Lookahead" msgstr "前向" # -#: contextchain.c:1488 +#: contextchain.c:2463 msgid "A list of glyphs:" msgstr "字形列表：" # -#: contextchain.c:1595 +#: contextchain.c:2570 msgid "Replacements" msgstr "替换" # -#: contextchain.c:1648 +#: contextchain.c:2623 msgid "A coverage table:" msgstr "范围表：" # -#: contextchain.c:1742 +#: contextchain.c:2787 contextchain.c:2961 msgid "Same as Match Classes" msgstr "同匹配类属" # -#: contextchain.c:1793 +#: contextchain.c:2856 contextchain.c:3031 msgid "Match Classes" msgstr "匹配类属" # -#: contextchain.c:1794 +#: contextchain.c:2857 contextchain.c:3032 msgid "Back Classes" msgstr "向后类属" # -#: contextchain.c:1795 +#: contextchain.c:2858 contextchain.c:3033 msgid "Ahead Classes" msgstr "向前类属" @@ -4218,7 +4220,7 @@ msgstr "类属编号列表" # -#: contextchain.c:1841 +#: contextchain.c:3096 msgid "Classes" msgstr "类属" @@ -4400,8 +4402,8 @@ msgstr "指令统计 (TrueType)" # -#: cvexport.c:718 cvexportdlg.c:287 fontview.c:681 savefont.c:657 -#: savefont.c:857 showatt.c:2327 +#: cvexport.c:719 cvexportdlg.c:287 fontview.c:681 savefont.c:657 +#: savefont.c:857 showatt.c:2334 msgid "Save Failed" msgstr "保存失败" @@ -4465,7 +4467,7 @@ msgstr "Raph 面" # -#: cvexportdlg.c:306 fontview.c:4791 savefontdlg.c:1626 +#: cvexportdlg.c:306 fontview.c:4795 savefontdlg.c:1626 msgid "_Replace" msgstr "替换(_R)" @@ -4527,7 +4529,7 @@ msgstr "变换矩阵" # -#: cvgetinfo.c:185 cvstroke.c:2509 kernclass.c:745 +#: cvgetinfo.c:185 cvstroke.c:2516 kernclass.c:745 msgid "Value out of range" msgstr "值溢出" @@ -4649,16 +4651,16 @@ msgid "Bounding Box:" msgstr "" -#: cvgetinfo.c:527 cvstroke.c:2281 tilepath.c:1843 +#: cvgetinfo.c:527 cvstroke.c:2288 tilepath.c:1843 msgid "X:" msgstr "" -#: cvgetinfo.c:534 cvstroke.c:2294 tilepath.c:1859 +#: cvgetinfo.c:534 cvstroke.c:2301 tilepath.c:1859 msgid "Y:" msgstr "" # -#: cvgetinfo.c:567 cvgetinfo.c:3734 metricsview.c:3248 +#: cvgetinfo.c:567 cvgetinfo.c:3734 metricsview.c:3277 msgid "_Show" msgstr "显示(_S)" @@ -4889,8 +4891,8 @@ msgstr "默认" # -#: cvgetinfo.c:2777 cvgetinfo.c:2884 displayfonts.c:621 fontinfo.c:8996 -#: fontinfo.c:9057 +#: cvgetinfo.c:2777 cvgetinfo.c:2884 displayfonts.c:621 fontinfo.c:8775 +#: fontinfo.c:8836 msgid "Offset" msgstr "偏移" @@ -4901,7 +4903,7 @@ # #: cvgetinfo.c:2827 cvgetinfo.c:2934 nonlineartransui.c:470 -#: nonlineartransui.c:502 prefs.c:2212 transform.c:497 transform.c:506 +#: nonlineartransui.c:502 prefs.c:2214 transform.c:497 transform.c:506 msgid "°" msgstr "°" @@ -4959,7 +4961,7 @@ # #. GT: Y is a coordinate #. GT: Y is a coordinate, the leading spaces help to align it -#: cvgetinfo.c:3382 cvpointer.c:1345 fontinfo.c:8962 +#: cvgetinfo.c:3382 cvpointer.c:1348 fontinfo.c:8741 msgid "Y" msgstr "Y" @@ -5003,7 +5005,7 @@ msgstr "" #: cvgridfit.c:118 deltaui.c:63 displayfonts.c:624 displayfonts.c:1263 -#: metricsview.c:2745 +#: metricsview.c:2774 msgid "DPI" msgstr "" @@ -5056,12 +5058,12 @@ msgstr "查看消隐" # -#: cvhints.c:429 fontview.c:5181 +#: cvhints.c:429 fontview.c:5185 msgid "_HStem" msgstr "水平项(_H)" # -#: cvhints.c:439 fontview.c:5182 +#: cvhints.c:439 fontview.c:5186 msgid "_VStem" msgstr "垂直项(_V)" @@ -5180,76 +5182,76 @@ msgstr "不良 xfig 文件" # -#: cvimages.c:977 cvimages.c:1088 cvimages.c:1093 cvimportdlg.c:83 +#: cvimages.c:979 cvimages.c:1090 cvimages.c:1095 cvimportdlg.c:83 #: cvimportdlg.c:106 msgid "Bad image file" msgstr "不良图形文件" # -#: cvimages.c:977 cvimages.c:1088 cvimportdlg.c:83 cvimportdlg.c:106 +#: cvimages.c:979 cvimages.c:1090 cvimportdlg.c:83 cvimportdlg.c:106 #, c-format msgid "Bad image file: %.100s" msgstr "不良图形文件: %.100s" # -#: cvimages.c:1011 groupsdlg.c:1492 groupsdlg.c:1495 +#: cvimages.c:1013 groupsdlg.c:1492 groupsdlg.c:1495 msgid "Nothing Selected" msgstr "未选择" # -#: cvimages.c:1011 +#: cvimages.c:1013 msgid "You must select a glyph before you can import an image into it" msgstr "应选择一个字形以便为其载入图形" # -#: cvimages.c:1013 +#: cvimages.c:1015 msgid "More Images Than Selected Glyphs" msgstr "图形数量多于选择的字形数" # -#: cvimages.c:1032 cvimages.c:1040 +#: cvimages.c:1034 cvimages.c:1042 msgid "Bad Template" msgstr "不良模板" # -#: cvimages.c:1032 +#: cvimages.c:1034 msgid "Bad template, no extension" msgstr "不良模板，无扩展名" # -#: cvimages.c:1040 +#: cvimages.c:1042 msgid "Bad template, unrecognized format" msgstr "不良模板，不认识的格式" # -#: cvimages.c:1051 cvimages.c:1120 +#: cvimages.c:1053 cvimages.c:1122 msgid "Nothing Loaded" msgstr "未载入" # -#: cvimages.c:1072 +#: cvimages.c:1074 msgid "Unicode value not in font" msgstr "字体中无统一码值" # -#: cvimages.c:1072 +#: cvimages.c:1074 #, c-format msgid "Unicode value (%x) not in font, ignored" msgstr "字体中无统一码值 (%x)，忽略之" # -#: cvimages.c:1080 +#: cvimages.c:1082 msgid "Encoding value not in font" msgstr "字体中无编码值" # -#: cvimages.c:1080 +#: cvimages.c:1082 #, c-format msgid "Encoding value (%x) not in font, ignored" msgstr "字体中无编码值 (%x)，忽略之" # -#: cvimages.c:1093 +#: cvimages.c:1095 #, c-format msgid "Bad image file, not a bitmap: %.100s" msgstr "不良图形文件，不是位图： %.100s" @@ -5381,7 +5383,7 @@ msgstr "导入" # -#: cvimportdlg.c:693 fontinfo.c:6552 fontinfo.c:10462 +#: cvimportdlg.c:693 fontinfo.c:6331 fontinfo.c:10204 #: ../gdraw/gtextfield.c:1300 msgid "_Import" msgstr "导入(_I)" @@ -5530,7 +5532,7 @@ msgid "Flip" msgstr "" -#: cvpalettes.c:244 cvpalettes.c:273 cvpalettes.c:275 cvstroke.c:2038 +#: cvpalettes.c:244 cvpalettes.c:273 cvpalettes.c:275 cvstroke.c:2045 msgid "Rotate" msgstr "" @@ -5733,7 +5735,7 @@ msgstr "删除层" # -#: cvpalettes.c:1600 cvpalettes.c:2093 cvpalettes.c:2626 fontinfo.c:10665 +#: cvpalettes.c:1600 cvpalettes.c:2093 cvpalettes.c:2626 fontinfo.c:10407 msgid "Layers" msgstr "层" @@ -5752,7 +5754,7 @@ msgstr "层可见？" # -#: cvpalettes.c:1645 cvpalettes.c:2125 cvstroke.c:2641 +#: cvpalettes.c:1645 cvpalettes.c:2125 cvstroke.c:2648 msgid "Layer" msgstr "层" @@ -5852,53 +5854,53 @@ msgstr "填充椭圆" # -#: cvpointer.c:1162 cvpointer.c:1171 fvmetricsdlg.c:62 +#: cvpointer.c:1165 cvpointer.c:1174 fvmetricsdlg.c:62 msgid "Negative Width" msgstr "负值宽度" -#: cvpointer.c:1162 cvpointer.c:1171 +#: cvpointer.c:1165 cvpointer.c:1174 msgid "" "Negative character widths are not allowed in TrueType.\n" "Do you really want a negative width?" msgstr "" # -#: cvpointer.c:1351 +#: cvpointer.c:1354 msgid "Search Radius" msgstr "搜索半径" # -#: cvpointer.c:1428 +#: cvpointer.c:1431 msgid "Select Point(s) at..." msgstr "选择点…" # -#: cvpointer.c:1465 showatt.c:3151 +#: cvpointer.c:1468 showatt.c:3158 msgid "_Exact" msgstr "精确(_E)" # -#: cvpointer.c:1474 +#: cvpointer.c:1477 msgid "_Around" msgstr "大概(_A)" # -#: cvpointer.c:1483 +#: cvpointer.c:1486 msgid "W_ithin Rectangle" msgstr "矩形内(_I)" # -#: cvpointer.c:1492 +#: cvpointer.c:1495 msgid "_Radius:" msgstr "半径(_R)：" # -#: cvpointer.c:1500 fontinfo.c:192 +#: cvpointer.c:1503 fontinfo.c:192 msgid "3" msgstr "3" # -#: cvpointer.c:1510 +#: cvpointer.c:1513 msgid "_Width:" msgstr "宽度(_W)：" @@ -6006,7 +6008,6 @@ # #: cvruler.c:432 -#, c-format msgid "No Slope" msgstr "没有范围" @@ -6016,7 +6017,7 @@ msgstr "压力(_P):" # -#: cvstroke.c:147 cvstroke.c:253 cvstroke.c:3041 fontinfo.c:4257 +#: cvstroke.c:147 cvstroke.c:253 cvstroke.c:3048 fontinfo.c:4034 msgid "Stroke _Width:" msgstr "笔画宽度(_W):" @@ -6165,42 +6166,42 @@ #. GT: | / | #. GT: -----------------+ -----------------+ ----------------+--+ #. GT: Butt Round Square -#: cvstroke.c:905 cvstroke.c:3161 +#: cvstroke.c:905 cvstroke.c:3168 msgid "_Butt" msgstr "平头(_B)" # -#: cvstroke.c:915 cvstroke.c:3173 +#: cvstroke.c:915 cvstroke.c:3180 msgid "_Round" msgstr "圆头(_R)" # -#: cvstroke.c:925 cvstroke.c:3185 +#: cvstroke.c:925 cvstroke.c:3192 msgid "S_quare" msgstr "方头(_Q)" # -#: cvstroke.c:936 cvstroke.c:3153 +#: cvstroke.c:936 cvstroke.c:3160 msgid "Line Cap" msgstr "线宽" # -#: cvstroke.c:949 cvstroke.c:3228 +#: cvstroke.c:949 cvstroke.c:3235 msgid "_Miter" msgstr "斜接(_M)" # -#: cvstroke.c:959 cvstroke.c:3240 +#: cvstroke.c:959 cvstroke.c:3247 msgid "Ro_und" msgstr "圆头(_U)" # -#: cvstroke.c:969 cvstroke.c:3252 +#: cvstroke.c:969 cvstroke.c:3259 msgid "Be_vel" msgstr "伞形(&V)" # -#: cvstroke.c:979 cvstroke.c:3220 +#: cvstroke.c:979 cvstroke.c:3227 msgid "Line Join" msgstr "线连接" @@ -6339,129 +6340,129 @@ "digit number expressing an RGB color." msgstr "" -#: cvstroke.c:2039 +#: cvstroke.c:2046 msgid "Translation in X" msgstr "" -#: cvstroke.c:2040 +#: cvstroke.c:2047 msgid "Translation in Y" msgstr "" -#: cvstroke.c:2072 +#: cvstroke.c:2079 msgid "Bad Transformation matrix" msgstr "" -#: cvstroke.c:2080 +#: cvstroke.c:2087 msgid "No Glyph" msgstr "" -#: cvstroke.c:2080 +#: cvstroke.c:2087 #, c-format msgid "This font does not contain a glyph named \"%.40s\"" msgstr "" -#: cvstroke.c:2169 tilepath.c:1761 +#: cvstroke.c:2176 tilepath.c:1761 msgid "Tile Pattern" msgstr "" -#: cvstroke.c:2181 +#: cvstroke.c:2188 msgid "" "The pattern itself should be drawn in another glyph\n" "of the current font. Specify a glyph name:" msgstr "" -#: cvstroke.c:2201 +#: cvstroke.c:2208 msgid "Aspect Ratio same as Tile Glyph" msgstr "" # -#: cvstroke.c:2210 metricsview.c:639 tilepath.c:1791 +#: cvstroke.c:2217 metricsview.c:644 tilepath.c:1791 msgid "Width:" msgstr "宽度：" -#: cvstroke.c:2247 +#: cvstroke.c:2254 msgid "Rotate:" msgstr "" -#: cvstroke.c:2260 +#: cvstroke.c:2267 msgid "Skew:" msgstr "" -#: cvstroke.c:2273 +#: cvstroke.c:2280 msgid "Translate By" msgstr "" -#: cvstroke.c:2312 +#: cvstroke.c:2319 msgid "Transform:" msgstr "" # -#: cvstroke.c:2445 +#: cvstroke.c:2452 msgid "Bad Color" msgstr "不良颜色" # -#: cvstroke.c:2471 cvstroke.c:2480 cvstroke.c:2713 cvstroke.c:2908 +#: cvstroke.c:2478 cvstroke.c:2487 cvstroke.c:2720 cvstroke.c:2915 #: ../gdraw/gcolor.c:179 msgid "Opacity:" msgstr "透明：" # -#: cvstroke.c:2496 +#: cvstroke.c:2503 msgid "Bad Transformation Matrix" msgstr "不良变换矩阵" # -#: cvstroke.c:2509 cvstroke.c:2512 cvstroke.c:2515 +#: cvstroke.c:2516 cvstroke.c:2519 cvstroke.c:2522 msgid "Bad dash list" msgstr "不良横线列表" # -#: cvstroke.c:2515 +#: cvstroke.c:2522 #, c-format msgid "Too many dashes (at most %d allowed)" msgstr "过多划线 (最多允许 %d)" # -#: cvstroke.c:2659 +#: cvstroke.c:2666 msgid "Fi_ll" msgstr "填充(_L)" # -#: cvstroke.c:2693 cvstroke.c:2736 cvstroke.c:2888 cvstroke.c:2932 -#: cvstroke.c:3067 cvstroke.c:3110 cvstroke.c:3197 cvstroke.c:3264 +#: cvstroke.c:2700 cvstroke.c:2743 cvstroke.c:2895 cvstroke.c:2939 +#: cvstroke.c:3074 cvstroke.c:3117 cvstroke.c:3204 cvstroke.c:3271 msgid "Inherited" msgstr "继承" -#: cvstroke.c:2749 cvstroke.c:2945 +#: cvstroke.c:2756 cvstroke.c:2952 msgid "Gradient:" msgstr "" # -#: cvstroke.c:2758 cvstroke.c:2806 cvstroke.c:2954 cvstroke.c:3002 +#: cvstroke.c:2765 cvstroke.c:2813 cvstroke.c:2961 cvstroke.c:3009 #: scstylesui.c:170 msgid "Add" msgstr "添加" -#: cvstroke.c:2768 cvstroke.c:2816 cvstroke.c:2964 cvstroke.c:3012 +#: cvstroke.c:2775 cvstroke.c:2823 cvstroke.c:2971 cvstroke.c:3019 msgid "Edit" msgstr "" -#: cvstroke.c:2797 cvstroke.c:2993 +#: cvstroke.c:2804 cvstroke.c:3000 msgid "Pattern:" msgstr "" # -#: cvstroke.c:2853 +#: cvstroke.c:2860 msgid "Stroke" msgstr "笔画" # -#: cvstroke.c:3080 +#: cvstroke.c:3087 msgid "Dashes" msgstr "短划线" -#: cvstroke.c:3086 cvstroke.c:3121 +#: cvstroke.c:3093 cvstroke.c:3128 msgid "" "This specifies the dash pattern for a line.\n" "Leave this field blank for a solid line.\n" @@ -6473,7 +6474,7 @@ msgstr "" # -#: cvstroke.c:3127 +#: cvstroke.c:3134 msgid "_Transform Pen:" msgstr "变形笔（_T）:" @@ -6483,7 +6484,7 @@ msgstr "不再警告" # -#: cvundoes.c:2015 cvundoes.c:2028 fontviewbase.c:109 metricsview.c:2018 +#: cvundoes.c:2015 cvundoes.c:2028 fontviewbase.c:109 metricsview.c:2047 #: searchview.c:523 msgid "Bad Reference" msgstr "不良参照" @@ -6499,13 +6500,13 @@ # #: cvundoes.c:2023 cvundoes.c:2244 cvundoes.c:3560 fontviewbase.c:104 -#: parsettf.c:5670 sfd.c:7579 tottf.c:1377 +#: parsettf.c:5675 sfd.c:7641 tottf.c:1467 msgid "Yes to _All" msgstr "全是(_A)" # #: cvundoes.c:2024 cvundoes.c:2245 cvundoes.c:3561 fontviewbase.c:106 -#: parsettf.c:5671 tottf.c:1378 +#: parsettf.c:5676 tottf.c:1468 msgid "No _to All" msgstr "全否(_T)" @@ -6736,7 +6737,7 @@ msgid "Rasterize at sizes:" msgstr "" -#: deltaui.c:268 metricsview.c:2842 +#: deltaui.c:268 displayfonts.c:1833 metricsview.c:2871 msgid "DPI:" msgstr "" @@ -6800,12 +6801,12 @@ msgstr "" # -#: diffstubs.c:1278 lookups.c:1515 +#: diffstubs.c:1278 lookups.c:1516 msgid "State Machine" msgstr "状态机" # -#: diffstubs.c:1280 fontinfo.c:6734 lookups.c:1519 +#: diffstubs.c:1280 fontinfo.c:6513 lookups.c:1520 msgid "LookupType|Unknown" msgstr "未知" @@ -6815,13 +6816,13 @@ #. GT: The second %s (if present) is the script #. GT: While the %d is the index into the lookup list and is used to disambiguate it #. GT: In case that is needed -#: diffstubs.c:1330 lookups.c:1580 +#: diffstubs.c:1330 lookups.c:1581 #, c-format msgid "%s in %s lookup %d" msgstr "%s (%s中) 查找 %d" # -#: diffstubs.c:1334 lookups.c:1584 +#: diffstubs.c:1334 lookups.c:1585 #, c-format msgid "%s lookup %d" msgstr "%s 查找 %d" @@ -6829,7 +6830,7 @@ # #. GT: This string is used to generate a name for an OpenType lookup subtable. #. GT: %s is the lookup name -#: diffstubs.c:1351 lookups.c:1601 parsettfatt.c:5902 +#: diffstubs.c:1351 lookups.c:1602 parsettfatt.c:5943 #, c-format msgid "%s subtable" msgstr "%s替代表" @@ -6837,25 +6838,25 @@ # #. GT: This string is used to generate a name for an OpenType lookup subtable. #. GT: %s is the lookup name, %d is the index of the subtable in the lookup -#: diffstubs.c:1355 lookups.c:1605 +#: diffstubs.c:1355 lookups.c:1606 #, c-format msgid "%s per glyph data %d" msgstr "%s 每个字形数据 %d" # -#: diffstubs.c:1357 lookups.c:1607 +#: diffstubs.c:1357 lookups.c:1608 #, c-format msgid "%s kerning class %d" msgstr "%s 压缩类属 %d" # -#: diffstubs.c:1359 lookups.c:1609 +#: diffstubs.c:1359 lookups.c:1610 #, c-format msgid "%s contextual %d" msgstr "%s 关联 %d" # -#: diffstubs.c:1361 lookups.c:1611 +#: diffstubs.c:1361 lookups.c:1612 #, c-format msgid "%s anchor %d" msgstr "%s 锚点 %d" @@ -6908,8 +6909,8 @@ msgstr "打印机(_P)：" # -#: displayfonts.c:625 fontinfo.c:8971 fontinfo.c:9032 fontinfo.c:9093 -#: fontinfo.c:10707 tilepath.c:1719 +#: displayfonts.c:625 fontinfo.c:8750 fontinfo.c:8811 fontinfo.c:8872 +#: fontinfo.c:10449 tilepath.c:1719 msgid "Size" msgstr "大小" @@ -6929,18 +6930,18 @@ msgstr "打印到文件…" # -#: displayfonts.c:687 print.c:1677 print.c:2874 print.c:2879 print.c:3012 +#: displayfonts.c:687 print.c:1764 print.c:2961 print.c:2966 print.c:3099 msgid "Print Failed" msgstr "打印失败" # -#: displayfonts.c:687 print.c:3012 +#: displayfonts.c:687 print.c:3099 #, c-format msgid "Failed to open file %s for output" msgstr "未能打开文件 %s 作输出" # -#: displayfonts.c:695 print.c:1398 print.c:3019 +#: displayfonts.c:695 print.c:1485 print.c:3106 msgid "Failed to open temporary output file" msgstr "未能打开临时输出文件" @@ -7170,7 +7171,7 @@ msgstr "" # -#: dumpbdf.c:434 dumppfa.c:2803 winfonts.c:659 +#: dumpbdf.c:434 dumppfa.c:2813 winfonts.c:659 #, c-format msgid "Can't open %s\n" msgstr "不能打开 %s\n" @@ -7182,16 +7183,16 @@ msgstr "不能写入 %s\n" # -#: dumppfa.c:1527 fontviewbase.c:1075 tottf.c:1976 +#: dumppfa.c:1537 fontviewbase.c:1075 tottf.c:2066 msgid "Auto Hinting Font..." msgstr "自动消隐字体…" -#: dumppfa.c:1563 dumppfa.c:2511 +#: dumppfa.c:1573 dumppfa.c:2521 msgid "Converting PostScript" msgstr "" # -#: dumppfa.c:1567 dumppfa.c:2515 savefont.c:805 +#: dumppfa.c:1577 dumppfa.c:2525 savefont.c:805 msgid "Saving PostScript Font" msgstr "保存PostScript字体" @@ -7609,647 +7610,647 @@ msgstr "Big5 HKSCS (繁体中文)" # -#: encodingui.c:615 tottf.c:4276 tottf.c:4282 tottf.c:4288 tottf.c:4294 -#: tottf.c:4300 tottf.c:4331 tottf.c:4339 +#: encodingui.c:615 tottf.c:4366 tottf.c:4372 tottf.c:4378 tottf.c:4384 +#: tottf.c:4390 tottf.c:4421 tottf.c:4429 msgid "Bad Encoding" msgstr "不良编码" -#: featurefile.c:2442 +#: featurefile.c:2456 #, c-format msgid "Unparseable include on line %d of %s" msgstr "有不能解析的头文件处于行 %d (%s中)" -#: featurefile.c:2459 +#: featurefile.c:2473 #, c-format msgid "Include filename too long on line %d of %s" msgstr "" -#: featurefile.c:2467 +#: featurefile.c:2481 #, c-format msgid "End of file in include on line %d of %s" msgstr "处于行 %d (%s中)：头文件处为文件末尾" -#: featurefile.c:2469 +#: featurefile.c:2483 #, c-format msgid "Missing close parenthesis in include on line %d of %s" msgstr "" -#: featurefile.c:2475 +#: featurefile.c:2489 #, c-format msgid "No filename specified in include on line %d of %s" msgstr "" -#: featurefile.c:2481 +#: featurefile.c:2495 #, c-format msgid "Includes nested too deeply on line %d of %s" msgstr "" # -#: featurefile.c:2496 +#: featurefile.c:2510 #, c-format msgid "Could not open include file (%s) on line %d of %s" msgstr "未能打开头文件(%s)于行 %d (%s中)" -#: featurefile.c:2574 +#: featurefile.c:2588 #, c-format msgid "Number too long on line %d of %s" msgstr "行 %d (%s中)处数字太长" -#: featurefile.c:2577 +#: featurefile.c:2591 #, c-format msgid "Missing number on line %d of %s" msgstr "行 %d (%s中)处缺数字" -#: featurefile.c:2606 +#: featurefile.c:2620 #, c-format msgid "Name, %s%s, too long on line %d of %s" msgstr "" -#: featurefile.c:2612 +#: featurefile.c:2626 #, c-format msgid "Missing name on line %d of %s" msgstr "线行 %d (%s中)处缺名称" -#: featurefile.c:2655 +#: featurefile.c:2669 #, c-format msgid "Unexpected character (0x%02X) on line %d of %s" msgstr "有未预期的字符(0x%02X) 在第%d行(%s)" -#: featurefile.c:2719 featurefile.c:2739 +#: featurefile.c:2733 featurefile.c:2753 #, c-format msgid "Expected '%s' on line %d of %s" msgstr "需要'%s' 于行 %d (%s中)" -#: featurefile.c:2732 +#: featurefile.c:2746 #, c-format msgid "Expected '%c' on line %d of %s" msgstr "需要'%c' 于行 %d (%s中)" -#: featurefile.c:2742 +#: featurefile.c:2756 #, c-format msgid "Expected unknown token (internal error) on line %d of %s" msgstr "" -#: featurefile.c:2785 +#: featurefile.c:2799 #, c-format msgid "Expected ';' at statement end on line %d of %s" msgstr "" -#: featurefile.c:2835 +#: featurefile.c:2849 #, c-format msgid "Use of undefined glyph class, %s, on line %d of %s" msgstr "" -#: featurefile.c:2847 +#: featurefile.c:2861 #, c-format msgid "Use of undefined mark class, %s, on line %d of %s" msgstr "" -#: featurefile.c:2896 +#: featurefile.c:2910 #, c-format msgid "Reference to a CID in a non-CID-keyed font on line %d of %s" msgstr "" -#: featurefile.c:2938 +#: featurefile.c:2952 #, c-format msgid "Reference to a glyph name in a CID-keyed font on line %d of %s" msgstr "" -#: featurefile.c:3003 +#: featurefile.c:3017 #, c-format msgid "Expected '[' in glyph class definition on line %d of %s" msgstr "" -#: featurefile.c:3031 +#: featurefile.c:3045 #, c-format msgid "Invalid CID range in glyph class on line %d of %s" msgstr "" -#: featurefile.c:3067 +#: featurefile.c:3081 #, c-format msgid "Invalid glyph name range in glyph class on line %d of %s" msgstr "" -#: featurefile.c:3099 +#: featurefile.c:3113 #, c-format msgid "Unexpected token in glyph class range on line %d of %s" msgstr "" -#: featurefile.c:3108 +#: featurefile.c:3122 #, c-format msgid "" "Expected glyph name, cid, or class in glyph class definition on line %d of %s" msgstr "" -#: featurefile.c:3206 +#: featurefile.c:3220 #, c-format msgid "Expected ';' in lookupflags on line %d of %s" msgstr "期望有';' 查找标记于行%d (%s)" -#: featurefile.c:3214 +#: featurefile.c:3228 #, c-format msgid "Unexpected token in lookupflags on line %d of %s" msgstr "" -#: featurefile.c:3218 +#: featurefile.c:3232 #, c-format msgid "No flags specified in lookupflags on line %d of %s" msgstr "" -#: featurefile.c:3236 +#: featurefile.c:3250 #, c-format msgid "Expected '=' in glyph class definition on line %d of %s" msgstr "" -#: featurefile.c:3258 featurefile.c:3267 +#: featurefile.c:3272 featurefile.c:3281 #, c-format msgid "Expected tag in languagesystem on line %d of %s" msgstr "" -#: featurefile.c:3354 +#: featurefile.c:3368 #, c-format msgid "Expected integer in device table on line %d of %s" msgstr "" -#: featurefile.c:3363 +#: featurefile.c:3377 #, c-format msgid "Pixel size too big in device table on line %d of %s" msgstr "" -#: featurefile.c:3378 +#: featurefile.c:3392 #, c-format msgid "Expected comma in device table on line %d of %s" msgstr "" -#: featurefile.c:3404 +#: featurefile.c:3418 #, c-format msgid "Expected integer in caret on line %d of %s" msgstr "" -#: featurefile.c:3410 +#: featurefile.c:3424 #, c-format msgid "Expected '>' in caret on line %d of %s" msgstr "期望有'>' 于行%d (%s)" -#: featurefile.c:3433 +#: featurefile.c:3447 #, c-format msgid "\"%s\" is not the name of a known named anchor on line %d of %s." msgstr "" -#: featurefile.c:3473 +#: featurefile.c:3487 #, c-format msgid "Expected integer in anchor on line %d of %s" msgstr "" -#: featurefile.c:3477 +#: featurefile.c:3491 #, c-format msgid "Expected 'anchor' keyword in anchor on line %d of %s" msgstr "" -#: featurefile.c:3487 +#: featurefile.c:3501 #, c-format msgid "Expected '>' in anchor on line %d of %s" msgstr "期望有'>' 于行%d (%s)" -#: featurefile.c:3499 +#: featurefile.c:3513 #, c-format msgid "Expected name in anchor definition on line %d of %s" msgstr "" -#: featurefile.c:3508 +#: featurefile.c:3522 #, c-format msgid "Attempt to redefine anchor definition of \"%s\" on line %d of %s" msgstr "" # -#: featurefile.c:3531 +#: featurefile.c:3545 msgid "Refers to Font" msgstr "参照到字体" -#: featurefile.c:3531 +#: featurefile.c:3545 #, c-format msgid "" "Reference to a lookup which is not in the feature file but which is in the " "font, %.50s" msgstr "" -#: featurefile.c:3563 +#: featurefile.c:3577 #, c-format msgid "" "\"%s\" is not the name of a known named value record on line %d of %s." msgstr "" -#: featurefile.c:3608 featurefile.c:3724 +#: featurefile.c:3622 featurefile.c:3738 #, c-format msgid "Unexpected token in value record on line %d of %s" msgstr "" -#: featurefile.c:3621 +#: featurefile.c:3635 #, c-format msgid "Expected name in value record definition on line %d of %s" msgstr "" -#: featurefile.c:3630 +#: featurefile.c:3644 #, c-format msgid "" "Attempt to redefine value record definition of \"%s\" on line %d of %s" msgstr "" -#: featurefile.c:3650 featurefile.c:4892 +#: featurefile.c:3664 featurefile.c:4906 #, c-format msgid "" "This file uses both the v1.6 and the v1.8 formats for mark classes on line " "%d of %s" msgstr "" -#: featurefile.c:3657 +#: featurefile.c:3671 #, c-format msgid "Expected anchor in mark class definition on line %d of %s" msgstr "" -#: featurefile.c:3667 +#: featurefile.c:3681 #, c-format msgid "Expected class name in mark class definition on line %d of %s" msgstr "" -#: featurefile.c:3701 featurefile.c:4069 +#: featurefile.c:3715 featurefile.c:4083 #, c-format msgid "Lookups may only be specified after marked glyphs on line %d of %s" msgstr "" -#: featurefile.c:3705 featurefile.c:4073 +#: featurefile.c:3719 featurefile.c:4087 #, c-format msgid "Lookups must be defined before being used on line %d of %s" msgstr "" -#: featurefile.c:3720 +#: featurefile.c:3734 #, c-format msgid "Expected '>' in value record on line %d of %s" msgstr "" -#: featurefile.c:3757 featurefile.c:3881 +#: featurefile.c:3771 featurefile.c:3895 #, c-format msgid "Expected glyph or glyphclass (after cursive) on line %d of %s" msgstr "" -#: featurefile.c:3773 +#: featurefile.c:3787 #, c-format msgid "Expected two anchors (after cursive) on line %d of %s" msgstr "" -#: featurefile.c:3896 +#: featurefile.c:3910 #, c-format msgid "Expected an anchor (after base/mark) on line %d of %s" msgstr "" -#: featurefile.c:3945 +#: featurefile.c:3959 #, c-format msgid "Expected glyph or glyphclass (after ligature) on line %d of %s" msgstr "" -#: featurefile.c:3959 +#: featurefile.c:3973 #, c-format msgid "Expected an anchor (after ligature) on line %d of %s" msgstr "" -#: featurefile.c:4414 +#: featurefile.c:4428 #, c-format msgid "Internal state messed up on line %d of %s" msgstr "" -#: featurefile.c:4447 +#: featurefile.c:4461 #, c-format msgid "" "When a single substitution is specified by glyph classes, those classes must " "be of the same length on line %d of %s" msgstr "" -#: featurefile.c:4471 +#: featurefile.c:4485 #, c-format msgid "" "When a single substitution's replacement is specified by a glyph class, the " "thing being replaced must also be a class on line %d of %s" msgstr "" -#: featurefile.c:4649 +#: featurefile.c:4663 #, c-format msgid "Lookup information attached to unmarked glyph on line %d of %s" msgstr "" -#: featurefile.c:4670 featurefile.c:4864 +#: featurefile.c:4684 featurefile.c:4878 #, c-format msgid "Unparseable contextual sequence on line %d of %s" msgstr "" -#: featurefile.c:4697 +#: featurefile.c:4711 #, c-format msgid "" "The ignore keyword must be followed by either position or substitute on line " "%d of %s" msgstr "" -#: featurefile.c:4757 +#: featurefile.c:4771 #, c-format msgid "Empty subsitute on line %d of %s" msgstr "空替代于行%d (%s)" -#: featurefile.c:4760 +#: featurefile.c:4774 #, c-format msgid "" "Reverse subsitute must have exactly one marked glyph and no lookups on line " "%d of %s" msgstr "" -#: featurefile.c:4783 +#: featurefile.c:4797 #, c-format msgid "No substitution specified on line %d of %s" msgstr "无指定替代于行 %d （%s）" -#: featurefile.c:4786 +#: featurefile.c:4800 #, c-format msgid "No marked glyphs allowed in replacement on line %d of %s" msgstr "" -#: featurefile.c:4820 +#: featurefile.c:4834 #, c-format msgid "Unparseable glyph sequence in substitution on line %d of %s" msgstr "" -#: featurefile.c:4826 +#: featurefile.c:4840 #, c-format msgid "Expected 'by' or 'from' keywords in substitution on line %d of %s" msgstr "" -#: featurefile.c:4837 +#: featurefile.c:4851 #, c-format msgid "Expected 'by' keyword in substitution on line %d of %s" msgstr "" -#: featurefile.c:4848 +#: featurefile.c:4862 #, c-format msgid "Expected a single glyph name in reverse substitution on line %d of %s" msgstr "" -#: featurefile.c:4903 +#: featurefile.c:4917 #, c-format msgid "Expected glyph name or class in mark statement on line %d of %s" msgstr "" -#: featurefile.c:4986 +#: featurefile.c:5000 #, c-format msgid "Empty position on line %d of %s" msgstr "空位于行%d (%s)" -#: featurefile.c:4992 +#: featurefile.c:5006 #, c-format msgid "Invalid cursive position on line %d of %s" msgstr "无效位置于行%d （ %s）" -#: featurefile.c:5005 +#: featurefile.c:5019 #, c-format msgid "" "A mark glyph (or class of marks) must be specified here on line %d of %s" msgstr "" -#: featurefile.c:5015 +#: featurefile.c:5029 #, c-format msgid "" "Mark to base anchor statements may only have one anchor on line %d of %s" msgstr "" -#: featurefile.c:5071 +#: featurefile.c:5085 #, c-format msgid "Unparseable glyph sequence in position on line %d of %s" msgstr "" -#: featurefile.c:5206 +#: featurefile.c:5220 #, c-format msgid "Expected name in lookup on line %d of %s" msgstr "期望名称于行%d (%s)" -#: featurefile.c:5223 featurefile.c:5579 +#: featurefile.c:5237 featurefile.c:5594 #, c-format msgid "Expected '{' in feature definition on line %d of %s" msgstr "" -#: featurefile.c:5241 +#: featurefile.c:5255 #, c-format msgid "Unexpected end of file in lookup definition on line %d of %s" msgstr "" -#: featurefile.c:5245 +#: featurefile.c:5259 #, c-format msgid "Unexpected token, %s, in lookup definition on line %d of %s" msgstr "" -#: featurefile.c:5247 +#: featurefile.c:5261 msgid " Perhaps you meant to use the keyword 'sub' rather than 'subs'?" msgstr "" -#: featurefile.c:5278 +#: featurefile.c:5292 #, c-format msgid "" "Mark classes must either be exactly the same or contain no common glyphs\n" " But the class on line %d of %s contains a match." msgstr "" -#: featurefile.c:5290 +#: featurefile.c:5304 #, c-format msgid "Expected %s in lookup definition on line %d of %s" msgstr "" -#: featurefile.c:5328 +#: featurefile.c:5342 #, c-format msgid "All entries in a lookup must have the same type on line %d of %s" msgstr "" -#: featurefile.c:5335 +#: featurefile.c:5349 #, c-format msgid "" "This lookup has no effect, I can't figure out its type on line %d of %s" msgstr "" -#: featurefile.c:5341 +#: featurefile.c:5355 #, c-format msgid "" "Mark glyphs may not be specified with this type of lookup on line %d of %s" msgstr "" -#: featurefile.c:5371 +#: featurefile.c:5385 #, c-format msgid "Invalid platform for string on line %d of %s" msgstr "字符串无效平台于行%d (%s)" -#: featurefile.c:5388 featurefile.c:5769 +#: featurefile.c:5402 featurefile.c:5805 #, c-format msgid "Expected string on line %d of %s" msgstr "期望字符串于行%d (%s)" -#: featurefile.c:5447 +#: featurefile.c:5461 #, c-format msgid "End of file found in string on line %d of %s" msgstr "" -#: featurefile.c:5543 featurefile.c:5716 +#: featurefile.c:5557 featurefile.c:5752 #, c-format msgid "Expected closing curly brace on line %d of %s" msgstr "" -#: featurefile.c:5555 +#: featurefile.c:5570 #, c-format msgid "Expected tag in feature on line %d of %s" msgstr "" -#: featurefile.c:5590 +#: featurefile.c:5605 #, c-format msgid "Unexpected end of file in feature definition on line %d of %s" msgstr "" -#: featurefile.c:5605 +#: featurefile.c:5620 #, c-format msgid "" "Features inside of other features are only permitted for 'aalt' features on " "line %d of %s" msgstr "" -#: featurefile.c:5610 featurefile.c:5621 +#: featurefile.c:5625 featurefile.c:5636 #, c-format msgid "Expected tag on line %d of %s" msgstr "期望标签于行%d (%s)" -#: featurefile.c:5637 +#: featurefile.c:5652 #, c-format msgid "Expected ';' on line %d of %s" msgstr "期望';'于行%d (%s)" -#: featurefile.c:5665 +#: featurefile.c:5680 #, c-format msgid "Unexpected token, %s, in feature definition on line %d of %s" msgstr "" -#: featurefile.c:5675 +#: featurefile.c:5690 #, c-format msgid "Expected '%c%c%c%c' in lookup definition on line %d of %s" msgstr "" -#: featurefile.c:5736 +#: featurefile.c:5772 #, c-format msgid "Unknown field %s on line %d of %s" msgstr "未知域%s于行%d (%s)" -#: featurefile.c:5778 +#: featurefile.c:5814 #, c-format msgid "Expected integer on line %d of %s" msgstr "期望整数于行%d (%s)" -#: featurefile.c:5811 featurefile.c:5897 +#: featurefile.c:5847 featurefile.c:5933 #, c-format msgid "Expected semicolon on line %d of %s" msgstr "期望分号于行%d (%s)" -#: featurefile.c:5824 +#: featurefile.c:5860 #, c-format msgid "Expected '}' on line %d of %s" msgstr "期望'}'于行%d (%s)" -#: featurefile.c:5855 featurefile.c:5879 +#: featurefile.c:5891 featurefile.c:5915 #, c-format msgid "Expected name or class on line %d of %s" msgstr "期望名称或类属于行%d (%s)" -#: featurefile.c:5916 +#: featurefile.c:5961 #, c-format msgid "Expected Attach or LigatureCaret or GlyphClassDef on line %d of %s" msgstr "" -#: featurefile.c:5922 +#: featurefile.c:5967 #, c-format msgid "Unexpected token in GDEF on line %d of %s" msgstr "" -#: featurefile.c:5960 +#: featurefile.c:6005 #, c-format msgid "" "Expected either \"HorizAxis\" or \"VertAxis\" in BASE table on line %d of %s" msgstr "" -#: featurefile.c:5986 +#: featurefile.c:6031 #, c-format msgid "Expected baseline tag in BASE table on line %d of %s" msgstr "" -#: featurefile.c:5994 +#: featurefile.c:6039 #, c-format msgid "" "Expected an integer specifying baseline positions in BASE table on line %d " "of %s" msgstr "" -#: featurefile.c:6021 +#: featurefile.c:6066 #, c-format msgid "Expected comma or semicolon in BASE table on line %d of %s" msgstr "" -#: featurefile.c:6027 +#: featurefile.c:6072 #, c-format msgid "Unexpected token, %s, in BASE table on line %d of %s" msgstr "" -#: featurefile.c:6033 +#: featurefile.c:6078 #, c-format msgid "Expected semicolon in BASE table on line %d of %s" msgstr "" -#: featurefile.c:6060 +#: featurefile.c:6105 #, c-format msgid "Expected tag in table on line %d of %s" msgstr "" -#: featurefile.c:6106 +#: featurefile.c:6151 #, c-format msgid "Expected matching tag in table on line %d of %s" msgstr "" -#: featurefile.c:6251 +#: featurefile.c:6296 #, c-format msgid "FontForge does not support anonymous tables on line %d of %s" msgstr "" -#: featurefile.c:6257 +#: featurefile.c:6302 #, c-format msgid "Unexpected token, %s, on line %d of %s" msgstr "未预期的标识,%s,于行%d (%s)" -#: featurefile.c:6980 +#: featurefile.c:7025 #, c-format msgid "No lookup named %s" msgstr "" -#: featurefile.c:7013 +#: featurefile.c:7058 msgid "Mismatch lookup types inside a parsed lookup" msgstr "" -#: featurefile.c:7016 +#: featurefile.c:7061 msgid "Could not figure out a lookup type" msgstr "" -#: featurefile.c:7026 +#: featurefile.c:7071 msgid "Mark anchors provided when nothing can use them" msgstr "" # -#: featurefile.c:7441 parsettfatt.c:770 +#: featurefile.c:7486 parsettfatt.c:785 #, c-format msgid "Anchor-%d" msgstr "锚点-%d" # -#: featurefile.c:7531 fontinfo.c:6943 +#: featurefile.c:7580 fontinfo.c:6722 msgid "Cannot open file" msgstr "无法打开文件" # -#: featurefile.c:7531 +#: featurefile.c:7580 #, c-format msgid "Cannot open feature file %.120s" msgstr "无法打开指定的文件：%.120s" @@ -10018,47 +10019,47 @@ msgstr "" # -#: fontinfo.c:734 fontinfo.c:9200 +#: fontinfo.c:734 fontinfo.c:8979 msgid "_Serifs" msgstr "衬线(_S)" # -#: fontinfo.c:734 fontinfo.c:735 fontinfo.c:736 fontinfo.c:738 fontinfo.c:9218 +#: fontinfo.c:734 fontinfo.c:735 fontinfo.c:736 fontinfo.c:738 fontinfo.c:8997 msgid "Panose|_Weight" msgstr "粗细(_W)" # -#: fontinfo.c:734 fontinfo.c:9236 +#: fontinfo.c:734 fontinfo.c:9015 msgid "_Proportion" msgstr "比例(_P)" # -#: fontinfo.c:734 fontinfo.c:735 fontinfo.c:9254 +#: fontinfo.c:734 fontinfo.c:735 fontinfo.c:9033 msgid "_Contrast" msgstr "对比(_C)" # -#: fontinfo.c:734 fontinfo.c:9272 +#: fontinfo.c:734 fontinfo.c:9051 msgid "Stroke _Variation" msgstr "笔画变化(_V)：" # -#: fontinfo.c:734 fontinfo.c:9290 +#: fontinfo.c:734 fontinfo.c:9069 msgid "_Arm Style" msgstr "Arm样式(_A)" # -#: fontinfo.c:734 fontinfo.c:9308 +#: fontinfo.c:734 fontinfo.c:9087 msgid "_Letterform" msgstr "字母形式(_L)" # -#: fontinfo.c:734 fontinfo.c:9326 +#: fontinfo.c:734 fontinfo.c:9105 msgid "_Midline" msgstr "中线(_M)" # -#: fontinfo.c:734 fontinfo.c:9344 +#: fontinfo.c:734 fontinfo.c:9123 msgid "_X-Height" msgstr "_X高度" @@ -10732,7 +10733,7 @@ msgstr "Korean (Johab)" # -#: fontinfo.c:866 fontinfo.c:1049 unicoderange.c:78 +#: fontinfo.c:866 fontinfo.c:1049 unicoderange.c:77 msgid "Lao" msgstr "老挝语" @@ -11271,7 +11272,7 @@ msgstr "全称" # -#: fontinfo.c:979 fontinfo.c:4267 +#: fontinfo.c:979 fontinfo.c:4044 msgid "UniqueID" msgstr "惟一标识(ID)" @@ -11355,42 +11356,42 @@ msgstr "WWS 子族" # -#: fontinfo.c:1024 unicoderange.c:41 +#: fontinfo.c:1024 unicoderange.c:43 msgid "Basic Latin" msgstr "基本拉丁文" # -#: fontinfo.c:1025 unicoderange.c:44 +#: fontinfo.c:1025 unicoderange.c:46 msgid "Latin-1 Supplement" msgstr "拉丁-1增补" # -#: fontinfo.c:1026 unicoderange.c:45 +#: fontinfo.c:1026 unicoderange.c:47 msgid "Latin Extended-A" msgstr "拉丁文扩展 A" # -#: fontinfo.c:1027 unicoderange.c:46 +#: fontinfo.c:1027 unicoderange.c:48 msgid "Latin Extended-B" msgstr "拉丁文扩展 B" # -#: fontinfo.c:1028 unicoderange.c:47 +#: fontinfo.c:1028 unicoderange.c:49 msgid "IPA Extensions" msgstr "IPA 国际音标扩展" # -#: fontinfo.c:1029 unicoderange.c:48 +#: fontinfo.c:1029 unicoderange.c:50 msgid "Spacing Modifier Letters" msgstr "空格调整字母" # -#: fontinfo.c:1030 unicoderange.c:49 +#: fontinfo.c:1030 unicoderange.c:51 msgid "Combining Diacritical Marks" msgstr "组合变音标记" # -#: fontinfo.c:1031 unicoderange.c:51 +#: fontinfo.c:1031 unicoderange.c:53 msgid "Greek and Coptic" msgstr "希腊及埃及古文" @@ -11405,12 +11406,12 @@ msgstr "西里尔文补充" # -#: fontinfo.c:1034 unicoderange.c:54 +#: fontinfo.c:1034 unicoderange.c:56 msgid "Armenian" msgstr "亚美尼亚语" # -#: fontinfo.c:1035 unicoderange.c:55 +#: fontinfo.c:1035 unicoderange.c:57 msgid "Hebrew" msgstr "希伯来语" @@ -11420,7 +11421,7 @@ msgstr "未分配位12" # -#: fontinfo.c:1037 unicoderange.c:56 +#: fontinfo.c:1037 unicoderange.c:58 msgid "Arabic" msgstr "阿拉伯语" @@ -11430,57 +11431,57 @@ msgstr "未分配位14" # -#: fontinfo.c:1039 lookups.c:1329 lookupui.c:191 +#: fontinfo.c:1039 lookups.c:1330 lookupui.c:191 msgid "Devanagari" msgstr "天城文(梵文)" # -#: fontinfo.c:1040 unicoderange.c:68 +#: fontinfo.c:1040 unicoderange.c:67 msgid "Bengali" msgstr "孟加拉语" # -#: fontinfo.c:1041 lookups.c:1345 lookupui.c:207 unicoderange.c:69 +#: fontinfo.c:1041 lookups.c:1346 lookupui.c:207 unicoderange.c:68 msgid "Gurmukhi" msgstr "古尔木其文" # -#: fontinfo.c:1042 unicoderange.c:70 +#: fontinfo.c:1042 unicoderange.c:69 msgid "Gujarati" msgstr "印度古吉拉特语" # -#: fontinfo.c:1043 unicoderange.c:71 +#: fontinfo.c:1043 unicoderange.c:70 msgid "Oriya" msgstr "奥里雅语" # -#: fontinfo.c:1044 unicoderange.c:72 +#: fontinfo.c:1044 unicoderange.c:71 msgid "Tamil" msgstr "泰米尔语" # -#: fontinfo.c:1045 unicoderange.c:73 +#: fontinfo.c:1045 unicoderange.c:72 msgid "Telugu" msgstr "泰卢固语" # -#: fontinfo.c:1046 unicoderange.c:74 +#: fontinfo.c:1046 unicoderange.c:73 msgid "Kannada" msgstr "卡纳达语" # -#: fontinfo.c:1047 unicoderange.c:75 +#: fontinfo.c:1047 unicoderange.c:74 msgid "Malayalam" msgstr "马拉雅拉姆语" # -#: fontinfo.c:1048 unicoderange.c:77 +#: fontinfo.c:1048 unicoderange.c:76 msgid "Thai" msgstr "泰国语" # -#: fontinfo.c:1050 unicoderange.c:81 +#: fontinfo.c:1050 unicoderange.c:80 msgid "Georgian" msgstr "格鲁吉亚语" @@ -11490,22 +11491,22 @@ msgstr "未分配位27" # -#: fontinfo.c:1052 lookups.c:1347 lookupui.c:209 +#: fontinfo.c:1052 lookups.c:1348 lookupui.c:209 msgid "Hangul Jamo" msgstr "韩文 Jamo" # -#: fontinfo.c:1053 unicoderange.c:110 +#: fontinfo.c:1053 unicoderange.c:111 msgid "Latin Extended Additional" msgstr "拉丁文扩展附加" # -#: fontinfo.c:1054 unicoderange.c:111 +#: fontinfo.c:1054 unicoderange.c:112 msgid "Greek Extended" msgstr "希腊扩展" # -#: fontinfo.c:1055 unicoderange.c:113 +#: fontinfo.c:1055 unicoderange.c:114 msgid "General Punctuation" msgstr "常用标点符号" @@ -11515,7 +11516,7 @@ msgstr "上下标" # -#: fontinfo.c:1057 unicoderange.c:115 +#: fontinfo.c:1057 unicoderange.c:116 msgid "Currency Symbols" msgstr "货币符号" @@ -11524,7 +11525,7 @@ msgstr "符号组合变音标记" # -#: fontinfo.c:1059 unicoderange.c:117 +#: fontinfo.c:1059 unicoderange.c:118 msgid "Letterlike Symbols" msgstr "字母符号" @@ -11549,7 +11550,7 @@ msgstr "其它技术符号" # -#: fontinfo.c:1064 unicoderange.c:122 +#: fontinfo.c:1064 unicoderange.c:124 msgid "Control Pictures" msgstr "控制图片" @@ -11558,42 +11559,42 @@ msgstr "光学符号识别" # -#: fontinfo.c:1066 unicoderange.c:124 +#: fontinfo.c:1066 unicoderange.c:126 msgid "Enclosed Alphanumerics" msgstr "带圈的字母数字" # -#: fontinfo.c:1067 unicoderange.c:125 +#: fontinfo.c:1067 unicoderange.c:127 msgid "Box Drawing" msgstr "方块图形" # -#: fontinfo.c:1068 unicoderange.c:126 +#: fontinfo.c:1068 unicoderange.c:128 msgid "Block Elements" msgstr "方块元素" # -#: fontinfo.c:1069 unicoderange.c:127 +#: fontinfo.c:1069 unicoderange.c:129 msgid "Geometric Shapes" msgstr "几何形状" # -#: fontinfo.c:1070 unicoderange.c:128 +#: fontinfo.c:1070 unicoderange.c:130 msgid "Miscellaneous Symbols" msgstr "其他符号" # -#: fontinfo.c:1071 unicoderange.c:129 +#: fontinfo.c:1071 unicoderange.c:132 msgid "Dingbats" msgstr "Dingbats 英文字符" # -#: fontinfo.c:1072 unicoderange.c:156 +#: fontinfo.c:1072 unicoderange.c:161 msgid "CJK Symbols and Punctuation" msgstr "中日韩符号与标点" # -#: fontinfo.c:1073 langfreq.c:1825 unicoderange.c:157 +#: fontinfo.c:1073 langfreq.c:1825 unicoderange.c:162 msgid "Hiragana" msgstr "日文平假名" @@ -11608,7 +11609,7 @@ msgstr "注音字母扩展" # -#: fontinfo.c:1076 unicoderange.c:160 +#: fontinfo.c:1076 unicoderange.c:165 msgid "Hangul Compatibility Jamo" msgstr "韩文兼容 Jamo" @@ -11623,12 +11624,12 @@ msgstr "带圈的中日韩字符和月时" # -#: fontinfo.c:1079 unicoderange.c:167 +#: fontinfo.c:1079 unicoderange.c:172 msgid "CJK Compatibility" msgstr "中日韩兼容字符" # -#: fontinfo.c:1080 unicoderange.c:191 +#: fontinfo.c:1080 unicoderange.c:199 msgid "Hangul Syllables" msgstr "韩文音节" @@ -11642,22 +11643,22 @@ msgstr "未分配位58" # -#: fontinfo.c:1083 unicoderange.c:170 +#: fontinfo.c:1083 unicoderange.c:175 msgid "CJK Unified Ideographs" msgstr "中日韩统一表意字符" # -#: fontinfo.c:1085 +#: fontinfo.c:1085 unicoderange.c:205 msgid "Private Use Area" msgstr "私用空间" # -#: fontinfo.c:1086 unicoderange.c:203 +#: fontinfo.c:1086 unicoderange.c:211 msgid "CJK Compatibility Ideographs" msgstr "中日韩兼容表意字符" # -#: fontinfo.c:1087 unicoderange.c:204 +#: fontinfo.c:1087 unicoderange.c:212 msgid "Alphabetic Presentation Forms" msgstr "字母表现形式" @@ -11667,17 +11668,17 @@ msgstr "阿拉伯表现形式 A" # -#: fontinfo.c:1089 +#: fontinfo.c:1089 unicoderange.c:219 msgid "Combining Half Marks" msgstr "组合半角标记" # -#: fontinfo.c:1090 unicoderange.c:212 +#: fontinfo.c:1090 unicoderange.c:220 msgid "CJK Compatibility Forms" msgstr "中日韩兼容形式" # -#: fontinfo.c:1091 unicoderange.c:213 +#: fontinfo.c:1091 unicoderange.c:221 msgid "Small Form Variants" msgstr "小样式变调" @@ -11692,72 +11693,72 @@ msgstr "半角及全角形式" # -#: fontinfo.c:1094 unicoderange.c:220 +#: fontinfo.c:1094 unicoderange.c:228 msgid "Specials" msgstr "特殊" # -#: fontinfo.c:1095 unicoderange.c:79 +#: fontinfo.c:1095 unicoderange.c:78 msgid "Tibetan" msgstr "藏文（中国）" # -#: fontinfo.c:1096 unicoderange.c:57 +#: fontinfo.c:1096 unicoderange.c:59 msgid "Syriac" msgstr "叙利亚文" # -#: fontinfo.c:1097 lookups.c:1411 lookupui.c:266 unicoderange.c:59 +#: fontinfo.c:1097 lookups.c:1412 lookupui.c:266 unicoderange.c:61 msgid "Thaana" msgstr "塔安那文" # -#: fontinfo.c:1098 unicoderange.c:76 +#: fontinfo.c:1098 unicoderange.c:75 msgid "Sinhala" msgstr "僧伽罗语" # -#: fontinfo.c:1099 unicoderange.c:80 +#: fontinfo.c:1099 unicoderange.c:79 msgid "Myanmar" msgstr "缅甸文" # -#: fontinfo.c:1100 unicoderange.c:85 +#: fontinfo.c:1100 unicoderange.c:84 msgid "Ethiopic" msgstr "埃塞尔比亚文" # -#: fontinfo.c:1101 lookups.c:1318 unicoderange.c:87 +#: fontinfo.c:1101 lookups.c:1319 unicoderange.c:86 msgid "Cherokee" msgstr "切罗基文" # -#: fontinfo.c:1102 unicoderange.c:88 +#: fontinfo.c:1102 unicoderange.c:87 msgid "Unified Canadian Aboriginal Syllabics" msgstr "统一加拿大原住民音节表" # -#: fontinfo.c:1103 lookups.c:1379 lookupui.c:238 unicoderange.c:89 +#: fontinfo.c:1103 lookups.c:1380 lookupui.c:238 unicoderange.c:88 msgid "Ogham" msgstr "欧甘语" # -#: fontinfo.c:1104 lookups.c:1394 lookupui.c:251 unicoderange.c:90 +#: fontinfo.c:1104 lookups.c:1395 lookupui.c:251 unicoderange.c:89 msgid "Runic" msgstr "Runic" # -#: fontinfo.c:1105 unicoderange.c:95 +#: fontinfo.c:1105 unicoderange.c:94 msgid "Khmer" msgstr "高棉语" # -#: fontinfo.c:1106 unicoderange.c:96 +#: fontinfo.c:1106 unicoderange.c:95 msgid "Mongolian" msgstr "蒙古语" # -#: fontinfo.c:1107 unicoderange.c:135 +#: fontinfo.c:1107 unicoderange.c:138 msgid "Braille Patterns" msgstr "盲文模式" @@ -11771,17 +11772,17 @@ msgstr "" # -#: fontinfo.c:1110 unicoderange.c:236 +#: fontinfo.c:1110 unicoderange.c:244 msgid "Old Italic" msgstr "古意大利式" # -#: fontinfo.c:1111 lookups.c:1341 lookupui.c:203 unicoderange.c:237 +#: fontinfo.c:1111 lookups.c:1342 lookupui.c:203 unicoderange.c:245 msgid "Gothic" msgstr "哥特式" # -#: fontinfo.c:1112 unicoderange.c:240 +#: fontinfo.c:1112 unicoderange.c:248 msgid "Deseret" msgstr "Deseret" @@ -11791,7 +11792,7 @@ msgstr "拜占庭乐符" # -#: fontinfo.c:1114 lookups.c:1373 lookupui.c:233 unicoderange.c:273 +#: fontinfo.c:1114 lookups.c:1374 lookupui.c:233 unicoderange.c:285 msgid "Mathematical Alphanumeric Symbols" msgstr "数学字母数字符号" @@ -11800,7 +11801,7 @@ msgstr "私人应用 (平面 15与16)" # -#: fontinfo.c:1116 unicoderange.c:209 +#: fontinfo.c:1116 unicoderange.c:217 msgid "Variation Selectors" msgstr "变调选择器" @@ -12272,129 +12273,129 @@ msgstr "" # -#: fontinfo.c:1236 +#: fontinfo.c:1240 msgid "No Grid Fit" msgstr "无网格填充" # -#: fontinfo.c:1237 +#: fontinfo.c:1241 msgid "Grid Fit" msgstr "网格填充" # -#: fontinfo.c:1240 +#: fontinfo.c:1244 msgid "No Anti-Alias" msgstr "不抗锯齿" # -#: fontinfo.c:1241 +#: fontinfo.c:1245 msgid "Anti-Alias" msgstr "抗锯齿" # -#: fontinfo.c:1244 +#: fontinfo.c:1248 msgid "No Symmetric-Smooth" msgstr "无对称-平滑" # -#: fontinfo.c:1245 +#: fontinfo.c:1249 msgid "Symmetric-Smoothing" msgstr "对称平滑" # -#: fontinfo.c:1248 +#: fontinfo.c:1252 msgid "No Grid Fit w/ Sym-Smooth" msgstr "无网格填充(平滑)" # -#: fontinfo.c:1249 +#: fontinfo.c:1253 msgid "Grid Fit w/ Sym-Smooth" msgstr "网格填充(对称平滑)" -#: fontinfo.c:1252 +#: fontinfo.c:1256 msgid "Gasp|For Pixels Per EM <= Value" msgstr "" # -#: fontinfo.c:1253 +#: fontinfo.c:1257 msgid "Gasp|Grid Fit" msgstr "网格填充" # -#: fontinfo.c:1254 +#: fontinfo.c:1258 msgid "Gasp|Anti-Alias" msgstr "抗锯齿" # -#: fontinfo.c:1255 +#: fontinfo.c:1259 msgid "Gasp|Symmetric Smoothing" msgstr "对称平滑" # -#: fontinfo.c:1256 +#: fontinfo.c:1260 msgid "Gasp|Grid Fit w/ Sym Smooth" msgstr "网格填充(平滑)" -#: fontinfo.c:1259 +#: fontinfo.c:1263 msgid "Cubic" msgstr "" -#: fontinfo.c:1260 fontinfo.c:8372 +#: fontinfo.c:1264 fontinfo.c:8151 msgid "Quadratic" msgstr "" -#: fontinfo.c:1263 fontview.c:4993 metricsview.c:3223 +#: fontinfo.c:1267 fontview.c:4997 metricsview.c:3252 msgid "Layer|Foreground" msgstr "" -#: fontinfo.c:1264 +#: fontinfo.c:1268 msgid "Layer|Background" msgstr "" -#: fontinfo.c:1268 +#: fontinfo.c:1272 msgid "Layer Name" msgstr "" -#: fontinfo.c:1269 +#: fontinfo.c:1273 msgid "Curve Type" msgstr "" -#: fontinfo.c:1270 +#: fontinfo.c:1274 msgid "Type" msgstr "" -#: fontinfo.c:1271 +#: fontinfo.c:1275 msgid "Orig layer" msgstr "" -#: fontinfo.c:1275 +#: fontinfo.c:1279 msgid "Set Name" msgstr "" -#: fontinfo.c:1276 +#: fontinfo.c:1280 msgid "Glyphs in the set" msgstr "" -#: fontinfo.c:1279 +#: fontinfo.c:1283 msgid "Class Name" msgstr "" -#: fontinfo.c:1280 +#: contextchain.c:1929 contextchain.c:1934 fontinfo.c:1284 msgid "Glyphs in the class" msgstr "" # -#: fontinfo.c:1720 fontinfo.c:1736 parsettf.c:4478 python.c:16809 -#: python.c:16824 +#: fontinfo.c:1721 fontinfo.c:1737 parsettf.c:4478 python.c:17246 +#: python.c:17261 msgid "Unknown" msgstr "未知" -#: fontinfo.c:1812 +#: fontinfo.c:1813 msgid "Key" msgstr "" # -#: fontinfo.c:1813 nonlineartransui.c:210 nonlineartransui.c:217 +#: fontinfo.c:1814 nonlineartransui.c:210 nonlineartransui.c:217 #: ttfinstrsui.c:1365 msgid "Value" msgstr "值" @@ -12403,76 +12404,76 @@ #. GT: The words "true" and "false" should be left untranslated. We are restricted #. GT: here by what PostScript understands, and it only understands the English #. GT: words. You may, of course, change it to something like ("true" (vrai) ou "false" (faux)) -#: fontinfo.c:1890 fontinfo.c:1958 fontinfo.c:1961 fontinfo.c:1965 -#: fontinfo.c:1976 +#: fontinfo.c:1891 fontinfo.c:1959 fontinfo.c:1962 fontinfo.c:1966 +#: fontinfo.c:1977 msgid "Bad type" msgstr "不良类型" -#: fontinfo.c:1890 +#: fontinfo.c:1891 #, c-format msgid "" "Expected array of numbers.\n" "Failed to parse \"%.*s\" as a number." msgstr "" -#: fontinfo.c:1958 +#: fontinfo.c:1959 msgid "" "Expected boolean value.\n" "(\"true\" or \"false\")" msgstr "" -#: fontinfo.c:1961 +#: fontinfo.c:1962 msgid "" "Expected PostScript code.\n" "Which usually begins with a \"{\" and ends with a \"}\"." msgstr "" -#: fontinfo.c:1965 fontinfo.c:1976 +#: fontinfo.c:1966 fontinfo.c:1977 msgid "Expected number." msgstr "" -#: fontinfo.c:2280 +#: fontinfo.c:2281 msgid "No Name" msgstr "" -#: fontinfo.c:2280 +#: fontinfo.c:2281 msgid "Please specify a name for this mark class or set" msgstr "" -#: fontinfo.c:2285 +#: fontinfo.c:2286 msgid "Mark class/set names should not contain spaces." msgstr "" # -#: fontinfo.c:2291 groupsdlg.c:727 groupsdlg.c:734 +#: fontinfo.c:2292 groupsdlg.c:727 groupsdlg.c:734 msgid "Duplicate Name" msgstr "复制名称" -#: fontinfo.c:2291 +#: fontinfo.c:2292 #, c-format msgid "This name was previously used to identify mark class/set #%d." msgstr "" -#: fontinfo.c:2325 +#: fontinfo.c:2327 msgid "Mark Class was in use" msgstr "" -#: fontinfo.c:2325 +#: fontinfo.c:2327 #, c-format msgid "This mark class (%s) was used in lookup %s" msgstr "" -#: fontinfo.c:2335 +#: fontinfo.c:2337 msgid "Mark Set was in use" msgstr "" -#: fontinfo.c:2335 +#: fontinfo.c:2337 #, c-format msgid "This mark set (%s) was used in lookup %s" msgstr "" # -#: fontinfo.c:2518 macencui.c:485 macencui.c:843 macencui.c:1143 +#: macencui.c:485 macencui.c:843 macencui.c:1143 msgid "_Name:" msgstr "名称(_N):" @@ -12481,22 +12482,22 @@ msgstr "" # -#: fontinfo.c:2797 +#: fontinfo.c:2541 msgid "Bad Family Name" msgstr "不良字族名" -#: fontinfo.c:2797 +#: fontinfo.c:2541 msgid "Bad Family Name, must begin with an alphabetic character." msgstr "" # -#: fontinfo.c:2826 fontinfo.c:2848 fontinfo.c:2851 fontinfo.c:2866 -#: fontinfo.c:2874 parsettf.c:1428 parsettf.c:1439 parsettf.c:1450 +#: fontinfo.c:2570 fontinfo.c:2592 fontinfo.c:2595 fontinfo.c:2610 +#: fontinfo.c:2618 parsettf.c:1428 parsettf.c:1439 parsettf.c:1450 #: savefontdlg.c:1411 msgid "Bad Font Name" msgstr "不良字体名" -#: fontinfo.c:2826 +#: fontinfo.c:2570 #, c-format msgid "" "A PostScript name should be ASCII\n" @@ -12505,38 +12506,38 @@ msgstr "" # -#: fontinfo.c:2831 mmdlg.c:1777 +#: fontinfo.c:2575 mmdlg.c:1777 msgid "A Font Family name is required" msgstr "需要字体集名称" # -#: fontinfo.c:2840 fontinfo.c:2844 fontinfo.c:2857 +#: fontinfo.c:2584 fontinfo.c:2588 fontinfo.c:2601 msgid "Bad Font Family Name" msgstr "不良字体集名称" -#: fontinfo.c:2840 fontinfo.c:2866 parsettf.c:1428 +#: fontinfo.c:2584 fontinfo.c:2610 parsettf.c:1428 msgid "A PostScript name may not be a number" msgstr "" -#: fontinfo.c:2844 +#: fontinfo.c:2588 msgid "" "Some versions of Windows will refuse to install postscript fonts if the " "familyname is longer than 31 characters. Do you want to continue anyway?" msgstr "" -#: fontinfo.c:2848 savefontdlg.c:1411 +#: fontinfo.c:2592 savefontdlg.c:1411 msgid "" "Some versions of Windows will refuse to install postscript fonts if the " "fontname is longer than 31 characters. Do you want to continue anyway?" msgstr "" -#: fontinfo.c:2851 +#: fontinfo.c:2595 msgid "" "Adobe's fontname spec (5088.FontNames.pdf) says that fontnames should not be " "longer than 29 characters. Do you want to continue anyway?" msgstr "" -#: fontinfo.c:2857 fontinfo.c:2874 +#: fontinfo.c:2601 fontinfo.c:2618 #, c-format msgid "" "A PostScript name should be ASCII\n" @@ -12544,38 +12545,38 @@ msgstr "" # -#: fontinfo.c:2900 +#: fontinfo.c:2644 #, c-format msgid "Version %.20s" msgstr "版本 %.20s" # -#: fontinfo.c:3289 +#: fontinfo.c:3033 msgid "Detach from PostScript Names" msgstr "与 PostScript 名称分离" # -#: fontinfo.c:3292 +#: fontinfo.c:3036 msgid "Same as PostScript Names" msgstr "与 PostScript 名称相同" # -#: fontinfo.c:3299 +#: fontinfo.c:3043 msgid "Multi-line edit" msgstr "多行编辑" # -#: fontinfo.c:3318 +#: fontinfo.c:3062 #, c-format msgid "%1$.30s string for %2$.30s" msgstr "%1$.30s 字符串向 %2$.30s" # -#: fontinfo.c:3482 +#: fontinfo.c:3226 msgid "Please read the OFL" msgstr "请阅读 OFL" -#: fontinfo.c:3483 +#: fontinfo.c:3227 msgid "" "You should read the OFL and its FAQ \n" "at http://scripts.sil.org/OFL.\n" @@ -12592,79 +12593,79 @@ msgstr "" # -#: fontinfo.c:3744 +#: fontinfo.c:3521 msgid "Slant:" msgstr "斜度:" # -#: fontinfo.c:3744 +#: fontinfo.c:3521 msgid "Space:" msgstr "间距:" # -#: fontinfo.c:3744 +#: fontinfo.c:3521 msgid "Stretch:" msgstr "拉伸:" # -#: fontinfo.c:3745 +#: fontinfo.c:3522 msgid "Shrink:" msgstr "收缩：" # -#: fontinfo.c:3745 +#: fontinfo.c:3522 msgid "XHeight:" msgstr "X高度:" # -#: fontinfo.c:3745 +#: fontinfo.c:3522 msgid "Quad:" msgstr "四方数量:" # #. GT: Extra Space, see below for a full comment #. GT: Extra Space -#: fontinfo.c:3747 fontinfo.c:5273 fontinfo.c:5309 +#: fontinfo.c:3524 fontinfo.c:5050 fontinfo.c:5086 msgid "Extra Sp:" msgstr "空位:" -#: fontinfo.c:3748 +#: fontinfo.c:3525 msgid "In an italic font the horizontal change per unit vertical change" msgstr "" -#: fontinfo.c:3749 +#: fontinfo.c:3526 msgid "The amount of space between words when using this font" msgstr "" -#: fontinfo.c:3750 +#: fontinfo.c:3527 msgid "The amount of strechable space between words when using this font" msgstr "" -#: fontinfo.c:3751 +#: fontinfo.c:3528 msgid "The amount the space between words may shrink when using this font" msgstr "" -#: fontinfo.c:3752 +#: fontinfo.c:3529 msgid "The height of the lower case letters with flat tops" msgstr "" # -#: fontinfo.c:3753 +#: fontinfo.c:3530 msgid "The width of one em" msgstr "M全字宽度" -#: fontinfo.c:3754 +#: fontinfo.c:3531 msgid "" "Either:\n" "The amount of extra space to be added after a sentence\n" "Or the space to be used within math formulae" msgstr "" -#: fontinfo.c:3909 +#: fontinfo.c:3686 msgid "Name table too big for windows" msgstr "" -#: fontinfo.c:3910 +#: fontinfo.c:3687 msgid "" "Windows has decided that fonts with 'name' tables\n" "bigger than 5K are insecure and will refuse to load\n" @@ -12672,11 +12673,11 @@ "This font will have a 'name' table bigger than that." msgstr "" -#: fontinfo.c:3937 +#: fontinfo.c:3714 msgid "Duplicate StyleSet Name" msgstr "" -#: fontinfo.c:3937 +#: fontinfo.c:3714 #, c-format msgid "" "The feature '%c%c%c%c' is named twice in language %s\n" @@ -12685,65 +12686,65 @@ msgstr "" # -#: fontinfo.c:4051 fontinfo.c:4059 +#: fontinfo.c:3828 fontinfo.c:3836 msgid "Bad hex number" msgstr "无效的十六进制数" # -#: fontinfo.c:4051 fontinfo.c:4059 +#: fontinfo.c:3828 fontinfo.c:3836 #, c-format msgid "Bad hex number in %s" msgstr "无效的十六进制数在%s中" # -#: fontinfo.c:4187 +#: fontinfo.c:3964 msgid "Bad Grid Fitting table" msgstr "不良网格填充表" -#: fontinfo.c:4187 +#: fontinfo.c:3964 msgid "The 'gasp' (Grid Fit) table must end with a pixel entry of 65535" msgstr "" -#: fontinfo.c:4196 +#: fontinfo.c:3973 msgid "Bad Copyright" msgstr "" -#: fontinfo.c:4196 +#: fontinfo.c:3973 msgid "" "Copyright text (in the Names pane) must be entirely ASCII. So, use (c) " "instead of ©." msgstr "" -#: fontinfo.c:4197 +#: fontinfo.c:3974 msgid "Bad Human Fontname" msgstr "" -#: fontinfo.c:4197 +#: fontinfo.c:3974 msgid "" "The human-readable fontname text (in the Names pane) must be entirely ASCII." msgstr "" -#: fontinfo.c:4198 +#: fontinfo.c:3975 msgid "Bad Weight" msgstr "" -#: fontinfo.c:4198 +#: fontinfo.c:3975 msgid "The weight text (in the Names pane) must be entirely ASCII." msgstr "" -#: fontinfo.c:4199 +#: fontinfo.c:3976 msgid "Bad Version" msgstr "" -#: fontinfo.c:4199 +#: fontinfo.c:3976 msgid "The version text (in the Names pane) must be entirely ASCII." msgstr "" -#: fontinfo.c:4212 +#: fontinfo.c:3989 msgid "Deleting a layer cannot be UNDONE!" msgstr "" -#: fontinfo.c:4213 +#: fontinfo.c:3990 msgid "" "You are about to delete a layer.\n" "This will lose all contours in that layer.\n" @@ -12755,11 +12756,11 @@ "Is this really your intent?" msgstr "" -#: fontinfo.c:4221 +#: fontinfo.c:3998 msgid "Removing instructions cannot be UNDONE!" msgstr "" -#: fontinfo.c:4222 +#: fontinfo.c:3999 msgid "" "You are about to change the last quadratic\n" "layer to cubic. When this happens FontForge\n" @@ -12770,292 +12771,292 @@ "Is this really your intent?" msgstr "" -#: fontinfo.c:4231 splinefont.c:1946 +#: fontinfo.c:4008 splinefont.c:1946 msgid "Too many layers" msgstr "" -#: fontinfo.c:4231 +#: fontinfo.c:4008 #, c-format msgid "FontForge supports at most %d layers" msgstr "" # -#: fontinfo.c:4241 +#: fontinfo.c:4018 msgid "Too many Unique Font IDs" msgstr "过多相同的字体编号" -#: fontinfo.c:4241 +#: fontinfo.c:4018 msgid "" "You should only specify the TrueType Unique Font Identification string in " "one language. This font has more. Do you want to continue anyway?" msgstr "" # -#: fontinfo.c:4252 fontinfo.c:8044 +#: fontinfo.c:4029 fontinfo.c:7823 msgid "_Italic Angle:" msgstr "倾斜角(_I)：" # -#: fontinfo.c:4262 fontinfo.c:8079 +#: fontinfo.c:4039 fontinfo.c:7858 msgid "Underline _Position:" msgstr "下划线位置(_P)：" # -#: fontinfo.c:4263 fontinfo.c:8096 +#: fontinfo.c:4040 fontinfo.c:7875 msgid "Underline|_Height:" msgstr "高度(_H)：" # -#: fontinfo.c:4264 +#: fontinfo.c:4041 msgid "_Em Size:" msgstr "M全字尺寸(_E)：" # -#: fontinfo.c:4265 fontinfo.c:7976 +#: fontinfo.c:4042 fontinfo.c:7755 msgid "_Ascent:" msgstr "上高(_A)：" # -#: fontinfo.c:4266 fontinfo.c:7994 +#: fontinfo.c:4043 fontinfo.c:7773 msgid "_Descent:" msgstr "下深(_D)：" # -#: fontinfo.c:4268 fontinfo.c:10055 +#: fontinfo.c:4045 fontinfo.c:9835 msgid "De_sign Size:" msgstr "设计尺寸：" # -#: fontinfo.c:4269 fontinfo.c:7059 fontinfo.c:10359 +#: fontinfo.c:4046 fontinfo.c:6838 fontinfo.c:10101 msgid "_Bottom" msgstr "底(_B)" # -#: fontinfo.c:4270 fontinfo.c:7056 fontinfo.c:10326 +#: fontinfo.c:4047 fontinfo.c:6835 fontinfo.c:10068 msgid "_Top" msgstr "顶(_T)" # -#: fontinfo.c:4271 fontinfo.c:10133 +#: fontinfo.c:4048 fontinfo.c:9913 msgid "Style _ID:" msgstr "样式ID:" -#: fontinfo.c:4275 fontinfo.c:4278 fontinfo.c:4281 fontinfo.c:4284 -#: fontinfo.c:4287 fontinfo.c:4290 fontinfo.c:4293 fontinfo.c:4296 +#: fontinfo.c:4052 fontinfo.c:4055 fontinfo.c:4058 fontinfo.c:4061 +#: fontinfo.c:4064 fontinfo.c:4067 fontinfo.c:4070 fontinfo.c:4073 msgid "Bad Design Size Info" msgstr "" -#: fontinfo.c:4275 +#: fontinfo.c:4052 msgid "" "If the design size is 0, then all other fields on that pane must be zero (or " "unspecified) too." msgstr "" -#: fontinfo.c:4278 +#: fontinfo.c:4055 msgid "" "If you specify a style id for the design size, then you must specify a style " "name" msgstr "" -#: fontinfo.c:4281 +#: fontinfo.c:4058 msgid "" "If you specify a style name for the design size, then you must specify a " "style id" msgstr "" -#: fontinfo.c:4284 +#: fontinfo.c:4061 msgid "If you specify a design size, it must be positive" msgstr "" -#: fontinfo.c:4287 +#: fontinfo.c:4064 msgid "" "In the design size range, the bottom field must be less than the design size." msgstr "" -#: fontinfo.c:4290 +#: fontinfo.c:4067 msgid "" "In the design size range, the bottom top must be more than the design size." msgstr "" -#: fontinfo.c:4293 +#: fontinfo.c:4070 msgid "" "If you specify a style id for the design size, then you must specify a size " "range" msgstr "" -#: fontinfo.c:4296 +#: fontinfo.c:4073 msgid "" "If you specify a design size range, then you are supposed to specify a style " "id and style name too. FontForge will allow you to leave those fields blank, " "but other applications may not." msgstr "" -#: fontinfo.c:4301 +#: fontinfo.c:4078 msgid "sfnt Revision:" msgstr "" -#: fontinfo.c:4303 +#: fontinfo.c:4080 msgid "Woff Major Version:" msgstr "" -#: fontinfo.c:4306 +#: fontinfo.c:4083 msgid "Woff Minor Version:" msgstr "" -#: fontinfo.c:4314 +#: fontinfo.c:4091 msgid "MS Code Pages" msgstr "微软编码页" # -#: fontinfo.c:4316 fontinfo.c:10756 +#: fontinfo.c:4093 fontinfo.c:10498 msgid "Unicode Ranges" msgstr "统一码范围" # -#: fontinfo.c:4321 +#: fontinfo.c:4098 msgid "_Version" msgstr "版本" # -#: fontinfo.c:4331 fontinfo.c:8587 +#: fontinfo.c:4108 fontinfo.c:8366 msgid "Weight, Width, Slope Only" msgstr "仅粗细，宽度，斜度" # -#: fontinfo.c:4349 fontinfo.c:8466 +#: fontinfo.c:4126 fontinfo.c:8245 msgid "_Weight Class" msgstr "粗细类属(_W)" # -#: fontinfo.c:4350 fontinfo.c:8874 +#: fontinfo.c:4127 fontinfo.c:8653 msgid "HHead _Line Gap:" msgstr "HHead 线距(_L):" # -#: fontinfo.c:4351 fontinfo.c:8787 +#: fontinfo.c:4128 fontinfo.c:8566 msgid "Typo Line _Gap:" msgstr "Typo 线距(_G):" # -#: fontinfo.c:4353 fontinfo.c:8895 +#: fontinfo.c:4130 fontinfo.c:8674 msgid "VHead _Column Spacing:" msgstr "VHead 列宽(_C):" # -#: fontinfo.c:4356 fontinfo.c:8643 +#: fontinfo.c:4133 fontinfo.c:8422 msgid "Win _Ascent Offset:" msgstr "Win 重音偏移量(_A):" # -#: fontinfo.c:4356 fontinfo.c:4726 +#: fontinfo.c:4133 fontinfo.c:4503 msgid "Win Ascent:" msgstr "Win 上高:" # -#: fontinfo.c:4357 fontinfo.c:8676 +#: fontinfo.c:4134 fontinfo.c:8455 msgid "Win _Descent Offset:" msgstr "Win 下深偏移量(_D):" # -#: fontinfo.c:4357 fontinfo.c:4731 +#: fontinfo.c:4134 fontinfo.c:4508 msgid "Win Descent:" msgstr "Win 下深:" # -#: fontinfo.c:4360 fontinfo.c:8721 +#: fontinfo.c:4137 fontinfo.c:8500 msgid "_Typo Ascent Offset:" msgstr "字形上高偏移(_T):" # -#: fontinfo.c:4360 fontinfo.c:4735 +#: fontinfo.c:4137 fontinfo.c:4512 msgid "Typo Ascent:" msgstr "字形上高:" # -#: fontinfo.c:4361 fontinfo.c:8754 +#: fontinfo.c:4138 fontinfo.c:8533 msgid "T_ypo Descent Offset:" msgstr "字形下深偏移量(_Y):" # -#: fontinfo.c:4361 fontinfo.c:4740 +#: fontinfo.c:4138 fontinfo.c:4517 msgid "Typo Descent:" msgstr "字形下深:" # -#: fontinfo.c:4364 fontinfo.c:8808 +#: fontinfo.c:4141 fontinfo.c:8587 msgid "_HHead Ascent Offset:" msgstr "_HHead 上高偏移量:" # -#: fontinfo.c:4364 fontinfo.c:4744 +#: fontinfo.c:4141 fontinfo.c:4521 msgid "HHead Ascent:" msgstr "HHead 上高:" # -#: fontinfo.c:4365 fontinfo.c:8841 +#: fontinfo.c:4142 fontinfo.c:8620 msgid "HHead De_scent Offset:" msgstr "HHead 下深偏移(_S):" # -#: fontinfo.c:4365 fontinfo.c:4749 +#: fontinfo.c:4142 fontinfo.c:4526 msgid "HHead Descent:" msgstr "HHead 下深:" # -#: fontinfo.c:4371 fontinfo.c:8944 lookups.c:174 scstylesui.c:370 +#: fontinfo.c:4148 fontinfo.c:8723 lookups.c:175 scstylesui.c:370 msgid "Subscript" msgstr "下标" # -#: fontinfo.c:4373 fontinfo.c:9022 lookups.c:175 scstylesui.c:368 +#: fontinfo.c:4150 fontinfo.c:8801 lookups.c:176 scstylesui.c:368 msgid "Superscript" msgstr "上标" # -#: fontinfo.c:4375 fontinfo.c:9083 +#: fontinfo.c:4152 fontinfo.c:8862 msgid "Strikeout" msgstr "删除线" # -#: fontinfo.c:4381 fontinfo.c:4383 +#: fontinfo.c:4158 fontinfo.c:4160 msgid "Bad IBM Family" msgstr "不良IBM字族名" # -#: fontinfo.c:4381 +#: fontinfo.c:4158 msgid "Tag must be 4 characters long" msgstr "标签至少要有4个字符长" # -#: fontinfo.c:4383 +#: fontinfo.c:4160 msgid "A tag must be 4 ASCII characters" msgstr "特征标签应为4个ASCII字符" # -#: fontinfo.c:4398 +#: fontinfo.c:4175 msgid "Bad Ascent/Descent" msgstr "不良上高/下深" -#: fontinfo.c:4398 +#: fontinfo.c:4175 msgid "Ascent and Descent must be positive and their sum less than 16384" msgstr "" # -#: fontinfo.c:4409 +#: fontinfo.c:4186 msgid "Bad Style" msgstr "不良样式" -#: fontinfo.c:4409 +#: fontinfo.c:4186 msgid "A style may not have both condense and extend set (it makes no sense)" msgstr "" # -#: fontinfo.c:4423 fontview.c:4850 openfontdlg.c:438 prefs.c:1721 +#: fontinfo.c:4200 fontview.c:4854 openfontdlg.c:438 prefs.c:1723 #: savefontdlg.c:1345 msgid "Namelist contains non-ASCII names" msgstr "名称列表中包含非 ASCII 字符" -#: fontinfo.c:4423 +#: fontinfo.c:4200 msgid "" "Glyph names should be limited to characters in the ASCII character set,\n" "but there are names in this namelist which use characters outside\n" @@ -13063,21 +13064,21 @@ msgstr "" # -#: fontinfo.c:4463 math.c:366 math.c:650 +#: fontinfo.c:4240 math.c:366 math.c:650 msgid "Change" msgstr "更改" # -#: fontinfo.c:4464 scstylesui.c:2161 +#: fontinfo.c:4241 scstylesui.c:2161 msgid "Retain" msgstr "保留" # -#: fontinfo.c:4467 +#: fontinfo.c:4244 msgid "Change UniqueID?" msgstr "更改UniqueID？" -#: fontinfo.c:4467 +#: fontinfo.c:4244 msgid "" "You have changed this font's name without changing the UniqueID (or XUID).\n" "This is probably not a good idea, would you like me to\n" @@ -13085,257 +13086,257 @@ msgstr "" # -#: fontinfo.c:4726 +#: fontinfo.c:4503 msgid "Win Ascent Offset:" msgstr "Win 上高偏移量:" # -#: fontinfo.c:4731 +#: fontinfo.c:4508 msgid "Win Descent Offset:" msgstr "Win 下深偏移量:" # -#: fontinfo.c:4735 +#: fontinfo.c:4512 msgid "Typo Ascent Offset:" msgstr "字形上高偏移量:" # -#: fontinfo.c:4740 +#: fontinfo.c:4517 msgid "Typo Descent Offset:" msgstr "字形下降偏移量:" # -#: fontinfo.c:4744 +#: fontinfo.c:4521 msgid "HHead Ascent Offset:" msgstr "HHead 上高偏移量:" # -#: fontinfo.c:4749 +#: fontinfo.c:4526 msgid "HHead Descent Offset:" msgstr "HHead 下深偏移量:" # #. GT: TeX parameters for math fonts. "Num" means numerator, "Denom" #. GT: means denominator, "Sup" means superscript, "Sub" means subscript -#: fontinfo.c:5079 +#: fontinfo.c:4856 msgid "Num1:" msgstr "分子1:" # -#: fontinfo.c:5080 +#: fontinfo.c:4857 msgid "Num2:" msgstr "分子2:" # -#: fontinfo.c:5080 +#: fontinfo.c:4857 msgid "Num3:" msgstr "分子3:" # -#: fontinfo.c:5080 +#: fontinfo.c:4857 msgid "Denom1:" msgstr "分母1:" # -#: fontinfo.c:5081 +#: fontinfo.c:4858 msgid "Denom2:" msgstr "分母2:" # -#: fontinfo.c:5081 +#: fontinfo.c:4858 msgid "Sup1:" msgstr "上标1:" # -#: fontinfo.c:5081 +#: fontinfo.c:4858 msgid "Sup2:" msgstr "上标2:" # -#: fontinfo.c:5081 +#: fontinfo.c:4858 msgid "Sup3:" msgstr "上标3:" # -#: fontinfo.c:5081 +#: fontinfo.c:4858 msgid "Sub1:" msgstr "下标1:" # -#: fontinfo.c:5081 +#: fontinfo.c:4858 msgid "Sub2:" msgstr "下标2:" -#: fontinfo.c:5082 +#: fontinfo.c:4859 msgid "SupDrop:" msgstr "" -#: fontinfo.c:5082 +#: fontinfo.c:4859 msgid "SubDrop:" msgstr "" # -#: fontinfo.c:5082 +#: fontinfo.c:4859 msgid "Delim1:" msgstr "分母1:" # -#: fontinfo.c:5082 +#: fontinfo.c:4859 msgid "Delim2:" msgstr "分母2:" # -#: fontinfo.c:5082 +#: fontinfo.c:4859 msgid "Axis Ht:" msgstr "轴高:" -#: fontinfo.c:5084 +#: fontinfo.c:4861 msgid "Amount to raise baseline for numerators in display styles" msgstr "" -#: fontinfo.c:5085 +#: fontinfo.c:4862 msgid "Amount to raise baseline for numerators in non-display styles" msgstr "" -#: fontinfo.c:5086 +#: fontinfo.c:4863 msgid "Amount to raise baseline for numerators in non-display atop styles" msgstr "" -#: fontinfo.c:5087 +#: fontinfo.c:4864 msgid "Amount to lower baseline for denominators in display styles" msgstr "" -#: fontinfo.c:5088 +#: fontinfo.c:4865 msgid "Amount to lower baseline for denominators in non-display styles" msgstr "" -#: fontinfo.c:5089 +#: fontinfo.c:4866 msgid "Amount to raise baseline for superscripts in display styles" msgstr "" -#: fontinfo.c:5090 +#: fontinfo.c:4867 msgid "Amount to raise baseline for superscripts in non-display styles" msgstr "" -#: fontinfo.c:5091 +#: fontinfo.c:4868 msgid "Amount to raise baseline for superscripts in modified styles" msgstr "" -#: fontinfo.c:5092 +#: fontinfo.c:4869 msgid "Amount to lower baseline for subscripts in display styles" msgstr "" -#: fontinfo.c:5093 +#: fontinfo.c:4870 msgid "Amount to lower baseline for subscripts in non-display styles" msgstr "" -#: fontinfo.c:5094 +#: fontinfo.c:4871 msgid "Amount above top of large box to place baseline of superscripts" msgstr "" -#: fontinfo.c:5095 +#: fontinfo.c:4872 msgid "Amount below bottom of large box to place baseline of subscripts" msgstr "" -#: fontinfo.c:5096 +#: fontinfo.c:4873 msgid "Size of comb delimiters in display styles" msgstr "" -#: fontinfo.c:5097 +#: fontinfo.c:4874 msgid "Size of comb delimiters in non-display styles" msgstr "" # -#: fontinfo.c:5098 +#: fontinfo.c:4875 msgid "Height of fraction bar above base line" msgstr "基线上分数线高度" # #. GT: Default Rule Thickness. A rule being a typographic term for a straight #. GT: black line on a printed page. -#: fontinfo.c:5102 +#: fontinfo.c:4879 msgid "Def Rule Thick:" msgstr "定义规格厚度:" # #. GT: I don't really understand these "Big Op Space" things. They have #. GT: something to do with TeX and are roughly defined a few strings down -#: fontinfo.c:5105 +#: fontinfo.c:4882 msgid "Big Op Space1:" msgstr "大Op间距1:" # -#: fontinfo.c:5106 +#: fontinfo.c:4883 msgid "Big Op Space2:" msgstr "大Op间距2:" # -#: fontinfo.c:5107 +#: fontinfo.c:4884 msgid "Big Op Space3:" msgstr "大Op间距3:" # -#: fontinfo.c:5108 +#: fontinfo.c:4885 msgid "Big Op Space4:" msgstr "大Op间距4:" # -#: fontinfo.c:5109 +#: fontinfo.c:4886 msgid "Big Op Space5:" msgstr "大Op间距5:" -#: fontinfo.c:5110 +#: fontinfo.c:4887 msgid "Default thickness of over and overline bars" msgstr "" -#: fontinfo.c:5111 +#: fontinfo.c:4888 msgid "The minimum glue space above a large displayed operator" msgstr "" -#: fontinfo.c:5112 +#: fontinfo.c:4889 msgid "The minimum glue space below a large displayed operator" msgstr "" -#: fontinfo.c:5113 +#: fontinfo.c:4890 msgid "" "The minimum distance between a limit's baseline and a large displayed\n" "operator when the limit is above the operator" msgstr "" -#: fontinfo.c:5114 +#: fontinfo.c:4891 msgid "" "The minimum distance between a limit's baseline and a large displayed\n" "operator when the limit is below the operator" msgstr "" -#: fontinfo.c:5115 +#: fontinfo.c:4892 msgid "The extra glue place above and below displayed limits" msgstr "" # #. GT: More Parameters -#: fontinfo.c:5182 fontinfo.c:10018 +#: fontinfo.c:4959 fontinfo.c:9797 msgid "More Params" msgstr "更多参数" # -#: fontinfo.c:5276 +#: fontinfo.c:5053 msgid "Math Sp:" msgstr "数学Sp:" # # -#: fontinfo.c:6324 +#: fontinfo.c:6103 msgid "Do it" msgstr "执行" # -#: fontinfo.c:6327 +#: fontinfo.c:6106 msgid "Cannot be Undone" msgstr "不能取消" # -#: fontinfo.c:6327 +#: fontinfo.c:6106 msgid "" "The Merge operation cannot be reverted.\n" "Do it anyway?" @@ -13344,86 +13345,84 @@ "是否继续？" # -#: fontinfo.c:6536 +#: fontinfo.c:6315 msgid "Select lookups from other fonts" msgstr "从其他字体选择查找" # -#: fontinfo.c:6585 +#: fontinfo.c:6364 msgid "Import Lookup" msgstr "导入查找" # -#: fontinfo.c:6724 +#: fontinfo.c:6503 msgid "Kerning State Machine" msgstr "压缩状态机" # -#: fontinfo.c:6726 +#: fontinfo.c:6505 msgid "Indic State Machine" msgstr "Indic 状态机" # -#: fontinfo.c:6728 fontinfo.c:6730 +#: fontinfo.c:6507 fontinfo.c:6509 msgid "Contextual State Machine" msgstr "上下文状态机" # -#: fontinfo.c:6739 -#, c-format +#: fontinfo.c:6518 msgid "(kerning class)\n" msgstr "(压缩类属)\n" # -#: fontinfo.c:6744 -#, c-format +#: fontinfo.c:6523 msgid "Not attached to a feature" msgstr "未附加到特征" # -#: fontinfo.c:6799 +#: fontinfo.c:6578 #, c-format msgid " Used in %s\n" msgstr " 用于 %s\n" -#: fontinfo.c:6931 +#: fontinfo.c:6710 msgid "No data" msgstr "" -#: fontinfo.c:6931 +#: fontinfo.c:6710 msgid "This lookup contains no data" msgstr "" # -#: fontinfo.c:6936 +#: fontinfo.c:6715 msgid "Feature file?" msgstr "特征文件?" # -#: fontinfo.c:6943 +#: fontinfo.c:6722 #, c-format msgid "Cannot open %s" msgstr "无法打开 %s" # -#: fontinfo.c:6952 +#: fontinfo.c:6731 msgid "Output error" msgstr "输出错误" -#: fontinfo.c:6952 +#: fontinfo.c:6731 #, c-format msgid "An error occurred writing %s" msgstr "写入%s发生了错误" -#: fontinfo.c:6983 +#: fontinfo.c:6762 msgid "Lookups will be removed" msgstr "查找将被删除" -#: fontinfo.c:6983 +#: fontinfo.c:6762 msgid "Feature tags will be removed" msgstr "特征标签将被删除" -#: fontinfo.c:6986 +#: fontinfo.c:6765 msgid "" "Warning: There are already some 'aalt' lookups in\n" "the font. If you proceed with this command those\n" @@ -13432,7 +13431,7 @@ " Is that what you want?" msgstr "" -#: fontinfo.c:6992 +#: fontinfo.c:6771 msgid "" "Warning: There are already some 'aalt' lookups in\n" "the font but there are other feature tags associated\n" @@ -13443,7 +13442,7 @@ " Is that what you want?" msgstr "" -#: fontinfo.c:6999 +#: fontinfo.c:6778 msgid "" "Warning: There are already some 'aalt' lookups in\n" "the font, some have no other feature tags associated\n" @@ -13456,145 +13455,145 @@ msgstr "" # -#: fontinfo.c:7022 fontinfo.c:7024 +#: fontinfo.c:6801 fontinfo.c:6803 msgid "_Apply to All" msgstr "应用到全部(_A)" # -#: fontinfo.c:7024 +#: fontinfo.c:6803 msgid "_Apply to Selection" msgstr "应用到选择(_A)" -#: fontinfo.c:7026 +#: fontinfo.c:6805 msgid "Apply to:" msgstr "应用到：" -#: fontinfo.c:7026 +#: fontinfo.c:6805 msgid "Apply change to which lookups?" msgstr "要更改哪个查找？" # -#: fontinfo.c:7057 fontinfo.c:10337 +#: fontinfo.c:6836 fontinfo.c:10079 msgid "_Up" msgstr "上(_U)" # -#: fontinfo.c:7058 fontinfo.c:10348 +#: fontinfo.c:6837 fontinfo.c:10090 msgid "_Down" msgstr "下(_D)" # -#: fontinfo.c:7060 fontinfo.c:10370 +#: fontinfo.c:6839 fontinfo.c:10112 msgid "_Sort" msgstr "排序(_S)" # -#: fontinfo.c:7062 fontinfo.c:10385 +#: fontinfo.c:6841 fontinfo.c:10127 msgid "Add _Lookup" msgstr "添加查找(_L)" # -#: fontinfo.c:7063 fontinfo.c:10396 +#: fontinfo.c:6842 fontinfo.c:10138 msgid "Add Sub_table" msgstr "添加子表(_T)" # -#: fontinfo.c:7064 fontinfo.c:10407 +#: fontinfo.c:6843 fontinfo.c:10149 msgid "Edit _Metadata" msgstr "编辑元数据(_M)" # -#: fontinfo.c:7065 fontinfo.c:10418 +#: fontinfo.c:6844 fontinfo.c:10160 msgid "_Edit Data" msgstr "编辑数据(_E)" # -#: fontinfo.c:7066 fontinfo.c:10429 +#: fontinfo.c:6845 fontinfo.c:10171 msgid "De_lete" msgstr "删除(_L)" # -#: fontinfo.c:7067 fontinfo.c:10440 +#: fontinfo.c:6846 fontinfo.c:10182 msgid "_Merge" msgstr "混成(_M)" -#: fontinfo.c:7068 +#: fontinfo.c:6847 msgid "Sa_ve Lookup..." msgstr "" -#: fontinfo.c:7070 +#: fontinfo.c:6849 msgid "Add Language to Script..." msgstr "" -#: fontinfo.c:7071 +#: fontinfo.c:6850 msgid "Remove Language from Script..." msgstr "" -#: fontinfo.c:7073 +#: fontinfo.c:6852 msgid "_Add 'aalt' features" msgstr "添加 'aalt' 特征(_A)" # -#: fontinfo.c:7074 +#: fontinfo.c:6853 msgid "Add 'D_FLT' script" msgstr "添加 'D_FLT' 脚本" # -#: fontinfo.c:7076 +#: fontinfo.c:6855 msgid "_Revert All" msgstr "返转所有修改(_R)" -#: fontinfo.c:7078 +#: fontinfo.c:6857 msgid "S_ave Feature File..." msgstr "" # -#: fontinfo.c:7672 +#: fontinfo.c:7451 #, c-format msgid "Font Information for %.90s" msgstr "字体信息：%.90s" # -#: fontinfo.c:7693 +#: fontinfo.c:7472 msgid "Fo_ntname:" msgstr "字体名(_N)：" # -#: fontinfo.c:7710 mmdlg.c:2665 +#: fontinfo.c:7489 mmdlg.c:2665 msgid "_Family Name:" msgstr "字族名(_F)：" # -#: fontinfo.c:7730 +#: fontinfo.c:7509 msgid "Name For Human_s:" msgstr "昵称(_s)：" # -#: fontinfo.c:7748 +#: fontinfo.c:7527 msgid "_Weight" msgstr "粗细(_W)" # -#: fontinfo.c:7765 +#: fontinfo.c:7544 msgid "_Version:" msgstr "版本(_V)：" -#: fontinfo.c:7784 +#: fontinfo.c:7563 msgid "sfnt _Revision:" msgstr "" -#: fontinfo.c:7789 fontinfo.c:7800 +#: fontinfo.c:7568 fontinfo.c:7579 msgid "" "If you leave this field blank FontForge will use a default based on\n" "either the version string above, or one in the 'name' table." msgstr "" # -#: fontinfo.c:7803 +#: fontinfo.c:7582 msgid "_Base Filename:" msgstr "文件名(_B):" -#: fontinfo.c:7807 +#: fontinfo.c:7586 msgid "" "Use this as the default base for the filename\n" "when generating a font." @@ -13602,100 +13601,100 @@ # #. GT: The space in front of "Same" makes things line up better -#: fontinfo.c:7812 +#: fontinfo.c:7591 msgid " Same as Fontname" msgstr " 与字体名相同" # -#: fontinfo.c:7837 +#: fontinfo.c:7616 msgid "Copy_right:" msgstr "版权(_r)：" -#: fontinfo.c:7855 +#: fontinfo.c:7634 msgid "" "This must be ASCII, so you may not use the copyright symbol (use (c) " "instead)." msgstr "" # -#: fontinfo.c:7893 +#: fontinfo.c:7672 msgid "(Adobe now considers XUID/UniqueID unnecessary)" msgstr "(Adobe 如今认为 XUID/UniqueID 不必要)" -#: fontinfo.c:7900 +#: fontinfo.c:7679 msgid "Use XUID" msgstr "" # -#: fontinfo.c:7912 +#: fontinfo.c:7691 msgid "_XUID:" msgstr "_XUID:" -#: fontinfo.c:7928 +#: fontinfo.c:7707 msgid "Use UniqueID" msgstr "" # -#: fontinfo.c:7938 +#: fontinfo.c:7717 msgid "_UniqueID:" msgstr "_UniqueID:" # -#: fontinfo.c:8012 +#: fontinfo.c:7791 msgid " _Em Size:" msgstr " M全字大小(_E)：" # -#: fontinfo.c:8031 +#: fontinfo.c:7810 msgid "_Scale Outlines" msgstr "缩放轮廓(_S)" # -#: fontinfo.c:8066 fontinfo.c:8443 savefontdlg.c:1018 +#: fontinfo.c:7845 fontinfo.c:8222 savefontdlg.c:1018 msgid "_Guess" msgstr "估计(_G)" # -#: fontinfo.c:8112 +#: fontinfo.c:7891 msgid "Has _Vertical Metrics" msgstr "有垂直尺寸(_V)" # -#: fontinfo.c:8126 +#: fontinfo.c:7905 msgid "Interpretation:" msgstr "翻译：" # -#: fontinfo.c:8149 +#: fontinfo.c:7928 msgid "Name List:" msgstr "名称列表:" -#: fontinfo.c:8230 +#: fontinfo.c:8009 msgid "Font Type:" msgstr "" # -#: fontinfo.c:8240 +#: fontinfo.c:8019 msgid "_Outline Font" msgstr "轮廓字体(_O)" -#: fontinfo.c:8251 +#: fontinfo.c:8030 msgid "_Type3 Multi Layered Font" msgstr "" -#: fontinfo.c:8261 +#: fontinfo.c:8040 msgid "" "Allow editing of multiple colors and shades, fills and strokes.\n" "Multi layered fonts can only be output as type3 or svg fonts." msgstr "" # -#: fontinfo.c:8265 fontinfo.c:8277 +#: fontinfo.c:8044 fontinfo.c:8056 msgid "_Stroked Font" msgstr "单线字体(_S)" # -#: fontinfo.c:8273 fontinfo.c:8284 +#: fontinfo.c:8052 fontinfo.c:8063 msgid "" "Glyphs will be composed of stroked lines rather than filled outlines.\n" "All glyphs are stroked at the following width" @@ -13703,88 +13702,88 @@ "字形将由线组成而非可填充的轮廓。\n" "所有字形的线宽为" -#: fontinfo.c:8289 +#: fontinfo.c:8068 msgid " Stroke _Width:" msgstr "" -#: fontinfo.c:8312 +#: fontinfo.c:8091 msgid "All layers _cubic" msgstr "" -#: fontinfo.c:8323 +#: fontinfo.c:8102 msgid "" "Use cubic (that is postscript) splines to hold the outlines of all\n" "layers of this font. Cubic splines are generally easier to edit\n" "than quadratic (and you may still generate a truetype font from them)." msgstr "" -#: fontinfo.c:8327 +#: fontinfo.c:8106 msgid "All layers _quadratic" msgstr "" -#: fontinfo.c:8338 +#: fontinfo.c:8117 msgid "" "Use quadratic (that is truetype) splines to hold the outlines of all\n" "layers of this font rather than cubic (postscript) splines." msgstr "" -#: fontinfo.c:8341 +#: fontinfo.c:8120 msgid "_Mixed" msgstr "" -#: fontinfo.c:8352 +#: fontinfo.c:8131 msgid "" "The order of each layer of the font can be controlled\n" "individually. This might be useful if you wished to\n" "retain both quadratic and cubic versions of a font." msgstr "" -#: fontinfo.c:8364 +#: fontinfo.c:8143 msgid "Guidelines:" msgstr "" -#: fontinfo.c:8383 +#: fontinfo.c:8162 msgid "Use quadratic splines for the guidelines layer of the font" msgstr "" -#: fontinfo.c:8392 +#: fontinfo.c:8171 msgid "" "\n" "Layers:" msgstr "" -#: fontinfo.c:8427 +#: fontinfo.c:8206 msgid "" "The PostScript 'Private' dictionary gives you control over\n" "several font-wide versions of hinting.\n" "The 'Private' dictionary only applies to PostScript fonts." msgstr "" -#: fontinfo.c:8452 +#: fontinfo.c:8231 msgid "_Histogram" msgstr "" # -#: fontinfo.c:8458 +#: fontinfo.c:8237 msgid "Histogram Dialog" msgstr "直方图" # -#: fontinfo.c:8480 +#: fontinfo.c:8259 msgid "Width _Class" msgstr "宽度类属(_C)" # -#: fontinfo.c:8494 +#: fontinfo.c:8273 msgid "P_FM Family" msgstr "PFM字族" # -#: fontinfo.c:8508 +#: fontinfo.c:8287 msgid "_Embeddable" msgstr "可嵌入(_E)" -#: fontinfo.c:8513 +#: fontinfo.c:8292 msgid "" "Can this font be embedded in a downloadable (pdf)\n" "document, and if so, what behaviors are permitted on\n" @@ -13792,11 +13791,11 @@ msgstr "" # -#: fontinfo.c:8537 +#: fontinfo.c:8316 msgid "No Subsetting" msgstr "无子集" -#: fontinfo.c:8543 +#: fontinfo.c:8322 msgid "" "If set then the entire font must be\n" "embedded in a document when any character is.\n" @@ -13805,11 +13804,11 @@ msgstr "" # -#: fontinfo.c:8548 +#: fontinfo.c:8327 msgid "Only Embed Bitmaps" msgstr "仅嵌入位图" -#: fontinfo.c:8554 +#: fontinfo.c:8333 msgid "" "Only Bitmaps may be embedded.\n" "Outline descriptions may not be\n" @@ -13818,16 +13817,16 @@ msgstr "" # -#: fontinfo.c:8559 +#: fontinfo.c:8338 msgid "Vendor ID:" msgstr "供应者标识：" # -#: fontinfo.c:8573 +#: fontinfo.c:8352 msgid "_IBM Family:" msgstr "_IBM 字族:" -#: fontinfo.c:8592 +#: fontinfo.c:8371 msgid "" "MS needs to know whether a font family's members differ\n" "only in weight, width and slope (and not in other variables\n" @@ -13835,18 +13834,18 @@ msgstr "" # -#: fontinfo.c:8597 +#: fontinfo.c:8376 msgid "_OS/2 Version" msgstr "OS/2版本(_O)" -#: fontinfo.c:8601 +#: fontinfo.c:8380 msgid "" "The 'OS/2' table has changed slightly over the years.\n" "Generally fields have been added, but occasionally their\n" "meanings have been redefined." msgstr "" -#: fontinfo.c:8648 +#: fontinfo.c:8427 msgid "" "Anything outside the OS/2 WinAscent &\n" "WinDescent fields will be clipped by windows.\n" @@ -13863,17 +13862,17 @@ msgstr "" # -#: fontinfo.c:8663 fontinfo.c:8696 fontinfo.c:8741 fontinfo.c:8774 -#: fontinfo.c:8828 fontinfo.c:8861 +#: fontinfo.c:8442 fontinfo.c:8475 fontinfo.c:8520 fontinfo.c:8553 +#: fontinfo.c:8607 fontinfo.c:8640 msgid "Is Offset" msgstr "是偏移" # -#: fontinfo.c:8709 +#: fontinfo.c:8488 msgid "Really use Typo metrics" msgstr "应用 Typo 尺寸" -#: fontinfo.c:8715 +#: fontinfo.c:8494 msgid "" "The specification already says that the typo metrics should be\n" "used to determine line spacing. But so many\n" @@ -13881,7 +13880,7 @@ "bit was needed to remind them to do so." msgstr "" -#: fontinfo.c:8726 +#: fontinfo.c:8505 msgid "" "The typo ascent&descent fields are>supposed<\n" "to specify the line spacing on windows.\n" @@ -13897,11 +13896,11 @@ "things below the baseline" msgstr "" -#: fontinfo.c:8792 +#: fontinfo.c:8571 msgid "Sets the TypoLinegap field in the OS/2 table, used on MS Windows" msgstr "" -#: fontinfo.c:8813 +#: fontinfo.c:8592 msgid "" "This specifies the line spacing on the mac.\n" "(The descent field is usually negative.)\n" @@ -13915,11 +13914,11 @@ "below the baseline" msgstr "" -#: fontinfo.c:8879 +#: fontinfo.c:8658 msgid "Sets the linegap field in the hhea table, used on the mac" msgstr "" -#: fontinfo.c:8900 +#: fontinfo.c:8679 msgid "" "Sets the linegap field in the vhea table.\n" "This is the horizontal spacing between rows\n" @@ -13927,79 +13926,79 @@ msgstr "" # -#: fontinfo.c:8931 +#: fontinfo.c:8710 msgid "SubscriptSuperUse|Default" msgstr "默认" # -#: fontinfo.c:9159 +#: fontinfo.c:8938 msgid "PanoseUse|Default" msgstr "缺省" -#: fontinfo.c:9170 +#: fontinfo.c:8949 msgid "http://panose.com/" msgstr "" # -#: fontinfo.c:9181 +#: fontinfo.c:8960 msgid "Panose|_Family" msgstr "族(_F)" # -#: fontinfo.c:9375 +#: fontinfo.c:9154 msgid "Unicode Ranges:" msgstr "统一码范围:" # -#: fontinfo.c:9382 fontinfo.c:9436 +#: fontinfo.c:9161 fontinfo.c:9215 msgid "Default" msgstr "默认" -#: fontinfo.c:9429 +#: fontinfo.c:9208 msgid "MS Code Pages:" msgstr "微软编码页:" # -#: fontinfo.c:9498 +#: fontinfo.c:9277 msgid "Misc." msgstr "其他" # -#: fontinfo.c:9502 +#: fontinfo.c:9281 msgid "Metrics" msgstr "尺寸" # -#: fontinfo.c:9506 +#: fontinfo.c:9285 msgid "Sub/Super" msgstr "上标/下标" # -#: fontinfo.c:9510 +#: fontinfo.c:9289 msgid "Panose" msgstr "Panose" # -#: fontinfo.c:9514 +#: fontinfo.c:9293 msgid "Charsets" msgstr "字符集" # -#: fontinfo.c:9537 +#: fontinfo.c:9316 msgid "Gasp|_Version" msgstr "版本(_V)" -#: fontinfo.c:9559 +#: fontinfo.c:9338 msgid "Optimized For ClearType" msgstr "为ClearType优化" -#: fontinfo.c:9567 +#: fontinfo.c:9346 msgid "" "Actually a bit in the 'head' table.\n" "If unset then certain East Asian fonts will not be hinted" msgstr "" -#: fontinfo.c:9583 +#: fontinfo.c:9362 msgid "" "The 'gasp' table gives you control over when grid-fitting and\n" "anti-aliased rasterizing are done.\n" @@ -14014,26 +14013,26 @@ msgstr "" # -#: fontinfo.c:9602 +#: fontinfo.c:9381 msgid "Gasp|_Default" msgstr "默认(_D)" # -#: fontinfo.c:9626 +#: fontinfo.c:9405 msgid "_Language" msgstr "语言(_L)" # -#: fontinfo.c:9637 +#: fontinfo.c:9416 msgid "_String Type" msgstr "字串类型(_T)" # -#: fontinfo.c:9647 +#: fontinfo.c:9426 msgid "SortingScheme|Default" msgstr "默认" -#: fontinfo.c:9660 +#: fontinfo.c:9439 msgid "" "To create a new name, left click on the button, and select a locale.\n" "To change the locale, left click on it.\n" @@ -14048,12 +14047,12 @@ #. GT: English (possibly translating it in parentheses). I believe there #. GT: are legal reasons for this. #. GT: So "Añadir SIL Open Font License (licencia de fuentes libres)" -#: fontinfo.c:9675 +#: fontinfo.c:9454 msgid "Add SIL " msgstr "添加SIL " # -#: fontinfo.c:9683 +#: fontinfo.c:9462 msgid "" "The SIL Open Font License (OFL) is designed for free/libre/open font " "projects.\n" @@ -14082,11 +14081,11 @@ "单击此按钮可添加OFL元数据到你的字体中。\n" "\n" -#: fontinfo.c:9696 +#: fontinfo.c:9475 msgid "OFL website" msgstr "OFL 网站" -#: fontinfo.c:9702 +#: fontinfo.c:9481 msgid "" "\n" "Click here to go to http://scripts.sil.org/OFL \n" @@ -14095,7 +14094,7 @@ "\n" msgstr "" -#: fontinfo.c:9730 +#: fontinfo.c:9509 msgid "" "The OpenType Style Set features ('ss01'-'ss20') may\n" "be assigned human readable names here." @@ -14109,95 +14108,95 @@ "To change the text, left click in it and then type.\n" msgstr "" -#: fontinfo.c:9759 +#: fontinfo.c:9538 msgid "The font comment can contain whatever you feel it should" msgstr "" -#: fontinfo.c:9785 +#: fontinfo.c:9564 msgid "" "The FONTLOG contains some description of the \n" " font project, a detailed changelog, and a list of contributors" msgstr "" -#: fontinfo.c:9809 +#: fontinfo.c:9588 msgid "" "These are not Anchor Classes. For them see the \"Lookups\" pane.\n" "(Mark Classes can control when lookups are active, they do NOT\n" " position glyphs.)" msgstr "" -#: fontinfo.c:9853 +#: fontinfo.c:9632 msgid "" "These are not Anchor Classes. For them see the \"Lookups\" pane.\n" "(Mark Sets, like Mark Classes can control when lookups are active,\n" " they do NOT position glyphs.)" msgstr "" -#: fontinfo.c:9892 +#: fontinfo.c:9671 msgid "Version, Major:" msgstr "" -#: fontinfo.c:9909 fontinfo.c:9923 +#: fontinfo.c:9688 fontinfo.c:9702 msgid "" "If you leave this field blank FontForge will use a default based on\n" "either the version string, or one in the 'name' table." msgstr "" -#: fontinfo.c:9912 +#: fontinfo.c:9691 msgid "Minor:" msgstr "" -#: fontinfo.c:9932 +#: fontinfo.c:9711 msgid "Metadata (xml):" msgstr "" # -#: fontinfo.c:9969 +#: fontinfo.c:9748 msgid "ΤεΧ General" msgstr "ΤεΧ一般" # -#: fontinfo.c:9978 +#: fontinfo.c:9757 msgid "ΤεΧ Math Symbol" msgstr "ΤεΧ 数学符号" # -#: fontinfo.c:9987 +#: fontinfo.c:9766 msgid "ΤεΧ Math Extension" msgstr "ΤεΧ 数学扩展" # -#: fontinfo.c:10061 fontinfo.c:10079 +#: fontinfo.c:9841 fontinfo.c:9859 msgid "The size (in points) for which this face was designed" msgstr "此面以点为尺寸" # -#: fontinfo.c:10074 +#: fontinfo.c:9854 msgid "Size|Points" msgstr "点" # -#: fontinfo.c:10082 +#: fontinfo.c:9862 msgid "Design Range" msgstr "设计区域" -#: fontinfo.c:10087 fontinfo.c:10101 fontinfo.c:10120 +#: fontinfo.c:9867 fontinfo.c:9881 fontinfo.c:9900 msgid "" "The range of sizes (in points) to which this face applies.\n" "Lower bound is exclusive, upper bound is inclusive." msgstr "" # -#: fontinfo.c:10095 +#: fontinfo.c:9875 msgid "_Bottom:" msgstr "底(_B)：" # -#: fontinfo.c:10114 +#: fontinfo.c:9894 msgid "_Top:" msgstr "顶(_T)：" -#: fontinfo.c:10139 +#: fontinfo.c:9919 msgid "" "This is an identifying number shared by all members of\n" "this font family with the same style (I.e. 10pt Bold and\n" @@ -14205,11 +14204,11 @@ msgstr "" # -#: fontinfo.c:10152 +#: fontinfo.c:9932 msgid "Style Name:" msgstr "样式名称:" -#: fontinfo.c:10157 +#: fontinfo.c:9937 msgid "" "This provides a set of names used to identify the\n" "style of this font. Names may be translated into multiple\n" @@ -14223,122 +14222,122 @@ msgstr "新建(_N)..." # -#: fontinfo.c:10245 +#: fontinfo.c:9987 msgid "Mac Style Set:" msgstr "Mac样式集:" # -#: fontinfo.c:10273 +#: fontinfo.c:10015 msgid "FOND Name:" msgstr "FOND名称:" -#: fontinfo.c:10325 +#: fontinfo.c:10067 msgid "" "Moves the currently selected lookup to be first in the lookup ordering\n" "or moves the currently selected subtable to be first in its lookup." msgstr "" -#: fontinfo.c:10336 +#: fontinfo.c:10078 msgid "" "Moves the currently selected lookup before the previous lookup\n" "or moves the currently selected subtable before the previous subtable." msgstr "" -#: fontinfo.c:10347 +#: fontinfo.c:10089 msgid "" "Moves the currently selected lookup after the next lookup\n" "or moves the currently selected subtable after the next subtable." msgstr "" -#: fontinfo.c:10358 +#: fontinfo.c:10100 msgid "" "Moves the currently selected lookup to the end of the lookup chain\n" "or moves the currently selected subtable to be the last subtable in the " "lookup" msgstr "" -#: fontinfo.c:10369 +#: fontinfo.c:10111 msgid "Sorts the lookups in a default ordering based on feature tags" msgstr "" -#: fontinfo.c:10384 +#: fontinfo.c:10126 msgid "" "Adds a new lookup after the selected lookup\n" "or at the start of the lookup list if nothing is selected." msgstr "" -#: fontinfo.c:10395 +#: fontinfo.c:10137 msgid "" "Adds a new lookup subtable after the selected subtable\n" "or at the start of the lookup if nothing is selected." msgstr "" # -#: fontinfo.c:10406 +#: fontinfo.c:10148 msgid "Edits a lookup or lookup subtable." msgstr "编辑查找或子表。" # -#: fontinfo.c:10417 +#: fontinfo.c:10159 msgid "Edits the transformations in a lookup subtable." msgstr "编辑查找替代表中的变换" -#: fontinfo.c:10428 +#: fontinfo.c:10170 msgid "" "Deletes any selected lookups and their subtables, or deletes any selected " "subtables.\n" "This will also delete any transformations associated with those subtables." msgstr "" -#: fontinfo.c:10439 +#: fontinfo.c:10181 msgid "" "Merges two selected (and compatible) lookups into one,\n" "or merges two selected subtables of a lookup into one" msgstr "" -#: fontinfo.c:10450 +#: fontinfo.c:10192 msgid "" "Reverts the lookup list to its original condition.\n" "But any changes to subtable data will remain." msgstr "" # -#: fontinfo.c:10451 fontviewbase.c:1629 +#: fontinfo.c:10193 fontviewbase.c:1629 msgid "_Revert" msgstr "恢复(_R)" -#: fontinfo.c:10461 +#: fontinfo.c:10203 msgid "Imports a lookup (and all its subtables) from another font." msgstr "" # -#: fontinfo.c:10546 +#: fontinfo.c:10288 msgid "Creation Date:" msgstr "创建日期：" # -#: fontinfo.c:10565 +#: fontinfo.c:10307 msgid "Modification Date:" msgstr "修改日期：" -#: fontinfo.c:10600 +#: fontinfo.c:10342 msgid "" "This pane is informative only and shows the characters\n" "actually in the font. If you wish to set the OS/2 Unicode\n" "Range field, change the pane to" msgstr "" -#: fontinfo.c:10609 +#: fontinfo.c:10351 msgid "OS/2 -> Charsets" msgstr "" # -#: fontinfo.c:10623 +#: fontinfo.c:10365 msgid "Include Empty Blocks" msgstr "包括空白区" # -#: fontinfo.c:10639 +#: fontinfo.c:10381 msgid "" "Click on a range to select characters in that range.\n" "Double click on a range to see characters that should be\n" @@ -14348,92 +14347,92 @@ "双击一个范围以查看应在却不在此范\n" "围内的字符。" -#: fontinfo.c:10656 +#: fontinfo.c:10398 msgid "PS Names" msgstr "" # -#: fontinfo.c:10661 +#: fontinfo.c:10403 msgid "General" msgstr "一般" # -#: fontinfo.c:10669 +#: fontinfo.c:10411 msgid "PS UID" msgstr "PS UID" # -#: fontinfo.c:10674 +#: fontinfo.c:10416 msgid "PS Private" msgstr "PS专属" # -#: fontinfo.c:10679 +#: fontinfo.c:10421 msgid "OS/2" msgstr "OS/2" # -#: fontinfo.c:10686 +#: fontinfo.c:10428 msgid "TTF Names" msgstr "TTF名称" -#: fontinfo.c:10691 +#: fontinfo.c:10433 msgid "StyleSet Names" msgstr "" # -#: fontinfo.c:10696 +#: fontinfo.c:10438 msgid "Grid Fitting" msgstr "网格填充" # -#: fontinfo.c:10702 +#: fontinfo.c:10444 msgid "ΤεΧ" msgstr "ΤεΧ" -#: fontinfo.c:10715 +#: fontinfo.c:10457 msgid "FONTLOG" msgstr "" # -#: fontinfo.c:10720 +#: fontinfo.c:10462 msgid "Mark Classes" msgstr "标记类属" -#: fontinfo.c:10725 +#: fontinfo.c:10467 msgid "Mark Sets" msgstr "" # -#: fontinfo.c:10731 +#: fontinfo.c:10473 msgid "OpenType|Lookups" msgstr "查找" -#: fontinfo.c:10738 +#: fontinfo.c:10480 msgid "WOFF" msgstr "" # -#: fontinfo.c:10746 +#: fontinfo.c:10488 msgid "Mac Features" msgstr "Mac特征" # -#: fontinfo.c:10751 +#: fontinfo.c:10493 msgid "Dates" msgstr "日期" # -#: fontinfo.c:10827 +#: fontinfo.c:10569 msgid "TrueTypeName|New" msgstr "新建" # -#: fontinfo.c:10829 +#: fontinfo.c:10571 msgid "gaspTableEntry|New" msgstr "新建" -#: fontinfo.c:10841 +#: fontinfo.c:10583 msgid "PSPrivateDictKey|New" msgstr "" @@ -14468,42 +14467,42 @@ msgstr "保存为…" # -#: fontview.c:928 oflib.c:2069 prefs.c:494 +#: fontview.c:932 oflib.c:2069 prefs.c:496 msgid "Open Font" msgstr "打开字体" # -#: fontview.c:943 +#: fontview.c:947 msgid "Merge Feature Info" msgstr "混成特征信息" # -#: fontview.c:952 +#: fontview.c:956 msgid "Load of Kerning Metrics Failed" msgstr "载入压缩尺寸失败" # -#: fontview.c:952 +#: fontview.c:956 #, c-format msgid "Failed to load kern data from %s" msgstr "从%s载入压缩数据失败" # -#: fontview.c:1033 +#: fontview.c:1037 msgid "Many Windows" msgstr "许多窗口" -#: fontview.c:1033 +#: fontview.c:1037 msgid "" "This involves opening more than 10 windows.\n" "Is that really what you want?" msgstr "" -#: fontview.c:1132 +#: fontview.c:1136 msgid "Extremum bound..." msgstr "" -#: fontview.c:1132 +#: fontview.c:1136 msgid "" "Adobe says that \"big\" splines should not have extrema.\n" "But they don't define what big means.\n" @@ -14512,89 +14511,89 @@ msgstr "" # -#: fontview.c:1761 +#: fontview.c:1765 msgid "Select by Script" msgstr "按文字选择" -#: fontview.c:1776 +#: fontview.c:1780 msgid "All glyphs" msgstr "" -#: fontview.c:1780 +#: fontview.c:1784 msgid "Set the selection of the font view to all glyphs in the script." msgstr "" -#: fontview.c:1786 +#: fontview.c:1790 msgid "Only upper case" msgstr "" -#: fontview.c:1790 +#: fontview.c:1794 msgid "" "Set the selection of the font view to any upper case glyphs in the script." msgstr "" -#: fontview.c:1795 +#: fontview.c:1799 msgid "Only lower case" msgstr "" -#: fontview.c:1799 +#: fontview.c:1803 msgid "" "Set the selection of the font view to any lower case glyphs in the script." msgstr "" -#: fontview.c:1809 fontview.c:2071 +#: fontview.c:1813 fontview.c:2075 msgid "" "Set the selection of the font view to the glyphs\n" "which match" msgstr "" -#: fontview.c:1817 fontview.c:2079 +#: fontview.c:1821 fontview.c:2083 msgid "" "Expand the selection of the font view to include\n" "all the glyphs which match" msgstr "" -#: fontview.c:1825 fontview.c:2087 +#: fontview.c:1829 fontview.c:2091 msgid "Remove matching glyphs from the selection." msgstr "" -#: fontview.c:1829 fontview.c:2091 +#: fontview.c:1833 fontview.c:2095 msgid "Logical And with Selection" msgstr "" -#: fontview.c:1833 fontview.c:2095 +#: fontview.c:1837 fontview.c:2099 msgid "Remove glyphs which do not match from the selection." msgstr "" # -#: fontview.c:1885 +#: fontview.c:1889 msgid "No Script" msgstr "无脚本" -#: fontview.c:1885 +#: fontview.c:1889 msgid "Please specify a script" msgstr "请指定文字" # -#: fontview.c:1888 +#: fontview.c:1892 msgid "Bad Script" msgstr "不当文字" -#: fontview.c:1888 +#: fontview.c:1892 msgid "Scripts are 4 letter tags" msgstr "文字标签为4个字符。" -#: fontview.c:2036 +#: fontview.c:2040 msgid "Select by Name" msgstr "" -#: fontview.c:2045 +#: fontview.c:2049 msgid "" "Enter either a wildcard pattern (to match glyph names)\n" " or a unicode encoding like \"U+0065\"." msgstr "" -#: fontview.c:2050 +#: fontview.c:2054 msgid "" "Unix style wildcarding is accepted:\n" "Most characters match themselves\n" @@ -14610,438 +14609,438 @@ msgstr "" # -#: fontview.c:2879 lookupui.c:4796 metricsview.c:380 +#: fontview.c:2883 lookupui.c:4796 metricsview.c:380 msgid "New Lookup Subtable..." msgstr "新查找替代表" # -#: fontview.c:2885 +#: fontview.c:2889 msgid "Display Substitution..." msgstr "显示替换…" # -#: fontview.c:2886 +#: fontview.c:2890 msgid "Pick a substitution to display in the window." msgstr "选取替代字形显示到窗口中" # -#: fontview.c:3023 +#: fontview.c:3027 msgid "Show H. Metrics" msgstr "显示水平尺寸" # -#: fontview.c:3023 +#: fontview.c:3027 msgid "Show V. Metrics" msgstr "显示垂直尺寸" # -#: fontview.c:3032 +#: fontview.c:3036 msgid "Baseline" msgstr "基线" # -#: fontview.c:3040 +#: fontview.c:3044 msgid "Origin" msgstr "原点" # -#: fontview.c:3048 +#: fontview.c:3052 msgid "Advance Width as a Line" msgstr "前导宽度作为线" -#: fontview.c:3054 +#: fontview.c:3058 msgid "" "Display the advance width as a line\n" "perpendicular to the advance direction" msgstr "" # -#: fontview.c:3057 +#: fontview.c:3061 msgid "Advance Width as a Bar" msgstr "前导宽度作为条" -#: fontview.c:3063 +#: fontview.c:3067 msgid "" "Display the advance width as a bar under the glyph\n" "showing the extent of the advance" msgstr "" # -#: fontview.c:3209 +#: fontview.c:3213 msgid "Bitmap Magnification..." msgstr "位图缩放…" # -#: fontview.c:3209 +#: fontview.c:3213 msgid "Please specify a bitmap magnification factor." msgstr "请指定位图尺度系数" # -#: fontview.c:3464 fontview.c:3485 +#: fontview.c:3468 fontview.c:3489 msgid "Compact" msgstr "压缩" # -#: fontview.c:3559 fontview.c:3582 +#: fontview.c:3563 fontview.c:3586 msgid "Find an adobe CMap file..." msgstr "查找adobe CMap文件..." # -#: fontview.c:3614 +#: fontview.c:3618 msgid "Please close font" msgstr "请关闭字体" # -#: fontview.c:3614 +#: fontview.c:3618 #, c-format msgid "Please close %s before inserting it into a CID font" msgstr "请先关闭 %s 以便将其插入 CID 字体中" # -#: fontview.c:3661 fontview.c:4696 lookupui.c:2119 ../gdraw/gfilechooser.c:918 +#: fontview.c:3665 fontview.c:4700 lookupui.c:2119 ../gdraw/gfilechooser.c:918 msgid "_Remove" msgstr "移除(_R)" # -#: fontview.c:3662 fontview.c:5240 +#: fontview.c:3666 fontview.c:5244 msgid "_Remove Font" msgstr "移除字体(_R)" -#: fontview.c:3662 +#: fontview.c:3666 #, c-format msgid "" "Are you sure you wish to remove sub-font %1$.40s from the CID font %2$.40s" msgstr "" # -#: fontview.c:3722 +#: fontview.c:3726 msgid "Change Supplement..." msgstr "改变附件…" # -#: fontview.c:3722 +#: fontview.c:3726 #, c-format msgid "Please specify a new supplement for %.20s-%.20s" msgstr "请为%.20s-%.20s指定一个新附件" # -#: fontview.c:4207 +#: fontview.c:4211 msgid "_New Composition..." msgstr "新组成(_N)…" # -#: fontview.c:4208 +#: fontview.c:4212 msgid "_Modify Composition..." msgstr "修改组成(_M)…" # -#: fontview.c:4210 +#: fontview.c:4214 msgid "_Build Syllables" msgstr "生成音节(_B)" -#: fontview.c:4294 +#: fontview.c:4298 msgid "Open Font Library..." msgstr "" # -#: fontview.c:4301 +#: fontview.c:4305 msgid "_Hangul" msgstr "_Hangul" -#: fontview.c:4304 +#: fontview.c:4308 msgid "Browse web" msgstr "" # -#: fontview.c:4310 +#: fontview.c:4314 msgid "Save A_ll" msgstr "全部保存(_L)" # -#: fontview.c:4316 metricsview.c:3054 +#: fontview.c:4320 metricsview.c:3083 msgid "_Merge Feature Info..." msgstr "混成特征信息(_M)..." # -#: fontview.c:4318 +#: fontview.c:4322 msgid "Revert To _Backup" msgstr "从备份恢复字形(_B)" # -#: fontview.c:4329 prefs.c:2266 +#: fontview.c:4333 prefs.c:2268 msgid "Script Menu" msgstr "脚本目录" # -#: fontview.c:4342 +#: fontview.c:4346 msgid "_All Fonts" msgstr "所有字体(_A)" # -#: fontview.c:4343 +#: fontview.c:4347 msgid "_Displayed Font" msgstr "已显示字体(_D)" # -#: fontview.c:4345 +#: fontview.c:4349 msgid "Glyph _Metadata" msgstr "字形元数据(_M)" # -#: fontview.c:4347 +#: fontview.c:4351 msgid "_TrueType Instructions" msgstr "_TrueType指令" # -#: fontview.c:4369 +#: fontview.c:4373 msgid "Select by _Color" msgstr "按颜色选择(_S)" # -#: fontview.c:4370 +#: fontview.c:4374 msgid "Select by _Wildcard..." msgstr "按通配符选择(_W)…" # -#: fontview.c:4371 +#: fontview.c:4375 msgid "Select by _Script..." msgstr "按文字选择(_S)…" # -#: fontview.c:4373 +#: fontview.c:4377 msgid "_Glyphs Worth Outputting" msgstr "值得输出的字形(_G)" -#: fontview.c:4374 +#: fontview.c:4378 msgid "Glyphs with only _References" msgstr "" -#: fontview.c:4375 +#: fontview.c:4379 msgid "Glyphs with only S_plines" msgstr "" -#: fontview.c:4376 +#: fontview.c:4380 msgid "Glyphs with both" msgstr "" -#: fontview.c:4377 +#: fontview.c:4381 msgid "W_hitespace Glyphs" msgstr "" # -#: fontview.c:4378 +#: fontview.c:4382 msgid "_Changed Glyphs" msgstr "已改变字形(_C)" # -#: fontview.c:4379 +#: fontview.c:4383 msgid "_Hinting Needed" msgstr "需要消隐(_H)" # -#: fontview.c:4380 +#: fontview.c:4384 msgid "Autohinta_ble" msgstr "自动消隐表(_B)" -#: fontview.c:4382 +#: fontview.c:4386 msgid "Hold [Shift] key to merge" msgstr "" -#: fontview.c:4383 +#: fontview.c:4387 msgid "Hold [Control] key to restrict" msgstr "" # -#: fontview.c:4385 +#: fontview.c:4389 msgid "Selec_t By Lookup Subtable..." msgstr "按查找表选择(_T)…" -#: fontview.c:4396 +#: fontview.c:4400 msgid "Copy _Lookup Data" msgstr "复制查找数据(_L)" # -#: fontview.c:4398 metricsview.c:3073 +#: fontview.c:4402 metricsview.c:3102 msgid "Copy _VWidth" msgstr "编辑垂直宽度(_V)" # -#: fontview.c:4402 +#: fontview.c:4406 msgid "Paste Into" msgstr "粘贴到" # -#: fontview.c:4404 +#: fontview.c:4408 msgid "Paste After" msgstr "粘贴到后面" # -#: fontview.c:4406 +#: fontview.c:4410 msgid "Sa_me Glyph As" msgstr "相同字形(_M)" -#: fontview.c:4410 +#: fontview.c:4414 msgid "Copy Layer To Layer" msgstr "" # -#: fontview.c:4414 +#: fontview.c:4418 msgid "F_ind / Replace..." msgstr "查找(_I) / 替换…" # -#: fontview.c:4415 search.c:1261 +#: fontview.c:4419 search.c:1261 msgid "Replace with Reference" msgstr "替换参照" -#: fontview.c:4416 +#: fontview.c:4420 msgid "Correct References" msgstr "" # -#: fontview.c:4420 +#: fontview.c:4424 msgid "Copy _From" msgstr "复制自(_F)" -#: fontview.c:4450 +#: fontview.c:4454 msgid "Add _Small Capitals..." msgstr "" -#: fontview.c:4451 +#: fontview.c:4455 msgid "Add Subscripts/Superscripts..." msgstr "" # -#: fontview.c:4463 +#: fontview.c:4467 msgid "Buil_d Duplicate Glyph" msgstr "生成复制字形(_D)" # -#: fontview.c:4505 +#: fontview.c:4509 msgid "_MATH Info..." msgstr "数学信息(_M)…" # -#: fontview.c:4506 +#: fontview.c:4510 msgid "_BDF Info..." msgstr "BDF信息(_B)…" -#: fontview.c:4507 +#: fontview.c:4511 msgid "_Horizontal Baselines..." msgstr "" -#: fontview.c:4508 +#: fontview.c:4512 msgid "_Vertical Baselines..." msgstr "" -#: fontview.c:4509 +#: fontview.c:4513 msgid "_Justification..." msgstr "" # -#: fontview.c:4510 +#: fontview.c:4514 msgid "Show _Dependent" msgstr "显示依赖(_D)" # -#: fontview.c:4511 +#: fontview.c:4515 msgid "Mass Glyph _Rename..." msgstr "批量字形重命名(_R)..." -#: fontview.c:4512 +#: fontview.c:4516 msgid "Set _Color" msgstr "" # -#: fontview.c:4517 metricsview.c:3141 +#: fontview.c:4521 metricsview.c:3170 msgid "Find Pr_oblems..." msgstr "查找问题(_O)…" # -#: fontview.c:4518 +#: fontview.c:4522 msgid "_Validate..." msgstr "验证(_V)..." -#: fontview.c:4520 +#: fontview.c:4524 msgid "Set E_xtremum Bound..." msgstr "" # -#: fontview.c:4527 +#: fontview.c:4531 msgid "Other Info" msgstr "其它信息" -#: fontview.c:4528 +#: fontview.c:4532 msgid "_Validation" msgstr "" -#: fontview.c:4534 +#: fontview.c:4538 msgid "St_yle" msgstr "" # -#: fontview.c:4551 +#: fontview.c:4555 msgid "_Merge Fonts..." msgstr "混成字体(_M)…" # -#: fontview.c:4552 +#: fontview.c:4556 msgid "Interpo_late Fonts..." msgstr "插入字体(_L)…" # -#: fontview.c:4553 +#: fontview.c:4557 msgid "Compare Fonts..." msgstr "比较字体…" # -#: fontview.c:4559 lookupui.c:1430 lookupui.c:1450 metricsview.c:3164 +#: fontview.c:4563 lookupui.c:1430 lookupui.c:1450 metricsview.c:3193 #: windowmenu.c:247 msgid "All" msgstr "全部" # -#: fontview.c:4620 +#: fontview.c:4624 msgid "_Glyph Image" msgstr "字形(_G)" # -#: fontview.c:4621 +#: fontview.c:4625 msgid "_Name" msgstr "名称(_N)" # -#: fontview.c:4622 lookupui.c:4220 +#: fontview.c:4626 lookupui.c:4220 msgid "_Unicode" msgstr "统一码(_U)" # -#: fontview.c:4623 +#: fontview.c:4627 msgid "_Encoding Hex" msgstr "16进制编码(_H)" # -#: fontview.c:4656 +#: fontview.c:4660 msgid "Add Encoding Slots..." msgstr "增加编码位…" # -#: fontview.c:4656 +#: fontview.c:4660 msgid "How many CID slots do you wish to add?" msgstr "你想增加多少CID位？" # -#: fontview.c:4656 +#: fontview.c:4660 msgid "How many unencoded glyph slots do you wish to add?" msgstr "你想增加多少未编码的字形位？" # -#: fontview.c:4700 +#: fontview.c:4704 msgid "Detach & Remove Glyphs" msgstr "分离及移除字形" # -#: fontview.c:4700 +#: fontview.c:4704 msgid "" "Are you sure you wish to remove these glyphs? This operation cannot be " "undone." @@ -15050,499 +15049,499 @@ "此操作是不可恢复的。" # -#: fontview.c:4722 +#: fontview.c:4726 msgid "Add Encoding Name..." msgstr "增加编码…" -#: fontview.c:4722 +#: fontview.c:4726 msgid "" "Please provide the name of an encoding in the iconv database which you want " "in the menu." msgstr "" # -#: fontview.c:4727 +#: fontview.c:4731 msgid "Invalid Encoding" msgstr "无效编码" # -#: fontview.c:4752 +#: fontview.c:4756 msgid "Make Namelist" msgstr "生成名录" # -#: fontview.c:4760 +#: fontview.c:4764 msgid "Namelist creation failed" msgstr "名录创建失败" # -#: fontview.c:4760 fontview.c:4823 +#: fontview.c:4764 fontview.c:4827 #, c-format msgid "Could not write %s" msgstr "未能写入 %s" # -#: fontview.c:4773 +#: fontview.c:4777 msgid "Load Namelist" msgstr "载入名录" # -#: fontview.c:4794 problems.c:2385 searchview.c:822 ../gdraw/gsavefiledlg.c:72 +#: fontview.c:4798 problems.c:2385 searchview.c:822 ../gdraw/gsavefiledlg.c:72 msgid "Replace" msgstr "替换" # -#: fontview.c:4794 +#: fontview.c:4798 msgid "A name list with this name already exists. Replace it?" msgstr "同名列表存在。替换之?" # -#: fontview.c:4804 fontview.c:4875 +#: fontview.c:4808 fontview.c:4879 msgid "No such file" msgstr "无此文件" # -#: fontview.c:4804 fontview.c:4875 +#: fontview.c:4808 fontview.c:4879 #, c-format msgid "Could not read %s" msgstr "不能读 %s" # -#: fontview.c:4809 +#: fontview.c:4813 msgid "Bad namelist file" msgstr "不良名录文件" # -#: fontview.c:4809 +#: fontview.c:4813 #, c-format msgid "Could not parse %s" msgstr "不能处理 %s" # -#: fontview.c:4816 fontview.c:4818 +#: fontview.c:4820 fontview.c:4822 msgid "Non-ASCII glyphnames" msgstr "非ASCII码字形名" -#: fontview.c:4816 +#: fontview.c:4820 #, c-format msgid "This namelist contains at least one non-ASCII glyph name, namely: %s" msgstr "" -#: fontview.c:4818 +#: fontview.c:4822 msgid "" "This namelist is based on a namelist which contains non-ASCII glyph names" msgstr "" # -#: fontview.c:4823 +#: fontview.c:4827 msgid "Create failed" msgstr "创建失败" # -#: fontview.c:4842 +#: fontview.c:4846 msgid "Rename by NameList" msgstr "按名录重命名" -#: fontview.c:4842 +#: fontview.c:4846 msgid "" "Rename the glyphs in this font to the names found in the selected namelist" msgstr "" -#: fontview.c:4850 openfontdlg.c:438 prefs.c:1721 savefontdlg.c:1345 +#: fontview.c:4854 openfontdlg.c:438 prefs.c:1723 savefontdlg.c:1345 msgid "" "Glyph names should be limited to characters in the ASCII character set, but " "there are names in this namelist which use characters outside that range." msgstr "" # -#: fontview.c:4862 +#: fontview.c:4866 msgid "Load glyph names" msgstr "载入字形名称" # -#: fontview.c:4919 +#: fontview.c:4923 msgid "_Reencode" msgstr "重新编码(_R)" # -#: fontview.c:4920 +#: fontview.c:4924 msgid "_Compact" msgstr "压缩(_C)" # -#: fontview.c:4921 +#: fontview.c:4925 msgid "_Force Encoding" msgstr "强制编码(_F)" # -#: fontview.c:4923 +#: fontview.c:4927 msgid "_Add Encoding Slots..." msgstr "增加编码位(_A)…" # -#: fontview.c:4924 +#: fontview.c:4928 msgid "Remove _Unused Slots" msgstr "移除未用位(_U)" # -#: fontview.c:4925 +#: fontview.c:4929 msgid "_Detach Glyphs" msgstr "分离字形(_D)" # -#: fontview.c:4926 +#: fontview.c:4930 msgid "Detach & Remo_ve Glyphs..." msgstr "分离及移除字形(_V)…" # -#: fontview.c:4928 +#: fontview.c:4932 msgid "Add E_ncoding Name..." msgstr "增加编码名(_N)…" # -#: fontview.c:4929 +#: fontview.c:4933 msgid "_Load Encoding..." msgstr "载入编码(_L)…" # -#: fontview.c:4930 +#: fontview.c:4934 msgid "Ma_ke From Font..." msgstr "生成自字体(_K)…" # -#: fontview.c:4931 +#: fontview.c:4935 msgid "Remove En_coding..." msgstr "移除编码(_C)…" # -#: fontview.c:4933 +#: fontview.c:4937 msgid "Display By _Groups..." msgstr "按组显示(_G)…" # -#: fontview.c:4934 +#: fontview.c:4938 msgid "D_efine Groups..." msgstr "定义组(_E)…" # -#: fontview.c:4936 +#: fontview.c:4940 msgid "_Save Namelist of Font..." msgstr "保存字体列表(_S)…" # -#: fontview.c:4937 +#: fontview.c:4941 msgid "L_oad Namelist..." msgstr "载入列表(_O)…" # -#: fontview.c:4938 +#: fontview.c:4942 msgid "Rename Gl_yphs..." msgstr "重命名字形(_Y)…" # -#: fontview.c:4939 +#: fontview.c:4943 msgid "Cre_ate Named Glyphs..." msgstr "创建命名字形(_A)…" # -#: fontview.c:5026 +#: fontview.c:5030 msgid "_Show ATT" msgstr "显示ATT(_S)" # -#: fontview.c:5027 +#: fontview.c:5031 msgid "Display S_ubstitutions..." msgstr "显示替换(_u)…" -#: fontview.c:5030 +#: fontview.c:5034 msgid "Label Gl_yph By" msgstr "" # -#: fontview.c:5032 +#: fontview.c:5036 msgid "S_how H. Metrics..." msgstr "显示水平尺寸(_h)…" # -#: fontview.c:5033 +#: fontview.c:5037 msgid "Show _V. Metrics..." msgstr "显示垂直尺寸(_V)…" # -#: fontview.c:5035 +#: fontview.c:5039 msgid "32x8 cell window" msgstr "32x8单元窗口" -#: fontview.c:5036 +#: fontview.c:5040 msgid "_16x4 cell window" msgstr "" # -#: fontview.c:5037 +#: fontview.c:5041 msgid "_8x2 cell window" msgstr "_8x2单元窗口" # -#: fontview.c:5039 +#: fontview.c:5043 msgid "_24 pixel outline" msgstr "_24点轮廓" # -#: fontview.c:5040 +#: fontview.c:5044 msgid "_36 pixel outline" msgstr "_36点轮廓" # -#: fontview.c:5041 +#: fontview.c:5045 msgid "_48 pixel outline" msgstr "_48点轮廓" # -#: fontview.c:5042 +#: fontview.c:5046 msgid "_72 pixel outline" msgstr "_72点轮廓" # -#: fontview.c:5043 +#: fontview.c:5047 msgid "_96 pixel outline" msgstr "_96点轮廓" # -#: fontview.c:5045 +#: fontview.c:5049 msgid "_Fit to em" msgstr "充填em" # -#: fontview.c:5047 fontview.c:5069 +#: fontview.c:5051 fontview.c:5073 msgid "Bitmap _Magnification..." msgstr "位图缩放(_M)..." # -#: fontview.c:5082 metricsview.c:3545 parsettfbmf.c:615 +#: fontview.c:5086 metricsview.c:3574 parsettfbmf.c:615 #, c-format msgid "%d pixel bitmap" msgstr "%d像素位图" # -#: fontview.c:5084 metricsview.c:3547 +#: fontview.c:5088 metricsview.c:3576 #, c-format msgid "%d@%d pixel bitmap" msgstr "%d@%d像素位图" # -#: fontview.c:5183 +#: fontview.c:5187 msgid "BlueValues" msgstr "蓝值" # -#: fontview.c:5195 +#: fontview.c:5199 msgid "Edit 'fpgm'..." msgstr "编辑'fpgm'..." # -#: fontview.c:5196 +#: fontview.c:5200 msgid "Edit 'prep'..." msgstr "编辑'prep'..." # -#: fontview.c:5197 +#: fontview.c:5201 msgid "Edit 'maxp'..." msgstr "编辑'maxp'..." # -#: fontview.c:5198 +#: fontview.c:5202 msgid "Edit 'cvt '..." msgstr "编辑'cvt '..." -#: fontview.c:5199 +#: fontview.c:5203 msgid "Remove Instr Tables" msgstr "" # -#: fontview.c:5202 +#: fontview.c:5206 msgid "_Clear Hints" msgstr "清除消隐(_C)" # -#: fontview.c:5206 +#: fontview.c:5210 msgid "Histograms" msgstr "直方图" # -#: fontview.c:5220 +#: fontview.c:5224 msgid "_Auto Width..." msgstr "自动宽度(_A)…" # -#: fontview.c:5221 metricsview.c:3346 +#: fontview.c:5225 metricsview.c:3375 msgid "Ker_n By Classes..." msgstr "按类属压缩(_N)…" # -#: fontview.c:5222 +#: fontview.c:5226 msgid "Remove All Kern _Pairs" msgstr "移除所有压缩对(_P)" # -#: fontview.c:5225 metricsview.c:3347 +#: fontview.c:5229 metricsview.c:3376 msgid "VKern By Classes..." msgstr "按类属垂直压缩…" # -#: fontview.c:5226 metricsview.c:3348 +#: fontview.c:5230 metricsview.c:3377 msgid "VKern From HKern" msgstr "按水平压缩垂直压缩" # -#: fontview.c:5227 +#: fontview.c:5231 msgid "Remove All VKern Pairs" msgstr "移除所有垂直压缩对" # -#: fontview.c:5232 +#: fontview.c:5236 msgid "_Convert to CID" msgstr "转换到CID(_C)" # -#: fontview.c:5233 +#: fontview.c:5237 msgid "Convert By C_Map" msgstr "由CMap转换(_M)" # -#: fontview.c:5235 +#: fontview.c:5239 msgid "_Flatten" msgstr "平整(_F)" # -#: fontview.c:5236 +#: fontview.c:5240 msgid "Fl_attenByCMap" msgstr "由CMap平整(_A)" # -#: fontview.c:5238 +#: fontview.c:5242 msgid "Insert F_ont..." msgstr "插入字体(_O)…" # -#: fontview.c:5239 +#: fontview.c:5243 msgid "Insert _Blank" msgstr "插入空白(_B)" # -#: fontview.c:5242 +#: fontview.c:5246 msgid "_Change Supplement..." msgstr "改变附件(_C)…" # -#: fontview.c:5243 +#: fontview.c:5247 msgid "C_ID Font Info..." msgstr "CID字体信息(_I)…" # #. GT: Here (and following) MM means "MultiMaster" -#: fontview.c:5310 +#: fontview.c:5340 msgid "_Create MM..." msgstr "创建字体集(_C)…" # -#: fontview.c:5311 +#: fontview.c:5341 msgid "MM _Validity Check" msgstr "字体集校核(_V)" # -#: fontview.c:5312 +#: fontview.c:5342 msgid "MM _Info..." msgstr "字体集信息(_I)…" # -#: fontview.c:5313 +#: fontview.c:5343 msgid "_Blend to New Font..." msgstr "混合到新字体(_B)…" # -#: fontview.c:5314 +#: fontview.c:5344 msgid "MM Change Default _Weights..." msgstr "字体集默认粗细(_W)…" # -#: fontview.c:5409 +#: fontview.c:5439 msgid "_Overview" msgstr "概览(_O)" # -#: fontview.c:5410 +#: fontview.c:5440 msgid "_Index" msgstr "索引(_I)" # -#: fontview.c:5411 +#: fontview.c:5441 msgid "_About..." msgstr "关于(_A)…" # -#: fontview.c:5412 +#: fontview.c:5442 msgid "_License..." msgstr "许可(_L)…" # -#: fontview.c:5451 +#: fontview.c:5481 msgid "E_ncoding" msgstr "编码(_N)" # -#: fontview.c:5454 +#: fontview.c:5484 msgid "_CID" msgstr "字符标识(_C)" -#: fontview.c:7230 +#: fontview.c:7260 msgid "Selected BG Color" msgstr "" -#: fontview.c:7230 +#: fontview.c:7260 msgid "Color used to draw the background of selected glyphs" msgstr "" -#: fontview.c:7231 +#: fontview.c:7261 msgid "Selected FG Color" msgstr "" -#: fontview.c:7231 +#: fontview.c:7261 msgid "Color used to draw the foreground of selected glyphs" msgstr "" -#: fontview.c:7232 +#: fontview.c:7262 msgid "Changed Color" msgstr "" -#: fontview.c:7232 +#: fontview.c:7262 msgid "Color used to mark a changed glyph" msgstr "" -#: fontview.c:7233 +#: fontview.c:7263 msgid "Font Size" msgstr "" -#: fontview.c:7233 +#: fontview.c:7263 msgid "" "Size (in points) of the font used to display information and glyph labels in " "the fontview." msgstr "" -#: fontview.c:7234 +#: fontview.c:7264 msgid "Font Family" msgstr "" -#: fontview.c:7234 +#: fontview.c:7264 msgid "" "A comma separated list of font family names used to display small example " "images of glyphs over the user designed glyphs" msgstr "" -#: fontview.c:7235 +#: fontview.c:7265 msgid "Serif Family" msgstr "" -#: fontview.c:7235 +#: fontview.c:7265 msgid "" "A comma separated list of font family names used to display small example " "images of glyphs over the user designed glyphs\n" @@ -15550,11 +15549,11 @@ "serif font" msgstr "" -#: fontview.c:7236 +#: fontview.c:7266 msgid "Script Family" msgstr "" -#: fontview.c:7236 +#: fontview.c:7266 msgid "" "A comma separated list of font family names used to display small example " "images of glyphs over the user designed glyphs\n" @@ -15562,11 +15561,11 @@ "script font" msgstr "" -#: fontview.c:7237 +#: fontview.c:7267 msgid "Fraktur Family" msgstr "" -#: fontview.c:7237 +#: fontview.c:7267 msgid "" "A comma separated list of font family names used to display small example " "images of glyphs over the user designed glyphs\n" @@ -15574,11 +15573,11 @@ "fractur font" msgstr "" -#: fontview.c:7238 +#: fontview.c:7268 msgid "Double Struck Family" msgstr "" -#: fontview.c:7238 +#: fontview.c:7268 msgid "" "A comma separated list of font family names used to display small example " "images of glyphs over the user designed glyphs\n" @@ -15586,11 +15585,11 @@ "double struck font" msgstr "" -#: fontview.c:7239 +#: fontview.c:7269 msgid "Sans-Serif Family" msgstr "" -#: fontview.c:7239 +#: fontview.c:7269 msgid "" "A comma separated list of font family names used to display small example " "images of glyphs over the user designed glyphs\n" @@ -15598,11 +15597,11 @@ "sans-serif font" msgstr "" -#: fontview.c:7240 +#: fontview.c:7270 msgid "Monospace Family" msgstr "" -#: fontview.c:7240 +#: fontview.c:7270 msgid "" "A comma separated list of font family names used to display small example " "images of glyphs over the user designed glyphs\n" @@ -15610,37 +15609,37 @@ "monospace font" msgstr "" -#: fontview.c:7522 ../gdraw/ggadgets.c:85 ../gdraw/gprogress.c:191 +#: fontview.c:7552 ../gdraw/ggadgets.c:85 ../gdraw/gprogress.c:191 msgid "Color|Background" msgstr "" -#: fontview.c:7522 +#: fontview.c:7552 msgid "Background color for the drawing area of all views" msgstr "" -#: fontview.c:7531 +#: fontview.c:7561 msgid "View" msgstr "" -#: fontview.c:7532 +#: fontview.c:7562 msgid "" "This is an abstract class which defines common features of the\n" "FontView, CharView, BitmapView and MetricsView" msgstr "" -#: fontview.c:7544 +#: fontview.c:7574 msgid "FontView" msgstr "" -#: fontview.c:7545 +#: fontview.c:7575 msgid "This is the main fontforge window displaying a font" msgstr "" -#: fontview.c:7815 +#: fontview.c:7845 msgid "Glyph Set by Selection" msgstr "" -#: fontview.c:7831 +#: fontview.c:7861 msgid "" "Select glyphs in the font view above.\n" "The selected glyphs become your glyph class." @@ -15651,7 +15650,7 @@ msgid "_Unlink All" msgstr "全不连接(_U)" -#: fontviewbase.c:109 metricsview.c:2018 +#: fontviewbase.c:109 metricsview.c:2047 #, c-format msgid "" "You are attempting to clear %.30s which is referred to by\n" @@ -16240,13 +16239,11 @@ # #: glyphcomp.c:947 glyphcomp.c:1209 glyphcomp.c:1224 glyphcomp.c:1238 -#, c-format msgid "Outline Glyphs\n" msgstr "轮廓字形\n" # #: glyphcomp.c:952 glyphcomp.c:1240 -#, c-format msgid "Glyph Differences\n" msgstr "字形差异\n" @@ -16369,7 +16366,6 @@ msgstr "字形“%s” 不在 %s 中\n" #: glyphcomp.c:1242 -#, c-format msgid "" "ppem is different in the two fonts, cowardly refusing to compare glyphs\n" msgstr "" @@ -16377,7 +16373,6 @@ # #: glyphcomp.c:1277 glyphcomp.c:1300 glyphcomp.c:1330 glyphcomp.c:1382 #: glyphcomp.c:1401 -#, c-format msgid "Bitmap Strikes\n" msgstr "位图部件\n" @@ -16489,20 +16484,17 @@ # #: glyphcomp.c:1984 glyphcomp.c:2186 glyphcomp.c:2203 glyphcomp.c:2221 #: glyphcomp.c:2238 -#, c-format msgid "Glyph Positioning\n" msgstr "字形位置\n" # #: glyphcomp.c:1984 glyphcomp.c:2186 glyphcomp.c:2203 glyphcomp.c:2221 #: glyphcomp.c:2238 -#, c-format msgid "Glyph Substitution\n" msgstr "字形替代\n" # #: glyphcomp.c:1987 -#, c-format msgid "Lookup Differences\n" msgstr "查找差异\n" @@ -16598,22 +16590,22 @@ msgstr "查找子表 %s 不在 %s\n" # -#: gotodlg.c:102 gotodlg.c:199 +#: gotodlg.c:104 gotodlg.c:201 msgid "Goto" msgstr "转到" # -#: gotodlg.c:102 +#: gotodlg.c:104 #, c-format msgid "Could not find the glyph: %.70s" msgstr "未能找到字形：%.70s" # -#: gotodlg.c:211 +#: gotodlg.c:213 msgid "Enter the name of a glyph in the font" msgstr "输入字形名称" -#: gotodlg.c:229 +#: gotodlg.c:231 msgid "Merge into selection" msgstr "" @@ -16699,7 +16691,7 @@ msgstr "" # -#: groupsdlg.c:1252 oflib.c:707 oflib.c:1945 openfontdlg.c:276 +#: fontinfo.c:1237 groupsdlg.c:1252 oflib.c:707 oflib.c:1945 openfontdlg.c:276 msgid "Name" msgstr "名称" @@ -16901,7 +16893,6 @@ msgstr "未预期的服务器响应代码为 %d" #: http.c:648 -#, c-format msgid "Transmitting Meta Data..." msgstr "" @@ -17298,7 +17289,7 @@ msgid "Clear All" msgstr "清除全部" -#: kernclass.c:1350 +#: kernclass.c:1350 kernclass.c:2469 msgid "Clear Device Table" msgstr "" @@ -17321,24 +17312,24 @@ msgid "{All}" msgstr "" -#: kernclass.c:1875 +#: kernclass.c:1875 kernclass.c:1940 #, c-format msgid "The font does not contain a glyph named %s." msgstr "" -#: kernclass.c:1932 +#: kernclass.c:1997 msgid "_From this class" msgstr "" -#: kernclass.c:1932 +#: kernclass.c:1997 msgid "From the _other class" msgstr "" -#: kernclass.c:1956 +#: kernclass.c:2021 msgid "Glyph in two classes" msgstr "" -#: kernclass.c:1957 +#: kernclass.c:2022 #, c-format msgid "" "The glyph named %s also occurs in the class on row %d which begins with " @@ -17347,98 +17338,98 @@ msgstr "" #. GT: Select the class containing the glyph named in the following text field -#: kernclass.c:2227 +#: kernclass.c:2292 msgid "Select Class Containing:" msgstr "" # -#: kernclass.c:2233 kernclass.c:2240 +#: kernclass.c:2298 kernclass.c:2305 msgid "Select the class containing the named glyph" msgstr "选择命名字形的类属" # -#: kernclass.c:2320 +#: kernclass.c:2385 msgid "Display Size:" msgstr "显示尺寸:" # -#: kernclass.c:2343 +#: kernclass.c:2408 msgid "Magnification:" msgstr "放大:" # -#: kernclass.c:2359 +#: kernclass.c:2424 msgid "Kern Offset:" msgstr "压缩偏移:" -#: kernclass.c:2376 +#: kernclass.c:2441 msgid "" "Device Table Correction:\n" " (at display size)" msgstr "" -#: kernclass.c:2398 +#: kernclass.c:2463 msgid "" "Resets the kerning offset and device table corrections to what they were " "originally" msgstr "" -#: kernclass.c:2408 +#: kernclass.c:2473 msgid "Clear all device table corrections associated with this combination" msgstr "" -#: kernclass.c:2419 +#: kernclass.c:2484 msgid "Resets the kerning offset to what it was originally" msgstr "" # -#: kernclass.c:2444 +#: kernclass.c:2509 msgid "Lookup subtable:" msgstr "查找替代表:" # #. GT: The %s is the name of the lookup subtable containing this kerning class -#: kernclass.c:2596 +#: kernclass.c:2661 #, c-format msgid "Kerning by Classes: %s" msgstr "按类属压缩: %s" # -#: kernclass.c:2630 +#: kernclass.c:2695 #, c-format msgid "Lookup Subtable: %s" msgstr "查找替代表: %s" -#: kernclass.c:2641 +#: kernclass.c:2706 msgid "Show Kerning" msgstr "" -#: kernclass.c:2656 lookupui.c:4401 lookupui.c:5329 +#: kernclass.c:2721 lookupui.c:4401 lookupui.c:5329 msgid "_Default Separation:" msgstr "" -#: kernclass.c:2663 lookupui.c:4408 lookupui.c:5336 +#: kernclass.c:2728 lookupui.c:4408 lookupui.c:5336 msgid "" "Add entries to the lookup trying to make the optical\n" "separation between all pairs of glyphs equal to this\n" "value." msgstr "" -#: kernclass.c:2681 lookupui.c:4426 lookupui.c:5354 +#: kernclass.c:2746 lookupui.c:4426 lookupui.c:5354 msgid "_Min Kern:" msgstr "" -#: kernclass.c:2688 lookupui.c:4433 lookupui.c:5361 +#: kernclass.c:2753 lookupui.c:4433 lookupui.c:5361 msgid "" "Any computed kerning change whose absolute value is less\n" "that this will be ignored.\n" msgstr "" -#: kernclass.c:2705 lookupui.c:4450 lookupui.c:5378 +#: kernclass.c:2770 lookupui.c:4450 lookupui.c:5378 msgid "_Touching" msgstr "" -#: kernclass.c:2714 lookupui.c:4459 lookupui.c:5387 +#: kernclass.c:2779 lookupui.c:4459 lookupui.c:5387 msgid "" "Normally kerning is based on achieving a constant (optical)\n" "separation between glyphs, but occasionally it is desireable\n" @@ -17447,38 +17438,38 @@ "ation is 0 then the glyphs will actually be touching." msgstr "" -#: kernclass.c:2731 lookupui.c:4475 lookupui.c:5403 +#: kernclass.c:2796 lookupui.c:4475 lookupui.c:5403 msgid "Only kern glyphs closer" msgstr "" -#: kernclass.c:2739 lookupui.c:4483 lookupui.c:5411 +#: kernclass.c:2804 lookupui.c:4483 lookupui.c:5411 msgid "" "When doing autokerning, only move glyphs closer together,\n" "so the kerning offset will be negative." msgstr "" -#: kernclass.c:2745 lookupui.c:4489 lookupui.c:5417 +#: kernclass.c:2810 lookupui.c:4489 lookupui.c:5417 msgid "Autokern new entries" msgstr "" -#: kernclass.c:2753 +#: kernclass.c:2818 msgid "" "When adding a new class provide default kerning values\n" "Between it and every class with which it interacts." msgstr "" # -#: kernclass.c:3066 +#: kernclass.c:3131 msgid "VKern By Classes" msgstr "按类属垂直压缩" # -#: kernclass.c:3066 +#: kernclass.c:3131 msgid "Kern By Classes" msgstr "按类属压缩" # -#: kernclass.c:3086 +#: kernclass.c:3151 msgid "KernClass|_New Lookup..." msgstr "新建查找(_N)..." @@ -17498,7 +17489,7 @@ msgstr "德语" # -#: langfreq.c:1826 unicoderange.c:158 +#: langfreq.c:1826 unicoderange.c:163 msgid "Katakana" msgstr "日文片假名" @@ -17582,957 +17573,957 @@ msgstr "" # -#: lookups.c:41 +#: lookups.c:42 msgid "TeX Glyphlist" msgstr "TeX字形表" # -#: lookups.c:42 +#: lookups.c:43 msgid "TeX Extension List" msgstr "TeX扩展表" # -#: lookups.c:45 +#: lookups.c:46 msgid "Access All Alternates" msgstr "访问所有替代" # -#: lookups.c:46 +#: lookups.c:47 msgid "Above Base Forms" msgstr "基本形之上" # -#: lookups.c:47 +#: lookups.c:48 msgid "Above Base Mark" msgstr "基本标记之上" # -#: lookups.c:48 +#: lookups.c:49 msgid "Above Base Substitutions" msgstr "基本替代之上" # -#: lookups.c:49 +#: lookups.c:50 msgid "Vertical Fractions" msgstr "垂直比例" # -#: lookups.c:50 +#: lookups.c:51 msgid "Akhand" msgstr "Akhand" # -#: lookups.c:51 +#: lookups.c:52 msgid "Ancient Ligatures" msgstr "古典连写组合" # -#: lookups.c:52 +#: lookups.c:53 msgid "Below Base Forms" msgstr "低于基本形" # -#: lookups.c:53 +#: lookups.c:54 msgid "Below Base Mark" msgstr "基本标记之下" # -#: lookups.c:54 +#: lookups.c:55 msgid "Below Base Substitutions" msgstr "基本替代之下" # -#: lookups.c:55 +#: lookups.c:56 msgid "Capitals to Petite Capitals" msgstr "大写到袖珍大写" # -#: lookups.c:56 +#: lookups.c:57 msgid "Capitals to Small Capitals" msgstr "大写到小大写" # -#: lookups.c:57 +#: lookups.c:58 msgid "Contextual Alternates" msgstr "上下文替代" # -#: lookups.c:58 +#: lookups.c:59 msgid "Case-Sensitive Forms" msgstr "大小写区分形" # -#: lookups.c:59 +#: lookups.c:60 msgid "Glyph Composition/Decomposition" msgstr "字形组合或分组" -#: lookups.c:60 +#: lookups.c:61 msgid "Conjunct Form After Ro" msgstr "" -#: lookups.c:61 +#: lookups.c:62 msgid "Conjunct Forms" msgstr "" # -#: lookups.c:62 +#: lookups.c:63 msgid "Contextual Ligatures" msgstr "上下文组合" -#: lookups.c:63 +#: lookups.c:64 msgid "Centered CJK Punctuation" msgstr "" # -#: lookups.c:64 +#: lookups.c:65 msgid "Capital Spacing" msgstr "大写间隔" # -#: lookups.c:65 +#: lookups.c:66 msgid "Contextual Swash" msgstr "上下文泼溅" # -#: lookups.c:66 +#: lookups.c:67 msgid "Cursive Attachment" msgstr "草写附件" -#: lookups.c:67 +#: lookups.c:68 msgid "Character Variants 00" msgstr "" -#: lookups.c:68 +#: lookups.c:69 msgid "Character Variants 01" msgstr "" -#: lookups.c:69 +#: lookups.c:70 msgid "Character Variants 02" msgstr "" -#: lookups.c:70 +#: lookups.c:71 msgid "Character Variants 03" msgstr "" -#: lookups.c:71 +#: lookups.c:72 msgid "Character Variants 04" msgstr "" -#: lookups.c:72 +#: lookups.c:73 msgid "Character Variants 05" msgstr "" -#: lookups.c:73 +#: lookups.c:74 msgid "Character Variants 06" msgstr "" -#: lookups.c:74 +#: lookups.c:75 msgid "Character Variants 07" msgstr "" -#: lookups.c:75 +#: lookups.c:76 msgid "Character Variants 08" msgstr "" -#: lookups.c:76 +#: lookups.c:77 msgid "Character Variants 09" msgstr "" -#: lookups.c:77 +#: lookups.c:78 msgid "Character Variants 10" msgstr "" -#: lookups.c:78 +#: lookups.c:79 msgid "Character Variants 99" msgstr "" -#: lookups.c:79 +#: lookups.c:80 msgid "Drop Caps" msgstr "" # -#: lookups.c:80 +#: lookups.c:81 msgid "Distance" msgstr "间距" # -#: lookups.c:81 +#: lookups.c:82 msgid "Discretionary Ligatures" msgstr "按需组合" # -#: lookups.c:82 scstylesui.c:371 +#: lookups.c:83 scstylesui.c:371 msgid "Denominators" msgstr "分母" -#: lookups.c:83 +#: lookups.c:84 msgid "Dipthongs (Obsolete)" msgstr "" -#: lookups.c:84 +#: lookups.c:85 msgid "Dotless Forms" msgstr "" # -#: lookups.c:85 +#: lookups.c:86 msgid "Expert Forms" msgstr "专业形" # -#: lookups.c:86 +#: lookups.c:87 msgid "Final Glyph On Line" msgstr "线上最终字形" # -#: lookups.c:87 +#: lookups.c:88 msgid "Terminal Forms #2" msgstr "终端形 #2" # -#: lookups.c:88 +#: lookups.c:89 msgid "Terminal Forms #3" msgstr "终端形 #3" # -#: lookups.c:89 +#: lookups.c:90 msgid "Terminal Forms" msgstr "终端形" -#: lookups.c:90 +#: lookups.c:91 msgid "Flattened Accents over Capitals" msgstr "" # -#: lookups.c:91 +#: lookups.c:92 msgid "Diagonal Fractions" msgstr "对角比例" # -#: lookups.c:92 +#: lookups.c:93 msgid "Full Widths" msgstr "全宽" # -#: lookups.c:93 +#: lookups.c:94 msgid "Half Forms" msgstr "半形" # -#: lookups.c:94 +#: lookups.c:95 msgid "Halant Forms" msgstr "Halant Forms" # -#: lookups.c:95 +#: lookups.c:96 msgid "Alternative Half Widths" msgstr "替代半宽" # -#: lookups.c:96 +#: lookups.c:97 msgid "Historical Forms" msgstr "历史形" # -#: lookups.c:97 +#: lookups.c:98 msgid "Horizontal Kana Alternatives" msgstr "水平假名替代" # -#: lookups.c:98 +#: lookups.c:99 msgid "Historic Ligatures" msgstr "历史组合" # -#: lookups.c:99 +#: lookups.c:100 msgid "Hanja to Hangul" msgstr "汉字到谚文" -#: lookups.c:100 +#: lookups.c:101 msgid "Hojo (JIS X 0212-1990) Kanji Forms" msgstr "" # -#: lookups.c:101 +#: lookups.c:102 msgid "Half Widths" msgstr "半宽" # -#: lookups.c:102 +#: lookups.c:103 msgid "Initial Forms" msgstr "本形" # -#: lookups.c:103 +#: lookups.c:104 msgid "Isolated Forms" msgstr "分立形" # -#: lookups.c:104 +#: lookups.c:105 msgid "Italics" msgstr "斜体" # -#: lookups.c:105 +#: lookups.c:106 msgid "Justification Alternatives" msgstr "对齐替代" -#: lookups.c:106 +#: lookups.c:107 msgid "Japanese Forms (Obsolete)" msgstr "" -#: lookups.c:107 +#: lookups.c:108 msgid "JIS2004 Forms" msgstr "" # -#: lookups.c:108 +#: lookups.c:109 msgid "JIS78 Forms" msgstr "JIS78 Forms" # -#: lookups.c:109 +#: lookups.c:110 msgid "JIS83 Forms" msgstr "JIS83 Forms" # -#: lookups.c:110 +#: lookups.c:111 msgid "JIS90 Forms" msgstr "JIS90 Forms" # -#: lookups.c:111 +#: lookups.c:112 msgid "Horizontal Kerning" msgstr "水平压缩" # -#: lookups.c:112 +#: lookups.c:113 msgid "Left Bounds" msgstr "左边界" # -#: lookups.c:113 +#: lookups.c:114 msgid "Standard Ligatures" msgstr "标准组合" # -#: lookups.c:114 +#: lookups.c:115 msgid "Leading Jamo Forms" msgstr "Leading Jamo Forms" # -#: lookups.c:115 +#: lookups.c:116 msgid "Lining Figures" msgstr "线状图形" # -#: lookups.c:116 +#: lookups.c:117 msgid "Localized Forms" msgstr "本地形式" # -#: lookups.c:117 +#: lookups.c:118 msgid "Mark Positioning" msgstr "标记定位" # -#: lookups.c:118 +#: lookups.c:119 msgid "Medial Forms 2" msgstr "中等形 2" # -#: lookups.c:119 +#: lookups.c:120 msgid "Medial Forms" msgstr "中等形" # -#: lookups.c:120 +#: lookups.c:121 msgid "Mathematical Greek" msgstr "数学希腊字" # -#: lookups.c:121 +#: lookups.c:122 msgid "Mark to Mark" msgstr "标记到标记" # -#: lookups.c:122 +#: lookups.c:123 msgid "Mark Positioning via Substitution" msgstr "由替代标记定位" # -#: lookups.c:123 +#: lookups.c:124 msgid "Alternate Annotation Forms" msgstr "替代注释形式" -#: lookups.c:124 +#: lookups.c:125 msgid "NLC Kanji Forms" msgstr "" # -#: lookups.c:125 +#: lookups.c:126 msgid "Nukta Forms" msgstr "Nukta Forms" # -#: lookups.c:126 scstylesui.c:372 +#: lookups.c:127 scstylesui.c:372 msgid "Numerators" msgstr "运算符" # -#: lookups.c:127 +#: lookups.c:128 msgid "Oldstyle Figures" msgstr "旧体外形" # -#: lookups.c:128 +#: lookups.c:129 msgid "Optical Bounds" msgstr "可见边界" # -#: lookups.c:129 +#: lookups.c:130 msgid "Ordinals" msgstr "序数" # -#: lookups.c:130 +#: lookups.c:131 msgid "Ornaments" msgstr "装饰" # -#: lookups.c:131 +#: lookups.c:132 msgid "Proportional Alternate Metrics" msgstr "比例替代尺寸" # -#: lookups.c:132 +#: lookups.c:133 msgid "Lowercase to Petite Capitals" msgstr "小写到袖珍大写" -#: lookups.c:133 +#: lookups.c:134 msgid "Proportional Kana" msgstr "" # -#: lookups.c:134 +#: lookups.c:135 msgid "Proportional Numbers" msgstr "比例数字" # -#: lookups.c:135 +#: lookups.c:136 msgid "Pre Base Forms" msgstr "上一基本形" # -#: lookups.c:136 +#: lookups.c:137 msgid "Pre Base Substitutions" msgstr "上一基本替代" # -#: lookups.c:137 +#: lookups.c:138 msgid "Post Base Forms" msgstr "下一基本形" # -#: lookups.c:138 +#: lookups.c:139 msgid "Post Base Substitutions" msgstr "下一基本替代" # -#: lookups.c:139 +#: lookups.c:140 msgid "Proportional Width" msgstr "比例宽度" # -#: lookups.c:140 +#: lookups.c:141 msgid "Quarter Widths" msgstr "四分之一宽" # -#: lookups.c:141 +#: lookups.c:142 msgid "Randomize" msgstr "随机" -#: lookups.c:142 +#: lookups.c:143 msgid "Rakar Forms" msgstr "" # -#: lookups.c:143 +#: lookups.c:144 msgid "Required Ligatures" msgstr "必要组合" # -#: lookups.c:144 +#: lookups.c:145 msgid "Reph Form" msgstr "Reph 形" # -#: lookups.c:145 +#: lookups.c:146 msgid "Right Bounds" msgstr "右边界" # -#: lookups.c:146 +#: lookups.c:147 msgid "Right to Left Alternates" msgstr "右到左替代" -#: lookups.c:147 +#: lookups.c:148 msgid "Right to Left mirrored forms" msgstr "" # -#: lookups.c:148 +#: lookups.c:149 msgid "Ruby Notational Forms" msgstr "Ruby计数形式" # -#: lookups.c:149 +#: lookups.c:150 msgid "Stylistic Alternatives" msgstr "样式替代" # -#: lookups.c:150 scstylesui.c:369 +#: lookups.c:151 scstylesui.c:369 msgid "Scientific Inferiors" msgstr "科学下标" # -#: lookups.c:151 +#: lookups.c:152 msgid "Lowercase to Small Capitals" msgstr "小写到小大写" # -#: lookups.c:152 +#: lookups.c:153 msgid "Simplified Forms" msgstr "简化形式" # -#: lookups.c:153 +#: lookups.c:154 msgid "Style Set 1" msgstr "样式集1" # -#: lookups.c:154 +#: lookups.c:155 msgid "Style Set 2" msgstr "样式集2" # -#: lookups.c:155 +#: lookups.c:156 msgid "Style Set 3" msgstr "样式集3" # -#: lookups.c:156 +#: lookups.c:157 msgid "Style Set 4" msgstr "样式集4" # -#: lookups.c:157 +#: lookups.c:158 msgid "Style Set 5" msgstr "样式集5" # -#: lookups.c:158 +#: lookups.c:159 msgid "Style Set 6" msgstr "样式集6" # -#: lookups.c:159 +#: lookups.c:160 msgid "Style Set 7" msgstr "样式集7" # -#: lookups.c:160 +#: lookups.c:161 msgid "Style Set 8" msgstr "样式集8" # -#: lookups.c:161 +#: lookups.c:162 msgid "Style Set 9" msgstr "样式集9" # -#: lookups.c:162 +#: lookups.c:163 msgid "Style Set 10" msgstr "样式集10" # -#: lookups.c:163 +#: lookups.c:164 msgid "Style Set 11" msgstr "样式集11" # -#: lookups.c:164 +#: lookups.c:165 msgid "Style Set 12" msgstr "样式集12" # -#: lookups.c:165 +#: lookups.c:166 msgid "Style Set 13" msgstr "样式集13" # -#: lookups.c:166 +#: lookups.c:167 msgid "Style Set 14" msgstr "样式集14" # -#: lookups.c:167 +#: lookups.c:168 msgid "Style Set 15" msgstr "样式集15" # -#: lookups.c:168 +#: lookups.c:169 msgid "Style Set 16" msgstr "样式集16" # -#: lookups.c:169 +#: lookups.c:170 msgid "Style Set 17" msgstr "样式集17" # -#: lookups.c:170 +#: lookups.c:171 msgid "Style Set 18" msgstr "样式集18" # -#: lookups.c:171 +#: lookups.c:172 msgid "Style Set 19" msgstr "样式集19" # -#: lookups.c:172 +#: lookups.c:173 msgid "Style Set 20" msgstr "样式集20" # -#: lookups.c:173 +#: lookups.c:174 msgid "Script Style" msgstr "手书文字样式:" # -#: lookups.c:176 +#: lookups.c:177 msgid "Swash" msgstr "填充" # -#: lookups.c:177 +#: lookups.c:178 msgid "Titling" msgstr "叠加" # -#: lookups.c:178 +#: lookups.c:179 msgid "Trailing Jamo Forms" msgstr "Trailing Jamo Forms" # -#: lookups.c:179 +#: lookups.c:180 msgid "Traditional Name Forms" msgstr "传统名称形式" # -#: lookups.c:180 +#: lookups.c:181 msgid "Tabular Numbers" msgstr "表格数字" # -#: lookups.c:181 +#: lookups.c:182 msgid "Traditional Forms" msgstr "传统形式" # -#: lookups.c:182 +#: lookups.c:183 msgid "Third Widths" msgstr "三分之一宽" # -#: lookups.c:183 +#: lookups.c:184 msgid "Unicase" msgstr "一致大小写" # -#: lookups.c:184 +#: lookups.c:185 msgid "Alternate Vertical Metrics" msgstr "替代垂直尺寸" # -#: lookups.c:185 +#: lookups.c:186 msgid "Vattu Variants" msgstr "Vattu 变形" # -#: lookups.c:186 +#: lookups.c:187 msgid "Vertical Alternates (obs)" msgstr "垂直替补(绝对)" # -#: lookups.c:187 +#: lookups.c:188 msgid "Alternate Vertical Half Metrics" msgstr "替代垂直半尺寸" # -#: lookups.c:188 +#: lookups.c:189 msgid "Vowel Jamo Forms" msgstr "Vowel Jamo Forms" # -#: lookups.c:189 +#: lookups.c:190 msgid "Vertical Kana Alternates" msgstr "垂直假名替代" # -#: lookups.c:190 +#: lookups.c:191 msgid "Vertical Kerning" msgstr "垂直压缩" # -#: lookups.c:191 +#: lookups.c:192 msgid "Proportional Alternate Vertical Metrics" msgstr "比例替代垂直尺寸" # -#: lookups.c:192 +#: lookups.c:193 msgid "Vertical Rotation & Alternates" msgstr "垂直旋转及替补" # -#: lookups.c:193 +#: lookups.c:194 msgid "Slashed Zero" msgstr "带中线的零" # -#: lookups.c:195 +#: lookups.c:196 msgid "Required feature" msgstr "需要特征" # -#: lookups.c:1284 +#: lookups.c:1285 msgid "Undefined substitution" msgstr "未定义替换" # -#: lookups.c:1284 lookupui.c:133 +#: lookups.c:1285 lookupui.c:133 msgid "Single Substitution" msgstr "单一替代" # -#: lookups.c:1284 lookupui.c:134 +#: lookups.c:1285 lookupui.c:134 msgid "Multiple Substitution" msgstr "多重替代" # -#: lookups.c:1285 lookupui.c:135 +#: lookups.c:1286 lookupui.c:135 msgid "Alternate Substitution" msgstr "交换替代" # -#: lookups.c:1285 lookupui.c:136 +#: lookups.c:1286 lookupui.c:136 msgid "Ligature Substitution" msgstr "连字替换" # -#: lookups.c:1285 lookupui.c:137 showatt.c:571 showatt.c:647 +#: lookups.c:1286 lookupui.c:137 showatt.c:578 showatt.c:654 msgid "Contextual Substitution" msgstr "关联替代" # -#: lookups.c:1286 lookupui.c:138 +#: lookups.c:1287 lookupui.c:138 msgid "Contextual Chaining Substitution" msgstr "关联链替换" # -#: lookups.c:1286 lookups.c:1292 +#: lookups.c:1287 lookups.c:1293 msgid "Extension" msgstr "扩展" # -#: lookups.c:1287 +#: lookups.c:1288 msgid "Reverse Contextual Chaining Substitution" msgstr "逆向关联链替换" # -#: lookups.c:1288 +#: lookups.c:1289 msgid "Undefined positioning" msgstr "未定义位置" # -#: lookups.c:1288 +#: lookups.c:1289 msgid "Single Positioning" msgstr "简单定位" # -#: lookups.c:1288 +#: lookups.c:1289 msgid "Pairwise Positioning (kerning)" msgstr "配对定位(压缩)" # -#: lookups.c:1289 +#: lookups.c:1290 msgid "Cursive attachment" msgstr "草写附件" # -#: lookups.c:1289 +#: lookups.c:1290 msgid "Mark to base attachment" msgstr "标记基础附件" # -#: lookups.c:1290 +#: lookups.c:1291 msgid "Mark to Ligature attachment" msgstr "标记连写附件" # -#: lookups.c:1290 +#: lookups.c:1291 msgid "Mark to Mark attachment" msgstr "标记标记附件" # -#: lookups.c:1291 showatt.c:571 +#: lookups.c:1292 showatt.c:578 msgid "Contextual Positioning" msgstr "关联定位" # -#: lookups.c:1291 +#: lookups.c:1292 msgid "Contextual Chaining Positioning" msgstr "关联链定位" # #. GT: See the long comment at "Property|New" #. GT: The msgstr should contain a translation of "Arabic", ignore "Script|" -#: lookups.c:1301 lookupui.c:165 parsettf.c:4430 +#: lookups.c:1302 lookupui.c:165 parsettf.c:4430 msgid "Script|Arabic" msgstr "阿拉伯文" # -#: lookups.c:1302 lookupui.c:166 +#: lookups.c:1303 lookupui.c:166 msgid "Script|Aramaic" msgstr "Aramaic" # -#: lookups.c:1303 lookupui.c:167 +#: lookups.c:1304 lookupui.c:167 msgid "Script|Armenian" msgstr "Armenian" # -#: lookups.c:1304 lookupui.c:168 +#: lookups.c:1305 lookupui.c:168 msgid "Script|Avestan" msgstr "Avestan" # -#: lookups.c:1305 lookupui.c:169 +#: lookups.c:1306 lookupui.c:169 msgid "Script|Balinese" msgstr "Balinese" # -#: lookups.c:1306 lookupui.c:170 +#: lookups.c:1307 lookupui.c:170 msgid "Script|Batak" msgstr "Batak" # -#: lookups.c:1307 lookupui.c:171 +#: lookups.c:1308 lookupui.c:171 msgid "Script|Bengali" msgstr "Bengali" # -#: lookups.c:1308 lookupui.c:172 +#: lookups.c:1309 lookupui.c:172 msgid "Script|Bengali2" msgstr "Bengali2" # -#: lookups.c:1309 lookupui.c:173 +#: lookups.c:1310 lookupui.c:173 msgid "Bliss Symbolics" msgstr "Bliss符号" # -#: lookups.c:1310 lookupui.c:174 unicoderange.c:159 +#: lookups.c:1311 lookupui.c:174 unicoderange.c:164 msgid "Bopomofo" msgstr "注音字母" # -#: lookups.c:1311 lookupui.c:175 +#: lookups.c:1312 lookupui.c:175 msgid "Brāhmī" msgstr "Brāhmī" # -#: lookups.c:1312 lookupui.c:176 +#: lookups.c:1313 lookupui.c:176 msgid "Braille" msgstr "Braille" # -#: lookups.c:1313 lookupui.c:177 +#: lookups.c:1314 lookupui.c:177 msgid "Script|Buginese" msgstr "Buginese" # -#: lookups.c:1314 lookupui.c:178 +#: lookups.c:1315 lookupui.c:178 msgid "Script|Buhid" msgstr "Buhid" # -#: lookups.c:1315 lookupui.c:179 +#: lookups.c:1316 lookupui.c:179 msgid "Byzantine Music" msgstr "拜占庭乐符" # -#: lookups.c:1316 lookupui.c:180 +#: lookups.c:1317 lookupui.c:180 msgid "Canadian Syllabics" msgstr "加拿大音节" -#: lookups.c:1317 unicoderange.c:234 +#: lookups.c:1318 unicoderange.c:242 msgid "Carian" msgstr "" # -#: lookups.c:1319 lookupui.c:181 +#: lookups.c:1320 lookupui.c:181 msgid "Script|Cham" msgstr "Cham" # -#: lookups.c:1320 lookupui.c:182 +#: lookups.c:1321 lookupui.c:182 msgid "Script|Cherokee" msgstr "切洛基文" # -#: lookups.c:1321 lookupui.c:183 +#: lookups.c:1322 lookupui.c:183 msgid "Cirth" msgstr "色斯文" # -#: lookups.c:1322 lookupui.c:184 +#: lookups.c:1323 lookupui.c:184 msgid "CJK Ideographic" msgstr "中日韩表意字符" # -#: lookups.c:1323 lookupui.c:185 +#: lookups.c:1324 lookupui.c:185 msgid "Script|Coptic" msgstr "Coptic" # -#: lookups.c:1324 lookupui.c:186 +#: lookups.c:1325 lookupui.c:186 msgid "Cypro-Minoan" msgstr "塞浦路斯－克里特语" # -#: lookups.c:1325 lookupui.c:187 +#: lookups.c:1326 lookupui.c:187 msgid "Cypriot syllabary" msgstr "塞浦路斯音节" # -#: lookups.c:1326 lookupui.c:188 unicoderange.c:52 +#: lookups.c:1327 lookupui.c:188 unicoderange.c:54 msgid "Cyrillic" msgstr "西里尔语" # -#: lookups.c:1327 lookupui.c:189 +#: lookups.c:1328 lookupui.c:189 msgid "Script|Default" msgstr "默认" # -#: lookups.c:1328 lookupui.c:190 +#: lookups.c:1329 lookupui.c:190 msgid "Deseret (Mormon)" msgstr "Deseret (Mormon)" # -#: lookups.c:1330 lookupui.c:192 +#: lookups.c:1331 lookupui.c:192 msgid "Devanagari2" msgstr "Devanagari2" @@ -18547,358 +18538,359 @@ #. GT: dealing with these scripts against the day someone wants to use them. So #. GT: FontForge must be prepared to deal with those placeholders if nothing else. #. { (unichar_t *) N_("Egyptian hieroglyphs"), NULL, 0, 0, (void *) CHR('e','g','y','p'), NULL, false, false, false, false, false, false, true }, -#: lookups.c:1338 lookupui.c:200 +#: lookups.c:1339 lookupui.c:200 msgid "Script|Ethiopic" msgstr "埃塞俄比亚文" # -#: lookups.c:1339 lookupui.c:201 +#: lookups.c:1340 lookupui.c:201 msgid "Script|Georgian" msgstr "Georgian" # -#: lookups.c:1340 lookupui.c:202 unicoderange.c:145 +#: fontinfo.c:1122 lookups.c:1341 lookupui.c:202 unicoderange.c:148 msgid "Glagolitic" msgstr "格拉哥里语" # -#: lookups.c:1342 lookupui.c:204 parsettf.c:4430 +#: lookups.c:1343 lookupui.c:204 parsettf.c:4430 msgid "Script|Greek" msgstr "希腊" # -#: lookups.c:1343 lookupui.c:205 parsettf.c:4434 +#: lookups.c:1344 lookupui.c:205 parsettf.c:4434 msgid "Script|Gujarati" msgstr "古吉拉特文" # -#: lookups.c:1344 lookupui.c:206 +#: lookups.c:1345 lookupui.c:206 msgid "Script|Gujarati2" msgstr "Gujarati2" # -#: lookups.c:1346 lookupui.c:208 +#: lookups.c:1347 lookupui.c:208 msgid "Gurmukhi2" msgstr "Gurmukhi2" # -#: lookups.c:1348 lookupui.c:210 +#: lookups.c:1349 lookupui.c:210 msgid "Hangul" msgstr "韩文" # -#: lookups.c:1349 lookupui.c:211 +#: lookups.c:1350 lookupui.c:211 msgid "Script|Hanunóo" msgstr "Hanunóo" # -#: lookups.c:1350 lookupui.c:212 parsettf.c:4430 +#: lookups.c:1351 lookupui.c:212 parsettf.c:4430 msgid "Script|Hebrew" msgstr "希伯来语" # -#: lookups.c:1353 lookupui.c:215 +#: lookups.c:1354 lookupui.c:215 msgid "Script|Javanese" msgstr "Script|Javanese" -#: lookups.c:1354 unicoderange.c:184 +#: fontinfo.c:1141 lookups.c:1355 unicoderange.c:190 msgid "Kayah Li" msgstr "" # -#: lookups.c:1355 lookupui.c:217 +#: lookups.c:1356 lookupui.c:217 msgid "Hiragana & Katakana" msgstr "平假名与片假名" # -#: lookups.c:1356 lookupui.c:218 +#: lookups.c:1357 lookupui.c:218 msgid "Kharoṣṭhī" msgstr "Kharoṣṭhī" # -#: lookups.c:1357 lookupui.c:219 +#: lookups.c:1358 lookupui.c:219 msgid "Script|Kannada" msgstr "Script|Kannada" # -#: lookups.c:1358 lookupui.c:220 +#: lookups.c:1359 lookupui.c:220 msgid "Script|Kannada2" msgstr "Script|Kannada2" # -#: lookups.c:1359 lookupui.c:221 +#: lookups.c:1360 lookupui.c:221 msgid "Script|Khmer" msgstr "Script|Khmer" # -#: lookups.c:1360 lookupui.c:222 +#: lookups.c:1361 lookupui.c:222 msgid "Script|Kharosthi" msgstr "Script|Kharosthi" # -#: lookups.c:1361 lookupui.c:223 +#: lookups.c:1362 lookupui.c:223 msgid "Script|Lao" msgstr "老挝文" # -#: lookups.c:1362 lookupui.c:224 +#: lookups.c:1363 lookupui.c:224 msgid "Script|Latin" msgstr "拉丁文" # -#: lookups.c:1363 lookupui.c:225 +#: lookups.c:1364 lookupui.c:225 msgid "Lepcha (Róng)" msgstr "Lepcha (Róng)" # -#: lookups.c:1364 lookupui.c:226 +#: lookups.c:1365 lookupui.c:226 msgid "Script|Limbu" msgstr "Script|Limbu" # -#: lookups.c:1365 lookupui.c:227 +#: lookups.c:1366 lookupui.c:227 msgid "Linear A" msgstr "Linear A" # -#: lookups.c:1366 lookupui.c:228 +#: lookups.c:1367 lookupui.c:228 msgid "Linear B" msgstr "Linear B" -#: lookups.c:1367 unicoderange.c:233 +#: lookups.c:1368 unicoderange.c:241 msgid "Lycian" msgstr "" -#: lookups.c:1368 unicoderange.c:247 +#: lookups.c:1369 unicoderange.c:255 msgid "Lydian" msgstr "" # -#: lookups.c:1369 lookupui.c:229 +#: lookups.c:1370 lookupui.c:229 msgid "Script|Mandaean" msgstr "Script|Mandaean" # -#: lookups.c:1371 lookupui.c:231 +#: lookups.c:1372 lookupui.c:231 msgid "Script|Malayālam" msgstr "Script|Malayālam" # -#: lookups.c:1372 lookupui.c:232 +#: lookups.c:1373 lookupui.c:232 msgid "Script|Malayālam2" msgstr "Script|Malayālam2" # -#: lookups.c:1374 lookupui.c:234 +#: lookups.c:1375 lookupui.c:234 msgid "Script|Mongolian" msgstr "蒙古文" # -#: lookups.c:1375 lookupui.c:235 +#: lookups.c:1376 lookupui.c:235 msgid "Musical" msgstr "乐符" # -#: lookups.c:1376 lookupui.c:236 +#: lookups.c:1377 lookupui.c:236 msgid "Script|Myanmar" msgstr "Script|Myanmar" -#: lookups.c:1377 +#: fontinfo.c:1120 lookups.c:1378 unicoderange.c:99 msgid "New Tai Lue" msgstr "" # -#: lookups.c:1378 lookupui.c:237 lookupui.c:555 unicoderange.c:60 +#: fontinfo.c:1038 lookups.c:1379 lookupui.c:237 lookupui.c:555 +#: unicoderange.c:62 msgid "N'Ko" msgstr "N'Ko" -#: lookups.c:1380 unicoderange.c:106 +#: fontinfo.c:1139 lookups.c:1381 unicoderange.c:107 msgid "Ol Chiki" msgstr "" # -#: lookups.c:1381 lookupui.c:239 +#: lookups.c:1382 lookupui.c:239 msgid "Old Italic (Etruscan, Oscan, etc.)" msgstr "老意大利文 (Etruscan, Oscan 等)" # -#: lookups.c:1382 lookupui.c:240 +#: lookups.c:1383 lookupui.c:240 msgid "Script|Old Permic" msgstr "Script|Old Permic" # -#: lookups.c:1383 lookupui.c:241 +#: lookups.c:1384 lookupui.c:241 msgid "Old Persian cuneiform" msgstr "Old Persian cuneiform" # -#: lookups.c:1384 lookupui.c:242 +#: lookups.c:1385 lookupui.c:242 msgid "Script|Oriya" msgstr "Script|Oriya" # -#: lookups.c:1385 lookupui.c:243 +#: lookups.c:1386 lookupui.c:243 msgid "Script|Oriya2" msgstr "Script|Oriya2" # -#: lookups.c:1386 lookupui.c:244 unicoderange.c:242 +#: fontinfo.c:1131 lookups.c:1387 lookupui.c:244 unicoderange.c:250 msgid "Osmanya" msgstr "Osmanya" # -#: lookups.c:1387 lookupui.c:245 +#: lookups.c:1388 lookupui.c:245 msgid "Script|Pahlavi" msgstr "Script|Pahlavi" # -#: lookups.c:1388 lookupui.c:246 +#: lookups.c:1389 lookupui.c:246 msgid "Script|Phags-pa" msgstr "Script|Phags-pa" # -#: lookups.c:1389 lookupui.c:247 +#: lookups.c:1390 lookupui.c:247 msgid "Script|Phoenician" msgstr "Script|Phoenician" # -#: lookups.c:1390 lookupui.c:248 +#: lookups.c:1391 lookupui.c:248 msgid "Phaistos" msgstr "Phaistos" # -#: lookups.c:1391 lookupui.c:249 +#: lookups.c:1392 lookupui.c:249 msgid "Pollard Phonetic" msgstr "Pollard Phonetic" -#: lookups.c:1392 unicoderange.c:185 +#: fontinfo.c:1142 lookups.c:1393 unicoderange.c:191 msgid "Rejang" msgstr "" # -#: lookups.c:1393 lookupui.c:250 +#: lookups.c:1394 lookupui.c:250 msgid "Rongorongo" msgstr "Rongorongo" -#: lookups.c:1395 unicoderange.c:182 +#: fontinfo.c:1140 lookups.c:1396 unicoderange.c:188 msgid "Saurashtra" msgstr "" # -#: lookups.c:1396 lookupui.c:252 unicoderange.c:241 +#: fontinfo.c:1130 lookups.c:1397 lookupui.c:252 unicoderange.c:249 msgid "Shavian" msgstr "Shavian" # -#: lookups.c:1397 lookupui.c:253 +#: lookups.c:1398 lookupui.c:253 msgid "Script|Sinhala" msgstr "Script|Sinhala" # -#: lookups.c:1398 lookupui.c:254 +#: lookups.c:1399 lookupui.c:254 msgid "Script|Sumero-Akkadian Cuneiform" msgstr "Script|Sumero-Akkadian Cuneiform" -#: lookups.c:1399 +#: lookups.c:1400 msgid "Script|Sundanese" msgstr "" # -#: lookups.c:1400 lookupui.c:255 +#: lookups.c:1401 lookupui.c:255 msgid "Script|Syloti Nagri" msgstr "Script|Syloti Nagri" # -#: lookups.c:1401 lookupui.c:256 +#: lookups.c:1402 lookupui.c:256 msgid "Script|Syriac" msgstr "Script|Syriac" # -#: lookups.c:1402 lookupui.c:257 +#: lookups.c:1403 lookupui.c:257 msgid "Script|Tagalog" msgstr "Script|Tagalog" # -#: lookups.c:1403 lookupui.c:258 +#: lookups.c:1404 lookupui.c:258 msgid "Script|Tagbanwa" msgstr "Script|Tagbanwa" # -#: lookups.c:1404 lookupui.c:259 unicoderange.c:98 +#: fontinfo.c:1119 lookups.c:1405 lookupui.c:259 unicoderange.c:98 msgid "Tai Le" msgstr "傣仂文" # -#: lookups.c:1405 lookupui.c:260 +#: lookups.c:1406 lookupui.c:260 msgid "Tai Lu" msgstr "Tai Lu" # -#: lookups.c:1406 lookupui.c:261 +#: lookups.c:1407 lookupui.c:261 msgid "Script|Tamil" msgstr "Script|Tamil" # -#: lookups.c:1407 lookupui.c:262 +#: lookups.c:1408 lookupui.c:262 msgid "Script|Tamil2" msgstr "Script|Tamil2" # -#: lookups.c:1408 lookupui.c:263 +#: lookups.c:1409 lookupui.c:263 msgid "Script|Telugu" msgstr "Script|Telugu" # -#: lookups.c:1409 lookupui.c:264 +#: lookups.c:1410 lookupui.c:264 msgid "Script|Telugu2" msgstr "Script|Telugu2" # -#: lookups.c:1410 lookupui.c:265 +#: lookups.c:1411 lookupui.c:265 msgid "Tengwar" msgstr "Tengwar" # -#: lookups.c:1412 lookupui.c:267 parsettf.c:4436 +#: lookups.c:1413 lookupui.c:267 parsettf.c:4436 msgid "Script|Thai" msgstr "Script|Thai" # -#: lookups.c:1413 lookupui.c:268 +#: lookups.c:1414 lookupui.c:268 msgid "Script|Tibetan" msgstr "藏文" # -#: lookups.c:1414 lookupui.c:269 +#: lookups.c:1415 lookupui.c:269 msgid "Tifinagh (Berber)" msgstr "Tifinagh (Berber)" # -#: lookups.c:1415 lookupui.c:270 +#: lookups.c:1416 lookupui.c:270 msgid "Script|Ugaritic" msgstr "Script|Ugaritic" # -#: lookups.c:1416 lookupui.c:271 +#: lookups.c:1417 lookupui.c:271 msgid "Script|Vai" msgstr "Script|Vai" # -#: lookups.c:1418 lookupui.c:273 +#: lookups.c:1419 lookupui.c:273 msgid "Cuneiform, Ugaritic" msgstr "Cuneiform, Ugaritic" # -#: lookups.c:1419 lookupui.c:274 +#: lookups.c:1420 lookupui.c:274 msgid "Script|Yi" msgstr "Script|彝文字符" # -#: lookups.c:1464 +#: lookups.c:1465 msgid "Required Feature" msgstr "需要的特征" -#: lookups.c:1871 +#: lookups.c:1872 #, c-format msgid "" "The glyph, %s, contains a %s from %s and one from %s.\n" @@ -18906,16 +18898,16 @@ msgstr "" # -#: lookups.c:1873 +#: lookups.c:1874 msgid "positioning" msgstr "定位" # -#: lookups.c:1873 problems.c:2259 +#: lookups.c:1874 problems.c:2259 msgid "substitution" msgstr "替代" -#: lookups.c:1898 +#: lookups.c:1899 #, c-format msgid "" "The glyph, %s, contains the same %s from %s and from %s.\n" @@ -18923,16 +18915,16 @@ msgstr "" # -#: lookups.c:1900 problems.c:2260 +#: lookups.c:1901 problems.c:2260 msgid "ligature" msgstr "连字" # -#: lookups.c:1900 +#: lookups.c:1901 msgid "kern pair" msgstr "压缩对" -#: lookups.c:1926 +#: lookups.c:1927 #, c-format msgid "" "The glyph, %s, contains the same kern pair from %s and from %s.\n" @@ -18940,22 +18932,22 @@ msgstr "" # -#: lookups.c:4379 +#: lookups.c:4384 msgid "_Horizontal" msgstr "水平(_H)" # -#: lookups.c:4379 metricsview.c:3296 +#: lookups.c:4384 metricsview.c:3325 msgid "_Vertical" msgstr "垂直(_V)" # -#: lookups.c:4380 +#: lookups.c:4385 msgid "Kerning direction" msgstr "压缩方向" # -#: lookups.c:4380 +#: lookups.c:4385 msgid "Is this horizontal or vertical kerning data?" msgstr "此为水平抑或垂直压缩信息？" @@ -21525,7 +21517,7 @@ msgstr "此特征代码已使用" # -#: macencui.c:451 macencui.c:808 prefs.c:1467 +#: macencui.c:451 macencui.c:808 prefs.c:1469 msgid "Setting" msgstr "设定" @@ -21700,7 +21692,7 @@ msgstr "正上" # -#: math.c:170 math.c:171 +#: math.c:170 msgid "Bottom Right" msgstr "右下" @@ -22360,56 +22352,56 @@ msgstr "" # -#: metricsview.c:628 +#: metricsview.c:633 msgid "Name:" msgstr "名称：" # #. GT: Top/Left (side) bearing -#: metricsview.c:644 +#: metricsview.c:649 msgid "TBearing:" msgstr "上边位:" # -#: metricsview.c:644 +#: metricsview.c:649 msgid "LBearing:" msgstr "左边位：" # #. GT: Bottom/Right (side) bearing -#: metricsview.c:649 +#: metricsview.c:654 msgid "BBearing:" msgstr "底边位:" # -#: metricsview.c:649 +#: metricsview.c:654 msgid "RBearing:" msgstr "右边位：" # -#: metricsview.c:653 +#: metricsview.c:658 msgid "VKern:" msgstr "垂直压缩：" # -#: metricsview.c:653 +#: metricsview.c:658 msgid "Kern:" msgstr "压缩：" -#: metricsview.c:1017 +#: metricsview.c:1022 msgid "_Alter Class" msgstr "" -#: metricsview.c:1018 +#: metricsview.c:1023 msgid "_Create Pair" msgstr "" # -#: metricsview.c:1020 +#: metricsview.c:1025 msgid "Use Kerning Class?" msgstr "使用压缩类属？" -#: metricsview.c:1021 +#: metricsview.c:1026 #, c-format msgid "" "This kerning pair (%.20s and %.20s) is currently part of a kerning class " @@ -22418,173 +22410,173 @@ msgstr "" # -#: metricsview.c:1562 metricsview.c:1681 +#: metricsview.c:1591 metricsview.c:1710 msgid "Load Word List..." msgstr "载入词表…" # -#: metricsview.c:1563 metricsview.c:1686 +#: metricsview.c:1592 metricsview.c:1715 msgid "Load Glyph Name List..." msgstr "载入字形名称列表…" -#: metricsview.c:2682 +#: metricsview.c:2711 #, c-format msgid "Kerning Metrics For %.50s" msgstr "" -#: metricsview.c:2683 +#: metricsview.c:2712 #, c-format msgid "Advance Width Metrics For %.50s" msgstr "" # -#: metricsview.c:2684 +#: metricsview.c:2713 #, c-format msgid "Metrics For %.50s" msgstr "%.50s 的尺寸" -#: metricsview.c:2744 +#: metricsview.c:2773 msgid "Point Size" msgstr "" -#: metricsview.c:2749 +#: metricsview.c:2778 msgid "Number out of range" msgstr "" -#: metricsview.c:2816 +#: metricsview.c:2845 msgid "Set Point Size" msgstr "" -#: metricsview.c:2825 +#: metricsview.c:2854 msgid "Point Size:" msgstr "" # -#: metricsview.c:3102 +#: metricsview.c:3131 msgid "_Inline" msgstr "内线(_I)" # -#: metricsview.c:3103 metricsview.c:3303 +#: metricsview.c:3132 metricsview.c:3332 msgid "_Outline" msgstr "轮廓(_O)" # -#: metricsview.c:3104 +#: metricsview.c:3133 msgid "_Shadow" msgstr "阴影(_S)" # -#: metricsview.c:3105 +#: metricsview.c:3134 msgid "_Wireframe" msgstr "线框(_W)" # -#: metricsview.c:3154 +#: metricsview.c:3183 msgid "Effects" msgstr "效果" -#: metricsview.c:3249 +#: metricsview.c:3278 msgid "_Partial" msgstr "" -#: metricsview.c:3250 +#: metricsview.c:3279 msgid "Hide when _Moving" msgstr "" -#: metricsview.c:3251 +#: metricsview.c:3280 msgid "_Hide" msgstr "" # -#: metricsview.c:3280 +#: metricsview.c:3309 msgid "Insert Glyph _After..." msgstr "插入字形于后(_A)" # -#: metricsview.c:3281 +#: metricsview.c:3310 msgid "Insert Glyph _Before..." msgstr "插入字形于前(_B)" # -#: metricsview.c:3282 +#: metricsview.c:3311 msgid "_Replace Glyph..." msgstr "替换字形(_R)" # -#: metricsview.c:3293 +#: metricsview.c:3322 msgid "Show _Grid" msgstr "显示网格(_G)" -#: metricsview.c:3298 +#: metricsview.c:3327 msgid "Size set from _Window" msgstr "" -#: metricsview.c:3299 +#: metricsview.c:3328 msgid "Set Point _Size" msgstr "" -#: metricsview.c:3316 +#: metricsview.c:3345 msgid "_Kerning only" msgstr "" -#: metricsview.c:3317 +#: metricsview.c:3346 msgid "_Advance Width only" msgstr "" -#: metricsview.c:3318 +#: metricsview.c:3347 msgid "_Both" msgstr "" -#: metricsview.c:3344 +#: metricsview.c:3373 msgid "_Window Type" msgstr "" -#: metricsview.c:4783 +#: metricsview.c:4812 msgid "Advance Width Col" msgstr "" -#: metricsview.c:4783 +#: metricsview.c:4812 msgid "Color used to draw the advance width line of a glyph" msgstr "" -#: metricsview.c:4784 +#: metricsview.c:4813 msgid "Italic Advance Col" msgstr "" -#: metricsview.c:4784 +#: metricsview.c:4813 msgid "Color used to draw the italic advance width line of a glyph" msgstr "" -#: metricsview.c:4785 +#: metricsview.c:4814 msgid "Kern Line Color" msgstr "" -#: metricsview.c:4785 +#: metricsview.c:4814 msgid "Color used to draw the kerning line" msgstr "" -#: metricsview.c:4786 +#: metricsview.c:4815 msgid "Side Bearing Color" msgstr "" -#: metricsview.c:4786 +#: metricsview.c:4815 msgid "Color used to draw the left side bearing" msgstr "" -#: metricsview.c:4787 +#: metricsview.c:4816 msgid "Selected Glyph Col" msgstr "" -#: metricsview.c:4787 +#: metricsview.c:4816 msgid "Color used to mark the selected glyph" msgstr "" -#: metricsview.c:4797 +#: metricsview.c:4826 msgid "MetricsView" msgstr "" -#: metricsview.c:4798 +#: metricsview.c:4827 msgid "This window displays metrics information about a font" msgstr "" @@ -23338,11 +23330,11 @@ msgstr "" # -#: noprefs.c:175 prefs.c:276 +#: noprefs.c:175 prefs.c:278 msgid "OtherSubrsFile" msgstr "其他文件" -#: noprefs.c:175 prefs.c:276 +#: noprefs.c:175 prefs.c:278 #, c-format msgid "" "If you wish to replace Adobe's OtherSubrs array (for Type1 fonts)\n" @@ -23357,12 +23349,12 @@ msgstr "" # -#: noprefs.c:176 prefs.c:289 +#: noprefs.c:176 prefs.c:291 msgid "NewCharset" msgstr "新字符集" # -#: noprefs.c:176 prefs.c:289 +#: noprefs.c:176 prefs.c:291 msgid "" "Default encoding for\n" "new fonts" @@ -23371,32 +23363,32 @@ "新字体" # -#: noprefs.c:177 prefs.c:290 +#: noprefs.c:177 prefs.c:292 msgid "NewEmSize" msgstr "新M全身尺寸" # -#: noprefs.c:177 prefs.c:290 +#: noprefs.c:177 prefs.c:292 msgid "The default size of the Em-Square in a newly created font." msgstr "新创字体的M全身尺寸(EM)的默认值。" # -#: noprefs.c:178 prefs.c:291 +#: noprefs.c:178 prefs.c:293 msgid "NewFontsQuadratic" msgstr "新字体Quadratic" -#: noprefs.c:178 prefs.c:291 +#: noprefs.c:178 prefs.c:293 msgid "" "Whether new fonts should contain splines of quadratic (truetype)\n" "or cubic (postscript & opentype)." msgstr "" # -#: noprefs.c:179 prefs.c:277 +#: noprefs.c:179 prefs.c:279 msgid "FreeTypeInFontView" msgstr "字体视图用FreeType" -#: noprefs.c:179 prefs.c:277 +#: noprefs.c:179 prefs.c:279 msgid "" "Use the FreeType rasterizer (when available)\n" "to rasterize glyphs in the font view.\n" @@ -23404,11 +23396,11 @@ msgstr "" # -#: noprefs.c:180 prefs.c:292 +#: noprefs.c:180 prefs.c:294 msgid "LoadedFontsAsNew" msgstr "载入字体作为新文件" -#: noprefs.c:180 prefs.c:292 +#: noprefs.c:180 prefs.c:294 msgid "" "Whether fonts loaded from the disk should retain their splines\n" "with the original order (quadratic or cubic), or whether the\n" @@ -23417,11 +23409,11 @@ msgstr "" # -#: noprefs.c:181 prefs.c:296 +#: noprefs.c:181 prefs.c:298 msgid "PreferCJKEncodings" msgstr "用中日韩编码(CJK)" -#: noprefs.c:181 prefs.c:296 +#: noprefs.c:181 prefs.c:298 msgid "" "When loading a truetype or opentype font which has both a unicode\n" "and a CJK encoding table, use this flag to specify which\n" @@ -23429,22 +23421,22 @@ msgstr "" # -#: noprefs.c:182 prefs.c:297 +#: noprefs.c:182 prefs.c:299 msgid "AskUserForCMap" msgstr "询问CMap" -#: noprefs.c:182 prefs.c:297 +#: noprefs.c:182 prefs.c:299 msgid "" "When loading a font in sfnt format (TrueType, OpenType, etc.),\n" "ask the user to specify which cmap to use initially." msgstr "" # -#: noprefs.c:183 prefs.c:298 +#: noprefs.c:183 prefs.c:300 msgid "PreserveTables" msgstr "预留表" -#: noprefs.c:183 prefs.c:298 +#: noprefs.c:183 prefs.c:300 msgid "" "Enter a list of 4 letter table tags, separated by commas.\n" "FontForge will make a binary copy of these tables when it\n" @@ -23454,34 +23446,34 @@ msgstr "" # -#: noprefs.c:184 prefs.c:309 +#: noprefs.c:184 prefs.c:311 msgid "ItalicConstrained" msgstr "倾斜限制" -#: noprefs.c:184 prefs.c:309 +#: noprefs.c:184 prefs.c:311 msgid "" "In the Outline View, the Shift key constrains motion to be parallel to the " "ItalicAngle rather than constraining it to be vertical." msgstr "" # -#: noprefs.c:185 prefs.c:314 +#: noprefs.c:185 prefs.c:316 msgid "SnapToInt" msgstr "捕捉到整点" -#: noprefs.c:185 prefs.c:314 +#: noprefs.c:185 prefs.c:316 msgid "" "When the user clicks in the editing window, round the location to the " "nearest integers." msgstr "" # -#: noprefs.c:186 prefs.c:315 +#: noprefs.c:186 prefs.c:317 msgid "JoinSnap" msgstr "联合捕捉" # -#: noprefs.c:186 prefs.c:315 +#: noprefs.c:186 prefs.c:317 msgid "" "The Edit->Join command will join points which are this close together\n" "A value of 0 means they must be coincident" @@ -23490,12 +23482,12 @@ "值为0意味着它们是同一点。" # -#: noprefs.c:187 prefs.c:317 +#: noprefs.c:187 prefs.c:319 msgid "CopyMetaData" msgstr "复制元数据" # -#: noprefs.c:187 noprefs.c:192 prefs.c:317 +#: noprefs.c:187 noprefs.c:192 prefs.c:319 msgid "" "When copying glyphs from the font view, also copy the\n" "glyphs' metadata (name, encoding, comment, etc)." @@ -23504,21 +23496,21 @@ "如名称、编码、注释等。" # -#: noprefs.c:188 prefs.c:318 +#: noprefs.c:188 prefs.c:320 msgid "UndoDepth" msgstr "取消步数" # -#: noprefs.c:188 prefs.c:318 +#: noprefs.c:188 prefs.c:320 msgid "The maximum number of Undoes/Redoes stored in a glyph" msgstr "保存在字形中的取消/重来的最多数量" # -#: noprefs.c:189 prefs.c:324 +#: noprefs.c:189 prefs.c:326 msgid "AutoWidthSync" msgstr "自动宽度对正" -#: noprefs.c:189 prefs.c:324 +#: noprefs.c:189 prefs.c:326 msgid "" "Changing the width of a glyph\n" "changes the widths of all accented\n" @@ -23526,11 +23518,11 @@ msgstr "" # -#: noprefs.c:190 prefs.c:325 +#: noprefs.c:190 prefs.c:327 msgid "AutoLBearingSync" msgstr "自动左边位对正" -#: noprefs.c:190 prefs.c:325 +#: noprefs.c:190 prefs.c:327 msgid "" "Changing the left side bearing\n" "of a glyph adjusts the lbearing\n" @@ -23539,11 +23531,11 @@ msgstr "" # -#: noprefs.c:191 prefs.c:329 +#: noprefs.c:191 prefs.c:331 msgid "ClearInstrsBigChanges" msgstr "清除大变化指令" -#: noprefs.c:191 prefs.c:329 +#: noprefs.c:191 prefs.c:331 msgid "" "Instructions in a TrueType font refer to\n" "points by number, so if you edit a glyph\n" @@ -23558,27 +23550,27 @@ msgstr "" # -#: noprefs.c:192 prefs.c:330 +#: noprefs.c:192 prefs.c:332 msgid "CopyTTFInstrs" msgstr "复制TTF指令" # -#: noprefs.c:193 prefs.c:334 +#: noprefs.c:193 prefs.c:336 msgid "AccentOffsetPercent" msgstr "重音符偏移比例" -#: noprefs.c:193 prefs.c:334 +#: noprefs.c:193 prefs.c:336 msgid "" "The percentage of an em by which an accent is offset from its base glyph in " "Build Accent" msgstr "" # -#: noprefs.c:194 prefs.c:335 +#: noprefs.c:194 prefs.c:337 msgid "AccentCenterLowest" msgstr "重音符中心最低" -#: noprefs.c:194 prefs.c:335 prefs.c:481 +#: noprefs.c:194 prefs.c:337 prefs.c:483 msgid "" "When placing grave and acute accents above letters, should\n" "FontForge center them based on their full width, or\n" @@ -23587,11 +23579,11 @@ msgstr "" # -#: noprefs.c:195 prefs.c:336 +#: noprefs.c:195 prefs.c:338 msgid "CharCenterHighest" msgstr "字符中心最高" -#: noprefs.c:195 prefs.c:336 +#: noprefs.c:195 prefs.c:338 msgid "" "When centering an accent over a glyph, should the accent\n" "be centered on the highest point(s) of the glyph,\n" @@ -23599,11 +23591,11 @@ msgstr "" # -#: noprefs.c:196 prefs.c:337 +#: noprefs.c:196 prefs.c:339 msgid "PreferSpacingAccents" msgstr "重音符间距" -#: noprefs.c:196 prefs.c:337 +#: noprefs.c:196 prefs.c:339 msgid "" "Use spacing accents (Unicode: 02C0-02FF) rather than\n" "combining accents (Unicode: 0300-036F) when\n" @@ -23611,11 +23603,11 @@ msgstr "" # -#: noprefs.c:197 prefs.c:341 +#: noprefs.c:197 prefs.c:343 msgid "PreferPotrace" msgstr "采用Potrace" -#: noprefs.c:197 prefs.c:341 +#: noprefs.c:197 prefs.c:343 msgid "" "FontForge supports two different helper applications to do autotracing\n" " autotrace and potrace\n" @@ -23624,53 +23616,53 @@ msgstr "" # -#: noprefs.c:198 prefs.c:342 +#: noprefs.c:198 prefs.c:344 msgid "AutotraceArgs" msgstr "Autotrace参数" -#: noprefs.c:198 prefs.c:342 +#: noprefs.c:198 prefs.c:344 msgid "" "Extra arguments for configuring the autotrace program\n" "(either autotrace or potrace)" msgstr "" # -#: noprefs.c:199 prefs.c:343 +#: noprefs.c:199 prefs.c:345 msgid "AutotraceAsk" msgstr "询问Autotrace" # -#: noprefs.c:199 prefs.c:343 +#: noprefs.c:199 prefs.c:345 msgid "Ask the user for autotrace arguments each time autotrace is invoked" msgstr "每次autotrace启动时向用户询问参数" # -#: noprefs.c:200 prefs.c:344 +#: noprefs.c:200 prefs.c:346 msgid "MfArgs" msgstr "MF参数" # -#: noprefs.c:200 prefs.c:344 +#: noprefs.c:200 prefs.c:346 msgid "" "Commands to pass to mf (metafont) program, the filename will follow these" msgstr "传给 mf (metafont) 程序的参数, 文件名应遵循这些" # -#: noprefs.c:201 prefs.c:345 +#: noprefs.c:201 prefs.c:347 msgid "MfAsk" msgstr "询问MF" # -#: noprefs.c:201 prefs.c:345 +#: noprefs.c:201 prefs.c:347 msgid "Ask the user for mf commands each time mf is invoked" msgstr "每次启用mf时向用户询问其参数" # -#: noprefs.c:202 prefs.c:346 +#: noprefs.c:202 prefs.c:348 msgid "MfClearBg" msgstr "MF清除背景" -#: noprefs.c:202 prefs.c:346 +#: noprefs.c:202 prefs.c:348 msgid "" "FontForge loads large images into the background of each glyph\n" "prior to autotracing them. You may retain those\n" @@ -23679,12 +23671,12 @@ msgstr "" # -#: noprefs.c:203 prefs.c:347 +#: noprefs.c:203 prefs.c:349 msgid "MfShowErr" msgstr "MF提示错误" # -#: noprefs.c:203 prefs.c:347 +#: noprefs.c:203 prefs.c:349 msgid "" "MetaFont (mf) generates lots of verbiage to stdout.\n" "Most of the time I find it an annoyance but it is\n" @@ -23695,12 +23687,12 @@ "尤其是出错的时候。" # -#: noprefs.c:204 prefs.c:351 +#: noprefs.c:204 prefs.c:353 msgid "FoundryName" msgstr "制作工具" # -#: noprefs.c:204 prefs.c:351 +#: noprefs.c:204 prefs.c:353 msgid "" "Name used for foundry field in bdf\n" "font generation" @@ -23709,12 +23701,12 @@ "的名称" # -#: noprefs.c:205 prefs.c:352 +#: noprefs.c:205 prefs.c:354 msgid "TTFFoundry" msgstr "TTF作者" # -#: noprefs.c:205 prefs.c:352 +#: noprefs.c:205 prefs.c:354 msgid "" "Name used for Vendor ID field in\n" "ttf (OS/2 table) font generation.\n" @@ -23725,22 +23717,22 @@ "不应超过 4 个字符。" # -#: noprefs.c:206 prefs.c:353 +#: noprefs.c:206 prefs.c:355 msgid "NewFontNameList" msgstr "新的字体名称列表" -#: noprefs.c:206 prefs.c:353 +#: noprefs.c:206 prefs.c:355 msgid "" "FontForge will use this namelist when assigning\n" "glyph names to code points in a new font." msgstr "" # -#: noprefs.c:207 prefs.c:354 +#: noprefs.c:207 prefs.c:356 msgid "RecognizePUANames" msgstr "识别PUA名称" -#: noprefs.c:207 prefs.c:354 +#: noprefs.c:207 prefs.c:356 msgid "" "Once upon a time, Adobe assigned PUA (public use area) encodings\n" "for many stylistic variants of characters (small caps, old style\n" @@ -23759,11 +23751,11 @@ msgstr "" # -#: noprefs.c:208 prefs.c:355 +#: noprefs.c:208 prefs.c:357 msgid "UnicodeGlyphNames" msgstr "统一码字形名称" -#: noprefs.c:208 prefs.c:355 +#: noprefs.c:208 prefs.c:357 msgid "" "Allow the full unicode character set in glyph names.\n" "This does not conform to adobe's glyph name standard.\n" @@ -23776,7 +23768,7 @@ msgid "XUID-Base" msgstr "XUID-Base" -#: noprefs.c:209 prefs.c:474 +#: noprefs.c:209 prefs.c:476 msgid "" "If specified this should be a space separated list of integers each\n" "less than 16777216 which uniquely identify your organization\n" @@ -23784,11 +23776,11 @@ msgstr "" # -#: noprefs.c:210 noprefs.c:249 prefs.c:360 +#: noprefs.c:210 noprefs.c:249 prefs.c:362 msgid "AskBDFResolution" msgstr "询问BDF分辨率" -#: noprefs.c:210 noprefs.c:249 prefs.c:360 +#: noprefs.c:210 noprefs.c:249 prefs.c:362 msgid "" "When generating a set of BDF fonts ask the user\n" "to specify the screen resolution of the fonts\n" @@ -23796,65 +23788,65 @@ msgstr "" # -#: noprefs.c:211 prefs.c:361 +#: noprefs.c:211 prefs.c:363 msgid "AutoHint" msgstr "自动消隐" # -#: noprefs.c:211 prefs.c:361 +#: noprefs.c:211 prefs.c:363 msgid "AutoHint changed glyphs before generating a font" msgstr "生成字体之前自动消隐改变字形" # -#: noprefs.c:212 prefs.c:367 +#: noprefs.c:212 prefs.c:369 msgid "HintBoundingBoxes" msgstr "消隐外框" -#: noprefs.c:212 prefs.c:367 +#: noprefs.c:212 prefs.c:369 msgid "" "FontForge will place vertical or horizontal hints to describe the bounding " "boxes of suitable glyphs." msgstr "" # -#: noprefs.c:213 prefs.c:368 +#: noprefs.c:213 prefs.c:370 msgid "HintDiagonalEnds" msgstr "消隐对角端部" -#: noprefs.c:213 prefs.c:368 +#: noprefs.c:213 prefs.c:370 msgid "" "FontForge will place vertical or horizontal hints at the ends of diagonal " "stems." msgstr "" # -#: noprefs.c:214 prefs.c:369 +#: noprefs.c:214 prefs.c:371 msgid "HintDiagonalInter" msgstr "消隐对角内部" -#: noprefs.c:214 prefs.c:369 +#: noprefs.c:214 prefs.c:371 msgid "" "FontForge will place vertical or horizontal hints at the intersections of " "diagonal stems." msgstr "" # -#: noprefs.c:215 prefs.c:370 +#: noprefs.c:215 prefs.c:372 msgid "DetectDiagonalStems" msgstr "侦测对角项" -#: noprefs.c:215 prefs.c:370 +#: noprefs.c:215 prefs.c:372 msgid "" "FontForge will generate diagonal stem hints, which then can be used by the " "AutoInstr command." msgstr "" # -#: noprefs.c:216 prefs.c:382 +#: noprefs.c:216 prefs.c:384 msgid "UseNewIndicScripts" msgstr "使用新印地语文字" -#: noprefs.c:216 prefs.c:382 +#: noprefs.c:216 prefs.c:384 msgid "" "MS has changed (in August 2006) the inner workings of their Indic shaping\n" "engine, and to disambiguate this change has created a parallel set of " @@ -23871,11 +23863,11 @@ #. GT: this is because these strings are used in two different ways, one #. GT: translated (which the user sees, and should probably have added spaces, #. GT: and one untranslated which needs the current odd format -#: noprefs.c:239 prefs.c:265 +#: noprefs.c:239 prefs.c:267 msgid "ResourceFile" msgstr "资源文件" -#: noprefs.c:239 prefs.c:265 +#: noprefs.c:239 prefs.c:267 msgid "" "When FontForge starts up, it loads display related resources from a\n" "property on the screen. Sometimes it is useful to be able to store\n" @@ -23885,11 +23877,11 @@ msgstr "" # -#: noprefs.c:240 prefs.c:275 +#: noprefs.c:240 prefs.c:277 msgid "HelpDir" msgstr "帮助目录" -#: noprefs.c:240 prefs.c:275 +#: noprefs.c:240 prefs.c:277 msgid "" "The directory on your local system in which FontForge will search for help\n" "files. If a file is not found there, then FontForge will look for it on the " @@ -23897,22 +23889,22 @@ msgstr "" # -#: noprefs.c:241 prefs.c:278 +#: noprefs.c:241 prefs.c:280 msgid "SplashScreen" msgstr "欢迎窗口" # -#: noprefs.c:241 prefs.c:278 +#: noprefs.c:241 prefs.c:280 msgid "Show splash screen on start-up" msgstr "启动时显示欢迎窗口" # -#: noprefs.c:242 prefs.c:304 +#: noprefs.c:242 prefs.c:306 msgid "GlyphAutoGoto" msgstr "字形自动跳转" # -#: noprefs.c:242 prefs.c:304 +#: noprefs.c:242 prefs.c:306 msgid "" "Typing a normal character in the glyph view window changes the window to " "look at that character" @@ -23921,11 +23913,11 @@ "跳转到该字符" # -#: noprefs.c:243 prefs.c:305 +#: noprefs.c:243 prefs.c:307 msgid "OpenCharsInNewWindow" msgstr "于新窗口显示字符" -#: noprefs.c:243 prefs.c:305 +#: noprefs.c:243 prefs.c:307 msgid "" "When double clicking on a character in the font view\n" "open that character in a new window, otherwise\n" @@ -23933,33 +23925,33 @@ msgstr "" # -#: noprefs.c:244 prefs.c:310 +#: noprefs.c:244 prefs.c:312 msgid "ArrowMoveSize" msgstr "方向键移动尺寸" # -#: noprefs.c:244 prefs.c:310 +#: noprefs.c:244 prefs.c:312 msgid "" "The number of em-units by which an arrow key will move a selected point" msgstr "方向键按此尺寸移动选定点" -#: noprefs.c:245 prefs.c:311 +#: noprefs.c:245 prefs.c:313 msgid "ArrowAccelFactor" msgstr "方向键加速系数" -#: noprefs.c:245 prefs.c:311 +#: noprefs.c:245 prefs.c:313 msgid "" "Holding down the Alt (or Meta) key will speed up arrow key motion by this " "factor" msgstr "" # -#: noprefs.c:246 prefs.c:313 +#: noprefs.c:246 prefs.c:315 msgid "SnapDistance" msgstr "捕捉间距" # -#: noprefs.c:246 prefs.c:313 +#: noprefs.c:246 prefs.c:315 msgid "" "When the mouse pointer is within this many pixels\n" "of one of the various interesting features (baseline,\n" @@ -23972,11 +23964,11 @@ "基线、宽度、网格样条线等。" # -#: noprefs.c:247 prefs.c:316 +#: noprefs.c:247 prefs.c:318 msgid "StopAtJoin" msgstr "联合处停止" -#: noprefs.c:247 prefs.c:316 +#: noprefs.c:247 prefs.c:318 msgid "" "When dragging points in the outline view a join may occur\n" "(two open contours may connect at their endpoints). When\n" @@ -23986,17 +23978,17 @@ msgstr "" # -#: noprefs.c:248 prefs.c:319 +#: noprefs.c:248 prefs.c:321 msgid "UpdateFlex" msgstr "更新Flex" # -#: noprefs.c:248 prefs.c:319 +#: noprefs.c:248 prefs.c:321 msgid "Figure out flex hints after every change" msgstr "每次修改后指出flex消隐" # -#: noprefs.c:263 prefs.c:408 +#: noprefs.c:263 prefs.c:410 msgid "Display rulers in the Outline Glyph View" msgstr "轮廓字形视图中显示标尺" @@ -24201,7 +24193,7 @@ msgstr "PostScript" # -#: openfontdlg.c:126 openfontdlg.c:128 openfontdlg.c:130 prefs.c:505 +#: openfontdlg.c:126 openfontdlg.c:128 openfontdlg.c:130 prefs.c:507 #: savefontdlg.c:720 msgid "OpenType" msgstr "OpenType" @@ -24401,12 +24393,12 @@ #. GT: NaN is a concept in IEEE floating point which means "Not a Number" #. GT: it is used to represent errors like 0/0 or sqrt(-1). -#: parsepdf.c:1175 psread.c:563 +#: parsepdf.c:1175 psread.c:539 #, c-format msgid "Bad number, infinity or nan: %s\n" msgstr "" -#: parsepdf.c:1314 psread.c:2669 +#: parsepdf.c:1314 psread.c:2650 msgid "No mark in ] (close array)\n" msgstr "" @@ -24969,7 +24961,7 @@ msgid "Nifty, you've got one of the old Apple/Adobe type1 sfnts here\n" msgstr "" -#: parsettf.c:1082 tottf.c:4102 +#: parsettf.c:1082 tottf.c:4192 #, c-format msgid "" "Windows has decided that fonts with 'name' tables bigger than 5K are\n" @@ -25266,7 +25258,7 @@ msgstr "不能理解的格式fdselect %d\n" # -#: parsettf.c:3889 parsettf.c:6408 +#: parsettf.c:3889 parsettf.c:6413 msgid "CFF version mismatch\n" msgstr "CFF 版本不匹配\n" @@ -25533,16 +25525,16 @@ msgstr "" # -#: parsettf.c:5670 searchview.c:518 sfd.c:7579 +#: parsettf.c:5675 searchview.c:518 sfd.c:7641 msgid "Yes" msgstr "确定" # -#: parsettf.c:5671 +#: parsettf.c:5676 msgid "No" msgstr "否" -#: parsettf.c:5688 +#: parsettf.c:5693 #, c-format msgid "" "The glyph named %.30s is not mapped to any unicode code point.\n" @@ -25551,7 +25543,7 @@ "名为%.30s 的字形未被映射到任何统一码。\n" "但它的名称表明它映射到 U+%04X.\n" -#: parsettf.c:5696 +#: parsettf.c:5701 #, c-format msgid "" "The glyph named %.30s is mapped to U+%04X.\n" @@ -25561,11 +25553,11 @@ "但它的名称表明它应映射到 U+%04X.\n" # -#: parsettf.c:5707 parsettf.c:5710 +#: parsettf.c:5712 parsettf.c:5715 msgid "Bad glyph name" msgstr "不良字形名称" -#: parsettf.c:5707 +#: parsettf.c:5712 #, c-format msgid "" "The glyph named %.30s is not mapped to any unicode code point. But its name " @@ -25575,7 +25567,7 @@ "名为%.30s 的字形未被映射到任何统一码。但它的名称表明它映射到 U+%04X.\n" "你想忽略这个而保留它的名称么?" -#: parsettf.c:5710 +#: parsettf.c:5715 #, c-format msgid "" "The glyph named %.30s is mapped to U+%04X.\n" @@ -25586,12 +25578,12 @@ "但它的名称表明它应映射到 U+%04X.\n" "你想忽略这个而保留它的名称么?" -#: parsettf.c:6307 +#: parsettf.c:6312 #, c-format msgid "A point in %s is outside the font bounding box data.\n" msgstr "" -#: parsettf.c:6311 +#: parsettf.c:6316 #, c-format msgid "" "The advance width of %s (%d) does not match the font's advanceWidthMax (%d) " @@ -25660,161 +25652,161 @@ msgid "Unknown class table format: %d\n" msgstr "未知类属表格式: %d\n" -#: parsettfatt.c:357 +#: parsettfatt.c:358 #, c-format msgid "" "Nonsensical class assigned to a glyph-- class=%d is too big. Glyph=%d\n" msgstr "" # -#: parsettfatt.c:404 +#: parsettfatt.c:405 msgid "Bad device table\n" msgstr "不良设备表\n" -#: parsettfatt.c:476 +#: parsettfatt.c:477 #, c-format msgid "Bad pair position: glyphs %d & %d should have been < %d\n" msgstr "" -#: parsettfatt.c:515 +#: parsettfatt.c:516 #, c-format msgid "Bad kern pair: glyphs %d & %d should have been < %d\n" msgstr "" # -#: parsettfatt.c:733 +#: parsettfatt.c:748 #, c-format msgid "Cursive-%d" msgstr "草写-%d" # -#: parsettfatt.c:789 +#: parsettfatt.c:804 msgid "Bad mark table.\n" msgstr "不当标记表。\n" -#: parsettfatt.c:800 +#: parsettfatt.c:815 msgid "Class out of bounds in GPOS mark sub-table\n" msgstr "" -#: parsettfatt.c:802 +#: parsettfatt.c:817 #, c-format msgid "Class out of bounds in GPOS mark sub-table for mark %.30s\n" msgstr "" # -#: parsettfatt.c:829 +#: parsettfatt.c:844 msgid "Bad base table.\n" msgstr "不当基础表。\n" # -#: parsettfatt.c:860 +#: parsettfatt.c:875 msgid "Bad ligature base table.\n" msgstr "不良缩合基础表。\n" # -#: parsettfatt.c:874 +#: parsettfatt.c:889 msgid "Bad ligature anchor count.\n" msgstr "不良连写锚点计数.\n" -#: parsettfatt.c:994 +#: parsettfatt.c:1011 #, c-format msgid "" "Attempt to reference lookup %d (within a contextual lookup), but there are\n" " only %d lookups in %s\n" msgstr "" -#: parsettfatt.c:1049 parsettfatt.c:1190 +#: parsettfatt.c:1071 parsettfatt.c:1213 #, c-format msgid "Bad contextual or chaining sub table. Glyph %d out of range [0,%d)\n" msgstr "" -#: parsettfatt.c:1062 parsettfatt.c:1210 parsettfatt.c:1329 parsettfatt.c:1477 +#: parsettfatt.c:1084 parsettfatt.c:1233 parsettfatt.c:1352 parsettfatt.c:1506 #, c-format msgid "" "Attempt to apply a lookup to a location out of the range of this contextual\n" " lookup seq=%d max=%d\n" msgstr "" -#: parsettfatt.c:1154 parsettfatt.c:1165 parsettfatt.c:1177 parsettfatt.c:1201 +#: parsettfatt.c:1177 parsettfatt.c:1188 parsettfatt.c:1200 parsettfatt.c:1224 msgid "Unexpected end of file in contextual chaining subtable.\n" msgstr "" -#: parsettfatt.c:1296 parsettfatt.c:1424 +#: parsettfatt.c:1319 parsettfatt.c:1453 msgid "Bad count in context chaining sub-table.\n" msgstr "" -#: parsettfatt.c:1309 parsettfatt.c:1436 parsettfatt.c:1446 parsettfatt.c:1457 +#: parsettfatt.c:1332 parsettfatt.c:1465 parsettfatt.c:1475 parsettfatt.c:1486 msgid "Bad class count in contextual chaining sub-table.\n" msgstr "" -#: parsettfatt.c:1319 parsettfatt.c:1467 +#: parsettfatt.c:1342 parsettfatt.c:1496 msgid "Bad count in contextual chaining sub-table.\n" msgstr "" -#: parsettfatt.c:1571 +#: parsettfatt.c:1608 msgid "End of file in context chaining sub-table.\n" msgstr "" -#: parsettfatt.c:1582 parsettfatt.c:1668 +#: parsettfatt.c:1619 parsettfatt.c:1705 #, c-format msgid "" "Attempt to apply a lookup to a location out of the range of this contextual\n" " lookup seq=%d, max=%d\n" msgstr "" -#: parsettfatt.c:1633 parsettfatt.c:1642 parsettfatt.c:1651 parsettfatt.c:1660 +#: parsettfatt.c:1670 parsettfatt.c:1679 parsettfatt.c:1688 parsettfatt.c:1697 msgid "End of file in context chaining subtable.\n" msgstr "" -#: parsettfatt.c:1835 +#: parsettfatt.c:1873 #, c-format msgid "Bad substitution glyph: GID %d not less than %d\n" msgstr "" -#: parsettfatt.c:1876 parsettfatt.c:1904 parsettfatt.c:1916 +#: parsettfatt.c:1914 parsettfatt.c:1943 parsettfatt.c:1955 msgid "Unexpected end of file in GSUB sub-table.\n" msgstr "" -#: parsettfatt.c:1890 +#: parsettfatt.c:1929 msgid "" "Coverage table specifies a different number of glyphs than the sub-table " "expects.\n" msgstr "" -#: parsettfatt.c:1922 +#: parsettfatt.c:1961 #, c-format msgid "Bad Multiple/Alternate substitution glyph. GID %d not less than %d\n" msgstr "" -#: parsettfatt.c:1974 parsettfatt.c:1988 parsettfatt.c:1996 +#: parsettfatt.c:2013 parsettfatt.c:2029 parsettfatt.c:2037 msgid "Unexpected end of file in GSUB ligature sub-table.\n" msgstr "" -#: parsettfatt.c:2004 +#: parsettfatt.c:2045 #, c-format msgid "Bad ligature glyph. GID %d not less than %d\n" msgstr "" -#: parsettfatt.c:2011 +#: parsettfatt.c:2052 #, c-format msgid "" "Unlikely count of ligature components (%d), I suspect this ligature sub-\n" " table is garbage, I'm giving up on it.\n" msgstr "" -#: parsettfatt.c:2022 +#: parsettfatt.c:2063 #, c-format msgid "" "Bad ligature component glyph. GID %d not less than %d (in ligature %d)\n" msgstr "" -#: parsettfatt.c:2163 +#: parsettfatt.c:2204 #, c-format msgid "" "Bad reverse contextual chaining substitution glyph: %d is not less than %d\n" msgstr "" -#: parsettfatt.c:2230 +#: parsettfatt.c:2271 #, c-format msgid "" "This font, %s, has multiple GPOS 'size' features. I'm not sure how to " @@ -25822,188 +25814,188 @@ msgstr "" # -#: parsettfatt.c:2231 +#: parsettfatt.c:2272 msgid "" msgstr "<未命名>" -#: parsettfatt.c:2251 +#: parsettfatt.c:2292 msgid "" "This font contains a 'size' feature with a design size and design range but " "no stylename. That is technically an error, but we'll let it pass" msgstr "" -#: parsettfatt.c:2275 +#: parsettfatt.c:2316 msgid "" "The 'size' feature does not seem to follow the standard,\n" "nor does it conform to Adobe's early misinterpretation of\n" "the standard. I cannot parse it.\n" msgstr "" -#: parsettfatt.c:2280 +#: parsettfatt.c:2321 msgid "" "The 'size' feature of this font conforms to Adobe's early misinterpretation " "of the otf standard.\n" msgstr "" -#: parsettfatt.c:2305 +#: parsettfatt.c:2346 #, c-format msgid "" "The name parameter of the '%c%c%c%c' feature does not contain a valid name " "id.\n" msgstr "" -#: parsettfatt.c:2308 +#: parsettfatt.c:2349 #, c-format msgid "" "The name parameter of the '%c%c%c%c' feature has an unlikely version number " "%d.\n" msgstr "" -#: parsettfatt.c:2317 +#: parsettfatt.c:2358 #, c-format msgid "" "There are multiple name ids naming the '%c%c%c%c' feature\n" " this is technically legitimate, but fontforge can't handle it.\n" msgstr "" -#: parsettfatt.c:2336 parsettfatt.c:2374 +#: parsettfatt.c:2377 parsettfatt.c:2415 #, c-format msgid "Attempt to read script data beyond end of %s table" msgstr "" # -#: parsettfatt.c:2345 +#: parsettfatt.c:2386 #, c-format msgid "Too many scripts %d\n" msgstr "过多文字 %d\n" -#: parsettfatt.c:2383 +#: parsettfatt.c:2424 #, c-format msgid "End of file when reading scripts in %s table" msgstr "" -#: parsettfatt.c:2394 +#: parsettfatt.c:2435 #, c-format msgid "End of file in %s table" msgstr "" -#: parsettfatt.c:2411 parsettfatt.c:2433 +#: parsettfatt.c:2452 parsettfatt.c:2474 #, c-format msgid "Attempt to read feature data beyond end of %s table" msgstr "" # -#: parsettfatt.c:2420 +#: parsettfatt.c:2461 #, c-format msgid "Too many features %d\n" msgstr "过多特征 %d\n" -#: parsettfatt.c:2449 +#: parsettfatt.c:2490 #, c-format msgid "End of file when reading features in %s table" msgstr "" -#: parsettfatt.c:2468 parsettfatt.c:2490 +#: parsettfatt.c:2509 parsettfatt.c:2531 #, c-format msgid "Attempt to read lookup data beyond end of %s table" msgstr "" # -#: parsettfatt.c:2480 +#: parsettfatt.c:2521 #, c-format msgid "Too many lookups %d\n" msgstr "过多查找 %d\n" -#: parsettfatt.c:2516 +#: parsettfatt.c:2557 #, c-format msgid "End of file when reading lookups in %s table" msgstr "" -#: parsettfatt.c:2560 +#: parsettfatt.c:2601 msgid "Lookup out of bounds in feature table.\n" msgstr "" -#: parsettfatt.c:2593 +#: parsettfatt.c:2634 msgid "Required feature out of bounds in script table.\n" msgstr "" -#: parsettfatt.c:2600 +#: parsettfatt.c:2641 msgid "Feature out of bounds in script table.\n" msgstr "" -#: parsettfatt.c:2660 +#: parsettfatt.c:2701 msgid "" "This font is erroneous: it has a GPOS extension subtable that points to\n" "another extension sub-table.\n" msgstr "" -#: parsettfatt.c:2665 parsettfatt.c:2751 +#: parsettfatt.c:2706 parsettfatt.c:2792 #, c-format msgid "Unknown GPOS sub-table type: %d\n" msgstr "" -#: parsettfatt.c:2670 parsettfatt.c:2756 +#: parsettfatt.c:2711 parsettfatt.c:2797 msgid "Subtable extends beyond end of GPOS table\n" msgstr "" -#: parsettfatt.c:2705 +#: parsettfatt.c:2746 msgid "" "This font is erroneous: it has a GSUB extension subtable that points to\n" "another extension sub-table.\n" msgstr "" -#: parsettfatt.c:2713 parsettfatt.c:2789 +#: parsettfatt.c:2754 parsettfatt.c:2830 #, c-format msgid "Unknown GSUB sub-table type: %d\n" msgstr "" -#: parsettfatt.c:2718 parsettfatt.c:2794 +#: parsettfatt.c:2759 parsettfatt.c:2835 msgid "Subtable extends beyond end of GSUB table\n" msgstr "" # -#: parsettfatt.c:2937 +#: parsettfatt.c:2978 #, c-format msgid "MarkClass-%d" msgstr "标记类属-%d" -#: parsettfatt.c:2949 +#: parsettfatt.c:2990 #, c-format msgid "MarkSet-%d" msgstr "" # -#: parsettfatt.c:3018 +#: parsettfatt.c:3059 #, c-format msgid "!!!! Unknown caret format %d !!!!\n" msgstr "!!!! 未知游标格式 %d !!!!\n" -#: parsettfatt.c:3056 +#: parsettfatt.c:3097 #, c-format msgid "" "Bad lookup table: format=2 (%d/%d), first=%d last=%d total glyphs in " "font=%d\n" msgstr "" -#: parsettfatt.c:3080 +#: parsettfatt.c:3121 #, c-format msgid "" "Bad lookup table: format=4 (%d/%d), first=%d last=%d total glyphs in " "font=%d\n" msgstr "" -#: parsettfatt.c:3104 +#: parsettfatt.c:3145 #, c-format msgid "Bad lookup table: format=6, first=%d total glyphs in font=%d\n" msgstr "" -#: parsettfatt.c:3119 +#: parsettfatt.c:3160 #, c-format msgid "Bad lookup table: format=8, first=%d cnt=%d total glyphs in font=%d\n" msgstr "" # -#: parsettfatt.c:3131 +#: parsettfatt.c:3172 #, c-format msgid "Invalid lookup table format. %d\n" msgstr "无效查找表格式。 %d\n" @@ -26013,60 +26005,60 @@ #. GT: a statemachine. The %s is the name of the statemachine('s lookup) #. GT: and the %d is n, where this lookup is the n'th defined for this state #. GT: machine -#: parsettfatt.c:3207 +#: parsettfatt.c:3248 #, c-format msgid "%s nested-substitutions %d" msgstr "%s 嵌套替代 %d" # -#: parsettfatt.c:3211 +#: parsettfatt.c:3252 msgid "subtable" msgstr "替代表" -#: parsettfatt.c:3230 +#: parsettfatt.c:3271 #, c-format msgid "Glyph out of bounds in 'prop' table %d\n" msgstr "" -#: parsettfatt.c:3304 +#: parsettfatt.c:3345 #, c-format msgid "Glyph out of bounds in 'lcar' table %d\n" msgstr "" # -#: parsettfatt.c:3359 +#: parsettfatt.c:3400 #, c-format msgid "Glyph out of bounds in 'opbd' table %d\n" msgstr "'opbd' 表 %d 中字形超出边界\n" -#: parsettfatt.c:3487 +#: parsettfatt.c:3528 #, c-format msgid "Glyph out of bounds in 'mort'/'morx' table %d\n" msgstr "" -#: parsettfatt.c:3499 +#: parsettfatt.c:3540 #, c-format msgid "Substitute glyph out of bounds in 'mort'/'morx' table %d\n" msgstr "" # -#: parsettfatt.c:3567 parsettfatt.c:3577 +#: parsettfatt.c:3608 parsettfatt.c:3618 msgid "Bad font, offset out of bounds.\n" msgstr "不良字体: 偏移超出范围。\n" # -#: parsettfatt.c:3621 parsettfatt.c:3748 +#: parsettfatt.c:3662 parsettfatt.c:3789 msgid "Invalid ligature offset\n" msgstr "无效的缩合偏移量\n" -#: parsettfatt.c:3629 +#: parsettfatt.c:3670 #, c-format msgid "Attempt to make a ligature for glyph %d out of " msgstr "" #. GT: This is a reference to "Much Ado About Nothing". The string should read #. GT: "A ligature sub-table in Apple's 'mort'/'morx' table is too\ncomplex for me to understand. I shall give up on it.\nYour ligatures may not be complete." -#: parsettfatt.c:3700 parsettfatt.c:3822 +#: parsettfatt.c:3741 parsettfatt.c:3863 msgid "" "In an attempt to process the ligatures of this font, I've concluded\n" "that the state machine in Apple's mort/morx table is\n" @@ -26074,125 +26066,125 @@ "I shall give up on it. Your ligatures may be incomplete.\n" msgstr "" -#: parsettfatt.c:3756 +#: parsettfatt.c:3797 #, c-format msgid "Attempt to make a ligature for (non-existent) glyph %d out of " msgstr "" -#: parsettfatt.c:3866 +#: parsettfatt.c:3907 msgid "Bad mort ligature table. Not long enough\n" msgstr "" # -#: parsettfatt.c:3979 parsettfatt.c:3998 +#: parsettfatt.c:4020 parsettfatt.c:4039 msgid "Bad class in state machine.\n" msgstr "状态机中不良类属。\n" -#: parsettfatt.c:3989 +#: parsettfatt.c:4030 msgid "Bad glyph count in mort table.\n" msgstr "" -#: parsettfatt.c:4035 +#: parsettfatt.c:4076 msgid "" "It looks to me as though there's a morx sub-table with more than 1000\n" " transitions. Which makes me think there's probably an error\n" msgstr "" -#: parsettfatt.c:4054 +#: parsettfatt.c:4095 msgid "" "It looks to me as though there's a morx sub-table with more than 1000\n" " states. Which makes me think there's probably an error\n" msgstr "" -#: parsettfatt.c:4712 parsettfatt.c:4721 +#: parsettfatt.c:4753 parsettfatt.c:4762 msgid "Unexpected end of file found in morx chain.\n" msgstr "" -#: parsettfatt.c:4779 +#: parsettfatt.c:4820 #, c-format msgid "Invalid or unsupported version (0x%x) for 'kern' table" msgstr "" -#: parsettfatt.c:4785 +#: parsettfatt.c:4826 #, c-format msgid "Warning: Unlikely number of subtables (%d) for 'kern' table" msgstr "" -#: parsettfatt.c:4830 +#: parsettfatt.c:4871 msgid "" "In the 'kern' table, a subtable's length does not match the number of " "kerning pairs." msgstr "" -#: parsettfatt.c:4858 +#: parsettfatt.c:4899 #, c-format msgid "Bad kern pair: glyphs %d & %d must be less than %d\n" msgstr "" -#: parsettfatt.c:4926 +#: parsettfatt.c:4967 #, c-format msgid "Kerning subtable 3 says the glyph count is %d, but maxp says %d\n" msgstr "" -#: parsettfatt.c:4961 +#: parsettfatt.c:5002 #, c-format msgid "Invalid or unsupported format (%d) for subtable of 'kern' table" msgstr "" # -#: parsettfatt.c:4983 parsettfatt.c:5007 parsettfatt.c:5028 +#: parsettfatt.c:5024 parsettfatt.c:5048 parsettfatt.c:5069 msgid "End of file in feat table.\n" msgstr "feat table文件末尾。\n" -#: parsettfatt.c:5331 +#: parsettfatt.c:5372 msgid "Bad glyph variant subtable of MATH table.\n" msgstr "" -#: parsettfatt.c:5760 parsettfatt.c:5768 parsettfatt.c:5810 parsettfatt.c:5819 -#: parsettfatt.c:5833 parsettfatt.c:5851 parsettfatt.c:5952 parsettfatt.c:5959 -#: parsettfatt.c:6036 parsettfatt.c:6047 +#: parsettfatt.c:5801 parsettfatt.c:5809 parsettfatt.c:5851 parsettfatt.c:5860 +#: parsettfatt.c:5874 parsettfatt.c:5892 parsettfatt.c:5993 parsettfatt.c:6000 +#: parsettfatt.c:6077 parsettfatt.c:6088 msgid "JSTF table is too long.\n" msgstr "" -#: parsettfatt.c:5778 +#: parsettfatt.c:5819 msgid "Bad GID in JSTF extenser table.\n" msgstr "" -#: parsettfatt.c:5839 +#: parsettfatt.c:5880 #, c-format msgid "Lookup index (%d) out of bounds in GSUB from JSTF table.\n" msgstr "" -#: parsettfatt.c:5857 +#: parsettfatt.c:5898 #, c-format msgid "Lookup index (%d) out of bounds in GPOS from JSTF table.\n" msgstr "" #. GT: This string is used to generate a name for an OpenType lookup. #. GT: the %c%c... is the language followed by the script (OT tags) -#: parsettfatt.c:5875 +#: parsettfatt.c:5916 #, c-format msgid "JSTF shrinkage max at priority %d #%d for %c%c%c%c in %c%c%c%c" msgstr "" -#: parsettfatt.c:5886 +#: parsettfatt.c:5927 #, c-format msgid "JSTF extension max at priority %d #%d for %c%c%c%c in %c%c%c%c" msgstr "" -#: parsettfatt.c:5904 +#: parsettfatt.c:5945 #, c-format msgid "%s subtable %d" msgstr "" -#: parsettfatt.c:6020 +#: parsettfatt.c:6061 #, c-format msgid "" "Unlikely script count (%d), I suspect the JSTF-\n" " table is garbage, I'm giving up on it.\n" msgstr "" -#: parsettfatt.c:6030 parsettfatt.c:6058 +#: parsettfatt.c:6071 parsettfatt.c:6099 msgid "End of file found in JSTF table.\n" msgstr "" @@ -26314,11 +26306,11 @@ msgid "Processing Variations" msgstr "i处理变化" -#: prefs.c:267 +#: prefs.c:269 msgid "PixmapDir" msgstr "" -#: prefs.c:268 +#: prefs.c:270 msgid "" "As FontForge creates windows, it loads images for its menus\n" "from files in a standard directory. You may change this to\n" @@ -26328,11 +26320,11 @@ "restarting FontForge will fix that." msgstr "" -#: prefs.c:280 +#: prefs.c:282 msgid "UseCairoDrawing" msgstr "" -#: prefs.c:280 prefs.c:465 prefs.c:468 +#: prefs.c:282 prefs.c:467 prefs.c:470 msgid "" "Use the cairo library for drawing (if available)\n" "This makes for prettier (anti-aliased) but slower drawing\n" @@ -26340,11 +26332,11 @@ "Already existing windows will continue as they are." msgstr "" -#: prefs.c:283 +#: prefs.c:285 msgid "UsePangoDrawing" msgstr "" -#: prefs.c:283 +#: prefs.c:285 msgid "" "Use the pango library for text (if available)\n" "This makes for prettier and handles complex scripts.\n" @@ -26353,11 +26345,11 @@ "Already existing windows will continue as they are." msgstr "" -#: prefs.c:285 +#: prefs.c:287 msgid "ExportClipboard" msgstr "" -#: prefs.c:285 +#: prefs.c:287 msgid "" "If you are running an X11 clipboard manager you might want\n" "to turn this off. FF can put things into its internal clipboard\n" @@ -26367,53 +26359,53 @@ "loss of data." msgstr "" -#: prefs.c:299 +#: prefs.c:301 msgid "SeekCharacter" msgstr "" -#: prefs.c:299 +#: prefs.c:301 msgid "" "When fontforge opens a (non-sfd) font it will try to display this unicode " "character in the fontview." msgstr "" -#: prefs.c:300 +#: prefs.c:302 msgid "CompactOnOpen" msgstr "" -#: prefs.c:300 +#: prefs.c:302 msgid "When a font is opened, should it be made compact?" msgstr "" -#: prefs.c:312 +#: prefs.c:314 msgid "InterpolateCPsOnMotion" msgstr "" -#: prefs.c:312 +#: prefs.c:314 msgid "" "When moving one end point of a spline but not the other\n" "interpolate the control points between the two." msgstr "" -#: prefs.c:320 +#: prefs.c:322 msgid "AutoKernDialog" msgstr "" -#: prefs.c:320 +#: prefs.c:322 msgid "Open AutoKern dialog for new kerning subtables" msgstr "" -#: prefs.c:330 +#: prefs.c:332 msgid "" "When copying glyphs from the font view, also copy the\n" "glyphs' truetype instructions." msgstr "" -#: prefs.c:356 +#: prefs.c:358 msgid "AddCharToNameList" msgstr "" -#: prefs.c:356 +#: prefs.c:358 msgid "" "When displaying a list of glyph names\n" "(or sometimes just a single glyph name)\n" @@ -26426,11 +26418,11 @@ " this behavior" msgstr "" -#: prefs.c:365 +#: prefs.c:367 msgid "StandardSlopeError" msgstr "" -#: prefs.c:365 +#: prefs.c:367 msgid "" "The maximum slope difference which still allows to consider two points " "\"parallel\".\n" @@ -26438,64 +26430,64 @@ "straight lines when detecting stem edges." msgstr "" -#: prefs.c:366 +#: prefs.c:368 msgid "SerifSlopeError" msgstr "" -#: prefs.c:366 +#: prefs.c:368 msgid "" "Same as above, but for terminals of small features (e. g. serifs), which can " "deviate more significantly from the horizontal or vertical direction." msgstr "" -#: prefs.c:374 +#: prefs.c:376 msgid "InstructDiagonalStems" msgstr "" -#: prefs.c:374 +#: prefs.c:376 msgid "Generate instructions for diagonal stem hints." msgstr "" -#: prefs.c:375 +#: prefs.c:377 msgid "InstructSerifs" msgstr "" -#: prefs.c:375 +#: prefs.c:377 msgid "" "Try to detect serifs and other elements protruding from base stems and " "generate instructions for them." msgstr "" -#: prefs.c:376 +#: prefs.c:378 msgid "InstructBallTerminals" msgstr "" -#: prefs.c:376 +#: prefs.c:378 msgid "Generate instructions for ball terminals." msgstr "" -#: prefs.c:377 +#: prefs.c:379 msgid "InterpolateStrongPoints" msgstr "" -#: prefs.c:377 +#: prefs.c:379 msgid "" "Interpolate between stem edges some important points, not affected by other " "instructions." msgstr "" -#: prefs.c:378 +#: prefs.c:380 msgid "CounterControl" msgstr "" -#: prefs.c:378 +#: prefs.c:380 msgid "" "Make sure similar or equal counters remain the same in gridfitted outlines.\n" "Enabling this option may result in glyph advance widths being\n" "inconsistently scaled at some PPEMs." msgstr "" -#: prefs.c:479 savefontdlg.c:756 +#: prefs.c:481 savefontdlg.c:756 msgid "" "When generating a truetype or opentype font it is occasionally\n" "useful to know the mapping between truetype glyph ids and\n" @@ -26503,7 +26495,7 @@ "produce a file (with extension .g2n) containing those data." msgstr "" -#: prefs.c:482 +#: prefs.c:484 msgid "" "Apple and MS/Adobe differ about the format of truetype and opentype files.\n" "This controls the default setting of the Apple checkbox in the\n" @@ -26517,7 +26509,7 @@ "If both this and OpenType are set, both formats are generated" msgstr "" -#: prefs.c:483 +#: prefs.c:485 msgid "" "Apple and MS/Adobe differ about the format of truetype and opentype files.\n" "This controls the default setting of the OpenType checkbox in the\n" @@ -26532,136 +26524,136 @@ msgstr "" # -#: prefs.c:492 +#: prefs.c:494 msgid "Generic" msgstr "一般" # -#: prefs.c:493 +#: prefs.c:495 msgid "New Font" msgstr "新字体" # -#: prefs.c:495 +#: prefs.c:497 msgid "Navigation" msgstr "浏览" # -#: prefs.c:496 +#: prefs.c:498 msgid "Editing" msgstr "编辑" # -#: prefs.c:497 +#: prefs.c:499 msgid "Synchronize" msgstr "同步" # -#: prefs.c:498 +#: prefs.c:500 msgid "TT" msgstr "TrueType" # -#: prefs.c:499 +#: prefs.c:501 msgid "Accents" msgstr "重音符" # -#: prefs.c:500 +#: prefs.c:502 msgid "Apps" msgstr "应用程序" # -#: prefs.c:501 +#: prefs.c:503 msgid "Font Info" msgstr "字体信息" # -#: prefs.c:502 +#: prefs.c:504 msgid "Generate" msgstr "生成" # -#: prefs.c:503 +#: prefs.c:505 msgid "PS Hints" msgstr "PS消隐" -#: prefs.c:504 +#: prefs.c:506 msgid "TT Instrs" msgstr "" # -#: prefs.c:1252 scriptingdlg.c:62 +#: prefs.c:1254 scriptingdlg.c:62 msgid "Call Script" msgstr "调用脚本" -#: prefs.c:1391 +#: prefs.c:1393 msgid "This feature, setting combination is already used" msgstr "" -#: prefs.c:1392 +#: prefs.c:1394 msgid "" "This feature, setting combination is already used\n" "Do you really wish to reuse it?" msgstr "" # -#: prefs.c:1408 +#: prefs.c:1410 msgid "Tag too long" msgstr "标签过长" # -#: prefs.c:1408 +#: prefs.c:1410 msgid "Feature tags must be exactly 4 ASCII characters" msgstr "特征标签应为4个ASCII字符" # -#: prefs.c:1445 prefs.c:2274 +#: prefs.c:1447 prefs.c:2276 msgid "Mapping" msgstr "映射" # -#: prefs.c:1455 +#: prefs.c:1457 msgid "_Feature:" msgstr "特征(_F)：" # -#: prefs.c:1482 +#: prefs.c:1484 msgid "_Tag:" msgstr "标签(_T)…" # -#: prefs.c:1651 +#: prefs.c:1653 msgid "Menu name with no associated script" msgstr "菜单无相关脚本" # -#: prefs.c:1654 +#: prefs.c:1656 msgid "Script with no associated menu name" msgstr "脚本未相关菜单" # -#: prefs.c:1885 +#: prefs.c:1887 msgid "Preferences" msgstr "选项" # -#: prefs.c:1917 +#: prefs.c:1919 msgid "MacMap|_New..." msgstr "新建(_N)…" # -#: prefs.c:1952 +#: prefs.c:1954 msgid "MacMapping|Default" msgstr "默认" # -#: prefs.c:1976 +#: prefs.c:1978 msgid "Menu Name" msgstr "菜单名" # -#: prefs.c:1979 +#: prefs.c:1981 msgid "" "You may create a script menu containing up to 10 frequently used scripts.\n" "Each entry in the menu needs both a name to display in the menu and\n" @@ -26674,12 +26666,12 @@ "带 \"...\" 的按钮可让你浏览脚本文件。" # -#: prefs.c:1986 +#: prefs.c:1988 msgid "Script File" msgstr "脚本文件" # -#: prefs.c:1989 +#: prefs.c:1991 msgid "" "You may create a script menu containing up to 10 frequently used scripts\n" "Each entry in the menu needs both a name to display in the menu and\n" @@ -26692,17 +26684,17 @@ "带 \"...\" 的按钮可让你浏览脚本文件。" # -#: prefs.c:2020 savefontdlg.c:2938 +#: prefs.c:2022 savefontdlg.c:2938 msgid "..." msgstr "..." # -#: prefs.c:2085 +#: prefs.c:2087 msgid "On" msgstr "开" # -#: prefs.c:2093 +#: prefs.c:2095 msgid "Off" msgstr "关" @@ -26712,56 +26704,56 @@ #. GT: (after striping off "Prefs_App|") together, translated, and then broken up #. GT: to fit the dialog. There is an extra blank line, not used in English, #. GT: into which your text may extend if needed. -#: prefs.c:2234 +#: prefs.c:2236 msgid "Prefs_App|Normally FontForge will find applications by searching for" msgstr "" -#: prefs.c:2235 +#: prefs.c:2237 msgid "Prefs_App|them in your PATH environment variable, if you want" msgstr "" -#: prefs.c:2236 +#: prefs.c:2238 msgid "Prefs_App|to alter that behavior you may set an environment" msgstr "" -#: prefs.c:2237 +#: prefs.c:2239 msgid "Prefs_App|variable giving the full path spec of the application." msgstr "" -#: prefs.c:2238 +#: prefs.c:2240 msgid "Prefs_App|FontForge recognizes BROWSER, MF and AUTOTRACE." msgstr "" -#: prefs.c:2239 +#: prefs.c:2241 msgid "Prefs_App| " msgstr "" # -#: prefs.c:2270 +#: prefs.c:2272 msgid "Features" msgstr "特征" # -#: print.c:1402 +#: print.c:1489 msgid "Printing Font" msgstr "打印字体" -#: print.c:1403 +#: print.c:1490 msgid "Generating PostScript Font" msgstr "" # -#: print.c:1428 +#: print.c:1515 msgid "Failed to generate postscript font" msgstr "未能生成Postscript字体" # -#: print.c:1677 tottf.c:6113 +#: print.c:1764 tottf.c:6203 msgid "Warning: Font contained no glyphs" msgstr "警告：字体中无字形" # -#: print.c:2874 print.c:2879 +#: print.c:2961 print.c:2966 #, c-format msgid "Failed to generate postscript in file %s" msgstr "未能生成postscript 于文件 %s" @@ -27242,7 +27234,7 @@ msgstr "连字" # -#: problems.c:2264 +#: contextchain.c:2268 problems.c:2264 msgid "Simple" msgstr "简单" @@ -28314,12 +28306,12 @@ msgstr "检验 %.100s" # -#: psread.c:324 +#: psread.c:300 msgid "Can't back up with nothing on stack\n" msgstr "堆栈中什么也没有，不能备份\n" # -#: psread.c:326 +#: psread.c:302 msgid "Attempt to back up twice\n" msgstr "试图备份两次\n" @@ -28327,374 +28319,374 @@ #. GT: as it is a PostScript keyword. (FF contains a small PostScript interpreter #. GT: so it can understand some PostScript fonts, and can generate errors when #. GT: handed bad PostScript). -#: psread.c:384 +#: psread.c:360 msgid "Use of \"exit\" when not in a loop\n" msgstr "" #. GT: This is part of the PostScript language. Neither "stop" nor "stopped" #. GT: should be translated as both are PostScript keywords. -#: psread.c:410 +#: psread.c:386 msgid "Use of \"stop\" when not in a stopped\n" msgstr "" -#: psread.c:607 +#: psread.c:583 msgid "Attempt to invert a singular matrix\n" msgstr "" #. GT: Here "def" is a PostScript keyword, (meaning define). #. GT: This "def" should not be translated as it is part of the PostScript language. -#: psread.c:645 +#: psread.c:626 msgid "Key for a def must be a string or name literal\n" msgstr "" # -#: psread.c:707 psread.c:714 +#: psread.c:688 psread.c:695 msgid "Value out of bounds in spline.\n" msgstr "样条线值越界.\n" -#: psread.c:1078 +#: psread.c:1059 msgid "Unknown character after backslash in literal string.\n" msgstr "" # -#: psread.c:1084 +#: psread.c:1065 msgid "Unknown string type\n" msgstr "位置字符串类型\n" -#: psread.c:1164 +#: psread.c:1145 msgid "FontForge does not support dictionary based imagemask operators.\n" msgstr "" -#: psread.c:1169 +#: psread.c:1150 msgid "" "Fourth argument of imagemask must be a 6-element transformation matrix.\n" msgstr "" # -#: psread.c:1174 +#: psread.c:1155 msgid "Third argument of imagemask must be a boolean.\n" msgstr "蒙板的第三个参数必须为布尔类型.\n" -#: psread.c:1180 +#: psread.c:1161 msgid "First and second arguments of imagemask must be integers.\n" msgstr "" -#: psread.c:1189 +#: psread.c:1170 msgid "" "Width or height arguments to imagemask contain invalid values\n" "(either negative or they require more data than provided).\n" msgstr "" # -#: psread.c:1604 psread.c:1613 psread.c:1622 +#: psread.c:1585 psread.c:1594 psread.c:1603 msgid "Divide by zero in postscript code.\n" msgstr "postscript 编码中除零.\n" # -#: psread.c:1704 +#: psread.c:1685 msgid "Can't compare arrays\n" msgstr "不能比较阵列\n" -#: psread.c:2482 +#: psread.c:2463 msgid "" "This version of FontForge does not support the imagemask operator.\n" "For support configure --with-multilayer.\n" msgstr "" # -#: psread.c:2641 +#: psread.c:2622 msgid "No mark in counttomark\n" msgstr "无标记于 counttomark\n" # -#: psread.c:2652 +#: psread.c:2633 msgid "No mark in cleartomark\n" msgstr "No mark in cleartomark\n" # -#: psread.c:2754 +#: psread.c:2735 msgid "Nothing on stack to print\n" msgstr "栈内没有要打印的\n" -#: psread.c:2831 +#: psread.c:2812 #, c-format msgid "Warning: Unable to parse token %s, some features may be lost\n" msgstr "" # -#: psread.c:3310 +#: psread.c:3291 msgid "We don't understand this font\n" msgstr "不识别此字体\n" # -#: psread.c:3709 +#: psread.c:3690 #, c-format msgid "Stack got too big in %s\n" msgstr "%s 中堆栈太大\n" -#: psread.c:3753 +#: psread.c:3734 #, c-format msgid "%s's dotsection operator is depreciated for Type2\n" msgstr "" -#: psread.c:3757 +#: psread.c:3738 #, c-format msgid "Stack underflow on vstem3 in %s\n" msgstr "" -#: psread.c:3762 psread.c:3800 +#: psread.c:3743 psread.c:3781 #, c-format msgid "%s's vstem3 operator is not supported for Type2\n" msgstr "" -#: psread.c:3798 +#: psread.c:3779 #, c-format msgid "Stack underflow on hstem3 in %s\n" msgstr "" -#: psread.c:3835 +#: psread.c:3816 #, c-format msgid "Stack underflow on seac in %s\n" msgstr "" -#: psread.c:3837 +#: psread.c:3818 #, c-format msgid "%s's SEAC operator is invalid for Type2\n" msgstr "" -#: psread.c:3838 +#: psread.c:3819 #, c-format msgid "%s's SEAC-like endchar operator is depreciated for Type2\n" msgstr "" # -#: psread.c:3856 +#: psread.c:3837 #, c-format msgid "Reference encoding out of bounds in %s\n" msgstr "参照编码越界 %s\n" -#: psread.c:3868 +#: psread.c:3849 #, c-format msgid "Stack underflow on sbw in %s\n" msgstr "" -#: psread.c:3870 +#: psread.c:3851 #, c-format msgid "%s's sbw operator is not supported for Type2\n" msgstr "" -#: psread.c:3878 +#: psread.c:3859 #, c-format msgid "Stack underflow on unary operator in %s\n" msgstr "" -#: psread.c:3887 +#: psread.c:3868 #, c-format msgid "Stack underflow on binary operator in %s\n" msgstr "" -#: psread.c:3914 +#: psread.c:3895 #, c-format msgid "Stack underflow on ifelse in %s\n" msgstr "" -#: psread.c:3935 +#: psread.c:3916 msgid "Type2 fonts do not support the Type1 callothersubrs operator" msgstr "" -#: psread.c:3937 +#: psread.c:3918 #, c-format msgid "Stack underflow on callothersubr in %s\n" msgstr "" # -#: psread.c:3982 psread.c:4046 +#: psread.c:3963 psread.c:4027 #, c-format msgid "Bad flex subroutine in %s\n" msgstr "不良 flex 子程序于 %s\n" -#: psread.c:4024 +#: psread.c:4005 #, c-format msgid "No previous point on path in curveto from flex 0 in %s\n" msgstr "" -#: psread.c:4039 +#: psread.c:4020 #, c-format msgid "No previous point on path in lineto from flex 0 in %s\n" msgstr "" -#: psread.c:4062 +#: psread.c:4043 #, c-format msgid "Attempt to use a multiple master subroutine in a non-mm font in %s.\n" msgstr "" -#: psread.c:4064 +#: psread.c:4045 #, c-format msgid "" "Multiple master subroutine called with the wrong number of arguments in %s.\n" msgstr "" -#: psread.c:4098 +#: psread.c:4079 #, c-format msgid "Too few items on stack for put in %s\n" msgstr "" -#: psread.c:4099 psread.c:4107 +#: psread.c:4080 psread.c:4088 #, c-format msgid "Reference to transient memory out of bounds in put in %s\n" msgstr "" -#: psread.c:4106 +#: psread.c:4087 #, c-format msgid "Too few items on stack for get in %s\n" msgstr "" -#: psread.c:4117 +#: psread.c:4098 #, c-format msgid "Pop stack underflow on pop in %s\n" msgstr "" # -#: psread.c:4140 +#: psread.c:4121 #, c-format msgid "Index out of range in %s\n" msgstr "%s中索引超出范围\n" # -#: psread.c:4151 +#: psread.c:4132 #, c-format msgid "roll out of range in %s\n" msgstr "卷动越界于 %s\n" -#: psread.c:4167 +#: psread.c:4148 msgid "Type2 fonts do not support the Type1 setcurrentpoint operator" msgstr "" -#: psread.c:4168 +#: psread.c:4149 #, c-format msgid "Stack underflow on setcurrentpoint in %s\n" msgstr "" -#: psread.c:4251 +#: psread.c:4232 #, c-format msgid "No previous point on path in flex operator in %s\n" msgstr "" # -#: psread.c:4255 +#: psread.c:4236 #, c-format msgid "Uninterpreted opcode 12,%d in %s\n" msgstr "未解释的操作码 12,%d 于 %s\n" -#: psread.c:4267 +#: psread.c:4248 #, c-format msgid "Stack underflow on hstem in %s\n" msgstr "" -#: psread.c:4319 +#: psread.c:4300 #, c-format msgid "Stack underflow on vstem in %s\n" msgstr "" -#: psread.c:4370 +#: psread.c:4351 #, c-format msgid "Hint mask (or counter mask) with too many hints in %s\n" msgstr "" -#: psread.c:4407 +#: psread.c:4388 #, c-format msgid "Stack underflow on hsbw in %s\n" msgstr "" -#: psread.c:4449 +#: psread.c:4430 #, c-format msgid "Stack underflow on rlineto/rmoveto in %s\n" msgstr "" -#: psread.c:4456 +#: psread.c:4437 #, c-format msgid "Stack underflow on hlineto/hmoveto in %s\n" msgstr "" -#: psread.c:4462 +#: psread.c:4443 #, c-format msgid "Stack underflow on vlineto/vmoveto in %s\n" msgstr "" -#: psread.c:4494 +#: psread.c:4475 #, c-format msgid "No previous point on path in lineto in %s\n" msgstr "" -#: psread.c:4526 +#: psread.c:4507 #, c-format msgid "Stack underflow on rrcurveto in %s\n" msgstr "" -#: psread.c:4538 psread.c:4549 +#: psread.c:4519 psread.c:4530 #, c-format msgid "Stack underflow on hhcurveto in %s\n" msgstr "" -#: psread.c:4560 +#: psread.c:4541 #, c-format msgid "Stack underflow on hvcurveto in %s\n" msgstr "" -#: psread.c:4572 +#: psread.c:4553 #, c-format msgid "Stack underflow on vhcurveto in %s\n" msgstr "" -#: psread.c:4599 +#: psread.c:4580 #, c-format msgid "No previous point on path in curveto in %s\n" msgstr "" -#: psread.c:4619 +#: psread.c:4600 #, c-format msgid "Stack underflow on callsubr in %s\n" msgstr "" # -#: psread.c:4622 +#: psread.c:4603 #, c-format msgid "Too many subroutine calls in %s\n" msgstr "过多子程序调用于 %s\n" # -#: psread.c:4631 +#: psread.c:4612 #, c-format msgid "Subroutine number out of bounds in %s\n" msgstr "子程序数越界于%s\n" # -#: psread.c:4644 +#: psread.c:4625 #, c-format msgid "return when not in subroutine in %s\n" msgstr "返回若不在子程序中%s\n" -#: psread.c:4654 +#: psread.c:4635 msgid "Attempt to use a multiple master subroutine in a non-mm font.\n" msgstr "" -#: psread.c:4656 +#: psread.c:4637 #, c-format msgid "Too few items on stack for blend in %s\n" msgstr "" # -#: psread.c:4659 +#: psread.c:4640 msgid "Use of obsolete blend operator.\n" msgstr "使用失效的操作.\n" # -#: psread.c:4676 +#: psread.c:4657 #, c-format msgid "Uninterpreted opcode %d in %s\n" msgstr "未解释的代码 %d于%s\n" -#: psread.c:4682 +#: psread.c:4663 #, c-format msgid "end of subroutine reached with no return in %s\n" msgstr "" @@ -28809,7 +28801,7 @@ msgstr "" # -#: savefont.c:799 tottf.c:2005 +#: savefont.c:799 tottf.c:2095 msgid "Saving OpenType Font" msgstr "保存OpenType字体" @@ -30036,13 +30028,13 @@ msgid "Bad stem add" msgstr "" -#: scstylesui.c:469 +#: python.c:15128 scstylesui.c:469 msgid "" "The horizontal and vertical stem add amounts must either both be zero, or " "neither may be 0" msgstr "" -#: scstylesui.c:476 +#: python.c:15135 scstylesui.c:476 msgid "" "The horizontal and vertical stem add amounts may not differ by more than a " "factor of 4" @@ -30816,31 +30808,31 @@ msgstr "全部替代" # -#: sfd.c:2366 +#: sfd.c:2392 msgid "Saving Bitmaps" msgstr "保存位图" # -#: sfd.c:2494 +#: sfd.c:2520 msgid "Saving..." msgstr "保存" # -#: sfd.c:2494 +#: sfd.c:2520 msgid "Saving Spline Font Database" msgstr "保存样条字体库" # -#: sfd.c:2494 +#: sfd.c:2520 msgid "Saving Outlines" msgstr "保存轮廓" # -#: sfd.c:5081 splinefont.c:590 splinefont.c:607 +#: sfd.c:5125 splinefont.c:590 splinefont.c:607 msgid "Interpreting Glyphs" msgstr "处理字形" -#: sfd.c:6588 +#: sfd.c:6650 msgid "" "Warning: This version of FontForge does not contain extended type3/svg " "support\n" @@ -30848,25 +30840,25 @@ "Reconfigure with --with-type3.\n" msgstr "" -#: sfd.c:7580 +#: sfd.c:7642 msgid "_Skip for now" msgstr "" # -#: sfd.c:7581 +#: sfd.c:7643 msgid "Forget _to All" msgstr "全忽略(_T)" -#: sfd.c:7581 +#: sfd.c:7643 msgid "_Forget about it" msgstr "忽略之(_F)" # -#: sfd.c:7583 +#: sfd.c:7645 msgid "Recover old edit" msgstr "恢复旧版本" -#: sfd.c:7583 +#: sfd.c:7645 #, c-format msgid "" "You appear to have an old editing session on %s.\n" @@ -30874,11 +30866,11 @@ msgstr "" # -#: sfd.c:7619 +#: sfd.c:7681 msgid "Recovery Failed" msgstr "恢复失败" -#: sfd.c:7619 +#: sfd.c:7681 #, c-format msgid "" "Automagic recovery of changes to %.80s failed.\n" @@ -30952,7 +30944,7 @@ msgstr "" # -#: sftextfield.c:791 showatt.c:2313 showatt.c:2366 ../gdraw/gtextfield.c:1172 +#: sftextfield.c:791 showatt.c:2320 showatt.c:2373 ../gdraw/gtextfield.c:1172 msgid "Save" msgstr "保存" @@ -31027,31 +31019,28 @@ msgstr "终点 (%d,%d)" # -#: showatt.c:419 -#, c-format +#: showatt.c:422 msgid "Backtrack Match: " msgstr "逆溯匹配: " # -#: showatt.c:435 -#, c-format +#: showatt.c:438 msgid "Match: " msgstr "匹配: " # -#: showatt.c:444 -#, c-format +#: showatt.c:447 msgid "Lookahead Match: " msgstr "前循匹配: " # -#: showatt.c:457 +#: showatt.c:460 msgid "Backtrack class: " msgid_plural "Backtrack classes: " msgstr[0] "逆溯类属: " # -#: showatt.c:471 +#: showatt.c:475 msgid "Class" msgid_plural "Classes" msgstr[0] "类属" @@ -31063,62 +31052,61 @@ msgstr[0] "前循类属: " # -#: showatt.c:502 +#: showatt.c:508 #, c-format msgid "Back coverage %d: " msgstr "后向范围 %d: " # -#: showatt.c:512 +#: showatt.c:518 #, c-format msgid "Coverage %d: " msgstr "范围 %d: " # -#: showatt.c:522 +#: showatt.c:528 #, c-format msgid "Lookahead coverage %d: " msgstr "前向范围 %d: " # -#: showatt.c:538 +#: showatt.c:544 #, c-format msgid "Apply at %d %.80s" msgstr "应用到 %d %.80s" # -#: showatt.c:550 -#, c-format +#: showatt.c:556 msgid "Replacement: " msgstr "替代： " # -#: showatt.c:572 +#: showatt.c:579 msgid "Chaining Positioning" msgstr "链定位" # -#: showatt.c:572 +#: showatt.c:579 msgid "Chaining Substitution" msgstr "链式替代" # -#: showatt.c:573 +#: showatt.c:580 msgid "Reverse Chaining Subs" msgstr "反向链式替代" # -#: showatt.c:574 +#: showatt.c:581 msgid "glyphs" msgstr "字形" # -#: showatt.c:574 +#: showatt.c:581 msgid "classes" msgstr "类属" # -#: showatt.c:574 +#: showatt.c:581 msgid "coverage" msgstr "范围" @@ -31129,57 +31117,57 @@ #. GT: would be a better word) glyphs, classes or coverage tables. #. GT: So this might look like: #. GT: Contextual Positioning by classes -#: showatt.c:587 +#: showatt.c:594 #, c-format msgid "%s by %s" msgstr "%s 由 %s" # -#: showatt.c:596 +#: showatt.c:603 #, c-format msgid "Backtrack class %d: " msgstr "逆溯类属 %d: " # -#: showatt.c:606 showatt.c:684 +#: showatt.c:613 showatt.c:691 #, c-format msgid "Class %d: " msgstr "类属 %d: " # -#: showatt.c:616 +#: showatt.c:623 #, c-format msgid "Lookahead class %d: " msgstr "前循类属%d: " # -#: showatt.c:627 +#: showatt.c:634 #, c-format msgid "Rule %d" msgstr "规则 %d" # -#: showatt.c:647 +#: showatt.c:654 msgid "Indic Reordering" msgstr "印地语重排序" # -#: showatt.c:648 showatt.c:649 showatt.c:650 showatt.c:651 +#: showatt.c:655 showatt.c:656 showatt.c:657 showatt.c:658 msgid "" msgstr "<未定义>" # -#: showatt.c:648 +#: showatt.c:655 msgid "Simple Substitution" msgstr "简单替代" # -#: showatt.c:649 +#: showatt.c:656 msgid "Glyph Insertion" msgstr "字形插入" # -#: showatt.c:652 +#: showatt.c:659 msgid "Kern by State" msgstr "按状态压缩" @@ -31187,103 +31175,103 @@ #. GT: You're in a state machine, and this is describing the %4d'th state of #. GT: that machine. From the state the next state will be a list of #. GT: state-numbers which are appended to this string. -#: showatt.c:697 +#: showatt.c:704 #, c-format msgid "State %4d Next: " msgstr "状态%4d Next: " # -#: showatt.c:706 +#: showatt.c:713 #, c-format msgid "State %4d Flags:" msgstr "状态 %4d Flags:" # -#: showatt.c:716 +#: showatt.c:723 #, c-format msgid "State %4d Mark: " msgstr "状态 %4d Mark: " # -#: showatt.c:728 +#: showatt.c:735 #, c-format msgid "State %4d Cur: " msgstr "状态 %4d Cur: " # -#: showatt.c:743 +#: showatt.c:750 #, c-format msgid "Nested Substitution %.80s" msgstr "嵌套替代 %.80s" -#: showatt.c:1176 +#: showatt.c:1183 msgid "Lookups Enabled for Expansion" msgstr "" -#: showatt.c:1176 +#: showatt.c:1183 msgid "No Lookups Enabled for Expansion" msgstr "" -#: showatt.c:1177 +#: showatt.c:1184 msgid "Lookups Disabled for Expansion" msgstr "" -#: showatt.c:1177 +#: showatt.c:1184 msgid "No Lookups Disabled for Expansion" msgstr "" -#: showatt.c:1178 +#: showatt.c:1185 msgid "Lookups Limiting Expansion" msgstr "" -#: showatt.c:1178 +#: showatt.c:1185 msgid "No Lookups Limiting Expansion" msgstr "" -#: showatt.c:1179 +#: showatt.c:1186 msgid "Lookups Enabled for Shrinkage" msgstr "" -#: showatt.c:1179 +#: showatt.c:1186 msgid "No Lookups Enabled for Shrinkage" msgstr "" -#: showatt.c:1180 +#: showatt.c:1187 msgid "Lookups Disabled for Shrinkage" msgstr "" -#: showatt.c:1180 +#: showatt.c:1187 msgid "No Lookups Disabled for Shrinkage" msgstr "" -#: showatt.c:1181 +#: showatt.c:1188 msgid "Lookups Limiting Shrinkage" msgstr "" -#: showatt.c:1181 +#: showatt.c:1188 msgid "No Lookups Limiting Shrinkage" msgstr "" -#: showatt.c:1182 +#: showatt.c:1189 #, c-format msgid "Priority: %d" msgstr "" -#: showatt.c:1246 +#: showatt.c:1253 msgid "No Extender Glyphs" msgstr "" -#: showatt.c:1250 +#: showatt.c:1257 msgid "Extender Glyphs" msgstr "" # -#: showatt.c:1406 +#: showatt.c:1413 msgid "Not classified" msgstr "未分类" # -#: showatt.c:1468 +#: showatt.c:1475 msgid "Glyph Definition Sub-Table" msgstr "字形定义替代表" @@ -31291,174 +31279,174 @@ #. GT: Here caret means where to place the cursor inside a ligature. So OpenType #. GT: allows there to be a typing cursor inside a ligature (for instance you #. GT: can have a cursor between f and i in the "fi" ligature) -#: showatt.c:1476 +#: showatt.c:1483 msgid "Ligature Caret Sub-Table" msgstr "连写缩合替换表" # -#: showatt.c:1481 +#: showatt.c:1488 msgid "Mark Attachment Classes" msgstr "标记附在类属" -#: showatt.c:1500 +#: showatt.c:1507 #, c-format msgid "%c%c%c%c Min Extent=%d, Max Extent=%d" msgstr "" -#: showatt.c:1528 +#: showatt.c:1535 #, c-format msgid "Script '%c%c%c%c' on %c%c%c%c " msgstr "" -#: showatt.c:1538 +#: showatt.c:1545 #, c-format msgid "Script '%c%c%c%c' " msgstr "" -#: showatt.c:1565 +#: showatt.c:1572 #, c-format msgid "Default Baseline: '%s'" msgstr "" -#: showatt.c:1573 +#: showatt.c:1580 #, c-format msgid "" "Offsets from def. baseline: romn: %d idcn: %d ideo: %d hang: %d math: %d" msgstr "" -#: showatt.c:1578 +#: showatt.c:1585 msgid "All glyphs have the same baseline" msgstr "" -#: showatt.c:1581 +#: showatt.c:1588 msgid "Per glyph baseline data" msgstr "" # -#: showatt.c:1635 +#: showatt.c:1642 #, c-format msgid " Left Bound=%d" msgstr " 左边=%d" # -#: showatt.c:1638 +#: showatt.c:1645 #, c-format msgid " Right Bound=%d" msgstr " 右边=%d" # -#: showatt.c:1694 +#: showatt.c:1701 msgid "Strong Left to Right" msgstr "强从左到右" # -#: showatt.c:1695 +#: showatt.c:1702 msgid "Strong Right to Left" msgstr "强从右到左" # -#: showatt.c:1696 +#: showatt.c:1703 msgid "Arabic Right to Left" msgstr "阿拉伯文从右到左" # -#: showatt.c:1697 +#: showatt.c:1704 msgid "European Number" msgstr "欧洲数字" # -#: showatt.c:1698 +#: showatt.c:1705 msgid "European Number Separator" msgstr "欧洲数字分隔符" # -#: showatt.c:1699 +#: showatt.c:1706 msgid "European Number Terminator" msgstr "欧洲数字终止符" # -#: showatt.c:1700 +#: showatt.c:1707 msgid "Arabic Number" msgstr "阿拉伯数字" # -#: showatt.c:1701 +#: showatt.c:1708 msgid "Common Number Separator" msgstr "共同数字分隔符" # -#: showatt.c:1702 +#: showatt.c:1709 msgid "Block Separator" msgstr "块分隔符" # -#: showatt.c:1703 +#: showatt.c:1710 msgid "Segment Separator" msgstr "段分隔符" # -#: showatt.c:1704 +#: showatt.c:1711 msgid "White Space" msgstr "空白" # -#: showatt.c:1705 +#: showatt.c:1712 msgid "Neutral" msgstr "中立" # -#: showatt.c:1706 +#: showatt.c:1713 msgid "" msgstr "<未知方向>" # -#: showatt.c:1708 +#: showatt.c:1715 msgid " Floating accent" msgstr " 浮动重音符" # -#: showatt.c:1710 +#: showatt.c:1717 msgid " Hang left" msgstr " 左手" # -#: showatt.c:1712 +#: showatt.c:1719 msgid " Hang right" msgstr " 右手" # -#: showatt.c:1714 +#: showatt.c:1721 msgid " Attach right" msgstr " 右侧附加" # -#: showatt.c:1722 showatt.c:1728 +#: showatt.c:1729 showatt.c:1735 #, c-format msgid " Mirror=%.30s" msgstr " 镜像=%.30s" # -#: showatt.c:1991 +#: showatt.c:1998 msgid "No Advanced Typography" msgstr "无高级字体" # -#: showatt.c:1997 +#: showatt.c:2004 msgid "OpenType Tables" msgstr "OpenType表" -#: showatt.c:2003 +#: showatt.c:2010 msgid "'BASE' Baseline Table" msgstr "" -#: showatt.c:2011 +#: showatt.c:2018 #, c-format msgid "Horizontal: %d baseline" msgid_plural "Horizontal: %d baselines" msgstr[0] "" msgstr[1] "" -#: showatt.c:2021 +#: showatt.c:2028 #, c-format msgid "Vertical: %d baseline" msgid_plural "Vertical: %d baselines" @@ -31466,175 +31454,175 @@ msgstr[1] "" # -#: showatt.c:2031 +#: showatt.c:2038 msgid "'GDEF' Glyph Definition Table" msgstr "'GDEF' 字形定义表" # -#: showatt.c:2037 +#: showatt.c:2044 msgid "'GPOS' Glyph Positioning Table" msgstr "'GPOS' 字形定位表" # -#: showatt.c:2043 +#: showatt.c:2050 msgid "'GSUB' Glyph Substitution Table" msgstr "'GSUB' 字形替代表" -#: showatt.c:2050 +#: showatt.c:2057 msgid "'JSTF' Justification Table" msgstr "" # -#: showatt.c:2059 +#: showatt.c:2066 msgid "Apple Advanced Typography" msgstr "Apple高级字体" -#: showatt.c:2064 +#: showatt.c:2071 msgid "'bsln' Horizontal Baseline Table" msgstr "" # -#: showatt.c:2070 +#: showatt.c:2077 msgid "'kern' Horizontal Kerning Table" msgstr "'kern' 水平压缩表" # -#: showatt.c:2076 +#: showatt.c:2083 msgid "'lcar' Ligature Caret Table" msgstr "'lcar' 连写缩合表" -#: showatt.c:2082 +#: showatt.c:2089 msgid "'morx' Glyph Extended Metamorphosis Table" msgstr "" # -#: showatt.c:2088 +#: showatt.c:2095 msgid "'opbd' Optical Bounds Table" msgstr "'opbd' 光学边界表" # -#: showatt.c:2094 +#: showatt.c:2101 msgid "'prop' Glyph Properties Table" msgstr "'prop' 字形属性表" # -#: showatt.c:2847 +#: showatt.c:2854 msgid "Show ATT" msgstr "显示ATT" # -#: showatt.c:2937 +#: showatt.c:2944 msgid "No differences found" msgstr "未发现差异" # -#: showatt.c:2939 +#: showatt.c:2946 msgid "Differences..." msgstr "差异..." # -#: showatt.c:2956 +#: showatt.c:2963 #, c-format msgid "Compare %s to %s" msgstr "比较 %s 与 %s" # -#: showatt.c:2959 +#: showatt.c:2966 #, c-format msgid "Compare version %s of %s to %s" msgstr "比较版本 %s (%s) 对 %s" # -#: showatt.c:2962 showatt.c:3108 +#: showatt.c:2969 showatt.c:3115 msgid "Font Compare" msgstr "字体比较" # -#: showatt.c:3118 +#: showatt.c:3125 #, c-format msgid "Font to compare with %.20s" msgstr "字体与 %.20s 比较" # -#: showatt.c:3139 +#: showatt.c:3146 msgid "Compare _Outlines" msgstr "比较轮廓(_O)" # -#: showatt.c:3156 +#: showatt.c:3163 msgid "Accept outlines which exactly match the original" msgstr "接受与原先确切匹配的轮廓" # -#: showatt.c:3164 +#: showatt.c:3171 msgid "_Accept inexact" msgstr "接受模糊(_A)" -#: showatt.c:3169 +#: showatt.c:3176 msgid "" "Accept an outline which is a close approximation to the original.\n" "It may be off by an em-unit, or have a reference which matches a contour." msgstr "" # -#: showatt.c:3177 +#: showatt.c:3184 msgid "_Warn if inexact" msgstr "不确切则警告(_W)" -#: showatt.c:3182 +#: showatt.c:3189 msgid "Warn if the outlines are close but not exactly the same" msgstr "" # -#: showatt.c:3190 +#: showatt.c:3197 msgid "Warn if _unlinked references" msgstr "警告未连接的参照" -#: showatt.c:3195 +#: showatt.c:3202 msgid "" "Warn if one glyph contains an outline while the other contains a reference " "(but the reference describes the same outline)" msgstr "" # -#: showatt.c:3203 +#: showatt.c:3210 msgid "Compare _Hints" msgstr "比较消隐(_H)" -#: showatt.c:3208 +#: showatt.c:3215 msgid "Compare postscript hints and hintmasks and truetype instructions" msgstr "" # -#: showatt.c:3216 +#: showatt.c:3223 msgid "Compare Hint_Masks" msgstr "比较消隐蒙板(_M)" # -#: showatt.c:3221 +#: showatt.c:3228 msgid "Compare hintmasks" msgstr "比较消隐蒙板" # -#: showatt.c:3229 +#: showatt.c:3236 msgid "HintMasks only if conflicts" msgstr "消隐蒙板(仅冲突时)" -#: showatt.c:3234 +#: showatt.c:3241 msgid "Don't compare hintmasks if the glyph has no hint conflicts" msgstr "" # -#: showatt.c:3242 +#: showatt.c:3249 msgid "Don't Compare HintMasks" msgstr "不要比较消隐蒙板" # -#: showatt.c:3254 +#: showatt.c:3261 msgid "_Add Diff Outlines to Background" msgstr "添加不同差异轮廓到背景(_A)" -#: showatt.c:3259 +#: showatt.c:3266 msgid "" "If two glyphs differ, then add the outlines of the second glyph\n" "to the background layer of the first (So when opening the first\n" @@ -31642,11 +31630,11 @@ msgstr "" # -#: showatt.c:3267 +#: showatt.c:3274 msgid "Add _Missing Glyphs" msgstr "添加缺失字形(_M)" -#: showatt.c:3272 +#: showatt.c:3279 msgid "" "If a glyph in the second font is missing from the first, then\n" "add it to the first with the outlines of the second font in\n" @@ -31654,32 +31642,32 @@ msgstr "" # -#: showatt.c:3280 +#: showatt.c:3287 msgid "Compare _Bitmaps" msgstr "比较位图(_B)" # -#: showatt.c:3289 +#: showatt.c:3296 msgid "Compare _Names" msgstr "比较名称(_N)" # -#: showatt.c:3298 +#: showatt.c:3305 msgid "Compare Glyph _Positioning" msgstr "比较字形位置(_P)" # -#: showatt.c:3303 +#: showatt.c:3310 msgid "Kerning & such" msgstr "组合字等" # -#: showatt.c:3308 +#: showatt.c:3315 msgid "Compare Glyph _Substitution" msgstr "比较字形替代(_S)" # -#: showatt.c:3313 +#: showatt.c:3320 msgid "Ligatures & such" msgstr "组合字等" @@ -31788,7 +31776,8 @@ msgstr "设为默认" # -#: splinechar.c:1006 splinechar.c:1015 +#: charinfo.c:1359 charinfo.c:1374 charinfo.c:1386 splinechar.c:1006 +#: splinechar.c:1015 msgid "Multiple" msgstr "多重" @@ -31814,40 +31803,40 @@ "要交换名字么?" # -#: splinechar.c:1773 +#: splinechar.c:1810 msgid "Validating..." msgstr "正在校验文件" # -#: splinechar.c:2510 +#: splinechar.c:2547 msgid "You changed the point numbering" msgstr "你改了点数" # -#: splinechar.c:2511 +#: splinechar.c:2548 #, c-format msgid "You have just changed the point numbering of glyph %s.%s%s%s" msgstr "你改了字形 %s.%s%s%s 的点数" # -#: splinechar.c:2514 +#: splinechar.c:2551 msgid "" " Instructions in this glyph (or one that refers to it) have been lost." msgstr " 此字形（或参照此字形的其他字形）的指令已丢失。" # -#: splinechar.c:2515 +#: splinechar.c:2552 msgid "" " Instructions in this glyph (or one that refers to it) are now out of date." msgstr " 此字形（或参照此字形的其他字形）的指令已过期。" -#: splinechar.c:2516 +#: splinechar.c:2553 msgid "" " At least one reference to this glyph used point matching. That match is now " "out of date." msgstr "" -#: splinechar.c:2518 +#: splinechar.c:2555 msgid "" " At least one anchor point used point matching. It may be out of date now." msgstr "" @@ -31930,7 +31919,8 @@ msgstr "" # -#: splineoverlap.c:2456 transform.c:251 +#: contextchain.c:1138 contextchain.c:1226 splineoverlap.c:2456 +#: transform.c:251 msgid "Warning" msgstr "警告" @@ -31942,7 +31932,7 @@ "Element->Correct Direction before Remove Overlap will improve matters." msgstr "" -#: splinesave.c:2329 +#: splinesave.c:2310 #, c-format msgid "Number out of range: %g in type2 output (must be [-65536,65535])\n" msgstr "" @@ -31969,11 +31959,11 @@ msgstr "这个看来不像ofm文件，不知道怎么打开。" # -#: splinesaveafm.c:2029 splinesaveafm.c:2034 +#: splinesaveafm.c:2036 splinesaveafm.c:2041 msgid "" msgstr "<临时压缩>" -#: splinesaveafm.c:3041 +#: splinesaveafm.c:3048 #, c-format msgid "" "The width of %s is too big to fit in a tfm fix_word, it shall be truncated " @@ -31981,11 +31971,11 @@ msgstr "" # -#: splinesaveafm.c:3057 +#: splinesaveafm.c:3064 msgid "Value exceeds tfm limitations" msgstr "值超过 tfm 极限" -#: splinesaveafm.c:3057 +#: splinesaveafm.c:3064 #, c-format msgid "" "The width, height, depth or italic correction of %s is too big. Tfm files " @@ -32008,22 +31998,22 @@ msgstr "笔画..." # -#: splineutil.c:2203 +#: splineutil.c:2205 #, c-format msgid "Couldn't find referenced character \"%s\" in %s\n" msgstr "未能找到参照字符 \"%s\" 于 %s\n" # -#: splineutil.c:2637 +#: splineutil.c:2639 msgid "Multiple master font with more than 16 instances\n" msgstr "多主字体超过16实例\n" # -#: splineutil.c:2662 +#: splineutil.c:2664 msgid "Multiple master font with more than 4 axes\n" msgstr "多主字体超过4轴\n" -#: splineutil.c:2670 +#: splineutil.c:2672 #, c-format msgid "" "This multiple master font has %1$d instance fonts, but it needs at least " @@ -32031,7 +32021,7 @@ "correctly" msgstr "" -#: splineutil.c:2672 +#: splineutil.c:2674 #, c-format msgid "" "This multiple master font has %1$d instance fonts, but FontForge can only " @@ -32039,32 +32029,32 @@ "this correctly" msgstr "" -#: splineutil.c:2689 +#: splineutil.c:2691 msgid "Too many axis positions specified in /BlendDesignPositions.\n" msgstr "" -#: splineutil.c:2721 +#: splineutil.c:2723 #, c-format msgid "" "Too many mapping data points specified in /BlendDesignMap for axis %s.\n" msgstr "" -#: splineutil.c:2730 +#: splineutil.c:2732 #, c-format msgid "Bad value for blend in /BlendDesignMap for axis %s.\n" msgstr "" -#: splineutil.c:2743 +#: splineutil.c:2745 #, c-format msgid "Bad few values in /BlendDesignMap for axis %s.\n" msgstr "" -#: splineutil.c:2856 +#: splineutil.c:2858 #, c-format msgid "Could not parse a CID font, %sCIDFontType %d, %sfonttype %d\n" msgstr "" -#: splineutil.c:2864 +#: splineutil.c:2866 msgid "CID format doesn't contain what we expected it to.\n" msgstr "" @@ -32098,7 +32088,7 @@ msgid "fontology recapitulates file-ogeny" msgstr "" -#: startui.c:1189 +#: startui.c:1214 msgid "Flag0x10+" msgstr "" @@ -32424,7 +32414,7 @@ msgstr "此文件不含SVG字体。\n" # -#: svg.c:3799 svg.c:3824 svg.c:3844 svg.c:3887 ufo.c:1703 ufo.c:2027 +#: svg.c:3799 svg.c:3824 svg.c:3844 svg.c:3887 ufo.c:1724 ufo.c:2048 msgid "Can't find libxml2.\n" msgstr "未找到 libxml2.\n" @@ -32577,84 +32567,84 @@ msgid "Repeat Counts:" msgstr "" -#: tottf.c:510 +#: tottf.c:600 #, c-format msgid "" "Attempt to output %d into a 16-bit field. It will be truncated and the file " "may not be useful." msgstr "" -#: tottf.c:4276 tottf.c:4282 tottf.c:4288 +#: tottf.c:4366 tottf.c:4372 tottf.c:4378 #, c-format msgid "" "There is a single byte character (%d) using one of the slots needed for " "double byte characters" msgstr "" -#: tottf.c:4294 tottf.c:4300 +#: tottf.c:4384 tottf.c:4390 #, c-format msgid "There is a character (%d) which cannot be encoded" msgstr "" -#: tottf.c:4331 tottf.c:4339 +#: tottf.c:4421 tottf.c:4429 #, c-format msgid "There is a character (%d) which is not normally in the encoding" msgstr "" # -#: tottf.c:5690 +#: tottf.c:5780 msgid "Missing bitmap strike" msgstr "缺少位图删除线" -#: tottf.c:5690 +#: tottf.c:5780 #, c-format msgid "The font database does not contain a bitmap of size %d and depth %d" msgstr "" # -#: tottf.c:5704 +#: tottf.c:5794 msgid "No bitmap strikes" msgstr "无位图部件" -#: tottf.c:5713 +#: tottf.c:5803 msgid "Too many glyphs" msgstr "" -#: tottf.c:5713 +#: tottf.c:5803 #, c-format msgid "" "The 'sfnt' format is currently limited to 65535 glyphs, and your font has %d " "of them." msgstr "" -#: tottf.c:5974 +#: tottf.c:6064 #, c-format msgid "Failed to open glyph to name map file for writing: %s\n" msgstr "" # -#: tottf.c:6113 tottf.c:6120 tottf.c:6123 +#: tottf.c:6203 tottf.c:6210 tottf.c:6213 msgid "No Encoded Glyphs" msgstr "无已编码字形" -#: tottf.c:6120 +#: tottf.c:6210 msgid "" "This font contains no glyphs with unicode encodings.\n" "Would you like to use a \"Symbol\" encoding instead of Unicode?" msgstr "" -#: tottf.c:6123 +#: tottf.c:6213 msgid "" "This font contains no glyphs with unicode encodings.\n" "You will probably not be able to use the output." msgstr "" # -#: tottf.c:6193 +#: tottf.c:6283 msgid "Table length should not be odd\n" msgstr "表的长度不能是奇数\n" -#: tottf.c:7043 +#: tottf.c:7133 msgid "Something went wrong" msgstr "" @@ -32677,21 +32667,21 @@ "of its glyph kern pairs cannot be mapped to unicode-BMP kern pairs" msgstr "" -#: tottfgpos.c:1133 +#: tottfgpos.c:1136 #, c-format msgid "" "Lookup subtable %s contains a glyph %s whose kerning information takes up " "more than 64k bytes\n" msgstr "" -#: tottfgpos.c:1138 +#: tottfgpos.c:1141 #, c-format msgid "" "Lookup subtable %s had to be split into several subtables\n" "because it was too big.\n" msgstr "" -#: tottfgpos.c:1245 +#: tottfgpos.c:1248 #, c-format msgid "" "I miscalculated the size of subtable %s, this means the kerning output is " @@ -32699,21 +32689,21 @@ msgstr "" # -#: tottfgpos.c:1557 +#: tottfgpos.c:1560 msgid "Two cursive anchor classes" msgstr "双草写锚点类属" -#: tottfgpos.c:1557 +#: tottfgpos.c:1560 #, c-format msgid "Two cursive anchor classes in the same subtable, %s" msgstr "" # -#: tottfgpos.c:2963 +#: tottfgpos.c:2966 msgid "Lookup potentially too big" msgstr "查找太大" -#: tottfgpos.c:2964 +#: tottfgpos.c:2967 #, c-format msgid "" "Lookup %s has an\n" @@ -32722,11 +32712,11 @@ "Not all applications support extension lookups." msgstr "" -#: tottfgpos.c:4623 +#: tottfgpos.c:4626 msgid "Failure" msgstr "" -#: tottfgpos.c:4623 +#: tottfgpos.c:4626 msgid "Offset in JSTF table is too big. The resultant font will not work." msgstr "" @@ -33942,37 +33932,37 @@ msgstr "未知替代表'%c%c%c%c' 于 'TeX ' 表中, 忽略之\n" # -#: ufo.c:1155 +#: ufo.c:1176 msgid "Expected glyph file with format==1\n" msgstr "期望字形文件格式==1\n" # -#: ufo.c:1208 +#: ufo.c:1229 msgid "component with no base glyph" msgstr "无基字形组件" # -#: ufo.c:1416 +#: ufo.c:1437 #, c-format msgid "Bad glif file %s\n" msgstr "不良 glif 文件 %s\n" -#: ufo.c:1434 +#: ufo.c:1455 #, c-format msgid "Failed to find glyph %s when fixing up references\n" msgstr "" # -#: ufo.c:1463 +#: ufo.c:1484 msgid "Bad contents.plist\n" msgstr "不良 contents.plist\n" # -#: ufo.c:1469 ufo.c:1526 ufo.c:1726 ufo.c:2008 +#: ufo.c:1490 ufo.c:1547 ufo.c:1747 ufo.c:2029 msgid "Expected property list file" msgstr "需要属性列表文件" -#: ufo.c:1947 +#: ufo.c:1968 msgid "This font does not specify unitsPerEm\n" msgstr "" @@ -34029,61 +34019,61 @@ msgstr "" # -#: unicoderange.c:36 +#: unicoderange.c:38 msgid "Unicode Basic Multilingual Plane" msgstr "统一码基础多语言平面" # -#: unicoderange.c:37 +#: unicoderange.c:39 msgid "Basic Multilingual Plane" msgstr "基础多语言平面" # -#: unicoderange.c:38 +#: unicoderange.c:40 msgid "Alphabetic" msgstr "字母表" # -#: unicoderange.c:39 +#: unicoderange.c:41 msgid "C0 Control Character" msgstr "C0控制字符" # -#: unicoderange.c:40 +#: unicoderange.c:42 msgid "NUL, Default Character" msgstr "NUL，默认字符" # -#: unicoderange.c:42 +#: unicoderange.c:44 msgid "Delete Character" msgstr "删除字符" # -#: unicoderange.c:43 +#: unicoderange.c:45 msgid "C1 Control Character" msgstr "C1控制字符" # -#: unicoderange.c:50 +#: unicoderange.c:52 msgid "Greek" msgstr "希腊语" # -#: unicoderange.c:53 +#: unicoderange.c:55 msgid "Cyrillic Supplement" msgstr "Cyrillic增补" # -#: unicoderange.c:58 +#: unicoderange.c:60 msgid "Arabic Supplement" msgstr "Arabic增补" # -#: unicoderange.c:61 +#: unicoderange.c:63 msgid "Samaritan" msgstr "萨马利亚阿拉米语" -#: unicoderange.c:62 +#: unicoderange.c:64 msgid "Samaritan, Punctuation" msgstr "" @@ -34098,62 +34088,62 @@ msgstr "Pahlavi" # -#: unicoderange.c:65 unicoderange.c:149 +#: fontinfo.c:1123 unicoderange.c:152 msgid "Tifinagh" msgstr "提非纳文" # -#: unicoderange.c:66 +#: unicoderange.c:65 msgid "Mandaic" msgstr "Mandaic" # -#: unicoderange.c:67 +#: unicoderange.c:66 msgid "Devangari" msgstr "梵文字母, 天城体" # -#: unicoderange.c:82 +#: unicoderange.c:81 msgid "Hangul Jamo, Choseong" msgstr "韩文兼容, Choseong" # -#: unicoderange.c:83 +#: unicoderange.c:82 msgid "Hangul Jamo, Jungseong" msgstr "韩文兼容, Jungseong" # -#: unicoderange.c:84 +#: unicoderange.c:83 msgid "Hangul Jamo, Jongseong" msgstr "韩文兼容, Jongseong" # -#: unicoderange.c:86 +#: unicoderange.c:85 msgid "Ethiopic Supplement" msgstr "Ethiopic增补" # -#: unicoderange.c:91 +#: unicoderange.c:90 msgid "Tagalog" msgstr "塔加路语" # -#: unicoderange.c:92 +#: unicoderange.c:91 msgid "Hanunóo" msgstr "Hanunóo" # -#: unicoderange.c:93 +#: unicoderange.c:92 msgid "Buhid" msgstr "Buhid" # -#: unicoderange.c:94 +#: unicoderange.c:93 msgid "Tagbanwa" msgstr "塔格班瓦语" # -#: unicoderange.c:97 +#: fontinfo.c:1118 unicoderange.c:97 msgid "Limbu" msgstr "林布语" @@ -34168,7 +34158,7 @@ msgstr "高棉文符号" # -#: unicoderange.c:101 +#: fontinfo.c:1121 unicoderange.c:101 msgid "Buginese" msgstr "布吉语" @@ -34177,7 +34167,7 @@ msgstr "" # -#: unicoderange.c:103 +#: fontinfo.c:1051 unicoderange.c:103 msgid "Balinese" msgstr "巴里语" @@ -34186,32 +34176,32 @@ msgstr "" # -#: unicoderange.c:105 +#: fontinfo.c:1138 unicoderange.c:106 msgid "Lepcha" msgstr "Lepcha" # -#: unicoderange.c:107 +#: unicoderange.c:108 msgid "Phonetic Extensions" msgstr "音标扩展" # -#: unicoderange.c:108 +#: unicoderange.c:109 msgid "Phonetic Extensions Supplement" msgstr "音标扩展增补" # -#: unicoderange.c:109 +#: unicoderange.c:110 msgid "Combining Diacritical Marks Supplement" msgstr "组合变音标记补充" # -#: unicoderange.c:112 +#: unicoderange.c:113 msgid "Symbols" msgstr "符号" # -#: unicoderange.c:114 +#: unicoderange.c:115 msgid "Super and Sub scripts" msgstr "上下标" @@ -34221,37 +34211,37 @@ msgstr "符号组合标记" # -#: unicoderange.c:118 +#: unicoderange.c:119 msgid "Number Forms" msgstr "数字形式" # -#: unicoderange.c:119 +#: unicoderange.c:120 msgid "Arrows" msgstr "箭头" # -#: unicoderange.c:120 +#: unicoderange.c:121 msgid "Mathematical Operators" msgstr "数学运算符号" # -#: unicoderange.c:121 +#: unicoderange.c:122 msgid "Miscellaneous Technical Symbols" msgstr "其他科技符号" # -#: unicoderange.c:123 +#: unicoderange.c:125 msgid "OCR" msgstr "OCR" # -#: unicoderange.c:130 +#: unicoderange.c:133 msgid "Zapf Dingbats" msgstr "花体字" # -#: unicoderange.c:131 +#: unicoderange.c:134 msgid "Miscellaneous Math Symbols-A" msgstr "其他数学符号A" @@ -34261,7 +34251,7 @@ msgstr "其他数学符号A" # -#: unicoderange.c:133 +#: unicoderange.c:136 msgid "Supplemental Arrows-A" msgstr "补充箭头 A" @@ -34271,7 +34261,7 @@ msgstr "补充箭头 A" # -#: unicoderange.c:136 +#: unicoderange.c:139 msgid "Supplemental Arrows-B" msgstr "补充箭头 B" @@ -34281,7 +34271,7 @@ msgstr "补充箭头 B" # -#: unicoderange.c:138 +#: unicoderange.c:141 msgid "Miscellaneous Math Symbols-B" msgstr "其他数学符号B" @@ -34291,7 +34281,7 @@ msgstr "其他数学符号B" # -#: unicoderange.c:140 +#: unicoderange.c:143 msgid "Supplemental Math Operators" msgstr "补充的数学运算符" @@ -34301,7 +34291,7 @@ msgstr "补充的数学运算符" # -#: unicoderange.c:142 +#: unicoderange.c:145 msgid "Supplemental Symbols and Arrows" msgstr "其它符号和箭头" @@ -34311,32 +34301,32 @@ msgstr "补充符号" # -#: unicoderange.c:144 +#: unicoderange.c:147 msgid "Alphabetic Extended" msgstr "字母扩展" # -#: unicoderange.c:146 +#: unicoderange.c:149 msgid "Latin Extended-C" msgstr "拉丁文扩展 C" # -#: unicoderange.c:147 +#: fontinfo.c:1032 unicoderange.c:150 msgid "Coptic" msgstr "科普特文" # -#: unicoderange.c:148 +#: unicoderange.c:151 msgid "Georgian Supplement" msgstr "格鲁吉亚文补充" # -#: unicoderange.c:150 +#: unicoderange.c:153 msgid "Ethiopic Extended" msgstr "埃塞额比亚文扩展" # -#: unicoderange.c:151 +#: unicoderange.c:155 msgid "Supplemental Punctuation" msgstr "补充标点符号" @@ -34346,118 +34336,118 @@ msgstr "中日韩部首" # -#: unicoderange.c:153 +#: unicoderange.c:158 msgid "Kanqxi Radicals" msgstr "康熙字典部首" -#: unicoderange.c:154 +#: unicoderange.c:159 msgid "Ideographic Description Characters" msgstr "" # -#: unicoderange.c:155 +#: unicoderange.c:160 msgid "CJK Phonetics and Symbols" msgstr "中日韩注音符号" # -#: unicoderange.c:161 +#: unicoderange.c:166 msgid "Kanbun" msgstr "日本汉字" # -#: unicoderange.c:162 +#: unicoderange.c:167 msgid "Bopomofo Extended" msgstr "注音字母扩展" # -#: unicoderange.c:163 +#: unicoderange.c:168 msgid "CJK Strokes" msgstr "中日韩笔画" # -#: unicoderange.c:164 +#: unicoderange.c:169 msgid "Katakana Phonetic Extensions" msgstr "片假名语音扩展" # -#: unicoderange.c:165 +#: fontinfo.c:1078 unicoderange.c:170 msgid "Enclosed CJK Letters and Months" msgstr "带圈的中日韩字符和月时" # -#: unicoderange.c:166 +#: unicoderange.c:171 msgid "CJK Enclosed Letters and Months" msgstr "带圈的中日韩字符和月时" # -#: unicoderange.c:168 +#: unicoderange.c:173 msgid "CJK Unified Ideographs Extension A" msgstr "中日韩统一表意符号扩展A" # -#: unicoderange.c:169 +#: fontinfo.c:1124 unicoderange.c:174 msgid "Yijing Hexagram Symbols" msgstr "易经卦符" -#: unicoderange.c:171 +#: unicoderange.c:176 msgid "Yi Syllables" msgstr "" # -#: unicoderange.c:172 +#: unicoderange.c:177 msgid "Yi" msgstr "彝语" # -#: unicoderange.c:173 +#: unicoderange.c:178 msgid "Yi Radicals" msgstr "彝文部首" -#: unicoderange.c:174 +#: unicoderange.c:179 msgid "Lisu" msgstr "" -#: unicoderange.c:175 +#: fontinfo.c:1036 unicoderange.c:180 msgid "Vai" msgstr "" -#: unicoderange.c:176 +#: unicoderange.c:181 msgid "Cyrillic Extended-B" msgstr "" -#: unicoderange.c:177 +#: unicoderange.c:182 msgid "Bamum" msgstr "" # -#: unicoderange.c:178 +#: unicoderange.c:183 msgid "Modifier Tone Letters" msgstr "修饰符语调字母" # -#: unicoderange.c:179 +#: unicoderange.c:184 msgid "Latin Extended-D" msgstr "拉丁文扩展 D" # -#: unicoderange.c:180 +#: fontinfo.c:1125 unicoderange.c:185 msgid "Syloti Nagri" msgstr "Syloti Nagri" # -#: unicoderange.c:181 +#: fontinfo.c:1077 unicoderange.c:187 msgid "Phags-pa" msgstr "八思巴文" -#: unicoderange.c:183 +#: unicoderange.c:189 msgid "Devanagari Extended" msgstr "" -#: unicoderange.c:186 +#: unicoderange.c:193 msgid "Javanese" msgstr "" -#: unicoderange.c:187 +#: fontinfo.c:1143 unicoderange.c:194 msgid "Cham" msgstr "" @@ -34465,31 +34455,31 @@ msgid "Myanmar Extended" msgstr "" -#: unicoderange.c:189 +#: unicoderange.c:196 msgid "Tai Viet" msgstr "" -#: unicoderange.c:190 +#: unicoderange.c:198 msgid "Meetei Mayek" msgstr "" # -#: unicoderange.c:192 +#: unicoderange.c:200 msgid "High Surrogate" msgstr "高半超大字符集" # -#: unicoderange.c:193 +#: unicoderange.c:201 msgid "Surrogate High" msgstr "高半超大字符集" # -#: unicoderange.c:194 +#: unicoderange.c:202 msgid "Surrogate High, Non Private Use" msgstr "非私用高半超大字符集" # -#: unicoderange.c:195 +#: unicoderange.c:203 msgid "Surrogate High, Private Use" msgstr "私用高半超大字符集" @@ -34504,37 +34494,37 @@ msgstr "私用空间" # -#: unicoderange.c:198 +#: unicoderange.c:206 msgid "Private Use" msgstr "私人应用" # -#: unicoderange.c:201 +#: unicoderange.c:209 msgid "Corporate Use" msgstr "企业应用" # -#: unicoderange.c:202 +#: unicoderange.c:210 msgid "MicroSoft Symbol Area" msgstr "微软符号区" # -#: unicoderange.c:205 +#: unicoderange.c:213 msgid "Latin Ligatures" msgstr "拉丁组合字" # -#: unicoderange.c:206 +#: unicoderange.c:214 msgid "Armenian Ligatures" msgstr "Armenian 组合字" # -#: unicoderange.c:207 +#: unicoderange.c:215 msgid "Hebrew Ligatures/Pointed Letters" msgstr "Hebrew Ligatures/Pointed Letters" # -#: unicoderange.c:208 +#: unicoderange.c:216 msgid "Arabic Presentation Forms A" msgstr "阿拉伯文表现形式 A" @@ -34549,289 +34539,289 @@ msgstr "组合半角标记" # -#: unicoderange.c:214 +#: unicoderange.c:222 msgid "Arabic Presentation Forms B" msgstr "阿拉伯文表现形式 B" # -#: unicoderange.c:215 +#: unicoderange.c:223 msgid "Byte Order Mark" msgstr "字节顺序标记" # -#: unicoderange.c:216 +#: unicoderange.c:224 msgid "Half and Full Width Forms" msgstr "半宽全宽形式" # -#: unicoderange.c:217 +#: unicoderange.c:225 msgid "Latin Full Width Forms" msgstr "拉丁全宽形式" # -#: unicoderange.c:218 +#: unicoderange.c:226 msgid "KataKana Half Width Forms" msgstr "KataKana Half Width Forms" # -#: unicoderange.c:219 +#: unicoderange.c:227 msgid "Hangul Jamo Half Width Forms" msgstr "韩语谚文半宽形式" # -#: unicoderange.c:221 +#: unicoderange.c:229 msgid "Not a Unicode Character" msgstr "非统一码字符" # -#: unicoderange.c:222 +#: unicoderange.c:230 msgid "Signature Mark" msgstr "签名标记" # -#: unicoderange.c:224 +#: unicoderange.c:232 msgid "Unicode Supplementary Multilingual Plane" msgstr "统一码补充多语言平面" # -#: unicoderange.c:225 +#: unicoderange.c:233 msgid "Supplementary Multilingual Plane" msgstr "补充多语言字符面" # -#: unicoderange.c:226 +#: unicoderange.c:234 msgid "Aegean scripts" msgstr "Aegean scripts" # -#: unicoderange.c:227 +#: unicoderange.c:235 msgid "Linear B Syllabary" msgstr "线性 B 字音表" # -#: unicoderange.c:228 +#: unicoderange.c:236 msgid "Linear B Ideograms" msgstr "线性 B 表意符号" # -#: unicoderange.c:229 +#: unicoderange.c:237 msgid "Aegean numbers" msgstr "Aegean numbers" # -#: unicoderange.c:230 +#: fontinfo.c:1127 unicoderange.c:238 msgid "Ancient Greek Numbers" msgstr "古希腊数字" -#: unicoderange.c:231 +#: fontinfo.c:1144 unicoderange.c:239 msgid "Ancient Symbols" msgstr "" -#: unicoderange.c:232 +#: fontinfo.c:1145 unicoderange.c:240 msgid "Phaistos Disc" msgstr "" # -#: unicoderange.c:235 +#: unicoderange.c:243 msgid "Alphabetic and syllabic LTR scripts" msgstr "字母与音节自左至右书写" # -#: unicoderange.c:238 +#: fontinfo.c:1128 unicoderange.c:246 msgid "Ugaritic" msgstr "乌加里特文" # -#: unicoderange.c:239 +#: fontinfo.c:1129 unicoderange.c:247 msgid "Old Persian" msgstr "古波斯文" # -#: unicoderange.c:243 +#: unicoderange.c:251 msgid "Alphabetic and syllabic RTL scripts" msgstr "字母与音节自右至左书写" -#: unicoderange.c:244 +#: fontinfo.c:1132 unicoderange.c:252 msgid "Cypriot Syllabary" msgstr "" -#: unicoderange.c:245 +#: unicoderange.c:253 msgid "Imperial Aramaic" msgstr "" # -#: unicoderange.c:246 +#: fontinfo.c:1082 unicoderange.c:254 msgid "Phoenician" msgstr "腓尼基语" # -#: unicoderange.c:248 +#: unicoderange.c:256 msgid "Kharosthi" msgstr "Kharosthi" -#: unicoderange.c:249 +#: unicoderange.c:257 msgid "Old South Arabian" msgstr "" -#: unicoderange.c:250 +#: unicoderange.c:258 msgid "Avestan" msgstr "" -#: unicoderange.c:251 +#: unicoderange.c:259 msgid "Inscriptional Parthian" msgstr "" -#: unicoderange.c:252 +#: unicoderange.c:260 msgid "Inscriptional Pahlavi" msgstr "" -#: unicoderange.c:253 +#: unicoderange.c:261 msgid "Old Turkic" msgstr "" -#: unicoderange.c:254 +#: unicoderange.c:265 msgid "Kaithi" msgstr "" # -#: unicoderange.c:256 +#: unicoderange.c:266 msgid "African and other syllabic scripts" msgstr "非洲等其他音节文字" -#: unicoderange.c:257 +#: unicoderange.c:267 msgid "Cuneiform and other Near Eastern Scripts" msgstr "" -#: unicoderange.c:258 +#: unicoderange.c:268 msgid "Cuneiform" msgstr "" # -#: unicoderange.c:259 +#: unicoderange.c:269 msgid "Sumero-Akkadian Cuneiform" msgstr "Sumero-Akkadian Cuneiform" # -#: unicoderange.c:260 +#: unicoderange.c:270 msgid "Cuneiform Numbers" msgstr "Cuneiform Numbers" -#: unicoderange.c:262 +#: unicoderange.c:272 msgid "Egyptian hieroglyphs" msgstr "" -#: unicoderange.c:263 +#: unicoderange.c:273 msgid "North American ideographs and pictograms" msgstr "" -#: unicoderange.c:264 +#: unicoderange.c:274 msgid "Egyptian and Mayan hieroglyphs" msgstr "" # -#: unicoderange.c:265 +#: unicoderange.c:276 msgid "Sumerian pictograms" msgstr "Sumerian pictograms" # -#: unicoderange.c:266 +#: unicoderange.c:277 msgid "Large Asian Scripts" msgstr "泛亚洲字符" # -#: unicoderange.c:267 +#: unicoderange.c:279 msgid "Notational systems" msgstr "符号系统" # -#: unicoderange.c:268 +#: unicoderange.c:280 msgid "Byzantine Musical Symbols" msgstr "拜占庭乐符" # -#: unicoderange.c:269 +#: unicoderange.c:281 msgid "Musical Symbols" msgstr "音乐符号" # -#: unicoderange.c:270 +#: unicoderange.c:282 msgid "Ancient Greek Musical Notation" msgstr "古希腊音符" # -#: unicoderange.c:271 +#: fontinfo.c:1134 unicoderange.c:283 msgid "Tai Xuan Jing Symbols" msgstr "太玄经符号" # -#: unicoderange.c:272 +#: unicoderange.c:284 msgid "Chinese counting rod numerals" msgstr "中文数目字" -#: unicoderange.c:274 +#: unicoderange.c:286 msgid "Mahjong Tiles" msgstr "" -#: unicoderange.c:275 +#: unicoderange.c:287 msgid "Domino Tiles" msgstr "" # -#: unicoderange.c:277 +#: unicoderange.c:296 msgid "Unicode Supplementary Ideographic Plane" msgstr "统一码补充表意字符" # -#: unicoderange.c:278 +#: unicoderange.c:297 msgid "Supplementary Ideographic Plane" msgstr "补充表意字符面" # -#: unicoderange.c:279 +#: unicoderange.c:298 msgid "CJK Unified Ideographs Extension B" msgstr "中日韩统一表意字符扩展B" # -#: unicoderange.c:280 +#: unicoderange.c:301 msgid "CJK Compatibility Ideographs Supplement" msgstr "中日韩兼容表意字符补充" # -#: unicoderange.c:282 +#: unicoderange.c:303 msgid "Unicode Supplementary Special-purpose Plane" msgstr "统一码增补特别用途平面" # -#: unicoderange.c:283 +#: unicoderange.c:304 msgid "Supplementary Special-purpose Plane" msgstr "增补特用平面" # -#: unicoderange.c:284 +#: unicoderange.c:305 msgid "Tag characters" msgstr "标签字符" -#: unicoderange.c:285 +#: unicoderange.c:306 msgid "Variation Selectors B" msgstr "" # -#: unicoderange.c:287 +#: unicoderange.c:308 msgid "Supplementary Private Use Area-A" msgstr "补充私用空间 A" # -#: unicoderange.c:288 +#: unicoderange.c:309 msgid "Supplementary Private Use Area-B" msgstr "补充私用空间 B" # -#: unicoderange.c:293 +#: unicoderange.c:314 msgid "Non-Unicode Glyphs" msgstr "非统一码字形" # -#: unicoderange.c:294 +#: unicoderange.c:315 msgid "Unassigned Code Points" msgstr "未定的编码点" @@ -35258,7 +35248,7 @@ msgstr "" # -#: ../gdraw/gmatrixedit.c:1571 +#: ../gdraw/gmatrixedit.c:1625 msgid "Row|New" msgstr "新建" diff -Nru language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/JabberBot.po language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/JabberBot.po --- language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/JabberBot.po 2012-05-08 22:47:35.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/JabberBot.po 2013-01-29 09:37:09.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: 2012-05-08 03:13+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2013-01-28 12:04+0000\n" +"X-Generator: Launchpad (build 16451)\n" #, python-format msgid "" diff -Nru language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/Linux-PAM.po language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/Linux-PAM.po --- language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/Linux-PAM.po 2012-05-08 22:47:34.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/Linux-PAM.po 2013-01-29 09:37:11.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: 2012-05-08 03:08+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2013-01-28 11:58+0000\n" +"X-Generator: Launchpad (build 16451)\n" #: libpam_misc/misc_conv.c:33 msgid "...Time is running out...\n" @@ -34,7 +34,7 @@ msgstr "有错误的转换 (%d)\n" #: libpam/pam_get_authtok.c:39 modules/pam_exec/pam_exec.c:142 -#: modules/pam_unix/pam_unix_auth.c:157 modules/pam_userdb/pam_userdb.c:63 +#: modules/pam_unix/pam_unix_auth.c:157 modules/pam_userdb/pam_userdb.c:64 msgid "Password: " msgstr "密码： " @@ -52,12 +52,12 @@ msgid "Sorry, passwords do not match." msgstr "抱歉，密码不匹配。" -#: libpam/pam_get_authtok.c:132 libpam/pam_get_authtok.c:208 +#: libpam/pam_get_authtok.c:133 libpam/pam_get_authtok.c:209 #, c-format msgid "Retype %s" msgstr "重新输入 %s" -#: libpam/pam_get_authtok.c:152 libpam/pam_get_authtok.c:221 +#: libpam/pam_get_authtok.c:153 libpam/pam_get_authtok.c:222 msgid "Password change aborted." msgstr "密码更改取消。" @@ -234,12 +234,12 @@ msgstr "以某些形式包含用户名" #: modules/pam_cracklib/pam_cracklib.c:555 -#: modules/pam_unix/pam_unix_passwd.c:475 +#: modules/pam_unix/pam_unix_passwd.c:476 msgid "No password supplied" msgstr "密码未提供" #: modules/pam_cracklib/pam_cracklib.c:555 -#: modules/pam_unix/pam_unix_passwd.c:475 +#: modules/pam_unix/pam_unix_passwd.c:476 msgid "Password unchanged" msgstr "密码未更改" @@ -315,38 +315,38 @@ msgid "Too many logins for '%s'." msgstr "“%s”登录过多。" -#: modules/pam_mail/pam_mail.c:318 +#: modules/pam_mail/pam_mail.c:297 msgid "No mail." msgstr "无邮件。" -#: modules/pam_mail/pam_mail.c:321 +#: modules/pam_mail/pam_mail.c:300 msgid "You have new mail." msgstr "您有新邮件。" -#: modules/pam_mail/pam_mail.c:324 +#: modules/pam_mail/pam_mail.c:303 msgid "You have old mail." msgstr "您有旧邮件。" -#: modules/pam_mail/pam_mail.c:328 +#: modules/pam_mail/pam_mail.c:307 msgid "You have mail." msgstr "您有邮件。" -#: modules/pam_mail/pam_mail.c:335 +#: modules/pam_mail/pam_mail.c:314 #, c-format msgid "You have no mail in folder %s." msgstr "您在文件夹 %s 中无邮件。" -#: modules/pam_mail/pam_mail.c:339 +#: modules/pam_mail/pam_mail.c:318 #, c-format msgid "You have new mail in folder %s." msgstr "您在文件夹 %s 中有新邮件。" -#: modules/pam_mail/pam_mail.c:343 +#: modules/pam_mail/pam_mail.c:322 #, c-format msgid "You have old mail in folder %s." msgstr "您在文件夹 %s 中有旧邮件。" -#: modules/pam_mail/pam_mail.c:348 +#: modules/pam_mail/pam_mail.c:327 #, c-format msgid "You have mail in folder %s." msgstr "您在文件夹 %s 中有邮件。" @@ -362,7 +362,7 @@ msgstr "无法创建和初始化目录 '%s'" #: modules/pam_pwhistory/pam_pwhistory.c:218 -#: modules/pam_unix/pam_unix_passwd.c:496 +#: modules/pam_unix/pam_unix_passwd.c:497 msgid "Password has been already used. Choose another." msgstr "密码已使用。请选择其他密码。" @@ -396,17 +396,17 @@ msgid "No default type for role %s\n" msgstr "没有角色 %s 默认类型\n" -#: modules/pam_selinux/pam_selinux.c:677 +#: modules/pam_selinux/pam_selinux.c:667 #, c-format msgid "Unable to get valid context for %s" msgstr "无法为 %s 获得有效环境" -#: modules/pam_selinux/pam_selinux.c:728 +#: modules/pam_selinux/pam_selinux.c:718 #, c-format msgid "Security Context %s Assigned" msgstr "已指派安全环境 %s" -#: modules/pam_selinux/pam_selinux.c:749 +#: modules/pam_selinux/pam_selinux.c:739 #, c-format msgid "Key Creation Context %s Assigned" msgstr "已分配密钥生成环境 %s" @@ -506,7 +506,7 @@ " [-u username] [--user username]\n" " [-r] [--reset[=n]] [--quiet]\n" -#: modules/pam_timestamp/pam_timestamp.c:339 +#: modules/pam_timestamp/pam_timestamp.c:345 #, c-format msgid "Access granted (last access was %ld seconds ago)." msgstr "可以访问（上次访问是 %ld 秒之前）。" @@ -539,27 +539,27 @@ msgid "NIS password could not be changed." msgstr "无法更改 NIS 密码。" -#: modules/pam_unix/pam_unix_passwd.c:492 +#: modules/pam_unix/pam_unix_passwd.c:493 msgid "You must choose a longer password" msgstr "必须选择更长的密码" -#: modules/pam_unix/pam_unix_passwd.c:597 +#: modules/pam_unix/pam_unix_passwd.c:600 #, c-format msgid "Changing password for %s." msgstr "更改 %s 的密码。" -#: modules/pam_unix/pam_unix_passwd.c:608 +#: modules/pam_unix/pam_unix_passwd.c:611 msgid "(current) UNIX password: " msgstr "（当前）UNIX 密码： " -#: modules/pam_unix/pam_unix_passwd.c:643 +#: modules/pam_unix/pam_unix_passwd.c:646 msgid "You must wait longer to change your password" msgstr "您必须等待更长时间以更改密码" -#: modules/pam_unix/pam_unix_passwd.c:703 +#: modules/pam_unix/pam_unix_passwd.c:706 msgid "Enter new UNIX password: " msgstr "输入新的 UNIX 密码： " -#: modules/pam_unix/pam_unix_passwd.c:704 +#: modules/pam_unix/pam_unix_passwd.c:707 msgid "Retype new UNIX password: " msgstr "重新输入新的 UNIX 密码： " diff -Nru language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/MoinMoin.po language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/MoinMoin.po --- language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/MoinMoin.po 2012-05-08 22:47:35.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/MoinMoin.po 2013-01-29 09:37:09.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: 2012-05-08 03:13+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2013-01-28 12:04+0000\n" +"X-Generator: Launchpad (build 16451)\n" msgid "The wiki is currently not reachable." msgstr "此 wiki 目前无法访问。" diff -Nru language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/NetworkManager.po language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/NetworkManager.po --- language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/NetworkManager.po 2012-05-08 22:47:50.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/NetworkManager.po 2013-01-29 09:37:08.000000000 +0000 @@ -13,19 +13,19 @@ "Report-Msgid-Bugs-To: " "http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager&component=gene" "ral\n" -"POT-Creation-Date: 2012-05-02 08:58+0000\n" +"POT-Creation-Date: 2012-10-16 23:04+0000\n" "PO-Revision-Date: 2011-06-01 00:01+0000\n" "Last-Translator: Aron Xu \n" "Language-Team: Chinese (simplified) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-08 04:58+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2013-01-28 13:56+0000\n" +"X-Generator: Launchpad (build 16451)\n" #: ../cli/src/common.c:32 ../cli/src/common.c:44 ../cli/src/common.c:52 -#: ../cli/src/common.c:63 ../cli/src/connections.c:125 -#: ../cli/src/connections.c:159 +#: ../cli/src/common.c:63 ../cli/src/connections.c:133 +#: ../cli/src/connections.c:167 msgid "GROUP" msgstr "" @@ -61,16 +61,16 @@ #. 0 #. used only for 'GENERAL' group listing -#: ../cli/src/connections.c:58 ../cli/src/connections.c:126 -#: ../cli/src/devices.c:103 ../cli/src/devices.c:124 ../cli/src/devices.c:134 -#: ../cli/src/devices.c:144 ../cli/src/devices.c:158 ../cli/src/devices.c:172 -#: ../cli/src/devices.c:194 +#: ../cli/src/connections.c:60 ../cli/src/connections.c:134 +#: ../cli/src/devices.c:108 ../cli/src/devices.c:132 ../cli/src/devices.c:142 +#: ../cli/src/devices.c:152 ../cli/src/devices.c:166 ../cli/src/devices.c:180 +#: ../cli/src/devices.c:202 ../cli/src/devices.c:218 ../cli/src/devices.c:227 msgid "NAME" msgstr "名称" #. 0 #. 1 -#: ../cli/src/connections.c:59 ../cli/src/connections.c:127 +#: ../cli/src/connections.c:61 ../cli/src/connections.c:135 msgid "UUID" msgstr "UUID" @@ -78,28 +78,29 @@ #. 0 #. 1 #. 2 -#: ../cli/src/connections.c:60 ../cli/src/connections.c:160 -#: ../cli/src/devices.c:69 ../cli/src/devices.c:105 ../cli/src/devices.c:197 +#: ../cli/src/connections.c:62 ../cli/src/connections.c:168 +#: ../cli/src/devices.c:72 ../cli/src/devices.c:110 ../cli/src/devices.c:205 msgid "TYPE" msgstr "类型" #. 2 -#: ../cli/src/connections.c:61 +#: ../cli/src/connections.c:63 msgid "TIMESTAMP" msgstr "时间戳" #. 3 -#: ../cli/src/connections.c:62 +#: ../cli/src/connections.c:64 msgid "TIMESTAMP-REAL" msgstr "真实时间戳" #. 4 -#: ../cli/src/connections.c:63 +#. 13 +#: ../cli/src/connections.c:65 ../cli/src/devices.c:122 msgid "AUTOCONNECT" msgstr "自动连接" #. 5 -#: ../cli/src/connections.c:64 +#: ../cli/src/connections.c:66 msgid "READONLY" msgstr "只读" @@ -108,96 +109,96 @@ #. 2 #. 11 #. 5 -#: ../cli/src/connections.c:65 ../cli/src/connections.c:134 -#: ../cli/src/devices.c:71 ../cli/src/devices.c:184 ../cli/src/devices.c:200 +#: ../cli/src/connections.c:67 ../cli/src/connections.c:142 +#: ../cli/src/devices.c:74 ../cli/src/devices.c:192 ../cli/src/devices.c:208 msgid "DBUS-PATH" msgstr "" #. 2 -#: ../cli/src/connections.c:128 +#: ../cli/src/connections.c:136 msgid "DEVICES" msgstr "设备" #. 3 #. 1 -#. 6 +#. 8 #. 1 -#: ../cli/src/connections.c:129 ../cli/src/devices.c:70 -#: ../cli/src/devices.c:110 ../cli/src/network-manager.c:39 +#: ../cli/src/connections.c:137 ../cli/src/devices.c:73 +#: ../cli/src/devices.c:117 ../cli/src/network-manager.c:39 msgid "STATE" msgstr "状态" #. 4 -#: ../cli/src/connections.c:130 +#: ../cli/src/connections.c:138 msgid "DEFAULT" msgstr "默认" #. 5 -#: ../cli/src/connections.c:131 +#: ../cli/src/connections.c:139 msgid "DEFAULT6" msgstr "" #. 6 -#: ../cli/src/connections.c:132 +#: ../cli/src/connections.c:140 msgid "SPEC-OBJECT" msgstr "SPEC 对象" #. 7 #. 1 -#: ../cli/src/connections.c:133 ../cli/src/connections.c:147 +#: ../cli/src/connections.c:141 ../cli/src/connections.c:155 msgid "VPN" msgstr "VPN" #. 9 -#: ../cli/src/connections.c:135 +#: ../cli/src/connections.c:143 msgid "CON-PATH" msgstr "" #. 10 -#: ../cli/src/connections.c:136 +#: ../cli/src/connections.c:144 msgid "ZONE" msgstr "" #. 11 -#: ../cli/src/connections.c:137 +#: ../cli/src/connections.c:145 msgid "MASTER-PATH" msgstr "" -#: ../cli/src/connections.c:145 ../cli/src/devices.c:80 +#: ../cli/src/connections.c:153 ../cli/src/devices.c:83 msgid "GENERAL" msgstr "常规" #. 0 -#: ../cli/src/connections.c:146 +#: ../cli/src/connections.c:154 msgid "IP" msgstr "" #. 1 -#: ../cli/src/connections.c:161 +#: ../cli/src/connections.c:169 msgid "USERNAME" msgstr "" #. 2 -#: ../cli/src/connections.c:162 +#: ../cli/src/connections.c:170 msgid "GATEWAY" msgstr "网关" #. 3 -#: ../cli/src/connections.c:163 +#: ../cli/src/connections.c:171 msgid "BANNER" msgstr "" #. 4 -#: ../cli/src/connections.c:164 +#: ../cli/src/connections.c:172 msgid "VPN-STATE" msgstr "" #. 5 -#: ../cli/src/connections.c:165 +#: ../cli/src/connections.c:173 msgid "CFG" msgstr "" -#: ../cli/src/connections.c:186 +#: ../cli/src/connections.c:190 #, c-format msgid "" "Usage: nmcli con { COMMAND | help }\n" @@ -213,283 +214,285 @@ " delete id | uuid \n" msgstr "" -#: ../cli/src/connections.c:240 ../cli/src/connections.c:591 +#: ../cli/src/connections.c:256 ../cli/src/connections.c:634 #, c-format msgid "Error: 'con list': %s" msgstr "错误：'con list': %s" -#: ../cli/src/connections.c:242 ../cli/src/connections.c:593 +#: ../cli/src/connections.c:258 ../cli/src/connections.c:636 #, c-format msgid "Error: 'con list': %s; allowed fields: %s" msgstr "错误：'con list': %s；允许的字段：%s" -#: ../cli/src/connections.c:250 +#: ../cli/src/connections.c:266 msgid "Connection details" msgstr "连接详情" -#: ../cli/src/connections.c:466 +#: ../cli/src/connections.c:509 msgid "never" msgstr "从不" #. "CAPABILITIES" #. Print header #. "WIFI-PROPERTIES" -#: ../cli/src/connections.c:467 ../cli/src/connections.c:468 -#: ../cli/src/connections.c:705 ../cli/src/connections.c:706 -#: ../cli/src/connections.c:708 ../cli/src/devices.c:605 -#: ../cli/src/devices.c:658 ../cli/src/devices.c:772 ../cli/src/devices.c:773 -#: ../cli/src/devices.c:805 ../cli/src/devices.c:831 ../cli/src/devices.c:832 -#: ../cli/src/devices.c:833 ../cli/src/devices.c:834 ../cli/src/devices.c:835 -#: ../cli/src/network-manager.c:267 ../cli/src/settings.c:657 -#: ../cli/src/settings.c:727 ../cli/src/settings.c:847 -#: ../cli/src/settings.c:1129 ../cli/src/settings.c:1130 -#: ../cli/src/settings.c:1132 ../cli/src/settings.c:1134 -#: ../cli/src/settings.c:1135 ../cli/src/settings.c:1263 -#: ../cli/src/settings.c:1264 ../cli/src/settings.c:1265 -#: ../cli/src/settings.c:1266 ../cli/src/settings.c:1341 -#: ../cli/src/settings.c:1342 ../cli/src/settings.c:1343 -#: ../cli/src/settings.c:1344 ../cli/src/settings.c:1345 -#: ../cli/src/settings.c:1346 ../cli/src/settings.c:1347 -#: ../cli/src/settings.c:1348 ../cli/src/settings.c:1349 -#: ../cli/src/settings.c:1350 ../cli/src/settings.c:1351 -#: ../cli/src/settings.c:1352 ../cli/src/settings.c:1353 -#: ../cli/src/settings.c:1424 +#: ../cli/src/connections.c:510 ../cli/src/connections.c:511 +#: ../cli/src/connections.c:739 ../cli/src/connections.c:740 +#: ../cli/src/connections.c:742 ../cli/src/devices.c:444 +#: ../cli/src/devices.c:497 ../cli/src/devices.c:615 ../cli/src/devices.c:616 +#: ../cli/src/devices.c:617 ../cli/src/devices.c:649 ../cli/src/devices.c:676 +#: ../cli/src/devices.c:677 ../cli/src/devices.c:678 ../cli/src/devices.c:679 +#: ../cli/src/devices.c:680 ../cli/src/network-manager.c:267 +#: ../cli/src/settings.c:748 ../cli/src/settings.c:823 +#: ../cli/src/settings.c:943 ../cli/src/settings.c:1226 +#: ../cli/src/settings.c:1227 ../cli/src/settings.c:1229 +#: ../cli/src/settings.c:1231 ../cli/src/settings.c:1232 +#: ../cli/src/settings.c:1363 ../cli/src/settings.c:1364 +#: ../cli/src/settings.c:1365 ../cli/src/settings.c:1366 +#: ../cli/src/settings.c:1443 ../cli/src/settings.c:1444 +#: ../cli/src/settings.c:1445 ../cli/src/settings.c:1446 +#: ../cli/src/settings.c:1447 ../cli/src/settings.c:1448 +#: ../cli/src/settings.c:1449 ../cli/src/settings.c:1450 +#: ../cli/src/settings.c:1451 ../cli/src/settings.c:1452 +#: ../cli/src/settings.c:1453 ../cli/src/settings.c:1454 +#: ../cli/src/settings.c:1455 ../cli/src/settings.c:1526 +#: ../cli/src/settings.c:1869 ../cli/src/settings.c:1906 msgid "yes" msgstr "是" -#: ../cli/src/connections.c:467 ../cli/src/connections.c:468 -#: ../cli/src/connections.c:705 ../cli/src/connections.c:706 -#: ../cli/src/connections.c:708 ../cli/src/devices.c:605 -#: ../cli/src/devices.c:658 ../cli/src/devices.c:772 ../cli/src/devices.c:773 -#: ../cli/src/devices.c:805 ../cli/src/devices.c:831 ../cli/src/devices.c:832 -#: ../cli/src/devices.c:833 ../cli/src/devices.c:834 ../cli/src/devices.c:835 -#: ../cli/src/network-manager.c:269 ../cli/src/settings.c:657 -#: ../cli/src/settings.c:659 ../cli/src/settings.c:727 -#: ../cli/src/settings.c:847 ../cli/src/settings.c:1129 -#: ../cli/src/settings.c:1130 ../cli/src/settings.c:1132 -#: ../cli/src/settings.c:1134 ../cli/src/settings.c:1135 -#: ../cli/src/settings.c:1263 ../cli/src/settings.c:1264 -#: ../cli/src/settings.c:1265 ../cli/src/settings.c:1266 -#: ../cli/src/settings.c:1341 ../cli/src/settings.c:1342 -#: ../cli/src/settings.c:1343 ../cli/src/settings.c:1344 -#: ../cli/src/settings.c:1345 ../cli/src/settings.c:1346 -#: ../cli/src/settings.c:1347 ../cli/src/settings.c:1348 -#: ../cli/src/settings.c:1349 ../cli/src/settings.c:1350 -#: ../cli/src/settings.c:1351 ../cli/src/settings.c:1352 -#: ../cli/src/settings.c:1353 ../cli/src/settings.c:1424 +#: ../cli/src/connections.c:510 ../cli/src/connections.c:511 +#: ../cli/src/connections.c:739 ../cli/src/connections.c:740 +#: ../cli/src/connections.c:742 ../cli/src/devices.c:444 +#: ../cli/src/devices.c:497 ../cli/src/devices.c:615 ../cli/src/devices.c:616 +#: ../cli/src/devices.c:617 ../cli/src/devices.c:649 ../cli/src/devices.c:676 +#: ../cli/src/devices.c:677 ../cli/src/devices.c:678 ../cli/src/devices.c:679 +#: ../cli/src/devices.c:680 ../cli/src/network-manager.c:269 +#: ../cli/src/settings.c:748 ../cli/src/settings.c:750 +#: ../cli/src/settings.c:823 ../cli/src/settings.c:943 +#: ../cli/src/settings.c:1226 ../cli/src/settings.c:1227 +#: ../cli/src/settings.c:1229 ../cli/src/settings.c:1231 +#: ../cli/src/settings.c:1232 ../cli/src/settings.c:1363 +#: ../cli/src/settings.c:1364 ../cli/src/settings.c:1365 +#: ../cli/src/settings.c:1366 ../cli/src/settings.c:1443 +#: ../cli/src/settings.c:1444 ../cli/src/settings.c:1445 +#: ../cli/src/settings.c:1446 ../cli/src/settings.c:1447 +#: ../cli/src/settings.c:1448 ../cli/src/settings.c:1449 +#: ../cli/src/settings.c:1450 ../cli/src/settings.c:1451 +#: ../cli/src/settings.c:1452 ../cli/src/settings.c:1453 +#: ../cli/src/settings.c:1454 ../cli/src/settings.c:1455 +#: ../cli/src/settings.c:1526 ../cli/src/settings.c:1869 +#: ../cli/src/settings.c:1906 msgid "no" msgstr "否" -#: ../cli/src/connections.c:542 +#: ../cli/src/connections.c:585 msgid "Connection list" msgstr "" -#: ../cli/src/connections.c:555 ../cli/src/connections.c:1088 -#: ../cli/src/connections.c:1456 ../cli/src/connections.c:1471 -#: ../cli/src/connections.c:1480 ../cli/src/connections.c:1490 -#: ../cli/src/connections.c:1502 ../cli/src/connections.c:1601 -#: ../cli/src/connections.c:1703 ../cli/src/devices.c:1212 -#: ../cli/src/devices.c:1222 ../cli/src/devices.c:1336 -#: ../cli/src/devices.c:1344 ../cli/src/devices.c:1718 -#: ../cli/src/devices.c:1725 ../cli/src/devices.c:1739 -#: ../cli/src/devices.c:1746 ../cli/src/devices.c:1763 -#: ../cli/src/devices.c:1774 ../cli/src/devices.c:1995 -#: ../cli/src/devices.c:2002 +#: ../cli/src/connections.c:598 ../cli/src/connections.c:1135 +#: ../cli/src/connections.c:1673 ../cli/src/connections.c:1688 +#: ../cli/src/connections.c:1697 ../cli/src/connections.c:1707 +#: ../cli/src/connections.c:1719 ../cli/src/connections.c:1828 +#: ../cli/src/connections.c:1930 ../cli/src/devices.c:1127 +#: ../cli/src/devices.c:1137 ../cli/src/devices.c:1255 +#: ../cli/src/devices.c:1263 ../cli/src/devices.c:1627 +#: ../cli/src/devices.c:1634 ../cli/src/devices.c:1648 +#: ../cli/src/devices.c:1655 ../cli/src/devices.c:1672 +#: ../cli/src/devices.c:1683 ../cli/src/devices.c:1904 +#: ../cli/src/devices.c:1911 #, c-format msgid "Error: %s argument is missing." msgstr "错误：缺少 %s 参数。" -#: ../cli/src/connections.c:568 +#: ../cli/src/connections.c:611 #, c-format msgid "Error: %s - no such connection." msgstr "错误：%s - 没有这个连接。" -#: ../cli/src/connections.c:574 ../cli/src/connections.c:1515 -#: ../cli/src/connections.c:1618 ../cli/src/connections.c:1710 -#: ../cli/src/devices.c:1009 ../cli/src/devices.c:1089 -#: ../cli/src/devices.c:1236 ../cli/src/devices.c:1350 -#: ../cli/src/devices.c:1787 ../cli/src/devices.c:2008 +#: ../cli/src/connections.c:617 ../cli/src/connections.c:1732 +#: ../cli/src/connections.c:1845 ../cli/src/connections.c:1937 +#: ../cli/src/devices.c:911 ../cli/src/devices.c:991 ../cli/src/devices.c:1151 +#: ../cli/src/devices.c:1269 ../cli/src/devices.c:1696 +#: ../cli/src/devices.c:1917 #, c-format msgid "Unknown parameter: %s\n" msgstr "未知参数：%s\n" -#: ../cli/src/connections.c:583 +#: ../cli/src/connections.c:626 #, c-format msgid "Error: no valid parameter specified." msgstr "错误：没有指定有效参数。" -#: ../cli/src/connections.c:598 ../cli/src/connections.c:1803 -#: ../cli/src/devices.c:2216 ../cli/src/network-manager.c:596 +#: ../cli/src/connections.c:641 ../cli/src/connections.c:2033 +#: ../cli/src/devices.c:2128 ../cli/src/network-manager.c:599 #, c-format msgid "Error: %s." msgstr "错误：%s。" -#: ../cli/src/connections.c:611 +#: ../cli/src/connections.c:654 msgid "activating" msgstr "激活中" -#: ../cli/src/connections.c:613 +#: ../cli/src/connections.c:656 msgid "activated" msgstr "已激活" -#: ../cli/src/connections.c:615 ../cli/src/devices.c:273 +#: ../cli/src/common.c:386 ../cli/src/connections.c:658 msgid "deactivating" msgstr "" -#: ../cli/src/connections.c:618 ../cli/src/connections.c:641 -#: ../cli/src/connections.c:1327 ../cli/src/devices.c:277 -#: ../cli/src/devices.c:806 ../cli/src/network-manager.c:123 +#: ../cli/src/common.c:390 ../cli/src/connections.c:661 +#: ../cli/src/connections.c:684 ../cli/src/connections.c:1376 +#: ../cli/src/devices.c:650 ../cli/src/network-manager.c:123 #: ../cli/src/network-manager.c:185 ../cli/src/network-manager.c:188 #: ../cli/src/network-manager.c:197 ../cli/src/network-manager.c:257 #: ../cli/src/network-manager.c:273 ../cli/src/network-manager.c:431 #: ../cli/src/network-manager.c:486 ../cli/src/network-manager.c:524 -#: ../cli/src/network-manager.c:563 ../cli/src/settings.c:563 -#: ../cli/src/settings.c:591 ../cli/src/utils.c:531 ../src/main.c:458 -#: ../src/main.c:477 +#: ../cli/src/network-manager.c:563 ../cli/src/settings.c:629 +#: ../cli/src/settings.c:657 ../cli/src/utils.c:533 ../src/main.c:434 +#: ../src/main.c:453 msgid "unknown" msgstr "未知" -#: ../cli/src/connections.c:627 +#: ../cli/src/connections.c:670 msgid "VPN connecting (prepare)" msgstr "VPN 连接(准备)" -#: ../cli/src/connections.c:629 +#: ../cli/src/connections.c:672 msgid "VPN connecting (need authentication)" msgstr "VPN 连接中(需要验证)" -#: ../cli/src/connections.c:631 +#: ../cli/src/connections.c:674 msgid "VPN connecting" msgstr "VPN 连接中" -#: ../cli/src/connections.c:633 +#: ../cli/src/connections.c:676 msgid "VPN connecting (getting IP configuration)" msgstr "VPN 连接中(获取 IP 配置)" -#: ../cli/src/connections.c:635 +#: ../cli/src/connections.c:678 msgid "VPN connected" msgstr "VPN 连接" -#: ../cli/src/connections.c:637 +#: ../cli/src/connections.c:680 msgid "VPN connection failed" msgstr "VPN 连接失败" -#: ../cli/src/connections.c:639 +#: ../cli/src/connections.c:682 msgid "VPN disconnected" msgstr "断开 VPN 连接" -#: ../cli/src/connections.c:892 ../cli/src/connections.c:1116 +#: ../cli/src/connections.c:939 ../cli/src/connections.c:1163 #, c-format msgid "Error: 'con status': %s" msgstr "错误：'con status': %s" -#: ../cli/src/connections.c:894 ../cli/src/connections.c:1118 +#: ../cli/src/connections.c:941 ../cli/src/connections.c:1165 #, c-format msgid "Error: 'con status': %s; allowed fields: %s" msgstr "错误：'con status': %s；允许的字段：%s" -#: ../cli/src/connections.c:902 +#: ../cli/src/connections.c:949 msgid "Active connection details" msgstr "" -#: ../cli/src/connections.c:1038 ../cli/src/connections.c:1530 -#: ../cli/src/connections.c:1633 ../cli/src/connections.c:1724 -#: ../cli/src/devices.c:1036 ../cli/src/devices.c:1098 -#: ../cli/src/devices.c:1251 ../cli/src/devices.c:1380 -#: ../cli/src/devices.c:1809 ../cli/src/devices.c:2037 +#: ../cli/src/connections.c:1085 ../cli/src/connections.c:1747 +#: ../cli/src/connections.c:1860 ../cli/src/connections.c:1951 +#: ../cli/src/devices.c:938 ../cli/src/devices.c:1000 +#: ../cli/src/devices.c:1166 ../cli/src/devices.c:1299 +#: ../cli/src/devices.c:1718 ../cli/src/devices.c:1946 #: ../cli/src/network-manager.c:311 #, c-format msgid "Error: Can't find out if NetworkManager is running: %s." msgstr "" -#: ../cli/src/connections.c:1042 ../cli/src/connections.c:1534 -#: ../cli/src/connections.c:1637 ../cli/src/connections.c:1728 -#: ../cli/src/devices.c:1040 ../cli/src/devices.c:1102 -#: ../cli/src/devices.c:1255 ../cli/src/devices.c:1384 -#: ../cli/src/devices.c:1813 ../cli/src/devices.c:2041 +#: ../cli/src/connections.c:1089 ../cli/src/connections.c:1751 +#: ../cli/src/connections.c:1864 ../cli/src/connections.c:1955 +#: ../cli/src/devices.c:942 ../cli/src/devices.c:1004 +#: ../cli/src/devices.c:1170 ../cli/src/devices.c:1303 +#: ../cli/src/devices.c:1722 ../cli/src/devices.c:1950 #: ../cli/src/network-manager.c:315 #, c-format msgid "Error: NetworkManager is not running." msgstr "" -#: ../cli/src/connections.c:1074 +#: ../cli/src/connections.c:1121 msgid "Active connections" msgstr "活跃连接" -#: ../cli/src/connections.c:1099 +#: ../cli/src/connections.c:1146 #, c-format msgid "Error: '%s' is not an active connection." msgstr "" -#: ../cli/src/connections.c:1104 +#: ../cli/src/connections.c:1151 #, c-format msgid "Error: unknown parameter: %s" msgstr "" -#: ../cli/src/connections.c:1211 +#: ../cli/src/connections.c:1258 #, c-format msgid "no active connection on device '%s'" msgstr "设备 '%s' 中没有活跃连接" -#: ../cli/src/connections.c:1219 -#, c-format +#: ../cli/src/connections.c:1266 msgid "no active connection or device" msgstr "没有活跃连接或者设备" -#: ../cli/src/connections.c:1290 +#: ../cli/src/connections.c:1337 #, c-format msgid "device '%s' not compatible with connection '%s'" msgstr "设备 '%s' 不兼容连接 '%s'" -#: ../cli/src/connections.c:1292 +#: ../cli/src/connections.c:1340 #, c-format msgid "no device found for connection '%s'" msgstr "没有找到可用于连接 '%s' 的设备" -#: ../cli/src/connections.c:1303 +#: ../cli/src/connections.c:1352 msgid "unknown reason" msgstr "未知原因" -#: ../cli/src/connections.c:1305 +#: ../cli/src/connections.c:1354 msgid "none" msgstr "无" -#: ../cli/src/connections.c:1307 +#: ../cli/src/connections.c:1356 msgid "the user was disconnected" msgstr "用户已断开连接" -#: ../cli/src/connections.c:1309 +#: ../cli/src/connections.c:1358 msgid "the base network connection was interrupted" msgstr "基点网络连接中断" -#: ../cli/src/connections.c:1311 +#: ../cli/src/connections.c:1360 msgid "the VPN service stopped unexpectedly" msgstr "VPN 服务意外停止" -#: ../cli/src/connections.c:1313 +#: ../cli/src/connections.c:1362 msgid "the VPN service returned invalid configuration" msgstr "VPN 服务返回无效配置" -#: ../cli/src/connections.c:1315 +#: ../cli/src/connections.c:1364 msgid "the connection attempt timed out" msgstr "连接尝试超时" -#: ../cli/src/connections.c:1317 +#: ../cli/src/connections.c:1366 msgid "the VPN service did not start in time" msgstr "VPN 连接没有按时启动" -#: ../cli/src/connections.c:1319 +#: ../cli/src/connections.c:1368 msgid "the VPN service failed to start" msgstr "VPN 服务启动失败" -#: ../cli/src/connections.c:1321 +#: ../cli/src/connections.c:1370 msgid "no valid VPN secrets" msgstr "没有有效的 VPN 加密" -#: ../cli/src/connections.c:1323 +#: ../cli/src/connections.c:1372 msgid "invalid VPN secrets" msgstr "无效 VPN 加密" -#: ../cli/src/connections.c:1325 +#: ../cli/src/connections.c:1374 msgid "the connection was removed" msgstr "连接被删除" @@ -503,7 +506,8 @@ msgid "Connection activated\n" msgstr "连接已激活\n" -#: ../cli/src/connections.c:1345 +#. Active connection failed and dissapeared, quit. +#: ../cli/src/connections.c:1396 ../cli/src/connections.c:1497 #, c-format msgid "Error: Connection activation failed." msgstr "错误：激活连接失败。" @@ -513,17 +517,17 @@ msgid "state: %s (%d)\n" msgstr "状态：%s (%d)\n" -#: ../cli/src/connections.c:1374 +#: ../cli/src/connections.c:1429 #, c-format msgid "Error: Connection activation failed: %s." msgstr "错误：激活连接失败：%s。" -#: ../cli/src/connections.c:1391 ../cli/src/devices.c:1158 +#: ../cli/src/connections.c:1526 ../cli/src/devices.c:1060 #, c-format msgid "Error: Timeout %d sec expired." msgstr "错误：超时 %d 秒过期。" -#: ../cli/src/connections.c:1404 +#: ../cli/src/connections.c:1587 #, c-format msgid "Error: Connection activation failed: %s" msgstr "错误：激活连接失败：%s" @@ -538,60 +542,60 @@ msgid "Active connection path: %s\n" msgstr "活跃连接路径：%s\n" -#: ../cli/src/connections.c:1464 ../cli/src/connections.c:1609 -#: ../cli/src/connections.c:1737 +#: ../cli/src/connections.c:1681 ../cli/src/connections.c:1836 +#: ../cli/src/connections.c:1964 #, c-format msgid "Error: Unknown connection: %s." msgstr "错误：未知连接：%s" -#: ../cli/src/connections.c:1510 ../cli/src/devices.c:1230 -#: ../cli/src/devices.c:1782 +#: ../cli/src/connections.c:1727 ../cli/src/devices.c:1145 +#: ../cli/src/devices.c:1691 #, c-format msgid "Error: timeout value '%s' is not valid." msgstr "错误：超时值 '%s' 无效。" -#: ../cli/src/connections.c:1523 ../cli/src/connections.c:1626 -#: ../cli/src/connections.c:1717 +#: ../cli/src/connections.c:1740 ../cli/src/connections.c:1853 +#: ../cli/src/connections.c:1944 #, c-format msgid "Error: id or uuid has to be specified." msgstr "错误：必须指定 ID 或者 UUID。" -#: ../cli/src/connections.c:1555 +#: ../cli/src/connections.c:1773 #, c-format msgid "Error: No suitable device found: %s." msgstr "错误：没有找到合适的设备：%s。" -#: ../cli/src/connections.c:1557 +#: ../cli/src/connections.c:1775 #, c-format msgid "Error: No suitable device found." msgstr "错误：没有找到合适的设备。" -#: ../cli/src/connections.c:1662 +#: ../cli/src/connections.c:1889 #, c-format msgid "Warning: Connection not active\n" msgstr "警告：连接没有激活\n" -#: ../cli/src/connections.c:1676 +#: ../cli/src/connections.c:1903 #, c-format msgid "Error: Connection deletion failed: %s" msgstr "" -#: ../cli/src/connections.c:1794 +#: ../cli/src/connections.c:2024 #, c-format msgid "Error: 'con' command '%s' is not valid." msgstr "错误：'con' 命令 '%s' 无效。" -#: ../cli/src/connections.c:1859 +#: ../cli/src/connections.c:2092 #, c-format msgid "Error: could not connect to D-Bus." msgstr "错误：无法连接到 D-Bus。" -#: ../cli/src/connections.c:1867 +#: ../cli/src/connections.c:2100 #, c-format msgid "Error: Could not get system settings." msgstr "错误：无法获得系统设置。" -#: ../cli/src/connections.c:1877 +#: ../cli/src/connections.c:2110 #, c-format msgid "Error: Can't obtain connections: settings service is not running." msgstr "" @@ -599,226 +603,226 @@ #. 0 #. 9 #. 3 -#: ../cli/src/devices.c:68 ../cli/src/devices.c:104 ../cli/src/devices.c:182 -#: ../cli/src/devices.c:198 +#: ../cli/src/devices.c:71 ../cli/src/devices.c:109 ../cli/src/devices.c:190 +#: ../cli/src/devices.c:206 msgid "DEVICE" msgstr "设备" #. 0 -#: ../cli/src/devices.c:81 +#: ../cli/src/devices.c:84 msgid "CAPABILITIES" msgstr "功能" #. 1 -#: ../cli/src/devices.c:82 +#: ../cli/src/devices.c:85 msgid "WIFI-PROPERTIES" msgstr "WIFI 属性" #. 2 -#: ../cli/src/devices.c:83 +#: ../cli/src/devices.c:86 msgid "AP" msgstr "AP" #. 3 -#: ../cli/src/devices.c:84 +#: ../cli/src/devices.c:87 msgid "WIRED-PROPERTIES" msgstr "有线连接属性" #. 4 -#: ../cli/src/devices.c:85 +#: ../cli/src/devices.c:88 msgid "WIMAX-PROPERTIES" msgstr "" #. 5 #. 0 -#: ../cli/src/devices.c:86 ../cli/src/devices.c:195 +#: ../cli/src/devices.c:89 ../cli/src/devices.c:203 msgid "NSP" msgstr "" #. 6 -#: ../cli/src/devices.c:87 +#: ../cli/src/devices.c:90 msgid "IP4" msgstr "" #. 7 -#: ../cli/src/devices.c:88 +#: ../cli/src/devices.c:91 msgid "DHCP4" msgstr "" #. 8 -#: ../cli/src/devices.c:89 +#: ../cli/src/devices.c:92 msgid "IP6" msgstr "" #. 9 -#: ../cli/src/devices.c:90 +#: ../cli/src/devices.c:93 msgid "DHCP6" msgstr "" #. 2 -#: ../cli/src/devices.c:106 +#: ../cli/src/devices.c:111 msgid "VENDOR" msgstr "" #. 3 -#: ../cli/src/devices.c:107 +#: ../cli/src/devices.c:112 msgid "PRODUCT" msgstr "" #. 4 -#: ../cli/src/devices.c:108 +#: ../cli/src/devices.c:113 msgid "DRIVER" msgstr "驱动程序" -#. 5 -#: ../cli/src/devices.c:109 +#. 7 +#: ../cli/src/devices.c:116 msgid "HWADDR" msgstr "硬盘" -#. 7 -#: ../cli/src/devices.c:111 +#. 9 +#: ../cli/src/devices.c:118 msgid "REASON" msgstr "" -#. 8 -#: ../cli/src/devices.c:112 +#. 10 +#: ../cli/src/devices.c:119 msgid "UDI" msgstr "" -#. 9 -#: ../cli/src/devices.c:113 +#. 11 +#: ../cli/src/devices.c:120 msgid "IP-IFACE" msgstr "" -#. 10 -#: ../cli/src/devices.c:114 +#. 12 +#: ../cli/src/devices.c:121 msgid "NM-MANAGED" msgstr "" -#. 11 -#: ../cli/src/devices.c:115 +#. 14 +#: ../cli/src/devices.c:123 msgid "FIRMWARE-MISSING" msgstr "" -#. 12 -#: ../cli/src/devices.c:116 +#. 15 +#: ../cli/src/devices.c:124 msgid "CONNECTION" msgstr "" #. 0 -#: ../cli/src/devices.c:125 +#: ../cli/src/devices.c:133 msgid "CARRIER-DETECT" msgstr "容器探测" #. 1 -#: ../cli/src/devices.c:126 +#: ../cli/src/devices.c:134 msgid "SPEED" msgstr "速度" #. 0 -#: ../cli/src/devices.c:135 +#: ../cli/src/devices.c:143 msgid "CARRIER" msgstr "容器" #. 0 -#: ../cli/src/devices.c:145 +#: ../cli/src/devices.c:153 msgid "WEP" msgstr "WEP" #. 1 -#: ../cli/src/devices.c:146 +#: ../cli/src/devices.c:154 msgid "WPA" msgstr "WPA" #. 2 -#: ../cli/src/devices.c:147 +#: ../cli/src/devices.c:155 msgid "WPA2" msgstr "WPA2" #. 3 -#: ../cli/src/devices.c:148 +#: ../cli/src/devices.c:156 msgid "TKIP" msgstr "TKIP" #. 4 -#: ../cli/src/devices.c:149 +#: ../cli/src/devices.c:157 msgid "CCMP" msgstr "CCMP" #. 0 -#: ../cli/src/devices.c:159 +#: ../cli/src/devices.c:167 msgid "CTR-FREQ" msgstr "" #. 1 -#: ../cli/src/devices.c:160 +#: ../cli/src/devices.c:168 msgid "RSSI" msgstr "" #. 2 -#: ../cli/src/devices.c:161 +#: ../cli/src/devices.c:169 msgid "CINR" msgstr "" #. 3 -#: ../cli/src/devices.c:162 +#: ../cli/src/devices.c:170 msgid "TX-POW" msgstr "" #. 4 -#: ../cli/src/devices.c:163 +#: ../cli/src/devices.c:171 msgid "BSID" msgstr "" #. 0 -#: ../cli/src/devices.c:173 +#: ../cli/src/devices.c:181 msgid "SSID" msgstr "SSID" #. 1 -#: ../cli/src/devices.c:174 +#: ../cli/src/devices.c:182 msgid "BSSID" msgstr "BSSID" #. 2 -#: ../cli/src/devices.c:175 +#: ../cli/src/devices.c:183 msgid "MODE" msgstr "型号" #. 3 -#: ../cli/src/devices.c:176 +#: ../cli/src/devices.c:184 msgid "FREQ" msgstr "FREQ" #. 4 -#: ../cli/src/devices.c:177 +#: ../cli/src/devices.c:185 msgid "RATE" msgstr "频率" #. 5 #. 1 -#: ../cli/src/devices.c:178 ../cli/src/devices.c:196 +#: ../cli/src/devices.c:186 ../cli/src/devices.c:204 msgid "SIGNAL" msgstr "信号" #. 6 -#: ../cli/src/devices.c:179 +#: ../cli/src/devices.c:187 msgid "SECURITY" msgstr "安全性" #. 7 -#: ../cli/src/devices.c:180 +#: ../cli/src/devices.c:188 msgid "WPA-FLAGS" msgstr "WPA-标志" #. 8 -#: ../cli/src/devices.c:181 +#: ../cli/src/devices.c:189 msgid "RSN-FLAGS" msgstr "RSN-标志" #. 10 #. 4 -#: ../cli/src/devices.c:183 ../cli/src/devices.c:199 +#: ../cli/src/devices.c:191 ../cli/src/devices.c:207 msgid "ACTIVE" msgstr "活跃" @@ -839,461 +843,461 @@ "\n" msgstr "" -#: ../cli/src/devices.c:253 +#: ../cli/src/common.c:366 msgid "unmanaged" msgstr "未管理" -#: ../cli/src/devices.c:255 +#: ../cli/src/common.c:368 msgid "unavailable" msgstr "不可用" -#: ../cli/src/devices.c:257 ../cli/src/network-manager.c:120 +#: ../cli/src/common.c:370 ../cli/src/network-manager.c:120 msgid "disconnected" msgstr "已断开" -#: ../cli/src/devices.c:259 +#: ../cli/src/common.c:372 msgid "connecting (prepare)" msgstr "连接中(准备)" -#: ../cli/src/devices.c:261 +#: ../cli/src/common.c:374 msgid "connecting (configuring)" msgstr "连接中(配置)" -#: ../cli/src/devices.c:263 +#: ../cli/src/common.c:376 msgid "connecting (need authentication)" msgstr "连接中(需要验证)" -#: ../cli/src/devices.c:265 +#: ../cli/src/common.c:378 msgid "connecting (getting IP configuration)" msgstr "连接中(获得 IP 配置)" -#: ../cli/src/devices.c:267 +#: ../cli/src/common.c:380 msgid "connecting (checking IP connectivity)" msgstr "" -#: ../cli/src/devices.c:269 +#: ../cli/src/common.c:382 msgid "connecting (starting secondary connections)" msgstr "" -#: ../cli/src/devices.c:271 ../cli/src/network-manager.c:116 +#: ../cli/src/common.c:384 ../cli/src/network-manager.c:116 msgid "connected" msgstr "连接的" -#: ../cli/src/devices.c:275 +#: ../cli/src/common.c:388 msgid "connection failed" msgstr "连接失败" -#: ../cli/src/devices.c:286 +#: ../cli/src/common.c:399 msgid "No reason given" msgstr "" -#: ../cli/src/devices.c:289 +#: ../cli/src/common.c:402 msgid "Unknown error" msgstr "" -#: ../cli/src/devices.c:292 +#: ../cli/src/common.c:405 msgid "Device is now managed" msgstr "" -#: ../cli/src/devices.c:295 +#: ../cli/src/common.c:408 msgid "Device is now unmanaged" msgstr "" -#: ../cli/src/devices.c:298 +#: ../cli/src/common.c:411 msgid "The device could not be readied for configuration" msgstr "" -#: ../cli/src/devices.c:301 +#: ../cli/src/devices.c:291 msgid "" "IP configuration could not be reserved (no available address, timeout, etc)" msgstr "" -#: ../cli/src/devices.c:304 +#: ../cli/src/common.c:417 msgid "The IP configuration is no longer valid" msgstr "" -#: ../cli/src/devices.c:307 +#: ../cli/src/common.c:420 msgid "Secrets were required, but not provided" msgstr "" -#: ../cli/src/devices.c:310 +#: ../cli/src/common.c:423 msgid "802.1X supplicant disconnected" msgstr "" -#: ../cli/src/devices.c:313 +#: ../cli/src/common.c:426 msgid "802.1X supplicant configuration failed" msgstr "" -#: ../cli/src/devices.c:316 +#: ../cli/src/common.c:429 msgid "802.1X supplicant failed" msgstr "" -#: ../cli/src/devices.c:319 +#: ../cli/src/common.c:432 msgid "802.1X supplicant took too long to authenticate" msgstr "" -#: ../cli/src/devices.c:322 +#: ../cli/src/common.c:435 msgid "PPP service failed to start" msgstr "" -#: ../cli/src/devices.c:325 +#: ../cli/src/common.c:438 msgid "PPP service disconnected" msgstr "" -#: ../cli/src/devices.c:328 +#: ../cli/src/common.c:441 msgid "PPP failed" msgstr "" -#: ../cli/src/devices.c:331 +#: ../cli/src/common.c:444 msgid "DHCP client failed to start" msgstr "" -#: ../cli/src/devices.c:334 +#: ../cli/src/common.c:447 msgid "DHCP client error" msgstr "" -#: ../cli/src/devices.c:337 +#: ../cli/src/common.c:450 msgid "DHCP client failed" msgstr "" -#: ../cli/src/devices.c:340 +#: ../cli/src/common.c:453 msgid "Shared connection service failed to start" msgstr "" -#: ../cli/src/devices.c:343 +#: ../cli/src/common.c:456 msgid "Shared connection service failed" msgstr "" -#: ../cli/src/devices.c:346 +#: ../cli/src/common.c:459 msgid "AutoIP service failed to start" msgstr "" -#: ../cli/src/devices.c:349 +#: ../cli/src/common.c:462 msgid "AutoIP service error" msgstr "" -#: ../cli/src/devices.c:352 +#: ../cli/src/common.c:465 msgid "AutoIP service failed" msgstr "" -#: ../cli/src/devices.c:355 +#: ../cli/src/common.c:468 msgid "The line is busy" msgstr "" -#: ../cli/src/devices.c:358 +#: ../cli/src/common.c:471 msgid "No dial tone" msgstr "" -#: ../cli/src/devices.c:361 +#: ../cli/src/common.c:474 msgid "No carrier could be established" msgstr "" -#: ../cli/src/devices.c:364 +#: ../cli/src/common.c:477 msgid "The dialing request timed out" msgstr "" -#: ../cli/src/devices.c:367 +#: ../cli/src/common.c:480 msgid "The dialing attempt failed" msgstr "" -#: ../cli/src/devices.c:370 +#: ../cli/src/common.c:483 msgid "Modem initialization failed" msgstr "" -#: ../cli/src/devices.c:373 +#: ../cli/src/common.c:486 msgid "Failed to select the specified APN" msgstr "" -#: ../cli/src/devices.c:376 +#: ../cli/src/common.c:489 msgid "Not searching for networks" msgstr "" -#: ../cli/src/devices.c:379 +#: ../cli/src/common.c:492 msgid "Network registration denied" msgstr "" -#: ../cli/src/devices.c:382 +#: ../cli/src/common.c:495 msgid "Network registration timed out" msgstr "" -#: ../cli/src/devices.c:385 +#: ../cli/src/common.c:498 msgid "Failed to register with the requested network" msgstr "" -#: ../cli/src/devices.c:388 +#: ../cli/src/common.c:501 msgid "PIN check failed" msgstr "" -#: ../cli/src/devices.c:391 +#: ../cli/src/common.c:504 msgid "Necessary firmware for the device may be missing" msgstr "" -#: ../cli/src/devices.c:394 +#: ../cli/src/common.c:507 msgid "The device was removed" msgstr "" -#: ../cli/src/devices.c:397 +#: ../cli/src/common.c:510 msgid "NetworkManager went to sleep" msgstr "" -#: ../cli/src/devices.c:400 +#: ../cli/src/common.c:513 msgid "The device's active connection disappeared" msgstr "" -#: ../cli/src/devices.c:403 +#: ../cli/src/common.c:516 msgid "Device disconnected by user or client" msgstr "" -#: ../cli/src/devices.c:406 +#: ../cli/src/common.c:519 msgid "Carrier/link changed" msgstr "" -#: ../cli/src/devices.c:409 +#: ../cli/src/common.c:522 msgid "The device's existing connection was assumed" msgstr "" -#: ../cli/src/devices.c:412 +#: ../cli/src/common.c:525 msgid "The supplicant is now available" msgstr "" -#: ../cli/src/devices.c:415 +#: ../cli/src/common.c:528 msgid "The modem could not be found" msgstr "" -#: ../cli/src/devices.c:418 +#: ../cli/src/common.c:531 msgid "The Bluetooth connection failed or timed out" msgstr "" -#: ../cli/src/devices.c:421 +#: ../cli/src/common.c:534 msgid "GSM Modem's SIM card not inserted" msgstr "" -#: ../cli/src/devices.c:424 +#: ../cli/src/common.c:537 msgid "GSM Modem's SIM PIN required" msgstr "" -#: ../cli/src/devices.c:427 +#: ../cli/src/common.c:540 msgid "GSM Modem's SIM PUK required" msgstr "" -#: ../cli/src/devices.c:430 +#: ../cli/src/common.c:543 msgid "GSM Modem's SIM wrong" msgstr "" -#: ../cli/src/devices.c:433 +#: ../cli/src/common.c:546 msgid "InfiniBand device does not support connected mode" msgstr "" -#: ../cli/src/devices.c:436 +#: ../cli/src/common.c:549 msgid "A dependency of the connection failed" msgstr "" -#: ../cli/src/devices.c:438 ../cli/src/devices.c:461 ../cli/src/devices.c:477 -#: ../cli/src/devices.c:597 ../cli/src/devices.c:641 +#: ../cli/src/common.c:564 ../cli/src/devices.c:296 ../cli/src/devices.c:314 +#: ../cli/src/devices.c:436 ../cli/src/devices.c:480 msgid "Unknown" msgstr "未知" -#: ../cli/src/devices.c:510 +#: ../cli/src/devices.c:347 msgid "(none)" msgstr "(无)" -#: ../cli/src/devices.c:566 +#: ../cli/src/devices.c:403 #, c-format msgid "%u MHz" msgstr "%u MHz" -#: ../cli/src/devices.c:567 +#: ../cli/src/devices.c:404 #, c-format msgid "%u MB/s" msgstr "%u MB/s" -#: ../cli/src/devices.c:576 +#: ../cli/src/devices.c:413 msgid "Encrypted: " msgstr "加密： " -#: ../cli/src/devices.c:581 +#: ../cli/src/devices.c:418 msgid "WEP " msgstr "WEP " -#: ../cli/src/devices.c:583 +#: ../cli/src/devices.c:420 msgid "WPA " msgstr "WPA " -#: ../cli/src/devices.c:585 +#: ../cli/src/devices.c:422 msgid "WPA2 " msgstr "WPA2 " -#: ../cli/src/devices.c:588 +#: ../cli/src/devices.c:425 msgid "Enterprise " msgstr "企业级 " -#: ../cli/src/devices.c:597 +#: ../cli/src/devices.c:434 msgid "Ad-Hoc" msgstr "Ad-Hoc" -#: ../cli/src/devices.c:597 +#: ../cli/src/devices.c:435 msgid "Infrastructure" msgstr "基础构架" -#: ../cli/src/devices.c:632 +#: ../cli/src/devices.c:471 msgid "Home" msgstr "" -#: ../cli/src/devices.c:635 +#: ../cli/src/devices.c:474 msgid "Partner" msgstr "" -#: ../cli/src/devices.c:638 +#: ../cli/src/devices.c:477 msgid "Roaming" msgstr "" -#: ../cli/src/devices.c:710 +#: ../cli/src/devices.c:549 #, c-format msgid "Error: 'dev list': %s" msgstr "错误：'dev list': %s" -#: ../cli/src/devices.c:712 +#: ../cli/src/devices.c:551 #, c-format msgid "Error: 'dev list': %s; allowed fields: %s" msgstr "错误：'dev list': %s；允许的字段：%s" -#: ../cli/src/devices.c:721 +#: ../cli/src/devices.c:560 msgid "Device details" msgstr "设备详情" -#: ../cli/src/devices.c:766 ../cli/src/devices.c:767 ../cli/src/devices.c:1174 -#: ../cli/src/utils.c:477 +#: ../cli/src/devices.c:607 ../cli/src/devices.c:610 ../cli/src/devices.c:1086 +#: ../cli/src/utils.c:479 msgid "(unknown)" msgstr "(未知)" -#: ../cli/src/devices.c:775 +#: ../cli/src/devices.c:619 msgid "not connected" msgstr "" -#: ../cli/src/devices.c:802 +#: ../cli/src/devices.c:646 #, c-format msgid "%u Mb/s" msgstr "%u Mb/s" #. Print header #. "WIRED-PROPERTIES" -#: ../cli/src/devices.c:875 +#: ../cli/src/devices.c:720 msgid "on" msgstr "开" -#: ../cli/src/devices.c:875 +#: ../cli/src/devices.c:720 msgid "off" msgstr "关" -#: ../cli/src/devices.c:1026 +#: ../cli/src/devices.c:928 #, c-format msgid "Error: 'dev status': %s" msgstr "错误：'dev status': %s" -#: ../cli/src/devices.c:1028 +#: ../cli/src/devices.c:930 #, c-format msgid "Error: 'dev status': %s; allowed fields: %s" msgstr "错误：'dev status': %s；允许的字段：%s" -#: ../cli/src/devices.c:1051 +#: ../cli/src/devices.c:953 msgid "Status of devices" msgstr "设备状态" -#: ../cli/src/devices.c:1082 +#: ../cli/src/devices.c:984 #, c-format msgid "Error: '%s' argument is missing." msgstr "错误：缺少 '%s' 参数。" -#: ../cli/src/devices.c:1123 ../cli/src/devices.c:1275 -#: ../cli/src/devices.c:1412 ../cli/src/devices.c:2069 +#: ../cli/src/devices.c:1025 ../cli/src/devices.c:1190 +#: ../cli/src/devices.c:1331 ../cli/src/devices.c:1978 #, c-format msgid "Error: Device '%s' not found." msgstr "错误：没有找到设备 '%s'。" -#: ../cli/src/devices.c:1146 +#: ../cli/src/devices.c:1048 #, c-format msgid "Success: Device '%s' successfully disconnected." msgstr "成功：成功断开设备 '%s'。" -#: ../cli/src/devices.c:1171 +#: ../cli/src/devices.c:1083 #, c-format msgid "Error: Device '%s' (%s) disconnecting failed: %s" msgstr "错误：断开设备 '%s'(%s)失败：%s" -#: ../cli/src/devices.c:1179 +#: ../cli/src/devices.c:1169 #, c-format msgid "Device state: %d (%s)\n" msgstr "设备状态：%d (%s)\n" -#: ../cli/src/devices.c:1244 +#: ../cli/src/devices.c:1159 #, c-format msgid "Error: iface has to be specified." msgstr "错误：没有指定 iface。" -#: ../cli/src/devices.c:1370 +#: ../cli/src/devices.c:1289 #, c-format msgid "Error: 'dev wifi': %s" msgstr "错误：'dev wifi'：%s" -#: ../cli/src/devices.c:1372 +#: ../cli/src/devices.c:1291 #, c-format msgid "Error: 'dev wifi': %s; allowed fields: %s" msgstr "错误：'dev wifi': %s；允许的字段：%s" -#: ../cli/src/devices.c:1395 +#: ../cli/src/devices.c:1314 msgid "WiFi scan list" msgstr "WiFi 扫描列表" -#: ../cli/src/devices.c:1432 ../cli/src/devices.c:1486 +#: ../cli/src/devices.c:1351 ../cli/src/devices.c:1405 #, c-format msgid "Error: Access point with bssid '%s' not found." msgstr "" -#: ../cli/src/devices.c:1449 +#: ../cli/src/devices.c:1368 #, c-format msgid "Error: Device '%s' is not a WiFi device." msgstr "错误：设备 '%s' 不是 WiFi 设备。" -#: ../cli/src/devices.c:1951 +#: ../cli/src/devices.c:1860 #, c-format msgid "Error: 'dev wifi' command '%s' is not valid." msgstr "错误：'dev wifi' 命令 '%s' 无效。" -#: ../cli/src/devices.c:2027 +#: ../cli/src/devices.c:1936 #, c-format msgid "Error: 'dev wimax': %s" msgstr "" -#: ../cli/src/devices.c:2029 +#: ../cli/src/devices.c:1938 #, c-format msgid "Error: 'dev wimax': %s; allowed fields: %s" msgstr "" -#: ../cli/src/devices.c:2052 +#: ../cli/src/devices.c:1961 msgid "WiMAX NSP list" msgstr "" -#: ../cli/src/devices.c:2089 +#: ../cli/src/devices.c:1998 #, c-format msgid "Error: NSP with name '%s' not found." msgstr "" -#: ../cli/src/devices.c:2100 +#: ../cli/src/devices.c:2009 #, c-format msgid "Error: Device '%s' is not a WiMAX device." msgstr "" -#: ../cli/src/devices.c:2131 +#: ../cli/src/devices.c:2040 #, c-format msgid "Error: Access point with nsp '%s' not found." msgstr "" -#: ../cli/src/devices.c:2158 +#: ../cli/src/devices.c:2067 #, c-format msgid "Error: 'dev wimax' command '%s' is not valid." msgstr "" -#: ../cli/src/devices.c:2208 +#: ../cli/src/devices.c:2120 #, c-format msgid "Error: 'dev' command '%s' is not valid." msgstr "错误：'dev' 命令 '%s' 无效。" @@ -1422,7 +1426,7 @@ msgid "not running" msgstr "未运行" -#: ../cli/src/network-manager.c:350 ../cli/src/utils.c:457 +#: ../cli/src/network-manager.c:350 ../cli/src/utils.c:459 #, c-format msgid "Error: Couldn't connect to system bus: %s" msgstr "错误：无法连接到系统总线：%s" @@ -1489,12 +1493,12 @@ msgid "Error: invalid 'wimax' parameter: '%s'." msgstr "" -#: ../cli/src/network-manager.c:585 +#: ../cli/src/network-manager.c:588 #, c-format msgid "Error: 'nm' command '%s' is not valid." msgstr "错误：'nm' 命令 '%s' 无效。" -#: ../cli/src/nmcli.c:64 +#: ../cli/src/nmcli.c:76 #, c-format msgid "" "Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n" @@ -1518,219 +1522,218 @@ "\n" msgstr "" -#: ../cli/src/nmcli.c:109 +#: ../cli/src/nmcli.c:124 #, c-format msgid "Error: Object '%s' is unknown, try 'nmcli help'." msgstr "错误：对象 '%s' 未知，尝试 'nmcli help'。" -#: ../cli/src/nmcli.c:139 +#: ../cli/src/nmcli.c:154 #, c-format msgid "Error: Option '--terse' is specified the second time." msgstr "错误：第二次指定选项 '--terse'。" -#: ../cli/src/nmcli.c:144 +#: ../cli/src/nmcli.c:159 #, c-format msgid "Error: Option '--terse' is mutually exclusive with '--pretty'." msgstr "错误：选项 '--terse' 与 '--pretty' 相互排斥。" -#: ../cli/src/nmcli.c:152 +#: ../cli/src/nmcli.c:167 #, c-format msgid "Error: Option '--pretty' is specified the second time." msgstr "错误：第二次指定选项 '--pretty'。" -#: ../cli/src/nmcli.c:157 +#: ../cli/src/nmcli.c:172 #, c-format msgid "Error: Option '--pretty' is mutually exclusive with '--terse'." msgstr "错误：选项 '--pretty' 与 '--terse' 相互排斥。" -#: ../cli/src/nmcli.c:167 ../cli/src/nmcli.c:183 +#: ../cli/src/nmcli.c:182 ../cli/src/nmcli.c:198 #, c-format msgid "Error: missing argument for '%s' option." msgstr "错误：'%s' 选项缺少参数。" -#: ../cli/src/nmcli.c:176 ../cli/src/nmcli.c:192 +#: ../cli/src/nmcli.c:191 ../cli/src/nmcli.c:207 #, c-format msgid "Error: '%s' is not valid argument for '%s' option." msgstr "错误：'%s' 不是 '%s' 选项的有效参数。" -#: ../cli/src/nmcli.c:199 +#: ../cli/src/nmcli.c:214 #, c-format msgid "Error: fields for '%s' options are missing." msgstr "错误：缺少 '%s' 选项字段。" -#: ../cli/src/nmcli.c:207 +#: ../cli/src/nmcli.c:222 #, c-format msgid "nmcli tool, version %s\n" msgstr "nmcli 工具，版本 %s\n" -#: ../cli/src/nmcli.c:213 +#: ../cli/src/nmcli.c:228 #, c-format msgid "Error: Option '%s' is unknown, try 'nmcli -help'." msgstr "错误：选项 '%s' 未知，尝试 'nmcli -help'。" -#: ../cli/src/nmcli.c:232 +#: ../cli/src/nmcli.c:247 #, c-format msgid "Caught signal %d, shutting down..." msgstr "捕获信号 %d，关闭..." -#: ../cli/src/nmcli.c:257 +#: ../cli/src/nmcli.c:272 msgid "Error: Could not create NMClient object." msgstr "" -#: ../cli/src/nmcli.c:273 +#: ../cli/src/nmcli.c:288 msgid "Success" msgstr "成功" -#: ../cli/src/settings.c:497 +#: ../cli/src/settings.c:563 #, c-format msgid "%d (hex-ascii-key)" msgstr "%d (hex-ascii-key)" -#: ../cli/src/settings.c:499 +#: ../cli/src/settings.c:565 #, c-format msgid "%d (104/128-bit passphrase)" msgstr "%d (104/128 位密码短语)" -#: ../cli/src/settings.c:502 +#: ../cli/src/settings.c:568 ../cli/src/settings.c:696 #, c-format msgid "%d (unknown)" msgstr "%d (未知)" -#: ../cli/src/settings.c:528 +#: ../cli/src/settings.c:594 msgid "0 (unknown)" msgstr "0 (未知)" -#: ../cli/src/settings.c:534 +#: ../cli/src/settings.c:600 msgid "any, " msgstr "任意， " -#: ../cli/src/settings.c:536 +#: ../cli/src/settings.c:602 msgid "900 MHz, " msgstr "900 MHz， " -#: ../cli/src/settings.c:538 +#: ../cli/src/settings.c:604 msgid "1800 MHz, " msgstr "1800 MHz， " -#: ../cli/src/settings.c:540 +#: ../cli/src/settings.c:606 msgid "1900 MHz, " msgstr "1900 MHz， " -#: ../cli/src/settings.c:542 +#: ../cli/src/settings.c:608 msgid "850 MHz, " msgstr "850 MHz， " -#: ../cli/src/settings.c:544 +#: ../cli/src/settings.c:610 msgid "WCDMA 3GPP UMTS 2100 MHz, " msgstr "WCDMA 3GPP UMTS 2100 MHz， " -#: ../cli/src/settings.c:546 +#: ../cli/src/settings.c:612 msgid "WCDMA 3GPP UMTS 1800 MHz, " msgstr "WCDMA 3GPP UMTS 1800 MHz， " -#: ../cli/src/settings.c:548 +#: ../cli/src/settings.c:614 msgid "WCDMA 3GPP UMTS 1700/2100 MHz, " msgstr "WCDMA 3GPP UMTS 1700/2100 MHz， " -#: ../cli/src/settings.c:550 +#: ../cli/src/settings.c:616 msgid "WCDMA 3GPP UMTS 800 MHz, " msgstr "WCDMA 3GPP UMTS 800 MHz， " -#: ../cli/src/settings.c:552 +#: ../cli/src/settings.c:618 msgid "WCDMA 3GPP UMTS 850 MHz, " msgstr "WCDMA 3GPP UMTS 850 MHz， " -#: ../cli/src/settings.c:554 +#: ../cli/src/settings.c:620 msgid "WCDMA 3GPP UMTS 900 MHz, " msgstr "WCDMA 3GPP UMTS 900 MHz， " -#: ../cli/src/settings.c:556 +#: ../cli/src/settings.c:622 msgid "WCDMA 3GPP UMTS 1700 MHz, " msgstr "WCDMA 3GPP UMTS 1700 MHz， " -#: ../cli/src/settings.c:558 +#: ../cli/src/settings.c:624 msgid "WCDMA 3GPP UMTS 1900 MHz, " msgstr "" -#: ../cli/src/settings.c:560 +#: ../cli/src/settings.c:626 msgid "WCDMA 3GPP UMTS 2600 MHz, " msgstr "" -#: ../cli/src/settings.c:578 +#: ../cli/src/settings.c:644 msgid "0 (NONE)" msgstr "" -#: ../cli/src/settings.c:584 +#: ../cli/src/settings.c:650 msgid "REORDER_HEADERS, " msgstr "" -#: ../cli/src/settings.c:586 +#: ../cli/src/settings.c:652 msgid "GVRP, " msgstr "" -#: ../cli/src/settings.c:588 +#: ../cli/src/settings.c:654 msgid "LOOSE_BINDING, " msgstr "" -#: ../cli/src/settings.c:731 ../cli/src/settings.c:927 -#: ../cli/src/settings.c:1631 +#: ../cli/src/settings.c:827 ../cli/src/settings.c:1024 +#: ../cli/src/settings.c:1734 msgid "auto" msgstr "自动" -#: ../cli/src/settings.c:921 ../cli/src/settings.c:924 -#: ../cli/src/settings.c:925 ../cli/src/utils.c:279 +#: ../cli/src/settings.c:920 ../cli/src/settings.c:923 +#: ../cli/src/settings.c:924 ../cli/src/utils.c:247 msgid "not set" msgstr "未设置" -#: ../cli/src/utils.c:103 +#: ../cli/src/utils.c:105 #, c-format msgid "Error converting IP4 address '0x%X' to text form" msgstr "" -#: ../cli/src/utils.c:131 +#: ../cli/src/utils.c:133 #, c-format msgid "Error converting IP6 address '%s' to text form" msgstr "" -#: ../cli/src/utils.c:232 +#: ../cli/src/utils.c:234 #, c-format msgid "field '%s' has to be alone" msgstr "字段 '%s' 必须是单独的" -#: ../cli/src/utils.c:235 +#: ../cli/src/utils.c:237 #, c-format msgid "invalid field '%s'" msgstr "无效字段 '%s'" -#: ../cli/src/utils.c:254 -#, c-format +#: ../cli/src/utils.c:256 msgid "Option '--terse' requires specifying '--fields'" msgstr "选项 '--terse' 要求指定 '--fields'" -#: ../cli/src/utils.c:258 +#: ../cli/src/utils.c:260 #, c-format msgid "" "Option '--terse' requires specific '--fields' option values , not '%s'" msgstr "选项 '--terse' 需要特定 '--fields' 选项值，不是 '%s'" -#: ../cli/src/utils.c:468 +#: ../cli/src/utils.c:470 #, c-format msgid "Error: Couldn't create D-Bus object proxy for org.freedesktop.DBus" msgstr "" -#: ../cli/src/utils.c:476 +#: ../cli/src/utils.c:478 #, c-format msgid "Error: NameHasOwner request failed: %s" msgstr "" -#: ../cli/src/utils.c:521 +#: ../cli/src/utils.c:523 #, c-format msgid "" "Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --" "nocheck to suppress the warning.\n" msgstr "" -#: ../cli/src/utils.c:530 +#: ../cli/src/utils.c:532 #, c-format msgid "" "Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force " @@ -2079,128 +2082,128 @@ msgid "Could not generate random data." msgstr "无法生成随机数据。" -#: ../libnm-util/nm-utils.c:2040 +#: ../libnm-util/nm-utils.c:2078 #, c-format msgid "Not enough memory to make encryption key." msgstr "没有足够的空间生成加密密钥。" -#: ../libnm-util/nm-utils.c:2150 +#: ../libnm-util/nm-utils.c:2188 msgid "Could not allocate memory for PEM file creation." msgstr "无法为创建 PEM 文件分配内存。" -#: ../libnm-util/nm-utils.c:2162 +#: ../libnm-util/nm-utils.c:2200 #, c-format msgid "Could not allocate memory for writing IV to PEM file." msgstr "无法为在 PEM 文件中写入 IV 分配内存。" -#: ../libnm-util/nm-utils.c:2174 +#: ../libnm-util/nm-utils.c:2212 #, c-format msgid "Could not allocate memory for writing encrypted key to PEM file." msgstr "无法为在 PEM 文件中写入加密密钥分配内存。" -#: ../libnm-util/nm-utils.c:2193 +#: ../libnm-util/nm-utils.c:2231 #, c-format msgid "Could not allocate memory for PEM file data." msgstr "无法为 PEM 文件数据分配内存。" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:1 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:1 msgid "Enable or disable system networking" msgstr "启用或禁用系统网络" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:2 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:2 msgid "System policy prevents enabling or disabling system networking" msgstr "系统策略阻止启用或禁用系统网络" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:3 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:3 msgid "" "Put NetworkManager to sleep or wake it up (should only be used by system " "power management)" msgstr "挂起或唤醒 NetworkManager (应仅用于系统电源管理)" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:4 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:4 msgid "" "System policy prevents putting NetworkManager to sleep or waking it up" msgstr "系统策略阻止挂起或唤醒 NetworkManager" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:5 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:5 msgid "Enable or disable WiFi devices" msgstr "启用或禁用 WiFi 设备" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:6 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:6 msgid "System policy prevents enabling or disabling WiFi devices" msgstr "系统策略阻止启用或禁用 WiFi 设备" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:7 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:7 msgid "Enable or disable mobile broadband devices" msgstr "启用或禁用移动宽带设备" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:8 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:8 msgid "System policy prevents enabling or disabling mobile broadband devices" msgstr "系统策略阻止启用或禁用移动宽带设备" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:9 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:9 msgid "Enable or disable WiMAX mobile broadband devices" msgstr "" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:10 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:10 msgid "" "System policy prevents enabling or disabling WiMAX mobile broadband devices" msgstr "" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:11 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:11 msgid "Allow control of network connections" msgstr "允许控制网络连接" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:12 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:12 msgid "System policy prevents control of network connections" msgstr "系统策略阻止更改网络连接" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:13 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:13 msgid "Connection sharing via a protected WiFi network" msgstr "通过受保护的 WiFi 网络共享连接" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:14 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:14 msgid "" "System policy prevents sharing connections via a protected WiFi network" msgstr "系统策略阻止使用受保护的 WiFi 网络共享连接" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:15 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:15 msgid "Connection sharing via an open WiFi network" msgstr "通过公开 WiFi 网络共享连接" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:16 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:16 msgid "System policy prevents sharing connections via an open WiFi network" msgstr "系统策略阻止使用公开 WiFi 网络共享连接" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:17 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:17 msgid "Modify personal network connections" msgstr "" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:18 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:18 msgid "System policy prevents modification of personal network settings" msgstr "" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:19 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:19 msgid "Modify network connections for all users" msgstr "" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:20 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:20 msgid "System policy prevents modification of network settings for all users" msgstr "" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:21 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:21 msgid "Modify persistent system hostname" msgstr "更改系统固有主机名" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:22 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:22 msgid "System policy prevents modification of the persistent system hostname" msgstr "系统策略阻止更改系统固有主机名" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:23 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:23 msgid "Allow use of user-specific connections" msgstr "允许用户连接" -#: ../policy/org.freedesktop.NetworkManager.policy.in.h:24 +#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:24 msgid "System policy prevents use of user-specific connections" msgstr "系统策略阻止使用用户连接" @@ -2209,77 +2212,77 @@ msgid "Failed to initialize SIGTERM pipe: %d" msgstr "" -#: ../src/main.c:178 +#: ../src/main.c:159 #, c-format msgid "Opening %s failed: %s\n" msgstr "" -#: ../src/main.c:184 +#: ../src/main.c:165 #, c-format msgid "Writing to %s failed: %s\n" msgstr "" -#: ../src/main.c:189 +#: ../src/main.c:170 #, c-format msgid "Closing %s failed: %s\n" msgstr "" -#: ../src/main.c:232 +#: ../src/main.c:213 #, c-format msgid "NetworkManager is already running (pid %ld)\n" msgstr "" -#: ../src/main.c:372 +#: ../src/main.c:340 msgid "Print NetworkManager version and exit" msgstr "" -#: ../src/main.c:373 +#: ../src/main.c:341 msgid "Don't become a daemon" msgstr "" -#: ../src/main.c:374 +#: ../src/main.c:342 msgid "Make all warnings fatal" msgstr "" -#: ../src/main.c:375 +#: ../src/main.c:343 msgid "Specify the location of a PID file" msgstr "" -#: ../src/main.c:375 +#: ../src/main.c:343 msgid "filename" msgstr "" -#: ../src/main.c:376 +#: ../src/main.c:344 msgid "State file location" msgstr "" -#: ../src/main.c:376 +#: ../src/main.c:344 msgid "/path/to/state.file" msgstr "" -#: ../src/main.c:377 +#: ../src/main.c:345 msgid "Config file location" msgstr "" -#: ../src/main.c:377 +#: ../src/main.c:345 msgid "/path/to/config.file" msgstr "" -#: ../src/main.c:378 +#: ../src/main.c:346 msgid "List of plugins separated by ','" msgstr "" -#: ../src/main.c:378 +#: ../src/main.c:346 msgid "plugin1,plugin2" msgstr "" #. Translators: Do not translate the values in the square brackets -#: ../src/main.c:380 +#: ../src/main.c:348 msgid "Log level: one of [ERR, WARN, INFO, DEBUG]" msgstr "" #. Translators: Do not translate the values in the square brackets -#: ../src/main.c:383 +#: ../src/main.c:374 msgid "" "Log domains separated by ',': any combination of\n" " " @@ -2291,12 +2294,12 @@ " INFINIBAND,FIREWALL]" msgstr "" -#: ../src/main.c:396 +#: ../src/main.c:364 #, c-format msgid "GModules are not supported on your platform!\n" msgstr "" -#: ../src/main.c:419 +#: ../src/main.c:383 msgid "" "NetworkManager monitors all network connections and automatically\n" "chooses the best connection to use. It also allows the user to\n" @@ -2304,41 +2307,41 @@ "should associate with." msgstr "" -#: ../src/main.c:425 +#: ../src/main.c:389 #, c-format msgid "Invalid option. Please use --help to see a list of valid options.\n" msgstr "无效选项。请使用 --help 查看有效选项列表。\n" -#: ../src/main.c:435 +#: ../src/main.c:399 #, c-format msgid "You must be root to run NetworkManager!\n" msgstr "" -#: ../src/main.c:456 +#: ../src/main.c:432 #, c-format msgid "Failed to read configuration: (%d) %s\n" msgstr "" -#: ../src/main.c:467 +#: ../src/main.c:443 #, c-format msgid "%s. Please use --help to see a list of valid options.\n" msgstr "%s。请使用 --help 查看有效选项列表。\n" -#: ../src/main.c:474 +#: ../src/main.c:450 #, c-format msgid "State file %s parsing failed: (%d) %s\n" msgstr "" -#: ../src/main.c:491 +#: ../src/main.c:467 #, c-format msgid "Could not daemonize: %s [error %u]\n" msgstr "" -#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:62 +#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:138 msgid "# Created by NetworkManager\n" msgstr "# 由 NetworkManger 创建\n" -#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:69 +#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:145 #, c-format msgid "" "# Merged from %s\n" @@ -2364,60 +2367,62 @@ msgid "unsupported DHCP client '%s'" msgstr "不支持的 DHCP 客户端 '%s'" -#: ../src/dns-manager/nm-dns-manager.c:376 +#: ../src/dns-manager/nm-dns-manager.c:375 msgid "NOTE: the libc resolver may not support more than 3 nameservers." msgstr "注意：libc 解析器可能不支持超过三个名字服务器。" -#: ../src/dns-manager/nm-dns-manager.c:378 +#: ../src/dns-manager/nm-dns-manager.c:377 msgid "The nameservers listed below may not be recognized." msgstr "以下列出的名字服务器可能无法被识别。" -#: ../src/logging/nm-logging.c:130 +#: ../src/logging/nm-logging.c:141 #, c-format msgid "Unknown log level '%s'" msgstr "未知日志等级 '%s'" -#: ../src/logging/nm-logging.c:155 +#: ../src/logging/nm-logging.c:187 #, c-format msgid "Unknown log domain '%s'" msgstr "未知日志域 '%s'" -#: ../src/modem-manager/nm-modem-cdma.c:279 ../src/nm-device-bt.c:325 +#: ../src/modem-manager/nm-modem-cdma.c:280 +#: ../src/modem-manager/nm-modem-broadband.c:553 ../src/nm-device-bt.c:345 #, c-format msgid "CDMA connection %d" msgstr "" -#: ../src/modem-manager/nm-modem-gsm.c:547 ../src/nm-device-bt.c:321 +#: ../src/modem-manager/nm-modem-gsm.c:558 +#: ../src/modem-manager/nm-modem-broadband.c:531 ../src/nm-device-bt.c:341 #, c-format msgid "GSM connection %d" msgstr "" -#: ../src/nm-device-bond.c:191 +#: ../src/nm-device-bond.c:202 #, c-format msgid "Bond connection %d" msgstr "" -#: ../src/nm-device-bt.c:296 +#: ../src/nm-device-bt.c:316 #, c-format msgid "PAN connection %d" msgstr "" -#: ../src/nm-device-bt.c:329 +#: ../src/nm-device-bt.c:349 #, c-format msgid "DUN connection %d" msgstr "" -#: ../src/nm-device-ethernet.c:1326 +#: ../src/nm-device-ethernet.c:1324 #, c-format msgid "PPPoE connection %d" msgstr "" -#: ../src/nm-device-ethernet.c:1326 ../src/settings/nm-settings-utils.c:50 +#: ../src/nm-device-ethernet.c:1324 ../src/settings/nm-settings-utils.c:50 #, c-format msgid "Wired connection %d" msgstr "" -#: ../src/nm-device-infiniband.c:303 +#: ../src/nm-device-infiniband.c:305 #, c-format msgid "InfiniBand connection %d" msgstr "" @@ -2427,60 +2432,60 @@ msgid "Mesh %d" msgstr "" -#: ../src/nm-device-vlan.c:362 +#: ../src/nm-device-vlan.c:335 #, c-format msgid "VLAN connection %d" msgstr "" -#: ../src/nm-manager.c:661 +#: ../src/nm-manager.c:746 #, c-format msgid "VPN connection %d" msgstr "" -#: ../src/nm-netlink-monitor.c:148 ../src/nm-netlink-monitor.c:272 -#: ../src/nm-netlink-monitor.c:695 +#: ../src/nm-netlink-monitor.c:152 ../src/nm-netlink-monitor.c:276 +#: ../src/nm-netlink-monitor.c:699 #, c-format msgid "error processing netlink message: %s" msgstr "处理网路信息出错：%s" -#: ../src/nm-netlink-monitor.c:251 +#: ../src/nm-netlink-monitor.c:255 msgid "error occurred while waiting for data on socket" msgstr "等候套接字上的数据时发生了错误" -#: ../src/nm-netlink-monitor.c:296 +#: ../src/nm-netlink-monitor.c:300 #, c-format msgid "unable to connect to netlink for monitoring link status: %s" msgstr "无法为监视连接状态连接到网路：%s" -#: ../src/nm-netlink-monitor.c:307 +#: ../src/nm-netlink-monitor.c:311 #, c-format msgid "unable to enable netlink handle credential passing: %s" msgstr "无法启用网络链接句柄证书通过：%s" -#: ../src/nm-netlink-monitor.c:330 ../src/nm-netlink-monitor.c:390 +#: ../src/nm-netlink-monitor.c:334 ../src/nm-netlink-monitor.c:394 #, c-format msgid "unable to allocate netlink handle for monitoring link status: %s" msgstr "无法为监视连接状态分配网路句柄：%s" -#: ../src/nm-netlink-monitor.c:415 +#: ../src/nm-netlink-monitor.c:419 #, c-format msgid "unable to allocate netlink link cache for monitoring link status: %s" msgstr "无法为监视连接状态分配网路连接：%s" -#: ../src/nm-netlink-monitor.c:542 +#: ../src/nm-netlink-monitor.c:546 #, c-format msgid "unable to join netlink group: %s" msgstr "无法加入网络链接组群：%s" -#: ../src/nm-netlink-monitor.c:671 ../src/nm-netlink-monitor.c:684 +#: ../src/nm-netlink-monitor.c:675 ../src/nm-netlink-monitor.c:688 #, c-format msgid "error updating link cache: %s" msgstr "更新链接缓存出错：%s" -#: ../src/settings/plugins/ifcfg-rh/reader.c:93 +#: ../src/settings/plugins/ifcfg-rh/reader.c:110 msgid "System" msgstr "系统" -#: ../src/settings/plugins/ifcfg-rh/reader.c:3634 +#: ../src/settings/plugins/ifcfg-rh/reader.c:3702 msgid "Bond" msgstr "" diff -Nru language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/Parse-DebianChangelog-Pod.po language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/Parse-DebianChangelog-Pod.po --- language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/Parse-DebianChangelog-Pod.po 2012-05-08 22:47:51.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/Parse-DebianChangelog-Pod.po 2013-01-29 09:37:14.000000000 +0000 @@ -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: 2012-05-08 05:13+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2013-01-28 14:11+0000\n" +"X-Generator: Launchpad (build 16451)\n" #: ../bin/parsechangelog:20 ../lib/Parse/DebianChangelog.pm:22 #: ../lib/Parse/DebianChangelog/ChangesFilters.pm:21 diff -Nru language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/Parse-DebianChangelog.po language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/Parse-DebianChangelog.po --- language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/Parse-DebianChangelog.po 2012-05-08 22:47:51.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/Parse-DebianChangelog.po 2013-01-29 09:37:09.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: 2012-05-08 05:12+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2013-01-28 14:11+0000\n" +"X-Generator: Launchpad (build 16451)\n" #: ../bin/parsechangelog:146 #, perl-format diff -Nru language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/acl.po language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/acl.po --- language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/acl.po 2012-05-08 22:47:32.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/acl.po 2013-01-29 09:37: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: 2012-05-08 02:58+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2013-01-28 11:47+0000\n" +"X-Generator: Launchpad (build 16451)\n" #: ../chacl/chacl.c:46 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/adduser.po language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/adduser.po --- language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/adduser.po 2012-05-08 22:47:24.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/adduser.po 2013-01-29 09:37:03.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: 2012-05-08 01:54+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2013-01-28 10:32+0000\n" +"X-Generator: Launchpad (build 16451)\n" "Language: zh_CN\n" #. everyone can issue "--help" and "--version", but only root can go on diff -Nru language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/alsa-utils.po language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/alsa-utils.po --- language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/alsa-utils.po 2012-05-08 22:47:24.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/alsa-utils.po 2013-01-29 09:37:11.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: 2012-05-08 01:54+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2013-01-28 10:33+0000\n" +"X-Generator: Launchpad (build 16451)\n" #: alsamixer/card_select.c:126 alsamixer/device_name.c:126 msgid "Sound Card" diff -Nru language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/app-install-data.po language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/app-install-data.po --- language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/app-install-data.po 2012-05-08 22:47:57.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/app-install-data.po 2013-01-29 09:37:02.000000000 +0000 @@ -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: 2012-05-08 06:02+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2013-01-28 15:03+0000\n" +"X-Generator: Launchpad (build 16451)\n" "Language: \n" #: ../menu-data-additional/7zip.desktop.in.h:1 @@ -719,10 +719,12 @@ msgstr "查看和记录 Altus Metrum 产品的下行数据" #: ../menu-data/amarok:kde4__amarok.desktop.in.h:1 +#: ../menu-data/amarok:kde4__amarok_containers.desktop.in.h:1 msgid "Amarok" msgstr "Amarok" #: ../menu-data/amarok:kde4__amarok.desktop.in.h:2 +#: ../menu-data/amarok:kde4__amarok_containers.desktop.in.h:2 msgid "Amarok - Rediscover Your Music!" msgstr "Amarok - 重新发现您的音乐！" @@ -941,7 +943,7 @@ "Virtual Machine for running Atari 32-bit operating systems and applications" msgstr "用来运行 Atari 32位操作系统及应用程序的虚拟机" -#: ../menu-data/arcjobtool:arcjobtool.desktop.in.h:1 +#: ../menu-data/arc-gui-clients:arcsub-ui.desktop.in.h:1 msgid "ARC Job Submission Tool" msgstr "ARC 工作提交工具" @@ -1030,6 +1032,7 @@ #: ../menu-data/arora:arora.desktop.in.h:2 #: ../menu-data/dooble:dooble.desktop.in.h:2 #: ../menu-data/firefox:firefox.desktop.in.h:2 +#: ../menu-data/hv3:hv3.desktop.in.h:2 #: ../menu-data/netsurf-gtk:netsurf-gtk.desktop.in.h:2 msgid "Browse the World Wide Web" msgstr "浏览互联网" @@ -1157,11 +1160,11 @@ msgid "Rip audio tracks from your audio CDs" msgstr "从音频 CD 中提取音轨" -#: ../menu-data/auto-multiple-choice:auto-multiple-choice.desktop.in.h:1 +#: ../menu-data/auto-multiple-choice-common:auto-multiple-choice.desktop.in.h:1 msgid "Auto Multiple Choice" msgstr "自动多项选择" -#: ../menu-data/auto-multiple-choice:auto-multiple-choice.desktop.in.h:2 +#: ../menu-data/auto-multiple-choice-common:auto-multiple-choice.desktop.in.h:2 msgid "" "Manage multiple choice questionnaires, with automatic marking from papers' " "scans" @@ -1302,6 +1305,7 @@ msgid "Back In Time" msgstr "Back In Time" +#: ../menu-data/backintime-gnome:backintime-gnome-root.desktop.in.h:2 #: ../menu-data/backintime-gnome:backintime-gnome.desktop.in.h:2 #: ../menu-data/backintime-kde:kde4__backintime-kde4.desktop.in.h:2 msgid "Simple backup system" @@ -1367,10 +1371,14 @@ msgid "Media Player" msgstr "媒体播放器" +#: ../menu-data/banshee:banshee-audiocd.desktop.in.h:1 +#: ../menu-data/banshee:banshee-media-player.desktop.in.h:1 #: ../menu-data/banshee:banshee.desktop.in.h:1 msgid "Banshee Media Player" msgstr "Banshee 媒体播放器" +#: ../menu-data/banshee:banshee-audiocd.desktop.in.h:2 +#: ../menu-data/banshee:banshee-media-player.desktop.in.h:2 #: ../menu-data/banshee:banshee.desktop.in.h:2 msgid "Play and organize your media collection" msgstr "播放、管理媒体文件" @@ -1667,6 +1675,7 @@ msgid "BleachBit" msgstr "BleachBit" +#: ../menu-data/bleachbit:bleachbit-root.desktop.in.h:2 #: ../menu-data/bleachbit:bleachbit.desktop.in.h:2 msgid "Free space and maintain privacy" msgstr "释放空间及保护隐私" @@ -2020,6 +2029,7 @@ msgid "sioc:Forum browser" msgstr "sioc:论坛浏览器" +#: ../menu-data/buzztard-bsl:buzztard-songio-buzz.desktop.in.h:1 #: ../menu-data/buzztard:buzztard-edit.desktop.in.h:1 msgid "Buzztard Music Editor" msgstr "Buzztard 音乐编辑器" @@ -2044,11 +2054,11 @@ msgid "Advanced Command Line and Text Window Manager" msgstr "高级命令行和文本窗口管理器" -#: ../menu-data/bzflag-data:bzflag.desktop.in.h:1 +#: ../menu-data/bzflag-client:bzflag.desktop.in.h:1 msgid "BZFlag" msgstr "BZFlag" -#: ../menu-data/bzflag-data:bzflag.desktop.in.h:2 +#: ../menu-data/bzflag-client:bzflag.desktop.in.h:2 msgid "Battle enemy tanks" msgstr "与敌人的坦克战斗" @@ -2264,6 +2274,7 @@ #: ../menu-data/cbrpager:cbrpager.desktop.in.h:2 #: ../menu-data/comix:comix.desktop.in.h:2 +#: ../menu-data/mcomix:mcomix.desktop.in.h:2 msgid "A viewer for comic book archives" msgstr "漫画集阅读器" @@ -2441,6 +2452,9 @@ #: ../menu-data/chromium-browser:chromium-browser.desktop.in.h:3 #: ../menu-data/firefox:firefox.desktop.in.h:3 +#: ../menu-data/latexila-data:latexila.desktop.in.h:3 +#: ../menu-data/nautilus:nautilus-home.desktop.in.h:3 +#: ../menu-data/nautilus:nautilus.desktop.in.h:3 #: ../menu-data/terminator:terminator.desktop.in.h:3 msgid "Open a New Window" msgstr "打开一个新窗口" @@ -2553,12 +2567,14 @@ msgstr "停止" #: ../menu-data/clementine:clementine.desktop.in.h:6 +#: ../menu-data/minitube:minitube.desktop.in.h:5 #: ../menu-data/totem:totem.desktop.in.h:5 #: ../menu-data/wallch:wallch.desktop.in.h:7 msgid "Previous" msgstr "上一曲" #: ../menu-data/clementine:clementine.desktop.in.h:7 +#: ../menu-data/minitube:minitube.desktop.in.h:4 #: ../menu-data/totem:totem.desktop.in.h:4 #: ../menu-data/wallch:wallch.desktop.in.h:6 msgid "Next" @@ -2720,9 +2736,10 @@ msgid "Connectagram" msgstr "Connectagram" -#: ../menu-data/contacts:contacts.desktop.in.h:1 #: ../menu-data/gnome-contacts:gnome-contacts.desktop.in.h:1 +#: ../menu-data/gpe-contacts:gpe-contacts.desktop.in.h:1 #: ../menu-data/kaddressbook-mobile:kde4__kaddressbook-mobile.desktop.in.h:1 +#: ../menu-data/phoneui-apps:phoneui-contacts.desktop.in.h:1 #: ../menu-data/thunderbird:thunderbird.desktop.in.h:4 msgid "Contacts" msgstr "联系人" @@ -3033,15 +3050,18 @@ msgstr "拯救企鹅" #: ../menu-data/deja-dup:deja-dup-ccpanel.desktop.in.h:1 +#: ../menu-data/deja-dup:deja-dup-preferences.desktop.in.h:1 #: ../menu-data/deja-dup:deja-dup.desktop.in.h:1 msgid "Backup" msgstr "备份" #: ../menu-data/deja-dup:deja-dup-ccpanel.desktop.in.h:2 +#: ../menu-data/deja-dup:deja-dup-preferences.desktop.in.h:2 msgid "Change your backup settings" msgstr "更改备份设置" #: ../menu-data/deja-dup:deja-dup-ccpanel.desktop.in.h:3 +#: ../menu-data/deja-dup:deja-dup-preferences.desktop.in.h:3 msgid "Back Up Now" msgstr "立即备份" @@ -3118,6 +3138,7 @@ msgid "DeSmuME (Gtk)" msgstr "DeSmuME (Gtk)" +#: ../menu-data/desmume:desmume-glade.desktop.in.h:2 #: ../menu-data/desmume:desmume.desktop.in.h:2 msgid "Nintento DS emulator" msgstr "NDS 模拟器" @@ -3300,7 +3321,8 @@ #: ../menu-data/dolphin:kde4__dolphin.desktop.in.h:2 #: ../menu-data/exo-utils:exo-file-manager.desktop.in.h:1 -#: ../menu-data/pcmanfm:pcmanfm.desktop.in.h:1 +#: ../menu-data/gpe-filemanager:gpe-filemanager.desktop.in.h:1 +#: ../menu-data/thunar:thunar-settings.desktop.in.h:1 msgid "File Manager" msgstr "文件管理器" @@ -3539,11 +3561,11 @@ msgid "A graphical GNUstep diff utility" msgstr "一个图形 GNUstep diff 工具" -#: ../menu-data/easymp3gain-gtk:easymp3gain.desktop.in.h:1 +#: ../menu-data/easymp3gain-gtk:easymp3gain-gnome.desktop.in.h:1 msgid "easyMP3Gain" msgstr "easyMP3Gain" -#: ../menu-data/easymp3gain-gtk:easymp3gain.desktop.in.h:2 +#: ../menu-data/easymp3gain-gtk:easymp3gain-gnome.desktop.in.h:2 msgid "A GUI for mp3gain, vorbisgain and aacgain" msgstr "一个 mp3gain, vorbisgain 和 aacgain 的图形用户界面" @@ -3676,7 +3698,9 @@ msgid "EiskaltDC++ Gtk" msgstr "EiskaltDC++ Gtk" +#: ../menu-data/eiskaltdcpp-gtk3:eiskaltdcpp-gtk3.desktop.in.h:2 #: ../menu-data/eiskaltdcpp-gtk:eiskaltdcpp-gtk.desktop.in.h:2 +#: ../menu-data/eiskaltdcpp-qt-mini:eiskaltdcpp-qt-mini.desktop.in.h:2 #: ../menu-data/eiskaltdcpp-qt:eiskaltdcpp-qt.desktop.in.h:2 msgid "Share files over the DC++ network" msgstr "通过 DC++ 网络共享文件" @@ -3727,11 +3751,15 @@ msgid "Elmer FEA software" msgstr "Elmer FEA 软件" +#: ../menu-data/emacs23-lucid:emacs23-lucid.desktop.in.h:1 #: ../menu-data/emacs23:emacs23.desktop.in.h:1 msgid "GNU Emacs 23" msgstr "GNU Emacs 23" +#: ../menu-data/emacs23-lucid:emacs23-lucid.desktop.in.h:2 #: ../menu-data/emacs23:emacs23.desktop.in.h:2 +#: ../menu-data/emacs24-lucid:emacs24-lucid.desktop.in.h:2 +#: ../menu-data/emacs24:emacs24.desktop.in.h:2 msgid "View and edit files" msgstr "查看和编辑文件" @@ -3876,11 +3904,13 @@ msgid "Epidemics Simulator" msgstr "疫情模拟器" -#: ../menu-data/epiphany-browser-data:epiphany.desktop.in.h:1 +#: ../menu-data/epiphany-browser-data:epiphany-browser.desktop.in.h:1 +#: ../menu-data/epiphany-browser-data:epiphany-newtab.desktop.in.h:1 msgid "Epiphany Web Browser" msgstr "Epiphany 网页浏览器" -#: ../menu-data/epiphany-browser-data:epiphany.desktop.in.h:2 +#: ../menu-data/epiphany-browser-data:epiphany-browser.desktop.in.h:2 +#: ../menu-data/epiphany-browser-data:epiphany-newtab.desktop.in.h:2 #: ../menu-data/exo-utils:exo-web-browser.desktop.in.h:2 msgid "Browse the web" msgstr "浏览网页" @@ -3940,6 +3970,7 @@ msgid "EtherApe" msgstr "EtherApe" +#: ../menu-data/etherape:etherape-root.desktop.in.h:2 #: ../menu-data/etherape:etherape.desktop.in.h:2 msgid "Graphical Network Monitor" msgstr "图形化网络监视器" @@ -3982,14 +4013,19 @@ #: ../menu-data/evilvte:evilvte.desktop.in.h:2 #: ../menu-data/exo-utils:exo-terminal-emulator.desktop.in.h:1 +#: ../menu-data/lxpanel:lxde-x-terminal-emulator.desktop.in.h:2 +#: ../menu-data/xfce4-terminal:xfce4-terminal.desktop.in.h:2 msgid "Terminal Emulator" msgstr "终端模拟器" #: ../menu-data/evince-common:evince.desktop.in.h:1 #: ../menu-data/kdegraphics-mobipocket:kde4__okularApplication_mobi.desktop.in.h:2 #: ../menu-data/okular-backend-odp:kde4__okularApplication_odp.desktop.in.h:2 +#: ../menu-data/okular-extra-backends:kde4__okularApplication_chm.desktop.in.h:2 +#: ../menu-data/okular-extra-backends:kde4__okularApplication_djvu.desktop.in.h:2 +#: ../menu-data/okular-extra-backends:kde4__okularApplication_epub.desktop.in.h:2 +#: ../menu-data/okular-extra-backends:kde4__okularApplication_tiff.desktop.in.h:2 #: ../menu-data/okular:kde4__okular.desktop.in.h:2 -#: ../menu-data/okular:kde4__okularApplication_plucker.desktop.in.h:2 msgid "Document Viewer" msgstr "文档查看器" @@ -4043,12 +4079,16 @@ #: ../menu-data/exo-utils:exo-terminal-emulator.desktop.in.h:2 #: ../menu-data/gnome-terminal:gnome-terminal.desktop.in.h:2 -#: ../menu-data/roxterm:roxterm.desktop.in.h:2 +#: ../menu-data/lxterminal:lxterminal.desktop.in.h:2 +#: ../menu-data/roxterm-gtk2:roxterm.desktop.in.h:2 +#: ../menu-data/roxterm-gtk3:roxterm.desktop.in.h:2 #: ../menu-data/sakura:sakura.desktop.in.h:2 msgid "Use the command line" msgstr "使用命令行" #: ../menu-data/exo-utils:exo-web-browser.desktop.in.h:1 +#: ../menu-data/konqueror:kde4__konqbrowser.desktop.in.h:2 +#: ../menu-data/lxpanel:lxde-x-www-browser.desktop.in.h:1 #: ../menu-data/rekonq:kde4__rekonq.desktop.in.h:2 msgid "Web Browser" msgstr "网络浏览器" @@ -4093,6 +4133,7 @@ msgid "Exult Ultima 7 Engine" msgstr "Ultima 7 引擎终极版" +#: ../menu-data/f-spot:f-spot-import.desktop.in.h:1 #: ../menu-data/f-spot:f-spot.desktop.in.h:1 msgid "F-Spot Photo Manager" msgstr "F-Spot 照片管理器" @@ -4142,10 +4183,14 @@ msgid "Play Nintendo ROM files" msgstr "运行任天堂 ROM 文件" +#: ../menu-data/fcitx-config-gtk2:fcitx-config-gtk2.desktop.in.h:1 +#: ../menu-data/fcitx-config-gtk:fcitx-config-gtk3.desktop.in.h:1 #: ../menu-data/fcitx-data:fcitx-configtool.desktop.in.h:1 msgid "Fcitx Config Tool" msgstr "Fcitx 配置工具" +#: ../menu-data/fcitx-config-gtk2:fcitx-config-gtk2.desktop.in.h:2 +#: ../menu-data/fcitx-config-gtk:fcitx-config-gtk3.desktop.in.h:2 #: ../menu-data/fcitx-data:fcitx-configtool.desktop.in.h:2 msgid "Fcitx GUI Config Tool" msgstr "Fcitx 图形界面配置工具" @@ -4363,6 +4408,7 @@ msgid "FlightGear" msgstr "FlightGear" +#: ../menu-data/crrcsim:crrcsim.desktop.in.h:2 #: ../menu-data/flightgear:flightgear.desktop.in.h:2 msgid "A flight simulator" msgstr "一个飞行模拟器" @@ -4522,6 +4568,8 @@ msgstr "使用 OpenGL 的三维台球游戏" #: ../menu-data/foomatic-gui:foomatic-gui.desktop.in.h:1 +#: ../menu-data/gnome-control-center:gnome-printers-panel.desktop.in.h:1 +#: ../menu-data/system-config-printer-gnome:system-config-printer.desktop.in.h:1 msgid "Printers" msgstr "打印机" @@ -4636,10 +4684,14 @@ msgstr "下载和安装 Freeciv 的插件" #: ../menu-data/freeciv-client-gtk:freeciv-gtk.desktop.in.h:1 +#: ../menu-data/freeciv-client-sdl:freeciv-sdl.desktop.in.h:1 +#: ../menu-data/freeciv-client-xaw3d:freeciv-xaw3d.desktop.in.h:1 msgid "Freeciv" msgstr "Freeciv" #: ../menu-data/freeciv-client-gtk:freeciv-gtk.desktop.in.h:2 +#: ../menu-data/freeciv-client-sdl:freeciv-sdl.desktop.in.h:2 +#: ../menu-data/freeciv-client-xaw3d:freeciv-xaw3d.desktop.in.h:2 #: ../menu-data/freeciv-server:freeciv-server.desktop.in.h:2 msgid "" "Turn-based strategy game inspired by the history of human civilization" @@ -4671,6 +4723,7 @@ #: ../menu-data/freedm:freedm.desktop.in.h:2 #: ../menu-data/freedoom:freedoom.desktop.in.h:2 +#: ../menu-data/vavoom:vavoom.desktop.in.h:2 msgid "First Person Shooter Game" msgstr "第一人称射击游戏" @@ -4793,11 +4846,11 @@ msgid "Realtime audio processor based on frequency spectral manipulation" msgstr "基于频谱操作的实时音频处理器" -#: ../menu-data/frescobaldi:frescobaldi.desktop.in.h:1 +#: ../menu-data/frescobaldi:frescobaldi.desktop.in.h:2 msgid "LilyPond Music Editor" msgstr "LilyPond 音乐编辑器" -#: ../menu-data/frescobaldi:frescobaldi.desktop.in.h:2 +#: ../menu-data/frescobaldi:frescobaldi.desktop.in.h:1 msgid "Frescobaldi" msgstr "Frescobaldi" @@ -4814,7 +4867,6 @@ msgstr "Fritzing" #: ../menu-data/fritzing:fritzing.desktop.in.h:2 -#: ../menu-data/kicad:kicad.desktop.in.h:2 msgid "PCB-Suite" msgstr "PCB 套件" @@ -5477,8 +5529,8 @@ msgstr "编辑文本文件" #: ../menu-data/gedit:gedit.desktop.in.h:2 +#: ../menu-data/gpe-edit:gpe-edit.desktop.in.h:1 #: ../menu-data/kwrite:kde4__kwrite.desktop.in.h:1 -#: ../menu-data/mined:mined.desktop.in.h:2 msgid "Text Editor" msgstr "文本编辑器" @@ -5730,11 +5782,11 @@ msgid "gISOMount" msgstr "gISOMount" -#: ../menu-data/git-cola:cola.desktop.in.h:1 +#: ../menu-data/git-cola:git-cola.desktop.in.h:1 msgid "Cola Git GUI" msgstr "Cola Git 图形用户界面" -#: ../menu-data/git-cola:cola.desktop.in.h:2 +#: ../menu-data/git-cola:git-cola.desktop.in.h:2 msgid "A highly caffeinated git GUI" msgstr "一个高效的 GIT 前端" @@ -5787,6 +5839,7 @@ msgstr "英语 - 印度尼西亚语字典" #: ../menu-data/gkbd-capplet:gkbd-keyboard-display.desktop.in.h:1 +#: ../menu-data/gnome-control-center:ubuntu-region-panel.desktop.in.h:1 msgid "Keyboard Layout" msgstr "键盘布局" @@ -5822,7 +5875,7 @@ msgid "gLabels Label Designer" msgstr "gLabels 标签设计器" -#: ../menu-data/glabels:glabels.desktop.in.h:2 +#: ../menu-data/glabels:glabels-3.0.desktop.in.h:2 msgid "Create labels, business cards and media covers" msgstr "创建标签、商务名片和媒体封面" @@ -6204,11 +6257,11 @@ msgid "Post an entry to a web log" msgstr "发布一篇网络日志" -#: ../menu-data/gnome-bluetooth:bluetooth-properties.desktop.in.h:1 +#: ../menu-data/gnome-control-center:bluetooth-properties.desktop.in.h:1 msgid "Bluetooth" msgstr "蓝牙" -#: ../menu-data/gnome-bluetooth:bluetooth-properties.desktop.in.h:2 +#: ../menu-data/gnome-control-center:bluetooth-properties.desktop.in.h:2 msgid "Configure Bluetooth settings" msgstr "配置蓝牙" @@ -6253,6 +6306,7 @@ msgstr "自定义您的 GNOME 桌面" #: ../menu-data/gnome-color-manager:gcm-calibrate.desktop.in.h:1 +#: ../menu-data/gnome-control-center:gnome-color-panel.desktop.in.h:1 msgid "Color" msgstr "颜色" @@ -6296,7 +6350,7 @@ msgid "Disk Utility" msgstr "磁盘实用工具" -#: ../menu-data/gnome-disk-utility:palimpsest.desktop.in.h:2 +#: ../menu-data/gnome-disk-utility:gnome-disks.desktop.in.h:2 msgid "Manage Drives and Media" msgstr "管理驱动器及媒体" @@ -6375,7 +6429,7 @@ msgid "Keyring Access" msgstr "密钥环访问" -#: ../menu-data/gnome-keyring:gnome-keyring-prompt.desktop.in.h:2 +#: ../menu-data/gcr:gcr-prompter.desktop.in.h:2 msgid "Unlock access to passwords and other secrets" msgstr "解锁密码和证书等" @@ -6451,6 +6505,7 @@ msgid "View information about your network" msgstr "查看网络信息" +#: ../menu-data/gnome-control-center:gnome-network-panel.desktop.in.h:1 #: ../menu-data/gnome-network-admin:network.desktop.in.h:1 #: ../menu-data/network-manager-gnome:nm-applet.desktop.in.h:1 msgid "Network" @@ -6538,6 +6593,8 @@ msgid "GNOME Shell" msgstr "GNOME Shell" +#: ../menu-data/cinnamon:cinnamon.desktop.in.h:2 +#: ../menu-data/cinnamon:cinnamon2d.desktop.in.h:2 #: ../menu-data/gnome-shell:gnome-shell.desktop.in.h:2 msgid "Window management and application launching" msgstr "管理窗口、启动应用程序" @@ -6578,6 +6635,7 @@ #: ../menu-data/konsole:kde4__konsole.desktop.in.h:2 #: ../menu-data/terminal.app:Terminal.desktop.in.h:1 #: ../menu-data/vala-terminal:vala-terminal.desktop.in.h:1 +#: ../menu-data/xfce4-terminal:xfce4-terminal.desktop.in.h:1 msgid "Terminal" msgstr "Terminal" @@ -6650,7 +6708,6 @@ msgstr "收听 FM 电台" #: ../menu-data/gnomine:gnomine.desktop.in.h:1 -#: ../menu-data/mines.app:Mines.desktop.in.h:1 #: ../menu-data/sgt-puzzles:mines.desktop.in.h:1 msgid "Mines" msgstr "扫雷" @@ -6781,11 +6838,11 @@ msgid "Calculation, Analysis, and Visualization of Information" msgstr "计算，分析和信息可视化" -#: ../menu-data/gnunet-gtk:gnunet-gtk.desktop.in.h:1 +#: ../menu-data/gnunet-gtk:gnunet-fs-gtk.desktop.in.h:1 msgid "GNUnet Secured P2P" msgstr "GNUnet 安全点对点程序" -#: ../menu-data/gnunet-gtk:gnunet-gtk.desktop.in.h:2 +#: ../menu-data/gnunet-gtk:gnunet-fs-gtk.desktop.in.h:2 msgid "Share files using GNU's anonymous and censorship-resistant network" msgstr "通过 GNU 匿名、防监控网络共享文件" @@ -6825,11 +6882,12 @@ msgid "GoatTracker" msgstr "GoatTracker" -#: ../menu-data/gobby:gobby.desktop.in.h:1 +#: ../menu-data/gobby-0.4:gobby.desktop.in.h:1 msgid "Gobby Collaborative Editor (0.4)" msgstr "Gobby 协作编辑器(0.4)" -#: ../menu-data/gobby:gobby.desktop.in.h:2 +#: ../menu-data/gobby-0.4:gobby.desktop.in.h:2 +#: ../menu-data/gobby-0.5:gobby-0.5.desktop.in.h:2 msgid "Edit text files collaboratively" msgstr "协作编辑文本文件" @@ -6846,6 +6904,7 @@ msgstr "Goggles 音乐管理器" #: ../menu-data/gogglesmm:gogglesmm.desktop.in.h:2 +#: ../menu-data/rhythmbox:rhythmbox-device.desktop.in.h:2 #: ../menu-data/rhythmbox:rhythmbox.desktop.in.h:2 msgid "Play and organize your music collection" msgstr "播放和组织您的音乐收藏" @@ -7017,6 +7076,7 @@ msgid "Pointing devices" msgstr "定点设备" +#: ../menu-data/gnome-control-center:gnome-mouse-panel.desktop.in.h:2 #: ../menu-data/gpointing-device-settings:gpointing-device-settings.desktop.in.h:2 msgid "Set your mouse and touchpad preferences" msgstr "设置您的鼠标和触摸板的偏好设置" @@ -7410,7 +7470,8 @@ msgid "Getting Things GNOME!" msgstr "Getting Things GNOME!" -#: ../menu-data/gtg:gtg.desktop.in.h:2 +#. Gnome and KDE 3 use Comment +#: ../menu-data/gtg:gtg.desktop.in.h:3 msgid "Personal organizer for the GNOME desktop environment" msgstr "GNOME 桌面环境的个人事务管理程序" @@ -7747,7 +7808,7 @@ "A GTK+ utility to awake turned off machine using the Wake On LAN feature." msgstr "一个使用网络唤醒功能唤醒关机的计算机的 GTK+ 工具。" -#: ../menu-data/gwaterfall:waterfall.desktop.in.h:1 +#: ../menu-data/gwaterfall:gwaterfall.desktop.in.h:1 msgid "Waterfall" msgstr "瀑布" @@ -8105,11 +8166,11 @@ msgid "Organd Soft Synth" msgstr "Organd 软件合成器" -#: ../menu-data/hotot:hotot.desktop.in.h:1 +#: ../menu-data/hotot-gtk:hotot.desktop.in.h:1 msgid "Hotot Twitter Client" msgstr "Hotot Twitter 客户端" -#: ../menu-data/hotot:hotot.desktop.in.h:2 +#: ../menu-data/hotot-gtk:hotot.desktop.in.h:2 msgid "Lightweight Twitter Client base on Gtk2 and Webkit" msgstr "基于 Gtk2 和 Webkit 的轻量级 Twitter 客户端" @@ -8129,10 +8190,12 @@ msgid "Execute text commands" msgstr "执行文本命令" +#: ../menu-data/hplip-gui:hplip-kubuntu.desktop.in.h:1 #: ../menu-data/hplip-gui:hplip.desktop.in.h:1 msgid "HPLIP Toolbox" msgstr "HPLIP 工具箱" +#: ../menu-data/hplip-gui:hplip-kubuntu.desktop.in.h:2 #: ../menu-data/hplip-gui:hplip.desktop.in.h:2 msgid "HP Printing System Control Center" msgstr "惠普打印系统控制中心" @@ -8285,6 +8348,7 @@ msgid "Application to manage remote site configurations" msgstr "管理远程站点配置的应用程序" +#: ../menu-data/fcitx-data:fcitx.desktop.in.h:2 #: ../menu-data/im-config:im-config.desktop.in.h:1 #: ../menu-data/uim-gtk2.0:uim.desktop.in.h:1 msgid "Input Method" @@ -8732,12 +8796,10 @@ msgid "Manage system jobs present on your computer" msgstr "管理计算机上运行的系统作业" -#: ../menu-data/jockey-gtk:jockey-gtk.desktop.in.h:1 #: ../menu-data/jockey-kde:jockey-kde.desktop.in.h:1 msgid "Additional Drivers" msgstr "附加驱动" -#: ../menu-data/jockey-gtk:jockey-gtk.desktop.in.h:2 #: ../menu-data/jockey-kde:jockey-kde.desktop.in.h:2 msgid "Configure third-party and proprietary drivers" msgstr "配置第三方和专有驱动" @@ -8895,6 +8957,7 @@ msgstr "k9copy" #: ../menu-data/k9copy:kde4__k9copy.desktop.in.h:2 +#: ../menu-data/k9copy:kde4__k9copy_assistant.desktop.in.h:2 msgid "DVD9 to DVD5 backup tool" msgstr "DVD9 到 DVD5 备份工具" @@ -8962,6 +9025,7 @@ msgid "KDE Periodic Table of Elements" msgstr "KDE 元素周期表" +#: ../menu-data/kalzium-data:kde4__kalzium_cml.desktop.in.h:1 #: ../menu-data/kalzium:kde4__kalzium.desktop.in.h:2 msgid "Kalzium" msgstr "Kalzium" @@ -9244,7 +9308,7 @@ msgid "Touchpad management" msgstr "触控板管理" -#: ../menu-data/kde-runtime-data:kde4__nepomukbackup.desktop.in.h:1 +#: ../menu-data/nepomuk-core-data:kde4__nepomukbackup.desktop.in.h:1 msgid "Nepomuk Backup" msgstr "Nepomuk 备份" @@ -9285,8 +9349,11 @@ msgstr "用于改变 X 屏幕尺寸和方向的面板小程序。" #: ../menu-data/kdegraphics-mobipocket:kde4__okularApplication_mobi.desktop.in.h:1 +#: ../menu-data/okular-extra-backends:kde4__okularApplication_chm.desktop.in.h:1 +#: ../menu-data/okular-extra-backends:kde4__okularApplication_djvu.desktop.in.h:1 +#: ../menu-data/okular-extra-backends:kde4__okularApplication_epub.desktop.in.h:1 +#: ../menu-data/okular-extra-backends:kde4__okularApplication_tiff.desktop.in.h:1 #: ../menu-data/okular:kde4__okular.desktop.in.h:1 -#: ../menu-data/okular:kde4__okularApplication_plucker.desktop.in.h:1 msgid "Okular" msgstr "Okular" @@ -9304,7 +9371,6 @@ msgstr "KDE 非线性视频编辑器" #: ../menu-data/kdepasswd:kde4__kdepasswd.desktop.in.h:1 -#: ../menu-data/lwat:chguserpw.desktop.in.h:1 msgid "Change Password" msgstr "更改密码" @@ -9456,11 +9522,11 @@ msgid "Send keys to multiple windows simultaneously" msgstr "同时发送按键到多个窗口" -#: ../menu-data/keymon:key-mon.desktop.in.h:1 +#: ../menu-data/key-mon:key-mon.desktop.in.h:1 msgid "KeyMon" msgstr "KeyMon" -#: ../menu-data/keymon:key-mon.desktop.in.h:2 +#: ../menu-data/key-mon:key-mon.desktop.in.h:2 msgid "Keyboard and Mouse Monitor for screencasts" msgstr "用于屏幕录像的键盘和鼠标监控器" @@ -9607,7 +9673,7 @@ msgid "Convert Khmer between Unicode and legacy Khmer encodings." msgstr "在 Unicode 和传统柬埔寨语编码之间转换柬埔寨语的编码方式。" -#: ../menu-data/kicad:kicad.desktop.in.h:1 +#: ../menu-data/kicad-common:kicad.desktop.in.h:2 msgid "KiCad" msgstr "KiCad" @@ -9736,12 +9802,11 @@ msgid "Panorama" msgstr "全景图" -#. X-DocPath=photolayoutseditor/index.html -#: ../menu-data/kipi-plugins-common:kde4__photolayoutseditor.desktop.in.h:2 +#: ../menu-data/kipi-plugins-common:kde4__photolayoutseditor.desktop.in.h:1 msgid "Photo Layouts Editor" msgstr "照片布局编辑器" -#: ../menu-data/kipi-plugins-common:kde4__photolayoutseditor.desktop.in.h:3 +#: ../menu-data/kipi-plugins-common:kde4__photolayoutseditor.desktop.in.h:2 msgid "Create beautiful and professional photo layouts from your photos" msgstr "从您的照片中创建美观和专业的照片布局" @@ -10052,6 +10117,7 @@ msgstr "新闻阅读器" #: ../menu-data/knotes-mobile:kde4__notes-mobile.desktop.in.h:1 +#: ../menu-data/xfce4-notes:xfce4-notes.desktop.in.h:1 msgid "Notes" msgstr "注释" @@ -10177,14 +10243,17 @@ msgid "Instant Messenger" msgstr "即时通讯程序" +#: ../menu-data/gpe-calendar:gpe-calendar.desktop.in.h:1 #: ../menu-data/korganizer-mobile:kde4__korganizer-mobile.desktop.in.h:1 msgid "Calendar" msgstr "日历" +#: ../menu-data/korganizer:kde4__korganizer-import.desktop.in.h:1 #: ../menu-data/korganizer:kde4__korganizer.desktop.in.h:1 msgid "Calendar and Scheduling Program" msgstr "日历和日程安排程序" +#: ../menu-data/korganizer:kde4__korganizer-import.desktop.in.h:2 #: ../menu-data/korganizer:kde4__korganizer.desktop.in.h:2 msgid "KOrganizer" msgstr "KOrganizer" @@ -10213,10 +10282,12 @@ msgid "Patience Card Game" msgstr "考验耐心的牌类游戏" +#: ../menu-data/kphotoalbum:kde4__kphotoalbum-import.desktop.in.h:1 #: ../menu-data/kphotoalbum:kde4__kphotoalbum.desktop.in.h:1 msgid "KPhotoAlbum" msgstr "KPhotoAlbum" +#: ../menu-data/kphotoalbum:kde4__kphotoalbum-import.desktop.in.h:2 #: ../menu-data/kphotoalbum:kde4__kphotoalbum.desktop.in.h:2 msgid "Photo Album" msgstr "相册" @@ -10315,8 +10386,6 @@ msgstr "桌面共享" #: ../menu-data/krita:kde4__krita.desktop.in.h:1 -#: ../menu-data/krita:kde4__krita_odg.desktop.in.h:1 -#: ../menu-data/krita:kde4__krita_psd.desktop.in.h:1 msgid "Krita" msgstr "Krita" @@ -10441,7 +10510,8 @@ msgid "KSudoku, Sudoku game & more for KDE" msgstr "KSudoku、数独游戏及更多 KDE 游戏" -#: ../menu-data/ksysguard:kde4__ksysguard.desktop.in.h:1 +#: ../menu-data/gnome-system-monitor:gnome-system-monitor.desktop.in.h:1 +#: ../menu-data/ksysguard:kde4__ksysguard.desktop.in.h:2 msgid "System Monitor" msgstr "系统监视器" @@ -10586,11 +10656,11 @@ msgid "A virtual keyboard for KDE" msgstr "KDE 虚拟键盘" -#: ../menu-data/kvpm:kvpm.desktop.in.h:1 +#: ../menu-data/kvpm:kde4__kvpm.desktop.in.h:1 msgid "KVPM" msgstr "KVPM" -#: ../menu-data/kvpm:kvpm.desktop.in.h:2 +#: ../menu-data/kvpm:kde4__kvpm.desktop.in.h:2 msgid "KDE Volume Partition Manager" msgstr "KDE 卷分区管理器" @@ -10606,6 +10676,7 @@ msgid "KWalletManager" msgstr "KWalletManager" +#: ../menu-data/kwalletmanager:kde4__kwalletmanager-kwalletd.desktop.in.h:1 #: ../menu-data/kwalletmanager:kde4__kwalletmanager.desktop.in.h:2 msgid "Wallet Management Tool" msgstr "钱包管理工具" @@ -10814,7 +10885,8 @@ msgid "Panzer General clone" msgstr "装甲元帅游戏的克隆版本" -#: ../menu-data/libfm-gtk-data:libfm-pref-apps.desktop.in.h:1 +#: ../menu-data/exo-utils:exo-preferred-applications.desktop.in.h:1 +#: ../menu-data/libfm-gtk-bin:libfm-pref-apps.desktop.in.h:1 msgid "Preferred Applications" msgstr "首选应用程序" @@ -11241,11 +11313,11 @@ msgid "Tetris clone" msgstr "俄罗斯方块克隆" -#: ../menu-data/ltsp-livecd:ltsp-live.desktop.in.h:1 +#: ../menu-data/edubuntu-netboot:ltsp-live.desktop.in.h:1 msgid "Start LTSP-Live" msgstr "" -#: ../menu-data/ltsp-livecd:ltsp-live.desktop.in.h:2 +#: ../menu-data/edubuntu-netboot:ltsp-live.desktop.in.h:2 msgid "Starts an LTSP server from the live CD" msgstr "" @@ -11278,6 +11350,8 @@ msgid "luckyBackup" msgstr "luckyBackup" +#: ../menu-data/luckybackup:luckybackup-gnome-su.desktop.in.h:2 +#: ../menu-data/luckybackup:luckybackup-kde-su.desktop.in.h:2 #: ../menu-data/luckybackup:luckybackup.desktop.in.h:2 msgid "Backup & sync your data with the power of rsync" msgstr "通过强大的 rsync 备份和同步您的数据" @@ -11325,6 +11399,7 @@ msgstr "Lxkeymap 应用程序" #: ../menu-data/lxtask:lxtask.desktop.in.h:1 +#: ../menu-data/xfce4-taskmanager:xfce4-taskmanager.desktop.in.h:1 msgid "Task Manager" msgstr "任务管理器" @@ -11428,14 +11503,15 @@ msgid "Play classic Mahjong puzzle game" msgstr "玩经典的麻将益智游戏" -#: ../menu-data/mahjongg:mahjongg.desktop.in.h:1 +#: ../menu-data/gnome-mahjongg:gnome-mahjongg.desktop.in.h:1 msgid "Mahjongg" msgstr "Mahjongg" -#: ../menu-data/mahjongg:mahjongg.desktop.in.h:2 +#: ../menu-data/gnome-mahjongg:gnome-mahjongg.desktop.in.h:2 msgid "Disassemble a pile of tiles by removing matching pairs" msgstr "配对和消除麻将牌" +#: ../menu-data/mail-notification:mail-notification-properties.desktop.in.h:1 #: ../menu-data/mail-notification:mail-notification.desktop.in.h:1 msgid "Mail Notification" msgstr "邮件通知" @@ -11500,6 +11576,7 @@ msgid "Bio-polymer mass spectrometry software" msgstr "生物聚合物质谱分析法软件" +#: ../menu-data/gnome-control-center:gnome-keyboard-panel.desktop.in.h:1 #: ../menu-data/matchbox-keyboard:inputmethods__matchbox-keyboard.desktop.in.h:1 msgid "Keyboard" msgstr "键盘" @@ -12103,6 +12180,7 @@ msgstr "Mtink" #: ../menu-data/mtink:mtink.desktop.in.h:2 +#: ../menu-data/mtink:mtinkc.desktop.in.h:2 msgid "Status monitor for Epson inkjet printers" msgstr "Epson 喷墨打印机的状态监视器" @@ -12174,6 +12252,7 @@ msgid "Muon Software Center" msgstr "Muon 软件中心" +#: ../menu-data/muon-discover:kde4__muon-discover.desktop.in.h:2 #: ../menu-data/muon-installer:kde4__muon-installer.desktop.in.h:2 msgid "Software Center" msgstr "软件中心" @@ -12183,7 +12262,6 @@ msgstr "Muon 更新管理器" #: ../menu-data/muon-updater:kde4__muon-updater.desktop.in.h:2 -#: ../menu-data/update-manager:update-manager.desktop.in.h:1 msgid "Update Manager" msgstr "更新管理器" @@ -12307,6 +12385,7 @@ msgid "MythTV Frontend" msgstr "MythTV 前端" +#: ../menu-data/mythbuntu-live-autostart:mythbuntu-live-frontend.desktop.in.h:2 #: ../menu-data/mythtv-frontend:mythtv.desktop.in.h:2 msgid "A frontend for all content on a mythtv-backend" msgstr "可用于 mythtv 后端上所有内容的前端" @@ -12431,10 +12510,12 @@ msgid "NCurses Music Player Client" msgstr "NCurses 音乐播放器客户端" +#: ../menu-data/ndisgtk:ndisgtk-kde.desktop.in.h:1 #: ../menu-data/ndisgtk:ndisgtk.desktop.in.h:1 msgid "Windows Wireless Drivers" msgstr "Windows 无线驱动程序" +#: ../menu-data/ndisgtk:ndisgtk-kde.desktop.in.h:2 #: ../menu-data/ndisgtk:ndisgtk.desktop.in.h:2 msgid "Ndiswrapper driver installation tool" msgstr "Ndiswrapper 驱动程序安装工具" @@ -12585,11 +12666,12 @@ "Displays, modifies and exports in PostScript format phylogenetic trees" msgstr "在 PostScript 格式的系统树中显示、修改和导出" -#: ../menu-data/nmapsi4:kde__nmapsi4.desktop.in.h:1 +#: ../menu-data/nmapsi4:kde4__nmapsi4.desktop.in.h:1 msgid "NmapSI4 - User mode" msgstr "NmapSI4 - 用户模式" -#: ../menu-data/nmapsi4:kde__nmapsi4.desktop.in.h:2 +#: ../menu-data/nmapsi4:kde4__nmapsi4-admin.desktop.in.h:2 +#: ../menu-data/nmapsi4:kde4__nmapsi4.desktop.in.h:2 msgid "Is a Qt4 interface for nmap scanner" msgstr "Nmap 网络扫描器的 Qt4 界面" @@ -12711,11 +12793,11 @@ msgid "The complete OCR suite." msgstr "完整的光学字符识别(OCR)套件。" -#: ../menu-data/octave3.2:octave3.2.desktop.in.h:1 +#: ../menu-data/octave:www.octave.org-octave.desktop.in.h:1 msgid "GNU Octave" msgstr "GNU Octave" -#: ../menu-data/octave3.2:octave3.2.desktop.in.h:2 +#: ../menu-data/octave:www.octave.org-octave.desktop.in.h:2 msgid "Scientific Computing using GNU Octave" msgstr "使用 GNU Octave 进行科学计算" @@ -13090,7 +13172,7 @@ msgid "Pan Newsreader" msgstr "Pan 新闻阅读器" -#: ../menu-data/pan:pan.desktop.in.h:2 ../menu-data/xpn:xpn.desktop.in.h:2 +#: ../menu-data/xpn:xpn.desktop.in.h:2 msgid "Read News from Usenet" msgstr "从 Usenet 读取新闻" @@ -13643,11 +13725,11 @@ msgid "A collection of widgets" msgstr "小部件的集合" -#: ../menu-data/plasma-active-imageviewer:kde4__active-image-viewer.desktop.in.h:1 +#: ../menu-data/plasma-active:kde4__active-imageviewer.desktop.in.h:1 msgid "Images" msgstr "Images" -#: ../menu-data/plasma-active-imageviewer:kde4__active-image-viewer.desktop.in.h:2 +#: ../menu-data/plasma-active:kde4__active-imageviewer.desktop.in.h:2 msgid "An image viewer for touch tablets" msgstr "用于平板电脑的图像查看器" @@ -13962,7 +14044,6 @@ msgstr "Psi Plus Webkit" #: ../menu-data/psi-plus-webkit:psi-plus-webkit.desktop.in.h:2 -#: ../menu-data/psi-plus:psi-plus.desktop.in.h:2 #: ../menu-data/psi:psi.desktop.in.h:2 msgid "Communicate over the Jabber network" msgstr "通过 Jabber 网络进行交流" @@ -14019,7 +14100,7 @@ msgid "PureData" msgstr "PureData" -#: ../menu-data/puredata-core:puredata.desktop.in.h:2 +#: ../menu-data/puredata-gui:puredata.desktop.in.h:2 msgid "Visual dataflow programming platform for multimedia" msgstr "多媒体可视化数据流编程平台" @@ -14603,10 +14684,12 @@ msgstr "配置 Mikrokopter 的工具 " #: ../menu-data/qmmp:qmmp.desktop.in.h:1 +#: ../menu-data/qmmp:qmmp_dir.desktop.in.h:1 msgid "Qmmp" msgstr "Qmmp" #: ../menu-data/qmmp:qmmp.desktop.in.h:2 +#: ../menu-data/qmmp:qmmp_dir.desktop.in.h:2 msgid "Qt4-based Multimedia Player" msgstr "基于 Qt4 的多媒体播放器" @@ -15105,6 +15188,7 @@ msgid "RasMol (GTK version)" msgstr "RasMol (GTK 版本)" +#: ../menu-data/rasmol:rasmol-classic.desktop.in.h:2 #: ../menu-data/rasmol:rasmol-gtk.desktop.in.h:2 msgid "View macro-molecules and prepare publication-quality images of them" msgstr "查看大分子并制作打印质量的分子图像" @@ -15190,7 +15274,7 @@ msgid "Search and replace using regular expressions" msgstr "使用正则表达式搜索和替换" -#: ../menu-data/regina-normal:kde4__regina.desktop.in.h:1 +#: ../menu-data/regina-normal:regina.desktop.in.h:1 msgid "Regina" msgstr "Regina" @@ -15282,11 +15366,11 @@ msgid "Simple text editor for Markdown and ReStructuredText" msgstr "用于 Markdown 和 ReStructuredText 的简单文本编辑器" -#: ../menu-data/revelation:revelation.desktop.in.h:1 +#: ../menu-data/revelation:revelation.desktop.in.h:2 msgid "Revelation Password Manager" msgstr "Revelation 密码管理器" -#: ../menu-data/revelation:revelation.desktop.in.h:2 +#: ../menu-data/revelation:revelation.desktop.in.h:1 msgid "Organize and secure your passwords" msgstr "管理和保护您的密码" @@ -15322,6 +15406,7 @@ msgid "Purchase music on Ubuntu One in Rhythmbox" msgstr "" +#: ../menu-data/rhythmbox:rhythmbox-device.desktop.in.h:1 #: ../menu-data/rhythmbox:rhythmbox.desktop.in.h:1 msgid "Rhythmbox Music Player" msgstr "Rhythmbox 音乐播放器" @@ -15424,7 +15509,8 @@ "A high quality, fast scrolling first-person perspective 3D action game" msgstr "高品质、快节奏的第一人称视角 3D 动作游戏" -#: ../menu-data/roxterm:roxterm.desktop.in.h:1 +#: ../menu-data/roxterm-gtk2:roxterm.desktop.in.h:1 +#: ../menu-data/roxterm-gtk3:roxterm.desktop.in.h:1 msgid "ROXTerm" msgstr "ROXTerm" @@ -16371,11 +16457,13 @@ msgid "Ubuntu Software Center" msgstr "Ubuntu 软件中心" +#: ../menu-data/software-properties-gtk:software-properties-gnome.desktop.in.h:1 #: ../menu-data/software-properties-gtk:software-properties-gtk.desktop.in.h:1 #: ../menu-data/software-properties-kde:software-properties-kde.desktop.in.h:1 msgid "Software Sources" msgstr "软件源" +#: ../menu-data/software-properties-gtk:software-properties-gnome.desktop.in.h:2 #: ../menu-data/software-properties-gtk:software-properties-gtk.desktop.in.h:2 #: ../menu-data/software-properties-kde:software-properties-kde.desktop.in.h:2 msgid "Configure the sources for installable software and updates" @@ -16585,6 +16673,7 @@ msgid "Squeak" msgstr "Squeak" +#: ../menu-data/scratch:scratch.desktop.in.h:2 #: ../menu-data/squeak-vm:squeak.desktop.in.h:2 msgid " Programming system and content development tool" msgstr " 编程系统和内容开发工具" @@ -16762,17 +16851,11 @@ msgid "A subtitle editor based on GStreamer and Gtk+" msgstr "一个基于 GStreamer 和 Gtk+ 的字幕编辑器" -#: ../menu-data/sugar-emulator-0.84:sugar-emulator.desktop.in.h:1 -#: ../menu-data/sugar-emulator-0.86:sugar-emulator.desktop.in.h:1 -#: ../menu-data/sugar-emulator-0.88:sugar-emulator.desktop.in.h:1 -#: ../menu-data/sugar-emulator-0.90:sugar-emulator.desktop.in.h:1 +#: ../menu-data/sugar-emulator-0.96:sugar-emulator.desktop.in.h:1 msgid "Sugar" msgstr "Sugar" -#: ../menu-data/sugar-emulator-0.84:sugar-emulator.desktop.in.h:2 -#: ../menu-data/sugar-emulator-0.86:sugar-emulator.desktop.in.h:2 -#: ../menu-data/sugar-emulator-0.88:sugar-emulator.desktop.in.h:2 -#: ../menu-data/sugar-emulator-0.90:sugar-emulator.desktop.in.h:2 +#: ../menu-data/sugar-emulator-0.96:sugar-emulator.desktop.in.h:2 msgid "The emulator for the Sugar Desktop Environment" msgstr "Sugar 桌面环境模拟器" @@ -16912,10 +16995,12 @@ msgid "Search everything you do." msgstr "搜索你所做的一切。" +#: ../menu-data/synaptic:synaptic-kde.desktop.in.h:1 #: ../menu-data/synaptic:synaptic.desktop.in.h:1 msgid "Synaptic Package Manager" msgstr "新立得软件包管理器" +#: ../menu-data/synaptic:synaptic-kde.desktop.in.h:2 #: ../menu-data/synaptic:synaptic.desktop.in.h:2 msgid "Install, remove and upgrade software packages" msgstr "安装、删除和升级软件包" @@ -16976,6 +17061,7 @@ msgid "Configure and manage clusters in a graphical setting" msgstr "使用图形界面配置并管理群集" +#: ../menu-data/gnome-control-center:gnome-datetime-panel.desktop.in.h:1 #: ../menu-data/system-config-date:system-config-date.desktop.in.h:1 msgid "Date & Time" msgstr "日期和时间" @@ -17020,6 +17106,7 @@ msgid "KDE System Settings" msgstr "KDE 系统设置" +#: ../menu-data/gnome-control-center:gnome-control-center.desktop.in.h:1 #: ../menu-data/systemsettings:kde4__systemsettings.desktop.in.h:1 msgid "System Settings" msgstr "系统设置" @@ -17281,6 +17368,7 @@ msgstr "一个结构化的所见即所得的科学文本编辑器" #: ../menu-data/texmaker:texmaker.desktop.in.h:1 +#: ../menu-data/texstudio:texstudio.desktop.in.h:1 msgid "LaTeX development environment" msgstr "LaTeX 开发环境" @@ -17569,6 +17657,7 @@ msgid "Movie Player" msgstr "电影播放器" +#: ../menu-data/minitube:minitube.desktop.in.h:3 #: ../menu-data/totem:totem.desktop.in.h:3 msgid "Play/Pause" msgstr "播放 / 暂停" @@ -17934,11 +18023,11 @@ msgid "UAE Amiga emulator" msgstr "UAE Amiga 模拟器" -#: ../menu-data/ubuntuone-installer:ubuntuone-installer.desktop.in.h:1 +#: ../menu-data/ubuntuone-control-panel-qt:ubuntuone-installer.desktop.in.h:1 msgid "Ubuntu One" msgstr "Ubuntu One" -#: ../menu-data/ubuntuone-installer:ubuntuone-installer.desktop.in.h:2 +#: ../menu-data/ubuntuone-control-panel-qt:ubuntuone-installer.desktop.in.h:2 msgid "Configure and manage your Ubuntu One account" msgstr "配置和管理您的 Ubuntu One 账户" @@ -18198,7 +18287,7 @@ msgid "UTF-8 Migration Wizard" msgstr "UTF-8 迁移向导" -#: ../menu-data/utouch-geis-tools:geisview.desktop.in.h:1 +#: ../menu-data/geis-tools:geisview.desktop.in.h:1 msgid "geisview" msgstr "geisview" @@ -18350,10 +18439,12 @@ msgid "GVim" msgstr "GVim" +#: ../menu-data/vinagre:vinagre-file.desktop.in.h:1 #: ../menu-data/vinagre:vinagre.desktop.in.h:1 msgid "Remote Desktop Viewer" msgstr "远程桌面查看器" +#: ../menu-data/vinagre:vinagre-file.desktop.in.h:2 #: ../menu-data/vinagre:vinagre.desktop.in.h:2 msgid "Access remote desktops" msgstr "访问远程桌面" @@ -18657,7 +18748,6 @@ msgstr "韦诺之战 (1.10)" #: ../menu-data/wesnoth-1.10-core:wesnoth-1.10.desktop.in.h:2 -#: ../menu-data/wesnoth-1.8-core:wesnoth-1.8.desktop.in.h:2 msgid "A fantasy turn-based strategy game" msgstr "一个奇幻回合制战略游戏" @@ -18739,6 +18829,7 @@ msgid "Winefish LaTeX Editor" msgstr "Winefish LaTeX 编辑器" +#: ../menu-data/winefish:winefish-project.desktop.in.h:2 #: ../menu-data/winefish:winefish.desktop.in.h:2 msgid "LaTeX Editor based on Bluefish" msgstr "基于 Bluefish 的 LaTeX 编辑器" @@ -19569,6 +19660,7 @@ msgid "XTerm" msgstr "XTerm" +#: ../menu-data/xterm:debian-uxterm.desktop.in.h:2 #: ../menu-data/xterm:debian-xterm.desktop.in.h:2 msgid "standard terminal emulator for the X window system" msgstr "用于 X 窗口系统的标准终端仿真器" @@ -19691,6 +19783,7 @@ msgid "Place phone calls over the Internet" msgstr "在互联网上进行电话呼叫" +#: ../menu-data/khelpcenter4:kde4__Help.desktop.in.h:1 #: ../menu-data/yelp:yelp.desktop.in.h:1 msgid "Help" msgstr "帮助" @@ -19807,6 +19900,7 @@ msgid "Zenmap" msgstr "Zenmap" +#: ../menu-data/zenmap:zenmap-root.desktop.in.h:2 #: ../menu-data/zenmap:zenmap.desktop.in.h:2 msgid "A cross-platform GUI for the Nmap Security Scanner." msgstr "一个跨平台的 Nmap 安全扫描仪的 GUI。" diff -Nru language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/apparmorapplet.po language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/apparmorapplet.po --- language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/apparmorapplet.po 2012-05-08 22:47:57.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/apparmorapplet.po 2013-01-29 09:37:00.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: 2012-05-08 05:56+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2013-01-28 14:57+0000\n" +"X-Generator: Launchpad (build 16451)\n" #: src/apparmor-applet.c:244 msgid "" diff -Nru language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/apport.po language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/apport.po --- language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/apport.po 2012-05-08 22:47:52.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/apport.po 2013-01-29 09:37:09.000000000 +0000 @@ -7,30 +7,32 @@ msgstr "" "Project-Id-Version: apport\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-27 16:34+0000\n" +"POT-Creation-Date: 2013-01-02 20:40+0000\n" "PO-Revision-Date: 2012-04-06 17:06+0000\n" "Last-Translator: Aron Xu \n" "Language-Team: Chinese (China) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-08 05:20+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2013-01-28 14:19+0000\n" +"X-Generator: Launchpad (build 16451)\n" "Language: \n" -#: ../apport/ui.py:92 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:122 +#: ../apport/ui.py:122 msgid "This package does not seem to be installed correctly" msgstr "该软件包似乎没有被正确安装" -#. TRANS: %s is the name of the operating system -#: ../apport/ui.py:95 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:126 +#: ../apport/ui.py:126 #, python-format msgid "" "This is not an official %s package. Please remove any third party package " "and try again." msgstr "这不是官方的 %s 软件包。请删除所有第三方软件包，然后重试。" -#: ../apport/ui.py:115 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:143 +#: ../apport/ui.py:143 #, python-format msgid "" "You have some obsolete package versions installed. Please upgrade the " @@ -42,105 +44,151 @@ "\n" "%s" -#: ../apport/ui.py:211 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:249 +#: ../apport/ui.py:249 msgid "unknown program" msgstr "未知程序" -#: ../apport/ui.py:212 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:250 +#: ../apport/ui.py:250 #, python-format msgid "Sorry, the program \"%s\" closed unexpectedly" msgstr "对不起，%s 程序异常退出" -#: ../apport/ui.py:213 ../apport/ui.py:1111 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:252 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1254 +#: ../apport/ui.py:252 ../apport/ui.py:1254 #, python-format msgid "Problem in %s" msgstr "%s 中的问题" -#: ../apport/ui.py:214 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:253 +#: ../apport/ui.py:253 msgid "" "Your computer does not have enough free memory to automatically analyze the " "problem and send a report to the developers." msgstr "您的计算机剩余空间不足，程序无法自动诊断问题并向开发者发送问题报告。" #. package does not exist -#: ../apport/ui.py:228 ../apport/ui.py:235 ../apport/ui.py:241 -#: ../apport/ui.py:279 ../apport/ui.py:287 ../apport/ui.py:358 -#: ../apport/ui.py:361 ../apport/ui.py:559 ../apport/ui.py:926 -#: ../apport/ui.py:1065 ../apport/ui.py:1069 ../apport/ui.py:1088 -#: ../apport/ui.py:1094 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:268 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:285 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:1052 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:1072 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:1083 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui.py:1094 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:268 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:274 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:280 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:323 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:331 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:460 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:463 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:664 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1067 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1208 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1212 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1231 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1237 +#: ../apport/ui.py:268 ../apport/ui.py:274 ../apport/ui.py:280 +#: ../apport/ui.py:323 ../apport/ui.py:331 ../apport/ui.py:460 +#: ../apport/ui.py:463 ../apport/ui.py:664 ../apport/ui.py:1067 +#: ../apport/ui.py:1208 ../apport/ui.py:1212 ../apport/ui.py:1231 +#: ../apport/ui.py:1237 msgid "Invalid problem report" msgstr "无效的问题报告" -#: ../apport/ui.py:230 ../apport/ui.py:1071 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:269 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1214 +#: ../apport/ui.py:269 ../apport/ui.py:1214 msgid "This problem report is damaged and cannot be processed." msgstr "该问题报告已损坏，无法处理。" -#: ../apport/ui.py:236 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:275 +#: ../apport/ui.py:275 msgid "The report belongs to a package that is not installed." msgstr "该报告属于一个未安装的软件包。" -#: ../apport/ui.py:242 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:281 +#: ../apport/ui.py:281 msgid "An error occurred while attempting to process this problem report:" msgstr "尝试处理此问题报告时出现错误：" -#: ../apport/ui.py:280 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:324 +#: ../apport/ui.py:324 msgid "You are not allowed to access this problem report." msgstr "您没有访问这个问题报告的权限。" -#: ../apport/ui.py:283 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:327 +#: ../apport/ui.py:327 msgid "Error" msgstr "错误" -#: ../apport/ui.py:284 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:328 +#: ../apport/ui.py:328 msgid "There is not enough disk space available to process this report." msgstr "没有足够的空间来执行报告。" -#: ../apport/ui.py:311 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:412 +#: ../apport/ui.py:412 msgid "No package specified" msgstr "没有指定软件包" -#: ../apport/ui.py:312 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:413 +#: ../apport/ui.py:413 msgid "" "You need to specify a package or a PID. See --help for more information." msgstr "您需要指定一个软件包或者 PID。使用 --help 选项来获取更多信息。" -#: ../apport/ui.py:328 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:430 +#: ../apport/ui.py:430 msgid "Invalid PID" msgstr "无效的 PID" -#: ../apport/ui.py:329 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:431 +#: ../apport/ui.py:431 msgid "The specified process ID does not belong to a program." msgstr "指定的进程 ID 不属于一个程序。" -#: ../apport/ui.py:337 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:439 +#: ../apport/ui.py:439 msgid "Permission denied" msgstr "拒绝访问" -#: ../apport/ui.py:338 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:440 +#: ../apport/ui.py:440 msgid "" "The specified process does not belong to you. Please run this program as the " "process owner or as root." msgstr "指定的进程不属于您。请作为进程的所有者或 root 运行这个进程。" -#: ../apport/ui.py:359 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:461 +#: ../apport/ui.py:461 #, python-format msgid "Symptom script %s did not determine an affected package" msgstr "症状脚本 %s 没有划定受影响的包" -#: ../apport/ui.py:362 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:464 +#: ../apport/ui.py:464 #, python-format msgid "Package %s does not exist" msgstr "软件包 %s 不存在" -#: ../apport/ui.py:387 ../apport/ui.py:571 ../apport/ui.py:576 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:488 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:676 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:681 +#: ../apport/ui.py:488 ../apport/ui.py:676 ../apport/ui.py:681 msgid "Cannot create report" msgstr "不能创建报告" -#: ../apport/ui.py:402 ../apport/ui.py:448 ../apport/ui.py:465 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:503 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:549 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:566 +#: ../apport/ui.py:503 ../apport/ui.py:549 ../apport/ui.py:566 msgid "Updating problem report" msgstr "更新问题报告" -#: ../apport/ui.py:403 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:504 +#: ../apport/ui.py:504 msgid "" "You are not the reporter or subscriber of this problem report, or the report " "is a duplicate or already closed.\n" @@ -150,7 +198,8 @@ "您不是该问题报告的报告者或订阅者，或者该报告被视为重复或已经关闭。\n" "请使用 apport-bug 新建一份报告。" -#: ../apport/ui.py:412 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:513 +#: ../apport/ui.py:513 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 " @@ -165,51 +214,65 @@ "因此，我们建议您使用 apport-bug 来提交新的错误报告，并在当前报告中对您新提交的报告进行评论。\n" "您确定要继续么？" -#: ../apport/ui.py:449 ../apport/ui.py:466 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:550 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:567 +#: ../apport/ui.py:550 ../apport/ui.py:567 msgid "No additional information collected." msgstr "未收集更多信息。" -#: ../apport/ui.py:516 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:618 +#: ../apport/ui.py:618 msgid "What kind of problem do you want to report?" msgstr "您想报告什么类型的问题？" -#: ../apport/ui.py:533 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:635 +#: ../apport/ui.py:635 msgid "Unknown symptom" msgstr "未知症状" -#: ../apport/ui.py:534 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:636 +#: ../apport/ui.py:636 #, python-format msgid "The symptom \"%s\" is not known." msgstr "症状 %s 未知。" -#: ../apport/ui.py:562 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:667 +#: ../apport/ui.py:667 msgid "" "After closing this message please click on an application window to report a " "problem about it." msgstr "在关闭这个消息只后，请点击要报告问题的程序窗口。" -#: ../apport/ui.py:572 ../apport/ui.py:577 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:677 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:682 +#: ../apport/ui.py:677 ../apport/ui.py:682 msgid "xprop failed to determine process ID of the window" msgstr "xprop 无法确定窗口的进程 ID" -#: ../apport/ui.py:591 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:696 +#: ../apport/ui.py:696 msgid "%prog " msgstr "%prog <报告号>" -#: ../apport/ui.py:593 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:698 +#: ../apport/ui.py:698 msgid "Specify package name." msgstr "请指定包的名称。" -#: ../apport/ui.py:595 ../apport/ui.py:644 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:700 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:751 +#: ../apport/ui.py:700 ../apport/ui.py:751 msgid "Add an extra tag to the report. Can be specified multiple times." msgstr "向报告中添加额外的标记，可多次指定。" -#: ../apport/ui.py:625 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:730 +#: ../apport/ui.py:730 msgid "" "%prog [options] [symptom|pid|package|program path|.apport/.crash file]" msgstr "%prog [选项] [症状|PID|软件包|程序目录|.apport/.crash file]" -#: ../apport/ui.py:628 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:733 +#: ../apport/ui.py:733 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 " @@ -217,118 +280,142 @@ msgstr "" "以填写 bug 模式启动。需要 --package 和可选的 --pid 参数，或单独使用 --pid 参数。如果二者均未给出，将显示一系列症状供选择。" -#: ../apport/ui.py:630 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:735 +#: ../apport/ui.py:735 msgid "Click a window as a target for filing a problem report." msgstr "点击一个窗口作为提交问题报告的目标。" -#: ../apport/ui.py:632 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:737 +#: ../apport/ui.py:737 msgid "Start in bug updating mode. Can take an optional --package." msgstr "启动错误更新模式。可以使用选项 --package 来指定软件包。" -#: ../apport/ui.py:634 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:739 +#: ../apport/ui.py:739 msgid "" "File a bug report about a symptom. (Implied if symptom name is given as only " "argument.)" msgstr "针对某个症状报告 bug。" -#: ../apport/ui.py:636 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:741 +#: ../apport/ui.py:741 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，则是可选的。(如果只给定软件包名这一个参数则为必需。)" -#: ../apport/ui.py:638 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:743 +#: ../apport/ui.py:743 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 作为唯一参数。)" -#: ../apport/ui.py:640 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:747 +#: ../apport/ui.py:747 #, 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 中汇报崩溃。(如果文件只给定了参数时实现。)" -#: ../apport/ui.py:642 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:749 +#: ../apport/ui.py:749 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 "在提交报告过程中，将收集到的信息保存到要报告的文件中。该文件可用于稍后在另一台机器上提交。" -#: ../apport/ui.py:646 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:753 +#: ../apport/ui.py:753 msgid "Print the Apport version number." msgstr "输出 Apport 版本号" -#: ../apport/ui.py:778 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:887 +#: ../apport/ui.py:887 msgid "" "This will launch apport-retrace in a terminal window to examine the crash." msgstr "这将在终端窗口中启动 apport-retrace，以检查此崩溃。" -#: ../apport/ui.py:779 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:888 +#: ../apport/ui.py:888 msgid "Run gdb session" msgstr "运行 gdb 会话" -#: ../apport/ui.py:780 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:889 +#: ../apport/ui.py:889 msgid "Run gdb session without downloading debug symbols" msgstr "不下载调试符号的情况下运行 gdb 会话" #. TRANSLATORS: %s contains the crash report file name -#: ../apport/ui.py:782 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:891 +#: ../apport/ui.py:891 #, python-format msgid "Update %s with fully symbolic stack trace" msgstr "利用全符号化堆栈轨迹更新 %s" -#: ../apport/ui.py:823 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:964 +#: ../apport/ui.py:964 #, python-format msgid "" "The problem happened with the program %s which changed since the crash " "occurred." msgstr "自崩溃发生起已更改的程序 %s 出现问题。" -#: ../apport/ui.py:927 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1068 +#: ../apport/ui.py:1068 msgid "Could not determine the package or source package name." msgstr "无法检测包或者源码包的名称。" -#: ../apport/ui.py:945 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1086 +#: ../apport/ui.py:1086 msgid "Unable to start web browser" msgstr "无法打开浏览器" -#: ../apport/ui.py:946 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1087 +#: ../apport/ui.py:1087 #, python-format msgid "Unable to start web browser to open %s." msgstr "无法用浏览器打开网页 %s" -#: ../apport/ui.py:1021 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1162 +#: ../apport/ui.py:1162 #, python-format msgid "Please enter your account information for the %s bug tracking system" msgstr "请为 %s 错误追踪系统输入您的帐户信息" -#: ../apport/ui.py:1032 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1174 +#: ../apport/ui.py:1174 msgid "Network problem" msgstr "网络问题" -#: ../apport/ui.py:1034 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1176 +#: ../apport/ui.py:1176 msgid "" "Cannot connect to crash database, please check your Internet connection." msgstr "无法连接到崩溃数据库，请检查您的 Internet 连接。" -#: ../apport/ui.py:1060 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1203 +#: ../apport/ui.py:1203 msgid "Memory exhaustion" msgstr "内存耗尽" -#: ../apport/ui.py:1061 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1204 +#: ../apport/ui.py:1204 msgid "Your system does not have enough memory to process this crash report." msgstr "你的系统没有足够的内存来处理这一次崩溃报告。" -#: ../apport/ui.py:1084 ../apport/ui.py:1093 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1227 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1236 +#: ../apport/ui.py:1227 ../apport/ui.py:1236 msgid "" "This problem report applies to a program which is not installed any more." msgstr "这一问题报告适用于不再安装的程序。" -#: ../apport/ui.py:1114 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1257 +#: ../apport/ui.py:1257 #, python-format msgid "" "The problem cannot be reported:\n" @@ -339,48 +426,61 @@ "\n" "%s" -#: ../apport/ui.py:1153 ../apport/ui.py:1160 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1308 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1315 +#: ../apport/ui.py:1308 ../apport/ui.py:1315 msgid "Problem already known" msgstr "该问题为已知问题" -#: ../apport/ui.py:1154 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1309 +#: ../apport/ui.py:1309 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 "关于这个问题，之前已经有如网页所示的报告。您是否有所补充？" -#: ../apport/ui.py:1161 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1316 +#: ../apport/ui.py:1316 msgid "This problem was already reported to developers. Thank you!" msgstr "已将此问题报告给开发人员。谢谢！" -#: ../bin/apport-cli.py:71 +#: ../debian/tmp/usr/bin/apport-cli.py:74 ../bin/apport-cli.py:74 msgid "Press any key to continue..." msgstr "按任意键继续…" -#: ../bin/apport-cli.py:78 +#: ../debian/tmp/usr/bin/apport-cli.py:81 ../bin/apport-cli.py:81 msgid "What would you like to do? Your options are:" msgstr "您想做什么？您的选择是：" -#: ../bin/apport-cli.py:82 +#: ../debian/tmp/usr/bin/apport-cli.py:85 ../bin/apport-cli.py:85 #, python-format msgid "Please choose (%s):" msgstr "请选择(%s)：" -#: ../bin/apport-cli.py:141 +#: ../debian/tmp/usr/bin/apport-cli.py:145 ../bin/apport-cli.py:145 #, python-format msgid "(%i bytes)" msgstr "(%i 字节)" -#: ../bin/apport-cli.py:143 ../gtk/apport-gtk.py:118 ../kde/apport-kde.py:315 +#: ../debian/tmp/usr/bin/apport-cli.py:147 +#: ../debian/tmp/usr/share/apport/apport-kde.py:338 ../gtk/apport-gtk.py:138 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:138 ../bin/apport-cli.py:147 +#: ../kde/apport-kde.py:338 msgid "(binary data)" msgstr "(二进制数据)" -#: ../bin/apport-cli.py:173 ../gtk/apport-gtk.py:148 ../kde/apport-kde.py:156 +#: ../debian/tmp/usr/bin/apport-cli.py:175 +#: ../debian/tmp/usr/share/apport/apport-kde.py:162 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:404 +#: ../gtk/apport-gtk.py:173 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:282 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:173 ../bin/apport-cli.py:175 +#: ../kde/apport-kde.py:162 msgid "Send problem report to the developers?" msgstr "向开发者发送问题报告？" -#: ../bin/apport-cli.py:174 +#: ../debian/tmp/usr/bin/apport-cli.py:176 ../bin/apport-cli.py:176 msgid "" "After the problem report has been sent, please fill out the form in the\n" "automatically opened web browser." @@ -388,50 +488,57 @@ "当问题报告被发出之后，请填写\n" "自动弹出窗口的表格。" -#: ../bin/apport-cli.py:177 +#: ../debian/tmp/usr/bin/apport-cli.py:179 ../bin/apport-cli.py:179 #, python-format msgid "&Send report (%s)" msgstr "发送报告(&S)(%s)" -#: ../bin/apport-cli.py:181 +#: ../debian/tmp/usr/bin/apport-cli.py:183 ../bin/apport-cli.py:183 msgid "&Examine locally" msgstr "本地检查(&E)" -#: ../bin/apport-cli.py:185 +#: ../debian/tmp/usr/bin/apport-cli.py:187 ../bin/apport-cli.py:187 msgid "&View report" msgstr "查看报告(&V)" -#: ../bin/apport-cli.py:186 +#: ../debian/tmp/usr/bin/apport-cli.py:188 ../bin/apport-cli.py:188 msgid "&Keep report file for sending later or copying to somewhere else" msgstr "保存报告文件以便稍后发送或者复制到其他地方(&K)" -#: ../bin/apport-cli.py:187 +#: ../debian/tmp/usr/bin/apport-cli.py:189 ../bin/apport-cli.py:189 msgid "Cancel and &ignore future crashes of this program version" msgstr "终止并忽略这个版本软件以后出现的崩溃(&I)" -#: ../bin/apport-cli.py:189 ../bin/apport-cli.py:266 ../bin/apport-cli.py:298 -#: ../bin/apport-cli.py:319 +#: ../debian/tmp/usr/bin/apport-cli.py:191 +#: ../debian/tmp/usr/bin/apport-cli.py:268 +#: ../debian/tmp/usr/bin/apport-cli.py:300 +#: ../debian/tmp/usr/bin/apport-cli.py:321 ../bin/apport-cli.py:191 +#: ../bin/apport-cli.py:268 ../bin/apport-cli.py:300 ../bin/apport-cli.py:321 msgid "&Cancel" msgstr "取消(&C)" -#: ../bin/apport-cli.py:217 +#: ../debian/tmp/usr/bin/apport-cli.py:219 ../bin/apport-cli.py:219 msgid "Problem report file:" msgstr "问题报告文件：" -#: ../bin/apport-cli.py:223 ../bin/apport-cli.py:228 +#: ../debian/tmp/usr/bin/apport-cli.py:225 +#: ../debian/tmp/usr/bin/apport-cli.py:230 ../bin/apport-cli.py:225 +#: ../bin/apport-cli.py:230 msgid "&Confirm" msgstr "确认(&C)" -#: ../bin/apport-cli.py:227 +#: ../debian/tmp/usr/bin/apport-cli.py:229 ../bin/apport-cli.py:229 #, python-format msgid "Error: %s" msgstr "错误：%s" -#: ../bin/apport-cli.py:233 ../kde/apport-kde.py:360 +#: ../debian/tmp/usr/bin/apport-cli.py:235 +#: ../debian/tmp/usr/share/apport/apport-kde.py:383 ../bin/apport-cli.py:235 +#: ../kde/apport-kde.py:383 msgid "Collecting problem information" msgstr "正在收集问题信息" -#: ../bin/apport-cli.py:234 +#: ../debian/tmp/usr/bin/apport-cli.py:236 ../bin/apport-cli.py:236 msgid "" "The collected information can be sent to the developers to improve the\n" "application. This might take a few minutes." @@ -439,11 +546,14 @@ "收集到的信息将会传送到开发人员处以改进软件。\n" "这可能会花费几分钟时间，" -#: ../bin/apport-cli.py:246 ../gtk/apport-gtk.ui.h:13 ../kde/apport-kde.py:388 +#: ../debian/tmp/usr/bin/apport-cli.py:248 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:13 +#: ../debian/tmp/usr/share/apport/apport-kde.py:411 ../gtk/apport-gtk.ui.h:13 +#: ../bin/apport-cli.py:248 ../kde/apport-kde.py:411 msgid "Uploading problem information" msgstr "上传问题信息" -#: ../bin/apport-cli.py:247 +#: ../debian/tmp/usr/bin/apport-cli.py:249 ../bin/apport-cli.py:249 msgid "" "The collected information is being sent to the bug tracking system.\n" "This might take a few minutes." @@ -451,173 +561,213 @@ "收集到的信息正在被发送到错误跟踪系统。\n" "这可能要花费几分钟时间。" -#: ../bin/apport-cli.py:297 +#: ../debian/tmp/usr/bin/apport-cli.py:299 ../bin/apport-cli.py:299 msgid "&Done" msgstr "完成(&D)" -#: ../bin/apport-cli.py:303 +#: ../debian/tmp/usr/bin/apport-cli.py:305 ../bin/apport-cli.py:305 msgid "none" msgstr "无" -#: ../bin/apport-cli.py:304 +#: ../debian/tmp/usr/bin/apport-cli.py:306 ../bin/apport-cli.py:306 #, python-format msgid "Selected: %s. Multiple choices:" msgstr "已选择：%s。 多重选择：" -#: ../bin/apport-cli.py:320 +#: ../debian/tmp/usr/bin/apport-cli.py:322 ../bin/apport-cli.py:322 msgid "Choices:" msgstr "选择：" -#: ../bin/apport-cli.py:334 +#: ../debian/tmp/usr/bin/apport-cli.py:336 ../bin/apport-cli.py:336 msgid "Path to file (Enter to cancel):" msgstr "文件的路径(回车取消)：" -#: ../bin/apport-cli.py:340 +#: ../debian/tmp/usr/bin/apport-cli.py:342 ../bin/apport-cli.py:342 msgid "File does not exist." msgstr "文件不存在。" -#: ../bin/apport-cli.py:342 +#: ../debian/tmp/usr/bin/apport-cli.py:344 ../bin/apport-cli.py:344 msgid "This is a directory." msgstr "这是一个目录。" -#: ../bin/apport-cli.py:348 +#: ../debian/tmp/usr/bin/apport-cli.py:350 ../bin/apport-cli.py:350 msgid "To continue, you must visit the following URL:" msgstr "要继续，您必须访问下面这个网址：" -#: ../bin/apport-cli.py:350 +#: ../debian/tmp/usr/bin/apport-cli.py:352 ../bin/apport-cli.py:352 msgid "" "You can launch a browser now, or copy this URL into a browser on another " "computer." msgstr "您现在可以加载一个浏览器，或者复制这个网址到另外一个电脑的浏览器。" -#: ../bin/apport-cli.py:352 +#: ../debian/tmp/usr/bin/apport-cli.py:354 ../bin/apport-cli.py:354 msgid "Launch a browser now" msgstr "现在启动一个浏览器" -#: ../bin/apport-cli.py:366 +#: ../debian/tmp/usr/bin/apport-cli.py:368 ../bin/apport-cli.py:368 msgid "No pending crash reports. Try --help for more information." msgstr "没有已知的崩溃报告，尝试 --help 以获得更多信息。" +#: ../debian/tmp/usr/share/apport/apportcheckresume.py:68 #: ../data/apportcheckresume.py:68 msgid "" "This occured during a previous suspend and prevented it from resuming " "properly." msgstr "这是在上一个挂起中发生的，并阻止了它正确地恢复。" +#: ../debian/tmp/usr/share/apport/apportcheckresume.py:70 #: ../data/apportcheckresume.py:70 msgid "" "This occured during a previous hibernate and prevented it from resuming " "properly." msgstr "这是在上一个休眠中发生的，并阻止了它正确地恢复。" +#: ../debian/tmp/usr/share/apport/apportcheckresume.py:75 #: ../data/apportcheckresume.py:75 msgid "" "The resume processing hung very near the end and will have appeared to have " "completed normally." msgstr "这个恢复过程已经非常接近尾声，将正常结束。" -#: ../gtk/apport-gtk.ui.h:1 ../kde/apport-kde.py:423 ../kde/apport-kde.py:459 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:1 +#: ../debian/tmp/usr/share/apport/apport-kde.py:446 +#: ../debian/tmp/usr/share/apport/apport-kde.py:482 ../gtk/apport-gtk.ui.h:1 +#: ../kde/apport-kde.py:446 ../kde/apport-kde.py:482 msgid "Apport" msgstr "Apport" -#: ../gtk/apport-gtk.ui.h:2 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:2 ../gtk/apport-gtk.ui.h:2 msgid "Crash report" msgstr "崩溃报告" -#: ../gtk/apport-gtk.ui.h:3 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:3 ../gtk/apport-gtk.ui.h:3 msgid "Sorry, an internal error happened." msgstr "对不起，发生内部错误。" -#: ../gtk/apport-gtk.ui.h:4 ../gtk/apport-gtk.py:227 ../kde/apport-kde.py:206 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:4 +#: ../debian/tmp/usr/share/apport/apport-kde.py:220 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:302 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:342 +#: ../gtk/apport-gtk.ui.h:4 ../gtk/apport-gtk.py:296 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:252 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:296 ../kde/apport-kde.py:220 msgid "If you notice further problems, try restarting the computer." msgstr "如果您注意到更多问题，请尝试重新启动计算机。" -#: ../gtk/apport-gtk.ui.h:5 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:5 ../gtk/apport-gtk.ui.h:5 msgid "Send an error report to help fix this problem" msgstr "请发送错误报告，以帮助修复此问题" -#: ../gtk/apport-gtk.ui.h:6 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:6 ../gtk/apport-gtk.ui.h:6 msgid "Ignore future problems of this program version" msgstr "以后忽略此版本程序的问题" -#: ../gtk/apport-gtk.ui.h:7 ../gtk/apport-gtk.py:166 ../gtk/apport-gtk.py:491 -#: ../kde/apport-kde.py:248 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:7 +#: ../debian/tmp/usr/share/apport/apport-kde.py:271 ../gtk/apport-gtk.ui.h:7 +#: ../gtk/apport-gtk.py:200 ../gtk/apport-gtk.py:569 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:200 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:569 ../kde/apport-kde.py:271 msgid "Show Details" msgstr "显示详细信息" -#: ../gtk/apport-gtk.ui.h:8 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:8 ../gtk/apport-gtk.ui.h:8 msgid "_Examine locally" msgstr "本地检查(&E)" -#: ../gtk/apport-gtk.ui.h:9 ../gtk/apport-gtk.py:215 ../kde/apport-kde.py:196 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:9 +#: ../debian/tmp/usr/share/apport/apport-kde.py:213 ../gtk/apport-gtk.ui.h:9 +#: ../gtk/apport-gtk.py:283 ../debian/tmp/usr/share/apport/apport-gtk.py:283 +#: ../kde/apport-kde.py:213 msgid "Leave Closed" msgstr "保持关闭状态" -#: ../gtk/apport-gtk.ui.h:10 ../gtk/apport-gtk.py:178 ../gtk/apport-gtk.py:219 -#: ../gtk/apport-gtk.py:230 ../kde/apport-kde.py:200 ../kde/apport-kde.py:209 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:10 +#: ../debian/tmp/usr/share/apport/apport-kde.py:210 +#: ../debian/tmp/usr/share/apport/apport-kde.py:223 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:115 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:144 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:157 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:192 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:310 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:350 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:454 +#: ../gtk/apport-gtk.ui.h:10 ../gtk/apport-gtk.py:212 ../gtk/apport-gtk.py:280 +#: ../gtk/apport-gtk.py:299 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:111 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:137 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:149 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:182 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:258 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:328 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:212 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:280 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:299 ../kde/apport-kde.py:210 +#: ../kde/apport-kde.py:223 msgid "Continue" msgstr "继续" -#: ../gtk/apport-gtk.ui.h:11 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:11 ../gtk/apport-gtk.ui.h:11 msgid "Collecting problem information" msgstr "正在收集问题信息" -#: ../gtk/apport-gtk.ui.h:12 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:12 ../gtk/apport-gtk.ui.h:12 msgid "" "Information is being collected that may help the developers fix the problem " "you report." msgstr "正在收集信息，这些信息将会帮助开发人员修复您报告的问题。" -#: ../gtk/apport-gtk.ui.h:14 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:14 ../gtk/apport-gtk.ui.h:14 msgid "Uploading problem information" msgstr "正在上传问题信息" -#: ../gtk/apport-gtk.ui.h:15 ../kde/apport-kde.py:389 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:15 +#: ../debian/tmp/usr/share/apport/apport-kde.py:412 ../gtk/apport-gtk.ui.h:15 +#: ../kde/apport-kde.py:412 msgid "" "The collected information is being sent to the bug tracking system. This " "might take a few minutes." msgstr "正在将收集的信息到缺陷跟踪系统。可能需要几分钟时间。" -#: ../bin/apport-retrace.py:37 +#: ../debian/tmp/usr/bin/apport-retrace.py:31 ../bin/apport-retrace.py:31 msgid "%prog [options] " msgstr "%prog [选项] " -#: ../bin/apport-retrace.py:39 +#: ../debian/tmp/usr/bin/apport-retrace.py:33 ../bin/apport-retrace.py:33 msgid "Do not put the new traces into the report, but write them to stdout." msgstr "不把新的痕迹写入到报告，但是把它们写入到标准输出。" -#: ../bin/apport-retrace.py:41 +#: ../debian/tmp/usr/bin/apport-retrace.py:35 ../bin/apport-retrace.py:35 msgid "" "Start an interactive gdb session with the report's core dump (-o ignored; " "does not rewrite report)" msgstr "启动一个交互式的 gdb 进程并载入提交的崩溃信息 (-o 不重新生成报告)" -#: ../bin/apport-retrace.py:43 +#: ../debian/tmp/usr/bin/apport-retrace.py:37 ../bin/apport-retrace.py:37 msgid "" "Write modified report to given file instead of changing the original report" msgstr "将更改过的报告写入指定文件而非改变原始报告" -#: ../bin/apport-retrace.py:45 +#: ../debian/tmp/usr/bin/apport-retrace.py:39 ../bin/apport-retrace.py:39 msgid "Remove the core dump from the report after stack trace regeneration" msgstr "生成栈回溯后将内核转储从报告中删除" -#: ../bin/apport-retrace.py:47 +#: ../debian/tmp/usr/bin/apport-retrace.py:41 ../bin/apport-retrace.py:41 msgid "Override report's CoreFile" msgstr "覆盖报告核心文件" -#: ../bin/apport-retrace.py:49 +#: ../debian/tmp/usr/bin/apport-retrace.py:43 ../bin/apport-retrace.py:43 msgid "Override report's ExecutablePath" msgstr "覆盖报告执行路径" -#: ../bin/apport-retrace.py:51 +#: ../debian/tmp/usr/bin/apport-retrace.py:45 ../bin/apport-retrace.py:45 msgid "Override report's ProcMaps" msgstr "覆盖报告的进程表" -#: ../bin/apport-retrace.py:53 +#: ../debian/tmp/usr/bin/apport-retrace.py:47 ../bin/apport-retrace.py:47 msgid "Rebuild report's Package information" msgstr "重建报告的包信息" -#: ../bin/apport-retrace.py:55 +#: ../debian/tmp/usr/bin/apport-retrace.py:49 ../bin/apport-retrace.py:49 msgid "" "Build a temporary sandbox and download/install the necessary packages and " "debug symbols in there; without this option it assumes that the necessary " @@ -629,68 +779,70 @@ "构建临时沙盒，以及下载/安装必要的软件包和调试符号；如果没有该选项，则会假设该系统中已安装了必要的软件包和调试符号。此参数指向该打包系统配置库目录；如果指" "定 \"system\"，则其将使用系统配置文件，但之后，其将只能够追溯当前正在运行的版本上发生的崩溃。" -#: ../bin/apport-retrace.py:57 +#: ../debian/tmp/usr/bin/apport-retrace.py:51 ../bin/apport-retrace.py:51 msgid "" "Report download/install progress when installing packages into sandbox" msgstr "在将软件包安装到沙盒中时，报告下载和安装的进度" -#: ../bin/apport-retrace.py:59 +#: ../debian/tmp/usr/bin/apport-retrace.py:53 ../bin/apport-retrace.py:53 msgid "Prepend timestamps to log messages, for batch operation" msgstr "为进行批量操作，请预先设置时间戳，以记录消息" -#: ../bin/apport-retrace.py:61 +#: ../debian/tmp/usr/bin/apport-retrace.py:55 ../bin/apport-retrace.py:55 msgid "Cache directory for packages downloaded in the sandbox" msgstr "缓存下载到沙盒中的软件包的目录" -#: ../bin/apport-retrace.py:63 +#: ../debian/tmp/usr/bin/apport-valgrind.py:66 +#: ../debian/tmp/usr/bin/apport-retrace.py:59 ../bin/apport-valgrind.py:66 +#: ../bin/apport-retrace.py:59 msgid "" "Install an extra package into the sandbox (can be specified multiple times)" msgstr "将其他软件包安装到沙盒(可多次加以指定)中" -#: ../bin/apport-retrace.py:65 +#: ../debian/tmp/usr/bin/apport-retrace.py:61 ../bin/apport-retrace.py:61 msgid "" "Path to a file with the crash database authentication information. This is " "used when specifying a crash ID to upload the retraced stack traces (only if " "neither -g, -o, nor -s are specified)" msgstr "包含崩溃数据库访问信息文件之路径。此项将用于为特定崩溃代码上传堆栈的回溯调试信息(除非用户指定 -g, -o 或 -s)" -#: ../bin/apport-retrace.py:67 +#: ../debian/tmp/usr/bin/apport-retrace.py:63 ../bin/apport-retrace.py:63 msgid "" "Display retraced stack traces and ask for confirmation before sending them " "to the crash database." msgstr "显示返回的堆栈信息，并询求确认是否将其发送至崩溃数据库。" -#: ../bin/apport-retrace.py:69 +#: ../debian/tmp/usr/bin/apport-retrace.py:65 ../bin/apport-retrace.py:65 msgid "" "Path to the duplicate sqlite database (default: no duplicate checking)" msgstr "SQLite 数据库路径重复(默认：不重复检查)" -#: ../bin/apport-retrace.py:74 +#: ../debian/tmp/usr/bin/apport-retrace.py:70 ../bin/apport-retrace.py:70 msgid "incorrect number of arguments; use --help for a short help" msgstr "参数数量错误；使用 --help 获取简略帮助" -#: ../bin/apport-retrace.py:78 +#: ../debian/tmp/usr/bin/apport-retrace.py:80 ../bin/apport-retrace.py:80 msgid "" "you either need to do a local operation (-s, -g, -o) or supply an " "authentication file (--auth); see --help for a short help" msgstr "您或需要进行一项本地操作(-s, -g, -o) 或提供一个认证文件(--auth)；参见 --help 以获取简单帮助。" #. translators: don't translate y/n, apport currently only checks for "y" -#: ../bin/apport-retrace.py:110 +#: ../debian/tmp/usr/bin/apport-retrace.py:114 ../bin/apport-retrace.py:114 msgid "OK to send these as attachments? [y/n]" msgstr "确定以附件形式发送这些？[y/n]" -#: ../gtk/apport-gtk-mime.desktop.in.h:1 ../kde/apport-kde.desktop.in.h:1 +#: ../kde/apport-kde.desktop.in.h:1 ../gtk/apport-gtk-mime.desktop.in.h:1 #: ../kde/apport-kde-mime.desktop.in.h:1 ../gtk/apport-gtk.desktop.in.h:1 msgid "Report a problem..." msgstr "提交一份问题报告…" -#: ../gtk/apport-gtk-mime.desktop.in.h:2 ../kde/apport-kde.desktop.in.h:2 +#: ../kde/apport-kde.desktop.in.h:2 ../gtk/apport-gtk-mime.desktop.in.h:2 #: ../kde/apport-kde-mime.desktop.in.h:2 ../gtk/apport-gtk.desktop.in.h:2 msgid "Report a malfunction to the developers" msgstr "向开发者报告一个故障" -#: ../data/kernel_oops.py:28 +#: ../data/kernel_oops.py:28 ../debian/tmp/usr/share/apport/kernel_oops.py:28 msgid "Your system might become unstable now and might need to be restarted." msgstr "您的系统可能现在不稳定，它也许需要重启。" @@ -699,65 +851,93 @@ msgid "Sorry, the application %s has closed unexpectedly." msgstr "对不起，应用程序 %s 意外关闭。" -#: ../gtk/apport-gtk.py:136 +#: ../gtk/apport-gtk.py:156 ../debian/tmp/usr/share/apport/apport-gtk.py:156 #, python-format msgid "Sorry, %s has closed unexpectedly." msgstr "对不起，%s 已意外关闭。" -#: ../gtk/apport-gtk.py:142 ../kde/apport-kde.py:170 ../kde/apport-kde.py:203 +#: ../debian/tmp/usr/share/apport/apport-kde.py:176 +#: ../debian/tmp/usr/share/apport/apport-kde.py:217 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:108 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:300 +#: ../gtk/apport-gtk.py:161 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:106 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:250 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:161 ../kde/apport-kde.py:176 +#: ../kde/apport-kde.py:217 #, python-format msgid "Sorry, %s has experienced an internal error." msgstr "对不起，%s 出现了内部错误。" -#: ../gtk/apport-gtk.py:157 ../kde/apport-kde.py:164 +#: ../debian/tmp/usr/share/apport/apport-kde.py:170 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:412 +#: ../gtk/apport-gtk.py:182 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:288 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:182 ../kde/apport-kde.py:170 msgid "Send" msgstr "发送" -#: ../gtk/apport-gtk.py:194 ../kde/apport-kde.py:178 +#: ../debian/tmp/usr/share/apport/apport-kde.py:184 ../gtk/apport-gtk.py:253 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:253 ../kde/apport-kde.py:184 #, python-format msgid "Package: %s" msgstr "软件包：%s" -#: ../gtk/apport-gtk.py:201 ../kde/apport-kde.py:184 +#: ../debian/tmp/usr/share/apport/apport-kde.py:190 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:137 +#: ../gtk/apport-gtk.py:260 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:132 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:260 ../kde/apport-kde.py:190 msgid "Sorry, a problem occurred while installing software." msgstr "对不起，安装软件时出现问题。" -#: ../gtk/apport-gtk.py:210 ../kde/apport-kde.py:190 +#: ../debian/tmp/usr/share/apport/apport-kde.py:201 ../gtk/apport-gtk.py:272 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:272 ../kde/apport-kde.py:201 #, python-format msgid "The application %s has closed unexpectedly." msgstr "应用程序 %s 已意外关闭。" -#: ../gtk/apport-gtk.py:216 ../kde/apport-kde.py:197 ../kde/apport-kde.py:334 +#: ../debian/tmp/usr/share/apport/apport-kde.py:214 +#: ../debian/tmp/usr/share/apport/apport-kde.py:357 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:232 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_gtk.py:273 +#: ../gtk/apport-gtk.py:225 ../gtk/apport-gtk.py:284 +#: ../debian/tmp/usr/share/apport/testsuite/test_ui_kde.py:222 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:225 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:284 ../kde/apport-kde.py:214 +#: ../kde/apport-kde.py:357 msgid "Relaunch" msgstr "重新启动程序" -#: ../gtk/apport-gtk.py:231 ../kde/apport-kde.py:210 +#: ../debian/tmp/usr/share/apport/apport-kde.py:224 ../gtk/apport-gtk.py:300 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:300 ../kde/apport-kde.py:224 msgid "Ignore future problems of this type" msgstr "以后忽略此类错误" -#: ../gtk/apport-gtk.py:495 ../kde/apport-kde.py:245 +#: ../debian/tmp/usr/share/apport/apport-kde.py:268 ../gtk/apport-gtk.py:573 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:573 ../kde/apport-kde.py:268 msgid "Hide Details" msgstr "隐藏详细信息" -#: ../kde/apport-kde.py:271 +#: ../debian/tmp/usr/share/apport/apport-kde.py:294 ../kde/apport-kde.py:294 msgid "Username:" msgstr "用户名：" -#: ../kde/apport-kde.py:272 +#: ../debian/tmp/usr/share/apport/apport-kde.py:295 ../kde/apport-kde.py:295 msgid "Password:" msgstr "密码：" -#: ../kde/apport-kde.py:359 +#: ../debian/tmp/usr/share/apport/apport-kde.py:382 ../kde/apport-kde.py:382 msgid "Collecting Problem Information" msgstr "正在收集问题信息" -#: ../kde/apport-kde.py:361 +#: ../debian/tmp/usr/share/apport/apport-kde.py:384 ../kde/apport-kde.py:384 msgid "" "The collected information can be sent to the developers to improve the " "application. This might take a few minutes." msgstr "收集到的信息可以发送给开发者来改进程序。这可能要花费几分钟的时间。" -#: ../kde/apport-kde.py:387 +#: ../debian/tmp/usr/share/apport/apport-kde.py:410 ../kde/apport-kde.py:410 msgid "Uploading Problem Information" msgstr "上传问题信息" @@ -765,16 +945,16 @@ msgid "Apport crash file" msgstr "Apport 崩溃文件" -#: ../bin/apport-unpack.py:23 +#: ../bin/apport-unpack.py:22 ../debian/tmp/usr/bin/apport-unpack.py:22 #, python-format msgid "Usage: %s " msgstr "用法：%s <报告> <目标目录>" -#: ../bin/apport-unpack.py:33 +#: ../bin/apport-unpack.py:46 ../debian/tmp/usr/bin/apport-unpack.py:46 msgid "Destination directory exists and is not empty." msgstr "目标目录存在且不为空。" -#: ../data/general-hooks/ubuntu.py:51 +#: ../data/general-hooks/ubuntu.py:62 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 " @@ -787,8 +967,14 @@ "legacy。为了保证在安装新内核后您的启动引导程序能够同步更新，请打开终端并运行：\n" " sudo apt-get install grub-pc\n" -#: ../data/general-hooks/ubuntu.py:111 +#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:135 +#: ../data/general-hooks/ubuntu.py:135 msgid "" "An Ubuntu package has a file conflict with a package that is not a genuine " "Ubuntu package" msgstr "Ubuntu 软件包与非原生 Ubuntu 软件包发生文件冲突" + +#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:143 +#: ../data/general-hooks/ubuntu.py:143 +msgid "You have already encountered this package installation failure." +msgstr "" diff -Nru language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/apt-listchanges.po language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/apt-listchanges.po --- language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/apt-listchanges.po 2012-05-08 22:47:25.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/apt-listchanges.po 2013-01-29 09:37:17.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: 2012-05-08 01:56+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2013-01-28 10:34+0000\n" +"X-Generator: Launchpad (build 16451)\n" "Generated-By: pygettext.py 1.4\n" #: ../apt-listchanges.py:80 @@ -61,15 +61,15 @@ msgid "Confirmation failed, don't save seen state" msgstr "确认失败，未保存所见状态" -#: ../apt-listchanges.py:216 +#: ../apt-listchanges.py:217 msgid "apt-listchanges: changelogs for %s" msgstr "apt-listchanges: %s 的变更日志" -#: ../apt-listchanges.py:220 +#: ../apt-listchanges.py:221 msgid "apt-listchanges: news for %s" msgstr "apt-listchanges: %s 的新内容" -#: ../apt-listchanges.py:232 +#: ../apt-listchanges.py:233 msgid "didn't find any valid .deb archives" msgstr "没有找到任何有效的 .deb 档案" @@ -97,7 +97,7 @@ msgid "You can abort the installation if you select 'no'." msgstr "如果您选择“no”您可以中止安装。" -#: ../apt-listchanges/DebianFiles.py:171 +#: ../apt-listchanges/DebianFiles.py:215 msgid "Ignoring `%s' (seems to be a directory!)" msgstr "忽略“%s” (似乎是个目录！)" @@ -113,15 +113,15 @@ msgid "Mailing %s: %s" msgstr "正在邮寄给 %s: %s" -#: ../apt-listchanges/apt_listchanges.py:111 +#: ../apt-listchanges/apt_listchanges.py:112 msgid "The %s frontend is deprecated, using pager" msgstr "%s 前端已被废除，改用分页器" -#: ../apt-listchanges/apt_listchanges.py:115 +#: ../apt-listchanges/apt_listchanges.py:116 msgid "The mail frontend needs a installed 'sendmail', using pager" msgstr "邮件前端需要一个已安装的“sendmail”，改用分页器" -#: ../apt-listchanges/apt_listchanges.py:127 +#: ../apt-listchanges/apt_listchanges.py:128 msgid "" "The gtk frontend needs a working python-gtk2 and python-glade2.\n" "Those imports can not be found. Falling back to pager.\n" @@ -131,16 +131,16 @@ "无法找到这些组件。回退到使用分页器。\n" "错误信息为：%s\n" -#: ../apt-listchanges/apt_listchanges.py:180 +#: ../apt-listchanges/apt_listchanges.py:181 msgid "Do you want to continue? [Y/n] " msgstr "您想继续吗？[Y/n]？ " -#: ../apt-listchanges/apt_listchanges.py:193 -#: ../apt-listchanges/apt_listchanges.py:213 -#: ../apt-listchanges/apt_listchanges.py:221 +#: ../apt-listchanges/apt_listchanges.py:194 +#: ../apt-listchanges/apt_listchanges.py:214 +#: ../apt-listchanges/apt_listchanges.py:222 msgid "Reading changelogs" msgstr "读取变更记录(changelogs)" -#: ../apt-listchanges/apt_listchanges.py:221 +#: ../apt-listchanges/apt_listchanges.py:222 msgid "Done" msgstr "完成" diff -Nru language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/apt.po language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/apt.po --- language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/apt.po 2012-05-08 22:47:24.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/apt.po 2013-01-29 09:37:17.000000000 +0000 @@ -8,104 +8,102 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.0~pre1\n" -"Report-Msgid-Bugs-To: deity@lists.debian.org\n" +"Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-03-15 19:05+0000\n" -"PO-Revision-Date: 2012-04-20 13:46+0000\n" +"PO-Revision-Date: 2012-11-20 00:28+0000\n" "Last-Translator: Aron Xu \n" "Language-Team: Chinese (simplified) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2012-05-08 01:55+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2013-01-28 10:34+0000\n" +"X-Generator: Launchpad (build 16451)\n" "Language: \n" -#: cmdline/apt-cache.cc:154 +#: cmdline/apt-cache.cc:141 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "版本为 %2$s 的软件包 %1$s 有未满足的依赖关系：\n" -#: cmdline/apt-cache.cc:282 +#: cmdline/apt-cache.cc:245 msgid "Total package names: " msgstr "软件包名称总数： " -#: cmdline/apt-cache.cc:284 +#: cmdline/apt-cache.cc:286 msgid "Total package structures: " msgstr "全部软件包结构： " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:285 msgid " Normal packages: " msgstr " 普通软件包： " -#: cmdline/apt-cache.cc:325 +#: cmdline/apt-cache.cc:286 msgid " Pure virtual packages: " msgstr " 完全虚拟软件包： " -#: cmdline/apt-cache.cc:326 +#: cmdline/apt-cache.cc:287 msgid " Single virtual packages: " msgstr " 单虚拟软件包： " -#: cmdline/apt-cache.cc:327 +#: cmdline/apt-cache.cc:288 msgid " Mixed virtual packages: " msgstr " 混合虚拟软件包： " -#: cmdline/apt-cache.cc:328 +#: cmdline/apt-cache.cc:289 msgid " Missing: " msgstr " 缺失： " -#: cmdline/apt-cache.cc:330 +#: cmdline/apt-cache.cc:291 msgid "Total distinct versions: " msgstr "按版本共计： " -#: cmdline/apt-cache.cc:332 +#: cmdline/apt-cache.cc:293 msgid "Total distinct descriptions: " msgstr "按不同的说明共计： " -#: cmdline/apt-cache.cc:334 +#: cmdline/apt-cache.cc:295 msgid "Total dependencies: " msgstr "按依赖关系共计： " -#: cmdline/apt-cache.cc:337 +#: cmdline/apt-cache.cc:298 msgid "Total ver/file relations: " msgstr "按版本/文件关系共计： " -#: cmdline/apt-cache.cc:339 +#: cmdline/apt-cache.cc:300 msgid "Total Desc/File relations: " msgstr "按说明/文件关系共计： " -#: cmdline/apt-cache.cc:341 +#: cmdline/apt-cache.cc:302 msgid "Total Provides mappings: " msgstr "提供映射共计： " -#: cmdline/apt-cache.cc:353 +#: cmdline/apt-cache.cc:314 msgid "Total globbed strings: " msgstr "Glob 字串共计： " -#: cmdline/apt-cache.cc:367 +#: cmdline/apt-cache.cc:328 msgid "Total dependency version space: " msgstr "依赖关系版本名所占空间共计： " -#: cmdline/apt-cache.cc:372 +#: cmdline/apt-cache.cc:333 msgid "Total slack space: " msgstr "空闲空间共计: " -#: cmdline/apt-cache.cc:380 +#: cmdline/apt-cache.cc:341 msgid "Total space accounted for: " msgstr "总占用空间： " -#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139 +#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1221 #, c-format msgid "Package file %s is out of sync." msgstr "软件包文件 %s 尚未同步。" -#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374 -#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37 -#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160 +#: cmdline/apt-cache.cc:1453 msgid "No packages found" msgstr "没有发现匹配的软件包" -#: cmdline/apt-cache.cc:1218 +#: cmdline/apt-cache.cc:1221 msgid "You must give at least one search pattern" msgstr "您必须明确地给出至少一个表达式" @@ -113,53 +111,56 @@ msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1448 +#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644 +#: cmdline/apt-cache.cc:797 cmdline/apt-cache.cc:1021 +#: cmdline/apt-cache.cc:1425 cmdline/apt-cache.cc:1577 #, c-format msgid "Unable to locate package %s" msgstr "未发现软件包 %s" -#: cmdline/apt-cache.cc:1478 +#: cmdline/apt-cache.cc:1530 msgid "Package files:" msgstr "软件包文件：" -#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576 +#: cmdline/apt-cache.cc:1537 cmdline/apt-cache.cc:1624 msgid "Cache is out of sync, can't x-ref a package file" msgstr "缓存尚未同步，无法交差引证(x-ref)一个软件包文件" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1499 +#: cmdline/apt-cache.cc:1551 msgid "Pinned packages:" msgstr "被锁定的软件包：" -#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1604 msgid "(not found)" msgstr "(未找到)" -#: cmdline/apt-cache.cc:1519 +#. Installed version +#: cmdline/apt-cache.cc:1584 msgid " Installed: " msgstr " 已安装： " -#: cmdline/apt-cache.cc:1520 +#. Candidate Version +#: cmdline/apt-cache.cc:1591 msgid " Candidate: " msgstr " 候选软件包： " -#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546 +#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 msgid "(none)" msgstr "(无)" -#: cmdline/apt-cache.cc:1553 +#: cmdline/apt-cache.cc:1601 msgid " Package pin: " msgstr " 软件包锁： " #. Show the priority tables -#: cmdline/apt-cache.cc:1562 +#: cmdline/apt-cache.cc:1610 msgid " Version table:" msgstr " 版本列表：" -#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589 -#: cmdline/apt-get.cc:3243 cmdline/apt-internal-solver.cc:30 -#: cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-cache.cc:1720 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:588 +#: cmdline/apt-get.cc:2723 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s，用于 %s 构架，编译于 %s %s\n" @@ -218,11 +219,11 @@ msgid "Repeat this process for the rest of the CDs in your set." msgstr "请对您的盘片套件中的其它盘片重复相同的操作。" -#: cmdline/apt-config.cc:44 +#: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "参数没有成对" -#: cmdline/apt-config.cc:79 +#: cmdline/apt-config.cc:76 msgid "" "Usage: apt-config [options] command\n" "\n" @@ -284,35 +285,35 @@ msgid "Unable to write to %s" msgstr "无法写入 %s" -#: cmdline/apt-extracttemplates.cc:309 +#: cmdline/apt-extracttemplates.cc:310 msgid "Cannot get debconf version. Is debconf installed?" msgstr "无法获得 debconf 的版本。您安装了 debconf 吗？" -#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347 +#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:346 msgid "Package extension list is too long" msgstr "软件包的扩展列表太长" -#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189 -#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262 -#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298 +#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:188 +#: ftparchive/apt-ftparchive.cc:211 ftparchive/apt-ftparchive.cc:261 +#: ftparchive/apt-ftparchive.cc:275 ftparchive/apt-ftparchive.cc:297 #, c-format msgid "Error processing directory %s" msgstr "处理目录 %s 时出错" -#: ftparchive/apt-ftparchive.cc:260 +#: ftparchive/apt-ftparchive.cc:259 msgid "Source extension list is too long" msgstr "源扩展列表太长" -#: ftparchive/apt-ftparchive.cc:377 +#: ftparchive/apt-ftparchive.cc:376 msgid "Error writing header to contents file" msgstr "将头写入到目录文件时出错" -#: ftparchive/apt-ftparchive.cc:407 +#: ftparchive/apt-ftparchive.cc:406 #, c-format msgid "Error processing contents %s" msgstr "处理目录 %s 时出错" -#: ftparchive/apt-ftparchive.cc:595 +#: ftparchive/apt-ftparchive.cc:594 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -392,11 +393,11 @@ " -c=? 读取指定配置文件\n" " -o=? 设置任意指定的配置选项" -#: ftparchive/apt-ftparchive.cc:801 +#: ftparchive/apt-ftparchive.cc:800 msgid "No selections matched" msgstr "没有任何选定项是匹配的" -#: ftparchive/apt-ftparchive.cc:879 +#: ftparchive/apt-ftparchive.cc:878 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "软件包文件组“%s”中缺少一些文件" @@ -427,100 +428,100 @@ msgid "Failed to stat %s" msgstr "无法获得 %s 的状态" -#: ftparchive/cachedb.cc:245 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "归档文件没有包含控制字段" -#: ftparchive/cachedb.cc:482 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "无法获得游标" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:73 #, c-format msgid "W: Unable to read directory %s\n" msgstr "警告：无法读取目录 %s\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:78 #, c-format msgid "W: Unable to stat %s\n" msgstr "警告：无法获得 %s 的状态\n" -#: ftparchive/writer.cc:139 +#: ftparchive/writer.cc:134 msgid "E: " msgstr "错误： " -#: ftparchive/writer.cc:141 +#: ftparchive/writer.cc:136 msgid "W: " msgstr "警告： " -#: ftparchive/writer.cc:148 +#: ftparchive/writer.cc:143 msgid "E: Errors apply to file " msgstr "错误：处理文件时出错 " -#: ftparchive/writer.cc:166 ftparchive/writer.cc:198 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:193 #, c-format msgid "Failed to resolve %s" msgstr "无法解析 %s" -#: ftparchive/writer.cc:179 +#: ftparchive/writer.cc:174 msgid "Tree walking failed" msgstr "无法遍历目录树" -#: ftparchive/writer.cc:206 +#: ftparchive/writer.cc:201 #, c-format msgid "Failed to open %s" msgstr "无法打开 %s" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:260 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:273 +#: ftparchive/writer.cc:268 #, c-format msgid "Failed to readlink %s" msgstr "无法读取符号链接 %s" -#: ftparchive/writer.cc:277 +#: ftparchive/writer.cc:272 #, c-format msgid "Failed to unlink %s" msgstr "无法使用 unlink 删除 %s" -#: ftparchive/writer.cc:284 +#: ftparchive/writer.cc:279 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** 无法将 %s 链接到 %s" -#: ftparchive/writer.cc:294 +#: ftparchive/writer.cc:289 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " 达到了 DeLink 的上限 %sB。\n" -#: ftparchive/writer.cc:399 +#: ftparchive/writer.cc:392 msgid "Archive had no package field" msgstr "归档文件没有包含 package 字段" -#: ftparchive/writer.cc:407 ftparchive/writer.cc:709 +#: ftparchive/writer.cc:400 ftparchive/writer.cc:687 #, c-format msgid " %s has no override entry\n" msgstr " %s 中没有 override 项\n" -#: ftparchive/writer.cc:475 ftparchive/writer.cc:825 +#: ftparchive/writer.cc:463 ftparchive/writer.cc:790 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s 的维护者 %s 并非 %s\n" -#: ftparchive/writer.cc:719 +#: ftparchive/writer.cc:697 #, c-format msgid " %s has no source override entry\n" msgstr " %s 没有源代码的 override 项\n" -#: ftparchive/writer.cc:723 +#: ftparchive/writer.cc:701 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s 中没有二进制文件的 override 项\n" -#: ftparchive/contents.cc:337 ftparchive/contents.cc:368 +#: ftparchive/contents.cc:362 ftparchive/contents.cc:393 msgid "realloc - Failed to allocate memory" msgstr "realloc - 分配内存失败" @@ -549,56 +550,56 @@ msgid "Failed to read the override file %s" msgstr "无法读取 override 文件 %s" -#: ftparchive/multicompress.cc:67 +#: ftparchive/multicompress.cc:73 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "未知的压缩算法“%s”" -#: ftparchive/multicompress.cc:97 +#: ftparchive/multicompress.cc:103 #, c-format msgid "Compressed output %s needs a compression set" msgstr "压缩后的输出文件 %s 要求有一个压缩文件集合" -#: ftparchive/multicompress.cc:165 +#: ftparchive/multicompress.cc:170 msgid "Failed to create IPC pipe to subprocess" msgstr "无法为子进程创建 IPC 管道" -#: ftparchive/multicompress.cc:191 +#: ftparchive/multicompress.cc:196 msgid "Failed to create FILE*" msgstr "无法创建 FILE*" -#: ftparchive/multicompress.cc:194 +#: ftparchive/multicompress.cc:199 msgid "Failed to fork" msgstr "无法 fork" -#: ftparchive/multicompress.cc:208 +#: ftparchive/multicompress.cc:213 msgid "Compress child" msgstr "压缩子进程" -#: ftparchive/multicompress.cc:231 +#: ftparchive/multicompress.cc:236 #, c-format msgid "Internal error, failed to create %s" msgstr "内部错误，无法创建 %s" -#: ftparchive/multicompress.cc:401 +#: ftparchive/multicompress.cc:404 msgid "IO to subprocess/file failed" msgstr "无法对子进程或文件进行读写" -#: ftparchive/multicompress.cc:453 +#: ftparchive/multicompress.cc:456 msgid "Failed to read while computing MD5" msgstr "在计算 MD5 校验和时无法读取数据" -#: ftparchive/multicompress.cc:470 +#: ftparchive/multicompress.cc:473 #, c-format msgid "Problem unlinking %s" msgstr "在使用 unlink 删除 %s 时出错" -#: ftparchive/multicompress.cc:485 +#: ftparchive/multicompress.cc:488 #, c-format msgid "Failed to rename %s to %s" msgstr "无法将 %s 重命名为 %s" -#: cmdline/apt-get.cc:135 +#: cmdline/apt-get.cc:127 msgid "Y" msgstr "Y" @@ -606,75 +607,75 @@ msgid "N" msgstr "" -#: cmdline/apt-get.cc:162 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1756 #, c-format msgid "Regex compilation error - %s" msgstr "编译正则表达式时出错 - %s" -#: cmdline/apt-get.cc:257 +#: cmdline/apt-get.cc:244 msgid "The following packages have unmet dependencies:" msgstr "下列软件包有未满足的依赖关系：" -#: cmdline/apt-get.cc:347 +#: cmdline/apt-get.cc:334 #, c-format msgid "but %s is installed" msgstr "但是 %s 已经安装" -#: cmdline/apt-get.cc:349 +#: cmdline/apt-get.cc:336 #, c-format msgid "but %s is to be installed" msgstr "但是 %s 正要被安装" -#: cmdline/apt-get.cc:356 +#: cmdline/apt-get.cc:343 msgid "but it is not installable" msgstr "但无法安装它" -#: cmdline/apt-get.cc:358 +#: cmdline/apt-get.cc:345 msgid "but it is a virtual package" msgstr "但是它是虚拟软件包" -#: cmdline/apt-get.cc:361 +#: cmdline/apt-get.cc:348 msgid "but it is not installed" msgstr "但是它还没有被安装" -#: cmdline/apt-get.cc:361 +#: cmdline/apt-get.cc:348 msgid "but it is not going to be installed" msgstr "但是它将不会被安装" -#: cmdline/apt-get.cc:366 +#: cmdline/apt-get.cc:353 msgid " or" msgstr " 或" -#: cmdline/apt-get.cc:395 +#: cmdline/apt-get.cc:382 msgid "The following NEW packages will be installed:" msgstr "下列【新】软件包将被安装：" -#: cmdline/apt-get.cc:421 +#: cmdline/apt-get.cc:408 msgid "The following packages will be REMOVED:" msgstr "下列软件包将被【删除】：" -#: cmdline/apt-get.cc:443 +#: cmdline/apt-get.cc:430 msgid "The following packages have been kept back:" msgstr "下列软件包的版本将保持不变：" -#: cmdline/apt-get.cc:464 +#: cmdline/apt-get.cc:451 msgid "The following packages will be upgraded:" msgstr "下列软件包将被升级：" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:472 msgid "The following packages will be DOWNGRADED:" msgstr "下列软件包将被【降级】：" -#: cmdline/apt-get.cc:505 +#: cmdline/apt-get.cc:492 msgid "The following held packages will be changed:" msgstr "下列被要求保持版本不变的软件包将被改变：" -#: cmdline/apt-get.cc:560 +#: cmdline/apt-get.cc:545 #, c-format msgid "%s (due to %s) " msgstr "%s (是由于 %s) " -#: cmdline/apt-get.cc:568 +#: cmdline/apt-get.cc:553 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -682,59 +683,59 @@ "【警告】：下列基础软件包将被卸载。\n" "请勿尝试，除非您确实知道您在做什么！" -#: cmdline/apt-get.cc:599 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "升级了 %lu 个软件包，新安装了 %lu 个软件包， " -#: cmdline/apt-get.cc:603 +#: cmdline/apt-get.cc:588 #, c-format msgid "%lu reinstalled, " msgstr "重新安装了 %lu 个软件包， " -#: cmdline/apt-get.cc:605 +#: cmdline/apt-get.cc:590 #, c-format msgid "%lu downgraded, " msgstr "降级了 %lu 个软件包， " -#: cmdline/apt-get.cc:607 +#: cmdline/apt-get.cc:592 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "要卸载 %lu 个软件包，有 %lu 个软件包未被升级。\n" -#: cmdline/apt-get.cc:611 +#: cmdline/apt-get.cc:596 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "有 %lu 个软件包没有被完全安装或卸载。\n" -#: cmdline/apt-get.cc:633 +#: cmdline/apt-get.cc:628 #, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "注意，为任务 %2$s 选中了 %1$s\n" -#: cmdline/apt-get.cc:639 +#: cmdline/apt-get.cc:634 #, c-format msgid "Note, selecting '%s' for regex '%s'\n" msgstr "注意，根据正则表达式 %2$s 选中了 %1$s\n" -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:1126 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "软件包 %s 是由下面的软件包提供的虚拟软件包：\n" -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:1138 msgid " [Installed]" msgstr " [已安装]" -#: cmdline/apt-get.cc:676 +#: cmdline/apt-get.cc:671 msgid " [Not candidate version]" msgstr " [无候选版本]" -#: cmdline/apt-get.cc:678 +#: cmdline/apt-get.cc:1143 msgid "You should explicitly select one to install." msgstr "请您明确地选择一个来进行安装。" -#: cmdline/apt-get.cc:681 +#: cmdline/apt-get.cc:1148 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -745,177 +746,169 @@ "这可能意味着这个缺失的软件包可能已被废弃，\n" "或者只能在其他发布源中找到\n" -#: cmdline/apt-get.cc:699 +#: cmdline/apt-get.cc:1167 msgid "However the following packages replace it:" msgstr "可是下列软件包取代了它：" -#: cmdline/apt-get.cc:711 +#: cmdline/apt-get.cc:706 #, c-format msgid "Package '%s' has no installation candidate" msgstr "软件包 %s 没有可供安装的候选者" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:717 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "类似 %s 的虚拟软件包可以卸载\n" -#: cmdline/apt-get.cc:766 +#: cmdline/apt-get.cc:748 #, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "注意，选取 %s 而非 %s\n" -#: cmdline/apt-get.cc:796 +#: cmdline/apt-get.cc:1097 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "忽略了 %s，它已经被安装而且没有指定要升级。\n" -#: cmdline/apt-get.cc:800 +#: cmdline/apt-get.cc:782 #, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "忽略了 %s，它已经被安装而且仅请求了升级。\n" -#: cmdline/apt-get.cc:812 +#: cmdline/apt-get.cc:1190 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "不能重新安装 %s，因为无法下载它。\n" -#: cmdline/apt-get.cc:817 +#: cmdline/apt-get.cc:1198 #, c-format msgid "%s is already the newest version.\n" msgstr "%s 已经是最新的版本了。\n" -#: cmdline/apt-get.cc:836 cmdline/apt-get.cc:2106 cmdline/apt-mark.cc:59 +#: cmdline/apt-get.cc:1798 #, c-format msgid "%s set to manually installed.\n" msgstr "%s 被设置为手动安装。\n" -#: cmdline/apt-get.cc:862 +#: cmdline/apt-get.cc:844 #, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n" -#: cmdline/apt-get.cc:867 +#: cmdline/apt-get.cc:849 #, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "" -#: cmdline/apt-get.cc:909 +#: cmdline/apt-get.cc:1115 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "软件包 %s 还未安装，因而不会被卸载\n" -#: cmdline/apt-get.cc:987 +#: cmdline/apt-get.cc:669 msgid "Correcting dependencies..." msgstr "正在更正依赖关系..." -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:672 msgid " failed." msgstr " 失败。" -#: cmdline/apt-get.cc:993 +#: cmdline/apt-get.cc:675 msgid "Unable to correct dependencies" msgstr "无法更正依赖关系" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:678 msgid "Unable to minimize the upgrade set" msgstr "无法最小化要升级的软件包集合" -#: cmdline/apt-get.cc:998 +#: cmdline/apt-get.cc:680 msgid " Done" msgstr " 完成" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:986 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "您也许需要运行“apt-get -f install”来修正上面的错误。" -#: cmdline/apt-get.cc:1005 +#: cmdline/apt-get.cc:687 msgid "Unmet dependencies. Try using -f." msgstr "不能满足依赖关系。请试用 -f 选项。" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:712 msgid "WARNING: The following packages cannot be authenticated!" msgstr "【警告】：下列软件包不能通过验证！" -#: cmdline/apt-get.cc:1034 +#: cmdline/apt-get.cc:716 msgid "Authentication warning overridden.\n" msgstr "忽略了认证警告。\n" -#: cmdline/apt-get.cc:1041 +#: cmdline/apt-get.cc:723 msgid "Install these packages without verification [y/N]? " msgstr "不经验证就安装这些软件包吗？[y/N] " -#: cmdline/apt-get.cc:1043 +#: cmdline/apt-get.cc:725 msgid "Some packages could not be authenticated" msgstr "有些软件包不能通过验证" -#: cmdline/apt-get.cc:1052 cmdline/apt-get.cc:1213 +#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890 msgid "There are problems and -y was used without --force-yes" msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --force-yes" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:775 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "内部错误，InstallPackages 被用在了无法安装的软件包上！" -#: cmdline/apt-get.cc:1102 +#: cmdline/apt-get.cc:784 msgid "Packages need to be removed but remove is disabled." msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止。" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:795 msgid "Internal error, Ordering didn't finish" msgstr "内部错误，Ordering 未能完成" -#: cmdline/apt-get.cc:1151 +#: cmdline/apt-get.cc:836 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "怪了……文件大小不符，请发信给 apt@packages.debian.org 吧" -#. TRANSLATOR: The required space between number and unit is already included -#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1158 +#: cmdline/apt-get.cc:841 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "需要下载 %sB/%sB 的软件包。\n" -#. TRANSLATOR: The required space between number and unit is already included -#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1163 +#: cmdline/apt-get.cc:844 #, c-format msgid "Need to get %sB of archives.\n" msgstr "需要下载 %sB 的软件包。\n" -#. TRANSLATOR: The required space between number and unit is already included -#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:849 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "解压缩后会消耗掉 %sB 的额外空间。\n" -#. TRANSLATOR: The required space between number and unit is already included -#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1175 +#: cmdline/apt-get.cc:852 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "解压缩后将会空出 %sB 的空间。\n" -#: cmdline/apt-get.cc:1190 cmdline/apt-get.cc:1193 cmdline/apt-get.cc:2519 -#: cmdline/apt-get.cc:2522 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2303 +#: cmdline/apt-get.cc:2306 #, c-format msgid "Couldn't determine free space in %s" msgstr "无法获知您在 %s 上的可用空间" -#: cmdline/apt-get.cc:1203 +#: cmdline/apt-get.cc:880 #, c-format msgid "You don't have enough free space in %s." msgstr "您在 %s 上没有足够的可用空间。" -#: cmdline/apt-get.cc:1219 cmdline/apt-get.cc:1239 +#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916 msgid "Trivial Only specified but this is not a trivial operation." msgstr "虽然您指定了仅执行常规操作，但这不是个常规操作。" -#: cmdline/apt-get.cc:1221 +#: cmdline/apt-get.cc:898 msgid "Yes, do as I say!" msgstr "是，按我说的做！" -#: cmdline/apt-get.cc:1223 +#: cmdline/apt-get.cc:900 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -926,46 +919,46 @@ "若还想继续的话，就输入下面的短句“%s”\n" " ?] " -#: cmdline/apt-get.cc:1229 cmdline/apt-get.cc:1248 +#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925 msgid "Abort." msgstr "中止执行。" -#: cmdline/apt-get.cc:1244 +#: cmdline/apt-get.cc:921 msgid "Do you want to continue [Y/n]? " msgstr "您希望继续执行吗？[Y/n] " -#: cmdline/apt-get.cc:1316 cmdline/apt-get.cc:2584 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2359 #, c-format msgid "Failed to fetch %s %s\n" msgstr "无法下载 %s %s\n" -#: cmdline/apt-get.cc:1334 +#: cmdline/apt-get.cc:1011 msgid "Some files failed to download" msgstr "有一些文件无法下载" -#: cmdline/apt-get.cc:1335 cmdline/apt-get.cc:2596 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2368 msgid "Download complete and in download only mode" msgstr "下载完毕，目前是“仅下载”模式" -#: cmdline/apt-get.cc:1341 +#: cmdline/apt-get.cc:1018 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "有几个软件包无法下载，您可以运行 apt-get update 或者加上 --fix-missing 的选项再试试？" -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1022 msgid "--fix-missing and media swapping is not currently supported" msgstr "目前还不支持 --fix-missing 和介质交换" -#: cmdline/apt-get.cc:1350 +#: cmdline/apt-get.cc:1027 msgid "Unable to correct missing packages." msgstr "无法更正缺少的软件包。" -#: cmdline/apt-get.cc:1351 +#: cmdline/apt-get.cc:1028 msgid "Aborting install." msgstr "中止安装。" -#: cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1363 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -974,35 +967,35 @@ "all files have been overwritten by other packages:" msgstr[0] "以下软件包因为文件已被其他软件包覆盖而消失：" -#: cmdline/apt-get.cc:1383 +#: cmdline/apt-get.cc:1367 msgid "Note: This is done automatic and on purpose by dpkg." msgstr "注意：这是自动被 dpkg 有意完成的。" -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1335 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "忽略不可用的软件包 %2$s 的目标发行版本 %1$s" -#: cmdline/apt-get.cc:1553 +#: cmdline/apt-get.cc:1367 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "选择 %s 作为源代码包而非 %s\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1591 +#: cmdline/apt-get.cc:1405 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "忽略不可用的 %2$s 软件包的 %1$s 版" -#: cmdline/apt-get.cc:1607 +#: cmdline/apt-get.cc:1421 msgid "The update command takes no arguments" msgstr "update 命令不需要参数" -#: cmdline/apt-get.cc:1669 +#: cmdline/apt-get.cc:1490 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "我们不应该进行删除，无法启动自动删除器" -#: cmdline/apt-get.cc:1764 +#: cmdline/apt-get.cc:1547 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1018,15 +1011,15 @@ #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1767 cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1550 cmdline/apt-get.cc:1841 msgid "The following information may help to resolve the situation:" msgstr "下列信息可能会对解决问题有所帮助：" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1554 msgid "Internal Error, AutoRemover broke stuff" msgstr "内部错误，自动卸载工具坏事了" -#: cmdline/apt-get.cc:1778 +#: cmdline/apt-get.cc:1754 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -1034,32 +1027,32 @@ "required:" msgstr[0] "下列软件包是自动安装的并且现在不需要了：" -#: cmdline/apt-get.cc:1782 +#: cmdline/apt-get.cc:1758 #, 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" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1542 msgid "Use 'apt-get autoremove' to remove them." msgstr "使用'apt-get autoremove'来卸载它们" -#: cmdline/apt-get.cc:1803 +#: cmdline/apt-get.cc:1573 msgid "Internal error, AllUpgrade broke stuff" msgstr "内部错误，全部升级工具坏事了" -#: cmdline/apt-get.cc:1902 +#: cmdline/apt-get.cc:1878 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "您可能需要运行“apt-get -f install”来纠正下列错误：" -#: cmdline/apt-get.cc:1906 +#: cmdline/apt-get.cc:1814 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可以指定一个解决办法)。" -#: cmdline/apt-get.cc:1921 +#: cmdline/apt-get.cc:1826 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1070,28 +1063,28 @@ "因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n" "包尚未被创建或是它们已被从新到(Incoming)目录移出。" -#: cmdline/apt-get.cc:1942 +#: cmdline/apt-get.cc:1844 msgid "Broken packages" msgstr "破损的软件包" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:1873 msgid "The following extra packages will be installed:" msgstr "将会安装下列额外的软件包：" -#: cmdline/apt-get.cc:2058 +#: cmdline/apt-get.cc:1962 msgid "Suggested packages:" msgstr "建议安装的软件包：" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:1963 msgid "Recommended packages:" msgstr "推荐安装的软件包：" -#: cmdline/apt-get.cc:2101 +#: cmdline/apt-get.cc:1743 cmdline/apt-get.cc:1779 #, c-format msgid "Couldn't find package %s" msgstr "无法找到软件包 %s" -#: cmdline/apt-get.cc:2108 cmdline/apt-mark.cc:61 +#: cmdline/apt-get.cc:2082 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s 被设置为手动安装。\n" @@ -1102,41 +1095,41 @@ "instead." msgstr "" -#: cmdline/apt-get.cc:2132 +#: cmdline/apt-get.cc:1992 msgid "Calculating upgrade... " msgstr "正在对升级进行计算... " -#: cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1995 msgid "Failed" msgstr "失败" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2000 msgid "Done" msgstr "完成" -#: cmdline/apt-get.cc:2207 cmdline/apt-get.cc:2215 +#: cmdline/apt-get.cc:2067 cmdline/apt-get.cc:2075 msgid "Internal error, problem resolver broke stuff" msgstr "内部错误，问题解决工具坏事了" -#: cmdline/apt-get.cc:2239 cmdline/apt-get.cc:2272 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2099 cmdline/apt-get.cc:2132 msgid "Unable to lock the download directory" msgstr "无法锁定下载目录" -#: cmdline/apt-get.cc:2323 +#: cmdline/apt-get.cc:2294 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2381 +#: cmdline/apt-get.cc:2175 msgid "Must specify at least one package to fetch source for" msgstr "要下载源代码，必须指定至少一个对应的软件包" -#: cmdline/apt-get.cc:2421 cmdline/apt-get.cc:2733 +#: cmdline/apt-get.cc:2205 cmdline/apt-get.cc:2482 #, c-format msgid "Unable to find a source package for %s" msgstr "无法找到与 %s 对应的源代码包" -#: cmdline/apt-get.cc:2438 +#: cmdline/apt-get.cc:2221 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -1153,64 +1146,60 @@ "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2496 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "忽略已下载过的文件“%s”\n" -#: cmdline/apt-get.cc:2533 +#: cmdline/apt-get.cc:2316 #, c-format msgid "You don't have enough free space in %s" msgstr "您在 %s 上没有足够的可用空间" -#. TRANSLATOR: The required space between number and unit is already included -#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2542 +#: cmdline/apt-get.cc:2322 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "需要下载 %sB/%sB 的源代码包。\n" -#. TRANSLATOR: The required space between number and unit is already included -#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2547 +#: cmdline/apt-get.cc:2325 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "需要下载 %sB 的源代码包。\n" -#: cmdline/apt-get.cc:2553 +#: cmdline/apt-get.cc:2331 #, c-format msgid "Fetch source %s\n" msgstr "下载源代码 %s\n" -#: cmdline/apt-get.cc:2591 +#: cmdline/apt-get.cc:2364 msgid "Failed to fetch some archives." msgstr "有一些包文件无法下载。" -#: cmdline/apt-get.cc:2622 +#: cmdline/apt-get.cc:2393 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "忽略已经被解包到 %s 目录的源代码包\n" -#: cmdline/apt-get.cc:2634 +#: cmdline/apt-get.cc:2405 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "运行解包的命令“%s”出错。\n" -#: cmdline/apt-get.cc:2635 +#: cmdline/apt-get.cc:2406 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "请检查是否安装了“dpkg-dev”软件包。\n" -#: cmdline/apt-get.cc:2657 +#: cmdline/apt-get.cc:2423 #, c-format msgid "Build command '%s' failed.\n" msgstr "执行构造软件包命令“%s”失败。\n" -#: cmdline/apt-get.cc:2677 +#: cmdline/apt-get.cc:2443 msgid "Child process failed" msgstr "子进程出错" -#: cmdline/apt-get.cc:2696 +#: cmdline/apt-get.cc:2459 msgid "Must specify at least one package to check builddeps for" msgstr "要检查生成软件包的构建依赖关系，必须指定至少一个软件包" @@ -1221,12 +1210,12 @@ "APT::Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2738 +#: cmdline/apt-get.cc:2487 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "无法获得 %s 的构建依赖关系信息" -#: cmdline/apt-get.cc:2758 +#: cmdline/apt-get.cc:2507 #, c-format msgid "%s has no build depends.\n" msgstr "%s 没有构建依赖关系信息。\n" @@ -1238,14 +1227,14 @@ "packages" msgstr "" -#: cmdline/apt-get.cc:2909 +#: cmdline/apt-get.cc:2559 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系" -#: cmdline/apt-get.cc:2932 +#: cmdline/apt-get.cc:2648 #, c-format msgid "" "Failed to satisfy %s dependency for %s: Installed package %s is too new" @@ -1265,26 +1254,26 @@ "version" msgstr "" -#: cmdline/apt-get.cc:3000 +#: cmdline/apt-get.cc:2675 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s" -#: cmdline/apt-get.cc:3016 +#: cmdline/apt-get.cc:2691 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "不能满足软件包 %s 所要求的构建依赖关系。" -#: cmdline/apt-get.cc:3021 +#: cmdline/apt-get.cc:2696 msgid "Failed to process build dependencies" msgstr "无法处理构建依赖关系" -#: cmdline/apt-get.cc:3114 cmdline/apt-get.cc:3126 +#: cmdline/apt-get.cc:2977 cmdline/apt-get.cc:2989 #, c-format msgid "Changelog for %s (%s)" msgstr "" -#: cmdline/apt-get.cc:3248 +#: cmdline/apt-get.cc:2728 msgid "Supported modules:" msgstr "支持的模块：" @@ -1334,7 +1323,7 @@ " This APT has Super Cow Powers.\n" msgstr "" -#: cmdline/apt-get.cc:3454 +#: cmdline/apt-get.cc:2936 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1345,33 +1334,33 @@ "　　　apt-get 需要 root 特权进行实际的执行。\n" "　　　同时请记住此时并未锁定，所以请勿完全相信当前的情况！" -#: cmdline/acqprogress.cc:57 +#: cmdline/acqprogress.cc:55 msgid "Hit " msgstr "命中 " -#: cmdline/acqprogress.cc:81 +#: cmdline/acqprogress.cc:79 msgid "Get:" msgstr "获取：" -#: cmdline/acqprogress.cc:112 +#: cmdline/acqprogress.cc:110 msgid "Ign " msgstr "忽略 " -#: cmdline/acqprogress.cc:116 +#: cmdline/acqprogress.cc:114 msgid "Err " msgstr "错误 " -#: cmdline/acqprogress.cc:137 +#: cmdline/acqprogress.cc:135 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "下载 %sB，耗时 %s (%sB/s)\n" -#: cmdline/acqprogress.cc:227 +#: cmdline/acqprogress.cc:225 #, c-format msgid " [Working]" msgstr " [执行中]" -#: cmdline/acqprogress.cc:283 +#: cmdline/acqprogress.cc:271 #, c-format msgid "" "Media change: please insert the disc labeled\n" diff -Nru language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/aptitude.po language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/aptitude.po --- language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/aptitude.po 2012-05-08 22:47:25.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/aptitude.po 2013-01-29 09:37:09.000000000 +0000 @@ -14,15 +14,15 @@ "Project-Id-Version: aptitude\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" "POT-Creation-Date: 2012-03-27 16:51+0800\n" -"PO-Revision-Date: 2012-03-30 22:16+0000\n" +"PO-Revision-Date: 2012-10-05 03:19+0000\n" "Last-Translator: Aron Xu \n" "Language-Team: Chinese (simplified) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2012-05-08 01:57+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2013-01-28 10:37+0000\n" +"X-Generator: Launchpad (build 16451)\n" "Language: zh_CN\n" #: src/apt_config_treeitems.cc:99 src/apt_config_treeitems.cc:210 @@ -51,7 +51,7 @@ #: src/apt_config_treeitems.cc:280 #, c-format msgid "Editing \"%ls\": " -msgstr "" +msgstr "正在编辑“%ls”： " #: src/apt_config_treeitems.cc:402 msgid "%BChoice:%b " @@ -657,7 +657,7 @@ #, c-format msgid "" "%s is already installed at the latest version, so it will not be upgraded.\n" -msgstr "" +msgstr "%s 已经安装了最新版本，所以不会升级。\n" #: src/cmdline/cmdline_action.cc:338 #, c-format @@ -855,35 +855,35 @@ #: src/cmdline/cmdline_download_progress_display.cc:154 msgid "Hit" -msgstr "" +msgstr "命中" #. ForTranslators: this stands for "ignored" and should be #. the same width as the translation of "Err". #: src/cmdline/cmdline_download_progress_display.cc:181 msgid "Ign" -msgstr "" +msgstr "忽略" #. ForTranslators: this stands for "error" and should be the #. same width as the translation of "Ign". #: src/cmdline/cmdline_download_progress_display.cc:185 msgid "Err" -msgstr "" +msgstr "错误" #: src/cmdline/cmdline_download_progress_display.cc:211 #, c-format msgid "Fetched %sB in %s (%sB/s)" -msgstr "" +msgstr "已下载 %sB，耗时 %s (%sB/s)" #: src/cmdline/cmdline_download_progress_display.cc:230 #, c-format msgid "" "Media change: Please insert the disc labeled '%s' into the drive '%s' and " "press [Enter]." -msgstr "" +msgstr "更换介质：请将标签为“%s”的磁盘插入驱动器“%s”并按[回车(Enter)]。" #: src/cmdline/cmdline_download_progress_display.cc:436 msgid "[Working]" -msgstr "" +msgstr "[正在工作]" #: src/cmdline/cmdline_extract_cache_subset.cc:56 #, c-format @@ -2511,7 +2511,7 @@ #: src/edit_pkg_hier.cc:340 msgid "Unable to look up your home directory!" -msgstr "" +msgstr "无法查阅您的主目录！" #: src/generic/apt/aptcache.cc:271 #, c-format @@ -3151,7 +3151,7 @@ #: src/generic/problemresolver/exceptions.h:114 msgid "The maximum cost value was exceeded." -msgstr "" +msgstr "超出了最大消耗值。" #: src/generic/problemresolver/exceptions.h:124 msgid "A single cost level was both added and lower-bounded." @@ -5095,7 +5095,7 @@ #: src/main.cc:182 #, c-format msgid " Qt support disabled.\n" -msgstr "" +msgstr " Qt 支持已禁用\n" #: src/main.cc:184 msgid "" @@ -5294,13 +5294,13 @@ #: src/main.cc:232 #, c-format msgid " --qt Use the Qt GUI.\n" -msgstr "" +msgstr " --qt 使用 Qt 图形界面。\n" #: src/main.cc:233 #, c-format msgid "" " --no-qt Do not use the Qt GUI even if enabled in the configuration.\n" -msgstr "" +msgstr " --no-qt 不要使用 Qt 图形界面，即使在配置中启用。\n" #: src/main.cc:235 #, c-format @@ -6320,15 +6320,15 @@ #: src/qt/tabs_manager.cc:254 msgid "Perform Changes" -msgstr "" +msgstr "执行更改" #: src/qt/widgets/packages_tab.cc:72 msgid "all" -msgstr "" +msgstr "全部" #: src/qt/widgets/packages_tab.cc:72 msgid "installed locally" -msgstr "" +msgstr "已从本地安装" #: src/qt/widgets/packages_tab.cc:72 msgid "new" @@ -6336,19 +6336,19 @@ #: src/qt/widgets/packages_tab.cc:78 msgid "Show:" -msgstr "" +msgstr "显示：" #: src/qt/widgets/packages_tab.cc:84 msgid "Manage Filters" -msgstr "" +msgstr "管理过滤器" #: src/qt/widgets/packages_tab.cc:105 msgid "Name and Description" -msgstr "" +msgstr "名称描述" #: src/qt/widgets/packages_tab.cc:111 msgid "Find:" -msgstr "" +msgstr "查找：" #: src/qt/widgets/packages_tab.cc:113 msgid "by" @@ -6356,15 +6356,15 @@ #: src/qt/windows/main_window.cc:96 msgid "&File" -msgstr "" +msgstr "文件(&F)" #: src/qt/windows/main_window.cc:104 msgid "&Packages" -msgstr "" +msgstr "软件包(&P)" #: src/qt/windows/main_window.cc:112 msgid "&Help" -msgstr "" +msgstr "帮助(&H)" #: src/reason_fragment.cc:31 msgid "depends on" diff -Nru language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/apturl.po language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/apturl.po --- language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/apturl.po 2012-05-08 22:47:58.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/apturl.po 2013-01-29 09:37:10.000000000 +0000 @@ -14,10 +14,10 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-08 06:13+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2013-01-28 15:15+0000\n" +"X-Generator: Launchpad (build 16451)\n" -#: ../apturl-gtk:50 ../apturl-kde:53 +#: ../apturl-gtk:49 ../apturl-kde:52 msgid "User requested interrupt." msgstr "用户中断。" @@ -43,35 +43,35 @@ msgid "No ':' in the uri" msgstr "在 URI 中没有“:”" -#: ../AptUrl/AptUrl.py:77 +#: ../AptUrl/AptUrl.py:73 #, python-format msgid "Enabling '%s' failed" msgstr "启用“%s”失败" -#: ../AptUrl/AptUrl.py:94 +#: ../AptUrl/AptUrl.py:91 #, python-format msgid "Unknown channel '%s'" msgstr "未知频道“%s”" -#: ../AptUrl/AptUrl.py:95 +#: ../AptUrl/AptUrl.py:92 #, python-format msgid "The channel '%s' is not known" msgstr "频道“%s”未知" -#: ../AptUrl/AptUrl.py:103 +#: ../AptUrl/AptUrl.py:100 #, python-format msgid "Enabling channel '%s' failed" msgstr "启用频道“%s”失败" -#: ../AptUrl/AptUrl.py:115 +#: ../AptUrl/AptUrl.py:112 msgid "Invalid /etc/apt/sources.list file" msgstr "无效的 /etc/apt/sources.list 文件" -#: ../AptUrl/AptUrl.py:118 +#: ../AptUrl/AptUrl.py:115 msgid "Software index is broken" msgstr "软件索引已经损坏" -#: ../AptUrl/AptUrl.py:119 +#: ../AptUrl/AptUrl.py:116 msgid "" "This is a major failure of your software management system. Please check for " "broken packages with synaptic, check the file permissions and correctness of " @@ -81,26 +81,26 @@ "这是软件管理系统的主要错误. 请用新利得检查破损的软件包, 检查文件 /etc/apt/sources.list 的权限和正确性，并用命令：“sudo " "apt-get update”和“sudo apt-get install -f“ 重新载入软件包信息。" -#: ../AptUrl/AptUrl.py:147 +#: ../AptUrl/AptUrl.py:144 msgid "Need a url to continue, exiting" msgstr "需要一个网址以继续，应用程序将退出" -#: ../AptUrl/AptUrl.py:150 +#: ../AptUrl/AptUrl.py:147 #, python-format msgid "Invalid url: '%s' given, exiting" msgstr "错误的网址：输入为“%s”，退出" -#: ../AptUrl/AptUrl.py:186 +#: ../AptUrl/AptUrl.py:183 #, python-format msgid "Can not deal with protocol '%s' " msgstr "无法处理协议“%s” " -#: ../AptUrl/AptUrl.py:207 +#: ../AptUrl/AptUrl.py:205 #, python-format msgid "Package '%s' is virtual." msgstr "软件包“%s”为虚包。" -#: ../AptUrl/AptUrl.py:210 +#: ../AptUrl/AptUrl.py:208 #, python-format msgid "Could not find package '%s'." msgstr "无法找到软件包“%s”。" @@ -110,35 +110,35 @@ msgid "Package '%s' is already installed" msgstr "软件包“%s”已经安装" -#: ../AptUrl/AptUrl.py:228 +#: ../AptUrl/AptUrl.py:229 #, python-format msgid "Can not install '%s' (%s) " msgstr "无法安装“%s”(%s) " -#: ../AptUrl/AptUrl.py:233 +#: ../AptUrl/AptUrl.py:235 #, python-format msgid "" "Package '%s' requests minimal version '%s', but only '%s' is available" msgstr "软件包“%s”需要的最低版本是“%s”，但是只有“%s”可用" -#: ../AptUrl/UI.py:17 +#: ../AptUrl/UI.py:16 msgid "Enable additional components" msgstr "使用附加组件" -#: ../AptUrl/UI.py:25 ../AptUrl/gtk/GtkUI.py:77 ../AptUrl/kde/KdeUI.py:78 +#: ../AptUrl/UI.py:24 ../AptUrl/gtk/GtkUI.py:83 ../AptUrl/kde/KdeUI.py:80 msgid "Enable additional software channel" msgstr "启用附加软件频道" -#: ../AptUrl/UI.py:26 ../AptUrl/gtk/GtkUI.py:78 ../AptUrl/kde/KdeUI.py:79 +#: ../AptUrl/UI.py:25 ../AptUrl/gtk/GtkUI.py:84 ../AptUrl/kde/KdeUI.py:81 #, python-format msgid "Do you want to enable the following software channel: '%s'?" msgstr "您想启用“%s”软件频道吗？" -#: ../AptUrl/gtk/GtkUI.py:142 ../AptUrl/kde/KdeUI.py:128 +#: ../AptUrl/gtk/GtkUI.py:152 ../AptUrl/kde/KdeUI.py:133 msgid "Install additional software?" msgstr "安装附加软件？" -#: ../AptUrl/gtk/GtkUI.py:143 ../AptUrl/kde/KdeUI.py:129 +#: ../AptUrl/gtk/GtkUI.py:153 ../AptUrl/kde/KdeUI.py:134 #, python-format msgid "Do you want to install package '%s'?" msgstr "您确定要安装软件包“%s”？" diff -Nru language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/aspell.po language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/aspell.po --- language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/aspell.po 2012-05-08 22:47:25.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/aspell.po 2013-01-29 09:37:02.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: 2012-05-08 01:58+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2013-01-28 10:37+0000\n" +"X-Generator: Launchpad (build 16451)\n" "Language: zh_CN\n" #: common/info.cpp:232 diff -Nru language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/attr.po language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/attr.po --- language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/attr.po 2012-05-08 22:47:25.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/attr.po 2013-01-29 09:37: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: 2012-05-08 01:58+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2013-01-28 10:37+0000\n" +"X-Generator: Launchpad (build 16451)\n" #: ../attr/attr.c:46 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/avahi.po language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/avahi.po --- language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/avahi.po 2012-05-08 22:47:49.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/avahi.po 2013-01-29 09:36:56.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-08 04:52+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2013-01-28 13:50+0000\n" +"X-Generator: Launchpad (build 16451)\n" "Language: \n" #: ../avahi-common/error.c:30 diff -Nru language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/bacula.po language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/bacula.po --- language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/bacula.po 2012-05-08 22:47:38.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/bacula.po 2013-01-29 09:37:15.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-08 03:33+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2013-01-28 12:26+0000\n" +"X-Generator: Launchpad (build 16451)\n" #: src/dird/jobq.c:74 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/bash.po language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/bash.po --- language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/bash.po 2012-05-08 22:47:25.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/bash.po 2013-01-29 09:37:14.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: 2012-05-08 01:58+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2013-01-28 10:38+0000\n" +"X-Generator: Launchpad (build 16451)\n" #: arrayfunc.c:50 msgid "bad array subscript" diff -Nru language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/bfd.po language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/bfd.po --- language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/bfd.po 2012-05-08 22:47:25.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/bfd.po 2013-01-29 09:37:00.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: 2012-05-08 01:59+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2013-01-28 10:39+0000\n" +"X-Generator: Launchpad (build 16451)\n" #: aout-adobe.c:127 msgid "%B: Unknown section type in a.out.adobe file: %x\n" @@ -44,28 +44,28 @@ "%s: can not represent section for symbol `%s' in a.out object file format" msgstr "%s：无法在 a.out 对象文件格式中为符号“%s”表示节" -#: aoutx.h:1579 vms-alpha.c:7668 +#: aoutx.h:1579 vms-alpha.c:7671 msgid "*unknown*" msgstr "*未知*" -#: aoutx.h:4017 aoutx.h:4343 +#: aoutx.h:4018 aoutx.h:4344 msgid "%P: %B: unexpected relocation type\n" msgstr "%P: %B:非预期的重定位类型\n" -#: aoutx.h:5374 +#: aoutx.h:5375 #, c-format msgid "%s: relocatable link from %s to %s not supported" msgstr "%s: 不支持从 %s 到 %s 的重定位链接" -#: archive.c:2194 +#: archive.c:2203 msgid "Warning: writing archive was slow: rewriting timestamp\n" msgstr "警告：写入归档过慢：重新写入时间戳\n" -#: archive.c:2482 +#: archive.c:2491 msgid "Reading archive file mod timestamp" msgstr "正在读入文件修改时间戳" -#: archive.c:2506 +#: archive.c:2515 msgid "Writing updated armap timestamp" msgstr "正在更新 armap 时间戳" @@ -189,13 +189,13 @@ "Warning: Writing section `%s' to huge (ie negative) file offset 0x%lx." msgstr "警告：将节“%s”写入过大(例如负数)文件偏移量的位置 0x%lx。" -#: bout.c:1146 elf-m10300.c:2075 elf32-avr.c:1654 elf32-frv.c:5731 -#: elfxx-sparc.c:2796 reloc.c:5677 reloc16.c:162 elf32-ia64.c:360 +#: bout.c:1146 elf-m10300.c:2063 elf32-avr.c:1654 elf32-frv.c:5734 +#: elfxx-sparc.c:2802 reloc.c:6115 reloc16.c:162 elf32-ia64.c:360 #: elf64-ia64.c:360 msgid "%P%F: --relax and -r may not be used together\n" msgstr "%P%F：-relax 和 -r 不能一起使用\n" -#: cache.c:226 +#: cache.c:227 msgid "reopening %B: %s\n" msgstr "重新打开%B: %s\n" @@ -227,8 +227,8 @@ msgid "%B: unsupported relocation: ALPHA_R_GPRELLOW" msgstr "%B:不支持的重定向: ALPHA_R_GPRELLOW" -#: coff-alpha.c:1575 elf32-m32r.c:2493 elf64-alpha.c:4079 elf64-alpha.c:4228 -#: elf32-ia64.c:3845 elf64-ia64.c:3845 +#: coff-alpha.c:1575 elf32-m32r.c:2484 elf64-alpha.c:4074 elf64-alpha.c:4224 +#: elf32-ia64.c:3839 elf64-ia64.c:3839 msgid "%B: unknown relocation type %d" msgstr "%B: 未知的重定向类型 %d" @@ -242,7 +242,7 @@ msgid "%B: unable to find ARM glue '%s' for `%s'" msgstr "%B:不能找到 ARM 来连接'%s' 和 `%s'" -#: coff-arm.c:1369 elf32-arm.c:6980 +#: coff-arm.c:1369 elf32-arm.c:7023 #, c-format msgid "" "%B(%s): warning: interworking not enabled.\n" @@ -275,14 +275,14 @@ msgid "error: %B is compiled for APCS-%d, whereas %B is compiled for APCS-%d" msgstr "错误: %B 是为APCS-%d而编译，而 %B 是为 APCS-%d 而编译" -#: coff-arm.c:2226 elf32-arm.c:15580 +#: coff-arm.c:2226 elf32-arm.c:15621 #, c-format msgid "" "error: %B passes floats in float registers, whereas %B passes them in " "integer registers" msgstr "error: 应将 %B 浮点数传至浮点记录, 但是 %B 浮点数被传入整数记录" -#: coff-arm.c:2229 elf32-arm.c:15584 +#: coff-arm.c:2229 elf32-arm.c:15625 #, c-format msgid "" "error: %B passes floats in integer registers, whereas %B passes them in " @@ -303,12 +303,12 @@ "position independent" msgstr "错误: %B是以绝对位置代码编译的，而%B是一个位置独立的目标" -#: coff-arm.c:2274 elf32-arm.c:15649 +#: coff-arm.c:2274 elf32-arm.c:15690 #, c-format msgid "Warning: %B supports interworking, whereas %B does not" msgstr "警告：%B支持协同工作，而%B不支持" -#: coff-arm.c:2277 elf32-arm.c:15655 +#: coff-arm.c:2277 elf32-arm.c:15696 #, c-format msgid "Warning: %B does not support interworking, whereas %B does" msgstr "警告：%B不支持协同工作，而%B支持" @@ -318,7 +318,7 @@ msgid "private flags = %x:" msgstr "私有标志 = %x：" -#: coff-arm.c:2309 elf32-arm.c:11752 +#: coff-arm.c:2309 elf32-arm.c:11806 #, c-format msgid " [floats passed in float registers]" msgstr " [在浮点寄存器中传递浮点数]" @@ -328,7 +328,7 @@ msgid " [floats passed in integer registers]" msgstr " [在整数寄存器中传递浮点数]" -#: coff-arm.c:2314 elf32-arm.c:11755 +#: coff-arm.c:2314 elf32-arm.c:11809 #, c-format msgid " [position independent]" msgstr " [位置无关]" @@ -353,14 +353,14 @@ msgid " [interworking not supported]" msgstr " [不支持互操作]" -#: coff-arm.c:2370 elf32-arm.c:10787 +#: coff-arm.c:2370 elf32-arm.c:10841 #, c-format msgid "" "Warning: Not setting interworking flag of %B since it has already been " "specified as non-interworking" msgstr "警告：如果%B被指明不进行互操作的话无需设置其互操作标识" -#: coff-arm.c:2374 elf32-arm.c:10791 +#: coff-arm.c:2374 elf32-arm.c:10845 #, c-format msgid "Warning: Clearing the interworking flag of %B due to outside request" msgstr "警告：因外部请求而清除%B 的互操作标识" @@ -375,20 +375,20 @@ msgid "relocation `%s' not yet implemented" msgstr "" -#: coff-i860.c:605 coff-tic54x.c:398 coffcode.h:5192 +#: coff-i860.c:605 coff-tic54x.c:398 coffcode.h:5198 msgid "%B: warning: illegal symbol index %ld in relocs" msgstr "%B：警告：重定位中的符号索引：%ld 非法" -#: coff-i960.c:143 coff-i960.c:506 +#: coff-i960.c:144 coff-i960.c:507 msgid "uncertain calling convention for non-COFF symbol" msgstr "关于非-COFF 符号不确定的调用约定" -#: coff-m68k.c:506 elf32-bfin.c:5689 elf32-cr16.c:2897 elf32-m68k.c:4677 +#: coff-m68k.c:506 elf32-bfin.c:5690 elf32-cr16.c:2897 elf32-m68k.c:4677 msgid "unsupported reloc type" msgstr "不支持的重定位类型" -#: coff-mips.c:688 elf32-mips.c:1014 elf32-score.c:430 elf32-score7.c:330 -#: elf64-mips.c:2019 elfn32-mips.c:1832 +#: coff-mips.c:688 elf32-mips.c:1516 elf32-score.c:431 elf32-score7.c:330 +#: elf64-mips.c:2618 elfn32-mips.c:2431 msgid "GP relative relocation when _gp not defined" msgstr "当 _pg 没有定义进 使用 GP 相对重定位" @@ -396,17 +396,17 @@ msgid "Unrecognized reloc" msgstr "无法识别的重定位" -#: coff-rs6000.c:2676 +#: coff-rs6000.c:2720 #, c-format msgid "%s: unsupported relocation type 0x%02x" msgstr "%s：不支持的重定位类型 0x%02x" -#: coff-rs6000.c:2761 +#: coff-rs6000.c:2805 #, c-format msgid "%s: TOC reloc at 0x%x to symbol `%s' with no TOC entry" msgstr "%s: 在Ox%x 处用符号 \"%s\" 进行没有TOC输入的TOC 重定位" -#: coff-rs6000.c:3512 coff64-rs6000.c:2111 +#: coff-rs6000.c:3556 coff64-rs6000.c:2111 msgid "%B: symbol `%s' has unrecognized smclas %d" msgstr "%B: 无法识别符号 `%s' 中包含的smclas %d" @@ -430,76 +430,76 @@ msgid "ignoring reloc %s\n" msgstr "正在忽略重定位 %s\n" -#: coffcode.h:991 +#: coffcode.h:997 msgid "%B: warning: COMDAT symbol '%s' does not match section name '%s'" msgstr "%B:警告：COMDAT标识‘%s’与段名‘%s’不匹配" #. Generate a warning message rather using the 'unhandled' #. variable as this will allow some .sys files generate by #. other toolchains to be processed. See bugzilla issue 196. -#: coffcode.h:1215 +#: coffcode.h:1221 msgid "" "%B: Warning: Ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section %s" msgstr "%B:警告：忽视了段%s中的段标志IMAGE_SCN_MEM_NOT_PAGED" -#: coffcode.h:1282 +#: coffcode.h:1288 msgid "%B (%s): Section flag %s (0x%x) ignored" msgstr "%B (%s): 段标志 %s (0x%x) 被忽视" -#: coffcode.h:2424 +#: coffcode.h:2430 #, c-format msgid "Unrecognized TI COFF target id '0x%x'" msgstr "无法识别的 TI COFF 目标 id “0x%x”" -#: coffcode.h:2738 +#: coffcode.h:2744 msgid "%B: reloc against a non-existant symbol index: %ld" msgstr "%B:对一个不存在的符号索引：%ld重新定位" -#: coffcode.h:3296 +#: coffcode.h:3302 msgid "%B: too many sections (%d)" msgstr "" -#: coffcode.h:3712 +#: coffcode.h:3718 msgid "%B: section %s: string table overflow at offset %ld" msgstr "" -#: coffcode.h:4517 +#: coffcode.h:4523 msgid "%B: warning: line number table read failed" msgstr "%B: 警告: 读取行号表失败" -#: coffcode.h:4547 +#: coffcode.h:4553 msgid "%B: warning: illegal symbol index %ld in line numbers" msgstr "%B: 警告: 在行号中存在非法符号索引 %ld" -#: coffcode.h:4561 +#: coffcode.h:4567 msgid "%B: warning: duplicate line number information for `%s'" msgstr "%B:警告：重复的行号信息“%s”" -#: coffcode.h:4961 +#: coffcode.h:4967 msgid "%B: Unrecognized storage class %d for %s symbol `%s'" msgstr "%B: 储存类型 %d 的 %s 中`%s'符号无法识别" -#: coffcode.h:5087 +#: coffcode.h:5093 msgid "warning: %B: local symbol `%s' has no section" msgstr "警告:%B: 本地符号 `%s' 没有被选" -#: coffcode.h:5231 +#: coffcode.h:5237 msgid "%B: illegal relocation type %d at address 0x%lx" msgstr "%B: 重定位类型 %d 在地址 0x%lx 处非法" -#: coffgen.c:1578 +#: coffgen.c:1595 msgid "%B: bad string table size %lu" msgstr "%B: 字串表大小 %lu 错误" -#: cofflink.c:533 elflink.c:4353 +#: cofflink.c:533 elflink.c:4323 msgid "Warning: type of symbol `%s' changed from %d to %d in %B" msgstr "警告: 符号类型 '%s' 已从%d 改成了 %d 位于 %B" -#: cofflink.c:2330 +#: cofflink.c:2329 msgid "%B: relocs in section `%A', but it has no contents" msgstr "%B：在‘%A’部分中重定位，但它还没有内容" -#: cofflink.c:2392 elflink.c:9554 +#: cofflink.c:2391 elflink.c:9545 msgid "" "%X`%s' referenced in section `%A' of %B: defined in discarded section `%A' " "of %B\n" @@ -525,68 +525,68 @@ msgid "warning: unable to update contents of %s section in %s" msgstr "警告: 无法更新 %2$s 中的%1$s章节" -#: dwarf2.c:490 +#: dwarf2.c:496 #, c-format msgid "Dwarf Error: Can't find %s section." msgstr "Dwarf错误: 无法找到 %s 。" -#: dwarf2.c:518 +#: dwarf2.c:525 #, c-format msgid "Dwarf Error: Offset (%lu) greater than or equal to %s size (%lu)." msgstr "Dwarf 错误：偏移(%lu) 大于或等于 %s 大小 (%lu)。" -#: dwarf2.c:940 +#: dwarf2.c:949 #, c-format msgid "Dwarf Error: Invalid or unhandled FORM value: %u." msgstr "小错误：无效或未处理的表单值：%u。" -#: dwarf2.c:1191 +#: dwarf2.c:1200 msgid "Dwarf Error: mangled line number section (bad file number)." msgstr "小错误: 行号段错误(文件号出错)." -#: dwarf2.c:1443 +#: dwarf2.c:1453 #, c-format msgid "Dwarf Error: Unhandled .debug_line version %d." msgstr "" -#: dwarf2.c:1465 +#: dwarf2.c:1475 msgid "Dwarf Error: Invalid maximum operations per instruction." msgstr "" -#: dwarf2.c:1652 +#: dwarf2.c:1662 msgid "Dwarf Error: mangled line number section." msgstr "小错误: 行号段出错." -#: dwarf2.c:1978 dwarf2.c:2098 dwarf2.c:2383 +#: dwarf2.c:1989 dwarf2.c:2109 dwarf2.c:2394 #, c-format msgid "Dwarf Error: Could not find abbrev number %u." msgstr "小错误: 无法找到 abbrev 号 %u." -#: dwarf2.c:2344 +#: dwarf2.c:2355 #, c-format msgid "" "Dwarf Error: found dwarf version '%u', this reader only handles version 2, 3 " "and 4 information." msgstr "" -#: dwarf2.c:2351 +#: dwarf2.c:2362 #, c-format msgid "" "Dwarf Error: found address size '%u', this reader can not handle sizes " "greater than '%u'." msgstr "小错误: 发现地址大小为\"%u\", 此阅读器无法处理大小大于\"%u\"的地址." -#: dwarf2.c:2374 +#: dwarf2.c:2385 #, c-format msgid "Dwarf Error: Bad abbrev number: %u." msgstr "小错误：错误的缩写编号：%u。" -#: ecoff.c:1237 +#: ecoff.c:1239 #, c-format msgid "Unknown basic type %d" msgstr "未知的基本类型 %d" -#: ecoff.c:1494 +#: ecoff.c:1496 #, c-format msgid "" "\n" @@ -595,7 +595,7 @@ "\n" " End+1 符号：%ld" -#: ecoff.c:1501 ecoff.c:1504 +#: ecoff.c:1503 ecoff.c:1506 #, c-format msgid "" "\n" @@ -604,7 +604,7 @@ "\n" " 第一个符号：%ld" -#: ecoff.c:1516 +#: ecoff.c:1518 #, c-format msgid "" "\n" @@ -613,7 +613,7 @@ "\n" " End+1 符号：%-7ld 类型：%s" -#: ecoff.c:1523 +#: ecoff.c:1525 #, c-format msgid "" "\n" @@ -622,7 +622,7 @@ "\n" " 本地符号：%ld" -#: ecoff.c:1531 +#: ecoff.c:1533 #, c-format msgid "" "\n" @@ -631,7 +631,7 @@ "\n" " 结构；End+1 符号：%ld" -#: ecoff.c:1536 +#: ecoff.c:1538 #, c-format msgid "" "\n" @@ -640,7 +640,7 @@ "\n" " 联合；End+1 符号：%ld" -#: ecoff.c:1541 +#: ecoff.c:1543 #, c-format msgid "" "\n" @@ -649,7 +649,7 @@ "\n" " 枚举；End+1 符号：%ld" -#: ecoff.c:1547 +#: ecoff.c:1549 #, c-format msgid "" "\n" @@ -668,16 +668,16 @@ msgid "error: %B: Object tag '%d, %s' is incompatible with tag '%d, %s'" msgstr "错误： %B： 对象标签‘%d， %s’与标签‘%d， %s’不相容" -#: elf-eh-frame.c:913 +#: elf-eh-frame.c:917 msgid "%P: error in %B(%A); no .eh_frame_hdr table will be created.\n" msgstr "%P ： 在%B (%A)中发生错误; .eh_frame_hdr表格不会被创建。\n" -#: elf-eh-frame.c:1165 +#: elf-eh-frame.c:1189 msgid "" "%P: fde encoding in %B(%A) prevents .eh_frame_hdr table being created.\n" msgstr "" -#: elf-eh-frame.c:1583 +#: elf-eh-frame.c:1605 msgid "%P: DW_EH_PE_datarel unspecified for this architecture.\n" msgstr "" @@ -688,54 +688,58 @@ "pie\n" msgstr "" -#: elf-m10200.c:450 elf-m10300.c:1571 elf32-avr.c:1221 elf32-bfin.c:3209 -#: elf32-cr16.c:1482 elf32-cr16c.c:780 elf32-cris.c:2077 elf32-crx.c:922 -#: elf32-d10v.c:509 elf32-fr30.c:609 elf32-frv.c:4102 elf32-h8300.c:509 -#: elf32-i860.c:1211 elf32-ip2k.c:1468 elf32-iq2000.c:684 elf32-lm32.c:1168 -#: elf32-m32c.c:553 elf32-m32r.c:3111 elf32-m68hc1x.c:1138 elf32-mep.c:535 -#: elf32-microblaze.c:1231 elf32-moxie.c:282 elf32-msp430.c:486 elf32-mt.c:395 -#: elf32-openrisc.c:404 elf32-score.c:2731 elf32-score7.c:2540 -#: elf32-spu.c:5042 elf32-v850.c:2143 elf32-xstormy16.c:941 elf64-mmix.c:1522 +#: elf-m10200.c:450 elf-m10300.c:1563 elf32-avr.c:1221 elf32-bfin.c:3213 +#: elf32-cr16.c:1482 elf32-cr16c.c:780 elf32-cris.c:2081 elf32-crx.c:922 +#: elf32-d10v.c:509 elf32-epiphany.c:556 elf32-fr30.c:609 elf32-frv.c:4105 +#: elf32-h8300.c:509 elf32-i860.c:1211 elf32-ip2k.c:1468 elf32-iq2000.c:684 +#: elf32-lm32.c:1168 elf32-m32c.c:553 elf32-m32r.c:3106 elf32-m68hc1x.c:1138 +#: elf32-mep.c:535 elf32-microblaze.c:1231 elf32-moxie.c:282 +#: elf32-msp430.c:486 elf32-mt.c:395 elf32-openrisc.c:404 elf32-score.c:2729 +#: elf32-score7.c:2537 elf32-spu.c:5044 elf32-tilepro.c:3214 elf32-v850.c:2143 +#: elf32-xstormy16.c:935 elf64-mmix.c:1590 elfxx-tilegx.c:3577 msgid "internal error: out of range error" msgstr "内部错误：超出范围错误" -#: elf-m10200.c:454 elf-m10300.c:1575 elf32-avr.c:1225 elf32-bfin.c:3213 -#: elf32-cr16.c:1486 elf32-cr16c.c:784 elf32-cris.c:2081 elf32-crx.c:926 -#: elf32-d10v.c:513 elf32-fr30.c:613 elf32-frv.c:4106 elf32-h8300.c:513 +#: elf-m10200.c:454 elf-m10300.c:1567 elf32-avr.c:1225 elf32-bfin.c:3217 +#: elf32-cr16.c:1486 elf32-cr16c.c:784 elf32-cris.c:2085 elf32-crx.c:926 +#: elf32-d10v.c:513 elf32-fr30.c:613 elf32-frv.c:4109 elf32-h8300.c:513 #: elf32-i860.c:1215 elf32-iq2000.c:688 elf32-lm32.c:1172 elf32-m32c.c:557 -#: elf32-m32r.c:3115 elf32-m68hc1x.c:1142 elf32-mep.c:539 +#: elf32-m32r.c:3110 elf32-m68hc1x.c:1142 elf32-mep.c:539 #: elf32-microblaze.c:1235 elf32-moxie.c:286 elf32-msp430.c:490 -#: elf32-openrisc.c:408 elf32-score.c:2735 elf32-score7.c:2544 -#: elf32-spu.c:5046 elf32-v850.c:2147 elf32-xstormy16.c:945 elf64-mmix.c:1526 -#: elfxx-mips.c:9193 +#: elf32-openrisc.c:408 elf32-score.c:2733 elf32-score7.c:2541 +#: elf32-spu.c:5048 elf32-tilepro.c:3218 elf32-v850.c:2147 +#: elf32-xstormy16.c:939 elf64-mmix.c:1594 elfxx-mips.c:9465 +#: elfxx-tilegx.c:3581 msgid "internal error: unsupported relocation error" msgstr "内部错误：不支持的重定位错误" #: elf-m10200.c:458 elf32-cr16.c:1490 elf32-cr16c.c:788 elf32-crx.c:930 -#: elf32-d10v.c:517 elf32-h8300.c:517 elf32-lm32.c:1176 elf32-m32r.c:3119 -#: elf32-m68hc1x.c:1146 elf32-microblaze.c:1239 elf32-score.c:2739 -#: elf32-score7.c:2548 elf32-spu.c:5050 +#: elf32-d10v.c:517 elf32-h8300.c:517 elf32-lm32.c:1176 elf32-m32r.c:3114 +#: elf32-m68hc1x.c:1146 elf32-microblaze.c:1239 elf32-score.c:2737 +#: elf32-score7.c:2545 elf32-spu.c:5052 msgid "internal error: dangerous error" msgstr "内部错误：危险的错误" -#: elf-m10200.c:462 elf-m10300.c:1591 elf32-avr.c:1233 elf32-bfin.c:3221 -#: elf32-cr16.c:1494 elf32-cr16c.c:792 elf32-cris.c:2089 elf32-crx.c:934 -#: elf32-d10v.c:521 elf32-fr30.c:621 elf32-frv.c:4114 elf32-h8300.c:521 -#: elf32-i860.c:1223 elf32-ip2k.c:1483 elf32-iq2000.c:696 elf32-lm32.c:1180 -#: elf32-m32c.c:565 elf32-m32r.c:3123 elf32-m68hc1x.c:1150 elf32-mep.c:547 -#: elf32-microblaze.c:1243 elf32-moxie.c:294 elf32-msp430.c:498 elf32-mt.c:403 -#: elf32-openrisc.c:416 elf32-score.c:2748 elf32-score7.c:2552 -#: elf32-spu.c:5054 elf32-v850.c:2167 elf32-xstormy16.c:953 elf64-mmix.c:1534 +#: elf-m10200.c:462 elf-m10300.c:1580 elf32-avr.c:1233 elf32-bfin.c:3225 +#: elf32-cr16.c:1494 elf32-cr16c.c:792 elf32-cris.c:2093 elf32-crx.c:934 +#: elf32-d10v.c:521 elf32-epiphany.c:571 elf32-fr30.c:621 elf32-frv.c:4117 +#: elf32-h8300.c:521 elf32-i860.c:1223 elf32-ip2k.c:1483 elf32-iq2000.c:696 +#: elf32-lm32.c:1180 elf32-m32c.c:565 elf32-m32r.c:3118 elf32-m68hc1x.c:1150 +#: elf32-mep.c:547 elf32-microblaze.c:1243 elf32-moxie.c:294 +#: elf32-msp430.c:498 elf32-mt.c:403 elf32-openrisc.c:416 elf32-score.c:2746 +#: elf32-score7.c:2549 elf32-spu.c:5056 elf32-tilepro.c:3226 elf32-v850.c:2167 +#: elf32-xstormy16.c:947 elf64-mmix.c:1602 elfxx-tilegx.c:3589 msgid "internal error: unknown error" msgstr "内部错误：未知的错误" -#: elf-m10300.c:1515 elf32-arm.c:10365 elf32-i386.c:4107 elf32-m32r.c:2604 -#: elf32-m68k.c:4156 elf32-s390.c:3010 elf32-sh.c:4223 elf32-xtensa.c:3067 -#: elf64-s390.c:2985 elf64-sh64.c:1636 elf64-x86-64.c:3882 elfxx-sparc.c:3807 +#: elf-m10300.c:1507 elf32-arm.c:10419 elf32-i386.c:4264 elf32-m32r.c:2599 +#: elf32-m68k.c:4156 elf32-s390.c:3003 elf32-sh.c:4218 elf32-tilepro.c:3117 +#: elf32-xtensa.c:3066 elf64-s390.c:2978 elf64-sh64.c:1640 elf64-x86-64.c:4110 +#: elfxx-sparc.c:3835 elfxx-tilegx.c:3500 msgid "%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'" msgstr "%B(%A+0x%lx): 无法解决 %s 重定向于符号 “%s” 有冲突" -#: elf-m10300.c:1580 +#: elf-m10300.c:1572 msgid "" "error: inappropriate relocation type for shared library (did you forget -" "fpic?)" @@ -747,15 +751,16 @@ "making a shared library" msgstr "" -#: elf-m10300.c:1586 +#: elf-m10300.c:1575 msgid "internal error: suspicious relocation type used in shared library" msgstr "内部错误：共享库中使用了可疑的重定向类型" -#: elf-m10300.c:4384 elf32-arm.c:12743 elf32-cr16.c:2451 elf32-cris.c:3044 -#: elf32-hppa.c:1894 elf32-i370.c:503 elf32-i386.c:2043 elf32-lm32.c:1868 -#: elf32-m32r.c:1927 elf32-m68k.c:3252 elf32-s390.c:1652 elf32-sh.c:2931 -#: elf32-tic6x.c:2160 elf32-vax.c:1040 elf64-s390.c:1635 elf64-sh64.c:3377 -#: elf64-x86-64.c:1985 elfxx-sparc.c:2104 +#: elf-m10300.c:4372 elf32-arm.c:12800 elf32-cr16.c:2451 elf32-cris.c:3057 +#: elf32-hppa.c:1894 elf32-i370.c:503 elf32-i386.c:2182 elf32-lm32.c:1868 +#: elf32-m32r.c:1927 elf32-m68k.c:3253 elf32-s390.c:1652 elf32-sh.c:2931 +#: elf32-tic6x.c:2162 elf32-tilepro.c:1940 elf32-vax.c:1041 elf64-s390.c:1635 +#: elf64-sh64.c:3381 elf64-x86-64.c:2176 elfxx-sparc.c:2119 +#: elfxx-tilegx.c:2261 #, c-format msgid "dynamic variable `%s' is zero size" msgstr "动态变量\"%s\"大小为0" @@ -780,7 +785,7 @@ msgid "%B: no group info for section %A" msgstr "" -#: elf.c:737 elf.c:3121 elflink.c:10144 +#: elf.c:737 elf.c:3121 elflink.c:10135 msgid "%B: warning: sh_link not set for section `%A'" msgstr "%B: 警告: sh_link 设置未完成 `%A'" @@ -889,422 +894,424 @@ msgid "%B: section %A lma %#lx adjusted to %#lx" msgstr "" -#: elf.c:4774 +#: elf.c:4776 msgid "%B: section `%A' can't be allocated in segment %d" msgstr "" -#: elf.c:4822 +#: elf.c:4824 msgid "%B: warning: allocated section `%s' not in segment" msgstr "" -#: elf.c:5322 +#: elf.c:5324 msgid "%B: symbol `%s' required but not present" msgstr "" -#: elf.c:5660 +#: elf.c:5662 msgid "%B: warning: Empty loadable segment detected, is this intentional ?\n" msgstr "" -#: elf.c:6688 +#: elf.c:6692 #, c-format msgid "" "Unable to find equivalent output section for symbol '%s' from section '%s'" msgstr "" -#: elf.c:7684 +#: elf.c:7692 msgid "%B: unsupported relocation type %s" msgstr "" -#: elf32-arm.c:3590 +#: elf32-arm.c:3617 msgid "" "%B(%s): warning: interworking not enabled.\n" " first occurrence: %B: Thumb call to ARM" msgstr "" -#: elf32-arm.c:3637 +#: elf32-arm.c:3664 msgid "" "%B(%s): warning: interworking not enabled.\n" " first occurrence: %B: ARM call to Thumb" msgstr "" -#: elf32-arm.c:3849 elf32-arm.c:5286 +#: elf32-arm.c:3878 elf32-arm.c:5315 #, c-format msgid "%s: cannot create stub entry %s" msgstr "" -#: elf32-arm.c:5402 +#: elf32-arm.c:5431 #, c-format msgid "unable to find THUMB glue '%s' for '%s'" msgstr "" -#: elf32-arm.c:5438 +#: elf32-arm.c:5467 #, c-format msgid "unable to find ARM glue '%s' for '%s'" msgstr "无法找到ARM来连接\"%s\" 和 \"%s\"" -#: elf32-arm.c:5964 +#: elf32-arm.c:6005 msgid "%B: BE8 images only valid in big-endian mode." msgstr "%B:BE8图只在大-endian 模式下有效." #. Give a warning, but do as the user requests anyway. -#: elf32-arm.c:6194 +#: elf32-arm.c:6235 msgid "" "%B: warning: selected VFP11 erratum workaround is not necessary for target " "architecture" msgstr "%B: 警告:所选的VFP11错误对目标结构不是必需的" -#: elf32-arm.c:6738 elf32-arm.c:6758 +#: elf32-arm.c:6779 elf32-arm.c:6799 msgid "%B: unable to find VFP11 veneer `%s'" msgstr "%B: 无法找到 VFP11 的描述 \"%s\"" -#: elf32-arm.c:6806 +#: elf32-arm.c:6848 #, c-format msgid "Invalid TARGET2 relocation type '%s'." msgstr "TARGET2 重定向类型\"%s\" 无效." -#: elf32-arm.c:6890 +#: elf32-arm.c:6933 msgid "" "%B(%s): warning: interworking not enabled.\n" " first occurrence: %B: thumb call to arm" msgstr "%B(%s): 警告: 交互工作没法进行." -#: elf32-arm.c:7674 +#: elf32-arm.c:7717 msgid "%B(%A+0x%lx):unexpected Thumb instruction '0x%x' in TLS trampoline" msgstr "" -#: elf32-arm.c:7713 +#: elf32-arm.c:7756 msgid "%B(%A+0x%lx):unexpected ARM instruction '0x%x' in TLS trampoline" msgstr "" -#: elf32-arm.c:8166 +#: elf32-arm.c:8209 msgid "\\%B: Warning: Arm BLX instruction targets Arm function '%s'." msgstr "\\%B: 警告: Arm BLX 指令指向Arm函数\"%s\"." -#: elf32-arm.c:8575 +#: elf32-arm.c:8622 msgid "%B: Warning: Thumb BLX instruction targets thumb function '%s'." msgstr "%B: 警告: Thumb BLX 指令指向thumb 函数\"%s\"." -#: elf32-arm.c:9408 +#: elf32-arm.c:9460 msgid "" "%B(%A+0x%lx):unexpected Thumb instruction '0x%x' referenced by TLS_GOTDESC" msgstr "" -#: elf32-arm.c:9431 +#: elf32-arm.c:9483 msgid "" "%B(%A+0x%lx):unexpected ARM instruction '0x%x' referenced by TLS_GOTDESC" msgstr "" -#: elf32-arm.c:9460 +#: elf32-arm.c:9512 msgid "" "%B(%A+0x%lx): R_ARM_TLS_LE32 relocation not permitted in shared object" msgstr "%B(%A+0x%lx):R_ARM_TLS_LE32 重定位在sharped 对象中不可使用." -#: elf32-arm.c:9675 +#: elf32-arm.c:9727 msgid "" "%B(%A+0x%lx): Only ADD or SUB instructions are allowed for ALU group " "relocations" msgstr "%B(%A+0x%lx): 只有 ADD 或 SUB 指令才能用于 ALU 组的重定位." -#: elf32-arm.c:9715 elf32-arm.c:9802 elf32-arm.c:9885 elf32-arm.c:9970 +#: elf32-arm.c:9767 elf32-arm.c:9854 elf32-arm.c:9937 elf32-arm.c:10022 msgid "%B(%A+0x%lx): Overflow whilst splitting 0x%lx for group relocation %s" msgstr "%B(%A+0x%lx): 在对0x%lx 进行组重定位 %s 时发生溢出" -#: elf32-arm.c:10209 elf32-sh.c:4112 elf64-sh64.c:1544 +#: elf32-arm.c:10261 elf32-sh.c:4103 elf64-sh64.c:1544 msgid "%B(%A+0x%lx): %s relocation against SEC_MERGE section" msgstr "%B(%A+0x%lx): %s 重定位与SEC_MERGE段发生冲突" -#: elf32-arm.c:10320 elf32-m68k.c:4191 elf32-xtensa.c:2805 +#: elf32-arm.c:10372 elf32-m68k.c:4191 elf32-xtensa.c:2802 msgid "%B(%A+0x%lx): %s used with TLS symbol %s" msgstr "%B(%A+0x%lx): %s 是与TLS 符号%s 一起使用的" -#: elf32-arm.c:10321 elf32-m68k.c:4192 elf32-xtensa.c:2806 +#: elf32-arm.c:10373 elf32-m68k.c:4192 elf32-xtensa.c:2803 msgid "%B(%A+0x%lx): %s used with non-TLS symbol %s" msgstr "%B(%A+0x%lx): %s 是与非TLS 符号%s 一起使用的" -#: elf32-arm.c:10399 elf32-tic6x.c:2751 +#: elf32-arm.c:10453 elf32-tic6x.c:2753 msgid "out of range" msgstr "超出边界" -#: elf32-arm.c:10403 elf32-tic6x.c:2755 +#: elf32-arm.c:10457 elf32-tic6x.c:2757 msgid "unsupported relocation" msgstr "无法支持重定向" -#: elf32-arm.c:10411 elf32-tic6x.c:2763 +#: elf32-arm.c:10465 elf32-tic6x.c:2765 msgid "unknown error" msgstr "未知错误" -#: elf32-arm.c:10836 +#: elf32-arm.c:10890 msgid "" "Warning: Clearing the interworking flag of %B because non-interworking code " "in %B has been linked with it" msgstr "警告：正在清除%B的交互工作标志，因为在%B 中没有发现与其连接的交互工作的代码" -#: elf32-arm.c:10930 +#: elf32-arm.c:10984 msgid "%B: Unknown mandatory EABI object attribute %d" msgstr "" -#: elf32-arm.c:10938 +#: elf32-arm.c:10992 msgid "Warning: %B: Unknown EABI object attribute %d" msgstr "警告：%B：未知 EABI对象属性 %d" -#: elf32-arm.c:11119 +#: elf32-arm.c:11173 msgid "error: %B: Unknown CPU architecture" msgstr "" -#: elf32-arm.c:11157 +#: elf32-arm.c:11211 msgid "error: %B: Conflicting CPU architectures %d/%d" msgstr "" -#: elf32-arm.c:11206 +#: elf32-arm.c:11260 msgid "" "Error: %B has both the current and legacy Tag_MPextension_use attributes" msgstr "" -#: elf32-arm.c:11231 +#: elf32-arm.c:11285 msgid "error: %B uses VFP register arguments, %B does not" msgstr "" -#: elf32-arm.c:11376 +#: elf32-arm.c:11430 msgid "error: %B: unable to merge virtualization attributes with %B" msgstr "" -#: elf32-arm.c:11402 +#: elf32-arm.c:11456 msgid "error: %B: Conflicting architecture profiles %c/%c" msgstr "" -#: elf32-arm.c:11503 +#: elf32-arm.c:11557 msgid "Warning: %B: Conflicting platform configuration" msgstr "警告：%B：平台配置发生冲突" -#: elf32-arm.c:11512 +#: elf32-arm.c:11566 msgid "error: %B: Conflicting use of R9" msgstr "" -#: elf32-arm.c:11524 +#: elf32-arm.c:11578 msgid "error: %B: SB relative addressing conflicts with use of R9" msgstr "" -#: elf32-arm.c:11537 +#: elf32-arm.c:11591 msgid "" "warning: %B uses %u-byte wchar_t yet the output is to use %u-byte wchar_t; " "use of wchar_t values across objects may fail" msgstr "" -#: elf32-arm.c:11568 +#: elf32-arm.c:11622 msgid "" "warning: %B uses %s enums yet the output is to use %s enums; use of enum " "values across objects may fail" msgstr "警告：%B 使用 %s 枚举而输出使用%s 枚举；使用跨对象枚举可能会发生错误" -#: elf32-arm.c:11580 +#: elf32-arm.c:11634 msgid "error: %B uses iWMMXt register arguments, %B does not" msgstr "" -#: elf32-arm.c:11597 +#: elf32-arm.c:11651 msgid "error: fp16 format mismatch between %B and %B" msgstr "" -#: elf32-arm.c:11621 +#: elf32-arm.c:11675 msgid "DIV usage mismatch between %B and %B" msgstr "" -#: elf32-arm.c:11640 +#: elf32-arm.c:11694 msgid "%B has has both the current and legacy Tag_MPextension_use attributes" msgstr "" #. Ignore init flag - it may not be set, despite the flags field #. containing valid data. #. Ignore init flag - it may not be set, despite the flags field containing valid data. -#: elf32-arm.c:11728 elf32-bfin.c:5075 elf32-cris.c:4162 elf32-m68hc1x.c:1282 -#: elf32-m68k.c:1235 elf32-score.c:3996 elf32-score7.c:3803 elf32-vax.c:528 -#: elfxx-mips.c:12857 +#: elf32-arm.c:11782 elf32-bfin.c:5079 elf32-cris.c:4169 elf32-m68hc1x.c:1282 +#: elf32-m68k.c:1236 elf32-score.c:3994 elf32-score7.c:3800 elf32-vax.c:529 +#: elfxx-mips.c:14103 #, c-format msgid "private flags = %lx:" msgstr "私有标志 = %lx：" -#: elf32-arm.c:11737 +#: elf32-arm.c:11791 #, c-format msgid " [interworking enabled]" msgstr " [启用互操作]" -#: elf32-arm.c:11745 +#: elf32-arm.c:11799 #, c-format msgid " [VFP float format]" msgstr " [VFP 浮点格式]" -#: elf32-arm.c:11747 +#: elf32-arm.c:11801 #, c-format msgid " [Maverick float format]" msgstr " [Maverick 浮点格式]" -#: elf32-arm.c:11749 +#: elf32-arm.c:11803 #, c-format msgid " [FPA float format]" msgstr " [FPA 浮点格式]" -#: elf32-arm.c:11758 +#: elf32-arm.c:11812 #, c-format msgid " [new ABI]" msgstr " [新 ABI]" -#: elf32-arm.c:11761 +#: elf32-arm.c:11815 #, c-format msgid " [old ABI]" msgstr " [旧 ABI]" -#: elf32-arm.c:11764 +#: elf32-arm.c:11818 #, c-format msgid " [software FP]" msgstr " [软件 FP]" -#: elf32-arm.c:11773 +#: elf32-arm.c:11827 #, c-format msgid " [Version1 EABI]" msgstr " [版本1 EABI]" -#: elf32-arm.c:11776 elf32-arm.c:11787 +#: elf32-arm.c:11830 elf32-arm.c:11841 #, c-format msgid " [sorted symbol table]" msgstr " [排序过的符号表]" -#: elf32-arm.c:11778 elf32-arm.c:11789 +#: elf32-arm.c:11832 elf32-arm.c:11843 #, c-format msgid " [unsorted symbol table]" msgstr " [未排序的符号表]" -#: elf32-arm.c:11784 +#: elf32-arm.c:11838 #, c-format msgid " [Version2 EABI]" msgstr " [版本2 EABI]" -#: elf32-arm.c:11792 +#: elf32-arm.c:11846 #, c-format msgid " [dynamic symbols use segment index]" msgstr " [动态符号使用段索引]" -#: elf32-arm.c:11795 +#: elf32-arm.c:11849 #, c-format msgid " [mapping symbols precede others]" msgstr "" -#: elf32-arm.c:11802 +#: elf32-arm.c:11856 #, c-format msgid " [Version3 EABI]" msgstr " [Version3 EABI]" -#: elf32-arm.c:11806 +#: elf32-arm.c:11860 #, c-format msgid " [Version4 EABI]" msgstr " [Version4 EABI]" -#: elf32-arm.c:11810 +#: elf32-arm.c:11864 #, c-format msgid " [Version5 EABI]" msgstr " [Version5 EABI]" -#: elf32-arm.c:11813 +#: elf32-arm.c:11867 #, c-format msgid " [BE8]" msgstr " [BE8]" -#: elf32-arm.c:11816 +#: elf32-arm.c:11870 #, c-format msgid " [LE8]" msgstr " [LE8]" -#: elf32-arm.c:11822 +#: elf32-arm.c:11876 #, c-format msgid " " msgstr " <不可识别的 EABI 版本>" -#: elf32-arm.c:11829 +#: elf32-arm.c:11883 #, c-format msgid " [relocatable executable]" msgstr " [可重新定位的可执行程序]" -#: elf32-arm.c:11832 +#: elf32-arm.c:11886 #, c-format msgid " [has entry point]" msgstr " [含有入口点]" -#: elf32-arm.c:11837 +#: elf32-arm.c:11891 #, c-format msgid "" msgstr "<无法识别的标志位集合>" -#: elf32-arm.c:12135 elf32-i386.c:1323 elf32-s390.c:1000 elf32-tic6x.c:2827 -#: elf32-xtensa.c:1009 elf64-s390.c:960 elf64-x86-64.c:1172 elfxx-sparc.c:1370 +#: elf32-arm.c:12189 elf32-i386.c:1461 elf32-s390.c:1000 elf32-tic6x.c:2829 +#: elf32-tilepro.c:1336 elf32-xtensa.c:1009 elf64-s390.c:960 +#: elf64-x86-64.c:1364 elfxx-sparc.c:1371 elfxx-tilegx.c:1586 msgid "%B: bad symbol index: %d" msgstr "%B:错误的符号索引:%d" -#: elf32-arm.c:12283 elf64-x86-64.c:1370 elf64-x86-64.c:1541 elfxx-mips.c:7949 +#: elf32-arm.c:12337 elf64-x86-64.c:1561 elf64-x86-64.c:1732 elfxx-mips.c:8223 msgid "" "%B: relocation %s against `%s' can not be used when making a shared object; " "recompile with -fPIC" msgstr "" -#: elf32-arm.c:13412 +#: elf32-arm.c:13460 #, c-format msgid "Errors encountered processing file %s" msgstr "处理文件 %s 时遇到错误" -#: elf32-arm.c:14795 +#: elf32-arm.c:14837 msgid "%B: error: Cortex-A8 erratum stub is allocated in unsafe location" msgstr "" #. There's not much we can do apart from complain if this #. happens. -#: elf32-arm.c:14822 +#: elf32-arm.c:14864 msgid "%B: error: Cortex-A8 erratum stub out of range (input file too large)" msgstr "" -#: elf32-arm.c:14916 elf32-arm.c:14938 +#: elf32-arm.c:14958 elf32-arm.c:14980 msgid "%B: error: VFP11 veneer out of range" msgstr "%B: 错误: VFP11 veneer 超出界值" -#: elf32-arm.c:15477 +#: elf32-arm.c:15518 msgid "error: %B is already in final BE8 format" msgstr "" -#: elf32-arm.c:15553 +#: elf32-arm.c:15594 msgid "" "error: Source object %B has EABI version %d, but target %B has EABI version " "%d" msgstr "" -#: elf32-arm.c:15569 +#: elf32-arm.c:15610 msgid "error: %B is compiled for APCS-%d, whereas target %B uses APCS-%d" msgstr "" -#: elf32-arm.c:15594 +#: elf32-arm.c:15635 msgid "error: %B uses VFP instructions, whereas %B does not" msgstr "" -#: elf32-arm.c:15598 +#: elf32-arm.c:15639 msgid "error: %B uses FPA instructions, whereas %B does not" msgstr "" -#: elf32-arm.c:15608 +#: elf32-arm.c:15649 msgid "error: %B uses Maverick instructions, whereas %B does not" msgstr "" -#: elf32-arm.c:15612 +#: elf32-arm.c:15653 msgid "error: %B does not use Maverick instructions, whereas %B does" msgstr "" -#: elf32-arm.c:15631 +#: elf32-arm.c:15672 msgid "error: %B uses software FP, whereas %B uses hardware FP" msgstr "" -#: elf32-arm.c:15635 +#: elf32-arm.c:15676 msgid "error: %B uses hardware FP, whereas %B uses software FP" msgstr "" -#: elf32-avr.c:1229 elf32-bfin.c:3217 elf32-cris.c:2085 elf32-fr30.c:617 -#: elf32-frv.c:4110 elf32-i860.c:1219 elf32-ip2k.c:1479 elf32-iq2000.c:692 -#: elf32-m32c.c:561 elf32-mep.c:543 elf32-moxie.c:290 elf32-msp430.c:494 -#: elf32-mt.c:399 elf32-openrisc.c:412 elf32-v850.c:2151 elf32-xstormy16.c:949 -#: elf64-mmix.c:1530 +#: elf32-avr.c:1229 elf32-bfin.c:3221 elf32-cris.c:2089 elf32-epiphany.c:567 +#: elf32-fr30.c:617 elf32-frv.c:4113 elf32-i860.c:1219 elf32-ip2k.c:1479 +#: elf32-iq2000.c:692 elf32-m32c.c:561 elf32-mep.c:543 elf32-moxie.c:290 +#: elf32-msp430.c:494 elf32-mt.c:399 elf32-openrisc.c:412 elf32-tilepro.c:3222 +#: elf32-v850.c:2151 elf32-xstormy16.c:943 elf64-mmix.c:1598 +#: elfxx-tilegx.c:3585 msgid "internal error: dangerous relocation" msgstr "内部错误：危险的重定位" @@ -1316,126 +1323,126 @@ msgid "relocation should be even number" msgstr "" -#: elf32-bfin.c:1591 +#: elf32-bfin.c:1593 msgid "%B(%A+0x%lx): unresolvable relocation against symbol `%s'" msgstr "%B(%A+0x%lx): 无法解决与符号\"%s\" 相冲突的重定位" -#: elf32-bfin.c:1624 elf32-i386.c:4150 elf32-m68k.c:4233 elf32-s390.c:3062 -#: elf64-s390.c:3037 elf64-x86-64.c:3923 +#: elf32-bfin.c:1626 elf32-i386.c:4307 elf32-m68k.c:4233 elf32-s390.c:3055 +#: elf64-s390.c:3030 elf64-x86-64.c:4151 msgid "%B(%A+0x%lx): reloc against `%s': error %d" msgstr "%B(%A+0x%lx): 重定位与\"%s\"冲突:错误%d" -#: elf32-bfin.c:2723 +#: elf32-bfin.c:2725 msgid "" "%B: relocation at `%A+0x%x' references symbol `%s' with nonzero addend" msgstr "%B: 在\"%A+0x%x\"关联符号\"%s\"中进行带非零加数的重定位" -#: elf32-bfin.c:2737 +#: elf32-bfin.c:2741 msgid "relocation references symbol not defined in the module" msgstr "重定位关联符号还没有在模块中定义" -#: elf32-bfin.c:2834 +#: elf32-bfin.c:2838 msgid "R_BFIN_FUNCDESC references dynamic symbol with nonzero addend" msgstr "R_BFIN_FUNCDESC 与带有非零加数的动态符号相关联" -#: elf32-bfin.c:2875 elf32-bfin.c:2998 +#: elf32-bfin.c:2879 elf32-bfin.c:3002 msgid "cannot emit fixups in read-only section" msgstr "无法进行维修在只读磁区" -#: elf32-bfin.c:2906 elf32-bfin.c:3036 elf32-lm32.c:1103 elf32-sh.c:5021 +#: elf32-bfin.c:2910 elf32-bfin.c:3040 elf32-lm32.c:1103 elf32-sh.c:5016 msgid "cannot emit dynamic relocations in read-only section" msgstr "在只读部分无法进行动态重定位" -#: elf32-bfin.c:2956 +#: elf32-bfin.c:2960 msgid "R_BFIN_FUNCDESC_VALUE references dynamic symbol with nonzero addend" msgstr "R_BFIN_FUNCDESC_VALUE 与带有非零加数的动态符号相关联" -#: elf32-bfin.c:3121 +#: elf32-bfin.c:3125 msgid "relocations between different segments are not supported" msgstr "还没有支持在不同部分这间重定位" -#: elf32-bfin.c:3122 +#: elf32-bfin.c:3126 msgid "warning: relocation references a different segment" msgstr "警告:重定位关联了一个不同的部分" -#: elf32-bfin.c:4967 +#: elf32-bfin.c:4971 msgid "%B: unsupported relocation type %i" msgstr "%B:不支持的重定位类型 %i" -#: elf32-bfin.c:5121 elf32-frv.c:6805 +#: elf32-bfin.c:5125 elf32-frv.c:6808 #, c-format msgid "%s: cannot link non-fdpic object file into fdpic executable" msgstr "" -#: elf32-bfin.c:5125 elf32-frv.c:6809 +#: elf32-bfin.c:5129 elf32-frv.c:6812 #, c-format msgid "%s: cannot link fdpic object file into non-fdpic executable" msgstr "%s: 无法链接dfpic对象文件到可执行的非-dfpic 中" -#: elf32-bfin.c:5279 +#: elf32-bfin.c:5283 #, c-format msgid "*** check this relocation %s" msgstr "" -#: elf32-cris.c:1172 +#: elf32-cris.c:1176 msgid "%B, section %A: unresolvable relocation %s against symbol `%s'" msgstr "%B, %A段:无法解决重定位%s, 因为与符号\"%s\" 相冲突" -#: elf32-cris.c:1234 +#: elf32-cris.c:1238 msgid "%B, section %A: No PLT nor GOT for relocation %s against symbol `%s'" msgstr "%B, %A段:重定位%s没有PLT和GOT, 因为与符号\"%s\" 相冲突" -#: elf32-cris.c:1236 +#: elf32-cris.c:1240 msgid "%B, section %A: No PLT for relocation %s against symbol `%s'" msgstr "%B, %A段:重定位%s没有PLT, 因为与符号\"%s\" 相冲突" -#: elf32-cris.c:1242 elf32-cris.c:1375 elf32-cris.c:1635 elf32-cris.c:1718 -#: elf32-cris.c:1871 elf32-tic6x.c:2660 +#: elf32-cris.c:1246 elf32-cris.c:1379 elf32-cris.c:1639 elf32-cris.c:1722 +#: elf32-cris.c:1875 elf32-tic6x.c:2662 msgid "[whose name is lost]" msgstr "[某个名称丢失]" -#: elf32-cris.c:1361 elf32-tic6x.c:2645 +#: elf32-cris.c:1365 elf32-tic6x.c:2647 msgid "" "%B, section %A: relocation %s with non-zero addend %d against local symbol" msgstr "%B, %A段:重定位%s带有非零加数%d与局域符号\"%s\" 相冲突" -#: elf32-cris.c:1369 elf32-cris.c:1712 elf32-cris.c:1865 elf32-tic6x.c:2653 +#: elf32-cris.c:1373 elf32-cris.c:1716 elf32-cris.c:1869 elf32-tic6x.c:2655 msgid "" "%B, section %A: relocation %s with non-zero addend %d against symbol `%s'" msgstr "%B, %A段:重定位%s带的非零加数%d没与符号\"%s\" 相冲突" -#: elf32-cris.c:1395 +#: elf32-cris.c:1399 msgid "%B, section %A: relocation %s is not allowed for global symbol: `%s'" msgstr "%B, %A段:重定位%s不允许全局符号\"%s\" 使用" -#: elf32-cris.c:1411 +#: elf32-cris.c:1415 msgid "%B, section %A: relocation %s with no GOT created" msgstr "%B, %A段:重定位%s中没有GOT" #. We shouldn't get here for GCC-emitted code. -#: elf32-cris.c:1626 +#: elf32-cris.c:1630 msgid "" "%B, section %A: relocation %s has an undefined reference to `%s', perhaps a " "declaration mixup?" msgstr "" -#: elf32-cris.c:1998 +#: elf32-cris.c:2002 msgid "" "%B, section %A: relocation %s is not allowed for symbol: `%s' which is " "defined outside the program, perhaps a declaration mixup?" msgstr "" -#: elf32-cris.c:2051 +#: elf32-cris.c:2055 msgid "(too many global variables for -fpic: recompile with -fPIC)" msgstr "" -#: elf32-cris.c:2058 +#: elf32-cris.c:2062 msgid "" "(thread-local data too big for -fpic or -msmall-tls: recompile with -fPIC or " "-mno-small-tls)" msgstr "" -#: elf32-cris.c:3248 +#: elf32-cris.c:3261 msgid "" "%B, section %A:\n" " v10/v32 compatible object %s must not contain a PIC relocation" @@ -1443,14 +1450,14 @@ "%B, %A段: \n" " 与v10/v32 相容对象%s 一定不能包含PIC重定位" -#: elf32-cris.c:3353 +#: elf32-cris.c:3366 msgid "" "%B, section %A:\n" " relocation %s not valid in a shared object; typically an option mixup, " "recompile with -fPIC" msgstr "" -#: elf32-cris.c:3567 +#: elf32-cris.c:3580 msgid "" "%B, section %A:\n" " relocation %s should not be used in a shared object; recompile with -fPIC" @@ -1458,46 +1465,46 @@ "%B, %A段: \n" " 重定位%s不能用在共享对象中；请带参数 -fPIC 重新编译" -#: elf32-cris.c:3992 +#: elf32-cris.c:4002 msgid "" "%B, section `%A', to symbol `%s':\n" " relocation %s should not be used in a shared object; recompile with -fPIC" msgstr "" -#: elf32-cris.c:4111 +#: elf32-cris.c:4118 msgid "Unexpected machine number" msgstr "未知机器数码" -#: elf32-cris.c:4165 +#: elf32-cris.c:4172 #, c-format msgid " [symbols have a _ prefix]" msgstr " [符号有个 _ 前缀]" -#: elf32-cris.c:4168 +#: elf32-cris.c:4175 #, c-format msgid " [v10 and v32]" msgstr " [v10 和 v32]" -#: elf32-cris.c:4171 +#: elf32-cris.c:4178 #, c-format msgid " [v32]" msgstr " [v32]" -#: elf32-cris.c:4216 +#: elf32-cris.c:4223 msgid "" "%B: uses _-prefixed symbols, but writing file with non-prefixed symbols" msgstr "%B:使用_-前缀符号,但是正在写入的文件没有前缀符号" -#: elf32-cris.c:4217 +#: elf32-cris.c:4224 msgid "" "%B: uses non-prefixed symbols, but writing file with _-prefixed symbols" msgstr "%B:使用非前缀符号, 但是正在写入的文件带有_前缀符号" -#: elf32-cris.c:4236 +#: elf32-cris.c:4243 msgid "%B contains CRIS v32 code, incompatible with previous objects" msgstr "%B 含有CRIS v32代码,无法带先前对象编译" -#: elf32-cris.c:4238 +#: elf32-cris.c:4245 msgid "%B contains non-CRIS-v32 code, incompatible with previous objects" msgstr "%B 含有非CRIS v32代码,无法带先前对象编译" @@ -1519,107 +1526,107 @@ msgid "%H: relocation to `%s+%v' may have caused the error above\n" msgstr "" -#: elf32-frv.c:2902 +#: elf32-frv.c:2905 msgid "%H: relocation references symbol not defined in the module\n" msgstr "" -#: elf32-frv.c:2978 +#: elf32-frv.c:2981 msgid "%H: R_FRV_GETTLSOFF not applied to a call instruction\n" msgstr "" -#: elf32-frv.c:3019 +#: elf32-frv.c:3022 msgid "%H: R_FRV_GOTTLSDESC12 not applied to an lddi instruction\n" msgstr "" -#: elf32-frv.c:3090 +#: elf32-frv.c:3093 msgid "%H: R_FRV_GOTTLSDESCHI not applied to a sethi instruction\n" msgstr "" -#: elf32-frv.c:3127 +#: elf32-frv.c:3130 msgid "%H: R_FRV_GOTTLSDESCLO not applied to a setlo or setlos instruction\n" msgstr "" -#: elf32-frv.c:3174 +#: elf32-frv.c:3177 msgid "%H: R_FRV_TLSDESC_RELAX not applied to an ldd instruction\n" msgstr "" -#: elf32-frv.c:3258 +#: elf32-frv.c:3261 msgid "%H: R_FRV_GETTLSOFF_RELAX not applied to a calll instruction\n" msgstr "" -#: elf32-frv.c:3312 +#: elf32-frv.c:3315 msgid "%H: R_FRV_GOTTLSOFF12 not applied to an ldi instruction\n" msgstr "" -#: elf32-frv.c:3342 +#: elf32-frv.c:3345 msgid "%H: R_FRV_GOTTLSOFFHI not applied to a sethi instruction\n" msgstr "" -#: elf32-frv.c:3371 +#: elf32-frv.c:3374 msgid "%H: R_FRV_GOTTLSOFFLO not applied to a setlo or setlos instruction\n" msgstr "" -#: elf32-frv.c:3401 +#: elf32-frv.c:3404 msgid "%H: R_FRV_TLSOFF_RELAX not applied to an ld instruction\n" msgstr "" -#: elf32-frv.c:3446 +#: elf32-frv.c:3449 msgid "%H: R_FRV_TLSMOFFHI not applied to a sethi instruction\n" msgstr "" -#: elf32-frv.c:3473 +#: elf32-frv.c:3476 msgid "R_FRV_TLSMOFFLO not applied to a setlo or setlos instruction\n" msgstr "" -#: elf32-frv.c:3594 +#: elf32-frv.c:3597 msgid "%H: R_FRV_FUNCDESC references dynamic symbol with nonzero addend\n" msgstr "" -#: elf32-frv.c:3635 elf32-frv.c:3757 +#: elf32-frv.c:3638 elf32-frv.c:3760 msgid "%H: cannot emit fixups in read-only section\n" msgstr "" -#: elf32-frv.c:3666 elf32-frv.c:3800 +#: elf32-frv.c:3669 elf32-frv.c:3803 msgid "%H: cannot emit dynamic relocations in read-only section\n" msgstr "" -#: elf32-frv.c:3715 +#: elf32-frv.c:3718 msgid "" "%H: R_FRV_FUNCDESC_VALUE references dynamic symbol with nonzero addend\n" msgstr "" -#: elf32-frv.c:3971 +#: elf32-frv.c:3974 msgid "%H: reloc against `%s' references a different segment\n" msgstr "" -#: elf32-frv.c:4121 +#: elf32-frv.c:4124 msgid "%H: reloc against `%s': %s\n" msgstr "" -#: elf32-frv.c:6397 +#: elf32-frv.c:6400 msgid "%B: unsupported relocation type %i\n" msgstr "" -#: elf32-frv.c:6719 +#: elf32-frv.c:6722 #, c-format msgid "" "%s: compiled with %s and linked with modules that use non-pic relocations" msgstr "%s: 与%s编译并链接到使用non-pic重定位的模块中" -#: elf32-frv.c:6772 elf32-iq2000.c:845 elf32-m32c.c:807 +#: elf32-frv.c:6775 elf32-iq2000.c:845 elf32-m32c.c:807 #, c-format msgid "%s: compiled with %s and linked with modules compiled with %s" msgstr "%s：以 %s 编译并同以 %s 编译的模块连接" -#: elf32-frv.c:6784 +#: elf32-frv.c:6787 #, c-format msgid "" "%s: uses different unknown e_flags (0x%lx) fields than previous modules " "(0x%lx)" msgstr "%s: 使用未知 e_flags(0x%lx)域,与先前模块(0x%lx)不同" -#: elf32-frv.c:6834 elf32-iq2000.c:882 elf32-m32c.c:843 elf32-mt.c:576 -#: elf32-rx.c:2937 +#: elf32-frv.c:6837 elf32-iq2000.c:882 elf32-m32c.c:843 elf32-mt.c:576 +#: elf32-rx.c:3001 #, c-format msgid "private flags = 0x%lx:" msgstr "私有标志 = 0x%lx：" @@ -1628,7 +1635,7 @@ msgid "%B: Relocations in generic ELF (EM: %d)" msgstr "%B：普通ELF重定位（M: %d）" -#: elf32-hppa.c:850 elf32-hppa.c:3610 +#: elf32-hppa.c:850 elf32-hppa.c:3598 msgid "%B(%A+0x%lx): cannot reach %s, recompile with -ffunction-sections" msgstr "%B（%A+0x%lx）：无法达到 %s, 用 -ffunction-sections 重新编译" @@ -1638,86 +1645,88 @@ "with -fPIC" msgstr "" -#: elf32-hppa.c:2803 +#: elf32-hppa.c:2791 msgid "%B: duplicate export stub %s" msgstr "" -#: elf32-hppa.c:3449 +#: elf32-hppa.c:3437 msgid "" "%B(%A+0x%lx): %s fixup for insn 0x%x is not supported in a non-shared link" msgstr "" -#: elf32-hppa.c:4296 +#: elf32-hppa.c:4284 msgid "%B(%A+0x%lx): cannot handle %s for %s" msgstr "" -#: elf32-hppa.c:4608 +#: elf32-hppa.c:4603 msgid ".got section not immediately after .plt section" msgstr ".got 节不能紧接在 .plt 节之后" #. Unknown relocation. -#: elf32-i386.c:372 elf32-m68k.c:383 elf32-ppc.c:1675 elf32-s390.c:379 -#: elf32-tic6x.c:2682 elf64-ppc.c:2285 elf64-s390.c:403 elf64-x86-64.c:243 +#: elf32-i386.c:373 elf32-m68k.c:384 elf32-ppc.c:1676 elf32-s390.c:379 +#: elf32-tic6x.c:2684 elf64-ppc.c:2300 elf64-s390.c:403 elf64-x86-64.c:265 msgid "%B: invalid relocation type %d" msgstr "%B：无效的重定位类型 %d" -#: elf32-i386.c:1266 elf64-x86-64.c:1116 +#: elf32-i386.c:1404 elf64-x86-64.c:1308 msgid "" "%B: TLS transition from %s to %s against `%s' at 0x%lx in section `%A' failed" msgstr "" -#: elf32-i386.c:1411 elf32-i386.c:3090 elf64-x86-64.c:1296 elf64-x86-64.c:2909 -#: elfxx-sparc.c:3077 +#: elf32-i386.c:1549 elf32-i386.c:3244 elf64-x86-64.c:1487 elf64-x86-64.c:3125 +#: elfxx-sparc.c:3083 msgid "" "%B: relocation %s against STT_GNU_IFUNC symbol `%s' isn't handled by %s" msgstr "" -#: elf32-i386.c:1573 elf32-s390.c:1182 elf32-sh.c:6367 elf32-xtensa.c:1182 -#: elf64-s390.c:1151 elfxx-sparc.c:1547 +#: elf32-i386.c:1711 elf32-s390.c:1182 elf32-sh.c:6362 elf32-tilepro.c:1434 +#: elf32-xtensa.c:1182 elf64-s390.c:1151 elfxx-sparc.c:1548 +#: elfxx-tilegx.c:1701 msgid "%B: `%s' accessed both as normal and thread local symbol" msgstr "" -#: elf32-i386.c:2405 elf64-x86-64.c:2320 +#: elf32-i386.c:2539 elf64-x86-64.c:2506 msgid "%P: %B: warning: relocation against `%s' in readonly section `%A'.\n" msgstr "" -#: elf32-i386.c:2496 elf64-x86-64.c:2407 +#: elf32-i386.c:2629 elf64-x86-64.c:2593 msgid "%P: %B: warning: relocation in readonly section `%A'.\n" msgstr "" -#: elf32-i386.c:2932 +#: elf32-i386.c:3086 elf32-tilepro.c:2557 elfxx-tilegx.c:2871 msgid "%B: unrecognized relocation (0x%x) in section `%A'" msgstr "%B: 未识别的重定向 (0x%x)，位于 `%A' 区" -#: elf32-i386.c:3339 elf64-x86-64.c:3295 +#: elf32-i386.c:3494 elf64-x86-64.c:3513 msgid "hidden symbol" msgstr "隐藏符号" -#: elf32-i386.c:3342 elf64-x86-64.c:3298 +#: elf32-i386.c:3497 elf64-x86-64.c:3516 msgid "internal symbol" msgstr "内部符号" -#: elf32-i386.c:3345 elf64-x86-64.c:3301 +#: elf32-i386.c:3500 elf64-x86-64.c:3519 msgid "protected symbol" msgstr "受保护符号" -#: elf32-i386.c:3348 elf64-x86-64.c:3304 +#: elf32-i386.c:3503 elf64-x86-64.c:3522 msgid "symbol" msgstr "符号" -#: elf32-i386.c:3353 +#: elf32-i386.c:3508 msgid "" "%B: relocation R_386_GOTOFF against undefined %s `%s' can not be used when " "making a shared object" msgstr "" -#: elf32-i386.c:3363 +#: elf32-i386.c:3518 msgid "" "%B: relocation R_386_GOTOFF against protected function `%s' can not be used " "when making a shared object" msgstr "" -#: elf32-i386.c:4660 elf64-x86-64.c:4378 +#: elf32-i386.c:4839 elf32-tilepro.c:3467 elf64-x86-64.c:4609 +#: elfxx-tilegx.c:3847 #, c-format msgid "discarded output section: `%A'" msgstr "" @@ -1742,7 +1751,7 @@ msgstr "ip2k linker: 不必要的页指令于 0x%08lx (dest = 0x%08lx)。" #. Only if it's not an unresolved symbol. -#: elf32-ip2k.c:1475 +#: elf32-epiphany.c:563 elf32-ip2k.c:1475 msgid "unsupported relocation between data/insn address spaces" msgstr "于数据和指令地址空间的无效重定位" @@ -1768,30 +1777,30 @@ msgid "SDA relocation when _SDA_BASE_ not defined" msgstr "在 _SDA_BASE_ 未定义时出现 SDA 重定位" -#: elf32-m32r.c:3048 +#: elf32-m32r.c:3043 msgid "%B: The target (%s) of an %s relocation is in the wrong section (%A)" msgstr "" -#: elf32-m32r.c:3576 +#: elf32-m32r.c:3571 msgid "%B: Instruction set mismatch with previous modules" msgstr "%B: 当前指令集与之前的不匹配" -#: elf32-m32r.c:3597 +#: elf32-m32r.c:3592 #, c-format msgid "private flags = %lx" msgstr "私有标志 = %lx" -#: elf32-m32r.c:3602 +#: elf32-m32r.c:3597 #, c-format msgid ": m32r instructions" msgstr "：m32r 指令" -#: elf32-m32r.c:3603 +#: elf32-m32r.c:3598 #, c-format msgid ": m32rx instructions" msgstr "：m32rx 指令" -#: elf32-m32r.c:3604 +#: elf32-m32r.c:3599 #, c-format msgid ": m32r2 instructions" msgstr "：m32r2 指令" @@ -1833,7 +1842,7 @@ msgid "%B: linking files compiled for HCS12 with others compiled for HC12" msgstr "" -#: elf32-m68hc1x.c:1257 elf32-ppc.c:4214 elf64-sparc.c:705 elfxx-mips.c:12719 +#: elf32-m68hc1x.c:1257 elf32-ppc.c:4227 elf64-sparc.c:706 elfxx-mips.c:13965 msgid "" "%B: uses different e_flags (0x%lx) fields than previous modules (0x%lx)" msgstr "" @@ -1883,19 +1892,19 @@ msgid " [memory=flat]" msgstr " [memory=flat]" -#: elf32-m68k.c:1250 elf32-m68k.c:1251 vms-alpha.c:7311 vms-alpha.c:7326 +#: elf32-m68k.c:1251 elf32-m68k.c:1252 vms-alpha.c:7314 vms-alpha.c:7329 msgid "unknown" msgstr "未知" -#: elf32-m68k.c:1714 +#: elf32-m68k.c:1715 msgid "%B: GOT overflow: Number of relocations with 8-bit offset > %d" msgstr "" -#: elf32-m68k.c:1720 +#: elf32-m68k.c:1721 msgid "%B: GOT overflow: Number of relocations with 8- or 16-bit offset > %d" msgstr "" -#: elf32-m68k.c:3959 +#: elf32-m68k.c:3957 msgid "" "%B(%A+0x%lx): R_68K_TLS_LE32 relocation not permitted in shared object" msgstr "" @@ -1942,7 +1951,8 @@ msgid "%s: The target (%s) of an %s relocation is in the wrong section (%s)" msgstr "" -#: elf32-microblaze.c:1155 elfxx-sparc.c:3451 +#: elf32-microblaze.c:1155 elf32-tilepro.c:2891 elfxx-sparc.c:3457 +#: elfxx-tilegx.c:3230 msgid "%B: probably compiled without -fPIC?" msgstr "" @@ -1950,45 +1960,45 @@ msgid "%B: bad relocation section name `%s'" msgstr "%B:坏重定向名 `%s'" -#: elf32-mips.c:1045 elf64-mips.c:2084 elfn32-mips.c:1888 +#: elf32-mips.c:1549 elf64-mips.c:2683 elfn32-mips.c:2487 msgid "literal relocation occurs for an external symbol" msgstr "" -#: elf32-mips.c:1085 elf32-score.c:569 elf32-score7.c:469 elf64-mips.c:2127 -#: elfn32-mips.c:1929 +#: elf32-mips.c:1596 elf32-score.c:570 elf32-score7.c:469 elf64-mips.c:2726 +#: elfn32-mips.c:2528 msgid "32bits gp relative relocation occurs for an external symbol" msgstr "" -#: elf32-ppc.c:1740 +#: elf32-ppc.c:1741 #, c-format msgid "generic linker can't handle %s" msgstr "" -#: elf32-ppc.c:2183 +#: elf32-ppc.c:2184 msgid "corrupt %s section in %B" msgstr "" -#: elf32-ppc.c:2202 +#: elf32-ppc.c:2203 msgid "unable to read in %s section from %B" msgstr "" -#: elf32-ppc.c:2243 +#: elf32-ppc.c:2244 msgid "warning: unable to set size of %s section in %B" msgstr "" -#: elf32-ppc.c:2293 +#: elf32-ppc.c:2294 msgid "failed to allocate space for new APUinfo section." msgstr "" -#: elf32-ppc.c:2312 +#: elf32-ppc.c:2313 msgid "failed to compute new APUinfo section." msgstr "" -#: elf32-ppc.c:2315 +#: elf32-ppc.c:2316 msgid "failed to install new APUinfo section." msgstr "" -#: elf32-ppc.c:3343 +#: elf32-ppc.c:3356 msgid "%B: relocation %s cannot be used when making a shared object" msgstr "" @@ -1998,47 +2008,47 @@ msgid "%H: %s reloc against local symbol\n" msgstr "" -#: elf32-ppc.c:4026 elf32-ppc.c:4041 elfxx-mips.c:12423 elfxx-mips.c:12449 -#: elfxx-mips.c:12471 elfxx-mips.c:12497 +#: elf32-ppc.c:4039 elf32-ppc.c:4054 elfxx-mips.c:13651 elfxx-mips.c:13677 +#: elfxx-mips.c:13699 elfxx-mips.c:13725 msgid "Warning: %B uses hard float, %B uses soft float" msgstr "" -#: elf32-ppc.c:4029 elf32-ppc.c:4033 +#: elf32-ppc.c:4042 elf32-ppc.c:4046 msgid "" "Warning: %B uses double-precision hard float, %B uses single-precision hard " "float" msgstr "" -#: elf32-ppc.c:4037 +#: elf32-ppc.c:4050 msgid "Warning: %B uses soft float, %B uses single-precision hard float" msgstr "" -#: elf32-ppc.c:4044 elf32-ppc.c:4048 elfxx-mips.c:12403 elfxx-mips.c:12407 +#: elf32-ppc.c:4057 elf32-ppc.c:4061 elfxx-mips.c:13631 elfxx-mips.c:13635 msgid "Warning: %B uses unknown floating point ABI %d" msgstr "" -#: elf32-ppc.c:4090 elf32-ppc.c:4094 +#: elf32-ppc.c:4103 elf32-ppc.c:4107 msgid "Warning: %B uses unknown vector ABI %d" msgstr "" -#: elf32-ppc.c:4098 +#: elf32-ppc.c:4111 msgid "Warning: %B uses vector ABI \"%s\", %B uses \"%s\"" msgstr "" -#: elf32-ppc.c:4115 elf32-ppc.c:4118 +#: elf32-ppc.c:4128 elf32-ppc.c:4131 msgid "Warning: %B uses r3/r4 for small structure returns, %B uses memory" msgstr "" -#: elf32-ppc.c:4121 elf32-ppc.c:4125 +#: elf32-ppc.c:4134 elf32-ppc.c:4138 msgid "Warning: %B uses unknown small structure return convention %d" msgstr "" -#: elf32-ppc.c:4179 +#: elf32-ppc.c:4192 msgid "" "%B: compiled with -mrelocatable and linked with modules compiled normally" msgstr "" -#: elf32-ppc.c:4187 +#: elf32-ppc.c:4200 msgid "" "%B: compiled normally and linked with modules compiled with -mrelocatable" msgstr "" @@ -2051,7 +2061,7 @@ #. could just mark this symbol to exclude it #. from tls optimization but it's safer to skip #. the entire optimization. -#: elf32-ppc.c:4771 elf64-ppc.c:7778 +#: elf32-ppc.c:4809 elf64-ppc.c:7858 msgid "%H arg lost __tls_get_addr, TLS optimization disabled\n" msgstr "" @@ -2094,81 +2104,81 @@ msgid "%s not defined in linker created %s\n" msgstr "" -#: elf32-rx.c:553 +#: elf32-rx.c:563 msgid "%B:%A: Warning: deprecated Red Hat reloc " msgstr "" -#: elf32-rx.c:1095 +#: elf32-rx.c:1157 msgid "Warning: RX_SYM reloc with an unknown symbol" msgstr "" -#: elf32-rx.c:1260 +#: elf32-rx.c:1324 msgid "%B(%A): error: call to undefined function '%s'" msgstr "" -#: elf32-rx.c:1274 +#: elf32-rx.c:1338 msgid "" "%B(%A): warning: unaligned access to symbol '%s' in the small data area" msgstr "" -#: elf32-rx.c:1278 +#: elf32-rx.c:1342 msgid "%B(%A): internal error: out of range error" msgstr "" -#: elf32-rx.c:1282 +#: elf32-rx.c:1346 msgid "%B(%A): internal error: unsupported relocation error" msgstr "" -#: elf32-rx.c:1286 +#: elf32-rx.c:1350 msgid "%B(%A): internal error: dangerous relocation" msgstr "" -#: elf32-rx.c:1290 +#: elf32-rx.c:1354 msgid "%B(%A): internal error: unknown error" msgstr "" -#: elf32-rx.c:2940 +#: elf32-rx.c:3004 #, c-format msgid " [64-bit doubles]" msgstr "" -#: elf32-rx.c:2942 +#: elf32-rx.c:3006 #, c-format msgid " [dsp]" msgstr "" -#: elf32-s390.c:2209 elf64-s390.c:2196 +#: elf32-s390.c:2200 elf64-s390.c:2187 msgid "%B(%A+0x%lx): invalid instruction for TLS relocation %s" msgstr "" -#: elf32-score.c:1522 elf32-score7.c:1382 elfxx-mips.c:3324 +#: elf32-score.c:1520 elf32-score7.c:1379 elfxx-mips.c:3435 msgid "not enough GOT space for local GOT entries" msgstr "没有足够的 GOT 空间用于 GOT 条目" -#: elf32-score.c:2744 +#: elf32-score.c:2742 msgid "address not word align" msgstr "" -#: elf32-score.c:2829 elf32-score7.c:2634 +#: elf32-score.c:2827 elf32-score7.c:2631 #, c-format msgid "%s: Malformed reloc detected for section %s" msgstr "" -#: elf32-score.c:2880 elf32-score7.c:2685 +#: elf32-score.c:2878 elf32-score7.c:2682 msgid "%B: CALL15 reloc at 0x%lx not against global symbol" msgstr "" -#: elf32-score.c:3999 elf32-score7.c:3806 +#: elf32-score.c:3997 elf32-score7.c:3803 #, c-format msgid " [pic]" msgstr "" -#: elf32-score.c:4003 elf32-score7.c:3810 +#: elf32-score.c:4001 elf32-score7.c:3807 #, c-format msgid " [fix dep]" msgstr "" -#: elf32-score.c:4045 elf32-score7.c:3852 +#: elf32-score.c:4043 elf32-score7.c:3849 msgid "%B: warning: linking PIC files with non-PIC files" msgstr "" @@ -2216,77 +2226,77 @@ msgid "%B: 0x%lx: fatal: reloc overflow while relaxing" msgstr "" -#: elf32-sh.c:4057 elf64-sh64.c:1514 +#: elf32-sh.c:4048 elf64-sh64.c:1514 msgid "Unexpected STO_SH5_ISA32 on local symbol is not handled" msgstr "" -#: elf32-sh.c:4304 +#: elf32-sh.c:4299 msgid "" "%B: 0x%lx: fatal: unaligned branch target for relax-support relocation" msgstr "" -#: elf32-sh.c:4337 elf32-sh.c:4352 +#: elf32-sh.c:4332 elf32-sh.c:4347 msgid "%B: 0x%lx: fatal: unaligned %s relocation 0x%lx" msgstr "" -#: elf32-sh.c:4366 +#: elf32-sh.c:4361 msgid "%B: 0x%lx: fatal: R_SH_PSHA relocation %d not in range -32..32" msgstr "" -#: elf32-sh.c:4380 +#: elf32-sh.c:4375 msgid "%B: 0x%lx: fatal: R_SH_PSHL relocation %d not in range -32..32" msgstr "" -#: elf32-sh.c:4524 elf32-sh.c:4994 +#: elf32-sh.c:4519 elf32-sh.c:4989 msgid "%B(%A+0x%lx): cannot emit fixup to `%s' in read-only section" msgstr "" -#: elf32-sh.c:5101 +#: elf32-sh.c:5096 msgid "%B(%A+0x%lx): %s relocation against external symbol \"%s\"" msgstr "" -#: elf32-sh.c:5574 +#: elf32-sh.c:5569 #, c-format msgid "%X%C: relocation to \"%s\" references a different segment\n" msgstr "" -#: elf32-sh.c:5580 +#: elf32-sh.c:5575 #, c-format msgid "%C: warning: relocation to \"%s\" references a different segment\n" msgstr "" -#: elf32-sh.c:6358 elf32-sh.c:6441 +#: elf32-sh.c:6353 elf32-sh.c:6436 msgid "%B: `%s' accessed both as normal and FDPIC symbol" msgstr "" -#: elf32-sh.c:6363 elf32-sh.c:6445 +#: elf32-sh.c:6358 elf32-sh.c:6440 msgid "%B: `%s' accessed both as FDPIC and thread local symbol" msgstr "" -#: elf32-sh.c:6393 +#: elf32-sh.c:6388 msgid "%B: Function descriptor relocation with non-zero addend" msgstr "" -#: elf32-sh.c:6629 elf64-alpha.c:4648 +#: elf32-sh.c:6624 elf64-alpha.c:4652 msgid "%B: TLS local exec code cannot be linked into shared objects" msgstr "" -#: elf32-sh64.c:223 elf64-sh64.c:2314 +#: elf32-sh64.c:223 elf64-sh64.c:2318 #, c-format msgid "%s: compiled as 32-bit object and %s is 64-bit" msgstr "%s：编译为 32-位目标文件但 %s 是 64-位的" -#: elf32-sh64.c:226 elf64-sh64.c:2317 +#: elf32-sh64.c:226 elf64-sh64.c:2321 #, c-format msgid "%s: compiled as 64-bit object and %s is 32-bit" msgstr "%s：编译为 64-位目标文件但 %s 是 32-位的" -#: elf32-sh64.c:228 elf64-sh64.c:2319 +#: elf32-sh64.c:228 elf64-sh64.c:2323 #, c-format msgid "%s: object size does not match that of target %s" msgstr "%s：目标文件大小和目标 %s 不匹配" -#: elf32-sh64.c:451 elf64-sh64.c:2833 +#: elf32-sh64.c:451 elf64-sh64.c:2837 #, c-format msgid "%s: encountered datalabel symbol in input" msgstr "%s：在输入中遇到数据标签符号" @@ -2318,11 +2328,11 @@ msgid "%s: could not write out sorted .cranges entries" msgstr "%s：无法写出经排序的 .cranges 条目" -#: elf32-sparc.c:89 +#: elf32-sparc.c:90 msgid "%B: compiled for a 64 bit system and target is 32 bit" msgstr "" -#: elf32-sparc.c:102 +#: elf32-sparc.c:103 msgid "%B: linking little endian files with big endian files" msgstr "" @@ -2454,7 +2464,7 @@ msgid "fatal error while creating .fixup" msgstr "" -#: elf32-spu.c:5006 +#: elf32-spu.c:5008 msgid "%B(%s+0x%lx): unresolvable %s relocation against symbol `%s'" msgstr "" @@ -2466,43 +2476,43 @@ msgid "warning: generating a shared library containing non-PID code" msgstr "" -#: elf32-tic6x.c:2539 +#: elf32-tic6x.c:2541 msgid "%B: SB-relative relocation but __c6xabi_DSBT_BASE not defined" msgstr "" -#: elf32-tic6x.c:2759 +#: elf32-tic6x.c:2761 msgid "dangerous relocation" msgstr "" -#: elf32-tic6x.c:3740 +#: elf32-tic6x.c:3733 msgid "%B: error: unknown mandatory EABI object attribute %d" msgstr "" -#: elf32-tic6x.c:3748 +#: elf32-tic6x.c:3741 msgid "%B: warning: unknown EABI object attribute %d" msgstr "" -#: elf32-tic6x.c:3860 elf32-tic6x.c:3868 +#: elf32-tic6x.c:3853 elf32-tic6x.c:3861 msgid "error: %B requires more stack alignment than %B preserves" msgstr "" -#: elf32-tic6x.c:3878 elf32-tic6x.c:3887 +#: elf32-tic6x.c:3871 elf32-tic6x.c:3880 msgid "error: unknown Tag_ABI_array_object_alignment value in %B" msgstr "" -#: elf32-tic6x.c:3896 elf32-tic6x.c:3905 +#: elf32-tic6x.c:3889 elf32-tic6x.c:3898 msgid "error: unknown Tag_ABI_array_object_align_expected value in %B" msgstr "" -#: elf32-tic6x.c:3913 elf32-tic6x.c:3920 +#: elf32-tic6x.c:3906 elf32-tic6x.c:3913 msgid "error: %B requires more array alignment than %B preserves" msgstr "" -#: elf32-tic6x.c:3942 +#: elf32-tic6x.c:3935 msgid "warning: %B and %B differ in wchar_t size" msgstr "" -#: elf32-tic6x.c:3960 +#: elf32-tic6x.c:3953 msgid "warning: %B and %B differ in whether code is compiled for DSBT" msgstr "" @@ -2586,44 +2596,44 @@ msgid "v850e2v3 architecture" msgstr "" -#: elf32-vax.c:531 +#: elf32-vax.c:532 #, c-format msgid " [nonpic]" msgstr "" -#: elf32-vax.c:534 +#: elf32-vax.c:535 #, c-format msgid " [d-float]" msgstr "" -#: elf32-vax.c:537 +#: elf32-vax.c:538 #, c-format msgid " [g-float]" msgstr "" -#: elf32-vax.c:654 +#: elf32-vax.c:655 #, c-format msgid "" "%s: warning: GOT addend of %ld to `%s' does not match previous GOT addend of " "%ld" msgstr "" -#: elf32-vax.c:1587 +#: elf32-vax.c:1585 #, c-format msgid "%s: warning: PLT addend of %d to `%s' from %s section ignored" msgstr "" -#: elf32-vax.c:1714 +#: elf32-vax.c:1712 #, c-format msgid "%s: warning: %s relocation against symbol `%s' from %s section" msgstr "" -#: elf32-vax.c:1720 +#: elf32-vax.c:1718 #, c-format msgid "%s: warning: %s relocation to 0x%x from %s section" msgstr "" -#: elf32-xstormy16.c:451 elf32-ia64.c:2342 elf64-ia64.c:2342 +#: elf32-xstormy16.c:451 elf32-ia64.c:2336 elf64-ia64.c:2336 msgid "non-zero addend in @fptr reloc" msgstr "" @@ -2631,50 +2641,50 @@ msgid "%B(%A): invalid property table" msgstr "" -#: elf32-xtensa.c:2780 +#: elf32-xtensa.c:2777 msgid "%B(%A+0x%lx): relocation offset out of range (size=0x%x)" msgstr "" -#: elf32-xtensa.c:2859 elf32-xtensa.c:2980 +#: elf32-xtensa.c:2856 elf32-xtensa.c:2977 msgid "dynamic relocation in read-only section" msgstr "" -#: elf32-xtensa.c:2956 +#: elf32-xtensa.c:2953 msgid "TLS relocation invalid without dynamic sections" msgstr "" -#: elf32-xtensa.c:3173 +#: elf32-xtensa.c:3172 msgid "internal inconsistency in size of .got.loc section" msgstr "" -#: elf32-xtensa.c:3486 +#: elf32-xtensa.c:3485 msgid "%B: incompatible machine type. Output is 0x%x. Input is 0x%x" msgstr "" -#: elf32-xtensa.c:4715 elf32-xtensa.c:4723 +#: elf32-xtensa.c:4714 elf32-xtensa.c:4722 msgid "Attempt to convert L32R/CALLX to CALL failed" msgstr "" -#: elf32-xtensa.c:6333 elf32-xtensa.c:6409 elf32-xtensa.c:7525 +#: elf32-xtensa.c:6332 elf32-xtensa.c:6408 elf32-xtensa.c:7524 msgid "" "%B(%A+0x%lx): could not decode instruction; possible configuration mismatch" msgstr "" -#: elf32-xtensa.c:7265 +#: elf32-xtensa.c:7264 msgid "" "%B(%A+0x%lx): could not decode instruction for XTENSA_ASM_SIMPLIFY " "relocation; possible configuration mismatch" msgstr "" -#: elf32-xtensa.c:9024 +#: elf32-xtensa.c:9023 msgid "invalid relocation address" msgstr "" -#: elf32-xtensa.c:9073 +#: elf32-xtensa.c:9072 msgid "overflow after relaxation" msgstr "" -#: elf32-xtensa.c:10205 +#: elf32-xtensa.c:10204 msgid "%B(%A+0x%lx): unexpected fix for %s relocation" msgstr "" @@ -2682,27 +2692,27 @@ msgid "GPDISP relocation did not find ldah and lda instructions" msgstr "GPDISP 重定位无法找到 ldah 和 lda 指令" -#: elf64-alpha.c:2495 +#: elf64-alpha.c:2497 msgid "%B: .got subsegment exceeds 64K (size %d)" msgstr "" -#: elf64-alpha.c:4392 elf64-alpha.c:4404 +#: elf64-alpha.c:4387 elf64-alpha.c:4399 msgid "%B: gp-relative relocation against dynamic symbol %s" msgstr "" -#: elf64-alpha.c:4430 elf64-alpha.c:4565 +#: elf64-alpha.c:4425 elf64-alpha.c:4565 msgid "%B: pc-relative relocation against dynamic symbol %s" msgstr "" -#: elf64-alpha.c:4458 +#: elf64-alpha.c:4453 msgid "%B: change in gp: BRSGP %s" msgstr "" -#: elf64-alpha.c:4483 +#: elf64-alpha.c:4478 msgid "" msgstr "<未知>" -#: elf64-alpha.c:4488 +#: elf64-alpha.c:4483 msgid "%B: !samegp reloc against symbol without .prologue: %s" msgstr "" @@ -2714,15 +2724,15 @@ msgid "%B: pc-relative relocation against undefined weak symbol %s" msgstr "" -#: elf64-alpha.c:4632 +#: elf64-alpha.c:4636 msgid "%B: dtp-relative relocation against dynamic symbol %s" msgstr "" -#: elf64-alpha.c:4655 +#: elf64-alpha.c:4659 msgid "%B: tp-relative relocation against dynamic symbol %s" msgstr "" -#: elf64-hppa.c:2094 +#: elf64-hppa.c:2083 #, c-format msgid "stub entry for %s cannot load .plt, dp offset = %ld" msgstr "" @@ -2731,7 +2741,7 @@ msgid "%B(%A+0x%lx): cannot reach %s" msgstr "" -#: elf64-mmix.c:1177 +#: elf64-mmix.c:1244 #, c-format msgid "" "%s: Internal inconsistency error for value for\n" @@ -2739,51 +2749,51 @@ "0x%lx%08lx\n" msgstr "" -#: elf64-mmix.c:1607 +#: elf64-mmix.c:1670 #, c-format msgid "" "%s: base-plus-offset relocation against register symbol: (unknown) in %s" msgstr "" -#: elf64-mmix.c:1612 +#: elf64-mmix.c:1675 #, c-format msgid "%s: base-plus-offset relocation against register symbol: %s in %s" msgstr "" -#: elf64-mmix.c:1656 +#: elf64-mmix.c:1719 #, c-format msgid "%s: register relocation against non-register symbol: (unknown) in %s" msgstr "" -#: elf64-mmix.c:1661 +#: elf64-mmix.c:1724 #, c-format msgid "%s: register relocation against non-register symbol: %s in %s" msgstr "" -#: elf64-mmix.c:1698 +#: elf64-mmix.c:1761 #, c-format msgid "%s: directive LOCAL valid only with a register or absolute value" msgstr "%s：指令 LOCAL 只对寄存器或绝对值有效" -#: elf64-mmix.c:1726 +#: elf64-mmix.c:1789 #, c-format msgid "" "%s: LOCAL directive: Register $%ld is not a local register. First global " "register is $%ld." msgstr "%s：LOCAL 指令：寄存器 $%ld 不是本地寄存器。 第一个全局寄存器是 $%ld。" -#: elf64-mmix.c:2190 +#: elf64-mmix.c:2253 #, c-format msgid "" "%s: Error: multiple definition of `%s'; start of %s is set in a earlier " "linked file\n" msgstr "%s：错误：重复定义“%s”；%s 的起点在此前连接的文件中已设定\n" -#: elf64-mmix.c:2248 +#: elf64-mmix.c:2311 msgid "Register section has contents\n" msgstr "寄存器节有内容\n" -#: elf64-mmix.c:2440 +#: elf64-mmix.c:2503 #, c-format msgid "" "Internal inconsistency: remaining %u != max %u.\n" @@ -2792,11 +2802,11 @@ "内部不一致：剩余 %u != 最大 %u。\n" " 请报告该 bug。" -#: elf64-ppc.c:2744 libbfd.c:1012 +#: libbfd.c:1012 msgid "%B: compiled for a big endian system and target is little endian" msgstr "" -#: elf64-ppc.c:2747 libbfd.c:1014 +#: libbfd.c:1014 msgid "%B: compiled for a little endian system and target is big endian" msgstr "" @@ -2815,23 +2825,23 @@ msgid "dynreloc miscount for %B, section %A\n" msgstr "" -#: elf64-ppc.c:6996 +#: elf64-ppc.c:7076 msgid "%B: .opd is not a regular array of opd entries" msgstr "" -#: elf64-ppc.c:7005 +#: elf64-ppc.c:7085 msgid "%B: unexpected reloc type %u in .opd section" msgstr "" -#: elf64-ppc.c:7026 +#: elf64-ppc.c:7106 msgid "%B: undefined sym `%s' in .opd section" msgstr "" -#: elf64-ppc.c:7584 +#: elf64-ppc.c:7664 msgid "%H __tls_get_addr lost arg, TLS optimization disabled\n" msgstr "" -#: elf64-ppc.c:7929 elf64-ppc.c:8450 +#: elf64-ppc.c:8003 elf64-ppc.c:8564 #, c-format msgid "%s defined on removed toc entry" msgstr "" @@ -2861,7 +2871,7 @@ msgid "can't build branch stub `%s'\n" msgstr "" -#: elf64-ppc.c:10814 +#: elf64-ppc.c:10941 msgid "%B section %A exceeds stub group size" msgstr "" @@ -2869,7 +2879,7 @@ msgid "stubs don't match calculated size\n" msgstr "" -#: elf64-ppc.c:11469 +#: elf64-ppc.c:11756 #, c-format msgid "" "linker stubs in %u group%s\n" @@ -2909,77 +2919,77 @@ msgid "%H: error: %s not a multiple of %u\n" msgstr "" -#: elf64-sh64.c:1682 +#: elf64-sh64.c:1686 #, c-format msgid "%s: error: unaligned relocation type %d at %08x reloc %08x\n" msgstr "" -#: elf64-sparc.c:445 +#: elf64-sparc.c:446 msgid "%B: Only registers %%g[2367] can be declared using STT_REGISTER" msgstr "" -#: elf64-sparc.c:465 +#: elf64-sparc.c:466 msgid "Register %%g%d used incompatibly: %s in %B, previously %s in %B" msgstr "" -#: elf64-sparc.c:488 +#: elf64-sparc.c:489 msgid "Symbol `%s' has differing types: REGISTER in %B, previously %s in %B" msgstr "" -#: elf64-sparc.c:533 +#: elf64-sparc.c:534 msgid "Symbol `%s' has differing types: %s in %B, previously REGISTER in %B" msgstr "" -#: elf64-sparc.c:686 +#: elf64-sparc.c:687 msgid "%B: linking UltraSPARC specific with HAL specific code" msgstr "" -#: elf64-x86-64.c:1236 +#: elf64-x86-64.c:1427 msgid "%B: relocation %s against symbol `%s' isn't supported in x32 mode" msgstr "" -#: elf64-x86-64.c:1465 +#: elf64-x86-64.c:1656 msgid "%B: '%s' accessed both as normal and thread local symbol" msgstr "" -#: elf64-x86-64.c:2934 +#: elf64-x86-64.c:3150 msgid "" "%B: relocation %s against STT_GNU_IFUNC symbol `%s' has non-zero addend: %d" msgstr "" -#: elf64-x86-64.c:3193 +#: elf64-x86-64.c:3411 msgid "" "%B: relocation R_X86_64_GOTOFF64 against protected function `%s' can not be " "used when making a shared object" msgstr "" -#: elf64-x86-64.c:3305 +#: elf64-x86-64.c:3523 msgid "; recompile with -fPIC" msgstr "" -#: elf64-x86-64.c:3310 +#: elf64-x86-64.c:3528 msgid "" "%B: relocation %s against %s `%s' can not be used when making a shared " "object%s" msgstr "" -#: elf64-x86-64.c:3312 +#: elf64-x86-64.c:3530 msgid "" "%B: relocation %s against undefined %s `%s' can not be used when making a " "shared object%s" msgstr "" -#: elfcode.h:827 +#: elfcode.h:767 #, c-format msgid "warning: %s has a corrupt string table index - ignoring" msgstr "" -#: elfcode.h:1237 +#: elfcode.h:1177 #, c-format msgid "%s: version count (%ld) does not match symbol count (%ld)" msgstr "%s：版本计数 (%ld) 无法匹配符号计数 (%ld)" -#: elfcode.h:1491 +#: elfcode.h:1431 #, c-format msgid "%s(%s): relocation %d has invalid symbol index %ld" msgstr "" @@ -2988,197 +2998,197 @@ msgid "Warning: %B is truncated: expected core file size >= %lu, found: %lu." msgstr "" -#: elflink.c:1119 +#: elflink.c:1117 msgid "" "%s: TLS definition in %B section %A mismatches non-TLS definition in %B " "section %A" msgstr "" -#: elflink.c:1123 +#: elflink.c:1121 msgid "%s: TLS reference in %B mismatches non-TLS reference in %B" msgstr "" -#: elflink.c:1127 +#: elflink.c:1125 msgid "" "%s: TLS definition in %B section %A mismatches non-TLS reference in %B" msgstr "" -#: elflink.c:1131 +#: elflink.c:1129 msgid "" "%s: TLS reference in %B mismatches non-TLS definition in %B section %A" msgstr "" -#: elflink.c:1764 +#: elflink.c:1762 msgid "%B: unexpected redefinition of indirect versioned symbol `%s'" msgstr "" -#: elflink.c:2077 +#: elflink.c:2063 msgid "%B: version node not found for symbol %s" msgstr "" -#: elflink.c:2167 +#: elflink.c:2154 msgid "" "%B: bad reloc symbol index (0x%lx >= 0x%lx) for offset 0x%lx in section `%A'" msgstr "" -#: elflink.c:2178 +#: elflink.c:2165 msgid "" "%B: non-zero symbol index (0x%lx) for offset 0x%lx in section `%A' when the " "object file has no symbol table" msgstr "" -#: elflink.c:2368 +#: elflink.c:2355 msgid "%B: relocation size mismatch in %B section %A" msgstr "" -#: elflink.c:2663 +#: elflink.c:2639 #, c-format msgid "warning: type and size of dynamic symbol `%s' are not defined" msgstr "警告：动态符号“%s”的类型和大小未定义" -#: elflink.c:3421 +#: elflink.c:3391 msgid "%P: alternate ELF machine code found (%d) in %B, expecting %d\n" msgstr "" -#: elflink.c:4067 +#: elflink.c:4037 msgid "%B: %s: invalid version %u (max %d)" msgstr "" -#: elflink.c:4103 +#: elflink.c:4073 msgid "%B: %s: invalid needed version %d" msgstr "" -#: elflink.c:4299 +#: elflink.c:4269 msgid "" "Warning: alignment %u of common symbol `%s' in %B is greater than the " "alignment (%u) of its section %A" msgstr "" -#: elflink.c:4305 +#: elflink.c:4275 msgid "Warning: alignment %u of symbol `%s' in %B is smaller than %u in %B" msgstr "" -#: elflink.c:4320 +#: elflink.c:4290 msgid "Warning: size of symbol `%s' changed from %lu in %B to %lu in %B" msgstr "" -#: elflink.c:4489 +#: elflink.c:4463 msgid "%B: undefined reference to symbol '%s'" msgstr "" -#: elflink.c:4492 +#: elflink.c:4466 msgid "" "note: '%s' is defined in DSO %B so try adding it to the linker command line" msgstr "" -#: elflink.c:5795 +#: elflink.c:5781 #, c-format msgid "%s: undefined version: %s" msgstr "" -#: elflink.c:5863 +#: elflink.c:5849 msgid "%B: .preinit_array section is not allowed in DSO" msgstr "" -#: elflink.c:7617 +#: elflink.c:7604 #, c-format msgid "undefined %s reference in complex symbol: %s" msgstr "" -#: elflink.c:7771 +#: elflink.c:7758 #, c-format msgid "unknown operator '%c' in complex symbol" msgstr "" -#: elflink.c:8110 elflink.c:8127 elflink.c:8164 elflink.c:8181 +#: elflink.c:8097 elflink.c:8114 elflink.c:8151 elflink.c:8168 msgid "%B: Unable to sort relocs - they are in more than one size" msgstr "" -#: elflink.c:8141 elflink.c:8195 +#: elflink.c:8128 elflink.c:8182 msgid "%B: Unable to sort relocs - they are of an unknown size" msgstr "" -#: elflink.c:8246 +#: elflink.c:8233 msgid "Not enough memory to sort relocations" msgstr "没有足够的内存进行重定位排序" -#: elflink.c:8439 +#: elflink.c:8426 msgid "%B: Too many sections: %d (>= %d)" msgstr "" -#: elflink.c:8686 +#: elflink.c:8675 msgid "%B: internal symbol `%s' in %B is referenced by DSO" msgstr "" -#: elflink.c:8688 +#: elflink.c:8677 msgid "%B: hidden symbol `%s' in %B is referenced by DSO" msgstr "" -#: elflink.c:8690 +#: elflink.c:8679 msgid "%B: local symbol `%s' in %B is referenced by DSO" msgstr "" -#: elflink.c:8785 +#: elflink.c:8776 msgid "%B: could not find output section %A for input section %A" msgstr "" -#: elflink.c:8908 +#: elflink.c:8899 msgid "%B: protected symbol `%s' isn't defined" msgstr "" -#: elflink.c:8910 +#: elflink.c:8901 msgid "%B: internal symbol `%s' isn't defined" msgstr "" -#: elflink.c:8912 +#: elflink.c:8903 msgid "%B: hidden symbol `%s' isn't defined" msgstr "" -#: elflink.c:9441 +#: elflink.c:9432 msgid "error: %B: size of section %A is not multiple of address size" msgstr "" -#: elflink.c:9488 +#: elflink.c:9479 msgid "" "error: %B contains a reloc (0x%s) for section %A that references a non-" "existent global symbol" msgstr "" -#: elflink.c:10223 +#: elflink.c:10214 msgid "%A has both ordered [`%A' in %B] and unordered [`%A' in %B] sections" msgstr "" -#: elflink.c:10228 +#: elflink.c:10219 #, c-format msgid "%A has both ordered and unordered sections" msgstr "" -#: elflink.c:10793 +#: elflink.c:10784 msgid "%B: file class %s incompatible with %s" msgstr "" -#: elflink.c:11104 elflink.c:11148 +#: elflink.c:11093 elflink.c:11137 msgid "%B: could not find output section %s" msgstr "" -#: elflink.c:11109 +#: elflink.c:11098 #, c-format msgid "warning: %s section has zero size" msgstr "警告：%s 节的大小为零" -#: elflink.c:11214 +#: elflink.c:11215 msgid "%P: warning: creating a DT_TEXTREL in a shared object.\n" msgstr "" -#: elflink.c:11401 +#: elflink.c:11402 msgid "%P%X: can not read symbols: %E\n" msgstr "" -#: elflink.c:11750 +#: elflink.c:11792 msgid "Removing unused section '%s' in file '%B'" msgstr "" -#: elflink.c:11962 +#: elflink.c:11998 msgid "Warning: gc-sections option ignored" msgstr "" @@ -3198,170 +3208,170 @@ msgid "%B: warning: duplicate section `%A' has different contents" msgstr "" -#: elflink.c:12643 linker.c:3086 +#: coffgen.c:2500 elflink.c:12689 linker.c:3122 msgid "%F%P: already_linked_table: %E\n" msgstr "" -#: elfxx-mips.c:1221 +#: elfxx-mips.c:1234 msgid "static procedure (no name)" msgstr "静态过程 (无名称)" -#: elfxx-mips.c:5628 +#: elfxx-mips.c:5856 msgid "" "%B: %A+0x%lx: Direct jumps between ISA modes are not allowed; consider " "recompiling with interlinking enabled." msgstr "" -#: elfxx-mips.c:6288 elfxx-mips.c:6511 +#: elfxx-mips.c:6519 elfxx-mips.c:6742 msgid "%B: Warning: bad `%s' option size %u smaller than its header" msgstr "" -#: elfxx-mips.c:7262 elfxx-mips.c:7387 +#: elfxx-mips.c:7495 elfxx-mips.c:7620 msgid "" "%B: Warning: cannot determine the target function for stub section `%s'" msgstr "" -#: elfxx-mips.c:7516 +#: elfxx-mips.c:7749 msgid "%B: Malformed reloc detected for section %s" msgstr "" -#: elfxx-mips.c:7556 +#: elfxx-mips.c:7801 msgid "%B: GOT reloc at 0x%lx not expected in executables" msgstr "" -#: elfxx-mips.c:7678 +#: elfxx-mips.c:7930 msgid "%B: CALL16 reloc at 0x%lx not against global symbol" msgstr "" -#: elfxx-mips.c:8372 +#: elfxx-mips.c:8645 #, c-format msgid "non-dynamic relocations refer to dynamic symbol %s" msgstr "" -#: elfxx-mips.c:9075 +#: elfxx-mips.c:9347 msgid "" "%B: Can't find matching LO16 reloc against `%s' for %s at 0x%lx in section " "`%A'" msgstr "" -#: elfxx-mips.c:9214 +#: elfxx-mips.c:9486 msgid "" "small-data section exceeds 64KB; lower small-data size limit (see option -G)" msgstr "" -#: elfxx-mips.c:12038 +#: elfxx-mips.c:13266 #, c-format msgid "%s: illegal section name `%s'" msgstr "%s：非法的节名“%s”" -#: elfxx-mips.c:12417 elfxx-mips.c:12443 +#: elfxx-mips.c:13645 elfxx-mips.c:13671 msgid "Warning: %B uses -msingle-float, %B uses -mdouble-float" msgstr "" -#: elfxx-mips.c:12429 elfxx-mips.c:12485 +#: elfxx-mips.c:13657 elfxx-mips.c:13713 msgid "Warning: %B uses -msingle-float, %B uses -mips32r2 -mfp64" msgstr "" -#: elfxx-mips.c:12455 elfxx-mips.c:12491 +#: elfxx-mips.c:13683 elfxx-mips.c:13719 msgid "Warning: %B uses -mdouble-float, %B uses -mips32r2 -mfp64" msgstr "" -#: elfxx-mips.c:12533 +#: elfxx-mips.c:13761 msgid "%B: endianness incompatible with that of the selected emulation" msgstr "" -#: elfxx-mips.c:12544 +#: elfxx-mips.c:13772 msgid "%B: ABI is incompatible with that of the selected emulation" msgstr "" -#: elfxx-mips.c:12628 +#: elfxx-mips.c:13856 msgid "%B: warning: linking abicalls files with non-abicalls files" msgstr "" -#: elfxx-mips.c:12645 +#: elfxx-mips.c:13873 msgid "%B: linking 32-bit code with 64-bit code" msgstr "" -#: elfxx-mips.c:12673 +#: elfxx-mips.c:13901 msgid "%B: linking %s module with previous %s modules" msgstr "" -#: elfxx-mips.c:12696 +#: elfxx-mips.c:13924 msgid "%B: ABI mismatch: linking %s module with previous %s modules" msgstr "" -#: elfxx-mips.c:12860 +#: elfxx-mips.c:14106 #, c-format msgid " [abi=O32]" msgstr " [abi=O32]" -#: elfxx-mips.c:12862 +#: elfxx-mips.c:14108 #, c-format msgid " [abi=O64]" msgstr " [abi=O64]" -#: elfxx-mips.c:12864 +#: elfxx-mips.c:14110 #, c-format msgid " [abi=EABI32]" msgstr " [abi=EABI32]" -#: elfxx-mips.c:12866 +#: elfxx-mips.c:14112 #, c-format msgid " [abi=EABI64]" msgstr " [abi=EABI64]" -#: elfxx-mips.c:12868 +#: elfxx-mips.c:14114 #, c-format msgid " [abi unknown]" msgstr " [abi 未知]" -#: elfxx-mips.c:12870 +#: elfxx-mips.c:14116 #, c-format msgid " [abi=N32]" msgstr " [abi=N32]" -#: elfxx-mips.c:12872 +#: elfxx-mips.c:14118 #, c-format msgid " [abi=64]" msgstr " [abi=64]" -#: elfxx-mips.c:12874 +#: elfxx-mips.c:14120 #, c-format msgid " [no abi set]" msgstr "" -#: elfxx-mips.c:12895 +#: elfxx-mips.c:14141 #, c-format msgid " [unknown ISA]" msgstr " [未知的 ISA]" -#: elfxx-mips.c:12906 +#: elfxx-mips.c:14155 #, c-format msgid " [not 32bitmode]" msgstr " [非 32位模式]" -#: elfxx-sparc.c:595 +#: elfxx-sparc.c:596 #, c-format msgid "invalid relocation type %d" msgstr "" -#: i386linux.c:454 m68klinux.c:458 sparclinux.c:452 +#: i386linux.c:451 m68klinux.c:456 sparclinux.c:450 #, c-format msgid "Output file requires shared library `%s'\n" msgstr "输出文件需要共享库“%s”\n" -#: i386linux.c:462 m68klinux.c:466 sparclinux.c:460 +#: i386linux.c:459 m68klinux.c:464 sparclinux.c:458 #, c-format msgid "Output file requires shared library `%s.so.%s'\n" msgstr "输出文件需要共享库“%s.so.%s”\n" -#: i386linux.c:651 i386linux.c:701 m68klinux.c:658 m68klinux.c:706 -#: sparclinux.c:650 sparclinux.c:700 +#: i386linux.c:648 i386linux.c:698 m68klinux.c:656 m68klinux.c:704 +#: sparclinux.c:648 sparclinux.c:698 #, c-format msgid "Symbol %s not defined for fixups\n" msgstr "" -#: i386linux.c:725 m68klinux.c:730 sparclinux.c:724 +#: i386linux.c:722 m68klinux.c:728 sparclinux.c:722 msgid "Warning: fixup count mismatch\n" msgstr "" @@ -3442,11 +3452,11 @@ msgid "Deprecated %s called\n" msgstr "" -#: linker.c:1859 +#: linker.c:1872 msgid "%B: indirect symbol `%s' to `%s' is a loop" msgstr "" -#: linker.c:2726 +#: linker.c:2736 #, c-format msgid "Attempt to do relocatable link with %s input and %s output" msgstr "" @@ -3459,16 +3469,16 @@ msgid "%B: warning: duplicate section `%A' has different size\n" msgstr "" -#: mach-o.c:381 +#: mach-o.c:407 msgid "bfd_mach_o_canonicalize_symtab: unable to load symbols" msgstr "" -#: mach-o.c:1253 +#: mach-o.c:1301 #, c-format msgid "unable to write unknown load command 0x%lx" msgstr "" -#: mach-o.c:1654 +#: mach-o.c:1789 #, c-format msgid "bfd_mach_o_read_symtab_symbol: unable to read %d bytes at %lu" msgstr "" @@ -3478,104 +3488,104 @@ msgid "bfd_mach_o_read_symtab_symbol: symbol name out of range (%lu >= %lu)" msgstr "" -#: mach-o.c:1756 +#: mach-o.c:1892 #, c-format msgid "" "bfd_mach_o_read_symtab_symbol: symbol \"%s\" specified invalid section %d " "(max %lu): setting to undefined" msgstr "" -#: mach-o.c:1764 +#: mach-o.c:1900 #, c-format msgid "" "bfd_mach_o_read_symtab_symbol: symbol \"%s\" is unsupported 'indirect' " "reference: setting to undefined" msgstr "" -#: mach-o.c:1770 +#: mach-o.c:1906 #, c-format msgid "" "bfd_mach_o_read_symtab_symbol: symbol \"%s\" specified invalid type field " "0x%x: setting to undefined" msgstr "" -#: mach-o.c:1840 +#: mach-o.c:1979 msgid "bfd_mach_o_read_symtab_symbols: unable to allocate memory for symbols" msgstr "" -#: mach-o.c:1874 +#: mach-o.c:2014 #, c-format msgid "bfd_mach_o_read_dysymtab_symbol: unable to read %lu bytes at %lu" msgstr "" -#: mach-o.c:2556 +#: mach-o.c:2734 #, c-format msgid "unable to read unknown load command 0x%lx" msgstr "" -#: mach-o.c:2736 +#: mach-o.c:2915 #, c-format msgid "bfd_mach_o_scan: unknown architecture 0x%lx/0x%lx" msgstr "" -#: mach-o.c:2832 +#: mach-o.c:3011 #, c-format msgid "unknown header byte-order value 0x%lx" msgstr "" -#: mach-o.c:3402 +#: mach-o.c:3577 msgid "Mach-O header:\n" msgstr "" -#: mach-o.c:3403 +#: mach-o.c:3578 #, c-format msgid " magic : %08lx\n" msgstr "" -#: mach-o.c:3404 +#: mach-o.c:3579 #, c-format msgid " cputype : %08lx (%s)\n" msgstr "" -#: mach-o.c:3406 +#: mach-o.c:3581 #, c-format msgid " cpusubtype: %08lx\n" msgstr "" -#: mach-o.c:3407 +#: mach-o.c:3582 #, c-format msgid " filetype : %08lx (%s)\n" msgstr "" -#: mach-o.c:3410 +#: mach-o.c:3585 #, c-format msgid " ncmds : %08lx (%lu)\n" msgstr "" -#: mach-o.c:3411 +#: mach-o.c:3586 #, c-format msgid " sizeofcmds: %08lx\n" msgstr "" -#: mach-o.c:3412 +#: mach-o.c:3587 #, c-format msgid " flags : %08lx (" msgstr "" -#: mach-o.c:3414 vms-alpha.c:7671 +#: mach-o.c:3589 vms-alpha.c:7674 msgid ")\n" msgstr "" -#: mach-o.c:3415 +#: mach-o.c:3590 #, c-format msgid " reserved : %08x\n" msgstr "" -#: mach-o.c:3425 +#: mach-o.c:3600 msgid "Segments and Sections:\n" msgstr "" -#: mach-o.c:3426 +#: mach-o.c:3601 msgid " #: Segment name Section name Address\n" msgstr "" @@ -3757,7 +3767,7 @@ msgid "%B: bad pair/reflo after refhi\n" msgstr "" -#: pef.c:519 +#: pef.c:520 #, c-format msgid "bfd_pef_scan: unknown architecture 0x%lx" msgstr "" @@ -3793,21 +3803,21 @@ msgid "%B: Unrecognised import name type; %x" msgstr "" -#: peicode.h:1162 +#: peicode.h:1166 msgid "%B: Unrecognised machine type (0x%x) in Import Library Format archive" msgstr "" -#: peicode.h:1174 +#: peicode.h:1178 msgid "" "%B: Recognised but unhandled machine type (0x%x) in Import Library Format " "archive" msgstr "" -#: peicode.h:1192 +#: peicode.h:1196 msgid "%B: size field is zero in Import Library Format header" msgstr "" -#: peicode.h:1223 +#: peicode.h:1227 msgid "%B: string not null terminated in ILF object file." msgstr "" @@ -3963,1821 +3973,1821 @@ msgid "SEC_RELOC with no relocs in section %s" msgstr "" -#: vms-alpha.c:3822 vms-alpha.c:4053 +#: vms-alpha.c:3822 vms-alpha.c:4049 #, c-format msgid "Size error in section %s" msgstr "" -#: vms-alpha.c:3992 +#: vms-alpha.c:3991 msgid "Spurious ALPHA_R_BSR reloc" msgstr "" -#: vms-alpha.c:4040 +#: vms-alpha.c:4036 #, c-format msgid "Unhandled relocation %s" msgstr "未处理的重定位 %s" -#: vms-alpha.c:4330 +#: vms-alpha.c:4326 #, c-format msgid "unknown source command %d" msgstr "" -#: vms-alpha.c:4391 +#: vms-alpha.c:4387 msgid "DST__K_SET_LINUM_INCR not implemented" msgstr "" -#: vms-alpha.c:4397 +#: vms-alpha.c:4393 msgid "DST__K_SET_LINUM_INCR_W not implemented" msgstr "" -#: vms-alpha.c:4403 +#: vms-alpha.c:4399 msgid "DST__K_RESET_LINUM_INCR not implemented" msgstr "" -#: vms-alpha.c:4409 +#: vms-alpha.c:4405 msgid "DST__K_BEG_STMT_MODE not implemented" msgstr "" -#: vms-alpha.c:4415 +#: vms-alpha.c:4411 msgid "DST__K_END_STMT_MODE not implemented" msgstr "" -#: vms-alpha.c:4442 +#: vms-alpha.c:4438 msgid "DST__K_SET_PC not implemented" msgstr "" -#: vms-alpha.c:4448 +#: vms-alpha.c:4444 msgid "DST__K_SET_PC_W not implemented" msgstr "" -#: vms-alpha.c:4454 +#: vms-alpha.c:4450 msgid "DST__K_SET_PC_L not implemented" msgstr "" -#: vms-alpha.c:4460 +#: vms-alpha.c:4456 msgid "DST__K_SET_STMTNUM not implemented" msgstr "" -#: vms-alpha.c:4503 +#: vms-alpha.c:4499 #, c-format msgid "unknown line command %d" msgstr "" -#: vms-alpha.c:4957 vms-alpha.c:4974 vms-alpha.c:4988 vms-alpha.c:5003 -#: vms-alpha.c:5015 vms-alpha.c:5026 vms-alpha.c:5038 +#: vms-alpha.c:4953 vms-alpha.c:4970 vms-alpha.c:4984 vms-alpha.c:4999 +#: vms-alpha.c:5011 vms-alpha.c:5022 vms-alpha.c:5034 #, c-format msgid "Unknown reloc %s + %s" msgstr "" -#: vms-alpha.c:5093 +#: vms-alpha.c:5089 #, c-format msgid "Unknown reloc %s" msgstr "" -#: vms-alpha.c:5106 +#: vms-alpha.c:5102 msgid "Invalid section index in ETIR" msgstr "" -#: vms-alpha.c:5153 +#: vms-alpha.c:5156 #, c-format msgid "Unknown symbol in command %s" msgstr "" -#: vms-alpha.c:5668 +#: vms-alpha.c:5671 #, c-format msgid " EMH %u (len=%u): " msgstr "" -#: vms-alpha.c:5677 +#: vms-alpha.c:5680 #, c-format msgid "Module header\n" msgstr "" -#: vms-alpha.c:5678 +#: vms-alpha.c:5681 #, c-format msgid " structure level: %u\n" msgstr "" -#: vms-alpha.c:5679 +#: vms-alpha.c:5682 #, c-format msgid " max record size: %u\n" msgstr "" -#: vms-alpha.c:5682 +#: vms-alpha.c:5685 #, c-format msgid " module name : %.*s\n" msgstr "" -#: vms-alpha.c:5684 +#: vms-alpha.c:5687 #, c-format msgid " module version : %.*s\n" msgstr "" -#: vms-alpha.c:5686 +#: vms-alpha.c:5689 #, c-format msgid " compile date : %.17s\n" msgstr "" -#: vms-alpha.c:5691 +#: vms-alpha.c:5694 #, c-format msgid "Language Processor Name\n" msgstr "" -#: vms-alpha.c:5692 +#: vms-alpha.c:5695 #, c-format msgid " language name: %.*s\n" msgstr "" -#: vms-alpha.c:5699 +#: vms-alpha.c:5702 #, c-format msgid "Source Files Header\n" msgstr "" -#: vms-alpha.c:5700 +#: vms-alpha.c:5703 #, c-format msgid " file: %.*s\n" msgstr "" -#: vms-alpha.c:5707 +#: vms-alpha.c:5710 #, c-format msgid "Title Text Header\n" msgstr "" -#: vms-alpha.c:5708 +#: vms-alpha.c:5711 #, c-format msgid " title: %.*s\n" msgstr "" -#: vms-alpha.c:5715 +#: vms-alpha.c:5718 #, c-format msgid "Copyright Header\n" msgstr "" -#: vms-alpha.c:5716 +#: vms-alpha.c:5719 #, c-format msgid " copyright: %.*s\n" msgstr "" -#: vms-alpha.c:5722 +#: vms-alpha.c:5725 #, c-format msgid "unhandled emh subtype %u\n" msgstr "" -#: vms-alpha.c:5732 +#: vms-alpha.c:5735 #, c-format msgid " EEOM (len=%u):\n" msgstr "" -#: vms-alpha.c:5733 +#: vms-alpha.c:5736 #, c-format msgid " number of cond linkage pairs: %u\n" msgstr "" -#: vms-alpha.c:5735 +#: vms-alpha.c:5738 #, c-format msgid " completion code: %u\n" msgstr "" -#: vms-alpha.c:5739 +#: vms-alpha.c:5742 #, c-format msgid " transfer addr flags: 0x%02x\n" msgstr "" -#: vms-alpha.c:5740 +#: vms-alpha.c:5743 #, c-format msgid " transfer addr psect: %u\n" msgstr "" -#: vms-alpha.c:5742 +#: vms-alpha.c:5745 #, c-format msgid " transfer address : 0x%08x\n" msgstr "" -#: vms-alpha.c:5751 +#: vms-alpha.c:5754 msgid " WEAK" msgstr "" -#: vms-alpha.c:5753 +#: vms-alpha.c:5756 msgid " DEF" msgstr "" -#: vms-alpha.c:5755 +#: vms-alpha.c:5758 msgid " UNI" msgstr "" -#: vms-alpha.c:5757 vms-alpha.c:5778 +#: vms-alpha.c:5760 vms-alpha.c:5781 msgid " REL" msgstr "" -#: vms-alpha.c:5759 +#: vms-alpha.c:5762 msgid " COMM" msgstr "" -#: vms-alpha.c:5761 +#: vms-alpha.c:5764 msgid " VECEP" msgstr "" -#: vms-alpha.c:5763 +#: vms-alpha.c:5766 msgid " NORM" msgstr "" -#: vms-alpha.c:5765 +#: vms-alpha.c:5768 msgid " QVAL" msgstr "" -#: vms-alpha.c:5772 +#: vms-alpha.c:5775 msgid " PIC" msgstr "" -#: vms-alpha.c:5774 +#: vms-alpha.c:5777 msgid " LIB" msgstr "" -#: vms-alpha.c:5776 +#: vms-alpha.c:5779 msgid " OVR" msgstr "" -#: vms-alpha.c:5780 +#: vms-alpha.c:5783 msgid " GBL" msgstr "" -#: vms-alpha.c:5782 +#: vms-alpha.c:5785 msgid " SHR" msgstr "" -#: vms-alpha.c:5784 +#: vms-alpha.c:5787 msgid " EXE" msgstr "" -#: vms-alpha.c:5786 +#: vms-alpha.c:5789 msgid " RD" msgstr "" -#: vms-alpha.c:5788 +#: vms-alpha.c:5791 msgid " WRT" msgstr "" -#: vms-alpha.c:5790 +#: vms-alpha.c:5793 msgid " VEC" msgstr "" -#: vms-alpha.c:5792 +#: vms-alpha.c:5795 msgid " NOMOD" msgstr "" -#: vms-alpha.c:5794 +#: vms-alpha.c:5797 msgid " COM" msgstr "" -#: vms-alpha.c:5796 +#: vms-alpha.c:5799 msgid " 64B" msgstr "" -#: vms-alpha.c:5805 +#: vms-alpha.c:5808 #, c-format msgid " EGSD (len=%u):\n" msgstr "" -#: vms-alpha.c:5817 +#: vms-alpha.c:5820 #, c-format msgid " EGSD entry %2u (type: %u, len: %u): " msgstr "" -#: vms-alpha.c:5829 +#: vms-alpha.c:5832 #, c-format msgid "PSC - Program section definition\n" msgstr "" -#: vms-alpha.c:5830 vms-alpha.c:5847 +#: vms-alpha.c:5833 vms-alpha.c:5850 #, c-format msgid " alignment : 2**%u\n" msgstr "" -#: vms-alpha.c:5831 vms-alpha.c:5848 +#: vms-alpha.c:5834 vms-alpha.c:5851 #, c-format msgid " flags : 0x%04x" msgstr "" -#: vms-alpha.c:5835 +#: vms-alpha.c:5838 #, c-format msgid " alloc (len): %u (0x%08x)\n" msgstr "" -#: vms-alpha.c:5836 vms-alpha.c:5893 vms-alpha.c:5942 +#: vms-alpha.c:5839 vms-alpha.c:5896 vms-alpha.c:5945 #, c-format msgid " name : %.*s\n" msgstr "" -#: vms-alpha.c:5846 +#: vms-alpha.c:5849 #, c-format msgid "SPSC - Shared Image Program section def\n" msgstr "" -#: vms-alpha.c:5852 +#: vms-alpha.c:5855 #, c-format msgid " alloc (len) : %u (0x%08x)\n" msgstr "" -#: vms-alpha.c:5853 +#: vms-alpha.c:5856 #, c-format msgid " image offset : 0x%08x\n" msgstr "" -#: vms-alpha.c:5855 +#: vms-alpha.c:5858 #, c-format msgid " symvec offset : 0x%08x\n" msgstr "" -#: vms-alpha.c:5857 +#: vms-alpha.c:5860 #, c-format msgid " name : %.*s\n" msgstr "" -#: vms-alpha.c:5870 +#: vms-alpha.c:5873 #, c-format msgid "SYM - Global symbol definition\n" msgstr "" -#: vms-alpha.c:5871 vms-alpha.c:5931 vms-alpha.c:5952 vms-alpha.c:5971 +#: vms-alpha.c:5874 vms-alpha.c:5934 vms-alpha.c:5955 vms-alpha.c:5974 #, c-format msgid " flags: 0x%04x" msgstr "" -#: vms-alpha.c:5874 +#: vms-alpha.c:5877 #, c-format msgid " psect offset: 0x%08x\n" msgstr "" -#: vms-alpha.c:5878 +#: vms-alpha.c:5881 #, c-format msgid " code address: 0x%08x\n" msgstr "" -#: vms-alpha.c:5880 +#: vms-alpha.c:5883 #, c-format msgid " psect index for entry point : %u\n" msgstr "" -#: vms-alpha.c:5883 vms-alpha.c:5959 vms-alpha.c:5978 +#: vms-alpha.c:5886 vms-alpha.c:5962 vms-alpha.c:5981 #, c-format msgid " psect index : %u\n" msgstr "" -#: vms-alpha.c:5885 vms-alpha.c:5961 vms-alpha.c:5980 +#: vms-alpha.c:5888 vms-alpha.c:5964 vms-alpha.c:5983 #, c-format msgid " name : %.*s\n" msgstr "" -#: vms-alpha.c:5892 +#: vms-alpha.c:5895 #, c-format msgid "SYM - Global symbol reference\n" msgstr "" -#: vms-alpha.c:5904 +#: vms-alpha.c:5907 #, c-format msgid "IDC - Ident Consistency check\n" msgstr "" -#: vms-alpha.c:5905 +#: vms-alpha.c:5908 #, c-format msgid " flags : 0x%08x" msgstr "" -#: vms-alpha.c:5909 +#: vms-alpha.c:5912 #, c-format msgid " id match : %x\n" msgstr "" -#: vms-alpha.c:5911 +#: vms-alpha.c:5914 #, c-format msgid " error severity: %x\n" msgstr "" -#: vms-alpha.c:5914 +#: vms-alpha.c:5917 #, c-format msgid " entity name : %.*s\n" msgstr "" -#: vms-alpha.c:5916 +#: vms-alpha.c:5919 #, c-format msgid " object name : %.*s\n" msgstr "" -#: vms-alpha.c:5919 +#: vms-alpha.c:5922 #, c-format msgid " binary ident : 0x%08x\n" msgstr "" -#: vms-alpha.c:5922 +#: vms-alpha.c:5925 #, c-format msgid " ascii ident : %.*s\n" msgstr "" -#: vms-alpha.c:5930 +#: vms-alpha.c:5933 #, c-format msgid "SYMG - Universal symbol definition\n" msgstr "" -#: vms-alpha.c:5934 +#: vms-alpha.c:5937 #, c-format msgid " symbol vector offset: 0x%08x\n" msgstr "" -#: vms-alpha.c:5936 +#: vms-alpha.c:5939 #, c-format msgid " entry point: 0x%08x\n" msgstr "" -#: vms-alpha.c:5938 +#: vms-alpha.c:5941 #, c-format msgid " proc descr : 0x%08x\n" msgstr "" -#: vms-alpha.c:5940 +#: vms-alpha.c:5943 #, c-format msgid " psect index: %u\n" msgstr "" -#: vms-alpha.c:5951 +#: vms-alpha.c:5954 #, c-format msgid "SYMV - Vectored symbol definition\n" msgstr "" -#: vms-alpha.c:5955 +#: vms-alpha.c:5958 #, c-format msgid " vector : 0x%08x\n" msgstr "" -#: vms-alpha.c:5957 vms-alpha.c:5976 +#: vms-alpha.c:5960 vms-alpha.c:5979 #, c-format msgid " psect offset: %u\n" msgstr "" -#: vms-alpha.c:5970 +#: vms-alpha.c:5973 #, c-format msgid "SYMM - Global symbol definition with version\n" msgstr "" -#: vms-alpha.c:5974 +#: vms-alpha.c:5977 #, c-format msgid " version mask: 0x%08x\n" msgstr "" -#: vms-alpha.c:5985 +#: vms-alpha.c:5988 #, c-format msgid "unhandled egsd entry type %u\n" msgstr "" -#: vms-alpha.c:6019 +#: vms-alpha.c:6022 #, c-format msgid " linkage index: %u, replacement insn: 0x%08x\n" msgstr "" -#: vms-alpha.c:6022 +#: vms-alpha.c:6025 #, c-format msgid " psect idx 1: %u, offset 1: 0x%08x %08x\n" msgstr "" -#: vms-alpha.c:6026 +#: vms-alpha.c:6029 #, c-format msgid " psect idx 2: %u, offset 2: 0x%08x %08x\n" msgstr "" -#: vms-alpha.c:6031 +#: vms-alpha.c:6034 #, c-format msgid " psect idx 3: %u, offset 3: 0x%08x %08x\n" msgstr "" -#: vms-alpha.c:6036 +#: vms-alpha.c:6039 #, c-format msgid " global name: %.*s\n" msgstr "" -#: vms-alpha.c:6046 +#: vms-alpha.c:6049 #, c-format msgid " %s (len=%u+%u):\n" msgstr "" -#: vms-alpha.c:6061 +#: vms-alpha.c:6064 #, c-format msgid " (type: %3u, size: 4+%3u): " msgstr "" -#: vms-alpha.c:6065 +#: vms-alpha.c:6068 #, c-format msgid "STA_GBL (stack global) %.*s\n" msgstr "" -#: vms-alpha.c:6069 +#: vms-alpha.c:6072 #, c-format msgid "STA_LW (stack longword) 0x%08x\n" msgstr "" -#: vms-alpha.c:6073 +#: vms-alpha.c:6076 #, c-format msgid "STA_QW (stack quadword) 0x%08x %08x\n" msgstr "" -#: vms-alpha.c:6078 +#: vms-alpha.c:6081 #, c-format msgid "STA_PQ (stack psect base + offset)\n" msgstr "" -#: vms-alpha.c:6079 +#: vms-alpha.c:6082 #, c-format msgid " psect: %u, offset: 0x%08x %08x\n" msgstr "" -#: vms-alpha.c:6085 +#: vms-alpha.c:6088 #, c-format msgid "STA_LI (stack literal)\n" msgstr "" -#: vms-alpha.c:6088 +#: vms-alpha.c:6091 #, c-format msgid "STA_MOD (stack module)\n" msgstr "" -#: vms-alpha.c:6091 +#: vms-alpha.c:6094 #, c-format msgid "STA_CKARG (compare procedure argument)\n" msgstr "" -#: vms-alpha.c:6095 +#: vms-alpha.c:6098 #, c-format msgid "STO_B (store byte)\n" msgstr "" -#: vms-alpha.c:6098 +#: vms-alpha.c:6101 #, c-format msgid "STO_W (store word)\n" msgstr "" -#: vms-alpha.c:6101 +#: vms-alpha.c:6104 #, c-format msgid "STO_LW (store longword)\n" msgstr "" -#: vms-alpha.c:6104 +#: vms-alpha.c:6107 #, c-format msgid "STO_QW (store quadword)\n" msgstr "" -#: vms-alpha.c:6110 +#: vms-alpha.c:6113 #, c-format msgid "STO_IMMR (store immediate repeat) %u bytes\n" msgstr "" -#: vms-alpha.c:6117 +#: vms-alpha.c:6120 #, c-format msgid "STO_GBL (store global) %.*s\n" msgstr "" -#: vms-alpha.c:6121 +#: vms-alpha.c:6124 #, c-format msgid "STO_CA (store code address) %.*s\n" msgstr "" -#: vms-alpha.c:6125 +#: vms-alpha.c:6128 #, c-format msgid "STO_RB (store relative branch)\n" msgstr "" -#: vms-alpha.c:6128 +#: vms-alpha.c:6131 #, c-format msgid "STO_AB (store absolute branch)\n" msgstr "" -#: vms-alpha.c:6131 +#: vms-alpha.c:6134 #, c-format msgid "STO_OFF (store offset to psect)\n" msgstr "" -#: vms-alpha.c:6137 +#: vms-alpha.c:6140 #, c-format msgid "STO_IMM (store immediate) %u bytes\n" msgstr "" -#: vms-alpha.c:6144 +#: vms-alpha.c:6147 #, c-format msgid "STO_GBL_LW (store global longword) %.*s\n" msgstr "" -#: vms-alpha.c:6148 +#: vms-alpha.c:6151 #, c-format msgid "STO_OFF (store LP with procedure signature)\n" msgstr "" -#: vms-alpha.c:6151 +#: vms-alpha.c:6154 #, c-format msgid "STO_BR_GBL (store branch global) *todo*\n" msgstr "" -#: vms-alpha.c:6154 +#: vms-alpha.c:6157 #, c-format msgid "STO_BR_PS (store branch psect + offset) *todo*\n" msgstr "" -#: vms-alpha.c:6158 +#: vms-alpha.c:6161 #, c-format msgid "OPR_NOP (no-operation)\n" msgstr "" -#: vms-alpha.c:6161 +#: vms-alpha.c:6164 #, c-format msgid "OPR_ADD (add)\n" msgstr "" -#: vms-alpha.c:6164 +#: vms-alpha.c:6167 #, c-format msgid "OPR_SUB (substract)\n" msgstr "" -#: vms-alpha.c:6167 +#: vms-alpha.c:6170 #, c-format msgid "OPR_MUL (multiply)\n" msgstr "" -#: vms-alpha.c:6170 +#: vms-alpha.c:6173 #, c-format msgid "OPR_DIV (divide)\n" msgstr "" -#: vms-alpha.c:6173 +#: vms-alpha.c:6176 #, c-format msgid "OPR_AND (logical and)\n" msgstr "" -#: vms-alpha.c:6176 +#: vms-alpha.c:6179 #, c-format msgid "OPR_IOR (logical inclusive or)\n" msgstr "" -#: vms-alpha.c:6179 +#: vms-alpha.c:6182 #, c-format msgid "OPR_EOR (logical exclusive or)\n" msgstr "" -#: vms-alpha.c:6182 +#: vms-alpha.c:6185 #, c-format msgid "OPR_NEG (negate)\n" msgstr "" -#: vms-alpha.c:6185 +#: vms-alpha.c:6188 #, c-format msgid "OPR_COM (complement)\n" msgstr "" -#: vms-alpha.c:6188 +#: vms-alpha.c:6191 #, c-format msgid "OPR_INSV (insert field)\n" msgstr "" -#: vms-alpha.c:6191 +#: vms-alpha.c:6194 #, c-format msgid "OPR_ASH (arithmetic shift)\n" msgstr "" -#: vms-alpha.c:6194 +#: vms-alpha.c:6197 #, c-format msgid "OPR_USH (unsigned shift)\n" msgstr "" -#: vms-alpha.c:6197 +#: vms-alpha.c:6200 #, c-format msgid "OPR_ROT (rotate)\n" msgstr "" -#: vms-alpha.c:6200 +#: vms-alpha.c:6203 #, c-format msgid "OPR_SEL (select)\n" msgstr "" -#: vms-alpha.c:6203 +#: vms-alpha.c:6206 #, c-format msgid "OPR_REDEF (redefine symbol to curr location)\n" msgstr "" -#: vms-alpha.c:6206 +#: vms-alpha.c:6209 #, c-format msgid "OPR_REDEF (define a literal)\n" msgstr "" -#: vms-alpha.c:6210 +#: vms-alpha.c:6213 #, c-format msgid "STC_LP (store cond linkage pair)\n" msgstr "" -#: vms-alpha.c:6214 +#: vms-alpha.c:6217 #, c-format msgid "STC_LP_PSB (store cond linkage pair + signature)\n" msgstr "" -#: vms-alpha.c:6215 +#: vms-alpha.c:6218 #, c-format msgid " linkage index: %u, procedure: %.*s\n" msgstr "" -#: vms-alpha.c:6218 +#: vms-alpha.c:6221 #, c-format msgid " signature: %.*s\n" msgstr "" -#: vms-alpha.c:6221 +#: vms-alpha.c:6224 #, c-format msgid "STC_GBL (store cond global)\n" msgstr "" -#: vms-alpha.c:6222 +#: vms-alpha.c:6225 #, c-format msgid " linkage index: %u, global: %.*s\n" msgstr "" -#: vms-alpha.c:6226 +#: vms-alpha.c:6229 #, c-format msgid "STC_GCA (store cond code address)\n" msgstr "" -#: vms-alpha.c:6227 +#: vms-alpha.c:6230 #, c-format msgid " linkage index: %u, procedure name: %.*s\n" msgstr "" -#: vms-alpha.c:6231 +#: vms-alpha.c:6234 #, c-format msgid "STC_PS (store cond psect + offset)\n" msgstr "" -#: vms-alpha.c:6233 +#: vms-alpha.c:6236 #, c-format msgid " linkage index: %u, psect: %u, offset: 0x%08x %08x\n" msgstr "" -#: vms-alpha.c:6240 +#: vms-alpha.c:6243 #, c-format msgid "STC_NOP_GBL (store cond NOP at global addr)\n" msgstr "" -#: vms-alpha.c:6244 +#: vms-alpha.c:6247 #, c-format msgid "STC_NOP_PS (store cond NOP at psect + offset)\n" msgstr "" -#: vms-alpha.c:6248 +#: vms-alpha.c:6251 #, c-format msgid "STC_BSR_GBL (store cond BSR at global addr)\n" msgstr "" -#: vms-alpha.c:6252 +#: vms-alpha.c:6255 #, c-format msgid "STC_BSR_PS (store cond BSR at psect + offset)\n" msgstr "" -#: vms-alpha.c:6256 +#: vms-alpha.c:6259 #, c-format msgid "STC_LDA_GBL (store cond LDA at global addr)\n" msgstr "" -#: vms-alpha.c:6260 +#: vms-alpha.c:6263 #, c-format msgid "STC_LDA_PS (store cond LDA at psect + offset)\n" msgstr "" -#: vms-alpha.c:6264 +#: vms-alpha.c:6267 #, c-format msgid "STC_BOH_GBL (store cond BOH at global addr)\n" msgstr "" -#: vms-alpha.c:6268 +#: vms-alpha.c:6271 #, c-format msgid "STC_BOH_PS (store cond BOH at psect + offset)\n" msgstr "" -#: vms-alpha.c:6273 +#: vms-alpha.c:6276 #, c-format msgid "STC_NBH_GBL (store cond or hint at global addr)\n" msgstr "" -#: vms-alpha.c:6277 +#: vms-alpha.c:6280 #, c-format msgid "STC_NBH_PS (store cond or hint at psect + offset)\n" msgstr "" -#: vms-alpha.c:6281 +#: vms-alpha.c:6284 #, c-format msgid "CTL_SETRB (set relocation base)\n" msgstr "" -#: vms-alpha.c:6287 +#: vms-alpha.c:6290 #, c-format msgid "CTL_AUGRB (augment relocation base) %u\n" msgstr "" -#: vms-alpha.c:6291 +#: vms-alpha.c:6294 #, c-format msgid "CTL_DFLOC (define location)\n" msgstr "" -#: vms-alpha.c:6294 +#: vms-alpha.c:6297 #, c-format msgid "CTL_STLOC (set location)\n" msgstr "" -#: vms-alpha.c:6297 +#: vms-alpha.c:6300 #, c-format msgid "CTL_STKDL (stack defined location)\n" msgstr "" -#: vms-alpha.c:6300 vms-alpha.c:6714 +#: vms-alpha.c:6303 vms-alpha.c:6717 #, c-format msgid "*unhandled*\n" msgstr "" -#: vms-alpha.c:6330 vms-alpha.c:6369 +#: vms-alpha.c:6333 vms-alpha.c:6372 #, c-format msgid "cannot read GST record length\n" msgstr "" #. Ill-formed. -#: vms-alpha.c:6351 +#: vms-alpha.c:6354 #, c-format msgid "cannot find EMH in first GST record\n" msgstr "" -#: vms-alpha.c:6377 +#: vms-alpha.c:6380 #, c-format msgid "cannot read GST record header\n" msgstr "" -#: vms-alpha.c:6390 +#: vms-alpha.c:6393 #, c-format msgid " corrupted GST\n" msgstr "" -#: vms-alpha.c:6398 +#: vms-alpha.c:6401 #, c-format msgid "cannot read GST record\n" msgstr "" -#: vms-alpha.c:6427 +#: vms-alpha.c:6430 #, c-format msgid " unhandled EOBJ record type %u\n" msgstr "" -#: vms-alpha.c:6450 +#: vms-alpha.c:6453 #, c-format msgid " bitcount: %u, base addr: 0x%08x\n" msgstr "" -#: vms-alpha.c:6463 +#: vms-alpha.c:6466 #, c-format msgid " bitmap: 0x%08x (count: %u):\n" msgstr "" -#: vms-alpha.c:6470 +#: vms-alpha.c:6473 #, c-format msgid " %08x" msgstr "" -#: vms-alpha.c:6495 +#: vms-alpha.c:6498 #, c-format msgid " image %u (%u entries)\n" msgstr "" -#: vms-alpha.c:6500 +#: vms-alpha.c:6503 #, c-format msgid " offset: 0x%08x, val: 0x%08x\n" msgstr "" -#: vms-alpha.c:6521 +#: vms-alpha.c:6524 #, c-format msgid " image %u (%u entries), offsets:\n" msgstr "" -#: vms-alpha.c:6528 +#: vms-alpha.c:6531 #, c-format msgid " 0x%08x" msgstr "" #. 64 bits. -#: vms-alpha.c:6650 +#: vms-alpha.c:6653 #, c-format msgid "64 bits *unhandled*\n" msgstr "" -#: vms-alpha.c:6654 +#: vms-alpha.c:6657 #, c-format msgid "class: %u, dtype: %u, length: %u, pointer: 0x%08x\n" msgstr "" -#: vms-alpha.c:6665 +#: vms-alpha.c:6668 #, c-format msgid "non-contiguous array of %s\n" msgstr "" -#: vms-alpha.c:6669 +#: vms-alpha.c:6672 #, c-format msgid "dimct: %u, aflags: 0x%02x, digits: %u, scale: %u\n" msgstr "" -#: vms-alpha.c:6673 +#: vms-alpha.c:6676 #, c-format msgid "arsize: %u, a0: 0x%08x\n" msgstr "" -#: vms-alpha.c:6677 +#: vms-alpha.c:6680 #, c-format msgid "Strides:\n" msgstr "" -#: vms-alpha.c:6682 +#: vms-alpha.c:6685 #, c-format msgid "[%u]: %u\n" msgstr "" -#: vms-alpha.c:6687 +#: vms-alpha.c:6690 #, c-format msgid "Bounds:\n" msgstr "" -#: vms-alpha.c:6692 +#: vms-alpha.c:6695 #, c-format msgid "[%u]: Lower: %u, upper: %u\n" msgstr "" -#: vms-alpha.c:6704 +#: vms-alpha.c:6707 #, c-format msgid "unaligned bit-string of %s\n" msgstr "" -#: vms-alpha.c:6708 +#: vms-alpha.c:6711 #, c-format msgid "base: %u, pos: %u\n" msgstr "" -#: vms-alpha.c:6728 +#: vms-alpha.c:6731 #, c-format msgid "vflags: 0x%02x, value: 0x%08x " msgstr "" -#: vms-alpha.c:6734 +#: vms-alpha.c:6737 #, c-format msgid "(no value)\n" msgstr "" -#: vms-alpha.c:6737 +#: vms-alpha.c:6740 #, c-format msgid "(not active)\n" msgstr "" -#: vms-alpha.c:6740 +#: vms-alpha.c:6743 #, c-format msgid "(not allocated)\n" msgstr "" -#: vms-alpha.c:6743 +#: vms-alpha.c:6746 #, c-format msgid "(descriptor)\n" msgstr "" -#: vms-alpha.c:6747 +#: vms-alpha.c:6750 #, c-format msgid "(trailing value)\n" msgstr "" -#: vms-alpha.c:6750 +#: vms-alpha.c:6753 #, c-format msgid "(value spec follows)\n" msgstr "" -#: vms-alpha.c:6753 +#: vms-alpha.c:6756 #, c-format msgid "(at bit offset %u)\n" msgstr "" -#: vms-alpha.c:6756 +#: vms-alpha.c:6759 #, c-format msgid "(reg: %u, disp: %u, indir: %u, kind: " msgstr "" -#: vms-alpha.c:6763 +#: vms-alpha.c:6766 msgid "literal" msgstr "" -#: vms-alpha.c:6766 +#: vms-alpha.c:6769 msgid "address" msgstr "" -#: vms-alpha.c:6769 +#: vms-alpha.c:6772 msgid "desc" msgstr "" -#: vms-alpha.c:6772 +#: vms-alpha.c:6775 msgid "reg" msgstr "" -#: vms-alpha.c:6847 +#: vms-alpha.c:6850 #, c-format msgid "Debug symbol table:\n" msgstr "" -#: vms-alpha.c:6858 +#: vms-alpha.c:6861 #, c-format msgid "cannot read DST header\n" msgstr "" -#: vms-alpha.c:6863 +#: vms-alpha.c:6866 #, c-format msgid " type: %3u, len: %3u (at 0x%08x): " msgstr "" -#: vms-alpha.c:6877 +#: vms-alpha.c:6880 #, c-format msgid "cannot read DST symbol\n" msgstr "" -#: vms-alpha.c:6920 +#: vms-alpha.c:6923 #, c-format msgid "standard data: %s\n" msgstr "" -#: vms-alpha.c:6923 vms-alpha.c:7007 +#: vms-alpha.c:6926 vms-alpha.c:7010 #, c-format msgid " name: %.*s\n" msgstr "" -#: vms-alpha.c:6930 +#: vms-alpha.c:6933 #, c-format msgid "modbeg\n" msgstr "" -#: vms-alpha.c:6931 +#: vms-alpha.c:6934 #, c-format msgid " flags: %d, language: %u, major: %u, minor: %u\n" msgstr "" -#: vms-alpha.c:6937 vms-alpha.c:7203 +#: vms-alpha.c:6940 vms-alpha.c:7206 #, c-format msgid " module name: %.*s\n" msgstr "" -#: vms-alpha.c:6940 +#: vms-alpha.c:6943 #, c-format msgid " compiler : %.*s\n" msgstr "" -#: vms-alpha.c:6945 +#: vms-alpha.c:6948 #, c-format msgid "modend\n" msgstr "" -#: vms-alpha.c:6952 +#: vms-alpha.c:6955 msgid "rtnbeg\n" msgstr "" -#: vms-alpha.c:6953 +#: vms-alpha.c:6956 #, c-format msgid " flags: %u, address: 0x%08x, pd-address: 0x%08x\n" msgstr "" -#: vms-alpha.c:6958 +#: vms-alpha.c:6961 #, c-format msgid " routine name: %.*s\n" msgstr "" -#: vms-alpha.c:6966 +#: vms-alpha.c:6969 #, c-format msgid "rtnend: size 0x%08x\n" msgstr "" -#: vms-alpha.c:6974 +#: vms-alpha.c:6977 #, c-format msgid "prolog: bkpt address 0x%08x\n" msgstr "" -#: vms-alpha.c:6982 +#: vms-alpha.c:6985 #, c-format msgid "epilog: flags: %u, count: %u\n" msgstr "" -#: vms-alpha.c:6991 +#: vms-alpha.c:6994 #, c-format msgid "blkbeg: address: 0x%08x, name: %.*s\n" msgstr "" -#: vms-alpha.c:7000 +#: vms-alpha.c:7003 #, c-format msgid "blkend: size: 0x%08x\n" msgstr "" -#: vms-alpha.c:7006 +#: vms-alpha.c:7009 #, c-format msgid "typspec (len: %u)\n" msgstr "" -#: vms-alpha.c:7013 +#: vms-alpha.c:7016 #, c-format msgid "septyp, name: %.*s\n" msgstr "" -#: vms-alpha.c:7022 +#: vms-alpha.c:7025 #, c-format msgid "recbeg: name: %.*s\n" msgstr "" -#: vms-alpha.c:7029 +#: vms-alpha.c:7032 #, c-format msgid "recend\n" msgstr "" -#: vms-alpha.c:7032 +#: vms-alpha.c:7035 #, c-format msgid "enumbeg, len: %u, name: %.*s\n" msgstr "" -#: vms-alpha.c:7036 +#: vms-alpha.c:7039 #, c-format msgid "enumelt, name: %.*s\n" msgstr "" -#: vms-alpha.c:7040 +#: vms-alpha.c:7043 #, c-format msgid "enumend\n" msgstr "" -#: vms-alpha.c:7057 +#: vms-alpha.c:7060 #, c-format msgid "discontiguous range (nbr: %u)\n" msgstr "" -#: vms-alpha.c:7059 +#: vms-alpha.c:7062 #, c-format msgid " address: 0x%08x, size: %u\n" msgstr "" -#: vms-alpha.c:7069 +#: vms-alpha.c:7072 #, c-format msgid "line num (len: %u)\n" msgstr "" -#: vms-alpha.c:7086 +#: vms-alpha.c:7089 #, c-format msgid "delta_pc_w %u\n" msgstr "" -#: vms-alpha.c:7093 +#: vms-alpha.c:7096 #, c-format msgid "incr_linum(b): +%u\n" msgstr "" -#: vms-alpha.c:7099 +#: vms-alpha.c:7102 #, c-format msgid "incr_linum_w: +%u\n" msgstr "" -#: vms-alpha.c:7105 +#: vms-alpha.c:7108 #, c-format msgid "incr_linum_l: +%u\n" msgstr "" -#: vms-alpha.c:7111 +#: vms-alpha.c:7114 #, c-format msgid "set_line_num(w) %u\n" msgstr "" -#: vms-alpha.c:7116 +#: vms-alpha.c:7119 #, c-format msgid "set_line_num_b %u\n" msgstr "" -#: vms-alpha.c:7121 +#: vms-alpha.c:7124 #, c-format msgid "set_line_num_l %u\n" msgstr "" -#: vms-alpha.c:7126 +#: vms-alpha.c:7129 #, c-format msgid "set_abs_pc: 0x%08x\n" msgstr "" -#: vms-alpha.c:7130 +#: vms-alpha.c:7133 #, c-format msgid "delta_pc_l: +0x%08x\n" msgstr "" -#: vms-alpha.c:7135 +#: vms-alpha.c:7138 #, c-format msgid "term(b): 0x%02x" msgstr "" -#: vms-alpha.c:7137 +#: vms-alpha.c:7140 #, c-format msgid " pc: 0x%08x\n" msgstr "" -#: vms-alpha.c:7142 +#: vms-alpha.c:7145 #, c-format msgid "term_w: 0x%04x" msgstr "" -#: vms-alpha.c:7144 +#: vms-alpha.c:7147 #, c-format msgid " pc: 0x%08x\n" msgstr "" -#: vms-alpha.c:7150 +#: vms-alpha.c:7153 #, c-format msgid "delta pc +%-4d" msgstr "" -#: vms-alpha.c:7153 +#: vms-alpha.c:7156 #, c-format msgid " pc: 0x%08x line: %5u\n" msgstr "" -#: vms-alpha.c:7158 +#: vms-alpha.c:7161 #, c-format msgid " *unhandled* cmd %u\n" msgstr "" -#: vms-alpha.c:7173 +#: vms-alpha.c:7176 #, c-format msgid "source (len: %u)\n" msgstr "" -#: vms-alpha.c:7187 +#: vms-alpha.c:7190 #, c-format msgid " declfile: len: %u, flags: %u, fileid: %u\n" msgstr "" -#: vms-alpha.c:7191 +#: vms-alpha.c:7194 #, c-format msgid " rms: cdt: 0x%08x %08x, ebk: 0x%08x, ffb: 0x%04x, rfo: %u\n" msgstr "" -#: vms-alpha.c:7200 +#: vms-alpha.c:7203 #, c-format msgid " filename : %.*s\n" msgstr "" -#: vms-alpha.c:7209 +#: vms-alpha.c:7212 #, c-format msgid " setfile %u\n" msgstr "" -#: vms-alpha.c:7214 vms-alpha.c:7219 +#: vms-alpha.c:7217 vms-alpha.c:7222 #, c-format msgid " setrec %u\n" msgstr "" -#: vms-alpha.c:7224 vms-alpha.c:7229 +#: vms-alpha.c:7227 vms-alpha.c:7232 #, c-format msgid " setlnum %u\n" msgstr "" -#: vms-alpha.c:7234 vms-alpha.c:7239 +#: vms-alpha.c:7237 vms-alpha.c:7242 #, c-format msgid " deflines %u\n" msgstr "" -#: vms-alpha.c:7243 +#: vms-alpha.c:7246 #, c-format msgid " formfeed\n" msgstr "" -#: vms-alpha.c:7247 +#: vms-alpha.c:7250 #, c-format msgid " *unhandled* cmd %u\n" msgstr "" -#: vms-alpha.c:7259 +#: vms-alpha.c:7262 #, c-format msgid "*unhandled* dst type %u\n" msgstr "" -#: vms-alpha.c:7291 +#: vms-alpha.c:7294 #, c-format msgid "cannot read EIHD\n" msgstr "" -#: vms-alpha.c:7294 +#: vms-alpha.c:7297 #, c-format msgid "EIHD: (size: %u, nbr blocks: %u)\n" msgstr "" -#: vms-alpha.c:7297 +#: vms-alpha.c:7300 #, c-format msgid " majorid: %u, minorid: %u\n" msgstr "" -#: vms-alpha.c:7305 +#: vms-alpha.c:7308 msgid "executable" msgstr "" -#: vms-alpha.c:7308 +#: vms-alpha.c:7311 msgid "linkable image" msgstr "" -#: vms-alpha.c:7314 +#: vms-alpha.c:7317 #, c-format msgid " image type: %u (%s)" msgstr "" -#: vms-alpha.c:7320 +#: vms-alpha.c:7323 msgid "native" msgstr "" -#: vms-alpha.c:7323 +#: vms-alpha.c:7326 msgid "CLI" msgstr "" -#: vms-alpha.c:7329 +#: vms-alpha.c:7332 #, c-format msgid ", subtype: %u (%s)\n" msgstr "" -#: vms-alpha.c:7335 +#: vms-alpha.c:7338 #, c-format msgid " offsets: isd: %u, activ: %u, symdbg: %u, imgid: %u, patch: %u\n" msgstr "" -#: vms-alpha.c:7339 +#: vms-alpha.c:7342 #, c-format msgid " fixup info rva: " msgstr "" -#: vms-alpha.c:7341 +#: vms-alpha.c:7344 #, c-format msgid ", symbol vector rva: " msgstr "" -#: vms-alpha.c:7344 +#: vms-alpha.c:7347 #, c-format msgid "" "\n" " version array off: %u\n" msgstr "" -#: vms-alpha.c:7348 +#: vms-alpha.c:7351 #, c-format msgid " img I/O count: %u, nbr channels: %u, req pri: %08x%08x\n" msgstr "" -#: vms-alpha.c:7354 +#: vms-alpha.c:7357 #, c-format msgid " linker flags: %08x:" msgstr "" -#: vms-alpha.c:7384 +#: vms-alpha.c:7387 #, c-format msgid " ident: 0x%08x, sysver: 0x%08x, match ctrl: %u, symvect_size: %u\n" msgstr "" -#: vms-alpha.c:7390 +#: vms-alpha.c:7393 #, c-format msgid " BPAGE: %u" msgstr "" -#: vms-alpha.c:7396 +#: vms-alpha.c:7399 #, c-format msgid ", ext fixup offset: %u, no_opt psect off: %u" msgstr "" -#: vms-alpha.c:7399 +#: vms-alpha.c:7402 #, c-format msgid ", alias: %u\n" msgstr "" -#: vms-alpha.c:7407 +#: vms-alpha.c:7410 #, c-format msgid "system version array information:\n" msgstr "" -#: vms-alpha.c:7411 +#: vms-alpha.c:7414 #, c-format msgid "cannot read EIHVN header\n" msgstr "" -#: vms-alpha.c:7421 +#: vms-alpha.c:7424 #, c-format msgid "cannot read EIHVN version\n" msgstr "" -#: vms-alpha.c:7424 +#: vms-alpha.c:7427 #, c-format msgid " %02u " msgstr "" -#: vms-alpha.c:7428 +#: vms-alpha.c:7431 msgid "BASE_IMAGE " msgstr "" -#: vms-alpha.c:7431 +#: vms-alpha.c:7434 msgid "MEMORY_MANAGEMENT" msgstr "" -#: vms-alpha.c:7434 +#: vms-alpha.c:7437 msgid "IO " msgstr "" -#: vms-alpha.c:7437 +#: vms-alpha.c:7440 msgid "FILES_VOLUMES " msgstr "" -#: vms-alpha.c:7440 +#: vms-alpha.c:7443 msgid "PROCESS_SCHED " msgstr "" -#: vms-alpha.c:7443 +#: vms-alpha.c:7446 msgid "SYSGEN " msgstr "" -#: vms-alpha.c:7446 +#: vms-alpha.c:7449 msgid "CLUSTERS_LOCKMGR " msgstr "" -#: vms-alpha.c:7449 +#: vms-alpha.c:7452 msgid "LOGICAL_NAMES " msgstr "" -#: vms-alpha.c:7452 +#: vms-alpha.c:7455 msgid "SECURITY " msgstr "" -#: vms-alpha.c:7455 +#: vms-alpha.c:7458 msgid "IMAGE_ACTIVATOR " msgstr "" -#: vms-alpha.c:7458 +#: vms-alpha.c:7461 msgid "NETWORKS " msgstr "" -#: vms-alpha.c:7461 +#: vms-alpha.c:7464 msgid "COUNTERS " msgstr "" -#: vms-alpha.c:7464 +#: vms-alpha.c:7467 msgid "STABLE " msgstr "" -#: vms-alpha.c:7467 +#: vms-alpha.c:7470 msgid "MISC " msgstr "" -#: vms-alpha.c:7470 +#: vms-alpha.c:7473 msgid "CPU " msgstr "" -#: vms-alpha.c:7473 +#: vms-alpha.c:7476 msgid "VOLATILE " msgstr "" -#: vms-alpha.c:7476 +#: vms-alpha.c:7479 msgid "SHELL " msgstr "" -#: vms-alpha.c:7479 +#: vms-alpha.c:7482 msgid "POSIX " msgstr "" -#: vms-alpha.c:7482 +#: vms-alpha.c:7485 msgid "MULTI_PROCESSING " msgstr "" -#: vms-alpha.c:7485 +#: vms-alpha.c:7488 msgid "GALAXY " msgstr "" -#: vms-alpha.c:7488 +#: vms-alpha.c:7491 msgid "*unknown* " msgstr "" -#: vms-alpha.c:7491 +#: vms-alpha.c:7494 #, c-format msgid ": %u.%u\n" msgstr "" -#: vms-alpha.c:7504 vms-alpha.c:7763 +#: vms-alpha.c:7507 vms-alpha.c:7766 #, c-format msgid "cannot read EIHA\n" msgstr "" -#: vms-alpha.c:7507 +#: vms-alpha.c:7510 #, c-format msgid "Image activation: (size=%u)\n" msgstr "" -#: vms-alpha.c:7509 +#: vms-alpha.c:7512 #, c-format msgid " First address : 0x%08x 0x%08x\n" msgstr "" -#: vms-alpha.c:7512 +#: vms-alpha.c:7515 #, c-format msgid " Second address: 0x%08x 0x%08x\n" msgstr "" -#: vms-alpha.c:7515 +#: vms-alpha.c:7518 #, c-format msgid " Third address : 0x%08x 0x%08x\n" msgstr "" -#: vms-alpha.c:7518 +#: vms-alpha.c:7521 #, c-format msgid " Fourth address: 0x%08x 0x%08x\n" msgstr "" -#: vms-alpha.c:7521 +#: vms-alpha.c:7524 #, c-format msgid " Shared image : 0x%08x 0x%08x\n" msgstr "" -#: vms-alpha.c:7532 +#: vms-alpha.c:7535 #, c-format msgid "cannot read EIHI\n" msgstr "" -#: vms-alpha.c:7535 +#: vms-alpha.c:7538 #, c-format msgid "Image identification: (major: %u, minor: %u)\n" msgstr "" -#: vms-alpha.c:7538 +#: vms-alpha.c:7541 #, c-format msgid " image name : %.*s\n" msgstr "" -#: vms-alpha.c:7540 +#: vms-alpha.c:7543 #, c-format msgid " link time : %s\n" msgstr "" -#: vms-alpha.c:7542 +#: vms-alpha.c:7545 #, c-format msgid " image ident : %.*s\n" msgstr "" -#: vms-alpha.c:7544 +#: vms-alpha.c:7547 #, c-format msgid " linker ident : %.*s\n" msgstr "" -#: vms-alpha.c:7546 +#: vms-alpha.c:7549 #, c-format msgid " image build ident: %.*s\n" msgstr "" -#: vms-alpha.c:7556 +#: vms-alpha.c:7559 #, c-format msgid "cannot read EIHS\n" msgstr "" -#: vms-alpha.c:7559 +#: vms-alpha.c:7562 #, c-format msgid "Image symbol & debug table: (major: %u, minor: %u)\n" msgstr "" -#: vms-alpha.c:7564 +#: vms-alpha.c:7567 #, c-format msgid " debug symbol table : vbn: %u, size: %u (0x%x)\n" msgstr "" -#: vms-alpha.c:7568 +#: vms-alpha.c:7571 #, c-format msgid " global symbol table: vbn: %u, records: %u\n" msgstr "" -#: vms-alpha.c:7572 +#: vms-alpha.c:7575 #, c-format msgid " debug module table : vbn: %u, size: %u\n" msgstr "" -#: vms-alpha.c:7585 +#: vms-alpha.c:7588 #, c-format msgid "cannot read EISD\n" msgstr "" -#: vms-alpha.c:7595 +#: vms-alpha.c:7598 #, c-format msgid "" "Image section descriptor: (major: %u, minor: %u, size: %u, offset: %u)\n" msgstr "" -#: vms-alpha.c:7602 +#: vms-alpha.c:7605 #, c-format msgid " section: base: 0x%08x%08x size: 0x%08x\n" msgstr "" -#: vms-alpha.c:7607 +#: vms-alpha.c:7610 #, c-format msgid " flags: 0x%04x" msgstr "" -#: vms-alpha.c:7644 +#: vms-alpha.c:7647 #, c-format msgid " vbn: %u, pfc: %u, matchctl: %u type: %u (" msgstr "" -#: vms-alpha.c:7650 +#: vms-alpha.c:7653 msgid "NORMAL" msgstr "" -#: vms-alpha.c:7653 +#: vms-alpha.c:7656 msgid "SHRFXD" msgstr "" -#: vms-alpha.c:7656 +#: vms-alpha.c:7659 msgid "PRVFXD" msgstr "" -#: vms-alpha.c:7659 +#: vms-alpha.c:7662 msgid "SHRPIC" msgstr "" -#: vms-alpha.c:7662 +#: vms-alpha.c:7665 msgid "PRVPIC" msgstr "" -#: vms-alpha.c:7665 +#: vms-alpha.c:7668 msgid "USRSTACK" msgstr "" -#: vms-alpha.c:7673 +#: vms-alpha.c:7676 #, c-format msgid " ident: 0x%08x, name: %.*s\n" msgstr "" -#: vms-alpha.c:7683 +#: vms-alpha.c:7686 #, c-format msgid "cannot read DMT\n" msgstr "" -#: vms-alpha.c:7687 +#: vms-alpha.c:7690 #, c-format msgid "Debug module table:\n" msgstr "" -#: vms-alpha.c:7696 +#: vms-alpha.c:7699 #, c-format msgid "cannot read DMT header\n" msgstr "" -#: vms-alpha.c:7701 +#: vms-alpha.c:7704 #, c-format msgid " module offset: 0x%08x, size: 0x%08x, (%u psects)\n" msgstr "" -#: vms-alpha.c:7711 +#: vms-alpha.c:7714 #, c-format msgid "cannot read DMT psect\n" msgstr "" -#: vms-alpha.c:7714 +#: vms-alpha.c:7717 #, c-format msgid " psect start: 0x%08x, length: %u\n" msgstr "" -#: vms-alpha.c:7727 +#: vms-alpha.c:7730 #, c-format msgid "cannot read DST\n" msgstr "" -#: vms-alpha.c:7737 +#: vms-alpha.c:7740 #, c-format msgid "cannot read GST\n" msgstr "" -#: vms-alpha.c:7741 +#: vms-alpha.c:7744 #, c-format msgid "Global symbol table:\n" msgstr "" -#: vms-alpha.c:7769 +#: vms-alpha.c:7772 #, c-format msgid "Image activator fixup: (major: %u, minor: %u)\n" msgstr "" -#: vms-alpha.c:7772 +#: vms-alpha.c:7775 #, c-format msgid " iaflink : 0x%08x %08x\n" msgstr "" -#: vms-alpha.c:7775 +#: vms-alpha.c:7778 #, c-format msgid " fixuplnk: 0x%08x %08x\n" msgstr "" -#: vms-alpha.c:7778 +#: vms-alpha.c:7781 #, c-format msgid " size : %u\n" msgstr "" -#: vms-alpha.c:7780 +#: vms-alpha.c:7783 #, c-format msgid " flags: 0x%08x\n" msgstr "" -#: vms-alpha.c:7784 +#: vms-alpha.c:7787 #, c-format msgid " qrelfixoff: %5u, lrelfixoff: %5u\n" msgstr "" -#: vms-alpha.c:7788 +#: vms-alpha.c:7791 #, c-format msgid " qdotadroff: %5u, ldotadroff: %5u\n" msgstr "" -#: vms-alpha.c:7792 +#: vms-alpha.c:7795 #, c-format msgid " codeadroff: %5u, lpfixoff : %5u\n" msgstr "" -#: vms-alpha.c:7795 +#: vms-alpha.c:7798 #, c-format msgid " chgprtoff : %5u\n" msgstr "" -#: vms-alpha.c:7798 +#: vms-alpha.c:7801 #, c-format msgid " shlstoff : %5u, shrimgcnt : %5u\n" msgstr "" -#: vms-alpha.c:7800 +#: vms-alpha.c:7803 #, c-format msgid " shlextra : %5u, permctx : %5u\n" msgstr "" -#: vms-alpha.c:7803 +#: vms-alpha.c:7806 #, c-format msgid " base_va : 0x%08x\n" msgstr "" -#: vms-alpha.c:7805 +#: vms-alpha.c:7808 #, c-format msgid " lppsbfixoff: %5u\n" msgstr "" -#: vms-alpha.c:7813 +#: vms-alpha.c:7816 #, c-format msgid " Shareable images:\n" msgstr "" -#: vms-alpha.c:7817 +#: vms-alpha.c:7820 #, c-format msgid " %u: size: %u, flags: 0x%02x, name: %.*s\n" msgstr "" -#: vms-alpha.c:7824 +#: vms-alpha.c:7827 #, c-format msgid " quad-word relocation fixups:\n" msgstr "" -#: vms-alpha.c:7829 +#: vms-alpha.c:7832 #, c-format msgid " long-word relocation fixups:\n" msgstr "" -#: vms-alpha.c:7834 +#: vms-alpha.c:7837 #, c-format msgid " quad-word .address reference fixups:\n" msgstr "" -#: vms-alpha.c:7839 +#: vms-alpha.c:7842 #, c-format msgid " long-word .address reference fixups:\n" msgstr "" -#: vms-alpha.c:7844 +#: vms-alpha.c:7847 #, c-format msgid " Code Address Reference Fixups:\n" msgstr "" -#: vms-alpha.c:7849 +#: vms-alpha.c:7852 #, c-format msgid " Linkage Pairs Referece Fixups:\n" msgstr "" -#: vms-alpha.c:7858 +#: vms-alpha.c:7861 #, c-format msgid " Change Protection (%u entries):\n" msgstr "" -#: vms-alpha.c:7863 +#: vms-alpha.c:7866 #, c-format msgid " base: 0x%08x %08x, size: 0x%08x, prot: 0x%08x " msgstr "" #. FIXME: we do not yet support relocatable link. It is not obvious #. how to do it for debug infos. -#: vms-alpha.c:8694 +#: vms-alpha.c:8706 msgid "%P: relocatable link is not supported\n" msgstr "" -#: vms-alpha.c:8764 +#: vms-alpha.c:8776 msgid "%P: multiple entry points: in modules %B and %B\n" msgstr "" -#: vms-lib.c:1421 +#: vms-lib.c:1423 #, c-format msgid "could not open shared image '%s' from '%s'" msgstr "" @@ -5842,23 +5852,23 @@ msgid "warning: attempt to export undefined symbol `%s'" msgstr "警告：试图导出未定义的符号“%s”" -#: xcofflink.c:3681 +#: xcofflink.c:3678 msgid "error: undefined symbol __rtinit" msgstr "错误：未定义的符号 __rtinit" -#: xcofflink.c:4060 +#: xcofflink.c:4057 msgid "%B: loader reloc in unrecognized section `%s'" msgstr "" -#: xcofflink.c:4071 +#: xcofflink.c:4068 msgid "%B: `%s' in loader reloc but not loader sym" msgstr "" -#: xcofflink.c:4087 +#: xcofflink.c:4084 msgid "%B: loader reloc in read-only section %A" msgstr "" -#: xcofflink.c:5109 +#: xcofflink.c:5106 #, c-format msgid "TOC overflow: 0x%lx > 0x10000; try -mminimal-toc when compiling" msgstr "" @@ -5869,77 +5879,77 @@ "branch." msgstr "" -#: elf32-ia64.c:2290 elf64-ia64.c:2290 +#: elf32-ia64.c:2284 elf64-ia64.c:2284 msgid "@pltoff reloc against local symbol" msgstr "" -#: elf32-ia64.c:3693 elf64-ia64.c:3693 +#: elf32-ia64.c:3687 elf64-ia64.c:3687 #, c-format msgid "%s: short data segment overflowed (0x%lx >= 0x400000)" msgstr "" -#: elf32-ia64.c:3704 elf64-ia64.c:3704 +#: elf32-ia64.c:3698 elf64-ia64.c:3698 #, c-format msgid "%s: __gp does not cover short data segment" msgstr "" -#: elf32-ia64.c:3971 elf64-ia64.c:3971 +#: elf32-ia64.c:3965 elf64-ia64.c:3965 msgid "%B: non-pic code with imm relocation against dynamic symbol `%s'" msgstr "" -#: elf32-ia64.c:4038 elf64-ia64.c:4038 +#: elf32-ia64.c:4032 elf64-ia64.c:4032 msgid "%B: @gprel relocation against dynamic symbol %s" msgstr "" -#: elf32-ia64.c:4101 elf64-ia64.c:4101 +#: elf32-ia64.c:4095 elf64-ia64.c:4095 msgid "%B: linking non-pic code in a position independent executable" msgstr "" -#: elf32-ia64.c:4238 elf64-ia64.c:4238 +#: elf32-ia64.c:4232 elf64-ia64.c:4232 msgid "%B: @internal branch to dynamic symbol %s" msgstr "" -#: elf32-ia64.c:4240 elf64-ia64.c:4240 +#: elf32-ia64.c:4234 elf64-ia64.c:4234 msgid "%B: speculation fixup to dynamic symbol %s" msgstr "" -#: elf32-ia64.c:4242 elf64-ia64.c:4242 +#: elf32-ia64.c:4236 elf64-ia64.c:4236 msgid "%B: @pcrel relocation against dynamic symbol %s" msgstr "" -#: elf32-ia64.c:4439 elf64-ia64.c:4439 +#: elf32-ia64.c:4433 elf64-ia64.c:4433 msgid "unsupported reloc" msgstr "不支持的重定位" -#: elf32-ia64.c:4477 elf64-ia64.c:4477 +#: elf32-ia64.c:4471 elf64-ia64.c:4471 msgid "" "%B: missing TLS section for relocation %s against `%s' at 0x%lx in section " "`%A'." msgstr "" -#: elf32-ia64.c:4492 elf64-ia64.c:4492 +#: elf32-ia64.c:4486 elf64-ia64.c:4486 msgid "" "%B: Can't relax br (%s) to `%s' at 0x%lx in section `%A' with size 0x%lx (> " "0x1000000)." msgstr "" -#: elf32-ia64.c:4754 elf64-ia64.c:4754 +#: elf32-ia64.c:4748 elf64-ia64.c:4748 msgid "%B: linking trap-on-NULL-dereference with non-trapping files" msgstr "" -#: elf32-ia64.c:4763 elf64-ia64.c:4763 +#: elf32-ia64.c:4757 elf64-ia64.c:4757 msgid "%B: linking big-endian files with little-endian files" msgstr "" -#: elf32-ia64.c:4772 elf64-ia64.c:4772 +#: elf32-ia64.c:4766 elf64-ia64.c:4766 msgid "%B: linking 64-bit files with 32-bit files" msgstr "" -#: elf32-ia64.c:4781 elf64-ia64.c:4781 +#: elf32-ia64.c:4775 elf64-ia64.c:4775 msgid "%B: linking constant-gp files with non-constant-gp files" msgstr "" -#: elf32-ia64.c:4791 elf64-ia64.c:4791 +#: elf32-ia64.c:4785 elf64-ia64.c:4785 msgid "%B: linking auto-pic files with non-auto-pic files" msgstr "" diff -Nru language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/binutils.po language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/binutils.po --- language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/binutils.po 2012-05-08 22:47:25.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/binutils.po 2013-01-29 09:36:58.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: 2012-05-08 02:00+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2013-01-28 10:39+0000\n" +"X-Generator: Launchpad (build 16451)\n" #: addr2line.c:81 #, c-format @@ -52,35 +52,46 @@ "\n" msgstr "" -#: addr2line.c:101 ar.c:304 ar.c:333 coffdump.c:470 dlltool.c:3938 -#: dllwrap.c:524 elfedit.c:650 nlmconv.c:1114 objcopy.c:576 objcopy.c:611 -#: readelf.c:3174 size.c:99 srconv.c:1743 strings.c:667 sysdump.c:653 +#: addr2line.c:101 ar.c:304 ar.c:333 coffdump.c:471 dlltool.c:3938 +#: dllwrap.c:524 elfedit.c:653 nlmconv.c:1114 objcopy.c:576 objcopy.c:611 +#: readelf.c:3214 size.c:99 srconv.c:1743 strings.c:667 sysdump.c:653 #: windmc.c:228 windres.c:695 #, c-format msgid "Report bugs to %s\n" msgstr "将 bug 报告到 %s\n" -#: addr2line.c:271 +#. Note for translators: This printf is used to join the +#. function name just printed above to the line number/ +#. file name pair that is about to be printed below. Eg: +#. +#. foo at 123:bar.c +#: addr2line.c:276 #, c-format msgid " at " msgstr "" -#: addr2line.c:296 +#. Note for translators: This printf is used to join the +#. line number/file name pair that has just been printed with +#. the line number/file name pair that is going to be printed +#. by the next iteration of the while loop. Eg: +#. +#. 123:bar.c (inlined by) 456:main.c +#: addr2line.c:308 #, c-format msgid " (inlined by) " msgstr "" -#: addr2line.c:329 +#: addr2line.c:341 #, c-format msgid "%s: cannot get addresses from archive" msgstr "%s：无法从存档中获取地址" -#: addr2line.c:346 +#: addr2line.c:358 #, c-format msgid "%s: cannot find section %s" msgstr "%s: 无法找到章节 %s" -#: addr2line.c:415 nm.c:1566 objdump.c:3423 +#: addr2line.c:427 nm.c:1570 objdump.c:3423 #, c-format msgid "unknown demangling style `%s'" msgstr "未知的解码(demangle)风格“%s”" @@ -291,7 +302,7 @@ msgid "two different operation options specified" msgstr "给出了两个不同的操作选项" -#: ar.c:538 nm.c:1639 +#: ar.c:538 nm.c:1643 #, c-format msgid "sorry - this program has been built without plugin support\n" msgstr "" @@ -320,37 +331,37 @@ msgid "`x' cannot be used on thin archives." msgstr "" -#: ar.c:765 +#: ar.c:771 #, c-format msgid "internal error -- this option not implemented" msgstr "内部错误 -- 该选项尚未实现" -#: ar.c:834 +#: ar.c:840 #, c-format msgid "creating %s" msgstr "正在创建 %s" -#: ar.c:883 ar.c:937 ar.c:1266 objcopy.c:2055 +#: ar.c:889 ar.c:943 ar.c:1272 objcopy.c:2080 #, c-format msgid "internal stat error on %s" msgstr "%s 出现内部状态错误" -#: ar.c:902 ar.c:970 +#: ar.c:908 ar.c:976 #, c-format msgid "%s is not a valid archive" msgstr "%s 不是有效的归档文件" -#: ar.c:1171 +#: ar.c:1177 #, c-format msgid "No member named `%s'\n" msgstr "没有名为“%s”的成员\n" -#: ar.c:1221 +#: ar.c:1227 #, c-format msgid "no entry %s in archive %s!" msgstr "归档文件 %2$s 中没有条目 %1$s！" -#: ar.c:1360 +#: ar.c:1366 #, c-format msgid "%s: no archive map to update" msgstr "%s：没有要更新的归档映射" @@ -486,17 +497,17 @@ msgid "#lines %d " msgstr "#行号 %d " -#: coffdump.c:461 sysdump.c:646 +#: coffdump.c:462 sysdump.c:646 #, c-format msgid "Usage: %s [option(s)] in-file\n" msgstr "用法：%s [选项] 输入文件\n" -#: coffdump.c:462 +#: coffdump.c:463 #, c-format msgid " Print a human readable interpretation of a COFF object file\n" msgstr "" -#: coffdump.c:463 +#: coffdump.c:464 #, c-format msgid "" " The options are:\n" @@ -511,7 +522,7 @@ " -v --version 显示程序版本\n" "\n" -#: coffdump.c:532 srconv.c:1833 sysdump.c:710 +#: coffdump.c:533 srconv.c:1833 sysdump.c:710 msgid "no input file specified" msgstr "未指定输入文件" @@ -1333,7 +1344,7 @@ msgid "DRIVER options : %s\n" msgstr "驱动器选项 ：%s\n" -#: dwarf.c:256 dwarf.c:3019 +#: dwarf.c:256 dwarf.c:3027 msgid "badly formed extended line op encountered!\n" msgstr "" @@ -1361,7 +1372,7 @@ msgid " define new File Table entry\n" msgstr " 定义新文件表条目\n" -#: dwarf.c:281 dwarf.c:2548 +#: dwarf.c:281 dwarf.c:2555 #, c-format msgid " Entry\tDir\tTime\tSize\tName\n" msgstr " 条目\t目录\t时间\t大小\t名称\n" @@ -1443,279 +1454,279 @@ msgid "(DW_OP_GNU_implicit_pointer in frame info)" msgstr "" -#: dwarf.c:1229 +#: dwarf.c:1234 #, c-format msgid "(User defined location op)" msgstr "" -#: dwarf.c:1231 +#: dwarf.c:1236 #, c-format msgid "(Unknown location op)" msgstr "" -#: dwarf.c:1278 +#: dwarf.c:1283 msgid "Internal error: DWARF version is not 2, 3 or 4.\n" msgstr "" -#: dwarf.c:1384 +#: dwarf.c:1389 msgid "DW_FORM_data8 is unsupported when sizeof (dwarf_vma) != 8\n" msgstr "" -#: dwarf.c:1434 +#: dwarf.c:1439 #, c-format msgid " (indirect string, offset: 0x%s): %s" msgstr "" -#: dwarf.c:1459 +#: dwarf.c:1464 #, c-format msgid "Unrecognized form: %lu\n" msgstr "无法识别的表格: %lu\n" -#: dwarf.c:1552 +#: dwarf.c:1557 #, c-format msgid "(not inlined)" msgstr "(未内连)" -#: dwarf.c:1555 +#: dwarf.c:1560 #, c-format msgid "(inlined)" msgstr "(已内连)" -#: dwarf.c:1558 +#: dwarf.c:1563 #, c-format msgid "(declared as inline but ignored)" msgstr "(声明为内连但被忽略)" -#: dwarf.c:1561 +#: dwarf.c:1566 #, c-format msgid "(declared as inline and inlined)" msgstr "(声明为内连并已内连)" -#: dwarf.c:1564 +#: dwarf.c:1569 #, c-format msgid " (Unknown inline attribute value: %s)" msgstr "" -#: dwarf.c:1735 +#: dwarf.c:1740 #, c-format msgid "(location list)" msgstr "(位置列表)" -#: dwarf.c:1756 dwarf.c:3722 +#: dwarf.c:1761 dwarf.c:4045 #, c-format msgid " [without DW_AT_frame_base]" msgstr "" -#: dwarf.c:1771 +#: dwarf.c:1777 #, c-format msgid "" "Offset %s used as value for DW_AT_import attribute of DIE at offset %lx is " "too big.\n" msgstr "" -#: dwarf.c:1971 +#: dwarf.c:1978 #, c-format msgid "Unknown AT value: %lx" msgstr "未知的 AT 值：%lx" -#: dwarf.c:2042 +#: dwarf.c:2049 #, c-format msgid "Reserved length value (0x%s) found in section %s\n" msgstr "" -#: dwarf.c:2054 +#: dwarf.c:2061 #, c-format msgid "Corrupt unit length (0x%s) found in section %s\n" msgstr "" -#: dwarf.c:2062 +#: dwarf.c:2069 #, c-format msgid "No comp units in %s section ?" msgstr "" -#: dwarf.c:2071 +#: dwarf.c:2078 #, c-format msgid "Not enough memory for a debug info array of %u entries" msgstr "" -#: dwarf.c:2080 dwarf.c:3288 dwarf.c:3382 dwarf.c:3456 dwarf.c:3588 -#: dwarf.c:3758 dwarf.c:3827 dwarf.c:4024 +#: dwarf.c:2087 dwarf.c:3296 dwarf.c:3390 dwarf.c:3551 dwarf.c:3779 +#: dwarf.c:3911 dwarf.c:4081 dwarf.c:4150 dwarf.c:4354 #, c-format msgid "" "Contents of the %s section:\n" "\n" msgstr "" -#: dwarf.c:2088 +#: dwarf.c:2095 #, c-format msgid "Unable to locate %s section!\n" msgstr "" -#: dwarf.c:2169 +#: dwarf.c:2176 #, c-format msgid " Compilation Unit @ offset 0x%s:\n" msgstr "" -#: dwarf.c:2171 +#: dwarf.c:2178 #, c-format msgid " Length: 0x%s (%s)\n" msgstr "" -#: dwarf.c:2174 +#: dwarf.c:2181 #, c-format msgid " Version: %d\n" msgstr " 版本： %d\n" -#: dwarf.c:2175 +#: dwarf.c:2182 #, c-format msgid " Abbrev Offset: %s\n" msgstr "" -#: dwarf.c:2177 +#: dwarf.c:2184 #, c-format msgid " Pointer Size: %d\n" msgstr " 指针大小： %d\n" -#: dwarf.c:2181 +#: dwarf.c:2188 #, c-format msgid " Signature: " msgstr "" -#: dwarf.c:2185 +#: dwarf.c:2192 #, c-format msgid " Type Offset: 0x%s\n" msgstr "" -#: dwarf.c:2193 +#: dwarf.c:2200 #, c-format msgid "" "Debug info is corrupted, length of CU at %s extends beyond end of section " "(length = %s)\n" msgstr "" -#: dwarf.c:2206 +#: dwarf.c:2213 #, c-format msgid "CU at offset %s contains corrupt or unsupported version number: %d.\n" msgstr "" -#: dwarf.c:2217 +#: dwarf.c:2224 #, c-format msgid "" "Debug info is corrupted, abbrev offset (%lx) is larger than abbrev section " "size (%lx)\n" msgstr "" -#: dwarf.c:2267 +#: dwarf.c:2274 #, c-format msgid "" "Bogus end-of-siblings marker detected at offset %lx in .debug_info section\n" msgstr "" -#: dwarf.c:2271 +#: dwarf.c:2278 msgid "Further warnings about bogus end-of-sibling markers suppressed\n" msgstr "" -#: dwarf.c:2290 +#: dwarf.c:2297 #, c-format msgid " <%d><%lx>: Abbrev Number: %lu" msgstr "" -#: dwarf.c:2294 +#: dwarf.c:2301 #, c-format msgid " <%d><%lx>: ...\n" msgstr "" -#: dwarf.c:2313 +#: dwarf.c:2320 #, c-format msgid "" "DIE at offset %lx refers to abbreviation number %lu which does not exist\n" msgstr "" -#: dwarf.c:2415 +#: dwarf.c:2422 #, c-format msgid "" "Raw dump of debug contents of section %s:\n" "\n" msgstr "" -#: dwarf.c:2453 +#: dwarf.c:2460 #, c-format msgid "" "The information in section %s appears to be corrupt - the section is too " "small\n" msgstr "" -#: dwarf.c:2465 dwarf.c:2833 +#: dwarf.c:2472 dwarf.c:2840 msgid "Only DWARF version 2, 3 and 4 line info is currently supported.\n" msgstr "" -#: dwarf.c:2479 dwarf.c:2848 +#: dwarf.c:2486 dwarf.c:2855 msgid "Invalid maximum operations per insn.\n" msgstr "" -#: dwarf.c:2498 +#: dwarf.c:2505 dwarf.c:3574 #, c-format msgid " Offset: 0x%lx\n" msgstr "" -#: dwarf.c:2499 +#: dwarf.c:2506 #, c-format msgid " Length: %ld\n" msgstr " 长度： %ld\n" -#: dwarf.c:2500 +#: dwarf.c:2507 #, c-format msgid " DWARF Version: %d\n" msgstr " DWARF 版本： %d\n" -#: dwarf.c:2501 +#: dwarf.c:2508 #, c-format msgid " Prologue Length: %d\n" msgstr "" -#: dwarf.c:2502 +#: dwarf.c:2509 #, c-format msgid " Minimum Instruction Length: %d\n" msgstr " 最小指令长度： %d\n" -#: dwarf.c:2504 +#: dwarf.c:2511 #, c-format msgid " Maximum Ops per Instruction: %d\n" msgstr "" -#: dwarf.c:2505 +#: dwarf.c:2512 #, c-format msgid " Initial value of 'is_stmt': %d\n" msgstr " “is_stmt”的初始值： %d\n" -#: dwarf.c:2506 +#: dwarf.c:2513 #, c-format msgid " Line Base: %d\n" msgstr "" -#: dwarf.c:2507 +#: dwarf.c:2514 #, c-format msgid " Line Range: %d\n" msgstr "" -#: dwarf.c:2508 +#: dwarf.c:2515 #, c-format msgid " Opcode Base: %d\n" msgstr "" -#: dwarf.c:2517 +#: dwarf.c:2524 #, c-format msgid "" "\n" " Opcodes:\n" msgstr "" -#: dwarf.c:2520 +#: dwarf.c:2527 #, c-format msgid " Opcode %d has %d args\n" msgstr "" -#: dwarf.c:2526 +#: dwarf.c:2533 #, c-format msgid "" "\n" @@ -1724,7 +1735,7 @@ "\n" " 目录表为空。\n" -#: dwarf.c:2529 +#: dwarf.c:2536 #, c-format msgid "" "\n" @@ -1733,7 +1744,7 @@ "\n" " 目录表：\n" -#: dwarf.c:2544 +#: dwarf.c:2551 #, c-format msgid "" "\n" @@ -1742,7 +1753,7 @@ "\n" " 文件名表为空。\n" -#: dwarf.c:2547 +#: dwarf.c:2554 #, c-format msgid "" "\n" @@ -1752,7 +1763,7 @@ " 文件名表：\n" #. Now display the statements. -#: dwarf.c:2577 +#: dwarf.c:2584 #, c-format msgid "" "\n" @@ -1761,164 +1772,164 @@ "\n" " 行号语句：\n" -#: dwarf.c:2596 +#: dwarf.c:2603 #, c-format msgid " Special opcode %d: advance Address by %s to 0x%s" msgstr "" -#: dwarf.c:2610 +#: dwarf.c:2617 #, c-format msgid " Special opcode %d: advance Address by %s to 0x%s[%d]" msgstr "" -#: dwarf.c:2618 +#: dwarf.c:2625 #, c-format msgid " and Line by %s to %d\n" msgstr "" -#: dwarf.c:2628 +#: dwarf.c:2635 #, c-format msgid " Copy\n" msgstr " 复制\n" -#: dwarf.c:2638 +#: dwarf.c:2645 #, c-format msgid " Advance PC by %s to 0x%s\n" msgstr "" -#: dwarf.c:2651 +#: dwarf.c:2658 #, c-format msgid " Advance PC by %s to 0x%s[%d]\n" msgstr "" -#: dwarf.c:2662 +#: dwarf.c:2669 #, c-format msgid " Advance Line by %s to %d\n" msgstr "" -#: dwarf.c:2670 +#: dwarf.c:2677 #, c-format msgid " Set File Name to entry %s in the File Name Table\n" msgstr "" -#: dwarf.c:2678 +#: dwarf.c:2685 #, c-format msgid " Set column to %s\n" msgstr "" -#: dwarf.c:2686 +#: dwarf.c:2693 #, c-format msgid " Set is_stmt to %s\n" msgstr "" -#: dwarf.c:2691 +#: dwarf.c:2698 #, c-format msgid " Set basic block\n" msgstr " 设定基本块\n" -#: dwarf.c:2701 +#: dwarf.c:2708 #, c-format msgid " Advance PC by constant %s to 0x%s\n" msgstr "" -#: dwarf.c:2714 +#: dwarf.c:2721 #, c-format msgid " Advance PC by constant %s to 0x%s[%d]\n" msgstr "" -#: dwarf.c:2726 +#: dwarf.c:2733 #, c-format msgid " Advance PC by fixed size amount %s to 0x%s\n" msgstr "" -#: dwarf.c:2732 +#: dwarf.c:2739 #, c-format msgid " Set prologue_end to true\n" msgstr " 设置 prologue_end 为 true\n" -#: dwarf.c:2736 +#: dwarf.c:2743 #, c-format msgid " Set epilogue_begin to true\n" msgstr "" -#: dwarf.c:2742 +#: dwarf.c:2749 #, c-format msgid " Set ISA to %s\n" msgstr "" -#: dwarf.c:2746 dwarf.c:3160 +#: dwarf.c:2753 dwarf.c:3168 #, c-format msgid " Unknown opcode %d with operands: " msgstr "" -#: dwarf.c:2780 +#: dwarf.c:2787 #, c-format msgid "" "Decoded dump of debug contents of section %s:\n" "\n" msgstr "" -#: dwarf.c:2821 +#: dwarf.c:2828 msgid "The line info appears to be corrupt - the section is too small\n" msgstr "行信息似乎已损坏 - 节过小\n" -#: dwarf.c:2953 +#: dwarf.c:2960 #, c-format msgid "CU: %s:\n" msgstr "" -#: dwarf.c:2954 dwarf.c:2964 +#: dwarf.c:2961 dwarf.c:2972 #, c-format msgid "" "File name Line number Starting address\n" msgstr "" -#: dwarf.c:2959 +#: dwarf.c:2968 #, c-format msgid "CU: %s/%s:\n" msgstr "" -#: dwarf.c:3051 +#: dwarf.c:3059 #, c-format msgid "UNKNOWN: length %d\n" msgstr "未知：长度 %d\n" -#: dwarf.c:3156 +#: dwarf.c:3164 #, c-format msgid " Set ISA to %lu\n" msgstr " 设置 ISA 为 %lu\n" -#: dwarf.c:3322 dwarf.c:3872 +#: dwarf.c:3330 dwarf.c:4195 #, c-format msgid "" ".debug_info offset of 0x%lx in %s section does not point to a CU header.\n" msgstr "" -#: dwarf.c:3336 +#: dwarf.c:3344 msgid "Only DWARF 2 and 3 pubnames are currently supported\n" msgstr "" -#: dwarf.c:3343 +#: dwarf.c:3351 #, c-format msgid " Length: %ld\n" msgstr " 长度： %ld\n" -#: dwarf.c:3345 +#: dwarf.c:3353 #, c-format msgid " Version: %d\n" msgstr " 版本： %d\n" -#: dwarf.c:3347 +#: dwarf.c:3355 #, c-format msgid " Offset into .debug_info section: 0x%lx\n" msgstr "" -#: dwarf.c:3349 +#: dwarf.c:3357 #, c-format msgid " Size of area in .debug_info section: %ld\n" msgstr " 在 .debug_info 节中区域的大小： %ld\n" -#: dwarf.c:3352 +#: dwarf.c:3360 #, c-format msgid "" "\n" @@ -1927,149 +1938,149 @@ "\n" " 偏移量\t名称\n" -#: dwarf.c:3403 +#: dwarf.c:3411 #, c-format msgid " DW_MACINFO_start_file - lineno: %d filenum: %d\n" msgstr " DW_MACINFO_start_file - 行号：%d 文件编号：%d\n" -#: dwarf.c:3409 +#: dwarf.c:3417 #, c-format msgid " DW_MACINFO_end_file\n" msgstr " DW_MACINFO_end_file\n" -#: dwarf.c:3417 +#: dwarf.c:3425 #, c-format msgid " DW_MACINFO_define - lineno : %d macro : %s\n" msgstr " DW_MACINFO_define - 行号：%d 宏：%s\n" -#: dwarf.c:3426 +#: dwarf.c:3434 #, c-format msgid " DW_MACINFO_undef - lineno : %d macro : %s\n" msgstr " DW_MACINFO_undef - 行号：%d 宏：%s\n" -#: dwarf.c:3438 +#: dwarf.c:3446 #, c-format msgid " DW_MACINFO_vendor_ext - constant : %d string : %s\n" msgstr " DW_MACINFO_vendor_ext - 常量：%d 字符串：%s\n" -#: dwarf.c:3467 +#: dwarf.c:3790 #, c-format msgid " Number TAG\n" msgstr " 数字标签\n" -#: dwarf.c:3476 +#: dwarf.c:3799 msgid "has children" msgstr "" -#: dwarf.c:3476 +#: dwarf.c:3799 msgid "no children" msgstr "" -#: dwarf.c:3527 dwarf.c:3754 dwarf.c:3981 +#: dwarf.c:3850 dwarf.c:4077 dwarf.c:4311 #, c-format msgid "" "\n" "The %s section is empty.\n" msgstr "" -#: dwarf.c:3533 dwarf.c:3987 +#: dwarf.c:3856 dwarf.c:4317 #, c-format msgid "" "Unable to load/parse the .debug_info section, so cannot interpret the %s " "section.\n" msgstr "" -#: dwarf.c:3577 +#: dwarf.c:3900 msgid "No location lists in .debug_info section!\n" msgstr "" -#: dwarf.c:3582 +#: dwarf.c:3905 #, c-format msgid "Location lists in %s section start at 0x%s\n" msgstr "" -#: dwarf.c:3589 +#: dwarf.c:3912 #, c-format msgid " Offset Begin End Expression\n" msgstr "" -#: dwarf.c:3638 +#: dwarf.c:3961 #, c-format msgid "There is a hole [0x%lx - 0x%lx] in .debug_loc section.\n" msgstr "" -#: dwarf.c:3642 +#: dwarf.c:3965 #, c-format msgid "There is an overlap [0x%lx - 0x%lx] in .debug_loc section.\n" msgstr "" -#: dwarf.c:3650 +#: dwarf.c:3973 #, c-format msgid "Offset 0x%lx is bigger than .debug_loc section size.\n" msgstr "" -#: dwarf.c:3659 dwarf.c:3694 dwarf.c:3704 +#: dwarf.c:3982 dwarf.c:4017 dwarf.c:4027 #, c-format msgid "Location list starting at offset 0x%lx is not terminated.\n" msgstr "" -#: dwarf.c:3678 dwarf.c:4075 +#: dwarf.c:4001 dwarf.c:4405 #, c-format msgid "\n" msgstr "" -#: dwarf.c:3688 +#: dwarf.c:4011 #, c-format msgid "(base address)\n" msgstr "" -#: dwarf.c:3725 +#: dwarf.c:4048 msgid " (start == end)" msgstr " (初始值 == 终止值)" -#: dwarf.c:3727 +#: dwarf.c:4050 msgid " (start > end)" msgstr " (初始值 > 终止值)" -#: dwarf.c:3737 +#: dwarf.c:4060 #, c-format msgid "There are %ld unused bytes at the end of section %s\n" msgstr "" -#: dwarf.c:3883 +#: dwarf.c:4206 msgid "Only DWARF 2 and 3 aranges are currently supported.\n" msgstr "" -#: dwarf.c:3887 +#: dwarf.c:4210 #, c-format msgid " Length: %ld\n" msgstr " 宽度: %ld\n" -#: dwarf.c:3889 +#: dwarf.c:4212 #, c-format msgid " Version: %d\n" msgstr " 版本: %d\n" -#: dwarf.c:3890 +#: dwarf.c:4213 #, c-format msgid " Offset into .debug_info: 0x%lx\n" msgstr "" -#: dwarf.c:3892 +#: dwarf.c:4215 #, c-format msgid " Pointer Size: %d\n" msgstr "" -#: dwarf.c:3893 +#: dwarf.c:4216 #, c-format msgid " Segment Size: %d\n" msgstr "" -#: dwarf.c:3902 +#: dwarf.c:4232 msgid "Pointer size + Segment size is not a power of two.\n" msgstr "" -#: dwarf.c:3907 +#: dwarf.c:4237 #, c-format msgid "" "\n" @@ -2078,7 +2089,7 @@ "\n" " 地址 长度\n" -#: dwarf.c:3909 +#: dwarf.c:4239 #, c-format msgid "" "\n" @@ -2087,135 +2098,135 @@ "\n" " 地址 长度\n" -#: dwarf.c:3997 +#: dwarf.c:4327 msgid "No range lists in .debug_info section!\n" msgstr "" -#: dwarf.c:4021 +#: dwarf.c:4351 #, c-format msgid "Range lists in %s section start at 0x%lx\n" msgstr "" -#: dwarf.c:4025 +#: dwarf.c:4355 #, c-format msgid " Offset Begin End\n" msgstr "" -#: dwarf.c:4046 +#: dwarf.c:4376 #, c-format msgid "There is a hole [0x%lx - 0x%lx] in %s section.\n" msgstr "" -#: dwarf.c:4050 +#: dwarf.c:4380 #, c-format msgid "There is an overlap [0x%lx - 0x%lx] in %s section.\n" msgstr "" -#: dwarf.c:4093 +#: dwarf.c:4423 msgid "(start == end)" msgstr "" -#: dwarf.c:4095 +#: dwarf.c:4425 msgid "(start > end)" msgstr "" -#: dwarf.c:4347 +#: dwarf.c:4678 msgid "bad register: " msgstr "" #. The documentation for the format of this file is in gdb/dwarf2read.c. -#: dwarf.c:4350 dwarf.c:5159 +#: dwarf.c:4681 dwarf.c:5490 #, c-format msgid "Contents of the %s section:\n" msgstr "" -#: dwarf.c:5120 +#: dwarf.c:5451 #, c-format msgid " DW_CFA_??? (User defined call frame op: %#x)\n" msgstr "" -#: dwarf.c:5122 +#: dwarf.c:5453 #, c-format msgid "unsupported or unknown Dwarf Call Frame Instruction number: %#x\n" msgstr "" -#: dwarf.c:5163 +#: dwarf.c:5494 #, c-format msgid "Truncated header in the %s section.\n" msgstr "" -#: dwarf.c:5168 +#: dwarf.c:5499 #, c-format msgid "Version %ld\n" msgstr "" -#: dwarf.c:5175 +#: dwarf.c:5506 msgid "The address table data in version 3 may be wrong.\n" msgstr "" -#: dwarf.c:5178 +#: dwarf.c:5509 msgid "Version 4 does not support case insensitive lookups.\n" msgstr "" -#: dwarf.c:5183 +#: dwarf.c:5514 #, c-format msgid "Unsupported version %lu.\n" msgstr "" -#: dwarf.c:5199 +#: dwarf.c:5530 #, c-format msgid "Corrupt header in the %s section.\n" msgstr "" -#: dwarf.c:5214 +#: dwarf.c:5545 #, c-format msgid "" "\n" "CU table:\n" msgstr "" -#: dwarf.c:5220 +#: dwarf.c:5551 #, c-format msgid "[%3u] 0x%lx - 0x%lx\n" msgstr "" -#: dwarf.c:5225 +#: dwarf.c:5556 #, c-format msgid "" "\n" "TU table:\n" msgstr "" -#: dwarf.c:5232 +#: dwarf.c:5563 #, c-format msgid "[%3u] 0x%lx 0x%lx " msgstr "" -#: dwarf.c:5239 +#: dwarf.c:5570 #, c-format msgid "" "\n" "Address table:\n" msgstr "" -#: dwarf.c:5248 +#: dwarf.c:5579 #, c-format msgid "%lu\n" msgstr "" -#: dwarf.c:5251 +#: dwarf.c:5582 #, c-format msgid "" "\n" "Symbol table:\n" msgstr "" -#: dwarf.c:5285 +#: dwarf.c:5616 #, c-format msgid "Displaying the debug contents of section %s is not yet supported.\n" msgstr "尚不支持显示 %s 节的调试内容。\n" -#: dwarf.c:5421 dwarf.c:5491 +#: dwarf.c:5752 dwarf.c:5822 #, c-format msgid "Unrecognized debug option '%s'\n" msgstr "无法识别的调试选项“%s”\n" @@ -2235,11 +2246,11 @@ msgid "Unhandled data length: %d\n" msgstr "未处理的数据长度：%d\n" -#: elfcomm.c:263 elfcomm.c:277 elfcomm.c:645 readelf.c:3643 readelf.c:3951 -#: readelf.c:3994 readelf.c:4066 readelf.c:4144 readelf.c:4915 readelf.c:4939 -#: readelf.c:7340 readelf.c:7386 readelf.c:7587 readelf.c:8783 readelf.c:8797 -#: readelf.c:9322 readelf.c:9338 readelf.c:9381 readelf.c:9406 readelf.c:11674 -#: readelf.c:11866 readelf.c:12685 +#: elfcomm.c:263 elfcomm.c:277 elfcomm.c:645 readelf.c:3683 readelf.c:3991 +#: readelf.c:4034 readelf.c:4108 readelf.c:4187 readelf.c:4965 readelf.c:4989 +#: readelf.c:7397 readelf.c:7443 readelf.c:7642 readelf.c:8863 readelf.c:8877 +#: readelf.c:9423 readelf.c:9439 readelf.c:9482 readelf.c:9507 readelf.c:11904 +#: readelf.c:12096 readelf.c:12929 msgid "Out of memory\n" msgstr "内存不足\n" @@ -2248,7 +2259,7 @@ msgid "%s: failed to seek to first archive header\n" msgstr "" -#: elfcomm.c:321 elfcomm.c:611 elfedit.c:340 readelf.c:13169 +#: elfcomm.c:321 elfcomm.c:611 elfedit.c:340 readelf.c:13418 #, c-format msgid "%s: failed to read archive header\n" msgstr "" @@ -2321,7 +2332,7 @@ msgid "%s: failed to seek to next file name\n" msgstr "" -#: elfcomm.c:616 elfedit.c:347 readelf.c:13175 +#: elfcomm.c:616 elfedit.c:347 readelf.c:13424 #, c-format msgid "%s: did not find a valid archive header\n" msgstr "" @@ -2382,12 +2393,12 @@ msgid "%s: Failed to seek to ELF header\n" msgstr "" -#: elfedit.c:331 readelf.c:13161 +#: elfedit.c:331 readelf.c:13410 #, c-format msgid "%s: failed to seek to next archive header\n" msgstr "" -#: elfedit.c:362 elfedit.c:371 readelf.c:13189 readelf.c:13198 +#: elfedit.c:362 elfedit.c:371 readelf.c:13438 readelf.c:13447 #, c-format msgid "%s: bad archive file name\n" msgstr "" @@ -2402,22 +2413,22 @@ msgid "%s: failed to seek to archive member\n" msgstr "" -#: elfedit.c:454 readelf.c:13284 +#: elfedit.c:454 readelf.c:13533 #, c-format msgid "'%s': No such file\n" msgstr "" -#: elfedit.c:456 readelf.c:13286 +#: elfedit.c:456 readelf.c:13535 #, c-format msgid "Could not locate '%s'. System error message: %s\n" msgstr "" -#: elfedit.c:463 readelf.c:13293 +#: elfedit.c:463 readelf.c:13542 #, c-format msgid "'%s' is not an ordinary file\n" msgstr "" -#: elfedit.c:489 readelf.c:13306 +#: elfedit.c:489 readelf.c:13555 #, c-format msgid "%s: Failed to read file's magic number\n" msgstr "" @@ -2427,37 +2438,37 @@ msgid "Unknown OSABI: %s\n" msgstr "" -#: elfedit.c:566 +#: elfedit.c:568 #, c-format msgid "Unknown machine type: %s\n" msgstr "" -#: elfedit.c:584 +#: elfedit.c:587 #, c-format msgid "Unknown machine type: %d\n" msgstr "" -#: elfedit.c:603 +#: elfedit.c:606 #, c-format msgid "Unknown type: %s\n" msgstr "" -#: elfedit.c:634 +#: elfedit.c:637 #, c-format msgid "Usage: %s elffile(s)\n" msgstr "" -#: elfedit.c:636 +#: elfedit.c:639 #, c-format msgid " Update the ELF header of ELF files\n" msgstr "" -#: elfedit.c:637 objcopy.c:475 objcopy.c:585 +#: elfedit.c:640 objcopy.c:475 objcopy.c:585 #, c-format msgid " The options are:\n" msgstr " 选项为：\n" -#: elfedit.c:638 +#: elfedit.c:641 #, c-format msgid "" " --input-mach Set input machine type to \n" @@ -2988,17 +2999,17 @@ msgid "%s: invalid output format" msgstr "%s：无效的输出格式" -#: nm.c:346 readelf.c:8546 readelf.c:8591 +#: nm.c:346 readelf.c:8616 readelf.c:8661 #, c-format msgid ": %d" msgstr "<处理器专用>：%d" -#: nm.c:348 readelf.c:8555 readelf.c:8609 +#: nm.c:348 readelf.c:8625 readelf.c:8679 #, c-format msgid ": %d" msgstr "<操作系统专用>：%d" -#: nm.c:350 readelf.c:8558 readelf.c:8612 +#: nm.c:350 readelf.c:8628 readelf.c:8682 #, c-format msgid ": %d" msgstr "<未知>：%d" @@ -3012,7 +3023,7 @@ "\n" "归档索引：\n" -#: nm.c:1254 +#: nm.c:1258 #, c-format msgid "" "\n" @@ -3025,7 +3036,7 @@ "来自 %s 的未定义符号：\n" "\n" -#: nm.c:1256 +#: nm.c:1260 #, c-format msgid "" "\n" @@ -3038,7 +3049,7 @@ "来自 %s 的符号：\n" "\n" -#: nm.c:1258 nm.c:1309 +#: nm.c:1262 nm.c:1313 #, c-format msgid "" "Name Value Class Type Size Line " @@ -3046,7 +3057,7 @@ "\n" msgstr "" -#: nm.c:1261 nm.c:1312 +#: nm.c:1265 nm.c:1316 #, c-format msgid "" "Name Value Class Type Size " @@ -3054,7 +3065,7 @@ "\n" msgstr "" -#: nm.c:1305 +#: nm.c:1309 #, c-format msgid "" "\n" @@ -3067,7 +3078,7 @@ "来自 %s[%s] 的未定义的符号：\n" "\n" -#: nm.c:1307 +#: nm.c:1311 #, c-format msgid "" "\n" @@ -3080,24 +3091,24 @@ "来自 %s[%s] 的符号：\n" "\n" -#: nm.c:1399 +#: nm.c:1403 #, c-format msgid "Print width has not been initialized (%d)" msgstr "" -#: nm.c:1627 +#: nm.c:1631 msgid "Only -X 32_64 is supported" msgstr "只支持 -X 32_64" -#: nm.c:1656 +#: nm.c:1660 msgid "Using the --size-sort and --undefined-only options together" msgstr "" -#: nm.c:1657 +#: nm.c:1661 msgid "will produce no output, since undefined symbols have no size." msgstr "" -#: nm.c:1685 +#: nm.c:1689 #, c-format msgid "data size %ld" msgstr "数据大小 %ld" @@ -3305,7 +3316,7 @@ msgid "cannot open '%s': %s" msgstr "" -#: objcopy.c:764 objcopy.c:3392 +#: objcopy.c:764 objcopy.c:3417 #, c-format msgid "%s: fread failed" msgstr "%s：fread 失败" @@ -3315,316 +3326,316 @@ msgid "%s:%d: Ignoring rubbish found on this line" msgstr "" -#: objcopy.c:1128 +#: objcopy.c:1153 #, c-format msgid "not stripping symbol `%s' because it is named in a relocation" msgstr "" -#: objcopy.c:1211 +#: objcopy.c:1236 #, c-format msgid "%s: Multiple redefinition of symbol \"%s\"" msgstr "%s：多次重复定义符号“%s”" -#: objcopy.c:1215 +#: objcopy.c:1240 #, c-format msgid "%s: Symbol \"%s\" is target of more than one redefinition" msgstr "%s：符号“%s”是多次重复定义的标的" -#: objcopy.c:1243 +#: objcopy.c:1268 #, c-format msgid "couldn't open symbol redefinition file %s (error: %s)" msgstr "" -#: objcopy.c:1321 +#: objcopy.c:1346 #, c-format msgid "%s:%d: garbage found at end of line" msgstr "" -#: objcopy.c:1324 +#: objcopy.c:1349 #, c-format msgid "%s:%d: missing new symbol name" msgstr "" -#: objcopy.c:1334 +#: objcopy.c:1359 #, c-format msgid "%s:%d: premature end of file" msgstr "" -#: objcopy.c:1360 +#: objcopy.c:1385 #, c-format msgid "stat returns negative size for `%s'" msgstr "" -#: objcopy.c:1372 +#: objcopy.c:1397 #, c-format msgid "copy from `%s' [unknown] to `%s' [unknown]\n" msgstr "" -#: objcopy.c:1429 +#: objcopy.c:1454 msgid "Unable to change endianness of input file(s)" msgstr "" -#: objcopy.c:1438 +#: objcopy.c:1463 #, c-format msgid "copy from `%s' [%s] to `%s' [%s]\n" msgstr "" -#: objcopy.c:1487 +#: objcopy.c:1512 #, c-format msgid "Input file `%s' ignores binary architecture parameter." msgstr "" -#: objcopy.c:1495 +#: objcopy.c:1520 #, c-format msgid "Unable to recognise the format of the input file `%s'" msgstr "" -#: objcopy.c:1498 +#: objcopy.c:1523 #, c-format msgid "Output file cannot represent architecture `%s'" msgstr "" -#: objcopy.c:1561 +#: objcopy.c:1586 #, c-format msgid "warning: file alignment (0x%s) > section alignment (0x%s)" msgstr "" -#: objcopy.c:1620 +#: objcopy.c:1645 #, c-format msgid "can't add section '%s'" msgstr "" -#: objcopy.c:1634 +#: objcopy.c:1659 #, c-format msgid "can't create section `%s'" msgstr "" -#: objcopy.c:1680 +#: objcopy.c:1705 #, c-format msgid "cannot create debug link section `%s'" msgstr "" -#: objcopy.c:1773 +#: objcopy.c:1798 msgid "Can't fill gap after section" msgstr "" -#: objcopy.c:1797 +#: objcopy.c:1822 msgid "can't add padding" msgstr "" -#: objcopy.c:1888 +#: objcopy.c:1913 #, c-format msgid "cannot fill debug link section `%s'" msgstr "" -#: objcopy.c:1951 +#: objcopy.c:1976 msgid "error copying private BFD data" msgstr "" -#: objcopy.c:1962 +#: objcopy.c:1987 #, c-format msgid "this target does not support %lu alternative machine codes" msgstr "" -#: objcopy.c:1966 +#: objcopy.c:1991 msgid "treating that number as an absolute e_machine value instead" msgstr "" -#: objcopy.c:1970 +#: objcopy.c:1995 msgid "ignoring the alternative value" msgstr "" -#: objcopy.c:2002 objcopy.c:2038 +#: objcopy.c:2027 objcopy.c:2063 #, c-format msgid "cannot create tempdir for archive copying (error: %s)" msgstr "" -#: objcopy.c:2068 +#: objcopy.c:2093 msgid "Unable to recognise the format of file" msgstr "" -#: objcopy.c:2195 +#: objcopy.c:2220 #, c-format msgid "error: the input file '%s' is empty" msgstr "" -#: objcopy.c:2339 +#: objcopy.c:2364 #, c-format msgid "Multiple renames of section %s" msgstr "多次改名节 %s" -#: objcopy.c:2390 +#: objcopy.c:2415 msgid "error in private header data" msgstr "" -#: objcopy.c:2468 +#: objcopy.c:2493 msgid "failed to create output section" msgstr "" -#: objcopy.c:2482 +#: objcopy.c:2507 msgid "failed to set size" msgstr "" -#: objcopy.c:2496 +#: objcopy.c:2521 msgid "failed to set vma" msgstr "" -#: objcopy.c:2521 +#: objcopy.c:2546 msgid "failed to set alignment" msgstr "" -#: objcopy.c:2555 +#: objcopy.c:2580 msgid "failed to copy private data" msgstr "" -#: objcopy.c:2637 +#: objcopy.c:2662 msgid "relocation count is negative" msgstr "" #. User must pad the section up in order to do this. -#: objcopy.c:2698 +#: objcopy.c:2723 #, c-format msgid "" "cannot reverse bytes: length of section %s must be evenly divisible by %d" msgstr "" -#: objcopy.c:2884 +#: objcopy.c:2909 msgid "can't create debugging section" msgstr "" -#: objcopy.c:2897 +#: objcopy.c:2922 msgid "can't set debugging section contents" msgstr "" -#: objcopy.c:2905 +#: objcopy.c:2930 #, c-format msgid "don't know how to write debugging information for %s" msgstr "" -#: objcopy.c:3048 +#: objcopy.c:3073 msgid "could not create temporary file to hold stripped copy" msgstr "" -#: objcopy.c:3120 +#: objcopy.c:3145 #, c-format msgid "%s: bad version in PE subsystem" msgstr "" -#: objcopy.c:3150 +#: objcopy.c:3175 #, c-format msgid "unknown PE subsystem: %s" msgstr "" -#: objcopy.c:3212 +#: objcopy.c:3237 msgid "byte number must be non-negative" msgstr "字节编号必须是非负数" -#: objcopy.c:3218 +#: objcopy.c:3243 #, c-format msgid "architecture %s unknown" msgstr "未知的体系结构 %s" -#: objcopy.c:3226 +#: objcopy.c:3251 msgid "interleave must be positive" msgstr "" -#: objcopy.c:3235 +#: objcopy.c:3260 msgid "interleave width must be positive" msgstr "" -#: objcopy.c:3255 objcopy.c:3263 +#: objcopy.c:3280 objcopy.c:3288 #, c-format msgid "%s both copied and removed" msgstr "即要复制 %s 又要删除它" -#: objcopy.c:3362 objcopy.c:3442 objcopy.c:3550 objcopy.c:3581 objcopy.c:3605 -#: objcopy.c:3609 objcopy.c:3629 +#: objcopy.c:3387 objcopy.c:3467 objcopy.c:3575 objcopy.c:3606 objcopy.c:3630 +#: objcopy.c:3634 objcopy.c:3654 #, c-format msgid "bad format for %s" msgstr "%s 格式错误" -#: objcopy.c:3374 +#: objcopy.c:3399 #, c-format msgid "cannot open: %s: %s" msgstr "无法打开：%s：%s" -#: objcopy.c:3519 +#: objcopy.c:3544 #, c-format msgid "Warning: truncating gap-fill from 0x%s to 0x%x" msgstr "警告：将间隙填充由 0x%s 截短到 0x%x" -#: objcopy.c:3680 +#: objcopy.c:3705 #, c-format msgid "unknown long section names option '%s'" msgstr "" -#: objcopy.c:3698 +#: objcopy.c:3723 msgid "unable to parse alternative machine code" msgstr "" -#: objcopy.c:3743 +#: objcopy.c:3768 msgid "number of bytes to reverse must be positive and even" msgstr "" -#: objcopy.c:3746 +#: objcopy.c:3771 #, c-format msgid "Warning: ignoring previous --reverse-bytes value of %d" msgstr "" -#: objcopy.c:3761 +#: objcopy.c:3786 #, c-format msgid "%s: invalid reserve value for --heap" msgstr "" -#: objcopy.c:3767 +#: objcopy.c:3792 #, c-format msgid "%s: invalid commit value for --heap" msgstr "" -#: objcopy.c:3792 +#: objcopy.c:3817 #, c-format msgid "%s: invalid reserve value for --stack" msgstr "" -#: objcopy.c:3798 +#: objcopy.c:3823 #, c-format msgid "%s: invalid commit value for --stack" msgstr "" -#: objcopy.c:3827 +#: objcopy.c:3852 msgid "interleave start byte must be set with --byte" msgstr "" -#: objcopy.c:3830 +#: objcopy.c:3855 msgid "byte number must be less than interleave" msgstr "" -#: objcopy.c:3833 +#: objcopy.c:3858 msgid "interleave width must be less than or equal to interleave - byte`" msgstr "" -#: objcopy.c:3860 +#: objcopy.c:3885 #, c-format msgid "unknown input EFI target: %s" msgstr "" -#: objcopy.c:3891 +#: objcopy.c:3916 #, c-format msgid "unknown output EFI target: %s" msgstr "" -#: objcopy.c:3904 +#: objcopy.c:3929 #, c-format msgid "warning: could not locate '%s'. System error message: %s" msgstr "" -#: objcopy.c:3916 +#: objcopy.c:3941 #, c-format msgid "" "warning: could not create temporary file whilst copying '%s', (error: %s)" msgstr "" -#: objcopy.c:3944 objcopy.c:3958 +#: objcopy.c:3969 objcopy.c:3983 #, c-format msgid "%s %s%c0x%s never used" msgstr "" @@ -4116,17 +4127,17 @@ msgid " o_debugger: 0x%08x\n" msgstr "" -#: od-xcoff.c:521 +#: od-xcoff.c:522 #, c-format msgid "Section headers (at %u+%u=0x%08x to 0x%08x):\n" msgstr "" -#: od-xcoff.c:526 +#: od-xcoff.c:527 #, c-format msgid " No section header\n" msgstr "" -#: od-xcoff.c:531 od-xcoff.c:542 od-xcoff.c:598 +#: od-xcoff.c:532 od-xcoff.c:544 od-xcoff.c:599 msgid "cannot read section header" msgstr "" @@ -4142,17 +4153,17 @@ msgid "%2d %-8.8s %08x %08x %08x %08x %08x %08x %-5d %-5d\n" msgstr "" -#: od-xcoff.c:557 +#: od-xcoff.c:558 #, c-format msgid " Flags: %08x " msgstr "" -#: od-xcoff.c:565 +#: od-xcoff.c:566 #, c-format msgid "overflow - nreloc: %u, nlnno: %u\n" msgstr "" -#: od-xcoff.c:586 od-xcoff.c:919 od-xcoff.c:974 +#: od-xcoff.c:587 od-xcoff.c:922 od-xcoff.c:978 msgid "cannot read section headers" msgstr "" @@ -4160,55 +4171,58 @@ msgid "cannot read strings table len" msgstr "" -#: od-xcoff.c:664 +#: od-xcoff.c:662 msgid "cannot read strings table" msgstr "" -#: od-xcoff.c:672 +#: od-xcoff.c:670 msgid "cannot read symbol table" msgstr "" -#: od-xcoff.c:687 +#: od-xcoff.c:685 msgid "cannot read symbol entry" msgstr "" -#: od-xcoff.c:722 +#: od-xcoff.c:720 msgid "cannot read symbol aux entry" msgstr "" -#: od-xcoff.c:744 +#: od-xcoff.c:742 #, c-format msgid "Symbols table (strtable at 0x%08x)" msgstr "" -#: od-xcoff.c:749 +#: od-xcoff.c:747 #, c-format msgid "" ":\n" " No symbols\n" msgstr "" -#: od-xcoff.c:755 +#: od-xcoff.c:753 #, c-format msgid " (no strings):\n" msgstr "" -#: od-xcoff.c:757 +#: od-xcoff.c:755 #, c-format msgid " (strings size: %08x):\n" msgstr "" -#: od-xcoff.c:770 +#. Translators: 'sc' is for storage class, 'off' for offset. +#: od-xcoff.c:769 #, c-format msgid " # sc value section type aux name/off\n" msgstr "" +#. Section length, number of relocs and line number. #: od-xcoff.c:821 #, c-format msgid " scnlen: %08x nreloc: %-6u nlinno: %-6u\n" msgstr "" -#: od-xcoff.c:827 +#. Section length and number of relocs. +#: od-xcoff.c:828 #, c-format msgid " scnlen: %08x nreloc: %-6u\n" msgstr "" @@ -4259,7 +4273,7 @@ msgid " %s" msgstr "" -#: od-xcoff.c:889 +#: od-xcoff.c:891 #, c-format msgid "offset: %08x" msgstr "" @@ -4269,12 +4283,12 @@ msgid " lnno: %u\n" msgstr "" -#: od-xcoff.c:931 +#: od-xcoff.c:934 #, c-format msgid "Relocations for %s (%u)\n" msgstr "" -#: od-xcoff.c:934 +#: od-xcoff.c:937 msgid "cannot read relocations" msgstr "" @@ -4283,7 +4297,7 @@ msgid "vaddr sgn mod sz type symndx symbol\n" msgstr "" -#: od-xcoff.c:946 +#: od-xcoff.c:950 msgid "cannot read relocation entry" msgstr "" @@ -4292,21 +4306,22 @@ msgid "%08x %c %c %-2u " msgstr "" -#: od-xcoff.c:986 +#: od-xcoff.c:990 #, c-format msgid "Line numbers for %s (%u)\n" msgstr "" -#: od-xcoff.c:989 +#: od-xcoff.c:993 msgid "cannot read line numbers" msgstr "" -#: od-xcoff.c:992 +#. Line number, symbol index and physical address. +#: od-xcoff.c:997 #, c-format msgid "lineno symndx/paddr\n" msgstr "" -#: od-xcoff.c:1000 +#: od-xcoff.c:1005 msgid "cannot read line number entry" msgstr "" @@ -4315,67 +4330,68 @@ msgid " %-6u " msgstr "" -#: od-xcoff.c:1043 +#: od-xcoff.c:1048 #, c-format msgid "no .loader section in file\n" msgstr "" -#: od-xcoff.c:1049 +#: od-xcoff.c:1054 #, c-format msgid "section .loader is too short\n" msgstr "" -#: od-xcoff.c:1056 +#: od-xcoff.c:1061 #, c-format msgid "Loader header:\n" msgstr "" -#: od-xcoff.c:1058 +#: od-xcoff.c:1063 #, c-format msgid " version: %u\n" msgstr "" -#: od-xcoff.c:1061 +#: od-xcoff.c:1066 #, c-format msgid " Unhandled version\n" msgstr "" -#: od-xcoff.c:1066 +#: od-xcoff.c:1071 #, c-format msgid " nbr symbols: %u\n" msgstr "" -#: od-xcoff.c:1068 +#: od-xcoff.c:1073 #, c-format msgid " nbr relocs: %u\n" msgstr "" -#: od-xcoff.c:1069 +#. Import string table length. +#: od-xcoff.c:1075 #, c-format msgid " import strtab len: %u\n" msgstr "" -#: od-xcoff.c:1072 +#: od-xcoff.c:1078 #, c-format msgid " nbr import files: %u\n" msgstr "" -#: od-xcoff.c:1074 +#: od-xcoff.c:1080 #, c-format msgid " import file off: %u\n" msgstr "" -#: od-xcoff.c:1076 +#: od-xcoff.c:1082 #, c-format msgid " string table len: %u\n" msgstr "" -#: od-xcoff.c:1078 +#: od-xcoff.c:1084 #, c-format msgid " string table off: %u\n" msgstr "" -#: od-xcoff.c:1081 +#: od-xcoff.c:1087 #, c-format msgid "Dynamic symbols:\n" msgstr "" @@ -4385,22 +4401,22 @@ msgid " # value sc IFEW ty class file pa name\n" msgstr "" -#: od-xcoff.c:1087 +#: od-xcoff.c:1094 #, c-format msgid " %4u %08x %3u " msgstr "" -#: od-xcoff.c:1100 +#: od-xcoff.c:1107 #, c-format msgid " %3u %3u " msgstr "" -#: od-xcoff.c:1109 +#: od-xcoff.c:1116 #, c-format msgid "(bad offset: %u)" msgstr "" -#: od-xcoff.c:1116 +#: od-xcoff.c:1123 #, c-format msgid "Dynamic relocs:\n" msgstr "" @@ -4435,17 +4451,17 @@ msgid "%u" msgstr "" -#: od-xcoff.c:1155 +#: od-xcoff.c:1163 #, c-format msgid "Import files:\n" msgstr "" -#: od-xcoff.c:1187 +#: od-xcoff.c:1195 #, c-format msgid "no .except section in file\n" msgstr "" -#: od-xcoff.c:1195 +#: od-xcoff.c:1203 #, c-format msgid "Exception table:\n" msgstr "" @@ -4465,12 +4481,12 @@ msgid "@%08x" msgstr "" -#: od-xcoff.c:1229 +#: od-xcoff.c:1238 #, c-format msgid "no .typchk section in file\n" msgstr "" -#: od-xcoff.c:1236 +#: od-xcoff.c:1245 #, c-format msgid "Type-check section:\n" msgstr "" @@ -4480,12 +4496,12 @@ msgid "offset len lang-id general-hash language-hash\n" msgstr "" -#: od-xcoff.c:1282 +#: od-xcoff.c:1292 #, c-format msgid " address beyond section size\n" msgstr "" -#: od-xcoff.c:1292 +#: od-xcoff.c:1302 #, c-format msgid " tags at %08x\n" msgstr "" @@ -4534,7 +4550,7 @@ msgid " hand_mask_offset: 0x%08x\n" msgstr "" -#: od-xcoff.c:1370 +#: od-xcoff.c:1380 #, c-format msgid " number of CTL anchors: %u\n" msgstr "" @@ -4544,12 +4560,12 @@ msgid " CTL[%u]: %08x\n" msgstr "" -#: od-xcoff.c:1389 +#: od-xcoff.c:1399 #, c-format msgid " Name (len: %u): " msgstr "" -#: od-xcoff.c:1392 +#: od-xcoff.c:1402 #, c-format msgid "[truncated]\n" msgstr "" @@ -4559,66 +4575,66 @@ msgid " alloca reg: %u\n" msgstr "" -#: od-xcoff.c:1411 +#: od-xcoff.c:1421 #, c-format msgid " (end of tags at %08x)\n" msgstr "" -#: od-xcoff.c:1414 +#: od-xcoff.c:1424 #, c-format msgid " no tags found\n" msgstr "" -#: od-xcoff.c:1418 +#: od-xcoff.c:1428 #, c-format msgid " Truncated .text section\n" msgstr "" -#: od-xcoff.c:1503 +#: od-xcoff.c:1513 #, c-format msgid "TOC:\n" msgstr "" -#: od-xcoff.c:1546 +#: od-xcoff.c:1556 #, c-format msgid "Nbr entries: %-8u Size: %08x (%u)\n" msgstr "" -#: od-xcoff.c:1630 +#: od-xcoff.c:1640 msgid "cannot read header" msgstr "" -#: od-xcoff.c:1638 +#: od-xcoff.c:1648 #, c-format msgid "File header:\n" msgstr "" -#: od-xcoff.c:1639 +#: od-xcoff.c:1649 #, c-format msgid " magic: 0x%04x (0%04o) " msgstr "" -#: od-xcoff.c:1643 +#: od-xcoff.c:1653 #, c-format msgid "(WRMAGIC: writable text segments)" msgstr "" -#: od-xcoff.c:1646 +#: od-xcoff.c:1656 #, c-format msgid "(ROMAGIC: readonly sharablee text segments)" msgstr "" -#: od-xcoff.c:1649 +#: od-xcoff.c:1659 #, c-format msgid "(TOCMAGIC: readonly text segments and TOC)" msgstr "" -#: od-xcoff.c:1652 +#: od-xcoff.c:1662 #, c-format msgid "unknown magic" msgstr "" -#: od-xcoff.c:1659 +#: od-xcoff.c:1669 #, c-format msgid " Unhandled magic\n" msgstr "" @@ -4662,36 +4678,36 @@ msgid "Last stabs entries before error:\n" msgstr "" -#: readelf.c:265 +#: readelf.c:268 msgid "" msgstr "" -#: readelf.c:266 +#: readelf.c:269 msgid "" msgstr "" -#: readelf.c:267 readelf.c:5026 readelf.c:5536 readelf.c:8077 readelf.c:8195 -#: readelf.c:9154 readelf.c:9234 readelf.c:9287 readelf.c:12150 -#: readelf.c:12153 +#: readelf.c:270 readelf.c:5083 readelf.c:5594 readelf.c:8132 readelf.c:8250 +#: readelf.c:9233 readelf.c:9327 readelf.c:9388 readelf.c:12391 +#: readelf.c:12394 msgid "" msgstr "" -#: readelf.c:300 +#: readelf.c:309 #, c-format msgid "Unable to seek to 0x%lx for %s\n" msgstr "" -#: readelf.c:315 +#: readelf.c:324 #, c-format msgid "Out of memory allocating 0x%lx bytes for %s\n" msgstr "" -#: readelf.c:325 +#: readelf.c:334 #, c-format msgid "Unable to read in 0x%lx bytes of %s\n" msgstr "" -#: readelf.c:625 +#: readelf.c:638 msgid "Don't know about relocations on this machine architecture\n" msgstr "不知道关于本机器体系结构中重定位的情况\n" @@ -4699,202 +4715,202 @@ msgid "relocs" msgstr "重定位" -#: readelf.c:658 readelf.c:688 readelf.c:755 readelf.c:784 +#: readelf.c:671 readelf.c:701 readelf.c:768 readelf.c:797 msgid "out of memory parsing relocs\n" msgstr "" -#: readelf.c:889 +#: readelf.c:902 #, c-format msgid "" " Offset Info Type Sym. Value Symbol's Name + Addend\n" msgstr "" -#: readelf.c:891 +#: readelf.c:904 #, c-format msgid " Offset Info Type Sym.Value Sym. Name + Addend\n" msgstr "" -#: readelf.c:896 +#: readelf.c:909 #, c-format msgid " Offset Info Type Sym. Value Symbol's Name\n" msgstr "" -#: readelf.c:898 +#: readelf.c:911 #, c-format msgid " Offset Info Type Sym.Value Sym. Name\n" msgstr "" -#: readelf.c:906 +#: readelf.c:919 #, c-format msgid "" " Offset Info Type Symbol's Value " "Symbol's Name + Addend\n" msgstr "" -#: readelf.c:908 +#: readelf.c:921 #, c-format msgid "" " Offset Info Type Sym. Value Sym. Name + " "Addend\n" msgstr "" -#: readelf.c:913 +#: readelf.c:926 #, c-format msgid "" " Offset Info Type Symbol's Value " "Symbol's Name\n" msgstr "" -#: readelf.c:915 +#: readelf.c:928 #, c-format msgid "" " Offset Info Type Sym. Value Sym. Name\n" msgstr "" -#: readelf.c:1219 readelf.c:1378 readelf.c:1386 +#: readelf.c:1245 readelf.c:1405 readelf.c:1413 #, c-format msgid "unrecognized: %-7lx" msgstr "不能识别的：%-7lx" -#: readelf.c:1244 +#: readelf.c:1270 #, c-format msgid "" msgstr "" -#: readelf.c:1251 +#: readelf.c:1277 #, c-format msgid " bad symbol index: %08lx" msgstr "" -#: readelf.c:1336 +#: readelf.c:1363 #, c-format msgid "" msgstr "" -#: readelf.c:1338 +#: readelf.c:1365 #, c-format msgid "" msgstr "" -#: readelf.c:1731 +#: readelf.c:1758 #, c-format msgid "Processor Specific: %lx" msgstr "处理器特有：%lx" -#: readelf.c:1755 +#: readelf.c:1782 #, c-format msgid "Operating System specific: %lx" msgstr "操作系统特有：%lx" -#: readelf.c:1759 readelf.c:2821 +#: readelf.c:1786 readelf.c:2858 #, c-format msgid ": %lx" msgstr "<未知>：%lx" -#: readelf.c:1772 +#: readelf.c:1799 msgid "NONE (None)" msgstr "NONE (无)" -#: readelf.c:1773 +#: readelf.c:1800 msgid "REL (Relocatable file)" msgstr "REL (可重定位文件)" -#: readelf.c:1774 +#: readelf.c:1801 msgid "EXEC (Executable file)" msgstr "EXEC (可执行文件)" -#: readelf.c:1775 +#: readelf.c:1802 msgid "DYN (Shared object file)" msgstr "DYN (共享目标文件)" -#: readelf.c:1776 +#: readelf.c:1803 msgid "CORE (Core file)" msgstr "CORE (Core 文件)" -#: readelf.c:1780 +#: readelf.c:1807 #, c-format msgid "Processor Specific: (%x)" msgstr "处理器特有：(%x)" -#: readelf.c:1782 +#: readelf.c:1809 #, c-format msgid "OS Specific: (%x)" msgstr "操作系统特有：(%x)" -#: readelf.c:1784 readelf.c:3068 +#: readelf.c:1811 #, c-format msgid ": %x" msgstr "<未知>：%x" -#: readelf.c:1796 +#: readelf.c:1823 msgid "None" msgstr "无" -#: readelf.c:1964 +#: readelf.c:1994 #, c-format msgid ": 0x%x" msgstr "" -#: readelf.c:2150 +#: readelf.c:2180 msgid ", " msgstr "" -#: readelf.c:2236 readelf.c:7428 +#: readelf.c:2266 readelf.c:7485 msgid "unknown" msgstr "" -#: readelf.c:2237 +#: readelf.c:2267 msgid "unknown mac" msgstr "" -#: readelf.c:2301 +#: readelf.c:2331 msgid ", relocatable" msgstr "" -#: readelf.c:2304 +#: readelf.c:2334 msgid ", relocatable-lib" msgstr "" -#: readelf.c:2327 +#: readelf.c:2357 msgid ", unknown v850 architecture variant" msgstr "" -#: readelf.c:2384 +#: readelf.c:2414 msgid ", unknown CPU" msgstr "" -#: readelf.c:2399 +#: readelf.c:2429 msgid ", unknown ABI" msgstr "" -#: readelf.c:2419 readelf.c:2453 +#: readelf.c:2452 readelf.c:2486 msgid ", unknown ISA" msgstr "" -#: readelf.c:2626 +#: readelf.c:2663 msgid "Standalone App" msgstr "独立应用程序" -#: readelf.c:2635 +#: readelf.c:2672 msgid "Bare-metal C6000" msgstr "" -#: readelf.c:2645 readelf.c:3431 readelf.c:3447 +#: readelf.c:2682 readelf.c:3471 readelf.c:3487 #, c-format msgid "" msgstr "<未知：%x>" -#: readelf.c:3123 +#: readelf.c:3163 #, c-format msgid "Usage: readelf elf-file(s)\n" msgstr "用法：readelf <选项> elf-文件\n" -#: readelf.c:3124 +#: readelf.c:3164 #, c-format msgid " Display information about the contents of ELF format files\n" msgstr " 显示关于 ELF 格式文件内容的信息\n" -#: readelf.c:3125 +#: readelf.c:3165 #, c-format msgid "" " Options are:\n" @@ -4937,7 +4953,7 @@ " Display the contents of DWARF2 debug sections\n" msgstr "" -#: readelf.c:3157 +#: readelf.c:3197 #, c-format msgid "" " --dwarf-depth=N Do not display DIEs at depth N or greater\n" @@ -4945,14 +4961,14 @@ " or deeper\n" msgstr "" -#: readelf.c:3162 +#: readelf.c:3202 #, c-format msgid "" " -i --instruction-dump=\n" " Disassemble the contents of section \n" msgstr "" -#: readelf.c:3166 +#: readelf.c:3206 #, c-format msgid "" " -I --histogram Display histogram of bucket list lengths\n" @@ -4962,96 +4978,96 @@ " -v --version Display the version number of readelf\n" msgstr "" -#: readelf.c:3195 readelf.c:3224 readelf.c:3228 readelf.c:13374 +#: readelf.c:3235 readelf.c:3264 readelf.c:3268 readelf.c:13623 msgid "Out of memory allocating dump request table.\n" msgstr "" -#: readelf.c:3400 +#: readelf.c:3440 #, c-format msgid "Invalid option '-%c'\n" msgstr "无效的选项“-%c”\n" -#: readelf.c:3415 +#: readelf.c:3455 msgid "Nothing to do.\n" msgstr "无事可做。\n" -#: readelf.c:3427 readelf.c:3443 readelf.c:8013 +#: readelf.c:3467 readelf.c:3483 readelf.c:8068 msgid "none" msgstr "无" -#: readelf.c:3444 +#: readelf.c:3484 msgid "2's complement, little endian" msgstr "" -#: readelf.c:3445 +#: readelf.c:3485 msgid "2's complement, big endian" msgstr "" -#: readelf.c:3463 +#: readelf.c:3503 msgid "Not an ELF file - it has the wrong magic bytes at the start\n" msgstr "不是 ELF 文件 - 它开头的 magic 字节错误\n" -#: readelf.c:3473 +#: readelf.c:3513 #, c-format msgid "ELF Header:\n" msgstr "ELF 头：\n" -#: readelf.c:3474 +#: readelf.c:3514 #, c-format msgid " Magic: " msgstr " Magic： " -#: readelf.c:3478 +#: readelf.c:3518 #, c-format msgid " Class: %s\n" msgstr "" -#: readelf.c:3480 +#: readelf.c:3520 #, c-format msgid " Data: %s\n" msgstr "" -#: readelf.c:3482 +#: readelf.c:3522 #, c-format msgid " Version: %d %s\n" msgstr "" -#: readelf.c:3487 +#: readelf.c:3527 #, c-format msgid "" msgstr "" -#: readelf.c:3489 +#: readelf.c:3529 #, c-format msgid " OS/ABI: %s\n" msgstr "" -#: readelf.c:3491 +#: readelf.c:3531 #, c-format msgid " ABI Version: %d\n" msgstr "" -#: readelf.c:3493 +#: readelf.c:3533 #, c-format msgid " Type: %s\n" msgstr "" -#: readelf.c:3495 +#: readelf.c:3535 #, c-format msgid " Machine: %s\n" msgstr "" -#: readelf.c:3497 +#: readelf.c:3537 #, c-format msgid " Version: 0x%lx\n" msgstr "" -#: readelf.c:3500 +#: readelf.c:3540 #, c-format msgid " Entry point address: " msgstr " 入口点地址： " -#: readelf.c:3502 +#: readelf.c:3542 #, c-format msgid "" "\n" @@ -5060,69 +5076,69 @@ "\n" " 程序头起点： " -#: readelf.c:3504 +#: readelf.c:3544 #, c-format msgid "" " (bytes into file)\n" " Start of section headers: " msgstr "" -#: readelf.c:3506 +#: readelf.c:3546 #, c-format msgid " (bytes into file)\n" msgstr "" -#: readelf.c:3508 +#: readelf.c:3548 #, c-format msgid " Flags: 0x%lx%s\n" msgstr " 标志： 0x%lx%s\n" -#: readelf.c:3511 +#: readelf.c:3551 #, c-format msgid " Size of this header: %ld (bytes)\n" msgstr " 本头的大小： %ld (字节)\n" -#: readelf.c:3513 +#: readelf.c:3553 #, c-format msgid " Size of program headers: %ld (bytes)\n" msgstr " 程序头大小： %ld (字节)\n" -#: readelf.c:3515 +#: readelf.c:3555 #, c-format msgid " Number of program headers: %ld" msgstr "" -#: readelf.c:3522 +#: readelf.c:3562 #, c-format msgid " Size of section headers: %ld (bytes)\n" msgstr " 节头大小： %ld (字节)\n" -#: readelf.c:3524 +#: readelf.c:3564 #, c-format msgid " Number of section headers: %ld" msgstr " 节头数量： %ld" -#: readelf.c:3529 +#: readelf.c:3569 #, c-format msgid " Section header string table index: %ld" msgstr " 字符串表索引节头： %ld" -#: readelf.c:3536 +#: readelf.c:3576 #, c-format msgid " " msgstr "" -#: readelf.c:3570 readelf.c:3604 +#: readelf.c:3610 readelf.c:3644 msgid "program headers" msgstr "程序头" -#: readelf.c:3671 +#: readelf.c:3711 msgid "" "possibly corrupt ELF header - it has a non-zero program header offset, but " "no program headers" msgstr "" -#: readelf.c:3674 +#: readelf.c:3714 #, c-format msgid "" "\n" @@ -5131,7 +5147,7 @@ "\n" "本文件中没有程序头。\n" -#: readelf.c:3680 +#: readelf.c:3720 #, c-format msgid "" "\n" @@ -5140,12 +5156,12 @@ "\n" "Elf 文件类型为 %s\n" -#: readelf.c:3681 +#: readelf.c:3721 #, c-format msgid "Entry point " msgstr "入口点 " -#: readelf.c:3683 +#: readelf.c:3723 #, c-format msgid "" "\n" @@ -5154,7 +5170,7 @@ "\n" "共有 %d 个程序头，开始于偏移量 " -#: readelf.c:3695 readelf.c:3697 +#: readelf.c:3735 readelf.c:3737 #, c-format msgid "" "\n" @@ -5163,62 +5179,62 @@ "\n" "程序头：\n" -#: readelf.c:3701 +#: readelf.c:3741 #, c-format msgid "" " Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align\n" msgstr "" -#: readelf.c:3704 +#: readelf.c:3744 #, c-format msgid "" " Type Offset VirtAddr PhysAddr FileSiz " "MemSiz Flg Align\n" msgstr "" -#: readelf.c:3708 +#: readelf.c:3748 #, c-format msgid " Type Offset VirtAddr PhysAddr\n" msgstr "" -#: readelf.c:3710 +#: readelf.c:3750 #, c-format msgid "" " FileSiz MemSiz Flags Align\n" msgstr "" -#: readelf.c:3803 +#: readelf.c:3843 msgid "more than one dynamic segment\n" msgstr "多于一个动态段\n" -#: readelf.c:3822 +#: readelf.c:3862 msgid "no .dynamic section in the dynamic segment\n" msgstr "" -#: readelf.c:3837 +#: readelf.c:3877 msgid "the .dynamic section is not contained within the dynamic segment\n" msgstr "" -#: readelf.c:3840 +#: readelf.c:3880 msgid "" "the .dynamic section is not the first section in the dynamic segment.\n" msgstr "" -#: readelf.c:3848 +#: readelf.c:3888 msgid "Unable to find program interpreter name\n" msgstr "无法找到程序解释器名称\n" -#: readelf.c:3855 +#: readelf.c:3895 msgid "" "Internal error: failed to create format string to display program " "interpreter\n" msgstr "" -#: readelf.c:3859 +#: readelf.c:3899 msgid "Unable to read program interpreter name\n" msgstr "" -#: readelf.c:3862 +#: readelf.c:3902 #, c-format msgid "" "\n" @@ -5227,40 +5243,40 @@ "\n" " [正在请求程序解释器：%s]" -#: readelf.c:3874 +#: readelf.c:3914 #, c-format msgid "" "\n" " Section to Segment mapping:\n" msgstr "" -#: readelf.c:3875 +#: readelf.c:3915 #, c-format msgid " Segment Sections...\n" msgstr " 段节...\n" -#: readelf.c:3911 +#: readelf.c:3951 msgid "Cannot interpret virtual addresses without program headers.\n" msgstr "" -#: readelf.c:3927 +#: readelf.c:3967 #, c-format msgid "Virtual address 0x%lx not located in any PT_LOAD segment.\n" msgstr "" -#: readelf.c:3942 readelf.c:3985 +#: readelf.c:3982 readelf.c:4025 msgid "section headers" msgstr "节头" -#: readelf.c:4032 readelf.c:4107 +#: readelf.c:4074 readelf.c:4154 msgid "sh_entsize is zero\n" msgstr "" -#: readelf.c:4040 readelf.c:4115 +#: readelf.c:4082 readelf.c:4162 msgid "Invalid sh_entsize\n" msgstr "" -#: readelf.c:4045 readelf.c:4120 +#: readelf.c:4087 readelf.c:4167 msgid "symbols" msgstr "符号" @@ -5268,18 +5284,18 @@ msgid "symtab shndx" msgstr "" -#: readelf.c:4392 +#: readelf.c:4439 #, c-format msgid "UNKNOWN (%*.*lx)" msgstr "" -#: readelf.c:4414 +#: readelf.c:4461 msgid "" "possibly corrupt ELF file header - it has a non-zero section header offset, " "but no section headers\n" msgstr "" -#: readelf.c:4417 +#: readelf.c:4464 #, c-format msgid "" "\n" @@ -5288,38 +5304,38 @@ "\n" "本文件中没有节。\n" -#: readelf.c:4423 +#: readelf.c:4470 #, c-format msgid "There are %d section headers, starting at offset 0x%lx:\n" msgstr "共有 %d 个节头，从偏移量 0x%lx 开始：\n" -#: readelf.c:4444 readelf.c:5022 readelf.c:5433 readelf.c:5739 readelf.c:6152 -#: readelf.c:7036 readelf.c:9132 +#: readelf.c:4491 readelf.c:5079 readelf.c:5491 readelf.c:5797 readelf.c:6210 +#: readelf.c:7093 readelf.c:9213 msgid "string table" msgstr "字符串表" -#: readelf.c:4511 +#: readelf.c:4558 #, c-format msgid "Section %d has invalid sh_entsize %lx (expected %lx)\n" msgstr "" -#: readelf.c:4531 +#: readelf.c:4578 msgid "File contains multiple dynamic symbol tables\n" msgstr "文件含有多个动态符号表\n" -#: readelf.c:4544 +#: readelf.c:4590 msgid "File contains multiple dynamic string tables\n" msgstr "文件含有多个动态字符串表\n" -#: readelf.c:4550 +#: readelf.c:4596 msgid "dynamic strings" msgstr "动态字符串" -#: readelf.c:4557 +#: readelf.c:4603 msgid "File contains multiple symtab shndx tables\n" msgstr "" -#: readelf.c:4627 +#: readelf.c:4674 #, c-format msgid "" "\n" @@ -5328,7 +5344,7 @@ "\n" "节头：\n" -#: readelf.c:4629 +#: readelf.c:4676 #, c-format msgid "" "\n" @@ -5337,68 +5353,68 @@ "\n" "节头：\n" -#: readelf.c:4635 readelf.c:4646 readelf.c:4657 +#: readelf.c:4682 readelf.c:4693 readelf.c:4704 #, c-format msgid " [Nr] Name\n" msgstr "" -#: readelf.c:4636 +#: readelf.c:4683 #, c-format msgid " Type Addr Off Size ES Lk Inf Al\n" msgstr "" -#: readelf.c:4640 +#: readelf.c:4687 #, c-format msgid "" " [Nr] Name Type Addr Off Size ES Flg Lk " "Inf Al\n" msgstr "" -#: readelf.c:4647 +#: readelf.c:4694 #, c-format msgid "" " Type Address Off Size ES Lk Inf Al\n" msgstr "" -#: readelf.c:4651 +#: readelf.c:4698 #, c-format msgid "" " [Nr] Name Type Address Off Size ES " "Flg Lk Inf Al\n" msgstr "" -#: readelf.c:4658 +#: readelf.c:4705 #, c-format msgid " Type Address Offset Link\n" msgstr "" -#: readelf.c:4659 +#: readelf.c:4706 #, c-format msgid " Size EntSize Info Align\n" msgstr "" -#: readelf.c:4663 +#: readelf.c:4710 #, c-format msgid " [Nr] Name Type Address Offset\n" msgstr "" -#: readelf.c:4664 +#: readelf.c:4711 #, c-format msgid " Size EntSize Flags Link Info Align\n" msgstr "" -#: readelf.c:4669 +#: readelf.c:4716 #, c-format msgid " Flags\n" msgstr "" -#: readelf.c:4748 +#: readelf.c:4796 #, c-format msgid "" "section %u: sh_link value of %u is larger than the number of sections\n" msgstr "" -#: readelf.c:4847 +#: readelf.c:4896 #, c-format msgid "" "Key to Flags:\n" @@ -5407,7 +5423,7 @@ " O (extra OS processing required) o (OS specific), p (processor specific)\n" msgstr "" -#: readelf.c:4852 +#: readelf.c:4901 #, c-format msgid "" "Key to Flags:\n" @@ -5416,87 +5432,87 @@ " O (extra OS processing required) o (OS specific), p (processor specific)\n" msgstr "" -#: readelf.c:4874 +#: readelf.c:4923 #, c-format msgid "[: 0x%x] " msgstr "" -#: readelf.c:4899 +#: readelf.c:4949 #, c-format msgid "" "\n" "There are no sections to group in this file.\n" msgstr "" -#: readelf.c:4906 +#: readelf.c:4956 msgid "Section headers are not available!\n" msgstr "" -#: readelf.c:4930 +#: readelf.c:4980 #, c-format msgid "" "\n" "There are no section groups in this file.\n" msgstr "" -#: readelf.c:4967 +#: readelf.c:5018 #, c-format msgid "Bad sh_link in group section `%s'\n" msgstr "" -#: readelf.c:4981 +#: readelf.c:5032 #, c-format msgid "Corrupt header in group section `%s'\n" msgstr "" -#: readelf.c:4992 +#: readelf.c:5038 readelf.c:5049 #, c-format msgid "Bad sh_info in group section `%s'\n" msgstr "" -#: readelf.c:5031 +#: readelf.c:5088 msgid "section data" msgstr "节输出" -#: readelf.c:5040 +#: readelf.c:5099 #, c-format msgid "" "\n" "%sgroup section [%5u] `%s' [%s] contains %u sections:\n" msgstr "" -#: readelf.c:5043 +#: readelf.c:5102 #, c-format msgid " [Index] Name\n" msgstr "" -#: readelf.c:5057 +#: readelf.c:5116 #, c-format msgid "section [%5u] in group section [%5u] > maximum section [%5u]\n" msgstr "" -#: readelf.c:5066 +#: readelf.c:5125 #, c-format msgid "section [%5u] in group section [%5u] already in group section [%5u]\n" msgstr "" -#: readelf.c:5079 +#: readelf.c:5138 #, c-format msgid "section 0 in group section [%5u]\n" msgstr "" -#: readelf.c:5146 +#: readelf.c:5205 msgid "dynamic section image fixups" msgstr "" -#: readelf.c:5158 +#: readelf.c:5217 #, c-format msgid "" "\n" "Image fixups for needed library #%d: %s - ident: %lx\n" msgstr "" -#: readelf.c:5161 +#: readelf.c:5220 #, c-format msgid "" "Seg Offset Type SymVec DataType\n" @@ -5506,31 +5522,31 @@ msgid "dynamic section image relas" msgstr "" -#: readelf.c:5197 +#: readelf.c:5256 #, c-format msgid "" "\n" "Image relocs\n" msgstr "" -#: readelf.c:5199 +#: readelf.c:5258 #, c-format msgid "" "Seg Offset Type Addend Seg Sym Off\n" msgstr "" -#: readelf.c:5254 +#: readelf.c:5313 msgid "dynamic string section" msgstr "" -#: readelf.c:5355 +#: readelf.c:5414 #, c-format msgid "" "\n" "'%s' relocation section at offset 0x%lx contains %ld bytes:\n" msgstr "" -#: readelf.c:5370 +#: readelf.c:5429 #, c-format msgid "" "\n" @@ -5539,7 +5555,7 @@ "\n" "本文件中没有动态重定位。\n" -#: readelf.c:5394 +#: readelf.c:5453 #, c-format msgid "" "\n" @@ -5548,17 +5564,17 @@ "\n" "重定位节 " -#: readelf.c:5399 readelf.c:5815 readelf.c:5830 readelf.c:6167 +#: readelf.c:5873 readelf.c:5888 readelf.c:6225 #, c-format msgid "'%s'" msgstr "“%s”" -#: readelf.c:5401 readelf.c:5832 readelf.c:6169 +#: readelf.c:5460 readelf.c:5890 readelf.c:6227 #, c-format msgid " at offset 0x%lx contains %lu entries:\n" msgstr " 位于偏移量 0x%lx 含有 %lu 个条目：\n" -#: readelf.c:5452 +#: readelf.c:5510 #, c-format msgid "" "\n" @@ -5567,80 +5583,80 @@ "\n" "该文件中没有重定位信息。\n" -#: readelf.c:5590 +#: readelf.c:5648 #, c-format msgid "\tUnknown version.\n" msgstr "" -#: readelf.c:5643 readelf.c:6016 +#: readelf.c:5701 readelf.c:6074 msgid "unwind table" msgstr "" -#: readelf.c:5685 readelf.c:6098 readelf.c:6358 +#: readelf.c:5743 readelf.c:6156 readelf.c:6415 #, c-format msgid "Skipping unexpected relocation type %s\n" msgstr "跳过意外的重定位类型 %s\n" -#: readelf.c:5747 readelf.c:6160 readelf.c:7044 readelf.c:7091 +#: readelf.c:5805 readelf.c:6218 readelf.c:7101 readelf.c:7148 #, c-format msgid "" "\n" "There are no unwind sections in this file.\n" msgstr "" -#: readelf.c:5810 +#: readelf.c:5868 #, c-format msgid "" "\n" "Could not find unwind info section for " msgstr "" -#: readelf.c:5823 +#: readelf.c:5880 msgid "unwind info" msgstr "" -#: readelf.c:5825 readelf.c:6166 +#: readelf.c:5883 readelf.c:6224 #, c-format msgid "" "\n" "Unwind section " msgstr "" -#: readelf.c:6275 +#: readelf.c:6333 msgid "unwind data" msgstr "" -#: readelf.c:6329 +#: readelf.c:6386 #, c-format msgid "Skipping unexpected relocation at offset 0x%lx\n" msgstr "" -#: readelf.c:6433 +#: readelf.c:6490 #, c-format msgid "[Truncated opcode]\n" msgstr "" -#: readelf.c:6477 readelf.c:6677 +#: readelf.c:6534 readelf.c:6734 #, c-format msgid "Refuse to unwind" msgstr "" -#: readelf.c:6500 +#: readelf.c:6557 #, c-format msgid " [Reserved]" msgstr "" -#: readelf.c:6528 +#: readelf.c:6585 #, c-format msgid " finish" msgstr "" -#: readelf.c:6533 readelf.c:6619 +#: readelf.c:6590 readelf.c:6676 #, c-format msgid "[Spare]" msgstr "" -#: readelf.c:6640 readelf.c:6774 +#: readelf.c:6697 readelf.c:6831 #, c-format msgid " [unsupported opcode]" msgstr "" @@ -5655,277 +5671,277 @@ msgid " sp = sp + %d" msgstr "" -#: readelf.c:6724 +#: readelf.c:6781 #, c-format msgid "pop frame {" msgstr "" -#: readelf.c:6735 +#: readelf.c:6792 msgid "[pad]" msgstr "" -#: readelf.c:6763 +#: readelf.c:6820 #, c-format msgid "sp = sp + %ld" msgstr "" -#: readelf.c:6821 +#: readelf.c:6878 #, c-format msgid " Personality routine: " msgstr "" -#: readelf.c:6839 +#: readelf.c:6896 #, c-format msgid " [Truncated data]\n" msgstr "" -#: readelf.c:6854 +#: readelf.c:6911 #, c-format msgid " Compact model %d\n" msgstr "" -#: readelf.c:6890 +#: readelf.c:6947 #, c-format msgid " Restore stack from frame pointer\n" msgstr "" -#: readelf.c:6892 +#: readelf.c:6949 #, c-format msgid " Stack increment %d\n" msgstr "" -#: readelf.c:6893 +#: readelf.c:6950 #, c-format msgid " Registers restored: " msgstr "" -#: readelf.c:6898 +#: readelf.c:6955 #, c-format msgid " Return register: %s\n" msgstr "" -#: readelf.c:6981 +#: readelf.c:7038 #, c-format msgid "Could not locate .ARM.extab section containing 0x%lx.\n" msgstr "" -#: readelf.c:7050 +#: readelf.c:7107 #, c-format msgid "" "\n" "Unwind table index '%s' at offset 0x%lx contains %lu entries:\n" msgstr "" -#: readelf.c:7102 +#: readelf.c:7159 #, c-format msgid "NONE\n" msgstr "" -#: readelf.c:7128 +#: readelf.c:7185 #, c-format msgid "Interface Version: %s\n" msgstr "" -#: readelf.c:7130 +#: readelf.c:7187 #, c-format msgid "\n" msgstr "" -#: readelf.c:7143 +#: readelf.c:7200 #, c-format msgid "Time Stamp: %s\n" msgstr "" -#: readelf.c:7320 readelf.c:7366 +#: readelf.c:7377 readelf.c:7423 msgid "dynamic section" msgstr "" -#: readelf.c:7444 +#: readelf.c:7501 #, c-format msgid "" "\n" "There is no dynamic section in this file.\n" msgstr "" -#: readelf.c:7482 +#: readelf.c:7539 msgid "Unable to seek to end of file!\n" msgstr "" -#: readelf.c:7495 +#: readelf.c:7552 msgid "Unable to determine the number of symbols to load\n" msgstr "无法确定要读入的符号数量\n" -#: readelf.c:7530 +#: readelf.c:7585 msgid "Unable to seek to end of file\n" msgstr "无法定位到文件末尾\n" -#: readelf.c:7537 +#: readelf.c:7592 msgid "Unable to determine the length of the dynamic string table\n" msgstr "无法确定动态字符串表的长度\n" -#: readelf.c:7543 +#: readelf.c:7598 msgid "dynamic string table" msgstr "动态字符串表" -#: readelf.c:7580 +#: readelf.c:7635 msgid "symbol information" msgstr "符号信息" -#: readelf.c:7605 +#: readelf.c:7660 #, c-format msgid "" "\n" "Dynamic section at offset 0x%lx contains %u entries:\n" msgstr "" -#: readelf.c:7608 +#: readelf.c:7663 #, c-format msgid " Tag Type Name/Value\n" msgstr " 标记 类型 名称/值\n" -#: readelf.c:7644 +#: readelf.c:7699 #, c-format msgid "Auxiliary library" msgstr "附加库" -#: readelf.c:7648 +#: readelf.c:7703 #, c-format msgid "Filter library" msgstr "过滤器库" -#: readelf.c:7652 +#: readelf.c:7707 #, c-format msgid "Configuration file" msgstr "配置文件" -#: readelf.c:7656 +#: readelf.c:7711 #, c-format msgid "Dependency audit library" msgstr "" -#: readelf.c:7660 +#: readelf.c:7715 #, c-format msgid "Audit library" msgstr "" -#: readelf.c:7678 readelf.c:7706 readelf.c:7734 +#: readelf.c:7733 readelf.c:7761 readelf.c:7789 #, c-format msgid "Flags:" msgstr "标志：" -#: readelf.c:7681 readelf.c:7709 readelf.c:7736 +#: readelf.c:7736 readelf.c:7764 readelf.c:7791 #, c-format msgid " None\n" msgstr " 无\n" -#: readelf.c:7857 +#: readelf.c:7912 #, c-format msgid "Shared library: [%s]" msgstr "共享库：[%s]" -#: readelf.c:7860 +#: readelf.c:7915 #, c-format msgid " program interpreter" msgstr " 程序解释器" -#: readelf.c:7864 +#: readelf.c:7919 #, c-format msgid "Library soname: [%s]" msgstr "" -#: readelf.c:7868 +#: readelf.c:7923 #, c-format msgid "Library rpath: [%s]" msgstr "" -#: readelf.c:7872 +#: readelf.c:7927 #, c-format msgid "Library runpath: [%s]" msgstr "" -#: readelf.c:7905 +#: readelf.c:7960 #, c-format msgid " (bytes)\n" msgstr "" -#: readelf.c:7935 +#: readelf.c:7990 #, c-format msgid "Not needed object: [%s]\n" msgstr "不需要的目标：[%s]\n" -#: readelf.c:8035 +#: readelf.c:8090 msgid "| " msgstr "" -#: readelf.c:8068 +#: readelf.c:8123 #, c-format msgid "" "\n" "Version definition section '%s' contains %u entries:\n" msgstr "" -#: readelf.c:8071 +#: readelf.c:8126 #, c-format msgid " Addr: 0x" msgstr " 地址：0x" -#: readelf.c:8073 readelf.c:8191 readelf.c:8332 +#: readelf.c:8128 readelf.c:8246 readelf.c:8390 #, c-format msgid " Offset: %#08lx Link: %u (%s)\n" msgstr "" -#: readelf.c:8081 +#: readelf.c:8136 msgid "version definition section" msgstr "版本定义节" -#: readelf.c:8114 +#: readelf.c:8169 #, c-format msgid " %#06x: Rev: %d Flags: %s" msgstr "" -#: readelf.c:8117 +#: readelf.c:8172 #, c-format msgid " Index: %d Cnt: %d " msgstr "" -#: readelf.c:8133 +#: readelf.c:8188 #, c-format msgid "Name: %s\n" msgstr "名称：%s\n" -#: readelf.c:8135 +#: readelf.c:8190 #, c-format msgid "Name index: %ld\n" msgstr "名称索引：%ld\n" -#: readelf.c:8157 +#: readelf.c:8212 #, c-format msgid " %#06x: Parent %d: %s\n" msgstr "" -#: readelf.c:8160 +#: readelf.c:8215 #, c-format msgid " %#06x: Parent %d, name index: %ld\n" msgstr "" -#: readelf.c:8165 +#: readelf.c:8220 #, c-format msgid " Version def aux past end of section\n" msgstr "" -#: readelf.c:8171 +#: readelf.c:8226 #, c-format msgid " Version definition past end of section\n" msgstr "" -#: readelf.c:8186 +#: readelf.c:8241 #, c-format msgid "" "\n" "Version needs section '%s' contains %u entries:\n" msgstr "" -#: readelf.c:8189 +#: readelf.c:8244 #, c-format msgid " Addr: 0x" msgstr " 地址：0x" @@ -5934,37 +5950,37 @@ msgid "version need section" msgstr "版本需要节" -#: readelf.c:8228 +#: readelf.c:8283 #, c-format msgid " %#06x: Version: %d" msgstr "" -#: readelf.c:8231 +#: readelf.c:8286 #, c-format msgid " File: %s" msgstr " 文件：%s" -#: readelf.c:8233 +#: readelf.c:8288 #, c-format msgid " File: %lx" msgstr " 文件：%lx" -#: readelf.c:8235 +#: readelf.c:8290 #, c-format msgid " Cnt: %d\n" msgstr " 计数：%d\n" -#: readelf.c:8260 +#: readelf.c:8315 #, c-format msgid " %#06x: Name: %s" msgstr "" -#: readelf.c:8263 +#: readelf.c:8318 #, c-format msgid " %#06x: Name index: %lx" msgstr "" -#: readelf.c:8266 +#: readelf.c:8321 #, c-format msgid " Flags: %s Version: %d\n" msgstr " 标志：%s 版本：%d\n" @@ -5979,11 +5995,11 @@ msgid " Version need past end of section\n" msgstr "" -#: readelf.c:8320 +#: readelf.c:8378 msgid "version string table" msgstr "版本字符串表" -#: readelf.c:8327 +#: readelf.c:8385 #, c-format msgid "" "\n" @@ -5992,171 +6008,171 @@ "\n" "版本符号节“%s”含有 %d 个条目：\n" -#: readelf.c:8330 +#: readelf.c:8388 #, c-format msgid " Addr: " msgstr " 地址： " -#: readelf.c:8341 +#: readelf.c:8399 msgid "version symbol data" msgstr "版本符号数据" -#: readelf.c:8369 +#: readelf.c:8427 msgid " 0 (*local*) " msgstr " 0 (*本地*) " -#: readelf.c:8373 +#: readelf.c:8431 msgid " 1 (*global*) " msgstr " 1 (*全局*) " -#: readelf.c:8386 +#: readelf.c:8442 msgid "invalid index into symbol array\n" msgstr "" -#: readelf.c:8420 readelf.c:9199 +#: readelf.c:8476 readelf.c:9279 msgid "version need" msgstr "" -#: readelf.c:8430 +#: readelf.c:8487 msgid "version need aux (2)" msgstr "" -#: readelf.c:8445 readelf.c:8500 +#: readelf.c:8508 readelf.c:8570 msgid "*invalid*" msgstr "" -#: readelf.c:8475 readelf.c:9264 +#: readelf.c:8538 readelf.c:9357 msgid "version def" msgstr "" -#: readelf.c:8495 readelf.c:9279 +#: readelf.c:8564 readelf.c:9379 msgid "version def aux" msgstr "" -#: readelf.c:8529 +#: readelf.c:8599 #, c-format msgid "" "\n" "No version information found in this file.\n" msgstr "" -#: readelf.c:8728 +#: readelf.c:8807 #, c-format msgid ": %x" msgstr "" -#: readelf.c:8789 +#: readelf.c:8869 msgid "Unable to read in dynamic data\n" msgstr "无法读入动态数据\n" -#: readelf.c:8839 +#: readelf.c:8919 #, c-format msgid " " msgstr "" -#: readelf.c:8882 readelf.c:8934 readelf.c:8958 readelf.c:8988 readelf.c:9012 +#: readelf.c:8962 readelf.c:9014 readelf.c:9038 readelf.c:9068 readelf.c:9092 msgid "Unable to seek to start of dynamic information\n" msgstr "" -#: readelf.c:8888 readelf.c:8940 +#: readelf.c:8968 readelf.c:9020 msgid "Failed to read in number of buckets\n" msgstr "" -#: readelf.c:8894 +#: readelf.c:8974 msgid "Failed to read in number of chains\n" msgstr "" -#: readelf.c:8996 +#: readelf.c:9076 msgid "Failed to determine last chain length\n" msgstr "" -#: readelf.c:9040 +#: readelf.c:9120 #, c-format msgid "" "\n" "Symbol table for image:\n" msgstr "" -#: readelf.c:9042 readelf.c:9060 +#: readelf.c:9122 readelf.c:9140 #, c-format msgid " Num Buc: Value Size Type Bind Vis Ndx Name\n" msgstr "" -#: readelf.c:9044 readelf.c:9062 +#: readelf.c:9124 readelf.c:9142 #, c-format msgid " Num Buc: Value Size Type Bind Vis Ndx Name\n" msgstr "" -#: readelf.c:9058 +#: readelf.c:9138 #, c-format msgid "" "\n" "Symbol table of `.gnu.hash' for image:\n" msgstr "" -#: readelf.c:9101 +#: readelf.c:9182 #, c-format msgid "" "\n" "Symbol table '%s' has a sh_entsize of zero!\n" msgstr "" -#: readelf.c:9106 +#: readelf.c:9187 #, c-format msgid "" "\n" "Symbol table '%s' contains %lu entries:\n" msgstr "" -#: readelf.c:9111 +#: readelf.c:9192 #, c-format msgid " Num: Value Size Type Bind Vis Ndx Name\n" msgstr "" -#: readelf.c:9113 +#: readelf.c:9194 #, c-format msgid " Num: Value Size Type Bind Vis Ndx Name\n" msgstr "" -#: readelf.c:9170 +#: readelf.c:9249 msgid "version data" msgstr "版本数据" -#: readelf.c:9212 +#: readelf.c:9298 msgid "version need aux (3)" msgstr "" -#: readelf.c:9239 +#: readelf.c:9332 msgid "bad dynamic symbol\n" msgstr "" -#: readelf.c:9303 +#: readelf.c:9404 #, c-format msgid "" "\n" "Dynamic symbol information is not available for displaying symbols.\n" msgstr "" -#: readelf.c:9315 +#: readelf.c:9416 #, c-format msgid "" "\n" "Histogram for bucket list length (total of %lu buckets):\n" msgstr "" -#: readelf.c:9317 readelf.c:9387 +#: readelf.c:9418 readelf.c:9488 #, c-format msgid " Length Number %% of total Coverage\n" msgstr "" -#: readelf.c:9385 +#: readelf.c:9486 #, c-format msgid "" "\n" "Histogram for `.gnu.hash' bucket list length (total of %lu buckets):\n" msgstr "" -#: readelf.c:9451 +#: readelf.c:9552 #, c-format msgid "" "\n" @@ -6165,51 +6181,51 @@ "\n" "位于偏移量 0x%lx 的动态信息节含有 %d 个条目：\n" -#: readelf.c:9454 +#: readelf.c:9555 #, c-format msgid " Num: Name BoundTo Flags\n" msgstr "" -#: readelf.c:9463 +#: readelf.c:9564 #, c-format msgid "" msgstr "" -#: readelf.c:9545 +#: readelf.c:9646 msgid "Unhandled MN10300 reloc type found after SYM_DIFF reloc" msgstr "" -#: readelf.c:9705 +#: readelf.c:9813 #, c-format msgid "" "Missing knowledge of 32-bit reloc types used in DWARF sections of machine " "number %d\n" msgstr "" -#: readelf.c:10009 +#: readelf.c:10138 #, c-format msgid "unable to apply unsupported reloc type %d to section %s\n" msgstr "" -#: readelf.c:10017 +#: readelf.c:10146 #, c-format msgid "skipping invalid relocation offset 0x%lx in section %s\n" msgstr "" -#: readelf.c:10041 +#: readelf.c:10177 #, c-format msgid "" "skipping unexpected symbol type %s in %ld'th relocation in section %s\n" msgstr "" -#: readelf.c:10087 +#: readelf.c:10223 #, c-format msgid "" "\n" "Assembly dump of section %s\n" msgstr "" -#: readelf.c:10108 +#: readelf.c:10244 #, c-format msgid "" "\n" @@ -6218,30 +6234,30 @@ "\n" "“%s”节没有可输出的数据。\n" -#: readelf.c:10114 +#: readelf.c:10250 msgid "section contents" msgstr "" -#: readelf.c:10133 +#: readelf.c:10269 #, c-format msgid "" "\n" "String dump of section '%s':\n" msgstr "" -#: readelf.c:10151 +#: readelf.c:10287 #, c-format msgid "" " Note: This section has relocations against it, but these have NOT been " "applied to this dump.\n" msgstr "" -#: readelf.c:10182 +#: readelf.c:10318 #, c-format msgid " No strings found in this section." msgstr "" -#: readelf.c:10204 +#: readelf.c:10340 #, c-format msgid "" "\n" @@ -6250,19 +6266,19 @@ "\n" "“%s”节的十六进制输出：\n" -#: readelf.c:10228 +#: readelf.c:10364 #, c-format msgid "" " NOTE: This section has relocations against it, but these have NOT been " "applied to this dump.\n" msgstr "" -#: readelf.c:10362 +#: readelf.c:10498 #, c-format msgid "%s section data" msgstr "" -#: readelf.c:10427 +#: readelf.c:10568 #, c-format msgid "" "\n" @@ -6273,238 +6289,238 @@ #. 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:10436 +#: readelf.c:10577 #, c-format msgid "section '%s' has the NOBITS type - its contents are unreliable.\n" msgstr "" -#: readelf.c:10472 +#: readelf.c:10613 #, c-format msgid "Unrecognized debug section: %s\n" msgstr "无法识别的调试节：%s\n" -#: readelf.c:10500 +#: readelf.c:10641 #, c-format msgid "Section '%s' was not dumped because it does not exist!\n" msgstr "" -#: readelf.c:10541 +#: readelf.c:10682 #, c-format msgid "Section %d was not dumped because it does not exist!\n" msgstr "" -#: readelf.c:10719 readelf.c:10733 readelf.c:10752 readelf.c:11070 +#: readelf.c:10860 readelf.c:10874 readelf.c:10893 readelf.c:11293 #, c-format msgid "None\n" msgstr "" -#: readelf.c:10720 +#: readelf.c:10861 #, c-format msgid "Application\n" msgstr "" -#: readelf.c:10721 +#: readelf.c:10862 #, c-format msgid "Realtime\n" msgstr "" -#: readelf.c:10722 +#: readelf.c:10863 #, c-format msgid "Microcontroller\n" msgstr "" -#: readelf.c:10723 +#: readelf.c:10864 #, c-format msgid "Application or Realtime\n" msgstr "" -#: readelf.c:10734 readelf.c:10754 readelf.c:11124 readelf.c:11142 -#: readelf.c:11217 readelf.c:11238 +#: readelf.c:10875 readelf.c:10895 readelf.c:11347 readelf.c:11365 +#: readelf.c:11440 readelf.c:11461 #, c-format msgid "8-byte\n" msgstr "" -#: readelf.c:10735 readelf.c:11220 readelf.c:11241 +#: readelf.c:10876 readelf.c:11443 readelf.c:11464 #, c-format msgid "4-byte\n" msgstr "" -#: readelf.c:10739 readelf.c:10758 +#: readelf.c:10880 readelf.c:10899 #, c-format msgid "8-byte and up to %d-byte extended\n" msgstr "" -#: readelf.c:10753 +#: readelf.c:10894 #, c-format msgid "8-byte, except leaf SP\n" msgstr "" -#: readelf.c:10769 readelf.c:10859 readelf.c:11256 +#: readelf.c:10910 readelf.c:11000 readelf.c:11479 #, c-format msgid "flag = %d, vendor = %s\n" msgstr "" -#: readelf.c:10775 +#: readelf.c:10916 #, c-format msgid "True\n" msgstr "" -#: readelf.c:10904 readelf.c:11008 +#: readelf.c:11045 readelf.c:11231 #, c-format msgid "Hard or soft float\n" msgstr "" -#: readelf.c:10907 +#: readelf.c:11048 #, c-format msgid "Hard float\n" msgstr "" -#: readelf.c:10910 readelf.c:11017 +#: readelf.c:11051 readelf.c:11240 #, c-format msgid "Soft float\n" msgstr "" -#: readelf.c:10913 +#: readelf.c:11054 #, c-format msgid "Single-precision hard float\n" msgstr "" -#: readelf.c:10930 readelf.c:10956 +#: readelf.c:11071 readelf.c:11097 #, c-format msgid "Any\n" msgstr "" -#: readelf.c:10933 +#: readelf.c:11074 #, c-format msgid "Generic\n" msgstr "" -#: readelf.c:10962 +#: readelf.c:11103 #, c-format msgid "Memory\n" msgstr "" -#: readelf.c:11011 +#: readelf.c:11234 #, c-format msgid "Hard float (double precision)\n" msgstr "" -#: readelf.c:11014 +#: readelf.c:11237 #, c-format msgid "Hard float (single precision)\n" msgstr "" -#: readelf.c:11020 +#: readelf.c:11243 #, c-format msgid "Hard float (MIPS32r2 64-bit FPU)\n" msgstr "" -#: readelf.c:11103 +#: readelf.c:11326 #, c-format msgid "Not used\n" msgstr "" -#: readelf.c:11106 +#: readelf.c:11329 #, c-format msgid "2 bytes\n" msgstr "" -#: readelf.c:11109 +#: readelf.c:11332 #, c-format msgid "4 bytes\n" msgstr "" -#: readelf.c:11127 readelf.c:11145 readelf.c:11223 readelf.c:11244 +#: readelf.c:11350 readelf.c:11368 readelf.c:11446 readelf.c:11467 #, c-format msgid "16-byte\n" msgstr "" -#: readelf.c:11160 +#: readelf.c:11383 #, c-format msgid "DSBT addressing not used\n" msgstr "" -#: readelf.c:11163 +#: readelf.c:11386 #, c-format msgid "DSBT addressing used\n" msgstr "" -#: readelf.c:11178 +#: readelf.c:11401 #, c-format msgid "Data addressing position-dependent\n" msgstr "" -#: readelf.c:11181 +#: readelf.c:11404 #, c-format msgid "Data addressing position-independent, GOT near DP\n" msgstr "" -#: readelf.c:11184 +#: readelf.c:11407 #, c-format msgid "Data addressing position-independent, GOT far from DP\n" msgstr "" -#: readelf.c:11199 +#: readelf.c:11422 #, c-format msgid "Code addressing position-dependent\n" msgstr "" -#: readelf.c:11202 +#: readelf.c:11425 #, c-format msgid "Code addressing position-independent\n" msgstr "" -#: readelf.c:11308 +#: readelf.c:11531 msgid "attributes" msgstr "" -#: readelf.c:11329 +#: readelf.c:11552 #, c-format msgid "ERROR: Bad section length (%d > %d)\n" msgstr "" -#: readelf.c:11335 +#: readelf.c:11558 #, c-format msgid "Attribute Section: %s\n" msgstr "" -#: readelf.c:11360 +#: readelf.c:11583 #, c-format msgid "ERROR: Bad subsection length (%d > %d)\n" msgstr "" -#: readelf.c:11372 +#: readelf.c:11595 #, c-format msgid "File Attributes\n" msgstr "" -#: readelf.c:11375 +#: readelf.c:11598 #, c-format msgid "Section Attributes:" msgstr "" -#: readelf.c:11378 +#: readelf.c:11601 #, c-format msgid "Symbol Attributes:" msgstr "" -#: readelf.c:11393 +#: readelf.c:11616 #, c-format msgid "Unknown tag: %d\n" msgstr "" #. ??? Do something sensible, like dump hex. -#: readelf.c:11412 +#: readelf.c:11635 #, c-format msgid " Unknown section contexts\n" msgstr "" -#: readelf.c:11419 +#: readelf.c:11642 #, c-format msgid "Unknown format '%c'\n" msgstr "" -#: readelf.c:11463 readelf.c:11485 +#: readelf.c:11693 readelf.c:11715 msgid "" msgstr "" @@ -6512,32 +6528,32 @@ msgid "liblist" msgstr "" -#: readelf.c:11583 +#: readelf.c:11813 #, c-format msgid "" "\n" "Section '.liblist' contains %lu entries:\n" msgstr "" -#: readelf.c:11585 +#: readelf.c:11815 msgid "" " Library Time Stamp Checksum Version Flags\n" msgstr "" -#: readelf.c:11611 +#: readelf.c:11841 #, c-format msgid "" msgstr "" -#: readelf.c:11616 +#: readelf.c:11846 msgid " NONE" msgstr "" -#: readelf.c:11667 +#: readelf.c:11897 msgid "options" msgstr "选项" -#: readelf.c:11698 +#: readelf.c:11928 #, c-format msgid "" "\n" @@ -6546,26 +6562,26 @@ "\n" "“%s”节含有 %d 个条目：\n" -#: readelf.c:11859 +#: readelf.c:12089 msgid "conflict list found without a dynamic symbol table\n" msgstr "" -#: readelf.c:11876 readelf.c:11891 +#: readelf.c:12106 readelf.c:12121 msgid "conflict" msgstr "冲突" -#: readelf.c:11901 +#: readelf.c:12131 #, c-format msgid "" "\n" "Section '.conflict' contains %lu entries:\n" msgstr "" -#: readelf.c:11903 +#: readelf.c:12133 msgid " Num: Index Value Name" msgstr "" -#: readelf.c:11915 readelf.c:11995 readelf.c:12063 +#: readelf.c:12145 readelf.c:12234 readelf.c:12305 #, c-format msgid "" msgstr "" @@ -6574,75 +6590,77 @@ msgid "GOT" msgstr "" -#: readelf.c:11937 +#: readelf.c:12171 #, c-format msgid "" "\n" "Primary GOT:\n" msgstr "" -#: readelf.c:11938 +#: readelf.c:12172 #, c-format msgid " Canonical gp value: " msgstr "" -#: readelf.c:11942 readelf.c:12034 +#: readelf.c:12176 readelf.c:12276 #, c-format msgid " Reserved entries:\n" msgstr "" -#: readelf.c:11943 +#: readelf.c:12177 #, c-format msgid " %*s %10s %*s Purpose\n" msgstr "" -#: readelf.c:11944 readelf.c:11961 readelf.c:11977 readelf.c:12036 -#: readelf.c:12045 +#: readelf.c:12178 readelf.c:12195 readelf.c:12211 readelf.c:12278 +#: readelf.c:12287 msgid "Address" msgstr "" -#: readelf.c:11944 readelf.c:11961 readelf.c:11977 +#: readelf.c:12178 readelf.c:12195 readelf.c:12212 msgid "Access" msgstr "" -#: readelf.c:11945 readelf.c:11962 readelf.c:11978 readelf.c:12036 -#: readelf.c:12046 +#: readelf.c:12179 readelf.c:12196 readelf.c:12213 readelf.c:12278 +#: readelf.c:12288 msgid "Initial" msgstr "" -#: readelf.c:11947 +#: readelf.c:12181 #, c-format msgid " Lazy resolver\n" msgstr "" -#: readelf.c:11953 +#: readelf.c:12187 #, c-format msgid " Module pointer (GNU extension)\n" msgstr "" -#: readelf.c:11959 +#: readelf.c:12193 #, c-format msgid " Local entries:\n" msgstr "" -#: readelf.c:11975 +#: readelf.c:12209 #, c-format msgid " Global entries:\n" msgstr "" -#: readelf.c:11979 readelf.c:12047 +#: readelf.c:12214 readelf.c:12289 msgid "Sym.Val." msgstr "" -#: readelf.c:11979 readelf.c:12047 +#: coffdump.c:345 readelf.c:12215 readelf.c:12289 +#, c-format msgid "Type" msgstr "" -#: readelf.c:11979 readelf.c:12047 +#. Note for translators: "Ndx" = abbreviated form of "Index". +#: readelf.c:12217 readelf.c:12289 msgid "Ndx" msgstr "" -#: readelf.c:11979 readelf.c:12047 +#: readelf.c:12217 readelf.c:12289 msgid "Name" msgstr "" @@ -6658,157 +6676,157 @@ "\n" msgstr "" -#: readelf.c:12035 +#: readelf.c:12277 #, c-format msgid " %*s %*s Purpose\n" msgstr "" -#: readelf.c:12038 +#: readelf.c:12280 #, c-format msgid " PLT lazy resolver\n" msgstr "" -#: readelf.c:12040 +#: readelf.c:12282 #, c-format msgid " Module pointer\n" msgstr "" -#: readelf.c:12043 +#: readelf.c:12285 #, c-format msgid " Entries:\n" msgstr "" -#: readelf.c:12110 +#: readelf.c:12352 msgid "liblist string table" msgstr "" -#: readelf.c:12121 +#: readelf.c:12362 #, c-format msgid "" "\n" "Library list section '%s' contains %lu entries:\n" msgstr "" -#: readelf.c:12125 +#: readelf.c:12366 msgid "" " Library Time Stamp Checksum Version Flags" msgstr "" -#: readelf.c:12175 +#: readelf.c:12416 msgid "NT_AUXV (auxiliary vector)" msgstr "" -#: readelf.c:12177 +#: readelf.c:12418 msgid "NT_PRSTATUS (prstatus structure)" msgstr "NT_PRSTATUS (prstatus 结构)" -#: readelf.c:12179 +#: readelf.c:12420 msgid "NT_FPREGSET (floating point registers)" msgstr "NT_FPREGSET (浮点寄存器)" -#: readelf.c:12181 +#: readelf.c:12422 msgid "NT_PRPSINFO (prpsinfo structure)" msgstr "NT_PRPSINFO (prpsinfo 结构)" -#: readelf.c:12183 +#: readelf.c:12424 msgid "NT_TASKSTRUCT (task structure)" msgstr "NT_TASKSTRUCT (任务结构)" -#: readelf.c:12185 +#: readelf.c:12426 msgid "NT_PRXFPREG (user_xfpregs structure)" msgstr "NT_PRXFPREG (user_xfpregs 结构)" -#: readelf.c:12187 +#: readelf.c:12428 msgid "NT_PPC_VMX (ppc Altivec registers)" msgstr "" -#: readelf.c:12189 +#: readelf.c:12430 msgid "NT_PPC_VSX (ppc VSX registers)" msgstr "" -#: readelf.c:12191 +#: readelf.c:12432 msgid "NT_X86_XSTATE (x86 XSAVE extended state)" msgstr "" -#: readelf.c:12193 +#: readelf.c:12434 msgid "NT_S390_HIGH_GPRS (s390 upper register halves)" msgstr "" -#: readelf.c:12195 +#: readelf.c:12436 msgid "NT_S390_TIMER (s390 timer register)" msgstr "" -#: readelf.c:12197 +#: readelf.c:12438 msgid "NT_S390_TODCMP (s390 TOD comparator register)" msgstr "" -#: readelf.c:12199 +#: readelf.c:12440 msgid "NT_S390_TODPREG (s390 TOD programmable register)" msgstr "" -#: readelf.c:12201 +#: readelf.c:12442 msgid "NT_S390_CTRS (s390 control registers)" msgstr "" -#: readelf.c:12203 +#: readelf.c:12444 msgid "NT_S390_PREFIX (s390 prefix register)" msgstr "" -#: readelf.c:12205 +#: readelf.c:12448 msgid "NT_PSTATUS (pstatus structure)" msgstr "NT_PSTATUS (pstatus 结构)" -#: readelf.c:12207 +#: readelf.c:12450 msgid "NT_FPREGS (floating point registers)" msgstr "NT_FPREGS (浮点数寄存器)" -#: readelf.c:12209 +#: readelf.c:12452 msgid "NT_PSINFO (psinfo structure)" msgstr "NT_PSINFO (psinfo 结构)" -#: readelf.c:12211 +#: readelf.c:12454 msgid "NT_LWPSTATUS (lwpstatus_t structure)" msgstr "NT_LWPSTATUS (lwpstatus_t 结构)" -#: readelf.c:12213 +#: readelf.c:12456 msgid "NT_LWPSINFO (lwpsinfo_t structure)" msgstr "NT_LWPSINFO (lwpsinfo_t 结构)" -#: readelf.c:12215 +#: readelf.c:12458 msgid "NT_WIN32PSTATUS (win32_pstatus structure)" msgstr "NT_WIN32PSTATUS (win32_pstatus 结构)" -#: readelf.c:12223 +#: readelf.c:12466 msgid "NT_VERSION (version)" msgstr "" -#: readelf.c:12225 +#: readelf.c:12468 msgid "NT_ARCH (architecture)" msgstr "" -#: readelf.c:12230 readelf.c:12253 readelf.c:12332 readelf.c:12390 -#: readelf.c:12467 +#: readelf.c:12473 readelf.c:12496 readelf.c:12575 readelf.c:12633 +#: readelf.c:12710 #, c-format msgid "Unknown note type: (0x%08x)" msgstr "未知的注释类型：(0x%08x)" -#: readelf.c:12242 +#: readelf.c:12485 msgid "NT_GNU_ABI_TAG (ABI version tag)" msgstr "" -#: readelf.c:12244 +#: readelf.c:12487 msgid "NT_GNU_HWCAP (DSO-supplied software HWCAP info)" msgstr "" -#: readelf.c:12246 +#: readelf.c:12489 msgid "NT_GNU_BUILD_ID (unique build ID bitstring)" msgstr "" -#: readelf.c:12248 +#: readelf.c:12491 msgid "NT_GNU_GOLD_VERSION (gold version)" msgstr "" -#: readelf.c:12266 +#: readelf.c:12509 #, c-format msgid " Build ID: " msgstr "" @@ -6818,21 +6836,21 @@ msgid "\n" msgstr "" -#: readelf.c:12305 +#: readelf.c:12548 #, c-format msgid " OS: %s, ABI: %ld.%ld.%ld\n" msgstr "" #. NetBSD core "procinfo" structure. -#: readelf.c:12322 +#: readelf.c:12565 msgid "NetBSD procinfo structure" msgstr "NetBSD procinfo 结构" -#: readelf.c:12349 readelf.c:12363 +#: readelf.c:12592 readelf.c:12606 msgid "PT_GETREGS (reg structure)" msgstr "PT_GETREGS (reg 结构)" -#: readelf.c:12351 readelf.c:12365 +#: readelf.c:12594 readelf.c:12608 msgid "PT_GETFPREGS (fpreg structure)" msgstr "PT_GETFPREGS (fpreg 结构)" @@ -6841,49 +6859,49 @@ msgid "PT_FIRSTMACH+%d" msgstr "" -#: readelf.c:12384 +#: readelf.c:12627 msgid "NT_STAPSDT (SystemTap probe descriptors)" msgstr "" -#: readelf.c:12417 +#: readelf.c:12660 #, c-format msgid " Provider: %s\n" msgstr "" -#: readelf.c:12418 +#: readelf.c:12661 #, c-format msgid " Name: %s\n" msgstr "" -#: readelf.c:12419 +#: readelf.c:12662 #, c-format msgid " Location: " msgstr "" -#: readelf.c:12421 +#: readelf.c:12664 #, c-format msgid ", Base: " msgstr "" -#: readelf.c:12423 +#: readelf.c:12666 #, c-format msgid ", Semaphore: " msgstr "" -#: readelf.c:12426 +#: readelf.c:12669 #, c-format msgid " Arguments: %s\n" msgstr "" -#: readelf.c:12439 +#: readelf.c:12682 msgid "NT_VMS_MHD (module header)" msgstr "" -#: readelf.c:12441 +#: readelf.c:12684 msgid "NT_VMS_LNM (language name)" msgstr "" -#: readelf.c:12443 +#: readelf.c:12686 msgid "NT_VMS_SRC (source files)" msgstr "" @@ -6891,11 +6909,11 @@ msgid "NT_VMS_TITLE" msgstr "" -#: readelf.c:12447 +#: readelf.c:12690 msgid "NT_VMS_EIDC (consistency check)" msgstr "" -#: readelf.c:12449 +#: readelf.c:12692 msgid "NT_VMS_FPMODE (FP mode)" msgstr "" @@ -6903,23 +6921,23 @@ msgid "NT_VMS_LINKTIME" msgstr "" -#: readelf.c:12453 +#: readelf.c:12696 msgid "NT_VMS_IMGNAM (image name)" msgstr "" -#: readelf.c:12455 +#: readelf.c:12698 msgid "NT_VMS_IMGID (image id)" msgstr "" -#: readelf.c:12457 +#: readelf.c:12700 msgid "NT_VMS_LINKID (link id)" msgstr "" -#: readelf.c:12459 +#: readelf.c:12702 msgid "NT_VMS_IMGBID (build id)" msgstr "" -#: readelf.c:12461 +#: readelf.c:12704 msgid "NT_VMS_GSTNAM (sym table name)" msgstr "" @@ -6931,32 +6949,32 @@ msgid "NT_VMS_PATCHTIME" msgstr "" -#: readelf.c:12481 +#: readelf.c:12724 #, c-format msgid " Creation date : %.17s\n" msgstr "" -#: readelf.c:12482 +#: readelf.c:12725 #, c-format msgid " Last patch date: %.17s\n" msgstr "" -#: readelf.c:12483 +#: readelf.c:12726 #, c-format msgid " Module name : %s\n" msgstr "" -#: readelf.c:12484 +#: readelf.c:12727 #, c-format msgid " Module version : %s\n" msgstr "" -#: readelf.c:12487 +#: readelf.c:12730 #, c-format msgid " Invalid size\n" msgstr "" -#: readelf.c:12490 +#: readelf.c:12733 #, c-format msgid " Language: %s\n" msgstr "" @@ -6965,17 +6983,17 @@ msgid " FP mode: 0x%016" msgstr "" -#: readelf.c:12498 +#: readelf.c:12742 #, c-format msgid " Link time: " msgstr "" -#: readelf.c:12504 +#: readelf.c:12748 #, c-format msgid " Patch time: " msgstr "" -#: readelf.c:12510 +#: readelf.c:12754 #, c-format msgid " Major id: %u, minor id: %u\n" msgstr "" @@ -6991,41 +7009,41 @@ " Link flags : 0x%016" msgstr "" -#: readelf.c:12519 +#: readelf.c:12763 #, c-format msgid " Header flags: 0x%08x\n" msgstr "" -#: readelf.c:12521 +#: readelf.c:12765 #, c-format msgid " Image id : %s\n" msgstr "" -#: readelf.c:12525 +#: readelf.c:12769 #, c-format msgid " Image name: %s\n" msgstr "" -#: readelf.c:12528 +#: readelf.c:12772 #, c-format msgid " Global symbol table name: %s\n" msgstr "" -#: readelf.c:12531 +#: readelf.c:12775 #, c-format msgid " Image id: %s\n" msgstr "" -#: readelf.c:12534 +#: readelf.c:12778 #, c-format msgid " Linker id: %s\n" msgstr "" -#: readelf.c:12609 +#: readelf.c:12853 msgid "notes" msgstr "注释" -#: readelf.c:12615 +#: readelf.c:12859 #, c-format msgid "" "\n" @@ -7034,35 +7052,35 @@ "\n" "注释位于偏移量 0x%08lx 长度为 0x%08lx：\n" -#: readelf.c:12617 +#: readelf.c:12861 #, c-format msgid " %-20s %10s\tDescription\n" msgstr "" -#: readelf.c:12617 +#: readelf.c:12861 msgid "Owner" msgstr "" -#: readelf.c:12617 +#: readelf.c:12861 msgid "Data size" msgstr "" -#: readelf.c:12655 readelf.c:12668 +#: readelf.c:12899 readelf.c:12912 #, c-format msgid "corrupt note found at offset %lx into core notes\n" msgstr "" -#: readelf.c:12657 readelf.c:12670 +#: readelf.c:12901 readelf.c:12914 #, c-format msgid " type: %lx, namesize: %08lx, descsize: %08lx\n" msgstr "" -#: readelf.c:12766 +#: readelf.c:13010 #, c-format msgid "No note segments present in the core file.\n" msgstr "core 文件中没有注释段。\n" -#: readelf.c:12853 +#: readelf.c:13102 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" @@ -7070,12 +7088,12 @@ "本 readelf 实例编译时未加入 64 位数据类型支持，\n" "因而无法读入 64 位 ELF 文件。\n" -#: readelf.c:12900 +#: readelf.c:13149 #, c-format msgid "%s: Failed to read file header\n" msgstr "%s：读入文件头失败\n" -#: readelf.c:12914 +#: readelf.c:13163 #, c-format msgid "" "\n" @@ -7084,49 +7102,49 @@ "\n" "文件：%s\n" -#: readelf.c:13086 +#: readelf.c:13335 #, c-format msgid "%s: unable to dump the index as none was found\n" msgstr "" -#: readelf.c:13092 +#: readelf.c:13341 #, c-format msgid "Index of archive %s: (%ld entries, 0x%lx bytes in the symbol table)\n" msgstr "" -#: readelf.c:13110 +#: readelf.c:13359 #, c-format msgid "Binary %s contains:\n" msgstr "" -#: readelf.c:13118 +#: readelf.c:13367 #, c-format msgid "%s: end of the symbol table reached before the end of the index\n" msgstr "" -#: readelf.c:13129 +#: readelf.c:13378 #, c-format msgid "" "%s: symbols remain in the index symbol table, but without corresponding " "entries in the index table\n" msgstr "" -#: readelf.c:13134 +#: readelf.c:13383 #, c-format msgid "%s: failed to seek back to start of object files in the archive\n" msgstr "" -#: readelf.c:13217 readelf.c:13300 +#: readelf.c:13466 readelf.c:13549 #, c-format msgid "Input file '%s' is not readable.\n" msgstr "" -#: readelf.c:13239 +#: readelf.c:13488 #, c-format msgid "%s: failed to seek to archive member.\n" msgstr "" -#: readelf.c:13318 +#: readelf.c:13567 #, c-format msgid "File %s is not an archive so its index cannot be displayed.\n" msgstr "" @@ -7276,7 +7294,7 @@ msgid "group icon" msgstr "组图标" -#: resbin.c:935 resbin.c:1151 +#: resbin.c:935 resbin.c:1173 msgid "unexpected version string" msgstr "意外的版本字符串" @@ -7318,31 +7336,31 @@ msgid "unexpected stringfileinfo value length %ld" msgstr "" -#: resbin.c:1049 +#: resbin.c:1067 #, c-format msgid "unexpected version stringtable value length %ld" msgstr "" -#: resbin.c:1083 +#: resbin.c:1101 #, c-format msgid "unexpected version string length %ld != %ld + %ld" msgstr "" -#: resbin.c:1094 +#: resbin.c:1108 #, c-format msgid "unexpected version string length %ld < %ld" msgstr "" -#: resbin.c:1111 +#: resbin.c:1133 #, c-format msgid "unexpected varfileinfo value length %ld" msgstr "" -#: resbin.c:1130 +#: resbin.c:1152 msgid "version varfileinfo" msgstr "" -#: resbin.c:1145 +#: resbin.c:1167 #, c-format msgid "unexpected version value length %ld" msgstr "" @@ -7509,7 +7527,7 @@ msgid "stat failed on file `%s': %s" msgstr "" -#: resrc.c:1940 +#: resrc.c:1958 #, c-format msgid "can't open `%s' for output: %s" msgstr "无法为输出打开“%s”：%s" diff -Nru language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/bison-runtime.po language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/bison-runtime.po --- language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/bison-runtime.po 2012-05-08 22:47:26.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/bison-runtime.po 2013-01-29 09:37: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: 2012-05-08 02:03+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2013-01-28 10:43+0000\n" +"X-Generator: Launchpad (build 16451)\n" "Language: zh_CN\n" #: data/glr.c:923 data/yacc.c:727 diff -Nru language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/bison.po language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/bison.po --- language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/bison.po 2012-05-08 22:47:26.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/bison.po 2013-01-29 09:37:08.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: 2012-05-08 02:03+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2013-01-28 10:43+0000\n" +"X-Generator: Launchpad (build 16451)\n" #: src/complain.c:115 src/complain.c:126 src/complain.c:135 src/complain.c:183 #: src/complain.c:193 diff -Nru language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/byobu.po language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/byobu.po --- language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/byobu.po 2012-05-08 22:47:59.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/byobu.po 2013-01-29 09:37:05.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: 2012-05-08 06:55+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2013-01-28 15:56+0000\n" +"X-Generator: Launchpad (build 16451)\n" #: bin/menu:34 byobu-config:129 byobu-config:401 byobu-config:409 msgid "Menu" diff -Nru language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/bzr.po language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/bzr.po --- language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/bzr.po 1970-01-01 00:00:00.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/bzr.po 2013-01-29 09:36:58.000000000 +0000 @@ -0,0 +1,13235 @@ +# Chinese (Simplified) translation for bzr +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the bzr package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: bzr\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-02-02 17:39+0100\n" +"PO-Revision-Date: 2012-07-11 20:31+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Chinese (Simplified) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Launchpad-Export-Date: 2013-01-28 19:34+0000\n" +"X-Generator: Launchpad (build 16451)\n" + +#: bzrlib/add.py:93 +msgid "skipping {0} (larger than {1} of {2} bytes)" +msgstr "" + +#: bzrlib/branch.py:854 +msgid "Unstacking" +msgstr "" + +#: bzrlib/branch.py:2955 +#, python-format +msgid "Pushed up to revision %d." +msgstr "" + +#: bzrlib/branch.py:2957 +#, python-format +msgid "%d tag updated." +msgid_plural "%d tags updated." +msgstr[0] "" +msgstr[1] "" + +#: bzrlib/branch.py:2960 +msgid "No new revisions or tags to push." +msgstr "" + +#: bzrlib/branch.py:2962 +msgid "No new revisions to push." +msgstr "没有新的修改可以上传。" + +#: bzrlib/branch.py:2982 +msgid "checked branch {0} format {1}" +msgstr "" + +#: bzrlib/branch.py:2985 +#, python-format +msgid "found error:%s" +msgstr "" + +#: bzrlib/builtins.py:251 bzrlib/builtins.py:3045 bzrlib/workingtree.py:323 +#, python-format +msgid "Ignoring files outside view. View is %s" +msgstr "" + +#: bzrlib/builtins.py:260 +#, python-format +msgid "bzr %s --revision takes exactly one revision identifier" +msgstr "" + +#: bzrlib/builtins.py:315 +msgid "Display status summary." +msgstr "" + +#: bzrlib/builtins.py:317 +msgid "" +"This reports on versioned and unknown files, reporting them\n" +"grouped by state. Possible states are:" +msgstr "" + +#: bzrlib/builtins.py:320 +msgid "" +"added\n" +" Versioned in the working copy but not in the previous revision." +msgstr "" + +#: bzrlib/builtins.py:323 +msgid "" +"removed\n" +" Versioned in the previous revision but removed or deleted\n" +" in the working copy." +msgstr "" + +#: bzrlib/builtins.py:327 +msgid "" +"renamed\n" +" Path of this file changed from the previous revision;\n" +" the text may also have changed. This includes files whose\n" +" parent directory was renamed." +msgstr "" + +#: bzrlib/builtins.py:332 +msgid "" +"modified\n" +" Text has changed since the previous revision." +msgstr "" + +#: bzrlib/builtins.py:335 +msgid "" +"kind changed\n" +" File kind has been changed (e.g. from file to directory)." +msgstr "" + +#: bzrlib/builtins.py:338 +msgid "" +"unknown\n" +" Not versioned and not matching an ignore pattern." +msgstr "" + +#: bzrlib/builtins.py:341 +msgid "" +"Additionally for directories, symlinks and files with a changed\n" +"executable bit, Bazaar indicates their type using a trailing\n" +"character: '/', '@' or '*' respectively. These decorations can be\n" +"disabled using the '--no-classify' option." +msgstr "" + +#: bzrlib/builtins.py:346 +msgid "" +"To see ignored files use 'bzr ignored'. For details on the\n" +"changes to file texts, use 'bzr diff'." +msgstr "" + +#: bzrlib/builtins.py:349 +msgid "" +"Note that --short or -S gives status flags for each item, similar\n" +"to Subversion's status command. To get output similar to svn -q,\n" +"use bzr status -SV." +msgstr "" + +#: bzrlib/builtins.py:353 +msgid "" +"If no arguments are specified, the status of the entire working\n" +"directory is shown. Otherwise, only the status of the specified\n" +"files or directories is reported. If a directory is given, status\n" +"is reported for everything inside that directory." +msgstr "" + +#: bzrlib/builtins.py:358 +msgid "" +"Before merges are committed, the pending merge tip revisions are\n" +"shown. To see all pending merge revisions, use the -v option.\n" +"To skip the display of pending merge information altogether, use\n" +"the no-pending option or specify a file/directory." +msgstr "" + +#: bzrlib/builtins.py:363 +msgid "" +"To compare the working directory to a specific revision, pass a\n" +"single revision to the revision argument." +msgstr "" + +#: bzrlib/builtins.py:366 +msgid "" +"To see which files have changed in a specific revision, or between\n" +"two revisions, pass a revision range to the revision argument.\n" +"This will produce the same results as calling 'bzr diff --summarize'." +msgstr "" + +#: bzrlib/builtins.py:375 +msgid "Use short status indicators." +msgstr "" + +#: bzrlib/builtins.py:377 +msgid "Only show versioned files." +msgstr "" + +#: bzrlib/builtins.py:379 +msgid "Don't show pending merges." +msgstr "" + +#: bzrlib/builtins.py:382 +msgid "Do not mark object type using indicator." +msgstr "" + +#: bzrlib/builtins.py:397 +msgid "bzr status --revision takes exactly one or two revision specifiers" +msgstr "" + +#: bzrlib/builtins.py:441 bzrlib/builtins.py:5230 +msgid "You can only supply one of revision_id or --revision" +msgstr "" + +#: bzrlib/builtins.py:444 bzrlib/builtins.py:5232 +msgid "You must supply either --revision or a revision_id" +msgstr "" + +#: bzrlib/builtins.py:451 +#, python-format +msgid "Repository %r does not support access to raw revision texts" +msgstr "" + +#: bzrlib/builtins.py:462 +msgid "The repository {0} contains no revision {1}." +msgstr "" + +#: bzrlib/builtins.py:469 +msgid "You cannot specify a NULL revision." +msgstr "" + +#: bzrlib/builtins.py:561 +msgid "Remove the working tree from a given branch/checkout." +msgstr "" + +#: bzrlib/builtins.py:563 +msgid "" +"Since a lightweight checkout is little more than a working tree\n" +"this will refuse to run against one." +msgstr "" + +#: bzrlib/builtins.py:566 +msgid "To re-create the working tree, use \"bzr checkout\"." +msgstr "" + +#: bzrlib/builtins.py:572 +msgid "" +"Remove the working tree even if it has uncommitted or shelved changes." +msgstr "" + +#: bzrlib/builtins.py:586 +msgid "No working tree to remove" +msgstr "" + +#: bzrlib/builtins.py:588 +msgid "You cannot remove the working tree of a remote path" +msgstr "" + +#: bzrlib/builtins.py:597 +msgid "You cannot remove the working tree from a lightweight checkout" +msgstr "" + +#: bzrlib/builtins.py:637 +msgid "" +"The tree does not appear to be corrupt. You probably want \"bzr revert\" " +"instead. Use \"--force\" if you are sure you want to reset the working tree." +msgstr "" + +#: bzrlib/builtins.py:648 +msgid "" +", the header appears corrupt, try passing -r -1 to set the state to the last " +"commit" +msgstr "" + +#: bzrlib/builtins.py:652 +msgid "failed to reset the tree state{0}" +msgstr "" + +#: bzrlib/builtins.py:656 +msgid "Show current revision number." +msgstr "" + +#: bzrlib/builtins.py:658 +msgid "This is equal to the number of revisions on this branch." +msgstr "" + +#: bzrlib/builtins.py:671 +msgid "--tree and --revision can not be used together" +msgstr "" + +#: bzrlib/builtins.py:688 bzrlib/builtins.py:5986 +msgid "Tags can only be placed on a single revision, not on a range" +msgstr "" + +#: bzrlib/builtins.py:712 +msgid "Show revno of working tree." +msgstr "" + +#: bzrlib/builtins.py:760 +msgid "Add specified files or directories." +msgstr "" + +#: bzrlib/builtins.py:762 +msgid "" +"In non-recursive mode, all the named items are added, regardless\n" +"of whether they were previously ignored. A warning is given if\n" +"any of the named files are already versioned." +msgstr "" + +#: bzrlib/builtins.py:766 +msgid "" +"In recursive mode (the default), files are treated the same way\n" +"but the behaviour for directories is different. Directories that\n" +"are already versioned do not give a warning. All directories,\n" +"whether already versioned or not, are searched for files or\n" +"subdirectories that are neither versioned or ignored, and these\n" +"are added. This search proceeds recursively into versioned\n" +"directories. If no names are given '.' is assumed." +msgstr "" + +#: bzrlib/builtins.py:774 +msgid "" +"A warning will be printed when nested trees are encountered,\n" +"unless they are explicitly ignored." +msgstr "" + +#: bzrlib/builtins.py:777 +msgid "" +"Therefore simply saying 'bzr add' will version all files that\n" +"are currently unknown." +msgstr "" + +#: bzrlib/builtins.py:780 +msgid "" +"Adding a file whose parent directory is not versioned will\n" +"implicitly add the parent, and so on up to the root. This means\n" +"you should never need to explicitly add a directory, they'll just\n" +"get added when you add a file in the directory." +msgstr "" + +#: bzrlib/builtins.py:785 +msgid "" +"--dry-run will show which files would be added, but not actually\n" +"add them." +msgstr "" + +#: bzrlib/builtins.py:788 +msgid "" +"--file-ids-from will try to use the file ids from the supplied path.\n" +"It looks up ids trying to find a matching parent directory with the\n" +"same filename, and then by pure path. This option is rarely needed\n" +"but can be useful when adding the same logical file into two\n" +"branches that will be merged later (without showing the two different\n" +"adds as a conflict). It is also useful when merging another project\n" +"into a subdirectory of this one." +msgstr "" + +#: bzrlib/builtins.py:796 +msgid "" +"Any files matching patterns in the ignore list will not be added\n" +"unless they are explicitly mentioned." +msgstr "" + +#: bzrlib/builtins.py:799 +msgid "" +"In recursive mode, files larger than the configuration option \n" +"add.maximum_file_size will be skipped. Named items are never skipped due\n" +"to file size." +msgstr "" + +#: bzrlib/builtins.py:806 +msgid "Don't recursively add the contents of directories." +msgstr "" + +#: bzrlib/builtins.py:813 +msgid "Lookup file ids from this tree." +msgstr "" + +#: bzrlib/builtins.py:849 +msgid "ignored {0} matching \"{1}\"\n" +msgstr "" + +#: bzrlib/builtins.py:854 +msgid "Create a new versioned directory." +msgstr "" + +#: bzrlib/builtins.py:856 +msgid "This is equivalent to creating the directory and then adding it." +msgstr "" + +#: bzrlib/builtins.py:863 +msgid "No error if existing, make parent directories as needed." +msgstr "" + +#: bzrlib/builtins.py:897 +#, python-format +msgid "added %s\n" +msgstr "" + +#: bzrlib/builtins.py:939 +#, python-format +msgid "invalid kind %r specified" +msgstr "" + +#: bzrlib/builtins.py:976 +msgid "Move or rename a file." +msgstr "" + +#: bzrlib/builtins.py:978 +msgid " bzr mv SOURCE... DESTINATION" +msgstr "" + +#: bzrlib/builtins.py:980 +msgid "" +"If the last argument is a versioned directory, all the other names\n" +"are moved into it. Otherwise, there must be exactly two arguments\n" +"and the file is changed to a new name." +msgstr "" + +#: bzrlib/builtins.py:984 +msgid "" +"If OLDNAME does not exist on the filesystem but is versioned and\n" +"NEWNAME does exist on the filesystem but is not versioned, mv\n" +"assumes that the file has been manually moved and only updates\n" +"its internal inventory to reflect that change.\n" +"The same is valid when moving many SOURCE files to a DESTINATION." +msgstr "" + +#: bzrlib/builtins.py:990 +msgid "Files cannot be moved between branches." +msgstr "" + +#: bzrlib/builtins.py:997 +msgid "" +"Move only the bzr identifier of the file, because the file has already been " +"moved." +msgstr "" + +#: bzrlib/builtins.py:999 +msgid "Automatically guess renames." +msgstr "" + +#: bzrlib/builtins.py:1000 +msgid "Avoid making changes when guessing renames." +msgstr "" + +#: bzrlib/builtins.py:1009 +msgid "--dry-run requires --auto." +msgstr "" + +#: bzrlib/builtins.py:1013 +msgid "missing file argument" +msgstr "" + +#: bzrlib/builtins.py:1017 +msgid "can not move root of branch" +msgstr "" + +#: bzrlib/builtins.py:1023 +msgid "Only one path may be specified to --auto." +msgstr "" + +#: bzrlib/builtins.py:1026 +msgid "--after cannot be specified with --auto." +msgstr "" + +#: bzrlib/builtins.py:1062 +msgid "to mv multiple files the destination must be a versioned directory" +msgstr "" + +#: bzrlib/builtins.py:1114 +msgid "Turn this branch into a mirror of another branch." +msgstr "" + +#: bzrlib/builtins.py:1116 +msgid "" +"By default, this command only works on branches that have not diverged.\n" +"Branches are considered diverged if the destination branch's most recent \n" +"commit is one that has not been merged (directly or indirectly) into the \n" +"parent." +msgstr "" + +#: bzrlib/builtins.py:1121 +msgid "" +"If branches have diverged, you can use 'bzr merge' to integrate the changes\n" +"from one into the other. Once one branch has merged, the other should\n" +"be able to pull it again." +msgstr "" + +#: bzrlib/builtins.py:1125 +msgid "" +"If you want to replace your local changes and just want your branch to\n" +"match the remote one, use pull --overwrite. This will work even if the two\n" +"branches have diverged." +msgstr "" + +#: bzrlib/builtins.py:1129 +msgid "" +"If there is no default location set, the first pull will set it (use\n" +"--no-remember to avoid setting it). After that, you can omit the\n" +"location to use the default. To change the default, use --remember. The\n" +"value will only be saved if the remote location can be accessed." +msgstr "" + +#: bzrlib/builtins.py:1134 +msgid "" +"The --verbose option will display the revisions pulled using the log_format\n" +"configuration option. You can use a different format by overriding it with\n" +"-Olog_format=." +msgstr "" + +#: bzrlib/builtins.py:1138 +msgid "" +"Note: The location can be specified either in the form of a branch,\n" +"or in the form of a path to a file containing a merge directive generated\n" +"with bzr send." +msgstr "" + +#: bzrlib/builtins.py:1146 +msgid "Show logs of pulled revisions." +msgstr "" + +#: bzrlib/builtins.py:1148 +msgid "" +"Branch to pull into, rather than the one containing the working directory." +msgstr "" + +#: bzrlib/builtins.py:1151 +msgid "" +"Perform a local pull in a bound branch. Local pulls are not applied to the " +"master branch." +msgstr "" + +#: bzrlib/builtins.py:1189 +msgid "Need working tree for --show-base." +msgstr "" + +#: bzrlib/builtins.py:1205 +msgid "No pull location known or specified." +msgstr "" + +#: bzrlib/builtins.py:1211 +#, python-format +msgid "Using saved parent location: %s\n" +msgstr "" + +#: bzrlib/builtins.py:1218 bzrlib/builtins.py:4425 +msgid "Cannot use -r with merge directives or bundles" +msgstr "" + +#: bzrlib/builtins.py:1261 +msgid "Update a mirror of this branch." +msgstr "" + +#: bzrlib/builtins.py:1263 +msgid "" +"The target branch will not have its working tree populated because this\n" +"is both expensive, and is not supported on remote file systems." +msgstr "" + +#: bzrlib/builtins.py:1266 +msgid "" +"Some smart servers or protocols *may* put the working tree in place in\n" +"the future." +msgstr "" + +#: bzrlib/builtins.py:1269 +msgid "" +"This command only works on branches that have not diverged. Branches are\n" +"considered diverged if the destination branch's most recent commit is one\n" +"that has not been merged (directly or indirectly) by the source branch." +msgstr "" + +#: bzrlib/builtins.py:1273 +msgid "" +"If branches have diverged, you can use 'bzr push --overwrite' to replace\n" +"the other branch completely, discarding its unmerged changes." +msgstr "" + +#: bzrlib/builtins.py:1276 +msgid "" +"If you want to ensure you have the different changes in the other branch,\n" +"do a merge (see bzr help merge) from the other branch, and commit that.\n" +"After that you will be able to do a push without '--overwrite'." +msgstr "" + +#: bzrlib/builtins.py:1280 +msgid "" +"If there is no default push location set, the first push will set it (use\n" +"--no-remember to avoid setting it). After that, you can omit the\n" +"location to use the default. To change the default, use --remember. The\n" +"value will only be saved if the remote location can be accessed." +msgstr "" + +#: bzrlib/builtins.py:1285 +msgid "" +"The --verbose option will display the revisions pushed using the log_format\n" +"configuration option. You can use a different format by overriding it with\n" +"-Olog_format=." +msgstr "" + +#: bzrlib/builtins.py:1296 bzrlib/foreign.py:272 +msgid "" +"Branch to push from, rather than the one containing the working directory." +msgstr "" + +#: bzrlib/builtins.py:1299 +msgid "" +"By default push will fail if the target directory exists, but does not " +"already have a control directory. This flag will allow push to proceed." +msgstr "" + +#: bzrlib/builtins.py:1304 +msgid "" +"Create a stacked branch that references the public location of the parent " +"branch." +msgstr "" + +#: bzrlib/builtins.py:1307 +msgid "" +"Create a stacked branch that refers to another branch for the commit " +"history. Only the work not present in the referenced branch is included in " +"the branch created." +msgstr "" + +#: bzrlib/builtins.py:1312 bzrlib/foreign.py:279 +msgid "" +"Refuse to push if there are uncommitted changes in the working tree, --no-" +"strict disables the check." +msgstr "" + +#: bzrlib/builtins.py:1315 +msgid "Don't populate the working tree, even for protocols that support it." +msgstr "" + +#: bzrlib/builtins.py:1369 +msgid "Could not determine branch to refer to." +msgstr "" + +#: bzrlib/builtins.py:1378 +#, python-format +msgid "" +"No push location known or specified. To push to the parent branch (at %s), " +"use 'bzr push :parent'." +msgstr "" + +#: bzrlib/builtins.py:1384 bzrlib/foreign.py:306 +msgid "No push location known or specified." +msgstr "" + +#: bzrlib/builtins.py:1388 +#, python-format +msgid "Using saved push location: %s" +msgstr "" + +#: bzrlib/builtins.py:1398 +msgid "Create a new branch that is a copy of an existing branch." +msgstr "" + +#: bzrlib/builtins.py:1400 +msgid "" +"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n" +"be used. In other words, \"branch ../foo/bar\" will attempt to create " +"./bar.\n" +"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n" +"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n" +"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n" +"create ./foo-bar." +msgstr "" + +#: bzrlib/builtins.py:1407 +msgid "" +"To retrieve the branch as of a particular revision, supply the --revision\n" +"parameter, as in \"branch foo/bar -r 5\"." +msgstr "" + +#: bzrlib/builtins.py:1410 +msgid "The synonyms 'clone' and 'get' for this command are deprecated." +msgstr "" + +#: bzrlib/builtins.py:1420 +msgid "Create a branch without a working-tree." +msgstr "" + +#: bzrlib/builtins.py:1422 +msgid "Switch the checkout in the current directory to the new branch." +msgstr "" + +#: bzrlib/builtins.py:1425 +msgid "" +"Create a stacked branch referring to the source branch. The new branch will " +"depend on the availability of the source branch for all operations." +msgstr "" + +#: bzrlib/builtins.py:1429 +msgid "Do not use a shared repository, even if available." +msgstr "" + +#: bzrlib/builtins.py:1431 +msgid "" +"By default branch will fail if the target directory exists, but does not " +"already have a control directory. This flag will allow branch to proceed." +msgstr "" + +#: bzrlib/builtins.py:1436 +msgid "Bind new branch to from location." +msgstr "" + +#: bzrlib/builtins.py:1483 +#, python-format +msgid "Target directory \"%s\" already exists." +msgstr "" + +#: bzrlib/builtins.py:1495 +#, python-format +msgid "Parent of \"%s\" does not exist." +msgstr "" + +#: bzrlib/builtins.py:1514 +msgid "The branch {0} has no revision {1}." +msgstr "" + +#: bzrlib/builtins.py:1529 bzrlib/push.py:53 +#, python-format +msgid "Created new stacked branch referring to %s." +msgstr "" + +#: bzrlib/builtins.py:1533 +#, python-format +msgid "Branched %d revision." +msgid_plural "Branched %d revisions." +msgstr[0] "" +msgstr[1] "" + +#: bzrlib/builtins.py:1538 +#, python-format +msgid "New branch bound to %s" +msgstr "" + +#: bzrlib/builtins.py:1543 bzrlib/builtins.py:6280 +#, python-format +msgid "Switched to branch: %s" +msgstr "" + +#: bzrlib/builtins.py:1548 +msgid "List the branches available at the current location." +msgstr "" + +#: bzrlib/builtins.py:1550 +msgid "" +"This command will print the names of all the branches at the current\n" +"location." +msgstr "" + +#: bzrlib/builtins.py:1557 +msgid "" +"Recursively scan for branches rather than just looking in the specified " +"location." +msgstr "" + +#: bzrlib/builtins.py:1586 +msgid "(default)" +msgstr "" + +#: bzrlib/builtins.py:1598 +msgid "Create a new checkout of an existing branch." +msgstr "" + +#: bzrlib/builtins.py:1600 +msgid "" +"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree " +"for\n" +"the branch found in '.'. This is useful if you have removed the working " +"tree\n" +"or if it was never created - i.e. if you pushed the branch to its current\n" +"location using SFTP." +msgstr "" + +#: bzrlib/builtins.py:1605 +msgid "" +"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION " +"will\n" +"be used. In other words, \"checkout ../foo/bar\" will attempt to create " +"./bar.\n" +"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n" +"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n" +"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n" +"create ./foo-bar." +msgstr "" + +#: bzrlib/builtins.py:1612 +msgid "" +"To retrieve the branch as of a particular revision, supply the --revision\n" +"parameter, as in \"checkout foo/bar -r 5\". Note that this will be " +"immediately\n" +"out of date [so you cannot commit] but it may be useful (i.e. to examine " +"old\n" +"code.)" +msgstr "" + +#: bzrlib/builtins.py:1622 +msgid "" +"Perform a lightweight checkout. Lightweight checkouts depend on access to " +"the branch for every operation. Normal checkouts can perform common " +"operations like diff and status without such access, and also support local " +"commits." +msgstr "" + +#: bzrlib/builtins.py:1629 +msgid "Get file contents from this tree." +msgstr "" + +#: bzrlib/builtins.py:1631 +msgid "Hard-link working tree files where possible." +msgstr "" + +#: bzrlib/builtins.py:1672 +msgid "" +"Show list of renamed files.\n" +" " +msgstr "" + +#: bzrlib/builtins.py:1700 +msgid "Update a working tree to a new revision." +msgstr "" + +#: bzrlib/builtins.py:1702 +msgid "" +"This will perform a merge of the destination revision (the tip of the\n" +"branch, or the specified revision) into the working tree, and then make\n" +"that revision the basis revision for the working tree. " +msgstr "" + +#: bzrlib/builtins.py:1706 +msgid "" +"You can use this to visit an older revision, or to update a working tree\n" +"that is out of date from its branch." +msgstr "" + +#: bzrlib/builtins.py:1709 +msgid "" +"If there are any uncommitted changes in the tree, they will be carried\n" +"across and remain as uncommitted changes after the update. To discard\n" +"these changes, use 'bzr revert'. The uncommitted changes may conflict\n" +"with the changes brought in by the change in basis revision." +msgstr "" + +#: bzrlib/builtins.py:1714 +msgid "" +"If the tree's branch is bound to a master branch, bzr will also update\n" +"the branch from the master." +msgstr "" + +#: bzrlib/builtins.py:1717 +msgid "" +"You cannot update just a single file or directory, because each Bazaar\n" +"working tree has just a single basis revision. If you want to restore a\n" +"file that has been removed locally, use 'bzr revert' instead of 'bzr\n" +"update'. If you want to restore a file to its state in a previous\n" +"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n" +"out the old content of that file to a new location." +msgstr "" + +#: bzrlib/builtins.py:1724 +msgid "" +"The 'dir' argument, if given, must be the location of the root of a\n" +"working tree to update. By default, the working tree that contains the \n" +"current working directory is used." +msgstr "" + +#: bzrlib/builtins.py:1740 +msgid "bzr update --revision takes exactly one revision" +msgstr "" + +#: bzrlib/builtins.py:1748 +msgid "bzr update can only update a whole tree, not a file or subdirectory" +msgstr "" + +#: bzrlib/builtins.py:1779 +msgid "Tree is up to date at revision {0} of branch {1}" +msgstr "" + +#: bzrlib/builtins.py:1795 +#, python-format +msgid "" +"branch has no revision %s\n" +"bzr update --revision only works for a revision in the branch history" +msgstr "" + +#: bzrlib/builtins.py:1801 +msgid "Updated to revision {0} of branch {1}" +msgstr "" + +#: bzrlib/builtins.py:1805 +msgid "" +"Your local commits will now show as pending merges with 'bzr status', and " +"can be committed with 'bzr commit'." +msgstr "" + +#: bzrlib/builtins.py:1814 +msgid "Show information about a working tree, branch or repository." +msgstr "" + +#: bzrlib/builtins.py:1816 +msgid "" +"This command will show all known locations and formats associated to the\n" +"tree, branch or repository." +msgstr "" + +#: bzrlib/builtins.py:1819 +msgid "" +"In verbose mode, statistical information is included with each report.\n" +"To see extended statistic information, use a verbosity level of 2 or\n" +"higher by specifying the verbose option multiple times, e.g. -vv." +msgstr "" + +#: bzrlib/builtins.py:1823 +msgid "Branches and working trees will also report any missing revisions." +msgstr "" + +#: bzrlib/builtins.py:1825 bzrlib/builtins.py:3744 bzrlib/builtins.py:4885 +#: bzrlib/builtins.py:6466 +msgid ":Examples:" +msgstr "" + +#: bzrlib/builtins.py:1827 +msgid " Display information on the format and related locations:" +msgstr "" + +#: bzrlib/builtins.py:1829 +msgid " bzr info" +msgstr "" + +#: bzrlib/builtins.py:1831 +msgid "" +" Display the above together with extended format information and\n" +" basic statistics (like the number of files in the working tree and\n" +" number of revisions in the branch and repository):" +msgstr "" + +#: bzrlib/builtins.py:1835 +msgid " bzr info -v" +msgstr "" + +#: bzrlib/builtins.py:1837 +msgid " Display the above together with number of committers to the branch:" +msgstr "" + +#: bzrlib/builtins.py:1839 +msgid " bzr info -vv" +msgstr "" + +#: bzrlib/builtins.py:1858 +msgid "Remove files or directories." +msgstr "" + +#: bzrlib/builtins.py:1830 +msgid "" +"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n" +"delete them if they can easily be recovered using revert otherwise they\n" +"will be backed up (adding an extention of the form .~#~). If no options or\n" +"parameters are given Bazaar will scan for files that are being tracked by\n" +"Bazaar but missing in your tree and stop tracking them for you." +msgstr "" + +#: bzrlib/builtins.py:1868 +msgid "Only remove files that have never been committed." +msgstr "" + +#: bzrlib/builtins.py:1870 +msgid "The file deletion mode to be used." +msgstr "" + +#: bzrlib/builtins.py:1871 +msgid "Deletion Strategy" +msgstr "" + +#: bzrlib/builtins.py:1872 +msgid "Backup changed files (default)." +msgstr "" + +#: bzrlib/builtins.py:1873 +msgid "Delete from bzr but leave the working copy." +msgstr "" + +#: bzrlib/builtins.py:1874 +msgid "Don't backup changed files." +msgstr "" + +#: bzrlib/builtins.py:1875 +msgid "" +"Delete all the specified files, even if they can not be recovered and even " +"if they are non-empty directories. (deprecated, use no-backup)" +msgstr "" + +#: bzrlib/builtins.py:1884 +msgid "(The --force option is deprecated, rather use --no-backup in future.)" +msgstr "" + +#: bzrlib/builtins.py:1901 +msgid "No matching files." +msgstr "" + +#: bzrlib/builtins.py:1962 +msgid "Reconcile bzr metadata in a branch." +msgstr "" + +#: bzrlib/builtins.py:1964 +msgid "" +"This can correct data mismatches that may have been caused by\n" +"previous ghost operations or bzr upgrades. You should only\n" +"need to run this command if 'bzr check' or a bzr developer\n" +"advises you to run it." +msgstr "" + +#: bzrlib/builtins.py:1969 +msgid "" +"If a second branch is provided, cross-branch reconciliation is\n" +"also attempted, which will check that data like the tree root\n" +"id which was not present in very early bzr versions is represented\n" +"correctly in both branches." +msgstr "" + +#: bzrlib/builtins.py:1974 +msgid "" +"At the same time it is run it may recompress data resulting in\n" +"a potential saving in disk space or performance gain." +msgstr "" + +#: bzrlib/builtins.py:1977 +msgid "The branch *MUST* be on a listable system such as local disk or sftp." +msgstr "" + +#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779 +msgid "" +"Format for the bzr 2.0 series.\n" +"Uses group-compress storage.\n" +"Provides rich roots which are a one-way transition.\n" +msgstr "" + +#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779 +msgid "" +"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with " +"bzr repositories before 0.92 but cannot be read by bzr < 0.92. " +msgstr "" + +#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779 +msgid "The 2a format with experimental support for colocated branches.\n" +msgstr "" + +#: bzrlib/builtins.py:2045 +msgid "Make a directory into a versioned branch." +msgstr "" + +#: bzrlib/builtins.py:2047 +msgid "" +"Use this to create an empty branch, or before importing an\n" +"existing project." +msgstr "" + +#: bzrlib/builtins.py:2050 +msgid "" +"If there is a repository in a parent directory of the location, then\n" +"the history of the branch will be stored in the repository. Otherwise\n" +"init creates a standalone branch which carries its own history\n" +"in the .bzr directory." +msgstr "" + +#: bzrlib/builtins.py:2055 +msgid "" +"If there is already a branch at the location but it has no working tree,\n" +"the tree can be populated with 'bzr checkout'." +msgstr "" + +#: bzrlib/builtins.py:2058 +msgid "Recipe for importing a tree of files::" +msgstr "" + +#: bzrlib/builtins.py:2060 +msgid "" +" cd ~/project\n" +" bzr init\n" +" bzr add .\n" +" bzr status\n" +" bzr commit -m \"imported project\"" +msgstr "" + +#: bzrlib/builtins.py:2071 +msgid "" +"Create the path leading up to the branch if it does not already exist." +msgstr "" + +#: bzrlib/builtins.py:2074 +msgid "Specify a format for this branch. See \"help formats\"." +msgstr "" + +#: bzrlib/builtins.py:2082 +msgid "" +"Never change revnos or the existing log. Append revisions to it only." +msgstr "" + +#: bzrlib/builtins.py:2085 +msgid "Create a branch without a working tree." +msgstr "" + +#: bzrlib/builtins.py:2105 bzrlib/push.py:110 +#, python-format +msgid "" +"Parent directory of %s does not exist.\n" +"You may supply --create-prefix to create all leading parent directories." +msgstr "" + +#: bzrlib/builtins.py:2139 +msgid "" +"This branch format cannot be set to append-revisions-only. Try --default." +msgstr "" + +#: bzrlib/builtins.py:2150 +msgid "Created a {0} (format: {1})\n" +msgstr "" + +#: bzrlib/builtins.py:2159 +#, python-format +msgid "Using shared repository: %s\n" +msgstr "" + +#: bzrlib/builtins.py:2163 +msgid "Create a shared repository for branches to share storage space." +msgstr "" + +#: bzrlib/builtins.py:2165 +msgid "" +"New branches created under the repository directory will store their\n" +"revisions in the repository, not in the branch directory. For branches\n" +"with shared history, this reduces the amount of storage needed and \n" +"speeds up the creation of new branches." +msgstr "" + +#: bzrlib/builtins.py:2170 +msgid "" +"If the --no-trees option is given then the branches in the repository\n" +"will not have working trees by default. They will still exist as \n" +"directories on disk, but they will not have separate copies of the \n" +"files at a certain revision. This can be useful for repositories that\n" +"store branches which are interacted with through checkouts or remote\n" +"branches, such as on a server." +msgstr "" + +#: bzrlib/builtins.py:2177 +msgid "" +":Examples:\n" +" Create a shared repository holding just branches::" +msgstr "" + +#: bzrlib/builtins.py:2180 +msgid "" +" bzr init-repo --no-trees repo\n" +" bzr init repo/trunk" +msgstr "" + +#: bzrlib/builtins.py:2183 +msgid " Make a lightweight checkout elsewhere::" +msgstr "" + +#: bzrlib/builtins.py:2185 +msgid "" +" bzr checkout --lightweight repo/trunk trunk-checkout\n" +" cd trunk-checkout\n" +" (add files here)" +msgstr "" + +#: bzrlib/builtins.py:2193 +msgid "" +"Specify a format for this repository. See \"bzr help formats\" for details." +msgstr "" + +#: bzrlib/builtins.py:2197 +msgid "Repository format" +msgstr "" + +#: bzrlib/builtins.py:2199 +msgid "Branches in the repository will default to not having a working tree." +msgstr "" + +#: bzrlib/builtins.py:2225 +msgid "Show differences in the working tree, between revisions or branches." +msgstr "" + +#: bzrlib/builtins.py:2227 +msgid "" +"If no arguments are given, all changes for the current tree are listed.\n" +"If files are given, only the changes in those files are listed.\n" +"Remote and multiple branches can be compared by using the --old and\n" +"--new options. If not provided, the default for both is derived from\n" +"the first argument, if any, or the current tree if no arguments are\n" +"given." +msgstr "" + +#: bzrlib/builtins.py:2234 +msgid "" +"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n" +"produces patches suitable for \"patch -p1\"." +msgstr "" + +#: bzrlib/builtins.py:2237 +msgid "" +"Note that when using the -r argument with a range of revisions, the\n" +"differences are computed between the two specified revisions. That\n" +"is, the command does not show the changes introduced by the first \n" +"revision in the range. This differs from the interpretation of \n" +"revision ranges used by \"bzr log\" which includes the first revision\n" +"in the range." +msgstr "" + +#: bzrlib/builtins.py:2244 +msgid "" +":Exit values:\n" +" 1 - changed\n" +" 2 - unrepresentable changes\n" +" 3 - error\n" +" 0 - no change" +msgstr "" + +#: bzrlib/builtins.py:2250 +msgid "" +":Examples:\n" +" Shows the difference in the working tree versus the last commit::" +msgstr "" + +#: bzrlib/builtins.py:2253 +msgid " bzr diff" +msgstr "" + +#: bzrlib/builtins.py:2255 +msgid " Difference between the working tree and revision 1::" +msgstr "" + +#: bzrlib/builtins.py:2257 +msgid " bzr diff -r1" +msgstr "" + +#: bzrlib/builtins.py:2259 +msgid " Difference between revision 3 and revision 1::" +msgstr "" + +#: bzrlib/builtins.py:2261 +msgid " bzr diff -r1..3" +msgstr "" + +#: bzrlib/builtins.py:2263 +msgid " Difference between revision 3 and revision 1 for branch xxx::" +msgstr "" + +#: bzrlib/builtins.py:2265 +msgid " bzr diff -r1..3 xxx" +msgstr "" + +#: bzrlib/builtins.py:2267 +msgid " The changes introduced by revision 2 (equivalent to -r1..2)::" +msgstr "" + +#: bzrlib/builtins.py:2269 +msgid " bzr diff -c2" +msgstr "" + +#: bzrlib/builtins.py:2271 +msgid "" +" To see the changes introduced by revision X::\n" +" \n" +" bzr diff -cX" +msgstr "" + +#: bzrlib/builtins.py:2275 +msgid "" +" Note that in the case of a merge, the -c option shows the changes\n" +" compared to the left hand parent. To see the changes against\n" +" another parent, use::" +msgstr "" + +#: bzrlib/builtins.py:2279 +msgid " bzr diff -r..X" +msgstr "" + +#: bzrlib/builtins.py:2281 +msgid "" +" The changes between the current revision and the previous revision\n" +" (equivalent to -c-1 and -r-2..-1)" +msgstr "" + +#: bzrlib/builtins.py:2284 +msgid " bzr diff -r-2.." +msgstr "" + +#: bzrlib/builtins.py:2286 +msgid " Show just the differences for file NEWS::" +msgstr "" + +#: bzrlib/builtins.py:2288 +msgid " bzr diff NEWS" +msgstr "" + +#: bzrlib/builtins.py:2290 +msgid " Show the differences in working tree xxx for file NEWS::" +msgstr "" + +#: bzrlib/builtins.py:2292 +msgid " bzr diff xxx/NEWS" +msgstr "" + +#: bzrlib/builtins.py:2294 +msgid " Show the differences from branch xxx to this working tree:" +msgstr "" + +#: bzrlib/builtins.py:2296 +msgid " bzr diff --old xxx" +msgstr "" + +#: bzrlib/builtins.py:2298 +msgid " Show the differences between two branches for file NEWS::" +msgstr "" + +#: bzrlib/builtins.py:2300 +msgid " bzr diff --old xxx --new yyy NEWS" +msgstr "" + +#: bzrlib/builtins.py:2302 +msgid " Same as 'bzr diff' but prefix paths with old/ and new/::" +msgstr "" + +#: bzrlib/builtins.py:2304 +msgid "" +" bzr diff --prefix old/:new/\n" +" \n" +" Show the differences using a custom diff program with options::\n" +" \n" +" bzr diff --using /usr/bin/diff --diff-options -wu" +msgstr "" + +#: bzrlib/builtins.py:2314 +msgid "Pass these options to the external diff program." +msgstr "" + +#: bzrlib/builtins.py:2317 +msgid "" +"Set prefixes added to old and new filenames, as two values separated by a " +"colon. (eg \"old/:new/\")." +msgstr "" + +#: bzrlib/builtins.py:2320 +msgid "Branch/tree to compare from." +msgstr "" + +#: bzrlib/builtins.py:2324 +msgid "Branch/tree to compare to." +msgstr "" + +#: bzrlib/builtins.py:2330 +msgid "Use this command to compare files." +msgstr "" + +#: bzrlib/builtins.py:2335 +msgid "Diff format to use." +msgstr "" + +#: bzrlib/builtins.py:2337 +msgid "Diff format" +msgstr "" + +#: bzrlib/builtins.py:2359 +msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")" +msgstr "" + +#: bzrlib/builtins.py:2363 +msgid "bzr diff --revision takes exactly one or two revision specifiers" +msgstr "" + +#: bzrlib/builtins.py:2368 bzrlib/builtins.py:2765 bzrlib/builtins.py:2778 +#: bzrlib/builtins.py:2786 bzrlib/builtins.py:4959 +msgid "{0} and {1} are mutually exclusive" +msgstr "" + +#: bzrlib/builtins.py:2388 +msgid "" +"List files deleted in the working tree.\n" +" " +msgstr "" + +#: bzrlib/builtins.py:2465 +msgid "Show the tree root directory." +msgstr "" + +#: bzrlib/builtins.py:2467 +msgid "" +"The root is the nearest enclosing directory with a .bzr control\n" +"directory." +msgstr "" + +#: bzrlib/builtins.py:2482 +msgid "The limit argument must be an integer." +msgstr "" + +#: bzrlib/builtins.py:2490 +msgid "The levels argument must be an integer." +msgstr "" + +#: bzrlib/builtins.py:2495 +msgid "Show historical log for a branch or subset of a branch." +msgstr "" + +#: bzrlib/builtins.py:2497 +msgid "" +"log is bzr's default tool for exploring the history of a branch.\n" +"The branch to use is taken from the first parameter. If no parameters\n" +"are given, the branch containing the working directory is logged.\n" +"Here are some simple examples::" +msgstr "" + +#: bzrlib/builtins.py:2502 +msgid "" +" bzr log log the current branch\n" +" bzr log foo.py log a file in its branch\n" +" bzr log http://server/branch log a branch on a server" +msgstr "" + +#: bzrlib/builtins.py:2506 +msgid "" +"The filtering, ordering and information shown for each revision can\n" +"be controlled as explained below. By default, all revisions are\n" +"shown sorted (topologically) so that newer revisions appear before\n" +"older ones and descendants always appear before ancestors. If displayed,\n" +"merged revisions are shown indented under the revision in which they\n" +"were merged." +msgstr "" + +#: bzrlib/builtins.py:2513 +msgid ":Output control:" +msgstr "" + +#: bzrlib/builtins.py:2515 +msgid "" +" The log format controls how information about each revision is\n" +" displayed. The standard log formats are called ``long``, ``short``\n" +" and ``line``. The default is long. See ``bzr help log-formats``\n" +" for more details on log formats." +msgstr "" + +#: bzrlib/builtins.py:2520 +msgid "" +" The following options can be used to control what information is\n" +" displayed::" +msgstr "" + +#: bzrlib/builtins.py:2523 +msgid "" +" -l N display a maximum of N revisions\n" +" -n N display N levels of revisions (0 for all, 1 for collapsed)\n" +" -v display a status summary (delta) for each revision\n" +" -p display a diff (patch) for each revision\n" +" --show-ids display revision-ids (and file-ids), not just revnos" +msgstr "" + +#: bzrlib/builtins.py:2529 +msgid "" +" Note that the default number of levels to display is a function of the\n" +" log format. If the -n option is not used, the standard log formats show\n" +" just the top level (mainline)." +msgstr "" + +#: bzrlib/builtins.py:2533 +msgid "" +" Status summaries are shown using status flags like A, M, etc. To see\n" +" the changes explained using words like ``added`` and ``modified``\n" +" instead, use the -vv option." +msgstr "" + +#: bzrlib/builtins.py:2537 +msgid ":Ordering control:" +msgstr "" + +#: bzrlib/builtins.py:2539 +msgid "" +" To display revisions from oldest to newest, use the --forward option.\n" +" In most cases, using this option will have little impact on the total\n" +" time taken to produce a log, though --forward does not incrementally\n" +" display revisions like --reverse does when it can." +msgstr "" + +#: bzrlib/builtins.py:2544 +msgid ":Revision filtering:" +msgstr "" + +#: bzrlib/builtins.py:2546 +msgid "" +" The -r option can be used to specify what revision or range of revisions\n" +" to filter against. The various forms are shown below::" +msgstr "" + +#: bzrlib/builtins.py:2549 +msgid "" +" -rX display revision X\n" +" -rX.. display revision X and later\n" +" -r..Y display up to and including revision Y\n" +" -rX..Y display from X to Y inclusive" +msgstr "" + +#: bzrlib/builtins.py:2554 +msgid "" +" See ``bzr help revisionspec`` for details on how to specify X and Y.\n" +" Some common examples are given below::" +msgstr "" + +#: bzrlib/builtins.py:2557 +msgid "" +" -r-1 show just the tip\n" +" -r-10.. show the last 10 mainline revisions\n" +" -rsubmit:.. show what's new on this branch\n" +" -rancestor:path.. show changes since the common ancestor of this\n" +" branch and the one at location path\n" +" -rdate:yesterday.. show changes since yesterday" +msgstr "" + +#: bzrlib/builtins.py:2564 +msgid "" +" When logging a range of revisions using -rX..Y, log starts at\n" +" revision Y and searches back in history through the primary\n" +" (\"left-hand\") parents until it finds X. When logging just the\n" +" top level (using -n1), an error is reported if X is not found\n" +" along the way. If multi-level logging is used (-n0), X may be\n" +" a nested merge revision and the log will be truncated accordingly." +msgstr "" + +#: bzrlib/builtins.py:2571 +msgid ":Path filtering:" +msgstr "" + +#: bzrlib/builtins.py:2573 +msgid "" +" If parameters are given and the first one is not a branch, the log\n" +" will be filtered to show only those revisions that changed the\n" +" nominated files or directories." +msgstr "" + +#: bzrlib/builtins.py:2577 +msgid "" +" Filenames are interpreted within their historical context. To log a\n" +" deleted file, specify a revision range so that the file existed at\n" +" the end or start of the range." +msgstr "" + +#: bzrlib/builtins.py:2581 +msgid "" +" Historical context is also important when interpreting pathnames of\n" +" renamed files/directories. Consider the following example:" +msgstr "" + +#: bzrlib/builtins.py:2584 +msgid "" +" * revision 1: add tutorial.txt\n" +" * revision 2: modify tutorial.txt\n" +" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt" +msgstr "" + +#: bzrlib/builtins.py:2588 +msgid " In this case:" +msgstr "" + +#: bzrlib/builtins.py:2590 +msgid " * ``bzr log guide.txt`` will log the file added in revision 1" +msgstr "" + +#: bzrlib/builtins.py:2592 +msgid "" +" * ``bzr log tutorial.txt`` will log the new file added in revision 3" +msgstr "" + +#: bzrlib/builtins.py:2594 +msgid "" +" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n" +" the original file in revision 2." +msgstr "" + +#: bzrlib/builtins.py:2597 +msgid "" +" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n" +" was no file called guide.txt in revision 2." +msgstr "" + +#: bzrlib/builtins.py:2600 +msgid "" +" Renames are always followed by log. By design, there is no need to\n" +" explicitly ask for this (and no way to stop logging a file back\n" +" until it was last renamed)." +msgstr "" + +#: bzrlib/builtins.py:2604 +msgid ":Other filtering:" +msgstr "" + +#: bzrlib/builtins.py:2606 +msgid "" +" The --match option can be used for finding revisions that match a\n" +" regular expression in a commit message, committer, author or bug.\n" +" Specifying the option several times will match any of the supplied\n" +" expressions. --match-author, --match-bugs, --match-committer and\n" +" --match-message can be used to only match a specific field." +msgstr "" + +#: bzrlib/builtins.py:2612 +msgid ":Tips & tricks:" +msgstr "" + +#: bzrlib/builtins.py:2614 +msgid "" +" GUI tools and IDEs are often better at exploring history than command\n" +" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n" +" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n" +" Guide and\n" +" . " +msgstr "" + +#: bzrlib/builtins.py:2620 +msgid "" +" You may find it useful to add the aliases below to ``bazaar.conf``::" +msgstr "" + +#: bzrlib/builtins.py:2622 +msgid "" +" [ALIASES]\n" +" tip = log -r-1\n" +" top = log -l10 --line\n" +" show = log -v -p" +msgstr "" + +#: bzrlib/builtins.py:2627 +msgid "" +" ``bzr tip`` will then show the latest revision while ``bzr top``\n" +" will show the last 10 mainline revisions. To see the details of a\n" +" particular revision X, ``bzr show -rX``." +msgstr "" + +#: bzrlib/builtins.py:2631 +msgid "" +" If you are interested in looking deeper into a particular merge X,\n" +" use ``bzr log -n0 -rX``." +msgstr "" + +#: bzrlib/builtins.py:2634 +msgid "" +" ``bzr log -v`` on a branch with lots of history is currently\n" +" very slow. A fix for this issue is currently under development.\n" +" With or without that fix, it is recommended that a revision range\n" +" be given when using the -v option." +msgstr "" + +#: bzrlib/builtins.py:2639 +msgid "" +" bzr has a generic full-text matching plugin, bzr-search, that can be\n" +" used to find revisions matching user names, commit messages, etc.\n" +" Among other features, this plugin can find all revisions containing\n" +" a list of words but not others." +msgstr "" + +#: bzrlib/builtins.py:2644 +msgid "" +" When exploring non-mainline history on large projects with deep\n" +" history, the performance of log can be greatly improved by installing\n" +" the historycache plugin. This plugin buffers historical information\n" +" trading disk space for faster speed." +msgstr "" + +#: bzrlib/builtins.py:2653 +msgid "Show from oldest to newest." +msgstr "" + +#: bzrlib/builtins.py:2656 +msgid "Show files changed in each revision." +msgstr "" + +#: bzrlib/builtins.py:2662 +msgid "Show just the specified revision. See also \"help revisionspec\"." +msgstr "" + +#: bzrlib/builtins.py:2666 +msgid "What names to list as authors - first, all or committer." +msgstr "" + +#: bzrlib/builtins.py:2667 +msgid "Authors" +msgstr "" + +#: bzrlib/builtins.py:2672 +msgid "Number of levels to display - 0 for all, 1 for flat." +msgstr "" + +#: bzrlib/builtins.py:2682 +msgid "Limit the output to the first N revisions." +msgstr "" + +#: bzrlib/builtins.py:2687 +msgid "Show changes made in each revision as a patch." +msgstr "" + +#: bzrlib/builtins.py:2689 +msgid "Show merged revisions like --levels 0 does." +msgstr "" + +#: bzrlib/builtins.py:2693 +msgid "Do not report commits with more than one parent." +msgstr "" + +#: bzrlib/builtins.py:2695 +msgid "" +"Display only the revisions that are not part of both ancestries (require -" +"rX..Y)." +msgstr "" + +#: bzrlib/builtins.py:2699 +msgid "Show digital signature validity." +msgstr "" + +#: bzrlib/builtins.py:2702 +msgid "Show revisions whose properties match this expression." +msgstr "" + +#: bzrlib/builtins.py:2706 +msgid "Show revisions whose message matches this expression." +msgstr "" + +#: bzrlib/builtins.py:2710 +msgid "Show revisions whose committer matches this expression." +msgstr "" + +#: bzrlib/builtins.py:2714 +msgid "Show revisions whose authors match this expression." +msgstr "" + +#: bzrlib/builtins.py:2718 +msgid "Show revisions whose bugs match this expression." +msgstr "" + +#: bzrlib/builtins.py:2772 +msgid "--exclude-common-ancestry requires -r with two revisions" +msgstr "" + +#: bzrlib/builtins.py:2800 +#, python-format +msgid "Path unknown at end or start of revision range: %s" +msgstr "" + +#: bzrlib/builtins.py:2917 +#, python-format +msgid "bzr %s doesn't accept two revisions in different branches." +msgstr "" + +#: bzrlib/builtins.py:2933 +#, python-format +msgid "bzr %s --revision takes one or two values." +msgstr "" + +#: bzrlib/builtins.py:2978 +msgid "" +"List files in a tree.\n" +" " +msgstr "" + +#: bzrlib/builtins.py:2987 +msgid "Recurse into subdirectories." +msgstr "" + +#: bzrlib/builtins.py:2989 +msgid "Print paths relative to the root of the branch." +msgstr "" + +#: bzrlib/builtins.py:2991 +msgid "Print unknown files." +msgstr "" + +#: bzrlib/builtins.py:2992 +msgid "Print versioned files." +msgstr "" + +#: bzrlib/builtins.py:2995 +msgid "Print ignored files." +msgstr "" + +#: bzrlib/builtins.py:2997 +msgid "List entries of a particular kind: file, directory, symlink." +msgstr "" + +#: bzrlib/builtins.py:3010 +msgid "invalid kind specified" +msgstr "" + +#: bzrlib/builtins.py:3013 +msgid "Cannot set both --verbose and --null" +msgstr "" + +#: bzrlib/builtins.py:3022 +msgid "cannot specify both --from-root and PATH" +msgstr "" + +#: bzrlib/builtins.py:3109 +msgid "Ignore specified files or patterns." +msgstr "" + +#: bzrlib/builtins.py:3111 +msgid "See ``bzr help patterns`` for details on the syntax of patterns." +msgstr "" + +#: bzrlib/builtins.py:3113 +msgid "" +"If a .bzrignore file does not exist, the ignore command\n" +"will create one and add the specified files or patterns to the newly\n" +"created file. The ignore command will also automatically add the \n" +".bzrignore file to be versioned. Creating a .bzrignore file without\n" +"the use of the ignore command will require an explicit add command." +msgstr "" + +#: bzrlib/builtins.py:3119 +msgid "" +"To remove patterns from the ignore list, edit the .bzrignore file.\n" +"After adding, editing or deleting that file either indirectly by\n" +"using this command or directly by using an editor, be sure to commit\n" +"it." +msgstr "" + +#: bzrlib/builtins.py:3124 +msgid "" +"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n" +"the global ignore file can be found in the application data directory as\n" +"C:\\Documents and Settings\\\\Application Data\\Bazaar\\2.0\\ignore.\n" +"Global ignores are not touched by this command. The global ignore file\n" +"can be edited directly using an editor." +msgstr "" + +#: bzrlib/builtins.py:3130 +msgid "" +"Patterns prefixed with '!' are exceptions to ignore patterns and take\n" +"precedence over regular ignores. Such exceptions are used to specify\n" +"files that should be versioned which would otherwise be ignored." +msgstr "" + +#: bzrlib/builtins.py:3134 +msgid "" +"Patterns prefixed with '!!' act as regular ignore patterns, but have\n" +"precedence over the '!' exception patterns." +msgstr "" + +#: bzrlib/builtins.py:3137 +msgid "" +":Notes: \n" +" \n" +"* Ignore patterns containing shell wildcards must be quoted from\n" +" the shell on Unix." +msgstr "" + +#: bzrlib/builtins.py:3142 +msgid "" +"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n" +" To ignore patterns that begin with that character, use the \"RE:\" prefix." +msgstr "" + +#: bzrlib/builtins.py:3145 +msgid "" +":Examples:\n" +" Ignore the top level Makefile::" +msgstr "" + +#: bzrlib/builtins.py:3148 +msgid " bzr ignore ./Makefile" +msgstr "" + +#: bzrlib/builtins.py:3150 +msgid " Ignore .class files in all directories...::" +msgstr "" + +#: bzrlib/builtins.py:3152 +msgid " bzr ignore \"*.class\"" +msgstr "" + +#: bzrlib/builtins.py:3154 +msgid " ...but do not ignore \"special.class\"::" +msgstr "" + +#: bzrlib/builtins.py:3156 +msgid " bzr ignore \"!special.class\"" +msgstr "" + +#: bzrlib/builtins.py:3158 +msgid " Ignore files whose name begins with the \"#\" character::" +msgstr "" + +#: bzrlib/builtins.py:3160 +msgid " bzr ignore \"RE:^#\"" +msgstr "" + +#: bzrlib/builtins.py:3162 bzrlib/builtins.py:3166 +msgid " Ignore .o files under the lib directory::" +msgstr "" + +#: bzrlib/builtins.py:3164 +msgid " bzr ignore \"lib/**/*.o\"" +msgstr "" + +#: bzrlib/builtins.py:3168 +msgid " bzr ignore \"RE:lib/.*\\.o\"" +msgstr "" + +#: bzrlib/builtins.py:3170 +msgid " Ignore everything but the \"debian\" toplevel directory::" +msgstr "" + +#: bzrlib/builtins.py:3172 +msgid "" +" bzr ignore \"RE:(?!debian/).*\"\n" +" \n" +" Ignore everything except the \"local\" toplevel directory,\n" +" but always ignore autosave files ending in ~, even under local/::\n" +" \n" +" bzr ignore \"*\"\n" +" bzr ignore \"!./local\"\n" +" bzr ignore \"!!*~\"" +msgstr "" + +#: bzrlib/builtins.py:3186 +msgid "Display the default ignore rules that bzr uses." +msgstr "" + +#: bzrlib/builtins.py:3198 +msgid "ignore requires at least one NAME_PATTERN or --default-rules." +msgstr "" + +#: bzrlib/builtins.py:3209 +#, python-format +msgid "Invalid ignore pattern found. %s" +msgid_plural "Invalid ignore patterns found. %s" +msgstr[0] "" +msgstr[1] "" + +#: bzrlib/builtins.py:3218 +msgid "NAME_PATTERN should not be an absolute path" +msgstr "" + +#: bzrlib/builtins.py:3231 +#, python-format +msgid "" +"Warning: the following files are version controlled and match your ignore " +"pattern:\n" +"%s\n" +"These files will continue to be version controlled unless you 'bzr remove' " +"them.\n" +msgstr "" + +#: bzrlib/builtins.py:3238 +msgid "List ignored files and the patterns that matched them." +msgstr "" + +#: bzrlib/builtins.py:3240 +msgid "" +"List all the ignored files and the ignore pattern that caused the file to\n" +"be ignored." +msgstr "" + +#: bzrlib/builtins.py:3243 +msgid "Alternatively, to list just the files::" +msgstr "" + +#: bzrlib/builtins.py:3245 +msgid " bzr ls --ignored" +msgstr "" + +#: bzrlib/builtins.py:3279 +#, python-format +msgid "not a valid revision-number: %r" +msgstr "" + +#: bzrlib/builtins.py:3286 +msgid "" +"Export current or past revision to a destination directory or archive." +msgstr "" + +#: bzrlib/builtins.py:3288 +msgid "If no revision is specified this exports the last committed revision." +msgstr "" + +#: bzrlib/builtins.py:3290 +msgid "" +"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n" +"given, try to find the format with the extension. If no extension\n" +"is found exports to a directory (equivalent to --format=dir)." +msgstr "" + +#: bzrlib/builtins.py:3294 +msgid "" +"If root is supplied, it will be used as the root directory inside\n" +"container formats (tar, zip, etc). If it is not supplied it will default\n" +"to the exported filename. The root option has no effect for 'dir' format." +msgstr "" + +#: bzrlib/builtins.py:3298 +msgid "" +"If branch is omitted then the branch containing the current working\n" +"directory will be used." +msgstr "" + +#: bzrlib/builtins.py:3301 +msgid "" +"Note: Export of tree with non-ASCII filenames to zip is not supported." +msgstr "" + +#: bzrlib/builtins.py:3303 +msgid "" +" ================= =========================\n" +" Supported formats Autodetected by extension\n" +" ================= =========================\n" +" dir (none)\n" +" tar .tar\n" +" tbz2 .tar.bz2, .tbz2\n" +" tgz .tar.gz, .tgz\n" +" zip .zip\n" +" ================= =========================" +msgstr "" + +#: bzrlib/builtins.py:3317 +msgid "Type of file to export to." +msgstr "" + +#: bzrlib/builtins.py:3320 +msgid "Apply content filters to export the convenient form." +msgstr "" + +#: bzrlib/builtins.py:3324 +msgid "Name of the root directory inside the exported file." +msgstr "" + +#: bzrlib/builtins.py:3326 +msgid "" +"Set modification time of files to that of the last revision in which it was " +"changed." +msgstr "" + +#: bzrlib/builtins.py:3329 +msgid "" +"Export the working tree contents rather than that of the last revision." +msgstr "" + +#: bzrlib/builtins.py:3348 +msgid "--uncommitted requires a working tree" +msgstr "" + +#: bzrlib/builtins.py:3357 +#, python-format +msgid "Unsupported export format: %s" +msgstr "" + +#: bzrlib/builtins.py:3361 +msgid "" +"Write the contents of a file as of a given revision to standard output." +msgstr "" + +#: bzrlib/builtins.py:3363 +msgid "If no revision is nominated, the last revision is used." +msgstr "" + +#: bzrlib/builtins.py:3365 +msgid "" +"Note: Take care to redirect standard output when using this command on a\n" +"binary file." +msgstr "" + +#: bzrlib/builtins.py:3371 +msgid "The path name in the old tree." +msgstr "" + +#: bzrlib/builtins.py:3372 +msgid "Apply content filters to display the convenience form." +msgstr "" + +#: bzrlib/builtins.py:3383 +msgid "bzr cat --revision takes exactly one revision specifier" +msgstr "" + +#: bzrlib/builtins.py:3408 bzrlib/builtins.py:3420 +msgid "{0!r} is not present in revision {1}" +msgstr "" + +#: bzrlib/builtins.py:3443 +msgid "Commit changes into a new revision." +msgstr "" + +#: bzrlib/builtins.py:3445 +msgid "" +"An explanatory message needs to be given for each commit. This is\n" +"often done by using the --message option (getting the message from the\n" +"command line) or by using the --file option (getting the message from\n" +"a file). If neither of these options is given, an editor is opened for\n" +"the user to enter the message. To see the changed files in the\n" +"boilerplate text loaded into the editor, use the --show-diff option." +msgstr "" + +#: bzrlib/builtins.py:3452 +msgid "" +"By default, the entire tree is committed and the person doing the\n" +"commit is assumed to be the author. These defaults can be overridden\n" +"as explained below." +msgstr "" + +#: bzrlib/builtins.py:3456 +msgid ":Selective commits:" +msgstr "" + +#: bzrlib/builtins.py:3458 +msgid "" +" If selected files are specified, only changes to those files are\n" +" committed. If a directory is specified then the directory and\n" +" everything within it is committed." +msgstr "" + +#: bzrlib/builtins.py:3462 +msgid "" +" When excludes are given, they take precedence over selected files.\n" +" For example, to commit only changes within foo, but not changes\n" +" within foo/bar::" +msgstr "" + +#: bzrlib/builtins.py:3466 +msgid " bzr commit foo -x foo/bar" +msgstr "" + +#: bzrlib/builtins.py:3468 +msgid " A selective commit after a merge is not yet supported." +msgstr "" + +#: bzrlib/builtins.py:3470 +msgid ":Custom authors:" +msgstr "" + +#: bzrlib/builtins.py:3472 +msgid "" +" If the author of the change is not the same person as the committer,\n" +" you can specify the author's name using the --author option. The\n" +" name should be in the same format as a committer-id, e.g.\n" +" \"John Doe \". If there is more than one author of\n" +" the change you can specify the option multiple times, once for each\n" +" author." +msgstr "" + +#: bzrlib/builtins.py:3479 +msgid ":Checks:" +msgstr "" + +#: bzrlib/builtins.py:3481 +msgid "" +" A common mistake is to forget to add a new file or directory before\n" +" running the commit command. The --strict option checks for unknown\n" +" files and aborts the commit if any are found. More advanced pre-commit\n" +" checks can be implemented by defining hooks. See ``bzr help hooks``\n" +" for details." +msgstr "" + +#: bzrlib/builtins.py:3487 +msgid ":Things to note:" +msgstr "" + +#: bzrlib/builtins.py:3489 +msgid "" +" If you accidentially commit the wrong changes or make a spelling\n" +" mistake in the commit message say, you can use the uncommit command\n" +" to undo it. See ``bzr help uncommit`` for details." +msgstr "" + +#: bzrlib/builtins.py:3493 +msgid "" +" Hooks can also be configured to run after a commit. This allows you\n" +" to trigger updates to external systems like bug trackers. The --fixes\n" +" option can be used to record the association between a revision and\n" +" one or more bugs. See ``bzr help bugs`` for details." +msgstr "" + +#: bzrlib/builtins.py:3503 +msgid "Do not consider changes made to a given path." +msgstr "" + +#: bzrlib/builtins.py:3506 +msgid "Description of the new revision." +msgstr "" + +#: bzrlib/builtins.py:3509 +msgid "Commit even if nothing has changed." +msgstr "" + +#: bzrlib/builtins.py:3513 +msgid "Take commit message from this file." +msgstr "" + +#: bzrlib/builtins.py:3515 +msgid "Refuse to commit if there are unknown files in the working tree." +msgstr "" + +#: bzrlib/builtins.py:3518 +msgid "" +"Manually set a commit time using commit date format, e.g. '2009-10-10 " +"08:00:00 +0100'." +msgstr "" + +#: bzrlib/builtins.py:3521 +msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")." +msgstr "" + +#: bzrlib/builtins.py:3524 +msgid "Set the author's name, if it's different from the committer." +msgstr "" + +#: bzrlib/builtins.py:3527 +msgid "" +"Perform a local commit in a bound branch. Local commits are not pushed to " +"the master branch until a normal commit is performed." +msgstr "" + +#: bzrlib/builtins.py:3533 +msgid "" +"When no message is supplied, show the diff along with the status summary in " +"the message editor." +msgstr "" + +#: bzrlib/builtins.py:3536 +msgid "" +"When committing to a foreign version control system do not push data that " +"can not be natively represented." +msgstr "" + +#: bzrlib/builtins.py:3554 +#, python-format +msgid "" +"No tracker specified for bug %s. Use the form 'tracker:id' or specify a " +"default bug tracker using the `bugtracker` option.\n" +"See \"bzr help bugs\" for more information on this feature. Commit refused." +msgstr "" + +#: bzrlib/builtins.py:3563 +#, python-format +msgid "" +"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" " +"for more information on this feature.\n" +"Commit refused." +msgstr "" + +#: bzrlib/builtins.py:3572 +#, python-format +msgid "Unrecognized bug %s. Commit refused." +msgstr "" + +#: bzrlib/builtins.py:3575 +#, python-format +msgid "" +"%s\n" +"Commit refused." +msgstr "" + +#: bzrlib/builtins.py:3599 +msgid "Could not parse --commit-time: " +msgstr "" + +#: bzrlib/builtins.py:3639 +msgid "please specify either --message or --file" +msgstr "" + +#: bzrlib/builtins.py:3668 +msgid "please specify a commit message with either --message or --file" +msgstr "" + +#: bzrlib/builtins.py:3671 +msgid "" +"Empty commit message specified. Please specify a commit message with either -" +"-message or --file or leave a blank message with --message \"\"." +msgstr "" + +#: bzrlib/builtins.py:3691 +msgid "" +"No changes to commit. Please 'bzr add' the files you want to commit, or use -" +"-unchanged to force an empty commit." +msgstr "" + +#: bzrlib/builtins.py:3695 +msgid "" +"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr " +"resolve FILE\" to resolve." +msgstr "" + +#: bzrlib/builtins.py:3699 +msgid "Commit refused because there are unknown files in the working tree." +msgstr "" + +#: bzrlib/builtins.py:3702 +msgid "" +"\n" +"To commit to master branch, run update and then commit.\n" +"You can also pass --local to commit to continue working disconnected." +msgstr "" + +#: bzrlib/builtins.py:3710 +msgid "" +"Validate working tree structure, branch consistency and repository history." +msgstr "" + +#: bzrlib/builtins.py:3712 +msgid "" +"This command checks various invariants about branch and repository storage\n" +"to detect data corruption or bzr bugs." +msgstr "" + +#: bzrlib/builtins.py:3715 +msgid "" +"The working tree and branch checks will only give output if a problem is\n" +"detected. The output fields of the repository check are:" +msgstr "" + +#: bzrlib/builtins.py:3718 +msgid "" +"revisions\n" +" This is just the number of revisions checked. It doesn't\n" +" indicate a problem." +msgstr "" + +#: bzrlib/builtins.py:3722 +msgid "" +"versionedfiles\n" +" This is just the number of versionedfiles checked. It\n" +" doesn't indicate a problem." +msgstr "" + +#: bzrlib/builtins.py:3726 +msgid "" +"unreferenced ancestors\n" +" Texts that are ancestors of other texts, but\n" +" are not properly referenced by the revision ancestry. This is a\n" +" subtle problem that Bazaar can work around." +msgstr "" + +#: bzrlib/builtins.py:3731 +msgid "" +"unique file texts\n" +" This is the total number of unique file contents\n" +" seen in the checked revisions. It does not indicate a problem." +msgstr "" + +#: bzrlib/builtins.py:3735 +msgid "" +"repeated file texts\n" +" This is the total number of repeated texts seen\n" +" in the checked revisions. Texts can be repeated when their file\n" +" entries are modified, but the file contents are not. It does not\n" +" indicate a problem." +msgstr "" + +#: bzrlib/builtins.py:3741 +msgid "" +"If no restrictions are specified, all Bazaar data that is found at the " +"given\n" +"location will be checked." +msgstr "" + +#: bzrlib/builtins.py:3746 +msgid " Check the tree and branch at 'foo'::" +msgstr "" + +#: bzrlib/builtins.py:3748 +msgid " bzr check --tree --branch foo" +msgstr "" + +#: bzrlib/builtins.py:3750 +msgid " Check only the repository at 'bar'::" +msgstr "" + +#: bzrlib/builtins.py:3752 +msgid " bzr check --repo bar" +msgstr "" + +#: bzrlib/builtins.py:3754 +msgid " Check everything at 'baz'::" +msgstr "" + +#: bzrlib/builtins.py:3756 +msgid " bzr check baz" +msgstr "" + +#: bzrlib/builtins.py:3762 +msgid "Check the branch related to the current directory." +msgstr "" + +#: bzrlib/builtins.py:3764 +msgid "Check the repository related to the current directory." +msgstr "" + +#: bzrlib/builtins.py:3766 +msgid "Check the working tree related to the current directory." +msgstr "" + +#: bzrlib/builtins.py:3780 +msgid "Upgrade a repository, branch or working tree to a newer format." +msgstr "" + +#: bzrlib/builtins.py:3782 +msgid "" +"When the default format has changed after a major new release of\n" +"Bazaar, you may be informed during certain operations that you\n" +"should upgrade. Upgrading to a newer format may improve performance\n" +"or make new features available. It may however limit interoperability\n" +"with older repositories or with older versions of Bazaar." +msgstr "" + +#: bzrlib/builtins.py:3788 +msgid "" +"If you wish to upgrade to a particular format rather than the\n" +"current default, that can be specified using the --format option.\n" +"As a consequence, you can use the upgrade command this way to\n" +"\"downgrade\" to an earlier format, though some conversions are\n" +"a one way process (e.g. changing from the 1.x default to the\n" +"2.x default) so downgrading is not always possible." +msgstr "" + +#: bzrlib/builtins.py:3795 +msgid "" +"A backup.bzr.~#~ directory is created at the start of the conversion\n" +"process (where # is a number). By default, this is left there on\n" +"completion. If the conversion fails, delete the new .bzr directory\n" +"and rename this one back in its place. Use the --clean option to ask\n" +"for the backup.bzr directory to be removed on successful conversion.\n" +"Alternatively, you can delete it by hand if everything looks good\n" +"afterwards." +msgstr "" + +#: bzrlib/builtins.py:3803 +msgid "" +"If the location given is a shared repository, dependent branches\n" +"are also converted provided the repository converts successfully.\n" +"If the conversion of a branch fails, remaining branches are still\n" +"tried." +msgstr "" + +#: bzrlib/builtins.py:3808 +msgid "" +"For more information on upgrades, see the Bazaar Upgrade Guide,\n" +"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/." +msgstr "" + +#: bzrlib/builtins.py:3816 +msgid "Upgrade to a specific format. See \"bzr help formats\" for details." +msgstr "" + +#: bzrlib/builtins.py:3820 +msgid "Branch format" +msgstr "" + +#: bzrlib/builtins.py:3822 +msgid "Remove the backup.bzr directory if successful." +msgstr "" + +#: bzrlib/builtins.py:3824 +msgid "Show what would be done, but don't actually do anything." +msgstr "" + +#: bzrlib/builtins.py:3839 +msgid "Show or set bzr user id." +msgstr "" + +#: bzrlib/builtins.py:3841 +msgid "" +":Examples:\n" +" Show the email of the current user::" +msgstr "" + +#: bzrlib/builtins.py:3844 +msgid " bzr whoami --email" +msgstr "" + +#: bzrlib/builtins.py:3846 +msgid " Set the current user::" +msgstr "" + +#: bzrlib/builtins.py:3848 +msgid " bzr whoami \"Frank Chu \"" +msgstr "" + +#: bzrlib/builtins.py:3852 +msgid "Display email address only." +msgstr "" + +#: bzrlib/builtins.py:3854 +msgid "Set identity for the current branch instead of globally." +msgstr "" + +#: bzrlib/builtins.py:3880 +msgid "--email can only be used to display existing identity" +msgstr "" + +#: bzrlib/builtins.py:3904 +msgid "Print or set the branch nickname." +msgstr "" + +#: bzrlib/builtins.py:3875 +msgid "" +"If unset, the tree root directory name is used as the nickname.\n" +"To print the current nickname, execute with no argument." +msgstr "" + +#: bzrlib/builtins.py:3910 +msgid "" +"Bound branches use the nickname of its master branch unless it is set\n" +"locally." +msgstr "" + +#: bzrlib/builtins.py:3930 +msgid "Set/unset and display aliases." +msgstr "" + +#: bzrlib/builtins.py:3932 +msgid "" +":Examples:\n" +" Show the current aliases::" +msgstr "" + +#: bzrlib/builtins.py:3935 +msgid " bzr alias" +msgstr "" + +#: bzrlib/builtins.py:3937 +msgid " Show the alias specified for 'll'::" +msgstr "" + +#: bzrlib/builtins.py:3939 +msgid " bzr alias ll" +msgstr "" + +#: bzrlib/builtins.py:3941 +msgid " Set an alias for 'll'::" +msgstr "" + +#: bzrlib/builtins.py:3943 +msgid " bzr alias ll=\"log --line -r-10..-1\"" +msgstr "" + +#: bzrlib/builtins.py:3945 +msgid " To remove an alias for 'll'::" +msgstr "" + +#: bzrlib/builtins.py:3947 +msgid " bzr alias --remove ll" +msgstr "" + +#: bzrlib/builtins.py:3952 +msgid "Remove the alias." +msgstr "" + +#: bzrlib/builtins.py:3970 +msgid "bzr alias --remove expects an alias to remove." +msgstr "" + +#: bzrlib/builtins.py:4151 +msgid "" +"subunit not available. subunit needs to be installed to use --subunit." +msgstr "" + +#: bzrlib/builtins.py:4168 +msgid "" +"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead" +msgstr "" + +#: bzrlib/builtins.py:4215 +msgid "Show version of bzr." +msgstr "" + +#: bzrlib/builtins.py:4219 +msgid "Print just the version number." +msgstr "" + +#: bzrlib/builtins.py:4238 +msgid "It sure does!\n" +msgstr "" + +#: bzrlib/builtins.py:4262 +#, python-format +msgid "merge base is revision %s\n" +msgstr "" + +#: bzrlib/builtins.py:4266 +msgid "Perform a three-way merge." +msgstr "" + +#: bzrlib/builtins.py:4268 +msgid "" +"The source of the merge can be specified either in the form of a branch,\n" +"or in the form of a path to a file containing a merge directive generated\n" +"with bzr send. If neither is specified, the default is the upstream branch\n" +"or the branch most recently merged using --remember. The source of the\n" +"merge may also be specified in the form of a path to a file in another\n" +"branch: in this case, only the modifications to that file are merged into\n" +"the current working tree." +msgstr "" + +#: bzrlib/builtins.py:4276 +msgid "" +"When merging from a branch, by default bzr will try to merge in all new\n" +"work from the other branch, automatically determining an appropriate base\n" +"revision. If this fails, you may need to give an explicit base." +msgstr "" + +#: bzrlib/builtins.py:4280 +msgid "" +"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n" +"try to merge in all new work up to and including revision OTHER." +msgstr "" + +#: bzrlib/builtins.py:4283 +msgid "" +"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n" +"through OTHER, excluding BASE but including OTHER, will be merged. If this\n" +"causes some revisions to be skipped, i.e. if the destination branch does\n" +"not already contain revision BASE, such a merge is commonly referred to as\n" +"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n" +"cherrypicks. The changes look like a normal commit, and the history of the\n" +"changes from the other branch is not stored in the commit." +msgstr "" + +#: bzrlib/builtins.py:4291 +msgid "Revision numbers are always relative to the source branch." +msgstr "" + +#: bzrlib/builtins.py:4293 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106 +msgid "" +"Merge will do its best to combine the changes in two branches, but there\n" +"are some kinds of problems only a human can fix. When it encounters those,\n" +"it will mark a conflict. A conflict means that you need to fix something,\n" +"before you can commit." +msgstr "" + +#: bzrlib/builtins.py:4298 +msgid "" +"Use bzr resolve when you have fixed a problem. See also bzr conflicts." +msgstr "" + +#: bzrlib/builtins.py:4300 +msgid "" +"If there is no default branch set, the first merge will set it (use\n" +"--no-remember to avoid setting it). After that, you can omit the branch\n" +"to use the default. To change the default, use --remember. The value will\n" +"only be saved if the remote location can be accessed." +msgstr "" + +#: bzrlib/builtins.py:4305 +msgid "" +"The results of the merge are placed into the destination working\n" +"directory, where they can be reviewed (with bzr diff), tested, and then\n" +"committed to record the result of the merge." +msgstr "" + +#: bzrlib/builtins.py:4309 +msgid "" +"merge refuses to run if there are any uncommitted changes, unless\n" +"--force is given. If --force is given, then the changes from the source \n" +"will be merged with the current working tree, including any uncommitted\n" +"changes in the tree. The --force option can also be used to create a\n" +"merge revision which has more than two parents." +msgstr "" + +#: bzrlib/builtins.py:4315 +msgid "" +"If one would like to merge changes from the working tree of the other\n" +"branch without merging any committed revisions, the --uncommitted option\n" +"can be given." +msgstr "" + +#: bzrlib/builtins.py:4319 +msgid "" +"To select only some changes to merge, use \"merge -i\", which will prompt\n" +"you to apply each diff hunk and file change, similar to \"shelve\"." +msgstr "" + +#: bzrlib/builtins.py:4322 +msgid "" +":Examples:\n" +" To merge all new revisions from bzr.dev::" +msgstr "" + +#: bzrlib/builtins.py:4325 +msgid " bzr merge ../bzr.dev" +msgstr "" + +#: bzrlib/builtins.py:4327 +msgid " To merge changes up to and including revision 82 from bzr.dev::" +msgstr "" + +#: bzrlib/builtins.py:4329 +msgid " bzr merge -r 82 ../bzr.dev" +msgstr "" + +#: bzrlib/builtins.py:4331 +msgid " To merge the changes introduced by 82, without previous changes::" +msgstr "" + +#: bzrlib/builtins.py:4333 +msgid " bzr merge -r 81..82 ../bzr.dev" +msgstr "" + +#: bzrlib/builtins.py:4335 +msgid " To apply a merge directive contained in /tmp/merge::" +msgstr "" + +#: bzrlib/builtins.py:4337 +msgid " bzr merge /tmp/merge" +msgstr "" + +#: bzrlib/builtins.py:4339 +msgid "" +" To create a merge revision with three parents from two branches\n" +" feature1a and feature1b:" +msgstr "" + +#: bzrlib/builtins.py:4342 +msgid "" +" bzr merge ../feature1a\n" +" bzr merge ../feature1b --force\n" +" bzr commit -m 'revision with three parents'" +msgstr "" + +#: bzrlib/builtins.py:4354 +msgid "Merge even if the destination tree has uncommitted changes." +msgstr "" + +#: bzrlib/builtins.py:4360 +msgid "" +"Apply uncommitted changes from a working copy, instead of branch changes." +msgstr "" + +#: bzrlib/builtins.py:4362 +msgid "" +"If the destination is already completely merged into the source, pull from " +"the source rather than merging. When this happens, you do not need to " +"commit the result." +msgstr "" + +#: bzrlib/builtins.py:4367 +msgid "" +"Branch to merge into, rather than the one containing the working directory." +msgstr "" + +#: bzrlib/builtins.py:4369 +msgid "Instead of merging, show a diff of the merge." +msgstr "" + +#: bzrlib/builtins.py:4371 +msgid "Select changes interactively." +msgstr "" + +#: bzrlib/builtins.py:4393 +msgid "" +"Merging into empty branches not currently supported, " +"https://bugs.launchpad.net/bzr/+bug/308562" +msgstr "" + +#: bzrlib/builtins.py:4420 +msgid "Cannot use --uncommitted with bundles or merge directives." +msgstr "" + +#: bzrlib/builtins.py:4431 +msgid "Cannot use --uncommitted and --revision at the same time." +msgstr "" + +#: bzrlib/builtins.py:4451 +msgid "merger: " +msgstr "" + +#: bzrlib/builtins.py:4453 bzrlib/bundle/apply_bundle.py:71 +msgid "Nothing to do." +msgstr "" + +#: bzrlib/builtins.py:4457 +msgid "Cannot pull individual files" +msgstr "" + +#: bzrlib/builtins.py:4465 +msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')" +msgstr "" + +#: bzrlib/builtins.py:4523 +#, python-format +msgid "Show-base is not supported for this merge type. %s" +msgstr "" + +#: bzrlib/builtins.py:4532 +#, python-format +msgid "Conflict reduction is not supported for merge type %s." +msgstr "" + +#: bzrlib/builtins.py:4536 +msgid "Cannot do conflict reduction and show base." +msgstr "" + +#: bzrlib/builtins.py:4647 +msgid "No location specified or remembered" +msgstr "" + +#: bzrlib/builtins.py:4649 +msgid "{0} remembered {1} location {2}" +msgstr "" + +#: bzrlib/builtins.py:4655 +msgid "Redo a merge." +msgstr "" + +#: bzrlib/builtins.py:4657 +msgid "" +"Use this if you want to try a different merge technique while resolving\n" +"conflicts. Some merge techniques are better than others, and remerge\n" +"lets you try different ones on different files." +msgstr "" + +#: bzrlib/builtins.py:4661 +msgid "" +"The options for remerge have the same meaning and defaults as the ones for\n" +"merge. The difference is that remerge can (only) be run when there is a\n" +"pending merge, and it lets you specify particular files." +msgstr "" + +#: bzrlib/builtins.py:4665 +msgid "" +":Examples:\n" +" Re-do the merge of all conflicted files, and show the base text in\n" +" conflict regions, in addition to the usual THIS and OTHER texts::" +msgstr "" + +#: bzrlib/builtins.py:4669 +msgid " bzr remerge --show-base" +msgstr "" + +#: bzrlib/builtins.py:4671 +msgid "" +" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n" +" additional processing to reduce the size of conflict regions::" +msgstr "" + +#: bzrlib/builtins.py:4674 +msgid " bzr remerge --merge-type weave --reprocess foobar" +msgstr "" + +#: bzrlib/builtins.py:4681 +msgid "Show base revision text in conflicts." +msgstr "" + +#: bzrlib/builtins.py:4693 +msgid "" +"Sorry, remerge only works after normal merges. Not cherrypicking or multi-" +"merges." +msgstr "" + +#: bzrlib/builtins.py:4717 +msgid "Revert files to a previous revision." +msgstr "" + +#: bzrlib/builtins.py:4719 +msgid "" +"Giving a list of files will revert only those files. Otherwise, all files\n" +"will be reverted. If the revision is not specified with '--revision', the\n" +"last committed revision is used." +msgstr "" + +#: bzrlib/builtins.py:4723 +msgid "" +"To remove only some changes, without reverting to a prior version, use\n" +"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n" +"will remove the changes introduced by the second last commit (-2), without\n" +"affecting the changes introduced by the last commit (-1). To remove\n" +"certain changes on a hunk-by-hunk basis, see the shelve command." +msgstr "" + +#: bzrlib/builtins.py:4729 +msgid "" +"By default, any files that have been manually changed will be backed up\n" +"first. (Files changed only by merge are not backed up.) Backup files have\n" +"'.~#~' appended to their name, where # is a number." +msgstr "" + +#: bzrlib/builtins.py:4773 +msgid "" +"When you provide files, you can use their current pathname or the pathname\n" +"from the target revision. So you can use revert to \"undelete\" a file by\n" +"name. If you name a directory, all the contents of that directory will be\n" +"reverted." +msgstr "" + +#: bzrlib/builtins.py:4778 +msgid "" +"If you have newly added files since the target revision, they will be\n" +"removed. If the files to be removed have been changed, backups will be\n" +"created as above. Directories containing unknown files will not be\n" +"deleted." +msgstr "" + +#: bzrlib/builtins.py:4783 +msgid "" +"The working tree contains a list of revisions that have been merged but\n" +"not yet committed. These revisions will be included as additional parents\n" +"of the next commit. Normally, using revert clears that list as well as\n" +"reverting the files. If any files are specified, revert leaves the list\n" +"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n" +".`` in the tree root to revert all files but keep the recorded merges,\n" +"and ``bzr revert --forget-merges`` to clear the pending merge list without\n" +"reverting any files." +msgstr "" + +#: bzrlib/builtins.py:4792 +msgid "" +"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n" +"changes from a branch in a single revision. To do this, perform the merge\n" +"as desired. Then doing revert with the \"--forget-merges\" option will " +"keep\n" +"the content of the tree as it was, but it will clear the list of pending\n" +"merges. The next commit will then contain all of the changes that are\n" +"present in the other branch, but without any other parent revisions.\n" +"Because this technique forgets where these changes originated, it may\n" +"cause additional conflicts on later merges involving the same source and\n" +"target branches." +msgstr "" + +#: bzrlib/builtins.py:4806 +msgid "Do not save backups of reverted files." +msgstr "" + +#: bzrlib/builtins.py:4808 +msgid "Remove pending merge marker, without changing any files." +msgstr "" + +#: bzrlib/builtins.py:4839 +msgid "" +"Show help on a command or other topic.\n" +" " +msgstr "" + +#: bzrlib/builtins.py:4844 +msgid "Show help on all commands." +msgstr "" + +#: bzrlib/builtins.py:4873 +msgid "Show unmerged/unpulled revisions between two branches." +msgstr "" + +#: bzrlib/builtins.py:4875 +msgid "OTHER_BRANCH may be local or remote." +msgstr "" + +#: bzrlib/builtins.py:4877 +msgid "" +"To filter on a range of revisions, you can use the command -r begin..end\n" +"-r revision requests a specific revision, -r ..end or -r begin.. are\n" +"also valid.\n" +" \n" +":Exit values:\n" +" 1 - some missing revisions\n" +" 0 - no missing revisions" +msgstr "" + +#: bzrlib/builtins.py:4887 +msgid "" +" Determine the missing revisions between this and the branch at the\n" +" remembered pull location::" +msgstr "" + +#: bzrlib/builtins.py:4890 +msgid " bzr missing" +msgstr "" + +#: bzrlib/builtins.py:4892 +msgid " Determine the missing revisions between this and another branch::" +msgstr "" + +#: bzrlib/builtins.py:4894 +msgid " bzr missing http://server/branch" +msgstr "" + +#: bzrlib/builtins.py:4896 +msgid "" +" Determine the missing revisions up to a specific revision on the other\n" +" branch::" +msgstr "" + +#: bzrlib/builtins.py:4899 +msgid " bzr missing -r ..-10" +msgstr "" + +#: bzrlib/builtins.py:4901 +msgid "" +" Determine the missing revisions up to a specific revision on this\n" +" branch::" +msgstr "" + +#: bzrlib/builtins.py:4904 +msgid " bzr missing --my-revision ..-10" +msgstr "" + +#: bzrlib/builtins.py:4911 +msgid "Reverse the order of revisions." +msgstr "" + +#: bzrlib/builtins.py:4913 +msgid "Display changes in the local branch only." +msgstr "" + +#: bzrlib/builtins.py:4914 +msgid "Same as --mine-only." +msgstr "" + +#: bzrlib/builtins.py:4916 +msgid "Display changes in the remote branch only." +msgstr "" + +#: bzrlib/builtins.py:4917 +msgid "Same as --theirs-only." +msgstr "" + +#: bzrlib/builtins.py:4922 +msgid "" +"Filter on other branch revisions (inclusive). See \"help revisionspec\" for " +"details." +msgstr "" + +#: bzrlib/builtins.py:4926 +msgid "" +"Filter on local branch revisions (inclusive). See \"help revisionspec\" for " +"details." +msgstr "" + +#: bzrlib/builtins.py:4929 +msgid "Show all revisions in addition to the mainline ones." +msgstr "" + +#: bzrlib/builtins.py:4983 +msgid "No peer location known or specified." +msgstr "" + +#: bzrlib/builtins.py:4987 +msgid "Using saved parent location: {0}\n" +msgstr "" + +#: bzrlib/builtins.py:5020 +#, python-format +msgid "You have %d extra revision:\n" +msgid_plural "You have %d extra revisions:\n" +msgstr[0] "" +msgstr[1] "" + +#: bzrlib/builtins.py:5040 +#, python-format +msgid "You are missing %d revision:\n" +msgid_plural "You are missing %d revisions:\n" +msgstr[0] "" +msgstr[1] "" + +#: bzrlib/builtins.py:5055 +msgid "This branch has no new revisions.\n" +msgstr "" + +#: bzrlib/builtins.py:5058 +msgid "Other branch has no new revisions.\n" +msgstr "" + +#: bzrlib/builtins.py:5063 +msgid "Branches are up to date.\n" +msgstr "" + +#: bzrlib/builtins.py:5074 +msgid "Compress the data within a repository." +msgstr "" + +#: bzrlib/builtins.py:5076 +msgid "" +"This operation compresses the data within a bazaar repository. As\n" +"bazaar supports automatic packing of repository, this operation is\n" +"normally not required to be done manually." +msgstr "" + +#: bzrlib/builtins.py:5080 +msgid "" +"During the pack operation, bazaar takes a backup of existing repository\n" +"data, i.e. pack files. This backup is eventually removed by bazaar\n" +"automatically when it is safe to do so. To save disk space by removing\n" +"the backed up pack files, the --clean-obsolete-packs option may be\n" +"used." +msgstr "" + +#: bzrlib/builtins.py:5086 +msgid "" +"Warning: If you use --clean-obsolete-packs and your machine crashes\n" +"during or immediately after repacking, you may be left with a state\n" +"where the deletion has been written to disk but the new packs have not\n" +"been. In this case the repository may be unusable." +msgstr "" + +#: bzrlib/builtins.py:5095 +msgid "Delete obsolete packs to save disk space." +msgstr "" + +#: bzrlib/builtins.py:5109 +msgid "List the installed plugins." +msgstr "" + +#: bzrlib/builtins.py:5111 +msgid "" +"This command displays the list of installed plugins including\n" +"version of plugin and a short description of each." +msgstr "" + +#: bzrlib/builtins.py:5114 +msgid "--verbose shows the path where each plugin is located." +msgstr "" + +#: bzrlib/builtins.py:5116 +msgid "" +"A plugin is an external component for Bazaar that extends the\n" +"revision control system, by adding or replacing code in Bazaar.\n" +"Plugins can do a variety of things, including overriding commands,\n" +"adding new commands, providing additional network transports and\n" +"customizing log output." +msgstr "" + +#: bzrlib/builtins.py:5122 +msgid "" +"See the Bazaar Plugin Guide \n" +"for further information on plugins including where to find them and how to\n" +"install them. Instructions are also provided there on how to write new\n" +"plugins using the Python programming language." +msgstr "" + +#: bzrlib/builtins.py:5138 +msgid "Show testament (signing-form) of a revision." +msgstr "" + +#: bzrlib/builtins.py:5141 +msgid "Produce long-format testament." +msgstr "" + +#: bzrlib/builtins.py:5143 +msgid "Produce a strict-format testament." +msgstr "" + +#: bzrlib/builtins.py:5169 +msgid "Show the origin of each line in a file." +msgstr "" + +#: bzrlib/builtins.py:5171 +msgid "" +"This prints out the given file with an annotation on the left side\n" +"indicating which revision, author and date introduced the change." +msgstr "" + +#: bzrlib/builtins.py:5174 +msgid "" +"If the origin is the same for a run of consecutive lines, it is\n" +"shown only at the top, unless the --all option is given." +msgstr "" + +#: bzrlib/builtins.py:5182 +msgid "Show annotations on all lines." +msgstr "" + +#: bzrlib/builtins.py:5183 +msgid "Show commit date in annotations." +msgstr "" + +#: bzrlib/builtins.py:5270 +msgid "Cannot sign a range of non-revision-history revisions" +msgstr "" + +#: bzrlib/builtins.py:5282 +msgid "Please supply either one revision, or a range." +msgstr "" + +#: bzrlib/builtins.py:5286 +msgid "" +"Convert the current branch into a checkout of the supplied branch.\n" +"If no branch is supplied, rebind to the last bound location." +msgstr "" + +#: bzrlib/builtins.py:5289 +msgid "" +"Once converted into a checkout, commits must succeed on the master branch\n" +"before they will be applied to the local branch." +msgstr "" + +#: bzrlib/builtins.py:5292 +msgid "" +"Bound branches use the nickname of its master branch unless it is set\n" +"locally, in which case binding will update the local nickname to be\n" +"that of the master." +msgstr "" + +#: bzrlib/builtins.py:5307 +msgid "No location supplied. This format does not remember old locations." +msgstr "" + +#: bzrlib/builtins.py:5313 +msgid "Branch is already bound" +msgstr "" + +#: bzrlib/builtins.py:5316 +msgid "No location supplied and no previous location known" +msgstr "" + +#: bzrlib/builtins.py:5322 +msgid "These branches have diverged. Try merging, and then bind again." +msgstr "" + +#: bzrlib/builtins.py:5329 +msgid "Convert the current checkout into a regular branch." +msgstr "" + +#: bzrlib/builtins.py:5331 +msgid "" +"After unbinding, the local branch is considered independent and subsequent\n" +"commits will be local only." +msgstr "" + +#: bzrlib/builtins.py:5342 +msgid "Local branch is not bound" +msgstr "" + +#: bzrlib/builtins.py:5346 +msgid "Remove the last committed revision." +msgstr "" + +#: bzrlib/builtins.py:5348 +msgid "" +"--verbose will print out what is being removed.\n" +"--dry-run will go through all the motions, but not actually\n" +"remove anything." +msgstr "" + +#: bzrlib/builtins.py:5352 +msgid "" +"If --revision is specified, uncommit revisions to leave the branch at the\n" +"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n" +"branch at revision 15." +msgstr "" + +#: bzrlib/builtins.py:5356 +msgid "" +"Uncommit leaves the working tree ready for a new commit. The only change\n" +"it may make is to restore any pending merges that were present before\n" +"the commit." +msgstr "" + +#: bzrlib/builtins.py:5367 +msgid "Don't actually make changes." +msgstr "" + +#: bzrlib/builtins.py:5368 +msgid "Say yes to all questions." +msgstr "" + +#: bzrlib/builtins.py:5370 +msgid "Keep tags that point to removed revisions." +msgstr "" + +#: bzrlib/builtins.py:5372 +msgid "Only remove the commits from the local branch when in a checkout." +msgstr "" + +#: bzrlib/builtins.py:5421 +msgid "No revisions to uncommit.\n" +msgstr "" + +#: bzrlib/builtins.py:5436 +msgid "Dry-run, pretending to remove the above revisions.\n" +msgstr "" + +#: bzrlib/builtins.py:5439 +msgid "The above revision(s) will be removed.\n" +msgstr "" + +#: bzrlib/builtins.py:5443 +msgid "Uncommit these revisions" +msgstr "" + +#: bzrlib/builtins.py:5446 +msgid "Canceled\n" +msgstr "" + +#: bzrlib/builtins.py:5453 +#, python-format +msgid "" +"You can restore the old tip by running:\n" +" bzr pull . -r revid:%s\n" +msgstr "" + +#: bzrlib/builtins.py:5458 +msgid "Break a dead lock." +msgstr "" + +#: bzrlib/builtins.py:5460 +msgid "" +"This command breaks a lock on a repository, branch, working directory or\n" +"config file." +msgstr "" + +#: bzrlib/builtins.py:5463 +msgid "" +"CAUTION: Locks should only be broken when you are sure that the process\n" +"holding the lock has been stopped." +msgstr "" + +#: bzrlib/builtins.py:5466 +msgid "" +"You can get information on what locks are open via the 'bzr info\n" +"[location]' command." +msgstr "" + +#: bzrlib/builtins.py:5469 +msgid "" +":Examples:\n" +" bzr break-lock\n" +" bzr break-lock bzr+ssh://example.com/bzr/foo\n" +" bzr break-lock --conf ~/.bazaar" +msgstr "" + +#: bzrlib/builtins.py:5478 +msgid "LOCATION is the directory where the config lock is." +msgstr "" + +#: bzrlib/builtins.py:5480 +msgid "Do not ask for confirmation before breaking the lock." +msgstr "" + +#: bzrlib/builtins.py:5515 +msgid "The Bazaar smart server protocol over TCP. (default port: 4155)" +msgstr "" + +#: bzrlib/builtins.py:5516 +msgid "Run the bzr server." +msgstr "" + +#: bzrlib/builtins.py:5522 +msgid "Serve on stdin/out for use from inetd or sshd." +msgstr "" + +#: bzrlib/builtins.py:5523 +msgid "protocol" +msgstr "" + +#: bzrlib/builtins.py:5524 +msgid "Protocol to serve." +msgstr "" + +#: bzrlib/builtins.py:5479 +msgid "" +"Listen for connections on nominated port of the form [hostname:]portnumber. " +"Passing 0 as the port number will result in a dynamically allocated port. " +"The default port depends on the protocol." +msgstr "" + +#: bzrlib/builtins.py:5535 +msgid "Serve contents of this directory." +msgstr "" + +#: bzrlib/builtins.py:5537 +msgid "" +"By default the server is a readonly server. Supplying --allow-writes " +"enables write access to the contents of the served directory and below. " +"Note that ``bzr serve`` does not perform authentication, so unless some form " +"of external authentication is arranged supplying this option leads to global " +"uncontrolled write access to your file system." +msgstr "" + +#: bzrlib/builtins.py:5546 +msgid "Override the default idle client timeout (5min)." +msgstr "" + +#: bzrlib/builtins.py:5564 +msgid "Combine a tree into its containing tree." +msgstr "" + +#: bzrlib/builtins.py:5566 +msgid "This command requires the target tree to be in a rich-root format." +msgstr "" + +#: bzrlib/builtins.py:5568 +msgid "" +"The TREE argument should be an independent tree, inside another tree, but\n" +"not part of it. (Such trees can be produced by \"bzr split\", but also by\n" +"running \"bzr branch\" with the target inside a tree.)" +msgstr "" + +#: bzrlib/builtins.py:5572 +msgid "" +"The result is a combined tree, with the subtree no longer an independent\n" +"part. This is marked as a merge of the subtree into the containing tree,\n" +"and all history is preserved." +msgstr "" + +#: bzrlib/builtins.py:5590 +#, python-format +msgid "" +"Can't join trees because %s doesn't support rich root data.\n" +"You can use bzr upgrade on the repository." +msgstr "" + +#: bzrlib/builtins.py:5600 bzrlib/builtins.py:5606 +msgid "Cannot join {0}. {1}" +msgstr "" + +#: bzrlib/builtins.py:5610 +msgid "Split a subdirectory of a tree into a separate tree." +msgstr "" + +#: bzrlib/builtins.py:5612 +msgid "" +"This command will produce a target tree in a format that supports\n" +"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n" +"converted into earlier formats like 'dirstate-tags'." +msgstr "" + +#: bzrlib/builtins.py:5616 +msgid "" +"The TREE argument should be a subdirectory of a working tree. That\n" +"subdirectory will be converted into an independent tree, with its own\n" +"branch. Commits in the top-level tree will not apply to the new subtree." +msgstr "" + +#: bzrlib/builtins.py:5696 +msgid "No submit branch specified or known" +msgstr "" + +#: bzrlib/builtins.py:5705 bzrlib/send.py:109 +msgid "No public branch specified or known" +msgstr "" + +#: bzrlib/builtins.py:5710 +msgid "bzr merge-directive takes at most two one revision identifiers" +msgstr "" + +#: bzrlib/builtins.py:5719 +msgid "No revisions to bundle." +msgstr "" + +#: bzrlib/builtins.py:5738 +msgid "Mail or create a merge-directive for submitting changes." +msgstr "" + +#: bzrlib/builtins.py:5740 +msgid "A merge directive provides many things needed for requesting merges:" +msgstr "" + +#: bzrlib/builtins.py:5742 +msgid "* A machine-readable description of the merge to perform" +msgstr "" + +#: bzrlib/builtins.py:5744 +msgid "* An optional patch that is a preview of the changes requested" +msgstr "" + +#: bzrlib/builtins.py:5746 +msgid "" +"* An optional bundle of revision data, so that the changes can be applied\n" +" directly from the merge directive, without retrieving data from a\n" +" branch." +msgstr "" + +#: bzrlib/builtins.py:5750 +msgid "" +"`bzr send` creates a compact data set that, when applied using bzr\n" +"merge, has the same effect as merging from the source branch. " +msgstr "" + +#: bzrlib/builtins.py:5753 +msgid "" +"By default the merge directive is self-contained and can be applied to any\n" +"branch containing submit_branch in its ancestory without needing access to\n" +"the source branch." +msgstr "" + +#: bzrlib/builtins.py:5757 +msgid "" +"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n" +"revisions, but only a structured request to merge from the\n" +"public_location. In that case the public_branch is needed and it must be\n" +"up-to-date and accessible to the recipient. The public_branch is always\n" +"included if known, so that people can check it later." +msgstr "" + +#: bzrlib/builtins.py:5763 +msgid "" +"The submit branch defaults to the parent of the source branch, but can be\n" +"overridden. Both submit branch and public branch will be remembered in\n" +"branch.conf the first time they are used for a particular branch. The\n" +"source branch defaults to that containing the working directory, but can\n" +"be changed using --from." +msgstr "" + +#: bzrlib/builtins.py:5769 +msgid "" +"Both the submit branch and the public branch follow the usual behavior with\n" +"respect to --remember: If there is no default location set, the first send\n" +"will set it (use --no-remember to avoid setting it). After that, you can\n" +"omit the location to use the default. To change the default, use\n" +"--remember. The value will only be saved if the location can be accessed." +msgstr "" + +#: bzrlib/builtins.py:5775 +msgid "" +"In order to calculate those changes, bzr must analyse the submit branch.\n" +"Therefore it is most efficient for the submit branch to be a local mirror.\n" +"If a public location is known for the submit_branch, that location is used\n" +"in the merge directive." +msgstr "" + +#: bzrlib/builtins.py:5780 +msgid "" +"The default behaviour is to send the merge directive by mail, unless -o is\n" +"given, in which case it is sent to a file." +msgstr "" + +#: bzrlib/builtins.py:5783 +msgid "" +"Mail is sent using your preferred mail program. This should be transparent\n" +"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n" +"If the preferred client can't be found (or used), your editor will be used." +msgstr "" + +#: bzrlib/builtins.py:5787 +msgid "" +"To use a specific mail program, set the mail_client configuration option.\n" +"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n" +"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" " +"(MacOS X's\n" +"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n" +"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also " +"add\n" +"supported clients." +msgstr "" + +#: bzrlib/builtins.py:5794 +msgid "" +"If mail is being sent, a to address is required. This can be supplied\n" +"either on the commandline, by setting the submit_to configuration\n" +"option in the branch itself or the child_submit_to configuration option\n" +"in the submit branch." +msgstr "" + +#: bzrlib/builtins.py:5799 +msgid "" +"Two formats are currently supported: \"4\" uses revision bundle format 4 " +"and\n" +"merge directive format 2. It is significantly faster and smaller than\n" +"older formats. It is compatible with Bazaar 0.19 and later. It is the\n" +"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n" +"format 1. It is compatible with Bazaar 0.12 - 0.18." +msgstr "" + +#: bzrlib/builtins.py:5805 +msgid "" +"The merge directives created by bzr send may be applied using bzr merge or\n" +"bzr pull by specifying a file containing a merge directive as the location." +msgstr "" + +#: bzrlib/builtins.py:5808 +msgid "" +"bzr send makes extensive use of public locations to map local locations " +"into\n" +"URLs that can be used by other people. See `bzr help configuration` to\n" +"set them, and use `bzr info` to display them." +msgstr "" + +#: bzrlib/builtins.py:5832 +msgid "Write merge directive to this file or directory; use - for stdout." +msgstr "" + +#: bzrlib/builtins.py:5836 +msgid "" +"Refuse to send if there are uncommitted changes in the working tree, --no-" +"strict disables the check." +msgstr "" + +#: bzrlib/builtins.py:5838 +msgid "Mail the request to this address." +msgstr "" + +#: bzrlib/builtins.py:5842 +msgid "Body for the email." +msgstr "" + +#: bzrlib/builtins.py:5895 +msgid "Do not include a bundle in the merge directive." +msgstr "" + +#: bzrlib/builtins.py:5896 +msgid "Do not include a preview patch in the merge directive." +msgstr "" + +#: bzrlib/builtins.py:5899 +msgid "Remember submit and public branch." +msgstr "" + +#: bzrlib/builtins.py:5901 +msgid "" +"Branch to generate the submission from, rather than the one containing the " +"working directory." +msgstr "" + +#: bzrlib/builtins.py:5911 bzrlib/cmd_version_info.py:76 +msgid "format" +msgstr "" + +#: bzrlib/builtins.py:5912 +msgid "Use the specified output format." +msgstr "" + +#: bzrlib/builtins.py:5934 +msgid "Create, remove or modify a tag naming a revision." +msgstr "" + +#: bzrlib/builtins.py:5936 +msgid "" +"Tags give human-meaningful names to revisions. Commands that take a -r\n" +"(--revision) option can be given -rtag:X, where X is any previously\n" +"created tag." +msgstr "" + +#: bzrlib/builtins.py:5940 +msgid "" +"Tags are stored in the branch. Tags are copied from one branch to another\n" +"along when you branch, push, pull or merge." +msgstr "" + +#: bzrlib/builtins.py:5943 +msgid "" +"It is an error to give a tag name that already exists unless you pass\n" +"--force, in which case the tag is moved to point to the new revision." +msgstr "" + +#: bzrlib/builtins.py:5946 +msgid "" +"To rename a tag (change the name but keep it on the same revsion), run " +"``bzr\n" +"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``." +msgstr "" + +#: bzrlib/builtins.py:5949 +msgid "" +"If no tag name is specified it will be determined through the \n" +"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n" +"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n" +"details." +msgstr "" + +#: bzrlib/builtins.py:5959 +msgid "Delete this tag rather than placing it." +msgstr "" + +#: bzrlib/builtins.py:5962 +msgid "Branch in which to place the tag." +msgstr "" + +#: bzrlib/builtins.py:5964 +msgid "Replace existing tags." +msgstr "" + +#: bzrlib/builtins.py:5979 +msgid "No tag specified to delete." +msgstr "" + +#: bzrlib/builtins.py:5981 +#, python-format +msgid "Deleted tag %s." +msgstr "" + +#: bzrlib/builtins.py:5995 +msgid "Please specify a tag name." +msgstr "" + +#: bzrlib/builtins.py:6003 +#, python-format +msgid "Tag %s already exists for that revision." +msgstr "" + +#: bzrlib/builtins.py:6007 +#, python-format +msgid "Created tag %s." +msgstr "" + +#: bzrlib/builtins.py:6009 +#, python-format +msgid "Updated tag %s." +msgstr "" + +#: bzrlib/builtins.py:6013 +msgid "List tags." +msgstr "" + +#: bzrlib/builtins.py:6015 +msgid "" +"This command shows a table of tag names and the revisions they reference." +msgstr "" + +#: bzrlib/builtins.py:6021 +msgid "Branch whose tags should be displayed." +msgstr "" + +#: bzrlib/builtins.py:6023 +msgid "Sort tags by different criteria." +msgstr "" + +#: bzrlib/builtins.py:6023 +msgid "Sorting" +msgstr "" + +#: bzrlib/builtins.py:6092 +msgid "Reconfigure the type of a bzr directory." +msgstr "" + +#: bzrlib/builtins.py:6094 +msgid "A target configuration must be specified." +msgstr "" + +#: bzrlib/builtins.py:6096 +msgid "" +"For checkouts, the bind-to location will be auto-detected if not specified.\n" +"The order of preference is\n" +"1. For a lightweight checkout, the current bound location.\n" +"2. For branches that used to be checkouts, the previously-bound location.\n" +"3. The push location.\n" +"4. The parent location.\n" +"If none of these is available, --bind-to must be specified." +msgstr "" + +#: bzrlib/builtins.py:6110 +msgid "Tree type" +msgstr "" + +#: bzrlib/builtins.py:6111 +msgid "The relation between branch and tree." +msgstr "" + +#: bzrlib/builtins.py:6113 +msgid "Reconfigure to be an unbound branch with no working tree." +msgstr "" + +#: bzrlib/builtins.py:6114 +msgid "Reconfigure to be an unbound branch with a working tree." +msgstr "" + +#: bzrlib/builtins.py:6115 +msgid "Reconfigure to be a bound branch with a working tree." +msgstr "" + +#: bzrlib/builtins.py:6116 +msgid "Reconfigure to be a lightweight checkout (with no local history)." +msgstr "" + +#: bzrlib/builtins.py:6121 +msgid "Repository type" +msgstr "" + +#: bzrlib/builtins.py:6122 +msgid "Location fo the repository." +msgstr "" + +#: bzrlib/builtins.py:6124 +msgid "" +"Reconfigure to be a standalone branch (i.e. stop using shared repository)." +msgstr "" + +#: bzrlib/builtins.py:6126 +msgid "Reconfigure to use a shared repository." +msgstr "" + +#: bzrlib/builtins.py:6130 +msgid "Trees in Repository" +msgstr "" + +#: bzrlib/builtins.py:6131 +msgid "Whether new branches in the repository have trees." +msgstr "" + +#: bzrlib/builtins.py:6133 +msgid "" +"Reconfigure repository to create working trees on branches by default." +msgstr "" + +#: bzrlib/builtins.py:6135 +msgid "" +"Reconfigure repository to not create working trees on branches by default." +msgstr "" + +#: bzrlib/builtins.py:6138 +msgid "Branch to bind checkout to." +msgstr "" + +#: bzrlib/builtins.py:6140 +msgid "Perform reconfiguration even if local changes will be lost." +msgstr "" + +#: bzrlib/builtins.py:6143 +msgid "Reconfigure a branch to be stacked on another branch." +msgstr "" + +#: bzrlib/builtins.py:6147 +msgid "" +"Reconfigure a branch to be unstacked. This may require copying substantial " +"data into it." +msgstr "" + +#: bzrlib/builtins.py:6157 +msgid "Can't use both --stacked-on and --unstacked" +msgstr "" + +#: bzrlib/builtins.py:6171 +msgid "No target configuration specified" +msgstr "" + +#: bzrlib/builtins.py:6206 +msgid "Set the branch of a checkout and update." +msgstr "" + +#: bzrlib/builtins.py:6208 +msgid "" +"For lightweight checkouts, this changes the branch being referenced.\n" +"For heavyweight checkouts, this checks that there are no local commits\n" +"versus the current bound branch, then it makes the local branch a mirror\n" +"of the new location and binds to it." +msgstr "" + +#: bzrlib/builtins.py:6213 +msgid "" +"In both cases, the working tree is updated and uncommitted changes\n" +"are merged. The user can commit or revert these as they desire." +msgstr "" + +#: bzrlib/builtins.py:6216 +msgid "Pending merges need to be committed or reverted before using switch." +msgstr "" + +#: bzrlib/builtins.py:6218 +msgid "" +"The path to the branch to switch to can be specified relative to the parent\n" +"directory of the current branch. For example, if you are currently in a\n" +"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n" +"/path/to/newbranch." +msgstr "" + +#: bzrlib/builtins.py:6223 +msgid "" +"Bound branches use the nickname of its master branch unless it is set\n" +"locally, in which case switching will update the local nickname to be\n" +"that of the master." +msgstr "" + +#: bzrlib/builtins.py:6231 +msgid "Switch even if local commits will be lost." +msgstr "" + +#: bzrlib/builtins.py:6234 +msgid "Create the target branch from this one before switching to it." +msgstr "" + +#: bzrlib/builtins.py:6248 +msgid "You must supply either a revision or a location" +msgstr "" + +#: bzrlib/builtins.py:6261 +msgid "cannot create branch without source branch" +msgstr "" + +#: bzrlib/builtins.py:6286 +msgid "Manage filtered views." +msgstr "" + +#: bzrlib/builtins.py:6288 +msgid "" +"Views provide a mask over the tree so that users can focus on\n" +"a subset of a tree when doing their work. After creating a view,\n" +"commands that support a list of files - status, diff, commit, etc -\n" +"effectively have that list of files implicitly given each time.\n" +"An explicit list of files can still be given but those files\n" +"must be within the current view." +msgstr "" + +#: bzrlib/builtins.py:6295 +msgid "" +"In most cases, a view has a short life-span: it is created to make\n" +"a selected change and is deleted once that change is committed.\n" +"At other times, you may wish to create one or more named views\n" +"and switch between them." +msgstr "" + +#: bzrlib/builtins.py:6300 +msgid "" +"To disable the current view without deleting it, you can switch to\n" +"the pseudo view called ``off``. This can be useful when you need\n" +"to see the whole tree for an operation or two (e.g. merge) but\n" +"want to switch back to your view after that." +msgstr "" + +#: bzrlib/builtins.py:6305 +msgid "" +":Examples:\n" +" To define the current view::" +msgstr "" + +#: bzrlib/builtins.py:6308 +msgid " bzr view file1 dir1 ..." +msgstr "" + +#: bzrlib/builtins.py:6310 +msgid " To list the current view::" +msgstr "" + +#: bzrlib/builtins.py:6312 +msgid " bzr view" +msgstr "" + +#: bzrlib/builtins.py:6314 +msgid " To delete the current view::" +msgstr "" + +#: bzrlib/builtins.py:6316 +msgid " bzr view --delete" +msgstr "" + +#: bzrlib/builtins.py:6318 +msgid " To disable the current view without deleting it::" +msgstr "" + +#: bzrlib/builtins.py:6320 +msgid " bzr view --switch off" +msgstr "" + +#: bzrlib/builtins.py:6322 +msgid " To define a named view and switch to it::" +msgstr "" + +#: bzrlib/builtins.py:6324 +msgid " bzr view --name view-name file1 dir1 ..." +msgstr "" + +#: bzrlib/builtins.py:6326 +msgid " To list a named view::" +msgstr "" + +#: bzrlib/builtins.py:6328 +msgid " bzr view --name view-name" +msgstr "" + +#: bzrlib/builtins.py:6330 +msgid " To delete a named view::" +msgstr "" + +#: bzrlib/builtins.py:6332 +msgid " bzr view --name view-name --delete" +msgstr "" + +#: bzrlib/builtins.py:6334 +msgid " To switch to a named view::" +msgstr "" + +#: bzrlib/builtins.py:6336 +msgid " bzr view --switch view-name" +msgstr "" + +#: bzrlib/builtins.py:6338 +msgid " To list all views defined::" +msgstr "" + +#: bzrlib/builtins.py:6340 +msgid " bzr view --all" +msgstr "" + +#: bzrlib/builtins.py:6342 +msgid " To delete all views::" +msgstr "" + +#: bzrlib/builtins.py:6344 +msgid " bzr view --delete --all" +msgstr "" + +#: bzrlib/builtins.py:6351 +msgid "Apply list or delete action to all views." +msgstr "" + +#: bzrlib/builtins.py:6354 +msgid "Delete the view." +msgstr "" + +#: bzrlib/builtins.py:6357 +msgid "Name of the view to define, list or delete." +msgstr "" + +#: bzrlib/builtins.py:6361 +msgid "Name of the view to switch to." +msgstr "" + +#: bzrlib/builtins.py:6380 +msgid "Both --delete and a file list specified" +msgstr "" + +#: bzrlib/builtins.py:6383 +msgid "Both --delete and --switch specified" +msgstr "" + +#: bzrlib/builtins.py:6386 +msgid "Deleted all views.\n" +msgstr "" + +#: bzrlib/builtins.py:6388 +msgid "No current view to delete" +msgstr "" + +#: bzrlib/builtins.py:6391 +#, python-format +msgid "Deleted '%s' view.\n" +msgstr "" + +#: bzrlib/builtins.py:6395 +msgid "Both --switch and a file list specified" +msgstr "" + +#: bzrlib/builtins.py:6398 +msgid "Both --switch and --all specified" +msgstr "" + +#: bzrlib/builtins.py:6401 +msgid "No current view to disable" +msgstr "" + +#: bzrlib/builtins.py:6403 +#, python-format +msgid "Disabled '%s' view.\n" +msgstr "" + +#: bzrlib/builtins.py:6407 bzrlib/builtins.py:6429 +msgid "Using '{0}' view: {1}\n" +msgstr "" + +#: bzrlib/builtins.py:6410 +msgid "Views defined:\n" +msgstr "" + +#: bzrlib/builtins.py:6419 +msgid "No views defined.\n" +msgstr "" + +#: bzrlib/builtins.py:6426 +msgid "Cannot change the 'off' pseudo view" +msgstr "" + +#: bzrlib/builtins.py:6434 +msgid "No current view.\n" +msgstr "" + +#: bzrlib/builtins.py:6437 +msgid "'{0}' view is: {1}\n" +msgstr "" + +#: bzrlib/builtins.py:6457 +msgid " \n" +msgstr "" + +#: bzrlib/builtins.py:6461 +msgid "Remove a branch." +msgstr "" + +#: bzrlib/builtins.py:6463 +msgid "" +"This will remove the branch from the specified location but \n" +"will keep any working tree or repository in place." +msgstr "" + +#: bzrlib/builtins.py:6468 +msgid " Remove the branch at repo/trunk::" +msgstr "" + +#: bzrlib/builtins.py:6470 +msgid " bzr remove-branch repo/trunk" +msgstr "" + +#: bzrlib/builtins.py:6495 +msgid "Plaintext diff output." +msgstr "" + +#: bzrlib/builtins.py:6496 +msgid "Temporarily set aside some changes from the current tree." +msgstr "" + +#: bzrlib/builtins.py:6498 +msgid "" +"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n" +"ie. out of the way, until a later time when you can bring them back from\n" +"the shelf with the 'unshelve' command. The changes are stored alongside\n" +"your working tree, and so they aren't propagated along with your branch nor\n" +"will they survive its deletion." +msgstr "" + +#: bzrlib/builtins.py:6504 +msgid "If shelve --list is specified, previously-shelved changes are listed." +msgstr "" + +#: bzrlib/builtins.py:6506 +msgid "" +"Shelve is intended to help separate several sets of changes that have\n" +"been inappropriately mingled. If you just want to get rid of all changes\n" +"and you don't need to restore them later, use revert. If you want to\n" +"shelve all text changes at once, use shelve --all." +msgstr "" + +#: bzrlib/builtins.py:6511 +msgid "" +"If filenames are specified, only the changes to those files will be\n" +"shelved. Other files will be left untouched." +msgstr "" + +#: bzrlib/builtins.py:6514 +msgid "" +"If a revision is specified, changes since that revision will be shelved." +msgstr "" + +#: bzrlib/builtins.py:6516 +msgid "" +"You can put multiple items on the shelf, and by default, 'unshelve' will\n" +"restore the most recently shelved changes." +msgstr "" + +#: bzrlib/builtins.py:6519 +msgid "" +"For complicated changes, it is possible to edit the changes in a separate\n" +"editor program to decide what the file remaining in the working copy\n" +"should look like. To do this, add the configuration option" +msgstr "" + +#: bzrlib/builtins.py:6523 +msgid " change_editor = PROGRAM @new_path @old_path" +msgstr "" + +#: bzrlib/builtins.py:6525 +msgid "" +"where @new_path is replaced with the path of the new version of the \n" +"file and @old_path is replaced with the path of the old version of \n" +"the file. The PROGRAM should save the new file with the desired \n" +"contents of the file in the working tree.\n" +" " +msgstr "" + +#: bzrlib/builtins.py:6537 +msgid "Shelve all changes." +msgstr "" + +#: bzrlib/builtins.py:6539 +msgid "Method to use for writing diffs." +msgstr "" + +#: bzrlib/builtins.py:6539 +msgid "writer" +msgstr "" + +#: bzrlib/builtins.py:6543 +msgid "List shelved changes." +msgstr "" + +#: bzrlib/builtins.py:6545 +msgid "Destroy removed changes instead of shelving them." +msgstr "" + +#: bzrlib/builtins.py:6574 +msgid "No shelved changes." +msgstr "" + +#: bzrlib/builtins.py:6585 +msgid "Restore shelved changes." +msgstr "" + +#: bzrlib/builtins.py:6587 +msgid "" +"By default, the most recently shelved changes are restored. However if you\n" +"specify a shelf by id those changes will be restored instead. This works\n" +"best when the changes don't depend on each other." +msgstr "" + +#: bzrlib/builtins.py:6596 +msgid "The action to perform." +msgstr "" + +#: bzrlib/builtins.py:6596 bzrlib/conflicts.py:694 +msgid "action" +msgstr "" + +#: bzrlib/builtins.py:6598 +msgid "Apply changes and remove from the shelf." +msgstr "" + +#: bzrlib/builtins.py:6599 +msgid "Show changes, but do not apply or remove them." +msgstr "" + +#: bzrlib/builtins.py:6600 +msgid "" +"Instead of unshelving the changes, show the diff that would result from " +"unshelving." +msgstr "" + +#: bzrlib/builtins.py:6602 +msgid "Delete changes without applying them." +msgstr "" + +#: bzrlib/builtins.py:6603 +msgid "Apply changes but don't delete them." +msgstr "" + +#: bzrlib/builtins.py:6618 +msgid "Remove unwanted files from working tree." +msgstr "" + +#: bzrlib/builtins.py:6620 +msgid "" +"By default, only unknown files, not ignored files, are deleted. Versioned\n" +"files are never deleted." +msgstr "" + +#: bzrlib/builtins.py:6623 +msgid "" +"Another class is 'detritus', which includes files emitted by bzr during\n" +"normal operations and selftests. (The value of these files decreases with\n" +"time.)" +msgstr "" + +#: bzrlib/builtins.py:6627 +msgid "" +"If no options are specified, unknown files are deleted. Otherwise, option\n" +"flags are respected, and may be combined." +msgstr "" + +#: bzrlib/builtins.py:6630 +msgid "To check what clean-tree will do, use --dry-run." +msgstr "" + +#: bzrlib/builtins.py:6633 +msgid "Delete all ignored files." +msgstr "" + +#: bzrlib/builtins.py:6634 +msgid "" +"Delete conflict files, merge and revert backups, and failed selftest dirs." +msgstr "" + +#: bzrlib/builtins.py:6637 +msgid "Delete files unknown to bzr (default)." +msgstr "" + +#: bzrlib/builtins.py:6638 +msgid "Show files to delete instead of deleting them." +msgstr "" + +#: bzrlib/builtins.py:6640 +msgid "Do not prompt before deleting." +msgstr "" + +#: bzrlib/bundle/__init__.py:59 +msgid "A directory cannot be a bundle" +msgstr "" + +#: bzrlib/bundle/apply_bundle.py:40 +msgid "Install revisions" +msgstr "" + +#: bzrlib/bundle/commands.py:64 +msgid "--verbose requires a merge directive" +msgstr "" + +#: bzrlib/bundle/commands.py:67 +msgid "Bundle format not supported" +msgstr "" + +#: bzrlib/bundle/commands.py:77 +msgid "Records\n" +msgstr "" + +#: bzrlib/bundle/commands.py:81 +msgid "{0}: {1} ({2} multiparent)\n" +msgstr "" + +#: bzrlib/bundle/commands.py:83 +#, python-format +msgid "unique files: %d\n" +msgstr "" + +#: bzrlib/bundle/commands.py:92 +msgid "Revisions\n" +msgstr "" + +#: bzrlib/bundle/commands.py:93 +#, python-format +msgid "nicks: %s\n" +msgstr "" + +#: bzrlib/bundle/commands.py:95 +#, python-format +msgid "" +"committers: \n" +"%s\n" +msgstr "" + +#: bzrlib/bundle/commands.py:103 +msgid "Decoded contents\n" +msgstr "" + +#: bzrlib/bundle/serializer/v4.py:327 +#, python-format +msgid "Bundling %d revision." +msgid_plural "Bundling %d revisions." +msgstr[0] "" +msgstr[1] "" + +#: bzrlib/bzrdir.py:487 +msgid "" +"making backup of {0}\n" +" to {1}" +msgstr "" + +#: bzrlib/bzrdir.py:510 +msgid "renamed {0} to {1}" +msgstr "" + +#: bzrlib/bzrdir.py:1639 +#, python-format +msgid "" +"Source repository format does not support stacking, using format:\n" +" %s" +msgstr "" + +#: bzrlib/bzrdir.py:1659 +#, python-format +msgid "" +"Source branch format does not support stacking, using format:\n" +" %s" +msgstr "" + +#: bzrlib/bzrdir.py:1805 +msgid "starting repository conversion" +msgstr "" + +#: bzrlib/bzrdir.py:2026 +msgid "Using default stacking branch {0} at {1}" +msgstr "" + +#: bzrlib/check.py:108 +msgid "check" +msgstr "" + +#: bzrlib/check.py:110 +msgid "checking revisions" +msgstr "" + +#: bzrlib/check.py:112 +msgid "checking commit contents" +msgstr "" + +#: bzrlib/check.py:114 +msgid "checking file graphs" +msgstr "" + +#: bzrlib/check.py:118 +msgid "checking branches and trees" +msgstr "" + +#: bzrlib/check.py:205 +msgid "checked repository {0} format {1}" +msgstr "" + +#: bzrlib/check.py:208 +#, python-format +msgid "%6d revisions" +msgstr "" + +#: bzrlib/check.py:209 +#, python-format +msgid "%6d file-ids" +msgstr "" + +#: bzrlib/check.py:211 +#, python-format +msgid "%6d unreferenced text versions" +msgstr "" + +#: bzrlib/check.py:215 +msgid "unreferenced version: {{{0}}} in {1}" +msgstr "" + +#: bzrlib/check.py:218 +#, python-format +msgid "%6d revisions are missing inventory_sha1" +msgstr "" + +#: bzrlib/check.py:221 +#, python-format +msgid "%6d revisions are mentioned but not present" +msgstr "" + +#: bzrlib/check.py:224 +#, python-format +msgid "%6d ghost revisions" +msgstr "" + +#: bzrlib/check.py:229 +#, python-format +msgid "%6d revisions missing parents in ancestry" +msgstr "" + +#: bzrlib/check.py:233 +#, python-format +msgid " %s should be in the ancestry for:" +msgstr "" + +#: bzrlib/check.py:237 +#, python-format +msgid "%6d inconsistent parents" +msgstr "" + +#: bzrlib/check.py:241 +msgid " * {0} version {1} has parents {2!r} but should have {3!r}" +msgstr "" + +#: bzrlib/check.py:247 +#, python-format +msgid "%6d revisions have incorrect parents in the revision index" +msgstr "" + +#: bzrlib/check.py:253 +msgid " {0} has wrong parents in index: {1!r} should be {2!r}" +msgstr "" + +#: bzrlib/check.py:267 +msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}" +msgstr "" + +#: bzrlib/check.py:296 +msgid "" +"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects " +"{{{4}}}" +msgstr "" + +#: bzrlib/check.py:354 +#, python-format +msgid "Checking branch at '%s'." +msgstr "" + +#: bzrlib/check.py:374 +#, python-format +msgid "Checking working tree at '%s'." +msgstr "" + +#: bzrlib/check.py:427 bzrlib/check.py:441 +msgid "No branch found at specified location." +msgstr "" + +#: bzrlib/check.py:429 bzrlib/check.py:439 +msgid "No working tree found at specified location." +msgstr "" + +#: bzrlib/check.py:432 +#, python-format +msgid "Checking repository at '%s'." +msgstr "" + +#: bzrlib/check.py:443 +msgid "No repository found at specified location." +msgstr "" + +#: bzrlib/clean_tree.py:63 +msgid "Nothing to delete." +msgstr "" + +#: bzrlib/clean_tree.py:68 +msgid "Are you sure you wish to delete these" +msgstr "" + +#: bzrlib/clean_tree.py:70 +msgid "Canceled" +msgstr "" + +#: bzrlib/clean_tree.py:107 +#, python-format +msgid "unable to remove %s" +msgstr "" + +#: bzrlib/clean_tree.py:111 +msgid "deleting paths:" +msgstr "" + +#: bzrlib/clean_tree.py:125 +msgid "unable to remove \"{0}\": {1}." +msgstr "" + +#: bzrlib/clean_tree.py:130 +msgid "No files deleted." +msgstr "" + +#: bzrlib/cmd_version_info.py:47 +msgid "No known version info format {0}. Supported types are: {1}" +msgstr "" + +#: bzrlib/cmd_version_info.py:52 +msgid "Version info in Custom template-based format." +msgstr "" + +#: bzrlib/cmd_version_info.py:52 +msgid "Version info in Python format." +msgstr "" + +#: bzrlib/cmd_version_info.py:52 +msgid "Version info in RIO (simple text) format (default)." +msgstr "" + +#: bzrlib/cmd_version_info.py:53 +msgid "Show version information about this tree." +msgstr "" + +#: bzrlib/cmd_version_info.py:55 +msgid "" +"You can use this command to add information about version into\n" +"source code of an application. The output can be in one of the\n" +"supported formats or in a custom format based on a template." +msgstr "" + +#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712 +#: en/help_topics/configuration.txt:722 +msgid "For example::" +msgstr "" + +#: bzrlib/cmd_version_info.py:61 +msgid "" +" bzr version-info --custom \\\n" +" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\"" +msgstr "" + +#: bzrlib/cmd_version_info.py:64 +msgid "" +"will produce a C header file with formatted string containing the\n" +"current revision number. Other supported variables in templates are:" +msgstr "" + +#: bzrlib/cmd_version_info.py:67 +msgid "" +" * {date} - date of the last revision\n" +" * {build_date} - current date\n" +" * {revno} - revision number\n" +" * {revision_id} - revision id\n" +" * {branch_nick} - branch nickname\n" +" * {clean} - 0 if the source tree contains uncommitted changes,\n" +" otherwise 1" +msgstr "" + +#: bzrlib/cmd_version_info.py:77 +msgid "Select the output format." +msgstr "" + +#: bzrlib/cmd_version_info.py:81 +msgid "Include all possible information." +msgstr "" + +#: bzrlib/cmd_version_info.py:82 +msgid "Check if tree is clean." +msgstr "" + +#: bzrlib/cmd_version_info.py:84 +msgid "Include the revision-history." +msgstr "" + +#: bzrlib/cmd_version_info.py:86 +msgid "Include the last revision for each file." +msgstr "" + +#: bzrlib/cmd_version_info.py:87 +msgid "Template for the output." +msgstr "" + +#: bzrlib/cmd_version_info.py:101 +msgid "bzr version-info --revision takes exactly one revision specifier" +msgstr "" + +#: bzrlib/commands.py:229 +#, python-format +msgid "unknown command \"%s\"" +msgstr "" + +#: bzrlib/commands.py:476 +msgid "No help for this command." +msgstr "" + +#: bzrlib/commands.py:489 +#, python-format +msgid ":Purpose: %s\n" +msgstr "" + +#: bzrlib/commands.py:491 +#, python-format +msgid "" +":Usage:\n" +"%s\n" +msgstr "" + +#: bzrlib/commands.py:493 +#, python-format +msgid ":Usage: %s\n" +msgstr "" + +#: bzrlib/commands.py:512 +#, python-format +msgid ":Options:%s" +msgstr "" + +#: bzrlib/commands.py:523 +#, python-format +msgid "" +":Description:\n" +" %s\n" +"\n" +msgstr "" + +#: bzrlib/commands.py:533 +#, python-format +msgid "" +"See bzr help %s for more details and examples.\n" +"\n" +msgstr "" + +#: bzrlib/commands.py:538 +msgid ":Aliases: " +msgstr "" + +#: bzrlib/commands.py:542 +#, python-format +msgid ":From: plugin \"%s\"\n" +msgstr "" + +#: bzrlib/commands.py:554 +msgid ":doc:`{0} <{1}-help>`" +msgstr "" + +#: bzrlib/commands.py:558 +#, python-format +msgid ":See also: %s" +msgstr "" + +#: bzrlib/commands.py:826 bzrlib/gpg.py:347 +msgid "Only ASCII permitted in option names" +msgstr "" + +#: bzrlib/commands.py:851 bzrlib/commands.py:859 +msgid "command {0!r} needs one or more {1}" +msgstr "" + +#: bzrlib/commands.py:868 +msgid "command {0!r} requires argument {1}" +msgstr "" + +#: bzrlib/commands.py:875 +msgid "extra argument to command {0}: {1}" +msgstr "" + +#: bzrlib/commands.py:972 +#, python-format +msgid "Profile data written to \"%s\"." +msgstr "" + +#: bzrlib/commit.py:117 bzrlib/commit.py:740 +msgid "added" +msgstr "" + +#: bzrlib/commit.py:117 bzrlib/commit.py:748 +msgid "modified" +msgstr "" + +#: bzrlib/commit.py:131 +#, python-format +msgid "Committing%s" +msgstr "" + +#: bzrlib/commit.py:134 +#, python-format +msgid "Committed revision %d." +msgstr "" + +#: bzrlib/commit.py:143 +#, python-format +msgid "deleted %s" +msgstr "" + +#: bzrlib/commit.py:146 +#, python-format +msgid "missing %s" +msgstr "" + +#: bzrlib/commit.py:511 +msgid "" +"Conflicting tags in bound branch:\n" +"{0}" +msgstr "" + +#: bzrlib/commit.py:742 +msgid "renamed" +msgstr "" + +#: bzrlib/commit.py:976 +msgid "unchanged" +msgstr "" + +#: bzrlib/commit.py:998 +msgid "{0} [{1}] - Stage" +msgstr "" + +#: bzrlib/commit.py:1001 +#, python-format +msgid "%s - Stage" +msgstr "" + +#: bzrlib/commit_signature_commands.py:34 +msgid "Sign all commits by a given committer." +msgstr "" + +#: bzrlib/commit_signature_commands.py:36 +msgid "" +"If location is not specified the local tree is used.\n" +"If committer is not specified the default committer is used." +msgstr "" + +#: bzrlib/commit_signature_commands.py:39 +msgid "This does not sign commits that already have signatures." +msgstr "" + +#: bzrlib/commit_signature_commands.py:47 +msgid "" +"Don't actually sign anything, just print the revisions that would be signed." +msgstr "" + +#: bzrlib/commit_signature_commands.py:103 +msgid "Verify all commit signatures." +msgstr "" + +#: bzrlib/commit_signature_commands.py:105 +msgid "" +"Verifies that all commits in the branch are signed by known GnuPG keys." +msgstr "" + +#: bzrlib/commit_signature_commands.py:110 +msgid "" +"Comma separated list of GPG key patterns which are acceptable for " +"verification." +msgstr "" + +#: bzrlib/commit_signature_commands.py:148 +msgid "Cannot verify a range of non-revision-history revisions" +msgstr "" + +#: bzrlib/commit_signature_commands.py:166 +msgid "All commits signed with verifiable keys" +msgstr "" + +#: bzrlib/config.py:436 +msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit." +msgstr "" + +#: bzrlib/config.py:2452 +msgid "{0} is not an SI unit." +msgstr "" + +#: bzrlib/config.py:2971 +msgid "" +"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value " +"will be saved." +msgstr "" + +#: bzrlib/config.py:3116 +#, python-format +msgid "Invalid '%s', should be of the form 'name=value'" +msgstr "" + +#: bzrlib/config.py:4018 +msgid "Display, set or remove a configuration option." +msgstr "" + +#: bzrlib/config.py:4020 +msgid "Display the active value for a given option." +msgstr "" + +#: bzrlib/config.py:4022 +msgid "" +"If --all is specified, NAME is interpreted as a regular expression and all\n" +"matching options are displayed mentioning their scope. The active value\n" +"that bzr will take into account is the first one displayed for each option." +msgstr "" + +#: bzrlib/config.py:4026 +msgid "If no NAME is given, --all .* is implied." +msgstr "" + +#: bzrlib/config.py:4028 +msgid "" +"Setting a value is achieved by using name=value without spaces. The value\n" +"is set in the most relevant scope and can be checked by displaying the\n" +"option again." +msgstr "" + +#: bzrlib/config.py:4040 +msgid "Reduce the scope to the specified configuration file." +msgstr "" + +#: bzrlib/config.py:4044 +msgid "Display all the defined values for the matching options." +msgstr "" + +#: bzrlib/config.py:4046 +msgid "Remove the option from the configuration file." +msgstr "" + +#: bzrlib/conflicts.py:50 +msgid "List files with conflicts." +msgstr "" + +#: bzrlib/conflicts.py:57 +msgid "" +"Conflicts normally are listed as short, human-readable messages. If --text\n" +"is supplied, the pathnames of files with text conflicts are listed,\n" +"instead. (This is useful for editing all files with text conflicts.)" +msgstr "" + +#: bzrlib/conflicts.py:61 +msgid "Use bzr resolve when you have fixed a problem." +msgstr "" + +#: bzrlib/conflicts.py:66 +msgid "List paths of files with text conflicts." +msgstr "" + +#: bzrlib/conflicts.py:85 +msgid "Marks the conflict as resolved." +msgstr "" + +#: bzrlib/conflicts.py:88 +msgid "Resolve the conflict preserving the version in the working tree." +msgstr "" + +#: bzrlib/conflicts.py:91 +msgid "Resolve the conflict taking the merged version into account." +msgstr "" + +#: bzrlib/conflicts.py:98 +msgid "How to resolve the conflict." +msgstr "" + +#: bzrlib/conflicts.py:104 +msgid "Mark a conflict as resolved." +msgstr "" + +#: bzrlib/conflicts.py:111 +msgid "" +"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n" +"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict " +"as\n" +"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved." +msgstr "" + +#: bzrlib/conflicts.py:119 +msgid "Resolve all conflicts in this tree." +msgstr "" + +#: bzrlib/conflicts.py:126 +msgid "If --all is specified, no FILE may be provided" +msgstr "" + +#: bzrlib/conflicts.py:151 +#, python-format +msgid "%d conflict auto-resolved." +msgid_plural "%d conflicts auto-resolved." +msgstr[0] "" +msgstr[1] "" + +#: bzrlib/conflicts.py:154 +msgid "Remaining conflicts:" +msgstr "" + +#: bzrlib/conflicts.py:159 +msgid "All conflicts resolved." +msgstr "" + +#: bzrlib/conflicts.py:168 +msgid "{0} conflict resolved, {1} remaining" +msgid_plural "{0} conflicts resolved, {1} remaining" +msgstr[0] "" +msgstr[1] "" + +#: bzrlib/controldir.py:712 +msgid "{0} is{1} redirected to {2}" +msgstr "" + +#: bzrlib/diff.py:399 +#, python-format +msgid "*** Ignoring files outside view. View is %s" +msgstr "" + +#: bzrlib/errors.py:157 +msgid "The tree builder is already building a tree." +msgstr "" + +#: bzrlib/errors.py:178 +msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s" +msgstr "" + +#: bzrlib/errors.py:197 +msgid "" +"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports " +"versions \"%(minimum)s\" to \"%(current)s\"." +msgstr "" + +#: bzrlib/errors.py:209 +msgid "The transport '%(transport)s' is only accessible within this process." +msgstr "" + +#: bzrlib/errors.py:227 +msgid "Invalid revision number %(revno)s" +msgstr "" + +#: bzrlib/errors.py:236 +msgid "Invalid revision-id {%(revision_id)s} in %(branch)s" +msgstr "" + +#: bzrlib/errors.py:247 +msgid "Reserved revision-id {%(revision_id)s}" +msgstr "" + +#: bzrlib/errors.py:261 +msgid "There is no public branch set for \"%(branch_url)s\"." +msgstr "" + +#: bzrlib/errors.py:271 +msgid "" +"No help could be found for '%(topic)s'. Please use 'bzr help topics' to " +"obtain a list of topics." +msgstr "" + +#: bzrlib/errors.py:280 +msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s." +msgstr "" + +#: bzrlib/errors.py:290 +msgid "" +"The file id \"%(file_id)s\" is not present in the repository %(repository)r" +msgstr "" + +#: bzrlib/errors.py:299 +msgid "The branch '%(branch)s' is not stacked." +msgstr "" + +#: bzrlib/errors.py:313 +msgid "No WorkingTree exists for \"%(base)s\"." +msgstr "" + +#: bzrlib/errors.py:322 +msgid "Not currently building a tree." +msgstr "" + +#: bzrlib/errors.py:327 +msgid "%(url)s is not a local path." +msgstr "" + +#: bzrlib/errors.py:355 +msgid "%(not_locked)r is not write locked but needs to be." +msgstr "" + +#: bzrlib/errors.py:363 +msgid "Error in command line options" +msgstr "" + +#: bzrlib/errors.py:368 +msgid "%(value)s is not an index of type %(_type)s." +msgstr "" + +#: bzrlib/errors.py:378 +msgid "Error in data for index %(value)s." +msgstr "" + +#: bzrlib/errors.py:387 +msgid "The key '%(key)s' is already in index '%(index)s'." +msgstr "" + +#: bzrlib/errors.py:397 +msgid "The key '%(key)s' is not a valid key." +msgstr "" + +#: bzrlib/errors.py:406 +msgid "Could not parse options for index %(value)s." +msgstr "" + +#: bzrlib/errors.py:415 +msgid "The value '%(value)s' is not a valid value." +msgstr "" + +#: bzrlib/errors.py:424 +msgid "Bad value \"%(value)s\" for option \"%(name)s\"." +msgstr "" + +#: bzrlib/errors.py:443 +msgid "Generic path error: %(path)r%(extra)s)" +msgstr "" + +#: bzrlib/errors.py:456 +msgid "No such file: %(path)r%(extra)s" +msgstr "" + +#: bzrlib/errors.py:461 +msgid "File exists: %(path)r%(extra)s" +msgstr "" + +#: bzrlib/errors.py:467 +msgid "" +"Could not rename %(source)s => %(dest)s because both files exist. (Use --" +"after to tell bzr about a rename that has already happened)%(extra)s" +msgstr "" + +#: bzrlib/errors.py:483 +msgid "\"%(path)s\" is not a directory %(extra)s" +msgstr "" + +#: bzrlib/errors.py:488 +msgid "\"%(path)s\" is not in the working directory %(extra)s" +msgstr "" + +#: bzrlib/errors.py:493 +msgid "Directory not empty: \"%(path)s\"%(extra)s" +msgstr "" + +#: bzrlib/errors.py:498 +msgid "Hard-linking \"%(path)s\" is not supported" +msgstr "" + +#: bzrlib/errors.py:513 +msgid "Device or resource busy: \"%(path)s\"%(extra)s" +msgstr "" + +#: bzrlib/errors.py:518 +msgid "Permission denied: \"%(path)s\"%(extra)s" +msgstr "" + +#: bzrlib/errors.py:523 +msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s" +msgstr "" + +#: bzrlib/errors.py:528 +msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r" +msgstr "" + +#: bzrlib/errors.py:539 +msgid "URLs differ by more than path: %(from_)r and %(to)r" +msgstr "" + +#: bzrlib/errors.py:561 +msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib." +msgstr "" + +#: bzrlib/errors.py:571 +msgid "Unsupported protocol for url \"%(path)s\"%(extra)s" +msgstr "" + +#: bzrlib/errors.py:579 +msgid "" +"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to " +"upgrade the branch to permit branch stacking." +msgstr "" + +#: bzrlib/errors.py:590 +msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'." +msgstr "" + +#: bzrlib/errors.py:600 +msgid "" +"The repository '%(url)s'(%(format)s) is not a stackable format. You will " +"need to upgrade the repository to permit branch stacking." +msgstr "" + +#: bzrlib/errors.py:611 +msgid "Error reading from %(path)r." +msgstr "" + +#: bzrlib/errors.py:630 +msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s" +msgstr "" + +#: bzrlib/errors.py:646 +msgid "Path \"%(path)s\" is not unicode normalized" +msgstr "" + +#: bzrlib/errors.py:654 +msgid "Not a branch: \"%(path)s\"%(detail)s." +msgstr "" + +#: bzrlib/errors.py:696 +msgid "No submit branch available for branch \"%(path)s\"" +msgstr "" + +#: bzrlib/errors.py:705 +msgid "A control directory already exists: \"%(path)s\"." +msgstr "" + +#: bzrlib/errors.py:710 +msgid "Already a branch: \"%(path)s\"." +msgstr "" + +#: bzrlib/errors.py:724 +msgid "Parent branch already exists: \"%(path)s\"." +msgstr "" + +#: bzrlib/errors.py:730 +msgid "" +"Directory contains a branch, but no working tree (use bzr checkout if you " +"wish to build a working tree): \"%(path)s\"" +msgstr "" + +#: bzrlib/errors.py:735 +msgid "" +"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\"" +msgstr "" + +#: bzrlib/errors.py:745 +msgid "" +"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\"" +msgstr "" + +#: bzrlib/errors.py:755 +msgid "No repository present: \"%(path)s\"" +msgstr "" + +#: bzrlib/errors.py:762 +msgid "" +"Unsupported branch format: %(format)s\n" +"Please run 'bzr upgrade'" +msgstr "" + +#: bzrlib/errors.py:768 +msgid "Unknown %(kind)s format: %(format)r" +msgstr "" + +#: bzrlib/errors.py:777 +msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s." +msgstr "" + +#: bzrlib/errors.py:787 +msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s" +msgstr "" + +#: bzrlib/errors.py:802 +msgid "" +"%(target)s\n" +"is not compatible with\n" +"%(source)s\n" +"%(details)s" +msgstr "" + +#: bzrlib/errors.py:818 +msgid "Revision is not compatible with %(repo_format)s" +msgstr "" + +#: bzrlib/errors.py:828 +msgid "%(context_info)s%(path)s is already versioned." +msgstr "" + +#: bzrlib/errors.py:849 +msgid "%(context_info)s%(path)s is not versioned." +msgstr "" + +#: bzrlib/errors.py:870 +msgid "Path(s) are not versioned: %(paths_as_string)s" +msgstr "" + +#: bzrlib/errors.py:881 +msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s" +msgstr "" + +#: bzrlib/errors.py:900 +msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\"" +msgstr "" + +#: bzrlib/errors.py:908 +msgid "" +"Filename %(filename)r is not valid in your current filesystem encoding " +"%(fs_encoding)s" +msgstr "" + +#: bzrlib/errors.py:919 +msgid "Cannot operate on \"%(filename)s\" because it is a control file" +msgstr "" + +#: bzrlib/errors.py:937 +msgid "The lock for '%(lock_description)s' is in use and cannot be broken." +msgstr "" + +#: bzrlib/errors.py:976 +msgid "Cannot lock %(lock)s: %(why)s" +msgstr "" + +#: bzrlib/errors.py:986 +msgid "" +"A transaction related operation was attempted after the transaction finished." +msgstr "" + +#: bzrlib/errors.py:1013 +msgid "Cannot lock: transport is read only: %(transport)s" +msgstr "" + +#: bzrlib/errors.py:1021 +msgid "Could not acquire lock \"%(lock)s\": %(msg)s" +msgstr "" + +#: bzrlib/errors.py:1032 +msgid "" +"Lock was broken while still open: %(lock)s - check storage consistency!" +msgstr "" + +#: bzrlib/errors.py:1043 +msgid "" +"Lock was released and re-acquired before being broken: %(lock)s: held by " +"%(holder)r, wanted to break %(target)r" +msgstr "" + +#: bzrlib/errors.py:1055 +msgid "" +"Lock is apparently held, but corrupted: %(corruption_info)s\n" +"Use 'bzr break-lock' to clear it" +msgstr "" + +#: bzrlib/errors.py:1068 +msgid "Lock not held: %(lock)s" +msgstr "" + +#: bzrlib/errors.py:1097 +msgid "No changes to commit" +msgstr "" + +#: bzrlib/errors.py:1102 +msgid "" +"Selected-file commit of merges is not supported yet: files %(files_str)s" +msgstr "" + +#: bzrlib/errors.py:1112 +msgid "" +"Excluding paths during commit is not supported by repository at " +"%(repository)r." +msgstr "" + +#: bzrlib/errors.py:1121 +msgid "" +"The specified commit message contains characters unsupported by the current " +"encoding." +msgstr "" + +#: bzrlib/errors.py:1127 +msgid "Upgrade URL cannot work with readonly URLs." +msgstr "" + +#: bzrlib/errors.py:1132 +msgid "The branch format %(format)s is already at the most recent format." +msgstr "" + +#: bzrlib/errors.py:1155 +msgid "Option --change does not accept revision ranges" +msgstr "" + +#: bzrlib/errors.py:1160 +msgid "No namespace registered for string: %(spec)r" +msgstr "" + +#: bzrlib/errors.py:1179 +msgid "" +"Requested revision: '%(spec)s' does not exist in branch: " +"%(branch_url)s%(extra)s" +msgstr "" + +#: bzrlib/errors.py:1193 +msgid "" +"Operation denied because it would change the main history, which is not " +"permitted by the append_revisions_only setting on branch \"%(location)s\"." +msgstr "" + +#: bzrlib/errors.py:1204 +msgid "" +"These branches have diverged. Use the missing command to see how.\n" +"Use the merge command to reconcile them." +msgstr "" + +#: bzrlib/errors.py:1224 +msgid "" +"Branches have no common ancestor, and no merge base revision was specified." +msgstr "" + +#: bzrlib/errors.py:1230 +msgid "" +"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3." +msgstr "" + +#: bzrlib/errors.py:1236 +msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s" +msgstr "" + +#: bzrlib/errors.py:1245 +msgid "" +"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s." +msgstr "" + +#: bzrlib/errors.py:1254 +msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s" +msgstr "" + +#: bzrlib/errors.py:1263 +msgid "Branch %(branch)s has no commits." +msgstr "" + +#: bzrlib/errors.py:1281 +msgid "" +"Bound branch %(branch)s is out of date with master branch " +"%(master)s.%(extra_help)s" +msgstr "" + +#: bzrlib/errors.py:1293 +msgid "" +"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is " +"bound to %(remote)s." +msgstr "" + +#: bzrlib/errors.py:1305 +msgid "Cannot pull --overwrite to a branch which is bound %(branch)s" +msgstr "" + +#: bzrlib/errors.py:1314 +msgid "" +"Unable to connect to target of bound branch %(branch)s => %(target)s: " +"%(error)s" +msgstr "" + +#: bzrlib/errors.py:1326 +msgid "Error in processing weave: %(msg)s" +msgstr "" + +#: bzrlib/errors.py:1335 +msgid "Revision {%(revision_id)s} already present in %(weave)s" +msgstr "" + +#: bzrlib/errors.py:1346 +msgid "Revision {%(revision_id)s} not present in %(weave)s" +msgstr "" + +#: bzrlib/errors.py:1356 +msgid "Weave invariant violated: %(what)s" +msgstr "" + +#: bzrlib/errors.py:1365 +msgid "Parents are mismatched between two revisions. %(msg)s" +msgstr "" + +#: bzrlib/errors.py:1387 +msgid "" +"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, " +"%(weave_b)s" +msgstr "" + +#: bzrlib/errors.py:1399 +msgid "Versioned file error" +msgstr "" + +#: bzrlib/errors.py:1404 +msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"." +msgstr "" + +#: bzrlib/errors.py:1414 +msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"." +msgstr "" + +#: bzrlib/errors.py:1424 +msgid "Text did not match its checksum: %(msg)s" +msgstr "" + +#: bzrlib/errors.py:1550 +msgid "Export format %(format)r not supported" +msgstr "" + +#: bzrlib/errors.py:1559 +msgid "Transport error: %(msg)s %(orig_error)s" +msgstr "" + +#: bzrlib/errors.py:1585 +msgid "Generic bzr smart protocol error: %(details)s" +msgstr "" + +#: bzrlib/errors.py:1593 +msgid "Received bad protocol version marker: %(marker)r" +msgstr "" + +#: bzrlib/errors.py:1625 +msgid "Transport operation not possible: %(msg)s %(orig_error)s" +msgstr "" + +#: bzrlib/errors.py:1630 +msgid "Connection error: %(msg)s %(orig_error)s" +msgstr "" + +#: bzrlib/errors.py:1635 +msgid "%(msg)s %(host)s%(port)s%(orig_error)s" +msgstr "" + +#: bzrlib/errors.py:1656 +msgid "Connection closed: %(msg)s %(orig_error)s" +msgstr "" + +#: bzrlib/errors.py:1661 +msgid "Connection Timeout: %(msg)s%(orig_error)s" +msgstr "" + +#: bzrlib/errors.py:1666 +msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s" +msgstr "" + +#: bzrlib/errors.py:1676 +msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s" +msgstr "" + +#: bzrlib/errors.py:1691 +msgid "Certificate error: %(error)s" +msgstr "" + +#: bzrlib/errors.py:1699 +msgid "Invalid http range %(range)r for %(path)s: %(msg)s" +msgstr "" + +#: bzrlib/errors.py:1713 +msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s" +msgstr "" + +#: bzrlib/errors.py:1721 +msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s" +msgstr "" + +#: bzrlib/errors.py:1730 +msgid "%(source)s is%(permanently)s redirected to %(target)s" +msgstr "" + +#: bzrlib/errors.py:1744 +msgid "Too many redirections" +msgstr "" + +#: bzrlib/errors.py:1749 +msgid "Working tree has conflicts." +msgstr "" + +#: bzrlib/errors.py:1753 +msgid "Config file %(filename)s is not UTF-8 encoded\n" +msgstr "" + +#: bzrlib/errors.py:1762 +msgid "" +"Error(s) parsing config file %(filename)s:\n" +"%(errors)s" +msgstr "" + +#: bzrlib/errors.py:1772 +msgid "" +"Bad value \"%(value)s\" for option \"%(name)s\".\n" +"See ``bzr help %(name)s``" +msgstr "" + +#: bzrlib/errors.py:1782 +msgid "%(username)r does not seem to contain a reasonable email address" +msgstr "" + +#: bzrlib/errors.py:1791 +msgid "Failed to GPG sign data with command \"%(command_line)s\"" +msgstr "" + +#: bzrlib/errors.py:1799 +msgid "Failed to verify GPG signature data with error \"%(error)s\"" +msgstr "" + +#: bzrlib/errors.py:1807 +msgid "Unable to import library \"%(library)s\": %(error)s" +msgstr "" + +#: bzrlib/errors.py:1815 +msgid "python-gpgme is not installed, it is needed to verify signatures" +msgstr "" + +#: bzrlib/errors.py:1823 +msgid "" +"The working tree for %(basedir)s has changed since the last commit, but " +"weave merge requires that it be unchanged" +msgstr "" + +#: bzrlib/errors.py:1833 +msgid "" +"Can't reprocess and show base, because reprocessing obscures the " +"relationship of conflicting lines to the base" +msgstr "" + +#: bzrlib/errors.py:1839 +msgid "Cycle in graph %(graph)r" +msgstr "" + +#: bzrlib/errors.py:1867 +msgid "File %(filename)s is not conflicted." +msgstr "" + +#: bzrlib/errors.py:1889 +msgid "No bundle was found in \"%(filename)s\"." +msgstr "" + +#: bzrlib/errors.py:1898 +msgid "Unable to handle bundle version %(version)s: %(msg)s" +msgstr "" + +#: bzrlib/errors.py:1908 +msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s" +msgstr "" + +#: bzrlib/errors.py:1921 +msgid "File id {%(file_id)s} already exists in inventory as %(entry)s" +msgstr "" + +#: bzrlib/errors.py:1931 +msgid "Key %(key)s is already present in map" +msgstr "" + +#: bzrlib/errors.py:1936 +msgid "The prefix %(prefix)s is in the help search path twice." +msgstr "" + +#: bzrlib/errors.py:1946 +msgid "" +"No final name for trans_id %(trans_id)r\n" +"file-id: %(file_id)r\n" +"root trans-id: %(root_trans_id)r\n" +msgstr "" + +#: bzrlib/errors.py:1978 +msgid "Attempt to reuse a transform that has already been applied." +msgstr "" + +#: bzrlib/errors.py:1983 +msgid "Moving the root directory is not supported at this time" +msgstr "" + +#: bzrlib/errors.py:1988 +msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s" +msgstr "" + +#: bzrlib/errors.py:1999 +msgid "" +"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s" +msgstr "" + +#: bzrlib/errors.py:2035 +msgid "" +"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s" +msgstr "" + +#: bzrlib/errors.py:2065 +msgid "Unable to import paramiko (required for sftp support): %(error)s" +msgstr "" + +#: bzrlib/errors.py:2073 +msgid "Nothing to merge." +msgstr "" + +#: bzrlib/errors.py:2078 +msgid "Format %(format)s cannot be initialised by this version of bzr." +msgstr "" + +#: bzrlib/errors.py:2087 +msgid "" +"Cannot convert from format %(from_format)s to format %(format)s. " +"%(problem)s" +msgstr "" + +#: bzrlib/errors.py:2099 +msgid "Could not find an appropriate Differ for file \"%(path)s\"" +msgstr "" + +#: bzrlib/errors.py:2107 +msgid "%(exe_name)s could not be found on this machine" +msgstr "" + +#: bzrlib/errors.py:2115 +msgid "Diff is not installed on this machine: %(msg)s" +msgstr "" + +#: bzrlib/errors.py:2123 +msgid "Diff3 is not installed on this machine." +msgstr "" + +#: bzrlib/errors.py:2129 +msgid "The content being inserted is already present." +msgstr "" + +#: bzrlib/errors.py:2134 +msgid "" +"This tree contains left-over files from a failed operation.\n" +" Please examine %(limbo_dir)s to see if it contains any files you wish " +"to\n" +" keep, and delete it when you are done." +msgstr "" + +#: bzrlib/errors.py:2145 +msgid "" +"This tree contains left-over files from a failed operation.\n" +" Please examine %(pending_deletion)s to see if it contains any files you\n" +" wish to keep, and delete it when you are done." +msgstr "" + +#: bzrlib/errors.py:2155 +msgid "" +"Unable to delete transform temporary directory %(limbo_dir)s.\n" +" Please examine %(limbo_dir)s to see if it contains any files you wish " +"to\n" +" keep, and delete it when you are done." +msgstr "" + +#: bzrlib/errors.py:2166 +msgid "" +"Unable to delete transform temporary directory %(pending_deletion)s. Please " +"examine %(pending_deletion)s to see if it contains any files you wish to " +"keep, and delete it when you are done." +msgstr "" + +#: bzrlib/errors.py:2176 +msgid "Working tree is out of date, please run 'bzr update'.%(more)s" +msgstr "" + +#: bzrlib/errors.py:2190 +msgid "" +"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"." +msgstr "" + +#: bzrlib/errors.py:2203 +msgid "Error in merge modified format" +msgstr "" + +#: bzrlib/errors.py:2208 +msgid "Format error in conflict listings" +msgstr "" + +#: bzrlib/errors.py:2212 +msgid "" +"Inconsistency in dirstate file %(dirstate_path)s.\n" +"Error: %(description)s" +msgstr "" + +#: bzrlib/errors.py:2223 +msgid "" +"An error has been detected in the repository %(repo_path)s.\n" +"Please run bzr reconcile on this repository." +msgstr "" + +#: bzrlib/errors.py:2234 +msgid "" +"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n" +"reason: %(reason)s" +msgstr "" + +#: bzrlib/errors.py:2247 +msgid "" +"An inconsistent delta was supplied: %(delta)r\n" +"reason: %(reason)s" +msgstr "" + +#: bzrlib/errors.py:2259 +msgid "To use this feature you must upgrade your branch at %(path)s." +msgstr "" + +#: bzrlib/errors.py:2268 +msgid "To use this feature you must upgrade your repository at %(path)s." +msgstr "" + +#: bzrlib/errors.py:2273 +msgid "" +"To use this feature you must upgrade your branch at %(path)s to a format " +"which supports rich roots." +msgstr "" + +#: bzrlib/errors.py:2279 +msgid "Cannot perform local-only commits on unbound branches." +msgstr "" + +#: bzrlib/errors.py:2284 +msgid "The method %(mname)s is not supported on objects of type %(tname)s." +msgstr "" + +#: bzrlib/errors.py:2305 +msgid "Ghost tags not supported by format %(format)r." +msgstr "" + +#: bzrlib/errors.py:2313 +msgid "File is binary but should be text." +msgstr "" + +#: bzrlib/errors.py:2318 +msgid "The path %(path)s is not permitted on this platform" +msgstr "" + +#: bzrlib/errors.py:2327 +msgid "" +"Testament did not match expected value.\n" +" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n" +" {%(measured)s}" +msgstr "" + +#: bzrlib/errors.py:2339 +msgid "Not a bzr revision-bundle: %(text)r" +msgstr "" + +#: bzrlib/errors.py:2348 +msgid "Bad bzr revision-bundle: %(text)r" +msgstr "" + +#: bzrlib/errors.py:2357 +msgid "Malformed bzr revision-bundle header: %(text)r" +msgstr "" + +#: bzrlib/errors.py:2362 +msgid "Malformed patches in bzr revision-bundle: %(text)r" +msgstr "" + +#: bzrlib/errors.py:2367 +msgid "Malformed footer in bzr revision-bundle: %(text)r" +msgstr "" + +#: bzrlib/errors.py:2372 +msgid "End of line marker was not \\n in bzr revision-bundle" +msgstr "" + +#: bzrlib/errors.py:2382 +msgid "Bundle format %(bundle_format)s is incompatible with %(other)s" +msgstr "" + +#: bzrlib/errors.py:2392 +msgid "Root class for inventory serialization errors" +msgstr "" + +#: bzrlib/errors.py:2396 +msgid "" +"The inventory was not in the expected format:\n" +" %(msg)s" +msgstr "" + +#: bzrlib/errors.py:2405 +msgid "This operation requires rich root data storage" +msgstr "" + +#: bzrlib/errors.py:2418 +msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s" +msgstr "" + +#: bzrlib/errors.py:2427 +msgid "" +"Don't know how to handle SSH connections. Please set BZR_SSH environment " +"variable." +msgstr "" + +#: bzrlib/errors.py:2434 +msgid "" +"Could not determine revno for {%(revision_id)s} because its ancestry shows a " +"ghost at {%(ghost_revision_id)s}" +msgstr "" + +#: bzrlib/errors.py:2444 +msgid "Ghost revision {%(revision_id)s} cannot be used here." +msgstr "" + +#: bzrlib/errors.py:2495 +msgid "" +"A merge directive must provide either a bundle or a public branch location." +msgstr "" + +#: bzrlib/errors.py:2502 +msgid "Bad merge directive payload %(start)r" +msgstr "" + +#: bzrlib/errors.py:2512 +msgid "Preview patch does not match requested changes." +msgstr "" + +#: bzrlib/errors.py:2518 +msgid "Patch_type was %(patch_type)s, but no patch was supplied." +msgstr "" + +#: bzrlib/errors.py:2528 +msgid "" +"Your branch does not have all of the revisions required in order to merge " +"this merge directive and the target location specified in the merge " +"directive is not a branch: %(location)s." +msgstr "" + +#: bzrlib/errors.py:2540 +msgid "Unsupported entry kind %(kind)s" +msgstr "" + +#: bzrlib/errors.py:2548 +msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s" +msgstr "" + +#: bzrlib/errors.py:2558 +msgid "Subsume target %(other_tree)s needs to be upgraded." +msgstr "" + +#: bzrlib/errors.py:2577 +msgid "No such tag: %(tag_name)s" +msgstr "" + +#: bzrlib/errors.py:2585 +msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade." +msgstr "" + +#: bzrlib/errors.py:2594 +msgid "Tag %(tag_name)s already exists." +msgstr "" + +#: bzrlib/errors.py:2602 +msgid "" +"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help " +"bugs\" for more information on this feature." +msgstr "" + +#: bzrlib/errors.py:2612 +msgid "" +"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s" +msgstr "" + +#: bzrlib/errors.py:2622 +msgid "" +"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s" +msgstr "" + +#: bzrlib/errors.py:2632 +msgid "Invalid line in bugs property: '%(line)s'" +msgstr "" + +#: bzrlib/errors.py:2640 +msgid "Invalid bug status: '%(status)s'" +msgstr "" + +#: bzrlib/errors.py:2648 +msgid "Could not understand response from smart server: %(response_tuple)r" +msgstr "" + +#: bzrlib/errors.py:2687 +msgid "Server sent an unexpected error: %(error_tuple)r" +msgstr "" + +#: bzrlib/errors.py:2706 +msgid "Unrecognised container format: %(container_format)r" +msgstr "" + +#: bzrlib/errors.py:2714 +msgid "Unexpected end of container stream" +msgstr "" + +#: bzrlib/errors.py:2719 +msgid "Unknown record type: %(record_type)r" +msgstr "" + +#: bzrlib/errors.py:2727 +msgid "Invalid record: %(reason)s" +msgstr "" + +#: bzrlib/errors.py:2735 +msgid "Container has data after end marker: %(excess)r" +msgstr "" + +#: bzrlib/errors.py:2743 +msgid "Container has multiple records with the same name: %(name)s" +msgstr "" + +#: bzrlib/errors.py:2756 +msgid "Corrupt or incompatible data stream: %(reason)s" +msgstr "" + +#: bzrlib/errors.py:2764 +msgid "SMTP error: %(error)s" +msgstr "" + +#: bzrlib/errors.py:2772 +msgid "No message supplied." +msgstr "" + +#: bzrlib/errors.py:2777 +msgid "No mail-to address (--mail-to) or output (-o) specified." +msgstr "" + +#: bzrlib/errors.py:2773 +msgid "Unknown mail client: %(mail_client)s" +msgstr "" + +#: bzrlib/errors.py:2782 +msgid "" +"Unable to find mail client with the following names: " +"%(mail_command_list_string)s" +msgstr "" + +#: bzrlib/errors.py:2792 +msgid "SMTP connection to %(host)s refused" +msgstr "" + +#: bzrlib/errors.py:2801 +msgid "Please specify smtp_server. No server at default %(host)s." +msgstr "" + +#: bzrlib/errors.py:2815 +msgid "" +"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-" +"reconfigure." +msgstr "" + +#: bzrlib/errors.py:2827 +msgid "'%(display_url)s' is already a branch." +msgstr "" + +#: bzrlib/errors.py:2832 +msgid "'%(display_url)s' is already a tree." +msgstr "" + +#: bzrlib/errors.py:2837 +msgid "'%(display_url)s' is already a checkout." +msgstr "" + +#: bzrlib/errors.py:2842 +msgid "'%(display_url)s' is already a lightweight checkout." +msgstr "" + +#: bzrlib/errors.py:2847 +msgid "'%(display_url)s' is already using a shared repository." +msgstr "" + +#: bzrlib/errors.py:2852 +msgid "'%(display_url)s' is already standalone." +msgstr "" + +#: bzrlib/errors.py:2857 +msgid "Shared repository '%(display_url)s' already creates working trees." +msgstr "" + +#: bzrlib/errors.py:2863 +msgid "" +"Shared repository '%(display_url)s' already doesn't create working trees." +msgstr "" + +#: bzrlib/errors.py:2869 +msgid "Requested reconfiguration of '%(display_url)s' is not supported." +msgstr "" + +#: bzrlib/errors.py:2874 +msgid "No location could be found to bind to at %(display_url)s." +msgstr "" + +#: bzrlib/errors.py:2879 +msgid "" +"Working tree \"%(display_url)s\" has uncommitted changes (See bzr " +"status).%(more)s" +msgstr "" + +#: bzrlib/errors.py:2898 +msgid "" +"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --" +"list).%(more)s" +msgstr "" + +#: bzrlib/errors.py:2904 +msgid "Variable {%(name)s} is not available." +msgstr "" + +#: bzrlib/errors.py:2912 +msgid "No template specified." +msgstr "" + +#: bzrlib/errors.py:2917 +msgid "Unable to create symlink %(path_str)son this platform" +msgstr "" + +#: bzrlib/errors.py:2932 +msgid "" +"Unsupported timezone format \"%(timezone)s\", options are \"utc\", " +"\"original\", \"local\"." +msgstr "" + +#: bzrlib/errors.py:2966 +msgid "" +"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s" +msgstr "" + +#: bzrlib/errors.py:2978 +msgid "The \"%(config_id)s\" configuration does not exist." +msgstr "" + +#: bzrlib/errors.py:2986 +msgid "The \"%(option_name)s\" configuration option does not exist." +msgstr "" + +#: bzrlib/errors.py:2994 +msgid "The alias \"%(alias_name)s\" does not exist." +msgstr "" + +#: bzrlib/errors.py:3008 +msgid "\"%(alias_name)s\" is not a valid location alias." +msgstr "" + +#: bzrlib/errors.py:3016 +msgid "No %(alias_name)s location assigned." +msgstr "" + +#: bzrlib/errors.py:3024 +msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s." +msgstr "" + +#: bzrlib/errors.py:3034 +msgid "Unknown rules detected: %(unknowns_str)s." +msgstr "" + +#: bzrlib/errors.py:3045 +msgid "Tip change rejected: %(msg)s" +msgstr "" + +#: bzrlib/errors.py:3053 +msgid "Shelf corrupt." +msgstr "" + +#: bzrlib/errors.py:3058 +msgid "Corruption while decompressing repository file%(orig_error)s" +msgstr "" + +#: bzrlib/errors.py:3070 +msgid "No changes are shelved with id \"%(shelf_id)d\"." +msgstr "" + +#: bzrlib/errors.py:3078 +msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead." +msgstr "" + +#: bzrlib/errors.py:3086 +msgid "" +"An attempt to access a url outside the server jail was made: '%(url)s'." +msgstr "" + +#: bzrlib/errors.py:3094 +msgid "The user aborted the operation." +msgstr "" + +#: bzrlib/errors.py:3099 +msgid "Branching '%(url)s'(%(format)s) must create a working tree." +msgstr "" + +#: bzrlib/errors.py:3109 +msgid "No such view: %(view_name)s." +msgstr "" + +#: bzrlib/errors.py:3119 +msgid "" +"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree " +"to a later format." +msgstr "" + +#: bzrlib/errors.py:3128 +msgid "" +"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s" +msgstr "" + +#: bzrlib/errors.py:3195 +msgid "%(bzrdir)r does not support co-located branches." +msgstr "" + +#: bzrlib/errors.py:3201 +msgid "" +"Unable to determine your name.\n" +"Please, set your name with the 'whoami' command.\n" +"E.g. bzr whoami \"Your Name \"" +msgstr "" + +#: bzrlib/errors.py:3210 +msgid "Invalid pattern(s) found. %(msg)s" +msgstr "" + +#: bzrlib/errors.py:3218 +msgid "" +"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr " +"unbind` to fix." +msgstr "" + +#: bzrlib/errors.py:3229 +msgid "Loop involving %(refs)r while expanding \"%(string)s\"." +msgstr "" + +#: bzrlib/errors.py:3238 +msgid "Option %(name)s is not defined while expanding \"%(string)s\"." +msgstr "" + +#: bzrlib/errors.py:3247 +msgid "" +"No compatible object available for operations from %(source)r to %(target)r." +msgstr "" + +#: bzrlib/errors.py:3257 +msgid "" +"VFS requests over the smart server are not allowed. Encountered: %(method)s, " +"%(arguments)s." +msgstr "" + +#: bzrlib/errors.py:3267 +msgid "" +"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by " +"format %(format)r" +msgstr "" + +#: bzrlib/errors.py:3279 +msgid "" +"Missing feature %(feature)s not provided by this version of Bazaar or any " +"plugin." +msgstr "" + +#: bzrlib/errors.py:3292 +msgid "Binary files section encountered." +msgstr "" + +#: bzrlib/errors.py:3300 +msgid "" +"Malformed patch header. %(desc)s\n" +"%(line)r" +msgstr "" + +#: bzrlib/errors.py:3309 +msgid "" +"Malformed hunk header. %(desc)s\n" +"%(line)r" +msgstr "" + +#: bzrlib/errors.py:3318 +msgid "" +"Malformed line. %(desc)s\n" +"%(line)r" +msgstr "" + +#: bzrlib/errors.py:3328 +msgid "" +"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", " +"but patch says it should be \"%(patch_line)s\"" +msgstr "" + +#: bzrlib/errors.py:3339 +msgid "The feature %(feature)s has already been registered." +msgstr "" + +#: bzrlib/export_pot.py:252 +#, python-format +msgid "Exporting messages from builtin command: %s" +msgstr "" + +#: bzrlib/export_pot.py:271 +msgid "Exporting messages from plugin command: {0} in {1}" +msgstr "" + +#: bzrlib/export_pot.py:292 +#, python-format +msgid "Exporting message from error: %s" +msgstr "" + +#: bzrlib/fetch.py:98 +msgid "Finding revisions" +msgstr "" + +#: bzrlib/fetch.py:103 +msgid "Fetching revisions" +msgstr "" + +#: bzrlib/foreign.py:262 +msgid "Push into a different VCS without any custom bzr metadata." +msgstr "" + +#: bzrlib/foreign.py:264 +msgid "" +"This will afterwards rebase the local branch on the remote\n" +"branch unless the --no-rebase option is used, in which case \n" +"the two branches will be out of sync after the push. " +msgstr "" + +#: bzrlib/foreign.py:277 +msgid "Do not rebase after push." +msgstr "" + +#: bzrlib/foreign.py:311 +#, python-format +msgid "Using saved location: %s\n" +msgstr "" + +#: bzrlib/foreign.py:321 +msgid "" +"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use " +"regular push." +msgstr "" + +#: bzrlib/gpg.py:439 +msgid "{0} commits with valid signatures" +msgstr "" + +#: bzrlib/gpg.py:445 +msgid "{0} commit with unknown key" +msgid_plural "{0} commits with unknown keys" +msgstr[0] "" +msgstr[1] "" + +#: bzrlib/gpg.py:453 +msgid "{0} commit not valid" +msgid_plural "{0} commits not valid" +msgstr[0] "" +msgstr[1] "" + +#: bzrlib/gpg.py:461 +msgid "{0} commit not signed" +msgid_plural "{0} commits not signed" +msgstr[0] "" +msgstr[1] "" + +#: bzrlib/gpg.py:469 +msgid "{0} commit with key now expired" +msgid_plural "{0} commits with key now expired" +msgstr[0] "" +msgstr[1] "" + +#: bzrlib/gpg.py:366 +msgid "No GnuPG key results for pattern: {0}" +msgstr "" + +#: bzrlib/gpg.py:505 +msgid "{0} signed {1} commit" +msgid_plural "{0} signed {1} commits" +msgstr[0] "" +msgstr[1] "" + +#: bzrlib/gpg.py:522 bzrlib/gpg.py:539 +msgid "{0} commit by author {1}" +msgid_plural "{0} commits by author {1}" +msgstr[0] "" +msgstr[1] "" + +#: bzrlib/gpg.py:554 +msgid "Unknown key {0} signed {1} commit" +msgid_plural "Unknown key {0} signed {1} commits" +msgstr[0] "" +msgstr[1] "" + +#: bzrlib/gpg.py:489 +msgid "{0} commit by author {1} with key {2} now expired" +msgid_plural "{0} commits by author {1} with key {2} now expired" +msgstr[0] "" +msgstr[1] "" + +#: bzrlib/groupcompress.py:1739 +#, python-format +msgid "Insert claimed random_id=True, but then inserted %r two times" +msgstr "" + +#: bzrlib/hooks.py:313 +#, python-format +msgid "Introduced in: %s" +msgstr "" + +#: bzrlib/hooks.py:316 +#, python-format +msgid "Deprecated in: %s" +msgstr "" + +#: bzrlib/knit.py:1766 bzrlib/knit.py:1802 +msgid "Walking content" +msgstr "" + +#: bzrlib/knit.py:3330 +msgid "annotating" +msgstr "" + +#: bzrlib/lock.py:548 +msgid "{0!r} was {1} locked again" +msgstr "" + +#: bzrlib/lockdir.py:321 +#, python-format +msgid "error removing pending lock: %s" +msgstr "" + +#: bzrlib/lockdir.py:616 +msgid "Unable to obtain" +msgstr "" + +#: bzrlib/lockdir.py:618 +msgid "Lock owner changed for" +msgstr "" + +#: bzrlib/lockdir.py:620 +msgid "{0} lock {1} {2}." +msgstr "" + +#: bzrlib/lockdir.py:627 +#, python-format +msgid "Will continue to try until %s, unless you press Ctrl-C." +msgstr "" + +#: bzrlib/lockdir.py:629 +msgid "See \"bzr help break-lock\" for more." +msgstr "" + +#: bzrlib/lockdir.py:739 +#, python-format +msgid "" +"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s" +msgstr "" + +#: bzrlib/log.py:563 +msgid "--exclude-common-ancestry requires two different revisions" +msgstr "" + +#: bzrlib/log.py:565 +#, python-format +msgid "invalid direction %r" +msgstr "" + +#: bzrlib/log.py:653 +msgid "Start revision not found in history of end revision." +msgstr "" + +#: bzrlib/log.py:1071 bzrlib/log.py:1129 +msgid "Logging revision 0 is invalid." +msgstr "" + +#: bzrlib/log.py:1073 bzrlib/log.py:1131 +msgid "Start revision must be older than the end revision." +msgstr "" + +#: bzrlib/log.py:1818 +#, python-format +msgid "unknown log formatter: %r" +msgstr "" + +#: bzrlib/log.py:2114 +msgid "fixes bug" +msgid_plural "fixes bugs" +msgstr[0] "" +msgstr[1] "" + +#: bzrlib/merge.py:689 +msgid "All changes applied successfully." +msgstr "" + +#: bzrlib/merge.py:691 +#, python-format +msgid "%d conflicts encountered." +msgstr "" + +#: bzrlib/merge.py:845 bzrlib/merge.py:1868 +msgid "Preparing file merge" +msgstr "" + +#: bzrlib/multiparent.py:426 +msgid "Importing revisions" +msgstr "" + +#: bzrlib/option.py:526 +msgid "Show help message." +msgstr "" + +#: bzrlib/option.py:528 +msgid "Only display errors and warnings." +msgstr "" + +#: bzrlib/option.py:531 +msgid "Show usage message and options." +msgstr "" + +#: bzrlib/option.py:533 +msgid "Display more information." +msgstr "" + +#: bzrlib/option.py:541 +msgid "" +"Select changes introduced by the specified revision. See also \"help " +"revisionspec\"." +msgstr "" + +#: bzrlib/option.py:543 +msgid "Branch to operate on, instead of working directory." +msgstr "" + +#: bzrlib/option.py:545 +msgid "Detailed log format." +msgstr "" + +#: bzrlib/option.py:545 +msgid "Format used by GNU ChangeLog files." +msgstr "" + +#: bzrlib/option.py:545 +msgid "Log format with one line per revision." +msgstr "" + +#: bzrlib/option.py:545 +msgid "Moderately short log format." +msgstr "" + +#: bzrlib/option.py:545 +msgid "Use specified log format." +msgstr "" + +#: bzrlib/option.py:547 +msgid "Log format" +msgstr "" + +#: bzrlib/option.py:549 +msgid "LCA-newness merge." +msgstr "" + +#: bzrlib/option.py:549 +msgid "Merge using external diff3." +msgstr "" + +#: bzrlib/option.py:549 +msgid "Native diff3-style merge." +msgstr "" + +#: bzrlib/option.py:549 +msgid "Select a particular merge algorithm." +msgstr "" + +#: bzrlib/option.py:549 +msgid "Weave-based merge." +msgstr "" + +#: bzrlib/option.py:551 +msgid "Merge algorithm" +msgstr "" + +#: bzrlib/option.py:554 +msgid "Message string." +msgstr "" + +#: bzrlib/option.py:556 +msgid "Use an ASCII NUL (\\0) separator rather than a newline." +msgstr "" + +#: bzrlib/option.py:558 +msgid "Ignore differences between branches and overwrite unconditionally." +msgstr "" + +#: bzrlib/option.py:560 +msgid "Remember the specified location as a default." +msgstr "" + +#: bzrlib/option.py:562 +msgid "Reprocess to reduce spurious conflicts." +msgstr "" + +#: bzrlib/option.py:566 +msgid "See \"help revisionspec\" for details." +msgstr "" + +#: bzrlib/option.py:568 +msgid "Show internal object ids." +msgstr "" + +#: bzrlib/option.py:571 +msgid "Display timezone as local, original, or utc." +msgstr "" + +#: bzrlib/osutils.py:100 +msgid "Parameter {0!r} encoding is unsupported by {1} application locale." +msgstr "" + +#: bzrlib/osutils.py:220 +msgid "lstat/stat of ({0!r}): {1!r}" +msgstr "" + +#: bzrlib/osutils.py:1030 bzrlib/osutils.py:1041 +#, python-format +msgid "sorry, %r not allowed in path" +msgstr "" + +#: bzrlib/osutils.py:1259 +#, python-format +msgid "%r is too short to calculate a relative path" +msgstr "" + +#: bzrlib/plugin.py:143 +#, python-format +msgid "\"%s\" is not a valid @ description " +msgstr "" + +#: bzrlib/plugins/bash_completion/bashcomp.py:411 +msgid "Enable completions for the selected plugin (default: all plugins)" +msgstr "" + +#: bzrlib/plugins/bash_completion/bashcomp.py:412 +msgid "Generate a shell function for bash command line completion." +msgstr "" + +#: bzrlib/plugins/bash_completion/bashcomp.py:414 +msgid "" +"This command generates a shell function which can be used by bash to\n" +"automatically complete the currently typed command when the user presses\n" +"the completion key (usually tab)." +msgstr "" + +#: bzrlib/plugins/bash_completion/bashcomp.py:418 +msgid "" +"Commonly used like this:\n" +" eval \"`bzr bash-completion`\"" +msgstr "" + +#: bzrlib/plugins/bash_completion/bashcomp.py:424 +msgid "Name of the generated function (default: _bzr)" +msgstr "" + +#: bzrlib/plugins/bash_completion/bashcomp.py:426 +msgid "Generate only the shell function, don't enable it" +msgstr "" + +#: bzrlib/plugins/launchpad/cmds.py:44 +msgid "Register a branch with launchpad.net." +msgstr "" + +#: bzrlib/plugins/launchpad/cmds.py:46 +msgid "" +"This command lists a bzr branch in the directory of branches on\n" +"launchpad.net. Registration allows the branch to be associated with\n" +"bugs or specifications." +msgstr "" + +#: bzrlib/plugins/launchpad/cmds.py:50 +msgid "" +"Before using this command you must register the project to which the\n" +"branch belongs, and create an account for yourself on launchpad.net." +msgstr "" + +#: bzrlib/plugins/launchpad/cmds.py:53 +msgid "" +"arguments:\n" +" public_url: The publicly visible url for the branch to register.\n" +" This must be an http or https url (which Launchpad can read\n" +" from to access the branch). Local file urls, SFTP urls, and\n" +" bzr+ssh urls will not work.\n" +" If no public_url is provided, bzr will use the configured\n" +" public_url if there is one for the current branch, and\n" +" otherwise error." +msgstr "" + +#: bzrlib/plugins/launchpad/cmds.py:62 +msgid "" +"example:\n" +" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n" +" --project fooproject" +msgstr "" + +#: bzrlib/plugins/launchpad/cmds.py:69 +msgid "Launchpad project short name to associate with the branch." +msgstr "" + +#: bzrlib/plugins/launchpad/cmds.py:76 +msgid "" +"Short name for the branch; by default taken from the last component of the " +"url." +msgstr "" + +#: bzrlib/plugins/launchpad/cmds.py:80 +msgid "One-sentence description of the branch." +msgstr "" + +#: bzrlib/plugins/launchpad/cmds.py:83 +msgid "Longer description of the purpose or contents of the branch." +msgstr "" + +#: bzrlib/plugins/launchpad/cmds.py:86 +msgid "Branch author's email address, if not yourself." +msgstr "" + +#: bzrlib/plugins/launchpad/cmds.py:89 +msgid "The bug this branch fixes." +msgstr "" + +#: bzrlib/plugins/launchpad/cmds.py:92 +msgid "Prepare the request but don't actually send it." +msgstr "" + +#: bzrlib/plugins/launchpad/cmds.py:114 +msgid "" +"register-branch requires a public branch url - see bzr help register-branch." +msgstr "" + +#: bzrlib/plugins/launchpad/cmds.py:122 +msgid "--product is deprecated; please use --project." +msgstr "" + +#: bzrlib/plugins/launchpad/cmds.py:152 +msgid "Open a Launchpad branch page in your web browser." +msgstr "" + +#: bzrlib/plugins/launchpad/cmds.py:157 +msgid "Do not actually open the browser. Just say the URL we would use." +msgstr "" + +#: bzrlib/plugins/launchpad/cmds.py:192 +#, python-format +msgid "Opening %s in web browser" +msgstr "" + +#: bzrlib/plugins/launchpad/cmds.py:200 +msgid "Show or set the Launchpad user ID." +msgstr "" + +#: bzrlib/plugins/launchpad/cmds.py:202 +msgid "" +"When communicating with Launchpad, some commands need to know your\n" +"Launchpad user ID. This command can be used to set or show the\n" +"user ID that Bazaar will use for such communication." +msgstr "" + +#: bzrlib/plugins/launchpad/cmds.py:206 +msgid "" +":Examples:\n" +" Show the Launchpad ID of the current user::" +msgstr "" + +#: bzrlib/plugins/launchpad/cmds.py:209 +msgid " bzr launchpad-login" +msgstr "" + +#: bzrlib/plugins/launchpad/cmds.py:211 +msgid " Set the Launchpad ID of the current user to 'bob'::" +msgstr "" + +#: bzrlib/plugins/launchpad/cmds.py:213 +msgid " bzr launchpad-login bob" +msgstr "" + +#: bzrlib/plugins/launchpad/cmds.py:220 +msgid "Don't check that the user name is valid." +msgstr "" + +#: bzrlib/plugins/launchpad/cmds.py:235 bzrlib/plugins/launchpad/cmds.py:246 +msgid "Launchpad user ID exists and has SSH keys.\n" +msgstr "" + +#: bzrlib/plugins/launchpad/cmds.py:238 +msgid "No Launchpad user ID configured.\n" +msgstr "" + +#: bzrlib/plugins/launchpad/cmds.py:249 +#, python-format +msgid "Launchpad user ID set to '%s'.\n" +msgstr "" + +#: bzrlib/plugins/launchpad/cmds.py:255 +msgid "Ask Launchpad to mirror a branch now." +msgstr "" + +#: bzrlib/plugins/launchpad/cmds.py:272 +msgid "Propose merging a branch on Launchpad." +msgstr "" + +#: bzrlib/plugins/launchpad/cmds.py:274 +msgid "" +"This will open your usual editor to provide the initial comment. When it\n" +"has created the proposal, it will open it in your default web browser." +msgstr "" + +#: bzrlib/plugins/launchpad/cmds.py:277 +msgid "" +"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n" +"is not supplied, the remembered submit branch will be used. If no submit\n" +"branch is remembered, the development focus will be used." +msgstr "" + +#: bzrlib/plugins/launchpad/cmds.py:281 +msgid "" +"By default, the SUBMIT_BRANCH's review team will be requested to review\n" +"the merge proposal. This can be overriden by specifying --review (-R).\n" +"The parameter the launchpad account name of the desired reviewer. This\n" +"may optionally be followed by '=' and the review type. For example:" +msgstr "" + +#: bzrlib/plugins/launchpad/cmds.py:286 +msgid " bzr lp-propose-merge --review jrandom --review review-team=qa" +msgstr "" + +#: bzrlib/plugins/launchpad/cmds.py:288 +msgid "" +"This will propose a merge, request \"jrandom\" to perform a review of\n" +"unspecified type, and request \"review-team\" to perform a \"qa\" review." +msgstr "" + +#: bzrlib/plugins/launchpad/cmds.py:293 +msgid "Propose the merge on staging." +msgstr "" + +#: bzrlib/plugins/launchpad/cmds.py:295 +msgid "Commit message." +msgstr "" + +#: bzrlib/plugins/launchpad/cmds.py:297 +msgid "Mark the proposal as approved immediately." +msgstr "" + +#: bzrlib/plugins/launchpad/cmds.py:300 +msgid "Requested reviewer and optional type." +msgstr "" + +#: bzrlib/plugins/launchpad/cmds.py:335 +msgid "Find the proposal to merge this revision." +msgstr "" + +#: bzrlib/plugins/launchpad/cmds.py:337 +msgid "" +"Finds the merge proposal(s) that discussed landing the specified revision.\n" +"This works only if the selected branch was the merge proposal target, and\n" +"if the merged_revno is recorded for the merge proposal. The proposal(s)\n" +"are opened in a web browser." +msgstr "" + +#: bzrlib/plugins/launchpad/cmds.py:342 +msgid "" +"Any revision involved in the merge may be specified-- the revision in\n" +"which the merge was performed, or one of the revisions that was merged." +msgstr "" + +#: bzrlib/plugins/launchpad/cmds.py:345 +msgid "So, to find the merge proposal that reviewed line 1 of README::" +msgstr "" + +#: bzrlib/plugins/launchpad/cmds.py:347 +msgid " bzr lp-find-proposal -r annotate:README:1" +msgstr "" + +#: bzrlib/plugins/launchpad/cmds.py:363 +msgid "No review found." +msgstr "" + +#: bzrlib/plugins/launchpad/cmds.py:364 +#, python-format +msgid "%d proposals(s) found." +msgstr "" + +#: bzrlib/plugins/launchpad/cmds.py:374 +msgid "Finding revision-id" +msgstr "" + +#: bzrlib/plugins/launchpad/cmds.py:381 +msgid "Finding merge" +msgstr "" + +#: bzrlib/plugins/launchpad/cmds.py:386 +msgid "Finding revno" +msgstr "" + +#: bzrlib/plugins/launchpad/cmds.py:392 +msgid "Finding Launchpad branch" +msgstr "" + +#: bzrlib/plugins/launchpad/cmds.py:395 +msgid "Finding proposals" +msgstr "" + +#: bzrlib/plugins/launchpad/account.py:66 +msgid "Setting ssh/sftp usernames for launchpad.net." +msgstr "" + +#: bzrlib/plugins/launchpad/lp_api.py:241 +#: bzrlib/plugins/launchpad/lp_api.py:246 +#, python-format +msgid "%s is not registered on Launchpad" +msgstr "" + +#: bzrlib/plugins/launchpad/lp_api.py:256 +#, python-format +msgid "%s has no development focus." +msgstr "" + +#: bzrlib/plugins/launchpad/lp_api.py:261 +#, python-format +msgid "development focus %s has no branch." +msgstr "" + +#: bzrlib/plugins/launchpad/lp_api.py:266 +#, python-format +msgid "source package %s has no branch." +msgstr "" + +#: bzrlib/plugins/launchpad/lp_api.py:270 +#, python-format +msgid "%s has no associated product or source package." +msgstr "" + +#: bzrlib/plugins/launchpad/lp_api.py:282 +#, python-format +msgid "%s is already up-to-date." +msgstr "" + +#: bzrlib/plugins/launchpad/lp_api.py:289 +#, python-format +msgid "Pushing to %s" +msgstr "" + +#: bzrlib/plugins/launchpad/lp_directory.py:170 +msgid "" +"resolution for {0}\n" +" local: {1}\n" +" remote: {2}" +msgstr "" + +#: bzrlib/plugins/launchpad/lp_propose.py:150 +#, python-format +msgid "There is already a branch merge proposal: %s" +msgstr "" + +#: bzrlib/plugins/weave_fmt/bzrdir.py:237 +msgid "pb parameter to convert() is deprecated" +msgstr "" + +#: bzrlib/plugins/weave_fmt/bzrdir.py:240 +msgid "starting upgrade from format 4 to 5" +msgstr "" + +#: bzrlib/plugins/weave_fmt/bzrdir.py:250 +msgid "note: upgrade may be faster if all store files are ungzipped first" +msgstr "" + +#: bzrlib/plugins/weave_fmt/bzrdir.py:279 +msgid "converting revision" +msgstr "" + +#: bzrlib/plugins/weave_fmt/bzrdir.py:284 +msgid "upgraded to weaves:" +msgstr "" + +#: bzrlib/plugins/weave_fmt/bzrdir.py:285 +#, python-format +msgid "%6d revisions and inventories" +msgstr "" + +#: bzrlib/plugins/weave_fmt/bzrdir.py:287 +#, python-format +msgid "%6d revisions not present" +msgstr "" + +#: bzrlib/plugins/weave_fmt/bzrdir.py:289 +#, python-format +msgid "%6d texts" +msgstr "" + +#: bzrlib/plugins/weave_fmt/bzrdir.py:325 +msgid "writing weave" +msgstr "" + +#: bzrlib/plugins/weave_fmt/bzrdir.py:329 +#: bzrlib/plugins/weave_fmt/bzrdir.py:331 +msgid "inventory" +msgstr "" + +#: bzrlib/plugins/weave_fmt/bzrdir.py:348 +msgid "write revision" +msgstr "" + +#: bzrlib/plugins/weave_fmt/bzrdir.py:362 +msgid "loading revision" +msgstr "" + +#: bzrlib/plugins/weave_fmt/bzrdir.py:367 +#, python-format +msgid "revision {%s} not present in branch; will be converted as a ghost" +msgstr "" + +#: bzrlib/plugins/weave_fmt/bzrdir.py:507 +msgid "starting upgrade from format 5 to 6" +msgstr "" + +#: bzrlib/plugins/weave_fmt/bzrdir.py:517 +#, python-format +msgid "adding prefixes to %s" +msgstr "" + +#: bzrlib/plugins/weave_fmt/bzrdir.py:557 +msgid "starting upgrade from format 6 to metadir" +msgstr "" + +#: bzrlib/plugins/weave_fmt/bzrdir.py:565 +msgid "Removing ancestry.weave" +msgstr "" + +#: bzrlib/plugins/weave_fmt/bzrdir.py:570 +msgid "Finding branch files" +msgstr "" + +#: bzrlib/plugins/weave_fmt/bzrdir.py:580 +msgid "Upgrading repository" +msgstr "" + +#: bzrlib/plugins/weave_fmt/bzrdir.py:590 +msgid "Upgrading branch" +msgstr "" + +#: bzrlib/plugins/weave_fmt/bzrdir.py:613 +msgid "No working tree." +msgstr "" + +#: bzrlib/plugins/weave_fmt/bzrdir.py:620 +msgid "Upgrading working tree" +msgstr "" + +#: bzrlib/plugins/weave_fmt/bzrdir.py:641 +#, python-format +msgid "Make %s lock" +msgstr "" + +#: bzrlib/plugins/weave_fmt/bzrdir.py:652 +#, python-format +msgid "Moving %s" +msgstr "" + +#: bzrlib/push.py:56 +msgid "Created new branch." +msgstr "" + +#: bzrlib/push.py:97 +#, python-format +msgid "" +"Target directory %s already contains a .bzr directory, but it is not valid." +msgstr "" + +#: bzrlib/push.py:101 +#, python-format +msgid "" +"Target directory %s already exists, but does not have a .bzr directory. " +"Supply --use-existing-dir to push there anyway." +msgstr "" + +#: bzrlib/push.py:122 +#, python-format +msgid "Too many redirections trying to make %s." +msgstr "" + +#: bzrlib/push.py:148 +msgid "" +"These branches have diverged. See \"bzr help diverged-branches\" for more " +"information." +msgstr "" + +#: bzrlib/push.py:152 +#, python-format +msgid "" +"It is not possible to losslessly push to %s. You may want to use dpush " +"instead." +msgstr "" + +#: bzrlib/push.py:158 +#, python-format +msgid "" +"At %s you have a valid .bzr control directory, but not a branch or " +"repository. This is an unsupported configuration. Please move the target " +"directory out of the way and try again." +msgstr "" + +#: bzrlib/reconcile.py:97 +#, python-format +msgid "Reconciling branch %s" +msgstr "" + +#: bzrlib/reconcile.py:103 +#, python-format +msgid "Reconciling repository %s" +msgstr "" + +#: bzrlib/reconcile.py:105 +msgid "Reconciling repository" +msgstr "" + +#: bzrlib/reconcile.py:111 +#, python-format +msgid "%s cannot canonicalize CHKs." +msgstr "" + +#: bzrlib/reconcile.py:119 +msgid "Reconcile aborted: revision index has inconsistent parents." +msgstr "" + +#: bzrlib/reconcile.py:121 +msgid "Run \"bzr check\" for more details." +msgstr "" + +#: bzrlib/reconcile.py:123 +msgid "Reconciliation complete." +msgstr "" + +#: bzrlib/reconcile.py:166 +msgid "Fixing last revision info {0} => {1}" +msgstr "" + +#: bzrlib/reconcile.py:173 +msgid "revision_history ok." +msgstr "" + +#: bzrlib/reconcile.py:234 +msgid "Reading inventory data" +msgstr "" + +#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384 +msgid "Inventory ok." +msgstr "" + +#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386 +msgid "Backing up inventory" +msgstr "" + +#: bzrlib/reconcile.py:258 +msgid "Backup inventory created." +msgstr "" + +#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405 +msgid "Writing weave" +msgstr "" + +#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408 +msgid "Inventory regenerated." +msgstr "" + +#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376 +msgid "Reading indexes" +msgstr "" + +#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382 +msgid "Checking unused inventories" +msgstr "" + +#: bzrlib/reconcile.py:388 +msgid "Backup Inventory created" +msgstr "" + +#: bzrlib/reconcile.py:446 +msgid "Fixing text parents" +msgstr "" + +#: bzrlib/reconfigure.py:54 +msgid "{0} is now stacked on {1}\n" +msgstr "" + +#: bzrlib/reconfigure.py:69 +#, python-format +msgid "%s is now not stacked\n" +msgstr "" + +#: bzrlib/remote.py:1228 bzrlib/repository.py:289 +#, python-format +msgid "bzr: ERROR (ignored): %s" +msgstr "" + +#: bzrlib/remote.py:2534 +msgid "Copying repository content as tarball..." +msgstr "" + +#: bzrlib/rename_map.py:69 +msgid "Calculating hashes" +msgstr "" + +#: bzrlib/rename_map.py:107 +msgid "Determining hash hits" +msgstr "" + +#: bzrlib/rename_map.py:242 +msgid "{0} => {1}" +msgstr "" + +#: bzrlib/repository.py:1738 +msgid "Moving repository to repository.backup" +msgstr "" + +#: bzrlib/repository.py:1745 +msgid "Creating new repository" +msgstr "" + +#: bzrlib/repository.py:1750 +msgid "Copying content" +msgstr "" + +#: bzrlib/repository.py:1754 +msgid "Deleting old repository content" +msgstr "" + +#: bzrlib/repository.py:1756 +msgid "repository converted" +msgstr "" + +#: bzrlib/revisionspec.py:903 +msgid "Using {0} {1}" +msgstr "" + +#: bzrlib/send.py:59 +#, python-format +msgid "Mail client \"%s\" does not support specifying body" +msgstr "" + +#: bzrlib/send.py:63 +msgid "--remember requires a branch to be specified." +msgstr "" + +#: bzrlib/send.py:78 +msgid "No submit branch known or specified" +msgstr "" + +#: bzrlib/send.py:81 +msgid "Using saved {0} location \"{1}\" to determine what changes to submit." +msgstr "" + +#: bzrlib/send.py:99 +#, python-format +msgid "No such send format '%s'." +msgstr "" + +#: bzrlib/send.py:115 +msgid "bzr send takes at most two one revision identifiers" +msgstr "" + +#: bzrlib/send.py:128 +msgid "No revisions to submit." +msgstr "" + +#: bzrlib/send.py:140 +msgid "" +"- not supported for merge directives that use more than one output file." +msgstr "" + +#: bzrlib/send.py:186 +msgid "Format 0.9 does not permit bundle with no patch" +msgstr "" + +#: bzrlib/shelf_ui.py:46 +#, python-format +msgid "Shelve adding file \"%(path)s\"?" +msgstr "" + +#: bzrlib/shelf_ui.py:47 +msgid "Shelve binary changes?" +msgstr "" + +#: bzrlib/shelf_ui.py:48 +msgid "Shelve changing \"%s\" from %(other)s to %(this)s?" +msgstr "" + +#: bzrlib/shelf_ui.py:50 +#, python-format +msgid "Shelve removing file \"%(path)s\"?" +msgstr "" + +#: bzrlib/shelf_ui.py:51 +#, python-format +msgid "Shelve %d change(s)?" +msgstr "" + +#: bzrlib/shelf_ui.py:52 +msgid "Shelve?" +msgstr "" + +#: bzrlib/shelf_ui.py:53 +#, python-format +msgid "" +"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?" +msgstr "" + +#: bzrlib/shelf_ui.py:55 +#, python-format +msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?" +msgstr "" + +#: bzrlib/shelf_ui.py:70 +#, python-format +msgid "Changes shelved with id \"%d\"." +msgstr "" + +#: bzrlib/shelf_ui.py:74 +msgid "Selected changes destroyed." +msgstr "" + +#: bzrlib/shelf_ui.py:78 +msgid "Selected changes:" +msgstr "" + +#: bzrlib/shelf_ui.py:98 +#, python-format +msgid "Delete file \"%(path)s\"?" +msgstr "" + +#: bzrlib/shelf_ui.py:99 +msgid "Apply binary changes?" +msgstr "" + +#: bzrlib/shelf_ui.py:100 +#, python-format +msgid "Change \"%(path)s\" from %(this)s to %(other)s?" +msgstr "" + +#: bzrlib/shelf_ui.py:102 +#, python-format +msgid "Add file \"%(path)s\"?" +msgstr "" + +#: bzrlib/shelf_ui.py:103 +#, python-format +msgid "Apply %d change(s)?" +msgstr "" + +#: bzrlib/shelf_ui.py:104 +msgid "Apply change?" +msgstr "" + +#: bzrlib/shelf_ui.py:105 +#, python-format +msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?" +msgstr "" + +#: bzrlib/shelf_ui.py:107 +#, python-format +msgid "Rename \"%(this)s\" => \"%(other)s\"?" +msgstr "" + +#: bzrlib/shelf_ui.py:402 +msgid "No changes are shelved." +msgstr "" + +#: bzrlib/shelf_ui.py:460 +#, python-format +msgid "Using changes with id \"%d\"." +msgstr "" + +#: bzrlib/shelf_ui.py:464 +#, python-format +msgid "Message: %s" +msgstr "" + +#: bzrlib/shelf_ui.py:476 +#, python-format +msgid "Deleted changes with id \"%d\"." +msgstr "" + +#: bzrlib/smart/medium.py:714 +msgid "HPSS calls: {0} ({1} vfs) {2}" +msgstr "" + +#: bzrlib/smart/server.py:169 +msgid "Requested to stop gracefully" +msgstr "" + +#: bzrlib/smart/server.py:179 +#, python-format +msgid "Waiting for %d client(s) to finish" +msgstr "" + +#: bzrlib/smart/server.py:185 +#, python-format +msgid "Still waiting for %d client(s) to finish" +msgstr "" + +#: bzrlib/smart/server.py:219 +#, python-format +msgid "listening socket error: %s" +msgstr "" + +#: bzrlib/smart/server.py:452 +#, python-format +msgid "listening on port: %s" +msgstr "" + +#: bzrlib/switch.py:73 +msgid "Pending merges must be committed or reverted before using switch." +msgstr "" + +#: bzrlib/switch.py:100 +msgid "" +"Cannot switch as local commits found in the checkout. Commit these to the " +"bound branch or use --force to throw them away." +msgstr "" + +#: bzrlib/switch.py:105 +#, python-format +msgid "" +"Unable to connect to current master branch %(target)s: %(error)s To switch " +"anyway, use --force." +msgstr "" + +#: bzrlib/switch.py:129 +msgid "Cannot switch a branch, only a checkout." +msgstr "" + +#: bzrlib/switch.py:167 +#, python-format +msgid "Tree is up to date at revision %d." +msgstr "" + +#: bzrlib/switch.py:173 +#, python-format +msgid "Updated to revision %d." +msgstr "" + +#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736 +msgid "Apply phase" +msgstr "" + +#: bzrlib/transform.py:1762 bzrlib/transform.py:1830 +msgid "removing file" +msgstr "" + +#: bzrlib/transform.py:1780 bzrlib/transform.py:1865 +msgid "adding file" +msgstr "" + +#: bzrlib/transform.py:2598 +msgid "Building tree" +msgstr "" + +#: bzrlib/transform.py:2688 bzrlib/transform.py:2715 +msgid "Adding file contents" +msgstr "" + +#: bzrlib/transform.py:3017 +msgid "Resolution pass" +msgstr "" + +#: bzrlib/transport/ftp/_gssapi.py:88 +#, python-format +msgid "Authenticated as %s" +msgstr "" + +#: bzrlib/tree.py:647 +msgid "*** {0} content-filter: {1} => {2!r}" +msgstr "" + +#: bzrlib/upgrade.py:77 +#, python-format +msgid "This is a checkout. The branch (%s) needs to be upgraded separately." +msgstr "" + +#: bzrlib/upgrade.py:100 +#, python-format +msgid "cannot upgrade from bzrdir format %s" +msgstr "" + +#: bzrlib/upgrade.py:103 +#, python-format +msgid "starting upgrade of %s" +msgstr "" + +#: bzrlib/upgrade.py:110 +msgid "finished" +msgstr "" + +#: bzrlib/upgrade.py:120 +msgid "Deleting backup.bzr" +msgstr "" + +#: bzrlib/upgrade.py:151 +msgid "" +"\n" +"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed" +msgstr "" + +#: bzrlib/upgrade.py:208 +#, python-format +msgid "Found %d dependent branches - upgrading ..." +msgstr "" + +#: bzrlib/upgrade.py:276 +msgid "Upgrading bzrdirs" +msgstr "" + +#: bzrlib/upgrade.py:282 +#, python-format +msgid "Upgrading %s" +msgstr "" + +#: bzrlib/upgrade.py:283 +msgid "Upgrading {0} {1} ..." +msgstr "" + +#: bzrlib/upgrade.py:301 +msgid "Removing backup ..." +msgstr "" + +#: bzrlib/upgrade.py:305 +msgid "failed to clean-up {0}: {1}" +msgstr "" + +#: bzrlib/vf_repository.py:1091 +msgid "inventories" +msgstr "" + +#: bzrlib/vf_repository.py:1117 +msgid "texts" +msgstr "" + +#: bzrlib/vf_repository.py:1622 bzrlib/vf_repository.py:1631 +msgid "Calculating text parents" +msgstr "" + +#: bzrlib/vf_repository.py:1707 +msgid "Fetch texts" +msgstr "" + +#: bzrlib/vf_repository.py:2536 +msgid "loading text store" +msgstr "" + +#: bzrlib/vf_repository.py:2542 +msgid "checking text graph" +msgstr "" + +#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012 +#: bzrlib/vf_repository.py:3127 +msgid "Transferring revisions" +msgstr "" + +#: bzrlib/win32utils.py:146 +msgid "Failed to GetProcessMemoryInfo()" +msgstr "" + +#: bzrlib/win32utils.py:167 +msgid "Cannot debug memory on win32 without ctypes or win32process" +msgstr "" + +#: bzrlib/win32utils.py:172 +msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}" +msgstr "" + +#: bzrlib/win32utils.py:180 +#, python-format +msgid "WorkingSize %8d KiB" +msgstr "" + +#: bzrlib/win32utils.py:181 +#, python-format +msgid "PeakWorking %8d KiB" +msgstr "" + +#: bzrlib/win32utils.py:182 +#, python-format +msgid "PagefileUsage %8d KiB" +msgstr "" + +#: bzrlib/win32utils.py:183 +#, python-format +msgid "PeakPagefileUsage %8d KiB" +msgstr "" + +#: bzrlib/win32utils.py:185 +#, python-format +msgid "PrivateUsage %8d KiB" +msgstr "" + +#: bzrlib/win32utils.py:186 +#, python-format +msgid "PageFaultCount %8d" +msgstr "" + +#: bzrlib/workingtree.py:1482 +msgid "Rerun update after fixing the conflicts." +msgstr "" + +#: dummy/help_topics/authentication/summary.txt:1 +msgid "Information on configuring authentication" +msgstr "" + +#: dummy/help_topics/basic/detail.txt:1 +msgid "" +"Bazaar 2.5b6 -- a free distributed version-control tool\n" +"http://bazaar.canonical.com/" +msgstr "" + +#: dummy/help_topics/basic/detail.txt:4 +msgid "" +"Basic commands:\n" +" bzr init makes this directory a versioned branch\n" +" bzr branch make a copy of another branch" +msgstr "" + +#: dummy/help_topics/basic/detail.txt:8 +msgid "" +" bzr add make files or directories versioned\n" +" bzr ignore ignore a file or pattern\n" +" bzr mv move or rename a versioned file" +msgstr "" + +#: dummy/help_topics/basic/detail.txt:12 +msgid "" +" bzr status summarize changes in working copy\n" +" bzr diff show detailed diffs" +msgstr "" + +#: dummy/help_topics/basic/detail.txt:15 +msgid "" +" bzr merge pull in changes from another branch\n" +" bzr commit save some or all changes\n" +" bzr send send changes via email" +msgstr "" + +#: dummy/help_topics/basic/detail.txt:19 +msgid "" +" bzr log show history of changes\n" +" bzr check validate storage" +msgstr "" + +#: dummy/help_topics/basic/detail.txt:22 +msgid "" +" bzr help init more help on e.g. init command\n" +" bzr help commands list all commands\n" +" bzr help topics list all help topics\n" +msgstr "" + +#: dummy/help_topics/basic/summary.txt:1 +msgid "Basic commands" +msgstr "" + +#: dummy/help_topics/branches/detail.txt:1 +msgid "Branches" +msgstr "" + +#: dummy/help_topics/branches/detail.txt:3 +msgid "" +"A branch consists of the state of a project, including all of its\n" +"history. All branches have a repository associated (which is where the\n" +"branch history is stored), but multiple branches may share the same\n" +"repository (a shared repository). Branches can be copied and merged." +msgstr "" + +#: dummy/help_topics/branches/detail.txt:8 +msgid "" +"In addition, one branch may be bound to another one. Binding to another\n" +"branch indicates that commits which happen in this branch must also \n" +"happen in the other branch. Bazaar ensures consistency by not allowing \n" +"commits when the two branches are out of date. In order for a commit \n" +"to succeed, it may be necessary to update the current branch using \n" +"``bzr update``." +msgstr "" + +#: dummy/help_topics/branches/detail.txt:15 +#: dummy/help_topics/checkouts/detail.txt:66 +#: dummy/help_topics/repositories/detail.txt:36 +msgid "Related commands::" +msgstr "" + +#: dummy/help_topics/branches/detail.txt:17 +msgid "" +" init Change a directory into a versioned branch.\n" +" branch Create a new branch that is a copy of an existing branch.\n" +" merge Perform a three-way merge.\n" +" bind Bind a branch to another one.\n" +msgstr "" + +#: dummy/help_topics/branches/summary.txt:1 +msgid "Information on what a branch is" +msgstr "" + +#: dummy/help_topics/bugs/summary.txt:1 +msgid "Bug tracker settings" +msgstr "" + +#: dummy/help_topics/checkouts/detail.txt:1 +msgid "Checkouts" +msgstr "" + +#: dummy/help_topics/checkouts/detail.txt:3 +msgid "" +"Checkouts are source trees that are connected to a branch, so that when\n" +"you commit in the source tree, the commit goes into that branch. They\n" +"allow you to use a simpler, more centralized workflow, ignoring some of\n" +"Bazaar's decentralized features until you want them. Using checkouts\n" +"with shared repositories is very similar to working with SVN or CVS, but\n" +"doesn't have the same restrictions. And using checkouts still allows\n" +"others working on the project to use whatever workflow they like." +msgstr "" + +#: dummy/help_topics/checkouts/detail.txt:11 +msgid "" +"A checkout is created with the bzr checkout command (see \"help " +"checkout\").\n" +"You pass it a reference to another branch, and it will create a local copy\n" +"for you that still contains a reference to the branch you created the\n" +"checkout from (the master branch). Then if you make any commits they will " +"be\n" +"made on the other branch first. This creates an instant mirror of your work, " +"or\n" +"facilitates lockstep development, where each developer is working together,\n" +"continuously integrating the changes of others." +msgstr "" + +#: dummy/help_topics/checkouts/detail.txt:19 +msgid "" +"However the checkout is still a first class branch in Bazaar terms, so that\n" +"you have the full history locally. As you have a first class branch you " +"can\n" +"also commit locally if you want, for instance due to the temporary loss af " +"a\n" +"network connection. Use the --local option to commit to do this. All the " +"local\n" +"commits will then be made on the master branch the next time you do a non-" +"local\n" +"commit." +msgstr "" + +#: dummy/help_topics/checkouts/detail.txt:26 +msgid "" +"If you are using a checkout from a shared branch you will periodically want " +"to\n" +"pull in all the changes made by others. This is done using the \"update\"\n" +"command. The changes need to be applied before any non-local commit, but\n" +"Bazaar will tell you if there are any changes and suggest that you use this\n" +"command when needed." +msgstr "" + +#: dummy/help_topics/checkouts/detail.txt:32 +msgid "" +"It is also possible to create a \"lightweight\" checkout by passing the\n" +"--lightweight flag to checkout. A lightweight checkout is even closer to an\n" +"SVN checkout in that it is not a first class branch, it mainly consists of " +"the\n" +"working tree. This means that any history operations must query the master\n" +"branch, which could be slow if a network connection is involved. Also, as " +"you\n" +"don't have a local branch, then you cannot commit locally." +msgstr "" + +#: dummy/help_topics/checkouts/detail.txt:39 +msgid "" +"Lightweight checkouts work best when you have fast reliable access to the\n" +"master branch. This means that if the master branch is on the same disk or " +"LAN\n" +"a lightweight checkout will be faster than a heavyweight one for any " +"commands\n" +"that modify the revision history (as only one copy of the branch needs to\n" +"be updated). Heavyweight checkouts will generally be faster for any command\n" +"that uses the history but does not change it, but if the master branch is " +"on\n" +"the same disk then there won't be a noticeable difference." +msgstr "" + +#: dummy/help_topics/checkouts/detail.txt:47 +msgid "" +"Another possible use for a checkout is to use it with a treeless repository\n" +"containing your branches, where you maintain only one working tree by\n" +"switching the master branch that the checkout points to when you want to\n" +"work on a different branch." +msgstr "" + +#: dummy/help_topics/checkouts/detail.txt:52 +msgid "" +"Obviously to commit on a checkout you need to be able to write to the " +"master\n" +"branch. This means that the master branch must be accessible over a " +"writeable\n" +"protocol , such as sftp://, and that you have write permissions at the " +"other\n" +"end. Checkouts also work on the local file system, so that all that matters " +"is\n" +"file permissions." +msgstr "" + +#: dummy/help_topics/checkouts/detail.txt:58 +msgid "" +"You can change the master of a checkout by using the \"switch\" command " +"(see\n" +"\"help switch\"). This will change the location that the commits are sent " +"to.\n" +"The \"bind\" command can also be used to turn a normal branch into a heavy\n" +"checkout. If you would like to convert your heavy checkout into a normal\n" +"branch so that every commit is local, you can use the \"unbind\" command. To " +"see\n" +"whether or not a branch is bound or not you can use the \"info\" command. If " +"the\n" +"branch is bound it will tell you the location of the bound branch." +msgstr "" + +#: dummy/help_topics/checkouts/detail.txt:68 +msgid "" +" checkout Create a checkout. Pass --lightweight to get a lightweight\n" +" checkout\n" +" update Pull any changes in the master branch in to your checkout\n" +" commit Make a commit that is sent to the master branch. If you have\n" +" a heavy checkout then the --local option will commit to the\n" +" checkout without sending the commit to the master\n" +" switch Change the master branch that the commits in the checkout " +"will\n" +" be sent to\n" +" bind Turn a standalone branch into a heavy checkout so that any\n" +" commits will be sent to the master branch\n" +" unbind Turn a heavy checkout into a standalone branch so that any\n" +" commits are only made locally\n" +" info Displays whether a branch is bound or unbound. If the branch " +"is\n" +" bound, then it will also display the location of the bound " +"branch\n" +msgstr "" + +#: dummy/help_topics/checkouts/summary.txt:1 +msgid "Information on what a checkout is" +msgstr "" + +#: dummy/help_topics/commands/summary.txt:1 +msgid "Basic help for all commands" +msgstr "" + +#: dummy/help_topics/configuration/summary.txt:1 +msgid "Details on the configuration settings available" +msgstr "" + +#: dummy/help_topics/conflict-types/summary.txt:1 +msgid "Types of conflicts and what to do about them" +msgstr "" + +#: dummy/help_topics/content-filters/summary.txt:1 +msgid "Conversion of content into/from working trees" +msgstr "" + +#: dummy/help_topics/criss-cross/detail.txt:1 +msgid "Criss-Cross" +msgstr "" + +#: dummy/help_topics/criss-cross/detail.txt:3 +msgid "" +"A criss-cross in the branch history can cause the default merge technique\n" +"to emit more conflicts than would normally be expected." +msgstr "" + +#: dummy/help_topics/criss-cross/detail.txt:6 +msgid "" +"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may " +"give\n" +"better results. You may wish to ``bzr revert`` the working tree and merge\n" +"again. Alternatively, use ``bzr remerge`` on particular conflicted files." +msgstr "" + +#: dummy/help_topics/criss-cross/detail.txt:10 +msgid "" +"Criss-crosses occur in a branch's history if two branches merge the same " +"thing\n" +"and then merge one another, or if two branches merge one another at the " +"same\n" +"time. They can be avoided by having each branch only merge from or into a\n" +"designated central branch (a \"star topology\")." +msgstr "" + +#: dummy/help_topics/criss-cross/detail.txt:15 +msgid "" +"Criss-crosses cause problems because of the way merge works. Bazaar's " +"default\n" +"merge is a three-way merger; in order to merge OTHER into THIS, it must\n" +"find a basis for comparison, BASE. Using BASE, it can determine whether\n" +"differences between THIS and OTHER are due to one side adding lines, or\n" +"from another side removing lines." +msgstr "" + +#: dummy/help_topics/criss-cross/detail.txt:21 +msgid "" +"Criss-crosses mean there is no good choice for a base. Selecting the " +"recent\n" +"merge points could cause one side's changes to be silently discarded.\n" +"Selecting older merge points (which Bazaar does) mean that extra conflicts\n" +"are emitted." +msgstr "" + +#: dummy/help_topics/criss-cross/detail.txt:26 +msgid "" +"The ``weave`` merge type is not affected by this problem because it uses\n" +"line-origin detection instead of a basis revision to determine the cause of\n" +"differences.\n" +msgstr "" + +#: dummy/help_topics/criss-cross/summary.txt:1 +msgid "Information on criss-cross merging" +msgstr "" + +#: dummy/help_topics/current-formats/summary.txt:1 +msgid "Current storage formats" +msgstr "" + +#: dummy/help_topics/debug-flags/summary.txt:1 +msgid "Options to show or record debug information" +msgstr "" + +#: dummy/help_topics/diverged-branches/summary.txt:1 +msgid "How to fix diverged branches" +msgstr "" + +#: en/help_topics/env-variables.txt:1 +msgid "Environment Variables" +msgstr "" + +#: en/help_topics/env-variables.txt:3 +msgid "" +"=================== " +"===========================================================\n" +"BZRPATH Path where bzr is to look for shell plugin external\n" +" commands.\n" +"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n" +"EMAIL E-Mail address of the user.\n" +"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n" +"EDITOR Editor for editing commit messages.\n" +"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n" +"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n" +"BZR_PLUGINS_AT Plugins to load from a directory not in " +"BZR_PLUGIN_PATH.\n" +"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n" +"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA " +"and\n" +" HOME.\n" +"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// " +"URLs).\n" +"BZR_SSH Path to SSH client, or one of paramiko, openssh, " +"sshcorp,\n" +" plink or lsh.\n" +"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n" +"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n" +"BZR_COLUMNS Override implicit terminal width.\n" +"BZR_CONCURRENCY Number of processes that can be run concurrently " +"(selftest)\n" +"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or " +"'text'.\n" +"BZR_PDB Control whether to launch a debugger on error.\n" +"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n" +" breakin debugger.\n" +"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based " +"(instead\n" +" of char-based).\n" +"=================== " +"===========================================================\n" +msgstr "" + +#: dummy/help_topics/env-variables/summary.txt:1 +msgid "Environment variable names and values" +msgstr "" + +#: dummy/help_topics/eol/summary.txt:1 +msgid "Information on end-of-line handling" +msgstr "" + +#: dummy/help_topics/files/detail.txt:1 +msgid "Files" +msgstr "" + +#: dummy/help_topics/files/detail.txt:3 +msgid "" +":On Unix: ~/.bazaar/bazaar.conf\n" +":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\" +"bazaar\\\\2.0\\\\bazaar.conf" +msgstr "" + +#: dummy/help_topics/files/detail.txt:6 +msgid "" +"Contains the user's default configuration. The section ``[DEFAULT]`` is\n" +"used to define general configuration that will be applied everywhere.\n" +"The section ``[ALIASES]`` can be used to create command aliases for\n" +"commonly used options." +msgstr "" + +#: dummy/help_topics/files/detail.txt:11 +msgid "A typical config file might look something like::" +msgstr "" + +#: dummy/help_topics/files/detail.txt:13 +msgid "" +" [DEFAULT]\n" +" email=John Doe " +msgstr "" + +#: dummy/help_topics/files/detail.txt:16 +msgid "" +" [ALIASES]\n" +" commit = commit --strict\n" +" log10 = log --short -r -10..-1\n" +msgstr "" + +#: dummy/help_topics/files/summary.txt:1 +msgid "Information on configuration and log files" +msgstr "" + +#: dummy/help_topics/formats/detail.txt:1 +msgid "Storage Formats" +msgstr "" + +#: dummy/help_topics/formats/detail.txt:3 +msgid "" +"To ensure that older clients do not access data incorrectly,\n" +"Bazaar's policy is to introduce a new storage format whenever\n" +"new features requiring new metadata are added. New storage\n" +"formats may also be introduced to improve performance and\n" +"scalability." +msgstr "" + +#: dummy/help_topics/formats/detail.txt:9 +msgid "" +"The newest format, 2a, is highly recommended. If your\n" +"project is not using 2a, then you should suggest to the\n" +"project owner to upgrade." +msgstr "" + +#: dummy/help_topics/formats/detail.txt:13 +msgid "" +"\n" +".. note::" +msgstr "" + +#: dummy/help_topics/formats/detail.txt:16 +msgid "" +" Some of the older formats have two variants:\n" +" a plain one and a rich-root one. The latter include an additional\n" +" field about the root of the tree. There is no performance cost\n" +" for using a rich-root format but you cannot easily merge changes\n" +" from a rich-root format into a plain format. As a consequence,\n" +" moving a project to a rich-root format takes some co-ordination\n" +" in that all contributors need to upgrade their repositories\n" +" around the same time. 2a and all future formats will be\n" +" implicitly rich-root." +msgstr "" + +#: dummy/help_topics/formats/detail.txt:26 +msgid "" +"See :doc:`current-formats-help` for the complete list of\n" +"currently supported formats. See :doc:`other-formats-help` for\n" +"descriptions of any available experimental and deprecated formats.\n" +msgstr "" + +#: dummy/help_topics/formats/summary.txt:1 +msgid "Information on choosing a storage format" +msgstr "" + +#: dummy/help_topics/global-options/detail.txt:1 +msgid "Global Options" +msgstr "" + +#: dummy/help_topics/global-options/detail.txt:3 +msgid "" +"These options may be used with any command, and may appear in front of any\n" +"command. (e.g. ``bzr --profile help``)." +msgstr "" + +#: dummy/help_topics/global-options/detail.txt:6 +msgid "" +"--version Print the version number. Must be supplied before the " +"command.\n" +"--no-aliases Do not process command aliases when running this command.\n" +"--builtin Use the built-in version of a command, not the plugin " +"version.\n" +" This does not suppress other plugin effects.\n" +"--no-plugins Do not process any plugins.\n" +"--no-l10n Do not translate messages.\n" +"--concurrency Number of processes that can be run concurrently (selftest)." +msgstr "" + +#: dummy/help_topics/global-options/detail.txt:14 +msgid "" +"--profile Profile execution using the hotshot profiler.\n" +"--lsprof Profile execution using the lsprof profiler.\n" +"--lsprof-file Profile execution using the lsprof profiler, and write the\n" +" results to a specified file. If the filename ends with " +"\".txt\",\n" +" text format will be used. If the filename either starts " +"with\n" +" \"callgrind.out\" or end with \".callgrind\", the output will " +"be\n" +" formatted for use with KCacheGrind. Otherwise, the output\n" +" will be a pickle.\n" +"--coverage Generate line coverage report in the specified directory." +msgstr "" + +#: dummy/help_topics/global-options/detail.txt:24 +msgid "" +"-Oname=value Override the ``name`` config option setting it to ``value`` " +"for\n" +" the duration of the command. This can be used multiple times " +"if\n" +" several options need to be overridden." +msgstr "" + +#: dummy/help_topics/global-options/detail.txt:28 +msgid "" +"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n" +"information on profiling." +msgstr "" + +#: dummy/help_topics/global-options/detail.txt:31 +msgid "" +"A number of debug flags are also available to assist troubleshooting and\n" +"development. See :doc:`debug-flags-help`.\n" +msgstr "" + +#: dummy/help_topics/global-options/summary.txt:1 +msgid "Options that control how Bazaar runs" +msgstr "" + +#: dummy/help_topics/hidden-commands/summary.txt:1 +msgid "All hidden commands" +msgstr "" + +#: dummy/help_topics/hooks/summary.txt:1 +msgid "Points at which custom processing can be added" +msgstr "" + +#: dummy/help_topics/launchpad/detail.txt:1 +msgid "Integration with Launchpad.net" +msgstr "" + +#: dummy/help_topics/launchpad/detail.txt:3 +msgid "" +"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n" +"specification tracking." +msgstr "" + +#: dummy/help_topics/launchpad/detail.txt:6 +msgid "" +"The bzr client (through the plugin called 'launchpad') has special\n" +"features to communicate with Launchpad:" +msgstr "" + +#: dummy/help_topics/launchpad/detail.txt:9 +msgid "" +" * The launchpad-login command tells Bazaar your Launchpad user name. " +"This\n" +" is then used by the 'lp:' transport to download your branches using\n" +" bzr+ssh://." +msgstr "" + +#: dummy/help_topics/launchpad/detail.txt:13 +msgid "" +" * The 'lp:' transport uses Launchpad as a directory service: for " +"example\n" +" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n" +" projects and may be branched, logged, etc. You can also use the 'lp:'\n" +" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk." +msgstr "" + +#: dummy/help_topics/launchpad/detail.txt:18 +msgid "" +" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n" +" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes " +"lp:12345'\n" +" will record a revision property that marks that revision as fixing\n" +" Launchpad bug 12345. When you push that branch to Launchpad it will\n" +" automatically be linked to the bug report." +msgstr "" + +#: dummy/help_topics/launchpad/detail.txt:24 +msgid "" +" * The register-branch command tells Launchpad about the url of a\n" +" public branch. Launchpad will then mirror the branch, display\n" +" its contents and allow it to be attached to bugs and other\n" +" objects." +msgstr "" + +#: dummy/help_topics/launchpad/detail.txt:29 +msgid "For more information see http://help.launchpad.net/\n" +msgstr "" + +#: dummy/help_topics/launchpad/summary.txt:1 +msgid "Using Bazaar with Launchpad.net" +msgstr "" + +#: dummy/help_topics/location-alias/summary.txt:1 +msgid "Aliases for remembered locations" +msgstr "" + +#: dummy/help_topics/log-formats/summary.txt:1 +msgid "Details on the logging formats available" +msgstr "" + +#: dummy/help_topics/other-formats/summary.txt:1 +msgid "Experimental and deprecated storage formats" +msgstr "" + +#: dummy/help_topics/patterns/summary.txt:1 +msgid "Information on the pattern syntax" +msgstr "" + +#: dummy/help_topics/repositories/detail.txt:1 +msgid "Repositories" +msgstr "" + +#: dummy/help_topics/repositories/detail.txt:3 +msgid "" +"Repositories in Bazaar are where committed information is stored. There is\n" +"a repository associated with every branch." +msgstr "" + +#: dummy/help_topics/repositories/detail.txt:6 +msgid "" +"Repositories are a form of database. Bzr will usually maintain this for\n" +"good performance automatically, but in some situations (e.g. when doing\n" +"very many commits in a short time period) you may want to ask bzr to\n" +"optimise the database indices. This can be done by the 'bzr pack' command." +msgstr "" + +#: dummy/help_topics/repositories/detail.txt:11 +msgid "" +"By default just running 'bzr init' will create a repository within the new\n" +"branch but it is possible to create a shared repository which allows " +"multiple\n" +"branches to share their information in the same location. When a new branch " +"is\n" +"created it will first look to see if there is a containing shared repository " +"it\n" +"can use." +msgstr "" + +#: dummy/help_topics/repositories/detail.txt:17 +msgid "" +"When two branches of the same project share a repository, there is\n" +"generally a large space saving. For some operations (e.g. branching\n" +"within the repository) this translates in to a large time saving." +msgstr "" + +#: dummy/help_topics/repositories/detail.txt:21 +msgid "" +"To create a shared repository use the init-repository command (or the alias\n" +"init-repo). This command takes the location of the repository to create. " +"This\n" +"means that 'bzr init-repository repo' will create a directory named 'repo',\n" +"which contains a shared repository. Any new branches that are created in " +"this\n" +"directory will then use it for storage." +msgstr "" + +#: dummy/help_topics/repositories/detail.txt:27 +msgid "" +"It is a good idea to create a repository whenever you might create more\n" +"than one branch of a project. This is true for both working areas where you\n" +"are doing the development, and any server areas that you use for hosting\n" +"projects. In the latter case, it is common to want branches without working\n" +"trees. Since the files in the branch will not be edited directly there is " +"no\n" +"need to use up disk space for a working tree. To create a repository in " +"which\n" +"the branches will not have working trees pass the '--no-trees' option to\n" +"'init-repository'." +msgstr "" + +#: dummy/help_topics/repositories/detail.txt:38 +msgid "" +" init-repository Create a shared repository. Use --no-trees to create " +"one\n" +" in which new branches won't get a working tree.\n" +msgstr "" + +#: dummy/help_topics/repositories/summary.txt:1 +msgid "Basic information on shared repositories." +msgstr "" + +#: dummy/help_topics/revisionspec/summary.txt:1 +msgid "Explain how to use --revision" +msgstr "" + +#: dummy/help_topics/rules/summary.txt:1 +msgid "Information on defining rule-based preferences" +msgstr "" + +#: dummy/help_topics/standalone-trees/detail.txt:1 +msgid "Standalone Trees" +msgstr "" + +#: dummy/help_topics/standalone-trees/detail.txt:3 +msgid "" +"A standalone tree is a working tree with an associated repository. It\n" +"is an independently usable branch, with no dependencies on any other.\n" +"Creating a standalone tree (via bzr init) is the quickest way to put\n" +"an existing project under version control." +msgstr "" + +#: dummy/help_topics/standalone-trees/detail.txt:8 +msgid "Related Commands::" +msgstr "" + +#: dummy/help_topics/standalone-trees/detail.txt:10 +msgid " init Make a directory into a versioned branch.\n" +msgstr "" + +#: dummy/help_topics/standalone-trees/summary.txt:1 +msgid "Information on what a standalone tree is" +msgstr "" + +#: dummy/help_topics/standard-options/detail.txt:1 +msgid "Standard Options" +msgstr "" + +#: dummy/help_topics/standard-options/detail.txt:3 +msgid "Standard options are legal for all commands." +msgstr "" + +#: dummy/help_topics/standard-options/detail.txt:5 +msgid "" +"--help, -h Show help message.\n" +"--verbose, -v Display more information.\n" +"--quiet, -q Only display errors and warnings." +msgstr "" + +#: dummy/help_topics/standard-options/detail.txt:9 +msgid "Unlike global options, standard options can be used in aliases.\n" +msgstr "" + +#: dummy/help_topics/standard-options/summary.txt:1 +msgid "Options that can be used with any command" +msgstr "" + +#: dummy/help_topics/status-flags/detail.txt:1 +msgid "Status Flags" +msgstr "" + +#: dummy/help_topics/status-flags/detail.txt:3 +msgid "" +"Status flags are used to summarise changes to the working tree in a concise\n" +"manner. They are in the form::" +msgstr "" + +#: dummy/help_topics/status-flags/detail.txt:6 +msgid " xxx " +msgstr "" + +#: dummy/help_topics/status-flags/detail.txt:8 +msgid "where the columns' meanings are as follows." +msgstr "" + +#: dummy/help_topics/status-flags/detail.txt:10 +msgid "Column 1 - versioning/renames::" +msgstr "" + +#: dummy/help_topics/status-flags/detail.txt:12 +msgid "" +" + File versioned\n" +" - File unversioned\n" +" R File renamed\n" +" ? File unknown\n" +" X File nonexistent (and unknown to bzr)\n" +" C File has conflicts\n" +" P Entry for a pending merge (not a file)" +msgstr "" + +#: dummy/help_topics/status-flags/detail.txt:20 +msgid "Column 2 - contents::" +msgstr "" + +#: dummy/help_topics/status-flags/detail.txt:22 +msgid "" +" N File created\n" +" D File deleted\n" +" K File kind changed\n" +" M File modified" +msgstr "" + +#: dummy/help_topics/status-flags/detail.txt:27 +msgid "Column 3 - execute::" +msgstr "" + +#: dummy/help_topics/status-flags/detail.txt:29 +msgid " * The execute bit was changed\n" +msgstr "" + +#: dummy/help_topics/status-flags/summary.txt:1 +msgid "Help on status flags" +msgstr "" + +#: dummy/help_topics/sync-for-reconfigure/detail.txt:1 +msgid "Branches Out of Sync" +msgstr "" + +#: dummy/help_topics/sync-for-reconfigure/detail.txt:3 +msgid "" +"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n" +"a local branch must be destroyed. (For checkouts, this is the local branch\n" +"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n" +"have the same last revision as the new reference branch for the lightweight\n" +"checkout, data could be lost, so Bazaar refuses." +msgstr "" + +#: dummy/help_topics/sync-for-reconfigure/detail.txt:9 +msgid "How you deal with this depends on *why* the branches are out of sync." +msgstr "" + +#: dummy/help_topics/sync-for-reconfigure/detail.txt:11 +msgid "" +"If you have a checkout and have done local commits, you can get back in " +"sync\n" +"by running \"bzr update\" (and possibly \"bzr commit\")." +msgstr "" + +#: dummy/help_topics/sync-for-reconfigure/detail.txt:14 +msgid "" +"If you have a branch and the remote branch is out-of-date, you can push\n" +"the local changes using \"bzr push\". If the local branch is out of date, " +"you\n" +"can do \"bzr pull\". If both branches have had changes, you can merge, " +"commit\n" +"and then push your changes. If you decide that some of the changes aren't\n" +"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n" +msgstr "" + +#: dummy/help_topics/sync-for-reconfigure/summary.txt:1 +msgid "Steps to resolve \"out-of-sync\" when reconfiguring" +msgstr "" + +#: dummy/help_topics/topics/summary.txt:1 +msgid "Topics list" +msgstr "" + +#: dummy/help_topics/url-special-chars/summary.txt:1 +msgid "Special character handling in URLs" +msgstr "" + +#: dummy/help_topics/urlspec/summary.txt:1 +msgid "Supported transport protocols" +msgstr "" + +#: dummy/help_topics/working-trees/detail.txt:1 +msgid "Working Trees" +msgstr "" + +#: dummy/help_topics/working-trees/detail.txt:3 +msgid "" +"A working tree is the contents of a branch placed on disk so that you can\n" +"see the files and edit them. The working tree is where you make changes to " +"a\n" +"branch, and when you commit the current state of the working tree is the\n" +"snapshot that is recorded in the commit." +msgstr "" + +#: dummy/help_topics/working-trees/detail.txt:8 +msgid "" +"When you push a branch to a remote system, a working tree will not be\n" +"created. If one is already present the files will not be updated. The\n" +"branch information will be updated and the working tree will be marked\n" +"as out-of-date. Updating a working tree remotely is difficult, as there\n" +"may be uncommitted changes or the update may cause content conflicts that " +"are\n" +"difficult to deal with remotely." +msgstr "" + +#: dummy/help_topics/working-trees/detail.txt:15 +msgid "" +"If you have a branch with no working tree you can use the 'checkout' " +"command\n" +"to create a working tree. If you run 'bzr checkout .' from the branch it " +"will\n" +"create the working tree. If the branch is updated remotely, you can update " +"the\n" +"working tree by running 'bzr update' in that directory." +msgstr "" + +#: dummy/help_topics/working-trees/detail.txt:20 +msgid "" +"If you have a branch with a working tree that you do not want the 'remove-" +"tree'\n" +"command will remove the tree if it is safe. This can be done to avoid the\n" +"warning about the remote working tree not being updated when pushing to the\n" +"branch. It can also be useful when working with a '--no-trees' repository\n" +"(see 'bzr help repositories')." +msgstr "" + +#: dummy/help_topics/working-trees/detail.txt:26 +msgid "" +"If you want to have a working tree on a remote machine that you push to you\n" +"can either run 'bzr update' in the remote branch after each push, or use " +"some\n" +"other method to update the tree during the push. There is an 'rspush' " +"plugin\n" +"that will update the working tree using rsync as well as doing a push. " +"There\n" +"is also a 'push-and-update' plugin that automates running 'bzr update' via " +"SSH\n" +"after each push." +msgstr "" + +#: dummy/help_topics/working-trees/detail.txt:33 +msgid "Useful commands::" +msgstr "" + +#: dummy/help_topics/working-trees/detail.txt:35 +msgid "" +" checkout Create a working tree when a branch does not have one.\n" +" remove-tree Removes the working tree from a branch when it is safe to do " +"so.\n" +" update When a working tree is out of sync with its associated " +"branch\n" +" this will update the tree to match the branch.\n" +msgstr "" + +#: dummy/help_topics/working-trees/summary.txt:1 +msgid "Information on working trees" +msgstr "" + +#: en/help_topics/authentication.txt:1 +msgid "" +"Authentication Settings\n" +"=======================" +msgstr "" + +#: en/help_topics/authentication.txt:4 +msgid "" +"\n" +"Intent\n" +"------" +msgstr "" + +#: en/help_topics/authentication.txt:8 +msgid "" +"Many different authentication policies can be described in the\n" +"``authentication.conf`` file but a particular user should need only a few\n" +"definitions to cover his needs without having to specify a user and a " +"password\n" +"for every branch he uses." +msgstr "" + +#: en/help_topics/authentication.txt:13 +msgid "" +"The definitions found in this file are used to find the credentials to use " +"for\n" +"a given url. The same credentials can generally be used for as many branches " +"as\n" +"possible by grouping their declaration around the remote servers that need\n" +"them. It's even possible to declare credentials that will be used by " +"different\n" +"servers." +msgstr "" + +#: en/help_topics/authentication.txt:19 +msgid "" +"The intent is to make this file as small as possible to minimize maintenance." +msgstr "" + +#: en/help_topics/authentication.txt:21 +msgid "" +"Once the relevant credentials are declared in this file you may use branch " +"urls\n" +"without embedding passwords (security hazard) or even users (enabling " +"sharing\n" +"of your urls with others)." +msgstr "" + +#: en/help_topics/authentication.txt:25 +msgid "Instead of using::" +msgstr "" + +#: en/help_topics/authentication.txt:27 +msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch" +msgstr "" + +#: en/help_topics/authentication.txt:29 +msgid "you simply use::" +msgstr "" + +#: en/help_topics/authentication.txt:31 +msgid " bzr branch ftp://host.com/path/to/my/branch" +msgstr "" + +#: en/help_topics/authentication.txt:33 +msgid "" +"provided you have created the following ``authentication.conf`` file::" +msgstr "" + +#: en/help_topics/authentication.txt:35 +msgid "" +" [myprojects]\n" +" scheme=ftp\n" +" host=host.com\n" +" user=joe\n" +" password=secret\n" +" " +msgstr "" + +#: en/help_topics/authentication.txt:42 +msgid "" +"Authentication definitions\n" +"--------------------------" +msgstr "" + +#: en/help_topics/authentication.txt:45 +msgid "" +"There are two kinds of authentication used by the various schemes supported " +"by\n" +"bzr:" +msgstr "" + +#: en/help_topics/authentication.txt:48 +msgid "1. user and password" +msgstr "" + +#: en/help_topics/authentication.txt:50 +msgid "" +"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n" +"``SFTP`` can use either a password or a host key to authenticate. However,\n" +"ssh agents are a better, more secure solution. So we have chosen to not " +"provide\n" +"our own less secure method." +msgstr "" + +#: en/help_topics/authentication.txt:55 +msgid "2. user, realm and password" +msgstr "" + +#: en/help_topics/authentication.txt:57 +msgid "" +"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n" +"against a host. But, by using ``.htaccess`` files, for example, it is " +"possible\n" +"to define several (``user, realm, password``) for a given ``host``. So what " +"is\n" +"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` " +"is\n" +"not taken into account in the definitions, but will displayed if bzr " +"prompts\n" +"you for a password." +msgstr "" + +#: en/help_topics/authentication.txt:64 +msgid "" +"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n" +"specifying the appropriate port." +msgstr "" + +#: en/help_topics/authentication.txt:67 +msgid "" +"To take all schemes into account, the password will be deduced from a set " +"of\n" +"authentication definitions (``scheme``, ``host``, ``port``, ``path``, " +"``user``,\n" +"``password``)." +msgstr "" + +#: en/help_topics/authentication.txt:71 +msgid "" +" * ``scheme``: can be empty (meaning the rest of the definition can be " +"used\n" +" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, " +"``ssh``\n" +" should be used instead since this is the real scheme regarding\n" +" authentication," +msgstr "" + +#: en/help_topics/authentication.txt:76 +msgid " * ``host``: can be empty (to act as a default for any host)," +msgstr "" + +#: en/help_topics/authentication.txt:78 +msgid "" +" * ``port`` can be empty (useful when an host provides several servers for " +"the\n" +" same scheme), only numerical values are allowed, this should be used " +"only\n" +" when the server uses a port different than the scheme standard port," +msgstr "" + +#: en/help_topics/authentication.txt:82 +msgid " * ``path``: can be empty (FTP or SFTP will never user it)," +msgstr "" + +#: en/help_topics/authentication.txt:84 +msgid "" +" * ``user``: can be empty (``bzr`` will defaults to python's\n" +" ``getpass.get_user()``)," +msgstr "" + +#: en/help_topics/authentication.txt:87 +msgid "" +" * ``password``: can be empty if you prefer to always be prompted for your\n" +" password." +msgstr "" + +#: en/help_topics/authentication.txt:90 +msgid "" +"Multiple definitions can be provided and, for a given URL, bzr will select " +"a\n" +"(``user`` [, ``password``]) based on the following rules :" +msgstr "" + +#: en/help_topics/authentication.txt:93 +msgid " 1. the first match wins," +msgstr "" + +#: en/help_topics/authentication.txt:95 +msgid " 2. empty fields match everything," +msgstr "" + +#: en/help_topics/authentication.txt:97 +msgid "" +" 3. ``scheme`` matches even if decorators are used in the requested URL," +msgstr "" + +#: en/help_topics/authentication.txt:99 +msgid "" +" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n" +" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but " +"``projectbzr.sf.net``\n" +" will not match ``bzr.sf.net``)." +msgstr "" + +#: en/help_topics/authentication.txt:103 +msgid "" +" 5. ``port`` matches if included in the requested URL (exact matches only)" +msgstr "" + +#: en/help_topics/authentication.txt:105 +msgid "" +" 6. ``path`` matches if included in the requested URL (and by rule #2 " +"above,\n" +" empty paths will match any provided path)." +msgstr "" + +#: en/help_topics/authentication.txt:110 +msgid "" +"File format\n" +"-----------" +msgstr "" + +#: en/help_topics/authentication.txt:113 +msgid "" +"The general rules for :doc:`configuration files `\n" +"apply except for the variable policies." +msgstr "" + +#: en/help_topics/authentication.txt:116 +msgid "Each section describes an authentication definition." +msgstr "" + +#: en/help_topics/authentication.txt:118 +msgid "" +"The section name is an arbitrary string, only the ``DEFAULT`` value is " +"reserved\n" +"and should appear as the *last* section." +msgstr "" + +#: en/help_topics/authentication.txt:121 +msgid "Each section should define:" +msgstr "" + +#: en/help_topics/authentication.txt:123 +msgid "* ``user``: the login to be used," +msgstr "" + +#: en/help_topics/authentication.txt:125 +msgid "Each section could define:" +msgstr "" + +#: en/help_topics/authentication.txt:127 +msgid "* ``host``: the remote server," +msgstr "" + +#: en/help_topics/authentication.txt:129 +msgid "* ``port``: the port the server is listening," +msgstr "" + +#: en/help_topics/authentication.txt:131 +msgid "* ``path``: the branch location," +msgstr "" + +#: en/help_topics/authentication.txt:133 +msgid "* ``password``: the password." +msgstr "" + +#: en/help_topics/authentication.txt:135 +msgid "" +"\n" +"Examples\n" +"--------" +msgstr "" + +#: en/help_topics/authentication.txt:139 +msgid "" +"\n" +"Personal projects hosted outside\n" +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/authentication.txt:143 +msgid "" +"All connections are done with the same ``user`` (the remote one for which " +"the\n" +"default bzr one is not appropriate) and the password is always prompted " +"with\n" +"some exceptions::" +msgstr "" + +#: en/help_topics/authentication.txt:147 +msgid "" +" # Pet projects on hobby.net\n" +" [hobby]\n" +" host=r.hobby.net\n" +" user=jim\n" +" password=obvious1234\n" +" \n" +" # Home server\n" +" [home]\n" +" scheme=https\n" +" host=home.net\n" +" user=joe\n" +" password=1essobV10us\n" +" \n" +" [DEFAULT]\n" +" # Our local user is barbaz, on all remote sites we're known as " +"foobar\n" +" user=foobar" +msgstr "" + +#: en/help_topics/authentication.txt:164 +msgid "" +"\n" +"Source hosting provider\n" +"~~~~~~~~~~~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/authentication.txt:168 +msgid "In the shp.net (fictitious) domain, each project has its own site::" +msgstr "" + +#: en/help_topics/authentication.txt:170 +msgid "" +" [shpnet domain]\n" +" # we use sftp, but ssh is the scheme used for authentication\n" +" scheme=ssh\n" +" # The leading '.' ensures that 'shp.net' alone doesn't match\n" +" host=.shp.net\n" +" user=joe\n" +" # bzr don't support supplying a password for sftp,\n" +" # consider using an ssh agent if you don't want to supply\n" +" # a password interactively. (pageant, ssh-agent, etc)" +msgstr "" + +#: en/help_topics/authentication.txt:180 +msgid "" +"HTTPS, SFTP servers and their proxy\n" +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/authentication.txt:183 +msgid "" +"At company.com, the server hosting release and integration branches is " +"behind a\n" +"proxy, and the two branches use different authentication policies::" +msgstr "" + +#: en/help_topics/authentication.txt:186 +msgid "" +" [reference code]\n" +" scheme=https\n" +" host=dev.company.com\n" +" path=/dev\n" +" user=user1\n" +" password=pass1" +msgstr "" + +#: en/help_topics/authentication.txt:193 +msgid "" +" # development branches on dev server\n" +" [dev]\n" +" scheme=ssh # bzr+ssh and sftp are available here\n" +" host=dev.company.com\n" +" path=/dev/integration\n" +" user=user2\n" +" \n" +" # proxy\n" +" [proxy]\n" +" scheme=http\n" +" host=proxy.company.com\n" +" port=3128\n" +" user=proxyuser1\n" +" password=proxypass1" +msgstr "" + +#: en/help_topics/authentication.txt:208 +msgid "" +"\n" +"Planned enhancements\n" +"--------------------" +msgstr "" + +#: en/help_topics/authentication.txt:212 +msgid "" +"The following are not yet implemented but planned as parts of a work in\n" +"progress:" +msgstr "" + +#: en/help_topics/authentication.txt:215 +msgid "* add a ``password_encoding`` field allowing:" +msgstr "" + +#: en/help_topics/authentication.txt:217 +msgid "" +" - storing the passwords in various obfuscating encodings (base64 for one)," +msgstr "" + +#: en/help_topics/authentication.txt:219 +msgid " - delegate password storage to plugins (.netrc for example)." +msgstr "" + +#: en/help_topics/authentication.txt:221 +msgid "" +"* update the credentials when the user is prompted for user or password," +msgstr "" + +#: en/help_topics/authentication.txt:223 +msgid "* add a ``verify_certificates`` field for ``HTTPS``." +msgstr "" + +#: en/help_topics/authentication.txt:225 +msgid "" +"The ``password_encoding`` and ``verify_certificates`` fields are recognized " +"but\n" +"ignored in the actual implementation.\n" +msgstr "" + +#: en/help_topics/bugs.txt:1 +msgid "Bug Tracker Settings" +msgstr "" + +#: en/help_topics/bugs.txt:3 +msgid "" +"When making a commit, metadata about bugs fixed by that change can be\n" +"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n" +"entry is included in the 'bugs' revision property stating ' '.\n" +"(The only ``status`` value currently supported is ``fixed.``)" +msgstr "" + +#: en/help_topics/bugs.txt:8 +msgid "" +"The ``--fixes`` option allows you to specify a bug tracker and a bug " +"identifier\n" +"rather than a full URL. This looks like::" +msgstr "" + +#: en/help_topics/bugs.txt:11 +msgid " bzr commit --fixes :" +msgstr "" + +#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:410 +msgid "or::" +msgstr "" + +#: en/help_topics/bugs.txt:15 +msgid " bzr commit --fixes " +msgstr "" + +#: en/help_topics/bugs.txt:17 +msgid "" +"where \"\" is an identifier for the bug tracker, and \"\" is " +"the\n" +"identifier for that bug within the bugtracker, usually the bug number.\n" +"If \"\" is not specified the ``bugtracker`` set in the branch\n" +"or global configuration is used." +msgstr "" + +#: en/help_topics/bugs.txt:22 +msgid "" +"Bazaar knows about a few bug trackers that have many users. If\n" +"you use one of these bug trackers then there is no setup required to\n" +"use this feature, you just need to know the tracker identifier to use.\n" +"These are the bugtrackers that are built in:" +msgstr "" + +#: en/help_topics/bugs.txt:27 +msgid "" +" ============================ ============ ============\n" +" URL Abbreviation Example\n" +" ============================ ============ ============\n" +" https://bugs.launchpad.net/ lp lp:12345\n" +" http://bugs.debian.org/ deb deb:12345\n" +" http://bugzilla.gnome.org/ gnome gnome:12345\n" +" ============================ ============ ============" +msgstr "" + +#: en/help_topics/bugs.txt:35 +msgid "" +"For the bug trackers not listed above configuration is required.\n" +"Support for generating the URLs for any project using Bugzilla or Trac\n" +"is built in, along with a template mechanism for other bugtrackers with\n" +"simple URL schemes. If your bug tracker can't be described by one\n" +"of the schemes described below then you can write a plugin to support\n" +"it." +msgstr "" + +#: en/help_topics/bugs.txt:42 +msgid "" +"If you use Bugzilla or Trac, then you only need to set a configuration\n" +"variable which contains the base URL of the bug tracker. These options\n" +"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n" +"configuration section in ``locations.conf``. You can set up these values\n" +"for each of the projects you work on." +msgstr "" + +#: en/help_topics/bugs.txt:48 +msgid "" +"Note: As you provide a short name for each tracker, you can specify one or\n" +"more bugs in one or more trackers at commit time if you wish." +msgstr "" + +#: en/help_topics/bugs.txt:51 +msgid "" +"Launchpad\n" +"---------" +msgstr "" + +#: en/help_topics/bugs.txt:54 +msgid "" +"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2." +msgstr "" + +#: en/help_topics/bugs.txt:56 +msgid "" +"bugzilla__url\n" +"----------------------" +msgstr "" + +#: en/help_topics/bugs.txt:59 +msgid "" +"If present, the location of the Bugzilla bug tracker referred to by\n" +". This option can then be used together with ``bzr commit\n" +"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n" +"example::" +msgstr "" + +#: en/help_topics/bugs.txt:64 +msgid " bugzilla_squid_url = http://bugs.squid-cache.org" +msgstr "" + +#: en/help_topics/bugs.txt:66 +msgid "" +"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n" +"fixed." +msgstr "" + +#: en/help_topics/bugs.txt:69 +msgid "" +"trac__url\n" +"------------------" +msgstr "" + +#: en/help_topics/bugs.txt:72 +msgid "" +"If present, the location of the Trac instance referred to by\n" +". This option can then be used together with ``bzr commit\n" +"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n" +"example::" +msgstr "" + +#: en/help_topics/bugs.txt:77 +msgid " trac_twisted_url = http://www.twistedmatrix.com/trac" +msgstr "" + +#: en/help_topics/bugs.txt:79 +msgid "" +"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 " +"as\n" +"fixed." +msgstr "" + +#: en/help_topics/bugs.txt:82 +msgid "" +"bugtracker__url\n" +"------------------------" +msgstr "" + +#: en/help_topics/bugs.txt:85 +msgid "" +"If present, the location of a generic bug tracker instance referred to by\n" +". The location must contain an ``{id}`` placeholder,\n" +"which will be replaced by a specific bug ID. This option can then be used\n" +"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n" +"fixed by that commit. For example::" +msgstr "" + +#: en/help_topics/bugs.txt:91 +msgid " bugtracker_python_url = http://bugs.python.org/issue{id}" +msgstr "" + +#: en/help_topics/bugs.txt:93 +msgid "" +"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n" +"Roundup bug tracker as fixed, or::" +msgstr "" + +#: en/help_topics/bugs.txt:96 +msgid "" +" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}" +msgstr "" + +#: en/help_topics/bugs.txt:98 +msgid "" +"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n" +"RT bug tracker as fixed, or::" +msgstr "" + +#: en/help_topics/bugs.txt:101 +msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}" +msgstr "" + +#: en/help_topics/bugs.txt:103 +msgid "" +"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-" +"1234\n" +"in Hudson's JIRA bug tracker as fixed.\n" +msgstr "" + +#: en/help_topics/commands.txt:1 +msgid "" +"add Add specified files or directories.\n" +"alias Set/unset and display aliases.\n" +"annotate Show the origin of each line in a file.\n" +"bash-completion Generate a shell function for bash command line " +"completion.\n" +" [bash_completion]\n" +"bind Convert the current branch into a checkout of the " +"supplied\n" +" branch.\n" +"branch Create a new branch that is a copy of an existing branch.\n" +"branches List the branches available at the current location.\n" +"break-lock Break a dead lock.\n" +"cat Write the contents of a file as of a given revision to\n" +" standard output.\n" +"check Validate working tree structure, branch consistency and\n" +" repository history.\n" +"checkout Create a new checkout of an existing branch.\n" +"clean-tree Remove unwanted files from working tree.\n" +"commit Commit changes into a new revision.\n" +"config Display, set or remove a configuration option.\n" +"conflicts List files with conflicts.\n" +"deleted List files deleted in the working tree.\n" +"diff Show differences in the working tree, between revisions " +"or\n" +" branches.\n" +"dpush Push into a different VCS without any custom bzr " +"metadata.\n" +"export Export current or past revision to a destination directory " +"or\n" +" archive.\n" +"help Show help on a command or other topic.\n" +"ignore Ignore specified files or patterns.\n" +"ignored List ignored files and the patterns that matched them.\n" +"info Show information about a working tree, branch or " +"repository.\n" +"init Make a directory into a versioned branch.\n" +"init-repository Create a shared repository for branches to share storage\n" +" space.\n" +"join Combine a tree into its containing tree.\n" +"launchpad-login Show or set the Launchpad user ID. [launchpad]\n" +"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n" +"launchpad-open Open a Launchpad branch page in your web browser. " +"[launchpad]\n" +"log Show historical log for a branch or subset of a branch.\n" +"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n" +"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n" +"ls List files in a tree.\n" +"merge Perform a three-way merge.\n" +"missing Show unmerged/unpulled revisions between two branches.\n" +"mkdir Create a new versioned directory.\n" +"mv Move or rename a file.\n" +"nick Print or set the branch nickname.\n" +"pack Compress the data within a repository.\n" +"plugins List the installed plugins.\n" +"pull Turn this branch into a mirror of another branch.\n" +"push Update a mirror of this branch.\n" +"reconcile Reconcile bzr metadata in a branch.\n" +"reconfigure Reconfigure the type of a bzr directory.\n" +"register-branch Register a branch with launchpad.net. [launchpad]\n" +"remerge Redo a merge.\n" +"remove Remove files or directories.\n" +"remove-branch Remove a branch.\n" +"remove-tree Remove the working tree from a given branch/checkout.\n" +"renames Show list of renamed files.\n" +"resolve Mark a conflict as resolved.\n" +"revert Revert files to a previous revision.\n" +"revno Show current revision number.\n" +"root Show the tree root directory.\n" +"send Mail or create a merge-directive for submitting changes.\n" +"serve Run the bzr server.\n" +"shelve Temporarily set aside some changes from the current tree.\n" +"sign-my-commits Sign all commits by a given committer.\n" +"split Split a subdirectory of a tree into a separate tree.\n" +"status Display status summary.\n" +"switch Set the branch of a checkout and update.\n" +"tag Create, remove or modify a tag naming a revision.\n" +"tags List tags.\n" +"testament Show testament (signing-form) of a revision.\n" +"unbind Convert the current checkout into a regular branch.\n" +"uncommit Remove the last committed revision.\n" +"unshelve Restore shelved changes.\n" +"update Update a working tree to a new revision.\n" +"upgrade Upgrade a repository, branch or working tree to a newer\n" +" format.\n" +"verify-signatures Verify all commit signatures.\n" +"version Show version of bzr.\n" +"version-info Show version information about this tree.\n" +"view Manage filtered views.\n" +"whoami Show or set bzr user id.\n" +msgstr "" + +#: en/help_topics/configuration.txt:1 +msgid "" +"Configuration Settings\n" +"=======================" +msgstr "" + +#: en/help_topics/configuration.txt:4 +msgid "" +"Environment settings\n" +"---------------------" +msgstr "" + +#: en/help_topics/configuration.txt:7 +msgid "" +"While most configuration is handled by configuration files, some options\n" +"which may be semi-permanent can also be controlled through the environment." +msgstr "" + +#: en/help_topics/configuration.txt:10 +msgid "" +"BZR_EMAIL\n" +"~~~~~~~~~" +msgstr "" + +#: en/help_topics/configuration.txt:13 +msgid "Override the email id used by Bazaar. Typical format::" +msgstr "" + +#: en/help_topics/configuration.txt:15 +msgid " \"John Doe \"" +msgstr "" + +#: en/help_topics/configuration.txt:17 +msgid "See also the ``email`` configuration option." +msgstr "" + +#: en/help_topics/configuration.txt:19 +msgid "" +"BZR_PROGRESS_BAR\n" +"~~~~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/configuration.txt:22 +msgid "" +"Override the progress display. Possible values are \"none\" or \"text\". " +"If\n" +"the value is \"none\" then no progress bar is displayed. The value \"text\" " +"draws\n" +"the ordinary command line progress bar." +msgstr "" + +#: en/help_topics/configuration.txt:26 +msgid "" +"BZR_SIGQUIT_PDB\n" +"~~~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/configuration.txt:29 +msgid "" +"Control whether SIGQUIT behaves normally or invokes a breakin debugger." +msgstr "" + +#: en/help_topics/configuration.txt:31 +msgid "" +"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n" +"* 1 = Invoke breakin debugger (default)" +msgstr "" + +#: en/help_topics/configuration.txt:34 +msgid "" +"BZR_HOME\n" +"~~~~~~~~" +msgstr "" + +#: en/help_topics/configuration.txt:37 +msgid "Override the home directory used by Bazaar." +msgstr "" + +#: en/help_topics/configuration.txt:39 +msgid "" +"BZR_SSH\n" +"~~~~~~~" +msgstr "" + +#: en/help_topics/configuration.txt:42 +msgid "Select a different SSH implementation." +msgstr "" + +#: en/help_topics/configuration.txt:44 +msgid "" +"BZR_PDB\n" +"~~~~~~~" +msgstr "" + +#: en/help_topics/configuration.txt:47 +msgid "Control whether to launch a debugger on error." +msgstr "" + +#: en/help_topics/configuration.txt:49 +msgid "" +"* 0 = Standard behavior\n" +"* 1 = Launch debugger" +msgstr "" + +#: en/help_topics/configuration.txt:52 +msgid "" +"BZR_REMOTE_PATH\n" +"~~~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/configuration.txt:55 +msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol." +msgstr "" + +#: en/help_topics/configuration.txt:57 +msgid "See also the ``bzr_remote_path`` configuration option." +msgstr "" + +#: en/help_topics/configuration.txt:59 +msgid "" +"BZR_EDITOR\n" +"~~~~~~~~~~" +msgstr "" + +#: en/help_topics/configuration.txt:62 +msgid "Path to the editor Bazaar should use for commit messages, etc." +msgstr "" + +#: en/help_topics/configuration.txt:64 +msgid "" +"BZR_LOG\n" +"~~~~~~~" +msgstr "" + +#: en/help_topics/configuration.txt:67 +msgid "" +"Location of the Bazaar log file. You can check the current location by\n" +"running ``bzr version``." +msgstr "" + +#: en/help_topics/configuration.txt:70 +msgid "" +"The log file contains debug information that is useful for diagnosing or\n" +"reporting problems with Bazaar." +msgstr "" + +#: en/help_topics/configuration.txt:73 +msgid "" +"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n" +"will disable logging." +msgstr "" + +#: en/help_topics/configuration.txt:76 +msgid "" +"\n" +"BZR_PLUGIN_PATH\n" +"~~~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/configuration.txt:80 +msgid "" +"The path to the plugins directory that Bazaar should use.\n" +"If not set, Bazaar will search for plugins in:" +msgstr "" + +#: en/help_topics/configuration.txt:83 +msgid "" +"* the user specific plugin directory (containing the ``user`` plugins)," +msgstr "" + +#: en/help_topics/configuration.txt:85 +msgid "* the bzrlib directory (containing the ``core`` plugins)," +msgstr "" + +#: en/help_topics/configuration.txt:87 +msgid "" +"* the site specific plugin directory if applicable (containing\n" +" the ``site`` plugins)." +msgstr "" + +#: en/help_topics/configuration.txt:90 +msgid "" +"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n" +"the way the plugin are searched. " +msgstr "" + +#: en/help_topics/configuration.txt:93 +msgid "" +"As for the ``PATH`` variables, if multiple directories are\n" +"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n" +"platform specific appropriate character (':' on Unix,\n" +"';' on windows)" +msgstr "" + +#: en/help_topics/configuration.txt:98 +msgid "" +"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n" +"in ``user``. However it will continue to search in ``core`` and\n" +"``site`` unless they are explicitly removed." +msgstr "" + +#: en/help_topics/configuration.txt:102 +msgid "" +"If you need to change the order or remove one of these\n" +"directories, you should use special values:" +msgstr "" + +#: en/help_topics/configuration.txt:105 +msgid "" +"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n" +" path from the default values," +msgstr "" + +#: en/help_topics/configuration.txt:108 +msgid "" +"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n" +" before the remaining default values (and also remove it from\n" +" the default values)." +msgstr "" + +#: en/help_topics/configuration.txt:112 +msgid "" +"Note that the special values 'user', 'core' and 'site' should be\n" +"used literally, they will be substituted by the corresponding,\n" +"platform specific, values." +msgstr "" + +#: en/help_topics/configuration.txt:116 +msgid "" +"The examples below use ':' as the separator, windows users\n" +"should use ';'." +msgstr "" + +#: en/help_topics/configuration.txt:119 +msgid "Overriding the default user plugin directory::" +msgstr "" + +#: en/help_topics/configuration.txt:121 +msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'" +msgstr "" + +#: en/help_topics/configuration.txt:123 +msgid "Disabling the site directory while retaining the user directory::" +msgstr "" + +#: en/help_topics/configuration.txt:125 +msgid " BZR_PLUGIN_PATH='-site:+user'" +msgstr "" + +#: en/help_topics/configuration.txt:127 +msgid "Disabling all plugins (better achieved with --no-plugins)::" +msgstr "" + +#: en/help_topics/configuration.txt:129 +msgid " BZR_PLUGIN_PATH='-user:-core:-site'" +msgstr "" + +#: en/help_topics/configuration.txt:131 +msgid "Overriding the default site plugin directory::" +msgstr "" + +#: en/help_topics/configuration.txt:133 +msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user" +msgstr "" + +#: en/help_topics/configuration.txt:135 +msgid "" +"BZR_DISABLE_PLUGINS\n" +"~~~~~~~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/configuration.txt:138 +msgid "" +"Under special circumstances (mostly when trying to diagnose a\n" +"bug), it's better to disable a plugin (or several) rather than\n" +"uninstalling them completely. Such plugins can be specified in\n" +"the ``BZR_DISABLE_PLUGINS`` environment variable." +msgstr "" + +#: en/help_topics/configuration.txt:143 +msgid "" +"In that case, ``bzr`` will stop loading the specified plugins and\n" +"will raise an import error if they are explicitly imported (by\n" +"another plugin that depends on them for example)." +msgstr "" + +#: en/help_topics/configuration.txt:147 +msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::" +msgstr "" + +#: en/help_topics/configuration.txt:149 +msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'" +msgstr "" + +#: en/help_topics/configuration.txt:151 +msgid "" +"BZR_PLUGINS_AT\n" +"~~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/configuration.txt:154 +msgid "" +"When adding a new feature or working on a bug in a plugin,\n" +"developers often need to use a specific version of a given\n" +"plugin. Since python requires that the directory containing the\n" +"code is named like the plugin itself this make it impossible to\n" +"use arbitrary directory names (using a two-level directory scheme\n" +"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n" +"if they don't appear in ``BZR_PLUGIN_PATH`` ." +msgstr "" + +#: en/help_topics/configuration.txt:162 +msgid "" +"Plugins specified in this environment variable takes precedence\n" +"over the ones in ``BZR_PLUGIN_PATH``." +msgstr "" + +#: en/help_topics/configuration.txt:165 +msgid "" +"The variable specified a list of ``plugin_name@plugin path``,\n" +"``plugin_name`` being the name of the plugin as it appears in\n" +"python module paths, ``plugin_path`` being the path to the\n" +"directory containing the plugin code itself\n" +"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n" +"separator, use ';' on windows." +msgstr "" + +#: en/help_topics/configuration.txt:172 +msgid "" +"Example:\n" +"~~~~~~~~" +msgstr "" + +#: en/help_topics/configuration.txt:175 +msgid "" +"Using a specific version of ``myplugin``:\n" +"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``" +msgstr "" + +#: en/help_topics/configuration.txt:178 +msgid "" +"BZRPATH\n" +"~~~~~~~" +msgstr "" + +#: en/help_topics/configuration.txt:181 +msgid "The path where Bazaar should look for shell plugin external commands." +msgstr "" + +#: en/help_topics/configuration.txt:183 +msgid "" +"\n" +"http_proxy, https_proxy\n" +"~~~~~~~~~~~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/configuration.txt:187 +msgid "Specifies the network proxy for outgoing connections, for example::" +msgstr "" + +#: en/help_topics/configuration.txt:189 +msgid "" +" http_proxy=http://proxy.example.com:3128/ \n" +" https_proxy=http://proxy.example.com:3128/" +msgstr "" + +#: en/help_topics/configuration.txt:192 +msgid "" +"\n" +"Configuration files\n" +"-------------------" +msgstr "" + +#: en/help_topics/configuration.txt:196 +msgid "" +"Location\n" +"~~~~~~~~" +msgstr "" + +#: en/help_topics/configuration.txt:199 +msgid "" +"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n" +"``C:\\Documents and Settings\\\\Application Data\\Bazaar\\2.0`` " +"on\n" +"Windows. (You can check the location for your system by using\n" +"``bzr version``.)" +msgstr "" + +#: en/help_topics/configuration.txt:204 +msgid "There are three primary configuration files in this location:" +msgstr "" + +#: en/help_topics/configuration.txt:206 +msgid "* ``bazaar.conf`` describes default configuration options," +msgstr "" + +#: en/help_topics/configuration.txt:208 +msgid "" +"* ``locations.conf`` describes configuration information for\n" +" specific branch locations," +msgstr "" + +#: en/help_topics/configuration.txt:211 +msgid "" +"* ``authentication.conf`` describes credential information for\n" +" remote servers." +msgstr "" + +#: en/help_topics/configuration.txt:214 +msgid "" +"Each branch can also contain a configuration file that sets values specific\n" +"to that branch. This file is found at ``.bzr/branch/branch.conf`` within " +"the\n" +"branch. This file is visible to all users of a branch, if you wish to " +"override\n" +"one of the values for a branch with a setting that is specific to you then " +"you\n" +"can do so in ``locations.conf``." +msgstr "" + +#: en/help_topics/configuration.txt:220 +msgid "" +"General format\n" +"~~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/configuration.txt:223 +msgid "" +"An ini file has three types of contructs: section headers, section\n" +"options and comments." +msgstr "" + +#: en/help_topics/configuration.txt:226 +msgid "" +"Comments\n" +"^^^^^^^^" +msgstr "" + +#: en/help_topics/configuration.txt:229 +msgid "" +"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n" +"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n" +"Bazaar when parsing ini files." +msgstr "" + +#: en/help_topics/configuration.txt:233 +msgid "" +"Section headers\n" +"^^^^^^^^^^^^^^^" +msgstr "" + +#: en/help_topics/configuration.txt:236 +msgid "" +"A section header is a word enclosed in brackets that starts at the begining\n" +"of a line. A typical section header looks like this::" +msgstr "" + +#: en/help_topics/configuration.txt:239 +msgid " [DEFAULT]" +msgstr "" + +#: en/help_topics/configuration.txt:241 +msgid "" +"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n" +"[ALIASES]. Section headers are case sensitive. The default section provides " +"for\n" +"setting options which can be overridden with the branch config file." +msgstr "" + +#: en/help_topics/configuration.txt:245 +msgid "" +"For ``locations.conf``, the options from the section with the\n" +"longest matching section header are used to the exclusion of other\n" +"potentially valid section headers. A section header uses the path for\n" +"the branch as the section header. Some examples include::" +msgstr "" + +#: en/help_topics/configuration.txt:250 +msgid "" +" [http://mybranches.isp.com/~jdoe/branchdir]\n" +" [/home/jdoe/branches/]" +msgstr "" + +#: en/help_topics/configuration.txt:253 +msgid "" +"\n" +"Section options\n" +"^^^^^^^^^^^^^^^" +msgstr "" + +#: en/help_topics/configuration.txt:257 +msgid "" +"A section option resides within a section. A section option contains an\n" +"option name, an equals sign and a value. For example::" +msgstr "" + +#: en/help_topics/configuration.txt:260 +msgid "" +" email = John Doe \n" +" gpg_signing_key = Amy Pond " +msgstr "" + +#: en/help_topics/configuration.txt:263 +msgid "" +"A option can reference other options by enclosing them in curly brackets::" +msgstr "" + +#: en/help_topics/configuration.txt:265 +msgid "" +" my_branch_name = feature_x\n" +" my_server = bzr+ssh://example.com\n" +" push_location = {my_server}/project/{my_branch_name}" +msgstr "" + +#: en/help_topics/configuration.txt:269 +msgid "" +"Option policies\n" +"^^^^^^^^^^^^^^^" +msgstr "" + +#: en/help_topics/configuration.txt:272 +msgid "" +"Options defined in a section affect the named directory or URL plus\n" +"any locations they contain. Policies can be used to change how an\n" +"option value is interpreted for contained locations. Currently\n" +"there are three policies available:" +msgstr "" + +#: en/help_topics/configuration.txt:277 +msgid "" +" none:\n" +" the value is interpreted the same for contained locations. This is\n" +" the default behaviour.\n" +" norecurse:\n" +" the value is only used for the exact location specified by the\n" +" section name.\n" +" appendpath:\n" +" for contained locations, any additional path components are\n" +" appended to the value." +msgstr "" + +#: en/help_topics/configuration.txt:287 +msgid "" +"Policies are specified by keys with names of the form " +"\":policy\".\n" +"For example, to define the push location for a tree of branches, the\n" +"following could be used::" +msgstr "" + +#: en/help_topics/configuration.txt:291 +msgid "" +" [/top/location]\n" +" push_location = sftp://example.com/location\n" +" push_location:policy = appendpath" +msgstr "" + +#: en/help_topics/configuration.txt:295 +msgid "" +"With this configuration, the push location for ``/top/location/branch1``\n" +"would be ``sftp://example.com/location/branch1``." +msgstr "" + +#: en/help_topics/configuration.txt:298 +msgid "" +"Section local options\n" +"^^^^^^^^^^^^^^^^^^^^^" +msgstr "" + +#: en/help_topics/configuration.txt:301 +msgid "" +"Some options are defined automatically inside a given section and can be\n" +"refered to in this section only. " +msgstr "" + +#: en/help_topics/configuration.txt:304 +msgid "For example, the ``appendpath`` policy can be used like this::" +msgstr "" + +#: en/help_topics/configuration.txt:306 +msgid "" +" [/home/vila/src/bzr/bugs]\n" +" mypush = lp:~vila/bzr\n" +" mypush:policy=appendpath" +msgstr "" + +#: en/help_topics/configuration.txt:310 +msgid "Using ``relpath`` to achieve the same result is done like this::" +msgstr "" + +#: en/help_topics/configuration.txt:312 +msgid "" +" [/home/vila/src/bzr/bugs]\n" +" mypush = lp:~vila/bzr/{relpath}" +msgstr "" + +#: en/help_topics/configuration.txt:315 +msgid "" +"In both cases, when used in a directory like\n" +"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::" +msgstr "" + +#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329 +msgid "" +" $ bzr config mypush\n" +" lp:~vila/bzr/832013-expand-in-stack" +msgstr "" + +#: en/help_topics/configuration.txt:321 +msgid "Another such option is ``basename`` which can be used like this::" +msgstr "" + +#: en/help_topics/configuration.txt:323 +msgid "" +" [/home/vila/src/bzr]\n" +" mypush = lp:~vila/bzr/{basename}" +msgstr "" + +#: en/help_topics/configuration.txt:326 +msgid "" +"When used in a directory like\n" +"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::" +msgstr "" + +#: en/help_topics/configuration.txt:332 +msgid "" +"Note that ``basename`` here refers to the base name of ``relpath`` which\n" +"itself is defined as the relative path between the section name and the\n" +"location it matches." +msgstr "" + +#: en/help_topics/configuration.txt:348 +msgid "" +"When an option is local to a Section, it cannot be referred to from option\n" +"values in any other section from the same ``Store`` nor from any other\n" +"``Store``." +msgstr "" + +#: en/help_topics/configuration.txt:352 +msgid "" +"\n" +"The main configuration file, bazaar.conf\n" +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/configuration.txt:356 +msgid "" +"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n" +"The default section contains the default\n" +"configuration options for all branches. The default section can be\n" +"overriden by providing a branch-specific section in ``locations.conf``." +msgstr "" + +#: en/help_topics/configuration.txt:361 +msgid "A typical ``bazaar.conf`` section often looks like the following::" +msgstr "" + +#: en/help_topics/configuration.txt:363 +msgid "" +" [DEFAULT]\n" +" email = John Doe \n" +" editor = /usr/bin/vim\n" +" create_signatures = when-required" +msgstr "" + +#: en/help_topics/configuration.txt:368 +msgid "" +"\n" +"The branch location configuration file, locations.conf\n" +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/configuration.txt:372 +msgid "" +"``locations.conf`` allows one to specify overriding settings for\n" +"a specific branch. The format is almost identical to the default section in\n" +"bazaar.conf with one significant change: The section header, instead of " +"saying\n" +"default, will be the path to a branch that you wish to override a value\n" +"for. The '?' and '*' wildcards are supported::" +msgstr "" + +#: en/help_topics/configuration.txt:378 +msgid "" +" [/home/jdoe/branches/nethack]\n" +" email = Nethack Admin " +msgstr "" + +#: en/help_topics/configuration.txt:381 +msgid "" +" [http://hypothetical.site.com/branches/devel-branch]\n" +" create_signatures = always" +msgstr "" + +#: en/help_topics/configuration.txt:384 +msgid "" +"The authentication configuration file, authentication.conf\n" +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/configuration.txt:387 +msgid "" +"``authentication.conf`` allows one to specify credentials for\n" +"remote servers. This can be used for all the supported transports and any " +"part\n" +"of bzr that requires authentication (smtp for example)." +msgstr "" + +#: en/help_topics/configuration.txt:391 +msgid "" +"The syntax of the file obeys the same rules as the others except for the\n" +"option policies which don't apply." +msgstr "" + +#: en/help_topics/configuration.txt:394 +msgid "" +"For more information on the possible uses of the authentication " +"configuration\n" +"file see :doc:`authentication-help`." +msgstr "" + +#: en/help_topics/configuration.txt:397 +msgid "" +"\n" +"Common options\n" +"--------------" +msgstr "" + +#: en/help_topics/configuration.txt:401 +msgid "" +"debug_flags\n" +"~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/configuration.txt:404 +msgid "" +"A comma-separated list of debugging options to turn on. The same values\n" +"can be used as with the -D command-line option (see `help global-options`).\n" +"For example::" +msgstr "" + +#: en/help_topics/configuration.txt:408 +msgid " debug_flags = hpss" +msgstr "" + +#: en/help_topics/configuration.txt:412 +msgid " debug_flags = hpss,evil" +msgstr "" + +#: en/help_topics/configuration.txt:414 +msgid "" +"email\n" +"~~~~~" +msgstr "" + +#: en/help_topics/configuration.txt:417 +msgid "" +"The email address to use when committing a branch. Typically takes the form\n" +"of::" +msgstr "" + +#: en/help_topics/configuration.txt:420 +msgid " email = Full Name " +msgstr "" + +#: en/help_topics/configuration.txt:422 +msgid "" +"editor\n" +"~~~~~~" +msgstr "" + +#: en/help_topics/configuration.txt:425 +msgid "" +"The path of the editor that you wish to use if *bzr commit* is run without\n" +"a commit message. This setting is trumped by the environment variable\n" +"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n" +"variables." +msgstr "" + +#: en/help_topics/configuration.txt:430 +msgid "" +"log_format\n" +"~~~~~~~~~~" +msgstr "" + +#: en/help_topics/configuration.txt:433 +msgid "" +"The default log format to use. Standard log formats are ``long``, ``short``\n" +"and ``line``. Additional formats may be provided by plugins. The default\n" +"value is ``long``." +msgstr "" + +#: en/help_topics/configuration.txt:437 +msgid "" +"check_signatures\n" +"~~~~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/configuration.txt:440 +msgid "" +"Reserved for future use. These options will allow a policy for branches to\n" +"require signatures." +msgstr "" + +#: en/help_topics/configuration.txt:443 +msgid "" +"require\n" +" The gnupg signature for revisions must be present and must be valid." +msgstr "" + +#: en/help_topics/configuration.txt:446 +msgid "" +"ignore\n" +" Do not check gnupg signatures of revisions." +msgstr "" + +#: en/help_topics/configuration.txt:449 +msgid "" +"check-available\n" +" (default) If gnupg signatures for revisions are present, check them.\n" +" Bazaar will fail if it finds a bad signature, but will not fail if\n" +" no signature is present." +msgstr "" + +#: en/help_topics/configuration.txt:454 +msgid "" +"create_signatures\n" +"~~~~~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/configuration.txt:457 +msgid "" +"Defines the behaviour of signing revisions on commits. By default bzr will " +"not\n" +"sign new commits." +msgstr "" + +#: en/help_topics/configuration.txt:460 +msgid "" +"always\n" +" Sign every new revision that is committed. If the signing fails then " +"the\n" +" commit will not be made." +msgstr "" + +#: en/help_topics/configuration.txt:464 +msgid "" +"when-required\n" +" Reserved for future use." +msgstr "" + +#: en/help_topics/configuration.txt:467 +msgid "" +"never\n" +" Reserved for future use." +msgstr "" + +#: en/help_topics/configuration.txt:470 +msgid "" +"In future it is planned that ``when-required`` will sign newly\n" +"committed revisions only when the branch requires them. ``never`` will " +"refuse\n" +"to sign newly committed revisions, even if the branch requires signatures." +msgstr "" + +#: en/help_topics/configuration.txt:474 +msgid "" +"dirstate.fdatasync\n" +"~~~~~~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/configuration.txt:477 +msgid "" +"If true (default), working tree metadata changes are flushed through the\n" +"OS buffers to physical disk. This is somewhat slower, but means data\n" +"should not be lost if the machine crashes. See also repository.fdatasync." +msgstr "" + +#: en/help_topics/configuration.txt:481 +msgid "" +"gpg_signing_key\n" +"~~~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/configuration.txt:484 +msgid "" +"The GnuPG user identity to use when signing commits. Can be an e-mail\n" +"address, key fingerprint or full key ID. When unset or when set to\n" +"\"default\" Bazaar will use the user e-mail set with ``whoami``." +msgstr "" + +#: en/help_topics/configuration.txt:488 +msgid "" +"recurse\n" +"~~~~~~~" +msgstr "" + +#: en/help_topics/configuration.txt:491 +msgid "" +"Only useful in ``locations.conf``. Defines whether or not the\n" +"configuration for this section applies to subdirectories:" +msgstr "" + +#: en/help_topics/configuration.txt:494 +msgid "" +"true\n" +" (default) This section applies to subdirectories as well." +msgstr "" + +#: en/help_topics/configuration.txt:497 +msgid "" +"false\n" +" This section only applies to the branch at this directory and not\n" +" branches below it." +msgstr "" + +#: en/help_topics/configuration.txt:501 +msgid "" +"gpg_signing_command\n" +"~~~~~~~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/configuration.txt:504 +msgid "" +"(Default: \"gpg\"). Which program should be used to sign and check " +"revisions.\n" +"For example::" +msgstr "" + +#: en/help_topics/configuration.txt:507 +msgid " gpg_signing_command = /usr/bin/gnpg" +msgstr "" + +#: en/help_topics/configuration.txt:509 +msgid "" +"The specified command must accept the options \"--clearsign\" and \"-u " +"\"." +msgstr "" + +#: en/help_topics/configuration.txt:511 +msgid "" +"bzr_remote_path\n" +"~~~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/configuration.txt:514 +msgid "" +"(Default: \"bzr\"). The path to the command that should be used to run the " +"smart\n" +"server for bzr. This value may only be specified in locations.conf, because:" +msgstr "" + +#: en/help_topics/configuration.txt:517 +msgid "" +"- it's needed before branch.conf is accessible\n" +"- allowing remote branch.conf files to specify commands would be a security\n" +" risk" +msgstr "" + +#: en/help_topics/configuration.txt:521 +msgid "It is overridden by the BZR_REMOTE_PATH environment variable." +msgstr "" + +#: en/help_topics/configuration.txt:523 +msgid "" +"smtp_server\n" +"~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/configuration.txt:526 +msgid "" +"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n" +"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin." +msgstr "" + +#: en/help_topics/configuration.txt:529 +msgid "" +"smtp_username, smtp_password\n" +"~~~~~~~~~~~~~~~~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/configuration.txt:532 +msgid "" +"User and password to authenticate to the SMTP server. If smtp_username\n" +"is set, and smtp_password is not, Bazaar will prompt for a password.\n" +"These settings are only needed if the SMTP server requires authentication\n" +"to send mail." +msgstr "" + +#: en/help_topics/configuration.txt:537 +msgid "" +"locks.steal_dead\n" +"~~~~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/configuration.txt:540 +msgid "" +"If set to true, bzr will automatically break locks held by processes from\n" +"the same machine and user that are no longer alive. Otherwise, it will\n" +"print a message and you can break the lock manually, if you are satisfied\n" +"the object is no longer in use." +msgstr "" + +#: en/help_topics/configuration.txt:545 +msgid "" +"mail_client\n" +"~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/configuration.txt:548 +msgid "" +"A mail client to use for sending merge requests.\n" +"By default, bzr will try to use ``mapi`` on Windows. On other platforms, " +"it\n" +"will try ``xdg-email``. If either of these fails, it will fall back to\n" +"``editor``." +msgstr "" + +#: en/help_topics/configuration.txt:553 +msgid "Supported values for specific clients:" +msgstr "" + +#: en/help_topics/configuration.txt:555 +msgid "" +":claws: Use Claws. This skips a dialog for attaching files.\n" +":evolution: Use Evolution.\n" +":kmail: Use KMail.\n" +":mutt: Use Mutt.\n" +":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove " +"1.5,\n" +" this works around some bugs that xdg-email doesn't handle." +msgstr "" + +#: en/help_topics/configuration.txt:562 +msgid "Supported generic values are:" +msgstr "" + +#: en/help_topics/configuration.txt:564 +msgid "" +":default: See above.\n" +":editor: Use your editor to compose the merge request. This also uses\n" +" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n" +" smtp_username and smtp_password.\n" +":mapi: Use your preferred e-mail client on Windows.\n" +":xdg-email: Use xdg-email to run your preferred mail program" +msgstr "" + +#: en/help_topics/configuration.txt:571 +msgid "" +"repository.fdatasync\n" +"~~~~~~~~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/configuration.txt:574 +msgid "" +"If true (default), repository changes are flushed through the OS buffers\n" +"to physical disk. This is somewhat slower, but means data should not be\n" +"lost if the machine crashes. See also dirstate.fdatasync." +msgstr "" + +#: en/help_topics/configuration.txt:578 +msgid "" +"submit_branch\n" +"~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/configuration.txt:581 +msgid "" +"The branch you intend to submit your current work to. This is " +"automatically\n" +"set by ``bzr send``, and is also used by the ``submit:`` revision spec. " +"This\n" +"should usually be set on a per-branch or per-location basis." +msgstr "" + +#: en/help_topics/configuration.txt:585 +msgid "" +"public_branch\n" +"~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/configuration.txt:588 +msgid "" +"A publically-accessible version of this branch (implying that this version " +"is\n" +"not publically-accessible). Used (and set) by ``bzr send``." +msgstr "" + +#: en/help_topics/configuration.txt:591 +msgid "" +"suppress_warnings\n" +"~~~~~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/configuration.txt:594 +msgid "" +"A list of strings, each string represent a warning that can be emitted by\n" +"bzr. Mentioning a warning in this list tells bzr to not emit it." +msgstr "" + +#: en/help_topics/configuration.txt:597 +msgid "Valid values:" +msgstr "" + +#: en/help_topics/configuration.txt:599 +msgid "" +"* ``format_deprecation``:\n" +" whether the format deprecation warning is shown on repositories that " +"are\n" +" using deprecated formats." +msgstr "" + +#: en/help_topics/configuration.txt:603 +msgid "" +"default_format\n" +"~~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/configuration.txt:606 +msgid "" +"A format name for the default format used when creating branches. See " +"``bzr\n" +"help formats`` for possible values." +msgstr "" + +#: en/help_topics/configuration.txt:609 +msgid "" +"\n" +"Unicode options\n" +"---------------" +msgstr "" + +#: en/help_topics/configuration.txt:613 +msgid "" +"output_encoding\n" +"~~~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/configuration.txt:616 +msgid "" +"A Python unicode encoding name for text output from bzr, such as log\n" +"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n" +"is the terminal encoding prefered by the operating system." +msgstr "" + +#: en/help_topics/configuration.txt:620 +msgid "" +"\n" +"Branch type specific options\n" +"----------------------------" +msgstr "" + +#: en/help_topics/configuration.txt:624 +msgid "" +"These options apply only to branches that use the ``dirstate-tags`` or\n" +"later format. They\n" +"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n" +"manually set in ``locations.conf`` or ``bazaar.conf``." +msgstr "" + +#: en/help_topics/configuration.txt:629 +msgid "" +"append_revisions_only\n" +"~~~~~~~~~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/configuration.txt:632 +msgid "" +"If set to \"True\" then revisions can only be appended to the log, not\n" +"removed. A branch with this setting enabled can only pull from another\n" +"branch if the other branch's log is a longer version of its own. This is\n" +"normally set by ``bzr init --append-revisions-only``. If you set it\n" +"manually, use either 'True' or 'False' (case-sensitive) to maintain\n" +"compatibility with previous bzr versions (older than 2.2)." +msgstr "" + +#: en/help_topics/configuration.txt:639 +msgid "" +"parent_location\n" +"~~~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/configuration.txt:642 +msgid "" +"If present, the location of the default branch for pull or merge. This " +"option\n" +"is normally set when creating a branch, the first ``pull`` or by ``pull\n" +"--remember``." +msgstr "" + +#: en/help_topics/configuration.txt:646 +msgid "" +"push_location\n" +"~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/configuration.txt:649 +msgid "" +"If present, the location of the default branch for push. This option\n" +"is normally set by the first ``push`` or ``push --remember``." +msgstr "" + +#: en/help_topics/configuration.txt:652 +msgid "" +"push_strict\n" +"~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/configuration.txt:655 +msgid "" +"If present, defines the ``--strict`` option default value for checking\n" +"uncommitted changes before pushing." +msgstr "" + +#: en/help_topics/configuration.txt:658 +msgid "" +"dpush_strict\n" +"~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/configuration.txt:661 +msgid "" +"If present, defines the ``--strict`` option default value for checking\n" +"uncommitted changes before pushing into a different VCS without any\n" +"custom bzr metadata." +msgstr "" + +#: en/help_topics/configuration.txt:665 +msgid "" +"bound_location\n" +"~~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/configuration.txt:668 +msgid "" +"The location that commits should go to when acting as a checkout.\n" +"This option is normally set by ``bind``." +msgstr "" + +#: en/help_topics/configuration.txt:671 +msgid "" +"bound\n" +"~~~~~" +msgstr "" + +#: en/help_topics/configuration.txt:674 +msgid "" +"If set to \"True\", the branch should act as a checkout, and push each " +"commit to\n" +"the bound_location. This option is normally set by ``bind``/``unbind``." +msgstr "" + +#: en/help_topics/configuration.txt:677 +msgid "" +"send_strict\n" +"~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/configuration.txt:680 +msgid "" +"If present, defines the ``--strict`` option default value for checking\n" +"uncommitted changes before sending a merge directive." +msgstr "" + +#: en/help_topics/configuration.txt:683 +msgid "" +"add.maximum_file_size\n" +"~~~~~~~~~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/configuration.txt:686 +msgid "" +"Defines the maximum file size the command line \"add\" operation will allow\n" +"in recursive mode, with files larger than this value being skipped. You may " +"\n" +"specify this value as an integer (in which case it is interpreted as bytes), " +"\n" +"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of " +"0 \n" +"will disable skipping." +msgstr "" + +#: en/help_topics/configuration.txt:692 +msgid "" +"External Merge Tools\n" +"--------------------" +msgstr "" + +#: en/help_topics/configuration.txt:695 +msgid "" +"bzr.mergetool.\n" +"~~~~~~~~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/configuration.txt:698 +msgid "" +"Defines an external merge tool called with the given command-line.\n" +"Arguments containing spaces should be quoted using single or double quotes. " +"The\n" +"executable may omit its path if it can be found on the PATH." +msgstr "" + +#: en/help_topics/configuration.txt:702 +msgid "" +"The following markers can be used in the command-line to substitute " +"filenames\n" +"involved in the merge conflict::" +msgstr "" + +#: en/help_topics/configuration.txt:705 +msgid "" +" {base} file.BASE\n" +" {this} file.THIS\n" +" {other} file.OTHER\n" +" {result} output file\n" +" {this_temp} temp copy of file.THIS, used to overwrite output file if " +"merge\n" +" succeeds." +msgstr "" + +#: en/help_topics/configuration.txt:714 +msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}" +msgstr "" + +#: en/help_topics/configuration.txt:716 +msgid "" +"bzr.default_mergetool\n" +"~~~~~~~~~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/configuration.txt:719 +msgid "" +"Specifies which external merge tool (as defined above) should be selected " +"by\n" +"default in tools such as ``bzr qconflicts``." +msgstr "" + +#: en/help_topics/configuration.txt:724 +msgid " bzr.default_mergetool = kdiff3\n" +msgstr "" + +#: en/help_topics/conflict-types.txt:1 +msgid "" +"Conflict Types\n" +"==============" +msgstr "" + +#: en/help_topics/conflict-types.txt:4 +msgid "" +"Some operations, like merge, revert and pull, modify the contents of your\n" +"working tree. These modifications are programmatically generated, and so " +"they\n" +"may conflict with the current state of your working tree. " +msgstr "" + +#: en/help_topics/conflict-types.txt:8 +msgid "" +"When conflicts are present in your working tree (as shown by ``bzr\n" +"conflicts``), you should resolve them and then inform bzr that the " +"conflicts\n" +"have been resolved." +msgstr "" + +#: en/help_topics/conflict-types.txt:12 +msgid "" +"Resolving conflicts is sometimes not obvious. Either because the user that\n" +"should resolve them is not the one responsible for their occurrence, as is " +"the\n" +"case when merging other people's work or because some conflicts are " +"presented\n" +"in a way that is not easy to understand." +msgstr "" + +#: en/help_topics/conflict-types.txt:17 +msgid "" +"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n" +"conflict if and only if there's an actual conceptual conflict in the source\n" +"tree. Because Bazaar doesn't understand the real meaning of the files " +"being\n" +"versioned, it can, when faced with ambiguities, fall short in either " +"direction\n" +"trying to resolve the conflict itself. Many kinds of changes can be " +"combined\n" +"programmatically, but sometimes only a human can determine the right thing " +"to\n" +"do." +msgstr "" + +#: en/help_topics/conflict-types.txt:25 +msgid "" +"When Bazaar generates a conflict, it adds information into the working tree " +"to\n" +"present the conflicting versions, and it's up to you to find the correct\n" +"resolution." +msgstr "" + +#: en/help_topics/conflict-types.txt:29 +msgid "Whatever the conflict is, resolving it is roughly done in two steps:" +msgstr "" + +#: en/help_topics/conflict-types.txt:31 +msgid "" +"1. Modify the working tree content so that the conflicted item is now in " +"the\n" +" state you want to keep, then" +msgstr "" + +#: en/help_topics/conflict-types.txt:34 +msgid "" +"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n" +" remaining generated information (``bzr resolve ``)." +msgstr "" + +#: en/help_topics/conflict-types.txt:37 +msgid "" +"For most conflict types, there are some obvious ways to modify the working\n" +"tree and put it into the desired state. For some types of conflicts, Bazaar\n" +"itself already made a choice, when possible." +msgstr "" + +#: en/help_topics/conflict-types.txt:41 +msgid "" +"Yet, whether Bazaar makes a choice or not, there are some other simple but\n" +"different ways to resolve the conflict." +msgstr "" + +#: en/help_topics/conflict-types.txt:44 +msgid "" +"Each type of conflict is explained below, and the action which must be done " +"to\n" +"resolve the conflict is outlined." +msgstr "" + +#: en/help_topics/conflict-types.txt:47 +msgid "" +"Various actions are available depending on the kind of conflict, for some " +"of\n" +"these actions, Bazaar can provide some help. In the end you should at least\n" +"inform Bazaar that you're done with the conflict with::" +msgstr "" + +#: en/help_topics/conflict-types.txt:51 +msgid " ``bzr resolve FILE --action=done'" +msgstr "" + +#: en/help_topics/conflict-types.txt:53 +msgid "" +"Note that this is the default action when a single file is involved so you " +"can\n" +"simply use::" +msgstr "" + +#: en/help_topics/conflict-types.txt:56 +msgid " ``bzr resolve FILE``" +msgstr "" + +#: en/help_topics/conflict-types.txt:58 +msgid "See ``bzr help resolve`` for more details." +msgstr "" + +#: en/help_topics/conflict-types.txt:60 +msgid "" +"Text conflicts\n" +"--------------" +msgstr "" + +#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120 +#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175 +#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213 +#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281 +#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339 +msgid "Typical message::" +msgstr "" + +#: en/help_topics/conflict-types.txt:65 +msgid " Text conflict in FILE" +msgstr "" + +#: en/help_topics/conflict-types.txt:67 +msgid "" +"These are produced when a text merge cannot completely reconcile two sets " +"of\n" +"text changes. Bazaar will emit files for each version with the extensions\n" +"THIS, OTHER, and BASE. THIS is the version of the file from the target " +"tree,\n" +"i.e. the tree that you are merging changes into. OTHER is the version that " +"you\n" +"are merging into the target. BASE is an older version that is used as a " +"basis\n" +"for comparison." +msgstr "" + +#: en/help_topics/conflict-types.txt:74 +msgid "" +"In the main copy of the file, Bazaar will include all the changes that it\n" +"could reconcile, and any un-reconciled conflicts are surrounded by\n" +"\"herringbone\" markers like ``<<<<<<<``." +msgstr "" + +#: en/help_topics/conflict-types.txt:78 +msgid "" +"Say the initial text is \"The project leader released it.\", and THIS " +"modifies it\n" +"to \"Martin Pool released it.\", while OTHER modifies it to \"The project " +"leader\n" +"released Bazaar.\" A conflict would look like this::" +msgstr "" + +#: en/help_topics/conflict-types.txt:82 +msgid "" +" <<<<<<< TREE\n" +" Martin Pool released it.\n" +" =======\n" +" The project leader released Bazaar.\n" +" >>>>>>> MERGE-SOURCE" +msgstr "" + +#: en/help_topics/conflict-types.txt:88 +msgid "The correct resolution would be \"Martin Pool released Bazaar.\"" +msgstr "" + +#: en/help_topics/conflict-types.txt:90 +msgid "" +"You can handle text conflicts either by editing the main copy of the file,\n" +"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n" +"worth mentioning that resolving text conflicts rarely involves picking one\n" +"set of changes over the other (but see below when you encounter these\n" +"cases). More often, the two sets of changes must be intelligently combined." +msgstr "" + +#: en/help_topics/conflict-types.txt:96 +msgid "" +"If you edit the main copy, be sure to remove the herringbone markers. When\n" +"you are done editing, the file should look like it never had a conflict, and " +"be\n" +"ready to commit." +msgstr "" + +#: en/help_topics/conflict-types.txt:100 +msgid "" +"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n" +"Bazaar will auto-detect which conflicts you have resolved." +msgstr "" + +#: en/help_topics/conflict-types.txt:103 +msgid "" +"When the conflict is resolved, Bazaar deletes the previously generated\n" +"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n" +"working tree." +msgstr "" + +#: en/help_topics/conflict-types.txt:107 +msgid "" +"\n" +"When you want to pick one set of changes over the other, you can use ``bzr\n" +"resolve`` with one of the following actions:" +msgstr "" + +#: en/help_topics/conflict-types.txt:111 +msgid "" +"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n" +"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``." +msgstr "" + +#: en/help_topics/conflict-types.txt:114 +msgid "" +"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n" +"modifications will be taken into account." +msgstr "" + +#: en/help_topics/conflict-types.txt:117 +msgid "" +"Content conflicts\n" +"-----------------" +msgstr "" + +#: en/help_topics/conflict-types.txt:122 +msgid " Contents conflict in FILE" +msgstr "" + +#: en/help_topics/conflict-types.txt:124 +msgid "" +"This conflict happens when there are conflicting changes in the working " +"tree\n" +"and the merge source, but the conflicted items are not text files. They " +"may\n" +"be binary files, or symlinks, or directories. It can even happen with " +"files\n" +"that are deleted on one side, and modified on the other." +msgstr "" + +#: en/help_topics/conflict-types.txt:129 +msgid "" +"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may " +"be\n" +"regular files, symlinks or directories). But it will not include a \"main " +"copy\"\n" +"of the file with herringbone conflict markers. It will appear that the " +"\"main\n" +"copy\" has been renamed to THIS or OTHER." +msgstr "" + +#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182 +msgid "" +"To resolve that kind of conflict, you should rebuild FILE from either " +"version\n" +"or a combination of both." +msgstr "" + +#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185 +#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252 +#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326 +#: en/help_topics/conflict-types.txt:361 +msgid "``bzr resolve`` recognizes the following actions:" +msgstr "" + +#: en/help_topics/conflict-types.txt:139 +msgid "" +"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n" +"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n" +"* ``--action=done`` will just mark the conflict as resolved." +msgstr "" + +#: en/help_topics/conflict-types.txt:143 +msgid "" +"Any action will also delete the previously generated ``.BASE``, ``.THIS`` " +"and\n" +"``.OTHER`` files if they are still present in the working tree." +msgstr "" + +#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193 +#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276 +#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334 +#: en/help_topics/conflict-types.txt:369 +msgid "" +"Bazaar cannot auto-detect when conflicts of this kind have been resolved." +msgstr "" + +#: en/help_topics/conflict-types.txt:148 +msgid "" +"Tag conflicts\n" +"-------------" +msgstr "" + +#: en/help_topics/conflict-types.txt:153 +msgid "" +" Conflicting tags:\n" +" version-0.1" +msgstr "" + +#: en/help_topics/conflict-types.txt:156 +msgid "" +"When pulling from or pushing to another branch, Bazaar informs you about " +"tags\n" +"that conflict between the two branches; that is the same tag points to two\n" +"different revisions. You need not resolve these conflicts, but subsequent\n" +"uses of pull or push will result in the same message." +msgstr "" + +#: en/help_topics/conflict-types.txt:161 +msgid "" +"To resolve the conflict, you must apply the correct tags to either the " +"target\n" +"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n" +"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n" +"target branch's tags match the source branch, then in the target branch do\n" +"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n" +"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the " +"source\n" +"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n" +"favor of the target branch, you need to similarly use ``tag --force`` in " +"the\n" +"source branch. (Note that pulling or pushing using --overwrite will " +"overwrite\n" +"all tags as well.)" +msgstr "" + +#: en/help_topics/conflict-types.txt:172 +msgid "" +"Duplicate paths\n" +"---------------" +msgstr "" + +#: en/help_topics/conflict-types.txt:177 +msgid " Conflict adding file FILE. Moved existing file to FILE.moved." +msgstr "" + +#: en/help_topics/conflict-types.txt:179 +msgid "" +"Sometimes Bazaar will attempt to create a file using a pathname that has\n" +"already been used. The existing file will be renamed to \"FILE.moved\". " +msgstr "" + +#: en/help_topics/conflict-types.txt:187 +msgid "" +"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved " +"FILE``,\n" +"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n" +"* ``--action=done`` will just mark the conflict as resolved." +msgstr "" + +#: en/help_topics/conflict-types.txt:191 +msgid "" +"Note that you must get rid of FILE.moved before using ``--action=done``." +msgstr "" + +#: en/help_topics/conflict-types.txt:195 +msgid "" +"Unversioned parent\n" +"------------------" +msgstr "" + +#: en/help_topics/conflict-types.txt:200 +msgid "" +" Conflict because FILE is not versioned, but has versioned children." +msgstr "" + +#: en/help_topics/conflict-types.txt:202 +msgid "" +"Sometimes Bazaar will attempt to create a file whose parent directory is " +"not\n" +"versioned. This happens when the directory has been deleted in the target,\n" +"but has a new child in the source, or vice versa. In this situation, " +"Bazaar\n" +"will version the parent directory as well. Resolving this issue depends\n" +"very much on the particular scenario. You may wish to rename or delete " +"either\n" +"the file or the directory. When you are satisfied, you can run \"bzr " +"resolve\n" +"FILE\" to mark the conflict as resolved." +msgstr "" + +#: en/help_topics/conflict-types.txt:210 +msgid "" +"Missing parent\n" +"--------------" +msgstr "" + +#: en/help_topics/conflict-types.txt:215 +msgid " Conflict adding files to FILE. Created directory." +msgstr "" + +#: en/help_topics/conflict-types.txt:217 +msgid "" +"This happens when a directory has been deleted in the target, but has new\n" +"children in the source. This is similar to the \"unversioned parent\" " +"conflict,\n" +"except that the parent directory does not *exist*, instead of just being\n" +"unversioned. In this situation, Bazaar will create the missing parent.\n" +"Resolving this issue depends very much on the particular scenario." +msgstr "" + +#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249 +msgid "" +"To resolve that kind of conflict, you should either remove or rename the\n" +"children or the directory or a combination of both." +msgstr "" + +#: en/help_topics/conflict-types.txt:228 +msgid "" +"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n" +" children,\n" +"* ``--action=take-other`` will acknowledge Bazaar choice to keep the " +"children\n" +" and restoring the directory,\n" +"* ``--action=done`` will just mark the conflict as resolved." +msgstr "" + +#: en/help_topics/conflict-types.txt:236 +msgid "" +"Deleting parent\n" +"---------------" +msgstr "" + +#: en/help_topics/conflict-types.txt:241 +msgid " Conflict: can't delete DIR because it is not empty. Not deleting." +msgstr "" + +#: en/help_topics/conflict-types.txt:243 +msgid "" +"This is the opposite of \"missing parent\". A directory is deleted in the\n" +"source, but has new children in the target (either because a directory\n" +"deletion is merged or because the merge introduce new children). Bazaar\n" +"will retain the directory. Resolving this issue depends very much on the\n" +"particular scenario." +msgstr "" + +#: en/help_topics/conflict-types.txt:254 +msgid "" +"* ``--action=take-this`` will acknowledge Bazaar choice to keep the " +"directory," +msgstr "" + +#: en/help_topics/conflict-types.txt:256 +msgid "" +"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n" +" children," +msgstr "" + +#: en/help_topics/conflict-types.txt:259 +msgid "* ``--action=done`` will just mark the conflict as resolved." +msgstr "" + +#: en/help_topics/conflict-types.txt:261 +msgid "" +"Note that when merging a directory deletion, if unversioned files are\n" +"present, they become potential orphans has they don't have a directory\n" +"parent anymore." +msgstr "" + +#: en/help_topics/conflict-types.txt:265 +msgid "" +"Handling such orphans, *before* the conflict is created, is controlled by\n" +"setting the ``bzr.transform.orphan_policy`` configuration option." +msgstr "" + +#: en/help_topics/conflict-types.txt:268 +msgid "There are two possible values for this option:" +msgstr "" + +#: en/help_topics/conflict-types.txt:270 +msgid "" +"* ``conflict`` (the default): will leave the orphans in place and\n" +" generate a conflicts," +msgstr "" + +#: en/help_topics/conflict-types.txt:273 +msgid "" +"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the " +"root\n" +" of the working tree with names like ``.~#~``." +msgstr "" + +#: en/help_topics/conflict-types.txt:278 +msgid "" +"Path conflict\n" +"-------------" +msgstr "" + +#: en/help_topics/conflict-types.txt:283 +msgid " Path conflict: PATH1 / PATH2" +msgstr "" + +#: en/help_topics/conflict-types.txt:285 +msgid "" +"This happens when the source and target have each modified the name or " +"parent\n" +"directory of a file. Bazaar will use the path elements from the source." +msgstr "" + +#: en/help_topics/conflict-types.txt:288 +msgid "" +"To resolve that kind of conflict, you just have to decide what name should " +"be\n" +"retained for the file involved." +msgstr "" + +#: en/help_topics/conflict-types.txt:293 +msgid "" +"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n" +" issuing ``bzr mv PATH2 PATH1``,\n" +"* ``--action=take-other`` will acknowledge Bazaar choice of keeping " +"``PATH2``,\n" +"* ``--action=done`` will just mark the conflict as resolved." +msgstr "" + +#: en/help_topics/conflict-types.txt:300 +msgid "" +"Parent loop\n" +"-----------" +msgstr "" + +#: en/help_topics/conflict-types.txt:305 +msgid " Conflict moving FILE into DIRECTORY. Cancelled move." +msgstr "" + +#: en/help_topics/conflict-types.txt:307 +msgid "" +"This happens when the source and the target have each moved directories, so\n" +"that, if the change could be applied, a directory would be contained by " +"itself.\n" +"For example::" +msgstr "" + +#: en/help_topics/conflict-types.txt:311 +msgid "" +" $ bzr init\n" +" $ bzr mkdir white\n" +" $ bzr mkdir black\n" +" $ bzr commit -m \"BASE\"\n" +" $ bzr branch . ../other\n" +" $ bzr mv white black\n" +" $ bzr commit -m \"THIS\"\n" +" $ bzr mv ../other/black ../other/white\n" +" $ bzr commit ../other -m \"OTHER\"\n" +" $ bzr merge ../other" +msgstr "" + +#: en/help_topics/conflict-types.txt:322 +msgid "" +"In this situation, Bazaar will cancel the move, and leave ``white`` in\n" +"``black``. To resolve that kind of conflict, you just have to decide what\n" +"name should be retained for the directories involved." +msgstr "" + +#: en/help_topics/conflict-types.txt:328 +msgid "" +"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` " +"\n" +" in ``black``,\n" +"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n" +" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n" +"* ``--action=done`` will just mark the conflict as resolved." +msgstr "" + +#: en/help_topics/conflict-types.txt:336 +msgid "" +"Non-directory parent\n" +"--------------------" +msgstr "" + +#: en/help_topics/conflict-types.txt:341 +msgid "" +" Conflict: foo.new is not a directory, but has files in it.\n" +" Created directory." +msgstr "" + +#: en/help_topics/conflict-types.txt:344 +msgid "" +"This happens when one side has added files to a directory, and the other " +"side\n" +"has changed the directory into a file or symlink. For example::" +msgstr "" + +#: en/help_topics/conflict-types.txt:347 +msgid "" +" $ bzr init\n" +" $ bzr mkdir foo\n" +" $ bzr commit -m \"BASE\"\n" +" $ bzr branch . ../other\n" +" $ rmdir foo\n" +" $ touch foo\n" +" $ bzr commit -m \"THIS\"\n" +" $ bzr mkdir ../other/foo/bar\n" +" $ bzr commit ../other -m \"OTHER\"\n" +" $ bzr merge ../other" +msgstr "" + +#: en/help_topics/conflict-types.txt:358 +msgid "" +"To resolve that kind of conflict, you have to decide what name should be\n" +"retained for the file, directory or symlink involved." +msgstr "" + +#: en/help_topics/conflict-types.txt:363 +msgid "" +"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n" +" ``bzr add foo``,\n" +"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n" +" ``bzr mv foo.new foo``,\n" +"* ``--action=done`` will just mark the conflict as resolved." +msgstr "" + +#: en/help_topics/conflict-types.txt:371 +msgid "" +"MalformedTransform\n" +"------------------" +msgstr "" + +#: en/help_topics/conflict-types.txt:374 +msgid "" +"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n" +"exception. This means that Bazaar encountered a filesystem conflict that it " +"was\n" +"unable to resolve. This usually indicates a bug. Please let us know if " +"you\n" +"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n" +msgstr "" + +#: en/help_topics/content-filters.txt:1 +msgid "" +"Content Filters\n" +"===============" +msgstr "" + +#: en/help_topics/content-filters.txt:4 +msgid "" +"Content formats\n" +"---------------" +msgstr "" + +#: en/help_topics/content-filters.txt:7 +msgid "" +"Bazaar's content filtering allows you to store files in a different\n" +"format from the copy in your working tree. This lets you, or your\n" +"co-developers, use Windows development tools that expect CRLF files\n" +"on projects that use other line-ending conventions. Among other things,\n" +"content filters also let Unix developers more easily work on projects\n" +"using Windows line-ending conventions, keyword expansion/compression,\n" +"and trailing spaces on lines in text files to be implicitly stripped\n" +"when committed." +msgstr "" + +#: en/help_topics/content-filters.txt:16 +msgid "To generalize, there are two content formats supported by Bazaar:" +msgstr "" + +#: en/help_topics/content-filters.txt:18 +msgid "" +"* a canonical format - how files are stored internally\n" +"* a convenience format - how files are created in a working tree." +msgstr "" + +#: en/help_topics/content-filters.txt:21 +msgid "" +"\n" +"Format conversion\n" +"-----------------" +msgstr "" + +#: en/help_topics/content-filters.txt:25 +msgid "" +"The conversion between these formats is done by content filters.\n" +"A content filter has two parts:" +msgstr "" + +#: en/help_topics/content-filters.txt:28 +msgid "" +"* a read converter - converts from convenience to canonical format\n" +"* a write converter - converts from canonical to convenience format." +msgstr "" + +#: en/help_topics/content-filters.txt:31 +msgid "" +"Many of these converters will provide *round-trip* conversion,\n" +"i.e. applying the read converter followed by the write converter\n" +"gives back the original content. However, others may provide an\n" +"asymmetric conversion. For example, a read converter might strip\n" +"trailing whitespace off lines in source code while the matching\n" +"write converter might pass content through unchanged." +msgstr "" + +#: en/help_topics/content-filters.txt:38 +msgid "" +"\n" +"Enabling content filters\n" +"------------------------" +msgstr "" + +#: en/help_topics/content-filters.txt:42 +msgid "" +"Content filters are typically provided by plugins, so the first step\n" +"in using them is to install the relevant plugins and read their\n" +"documentation. Some plugins may be very specific about which files\n" +"they filter, e.g. only files ending in ``.java`` or ``.php``.\n" +"In other cases, the plugin may leave it in the user's hands to\n" +"define which files are to be filtered. This is typically done\n" +"using rule-based preferences. See ``bzr help rules`` for general\n" +"information about defining these." +msgstr "" + +#: en/help_topics/content-filters.txt:51 +msgid "" +"\n" +"Impact on commands\n" +"------------------" +msgstr "" + +#: en/help_topics/content-filters.txt:55 +msgid "" +"Read converters are only applied to commands that read content from\n" +"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n" +"will apply read converters to files in the working tree, then compare\n" +"the results to the content last committed." +msgstr "" + +#: en/help_topics/content-filters.txt:60 +msgid "" +"Write converters are only applied by commands that **create files in a\n" +"working tree**, e.g. branch, checkout, update. If you wish to see the\n" +"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n" +"respectively." +msgstr "" + +#: en/help_topics/content-filters.txt:65 +msgid "" +"Note: ``bzr commit`` does not implicitly apply write converters after\n" +"comitting files. If this makes sense for a given plugin providing\n" +"a content filter, the plugin can usually achieve this effect by using a\n" +"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n" +"for more information on hooks." +msgstr "" + +#: en/help_topics/content-filters.txt:71 +msgid "" +"\n" +"Refreshing your working tree\n" +"----------------------------" +msgstr "" + +#: en/help_topics/content-filters.txt:75 +msgid "" +"For performance reasons, Bazaar caches the timestamps of files in\n" +"a working tree, and assumes files are unchanged if their timestamps\n" +"match the cached values. As a consequence, there are times when\n" +"you may need to explicitly ask for content filtering to be reapplied\n" +"in one or both directions, e.g. after installing or reconfiguring\n" +"plugins providing it." +msgstr "" + +#: en/help_topics/content-filters.txt:82 +msgid "Here are some general guidelines for doing this:" +msgstr "" + +#: en/help_topics/content-filters.txt:84 +msgid "" +" * To reapply read converters, ``touch`` files, i.e. update their\n" +" timestamp. Operations like ``bzr status`` should then reapply the\n" +" relevant read converters and compare the end result with the\n" +" canonical format." +msgstr "" + +#: en/help_topics/content-filters.txt:89 +msgid "" +" * To reapply write converters, ensure there are no local changes,\n" +" delete the relevant files and run ``bzr revert`` on those files." +msgstr "" + +#: en/help_topics/content-filters.txt:92 +msgid "" +"Note: In the future, it is likely that additional options will be added\n" +"to commands to make this refreshing process faster and safer.\n" +msgstr "" + +#: en/help_topics/current-formats.txt:1 +msgid "Current Storage Formats" +msgstr "" + +#: en/help_topics/current-formats.txt:3 +msgid "" +":2a:\n" +" (native) (default) Format for the bzr 2.0 series. Uses group-\n" +" compress storage. Provides rich roots which are a one-way\n" +" transition." +msgstr "" + +#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17 +msgid "" +"\n" +"See :doc:`formats-help` for more about storage formats." +msgstr "" + +#: en/help_topics/debug-flags.txt:1 +msgid "" +"Debug Flags\n" +"===========" +msgstr "" + +#: en/help_topics/debug-flags.txt:4 +msgid "" +"These flags can be passed on the bzr command line or (without the ``-D``\n" +"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``." +msgstr "" + +#: en/help_topics/debug-flags.txt:7 +msgid "" +"-Dauth Trace authentication sections used.\n" +"-Dbytes Print out how many bytes were transferred\n" +"-Ddirstate Trace dirstate activity (verbose!)\n" +"-Derror Instead of normal error handling, always print a " +"traceback\n" +" on error.\n" +"-Devil Capture call sites that do expensive or badly-scaling\n" +" operations.\n" +"-Dfetch Trace history copying between repositories.\n" +"-Dfilters Emit information for debugging content filtering.\n" +"-Dforceinvdeltas Force use of inventory deltas during generic streaming " +"fetch.\n" +"-Dgraph Trace graph traversal.\n" +"-Dhashcache Log every time a working file is read to determine its " +"hash.\n" +"-Dhooks Trace hook execution.\n" +"-Dhpss Trace smart protocol requests and responses.\n" +"-Dhpssdetail More hpss details.\n" +"-Dhpssvfs Traceback on vfs access to Remote objects.\n" +"-Dhttp Trace http connections, requests and responses.\n" +"-Dindex Trace major index operations.\n" +"-Dknit Trace knit operations.\n" +"-Dlock Trace when lockdir locks are taken or released.\n" +"-Dnoretry If a connection is reset, fail immediately rather than\n" +" retrying the request.\n" +"-Dprogress Trace progress bar operations.\n" +"-Dmem_dump Dump memory to a file upon an out of memory error.\n" +"-Dmerge Emit information for debugging merges.\n" +"-Dno_apport Don't use apport to report crashes.\n" +"-Dno_activity \t Don't show transport activity indicator in progress bar.\n" +"-Dpack Emit information about pack operations.\n" +"-Drelock Emit a message every time a branch or repository object " +"is\n" +" unlocked then relocked the same way.\n" +"-Dsftp Trace SFTP internals.\n" +"-Dstatic_tuple Error when a tuple is used where a StaticTuple is " +"expected\n" +"-Dstream Trace fetch streams.\n" +"-Dstrict_locks Trace when OS locks are potentially used in a non-" +"portable\n" +" manner.\n" +"-Dunlock Some errors during unlock are treated as warnings.\n" +"-DIDS_never Never use InterDifferingSerializer when fetching.\n" +"-DIDS_always Always use InterDifferingSerializer to fetch if " +"appropriate\n" +" for the format, even for non-local fetches.\n" +msgstr "" + +#: en/help_topics/diverged-branches.txt:1 +msgid "" +"Diverged Branches\n" +"=================" +msgstr "" + +#: en/help_topics/diverged-branches.txt:4 +msgid "" +"When Bazaar tries to push one branch onto another, it requires that the\n" +"destination branch must be ready to receive the source branch. If this " +"isn't\n" +"the case, then we say that the branches have ``diverged``. Branches are\n" +"considered diverged if the destination branch's most recent commit is one " +"that\n" +"has not been merged (directly or indirectly) by the source branch. To " +"recover\n" +"from diverged branches, one must merge the missing revisions into the " +"source\n" +"branch." +msgstr "" + +#: en/help_topics/diverged-branches.txt:12 +msgid "" +"This situation commonly arises when using a centralized workflow with local\n" +"commits. If someone else has committed new work to the mainline since your\n" +"last pull and you have local commits that have not yet been pushed to the\n" +"mainline, then your local branch and the mainline have diverged." +msgstr "" + +#: en/help_topics/diverged-branches.txt:17 +msgid "" +"Discovering What Has Diverged\n" +"-----------------------------" +msgstr "" + +#: en/help_topics/diverged-branches.txt:20 +msgid "" +"The ``bzr missing`` command is used to find out what revisions are in " +"another\n" +"branch that are not present in the current branch, and vice-versa. It shows " +"a\n" +"summary of which extra revisions exist in each branch. If you want to see " +"the\n" +"precise effects of those revisions, you can use ``bzr diff --" +"old=other_branch``\n" +"to show the differences between other_branch and your current branch." +msgstr "" + +#: en/help_topics/diverged-branches.txt:26 +msgid "" +"A Solution\n" +"----------" +msgstr "" + +#: en/help_topics/diverged-branches.txt:29 +msgid "" +"The solution is to merge the revisions from the mainline into your local\n" +"branch. To do so, use ``bzr merge`` to get the new revisions from the\n" +"mainline. This merge may result in conflicts if the other developer's " +"changes\n" +"overlap with your changes. These conflicts should be resolved before\n" +"continuing. After any conflicts have been resolved, or even if there were " +"no\n" +"conflicts, Bazaar requires that you explicitly commit these new revisions\n" +"to your local branch. This requirement gives you an opportunity to test " +"the\n" +"resulting working tree for correctness, since the merged revisions could " +"have\n" +"made arbitrary changes. After testing, you should commit the merge using\n" +"``bzr commit``. This clears up the diverged branches situation. Your " +"local\n" +"branch can now be pushed to the mainline.\n" +msgstr "" + +#: en/help_topics/eol.txt:1 +msgid "" +"End of Line Conversion\n" +"======================" +msgstr "" + +#: en/help_topics/eol.txt:4 +msgid "" +"EOL conversion is provided as a content filter where Bazaar internally\n" +"stores a canonical format but outputs a convenience format. See\n" +"``bzr help content-filters`` for general information about using these." +msgstr "" + +#: en/help_topics/eol.txt:8 +msgid "" +"Note: Content filtering is only supported in recently added formats,\n" +"e.g. 1.14. Be sure that both the repository *and* the branch are\n" +"in a recent format. (Just setting the format on the repository\n" +"is not enough.) If content filtering does not appear to be working, use\n" +"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n" +"or later." +msgstr "" + +#: en/help_topics/eol.txt:15 +msgid "" +"EOL conversion needs to be enabled for selected file patterns using\n" +"rules. See ``bzr help rules`` for general information on defining rules.\n" +"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n" +"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n" +"supported in a future verison of Bazaar." +msgstr "" + +#: en/help_topics/eol.txt:21 +msgid "" +"To configure which files to filter, set ``eol`` to one of the values below.\n" +"(If a value is not set, ``exact`` is the default.)" +msgstr "" + +#: en/help_topics/eol.txt:24 +msgid "" +" ========== ===================================== ======================\n" +" Value Checkout end-of-lines as Commit end-of-lines as\n" +" ========== ===================================== ======================\n" +" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n" +" ---------- ------------------------------------- ----------------------\n" +" ``lf`` ``lf`` ``lf``\n" +" ---------- ------------------------------------- ----------------------\n" +" ``crlf`` ``crlf`` ``lf``\n" +" ---------- ------------------------------------- ----------------------\n" +" ``exact`` No conversion Exactly as in file\n" +" ========== ===================================== ======================" +msgstr "" + +#: en/help_topics/eol.txt:36 +msgid "" +"Note: For safety reasons, no conversion is applied to any file where a null\n" +"byte is detected in the file." +msgstr "" + +#: en/help_topics/eol.txt:39 +msgid "" +"For users working on a cross-platform project, here is a suggested rule\n" +"to use as a starting point::" +msgstr "" + +#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52 +#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82 +msgid "" +" [name *]\n" +" eol = native" +msgstr "" + +#: en/help_topics/eol.txt:45 +msgid "" +"If you have binary files that do not contain a null byte though, be\n" +"sure to add ``eol = exact`` rules for those as well. You can do this\n" +"by giving more explicit patterns earlier in the rules file. For example::" +msgstr "" + +#: en/help_topics/eol.txt:49 +msgid "" +" [name *.png]\n" +" eol = exact" +msgstr "" + +#: en/help_topics/eol.txt:55 +msgid "" +"If your working tree is on a network drive shared by users on different\n" +"operating systems, you typically want to force certain conventions for\n" +"certain files. In that way, if a file is created with the wrong line\n" +"endings or line endings get mixed during editing, it gets committed\n" +"correctly and gets checked out correctly. For example::" +msgstr "" + +#: en/help_topics/eol.txt:61 +msgid "" +" [name *.bat]\n" +" eol = crlf" +msgstr "" + +#: en/help_topics/eol.txt:64 +msgid "" +" [name *.sh]\n" +" eol = lf" +msgstr "" + +#: en/help_topics/eol.txt:70 +msgid "" +"If you take the care to create files with their required endings, you can\n" +"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n" +"safer to use ``lf`` and ``crlf`` though because edits accidentally\n" +"introducing mixed line endings will be corrected during commit for files\n" +"with those settings." +msgstr "" + +#: en/help_topics/eol.txt:76 +msgid "" +"If you have sample test data that deliberately has text files with mixed\n" +"newline conventions, you can ask for those to be left alone like this::" +msgstr "" + +#: en/help_topics/eol.txt:79 +msgid "" +" [name test_data/]\n" +" eol = exact" +msgstr "" + +#: en/help_topics/eol.txt:85 +msgid "" +"Note that ``exact`` does not imply the file is binary but it does mean\n" +"that no conversion of end-of-lines will be done. (Bazaar currently relies\n" +"of content analysis to detect binary files for commands like ``diff``.\n" +"In the future, a ``binary = true`` rule may be added but it is not\n" +"supported yet.)" +msgstr "" + +#: en/help_topics/eol.txt:91 +msgid "" +"If you have an existing repository with text files already stored using\n" +"Windows newline conventions (``crlf``), then you may want to keep using " +"that\n" +"convention in the repository. Forcing certain files to this convention\n" +"may also help users who do not have rules configured. To do this, set\n" +"``eol`` to one of the values below." +msgstr "" + +#: en/help_topics/eol.txt:97 +msgid "" +" ============================ ======================== " +"======================\n" +" Value Checkout end-of-lines as Commit end-of-lines " +"as\n" +" ============================ ======================== " +"======================\n" +" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n" +" ``lf`` otherwise\n" +" ---------------------------- ------------------------ ----------------------" +"\n" +" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n" +" ---------------------------- ------------------------ ----------------------" +"\n" +" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n" +" ============================ ======================== ======================" +msgstr "" + +#: en/help_topics/eol.txt:108 +msgid "" +"For users working on an existing project that uses Windows newline\n" +"conventions in their Bazaar repository, this rule is suggested as a\n" +"starting point::" +msgstr "" + +#: en/help_topics/eol.txt:112 +msgid "" +" [name *]\n" +" eol = native-with-crlf-in-repo" +msgstr "" + +#: en/help_topics/eol.txt:115 +msgid "" +"For new projects, it is recommended that end-of-lines be stored as ``lf``\n" +"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n" +"``crlf`` and ``exact``." +msgstr "" + +#: en/help_topics/eol.txt:119 +msgid "" +"Note: Bazaar's EOL conversion will convert the content of files but\n" +"never reject files because a given line ending or mixed line endings\n" +"are found. A precommit hook should be used if you wish to validate\n" +"(and not just convert) content before committing.\n" +msgstr "" + +#: en/help_topics/hidden-commands.txt:1 +msgid "" +"added List files added in working tree.\n" +"ancestry List all revisions merged into this branch.\n" +"assert-fail Test reporting of assertion failures\n" +"bundle-info Output interesting stats about a bundle\n" +"bundle-revisions Create a merge-directive for submitting changes.\n" +"cat-revision Write out metadata for a revision.\n" +"dump-btree Dump the contents of a btree index file to stdout.\n" +"export-pot Export command helps and error messages in po format.\n" +"file-id Print file_id of a particular file or directory.\n" +"file-path Print path of file_ids to a file or directory.\n" +"find-merge-base Find and print a base revision for merging two " +"branches.\n" +"hooks Show hooks.\n" +"inventory Show inventory of the current working copy or a " +"revision.\n" +"local-time-offset Show the offset in seconds from GMT to local time.\n" +"lookup-revision Lookup the revision-id from a revision-number\n" +"merge-directive Generate a merge directive for auto-merge tools.\n" +"modified List files modified in working tree.\n" +"re-sign Create a digital signature for an existing revision.\n" +"reference list, view and set branch locations for nested trees.\n" +"relpath Show path of a file relative to root\n" +"repair-workingtree Reset the working tree state file.\n" +"revision-history Display the list of revision ids on a branch.\n" +"revision-info Show revision number and revision id for a given " +"revision\n" +" identifier.\n" +"rocks Statement of optimism.\n" +"selftest Run internal test suite.\n" +"shell-complete Show appropriate completions for context.\n" +"test-script Run a shell-like test from a file.\n" +"touching-revisions Return revision-ids which affected a particular file.\n" +"unknowns List unknown files.\n" +"wait-until-signalled Test helper for\n" +" test_start_and_stop_bzr_subprocess_send_signal.\n" +msgstr "" + +#: en/help_topics/hooks.txt:1 +msgid "" +"\n" +"Hooks\n" +"=====" +msgstr "" + +#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4 +msgid "" +"Introduction\n" +"------------" +msgstr "" + +#: en/help_topics/hooks.txt:8 +msgid "A hook of type *xxx* of class *yyy* needs to be registered using::" +msgstr "" + +#: en/help_topics/hooks.txt:10 +msgid " yyy.hooks.install_named_hook(\"xxx\", ...)" +msgstr "" + +#: en/help_topics/hooks.txt:12 +msgid "" +"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples." +msgstr "" + +#: en/help_topics/hooks.txt:14 +msgid "" +"The class that contains each hook is given before the hooks it supplies. " +"For\n" +"instance, BranchHooks as the class is the hooks class for\n" +"`bzrlib.branch.Branch.hooks`." +msgstr "" + +#: en/help_topics/hooks.txt:18 +msgid "" +"Each description also indicates whether the hook runs on the client (the\n" +"machine where bzr was invoked) or the server (the machine addressed by\n" +"the branch URL). These may be, but are not necessarily, the same machine." +msgstr "" + +#: en/help_topics/hooks.txt:22 +msgid "" +"Plugins (including hooks) are run on the server if all of these is true:" +msgstr "" + +#: en/help_topics/hooks.txt:24 +msgid "" +" * The connection is via a smart server (accessed with a URL starting with\n" +" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a " +"\"http://\"\n" +" URL when a smart server is available via HTTP)." +msgstr "" + +#: en/help_topics/hooks.txt:28 +msgid "" +" * The hook is either server specific or part of general infrastructure " +"rather\n" +" than client specific code (such as commit)." +msgstr "" + +#: en/help_topics/hooks.txt:31 +msgid "" +"\n" +"BranchHooks\n" +"-----------" +msgstr "" + +#: en/help_topics/hooks.txt:35 +msgid "" +"automatic_tag_name\n" +"~~~~~~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56 +#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:262 +msgid "Introduced in: 2.2" +msgstr "" + +#: en/help_topics/hooks.txt:40 +msgid "" +"Called to determine an automatic tag name for a revision.\n" +"automatic_tag_name is called with (branch, revision_id) and should\n" +"return a tag name or None if no tag name could be determined. The\n" +"first non-None tag name returned will be used." +msgstr "" + +#: en/help_topics/hooks.txt:45 +msgid "" +"open\n" +"~~~~" +msgstr "" + +#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:293 +#: en/help_topics/hooks.txt:307 +msgid "Introduced in: 1.8" +msgstr "" + +#: en/help_topics/hooks.txt:50 +msgid "" +"Called with the Branch object that has been opened after a branch is\n" +"opened." +msgstr "" + +#: en/help_topics/hooks.txt:53 +msgid "" +"post_branch_init\n" +"~~~~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/hooks.txt:58 +msgid "" +"Called after new branch initialization completes. post_branch_init is\n" +"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n" +"branch and checkout (both heavyweight and lightweight) will all\n" +"trigger this hook." +msgstr "" + +#: en/help_topics/hooks.txt:63 +msgid "" +"post_change_branch_tip\n" +"~~~~~~~~~~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:421 +msgid "Introduced in: 1.4" +msgstr "" + +#: en/help_topics/hooks.txt:68 +msgid "" +"Called in bzr client and server after a change to the tip of a branch\n" +"is made. post_change_branch_tip is called with a\n" +"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n" +"uncommit will all trigger this hook." +msgstr "" + +#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:392 +msgid "" +"post_commit\n" +"~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86 +#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110 +msgid "Introduced in: 0.15" +msgstr "" + +#: en/help_topics/hooks.txt:78 +msgid "" +"Called in the bzr client after a commit has completed. post_commit is\n" +"called with (local, master, old_revno, old_revid, new_revno,\n" +"new_revid). old_revid is NULL_REVISION for the first commit to a\n" +"branch." +msgstr "" + +#: en/help_topics/hooks.txt:83 +msgid "" +"post_pull\n" +"~~~~~~~~~" +msgstr "" + +#: en/help_topics/hooks.txt:88 +msgid "" +"Called after a pull operation completes. post_pull is called with a\n" +"bzrlib.branch.PullResult object and only runs in the bzr client." +msgstr "" + +#: en/help_topics/hooks.txt:91 +msgid "" +"post_push\n" +"~~~~~~~~~" +msgstr "" + +#: en/help_topics/hooks.txt:96 +msgid "" +"Called after a push operation completes. post_push is called with a\n" +"bzrlib.branch.BranchPushResult object and only runs in the bzr client." +msgstr "" + +#: en/help_topics/hooks.txt:99 +msgid "" +"post_switch\n" +"~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/hooks.txt:104 +msgid "" +"Called after a checkout switches branch. post_switch is called with a\n" +"bzrlib.branch.SwitchHookParams." +msgstr "" + +#: en/help_topics/hooks.txt:107 +msgid "" +"post_uncommit\n" +"~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/hooks.txt:112 +msgid "" +"Called in the bzr client after an uncommit completes. post_uncommit is\n" +"called with (local, master, old_revno, old_revid, new_revno,\n" +"new_revid) where local is the local branch or None, master is the\n" +"target branch, and an empty branch receives new_revno of 0, new_revid\n" +"of None." +msgstr "" + +#: en/help_topics/hooks.txt:118 +msgid "" +"pre_change_branch_tip\n" +"~~~~~~~~~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/hooks.txt:121 +msgid "Introduced in: 1.6" +msgstr "" + +#: en/help_topics/hooks.txt:123 +msgid "" +"Called in bzr client and server before a change to the tip of a branch\n" +"is made. pre_change_branch_tip is called with a\n" +"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n" +"uncommit will all trigger this hook." +msgstr "" + +#: en/help_topics/hooks.txt:128 +msgid "" +"pre_commit\n" +"~~~~~~~~~~" +msgstr "" + +#: en/help_topics/hooks.txt:131 +msgid "Introduced in: 0.91" +msgstr "" + +#: en/help_topics/hooks.txt:133 +msgid "" +"Called after a commit is calculated but before it is completed.\n" +"pre_commit is called with (local, master, old_revno, old_revid,\n" +"future_revno, future_revid, tree_delta, future_tree). old_revid is\n" +"NULL_REVISION for the first commit to a branch, tree_delta is a\n" +"TreeDelta object describing changes from the basis revision. hooks\n" +"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n" +"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n" +"tree." +msgstr "" + +#: en/help_topics/hooks.txt:142 +msgid "" +"set_rh\n" +"~~~~~~" +msgstr "" + +#: en/help_topics/hooks.txt:147 +msgid "" +"Invoked whenever the revision history has been set via\n" +"set_revision_history. The api signature is (branch, revision_history),\n" +"and the branch will be write-locked. The set_rh hook can be expensive\n" +"for bzr to trigger, a better hook to use is\n" +"Branch.post_change_branch_tip." +msgstr "" + +#: en/help_topics/hooks.txt:142 +msgid "" +"transform_fallback_location\n" +"~~~~~~~~~~~~~~~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/hooks.txt:145 +msgid "Introduced in: 1.9" +msgstr "" + +#: en/help_topics/hooks.txt:147 +msgid "" +"Called when a stacked branch is activating its fallback locations.\n" +"transform_fallback_location is called with (branch, url), and should\n" +"return a new url. Returning the same url allows it to be used as-is,\n" +"returning a different one can be used to cause the branch to stack on\n" +"a closer copy of that fallback_location. Note that the branch cannot\n" +"have history accessing methods called on it during this hook because\n" +"the fallback locations have not been activated. When there are\n" +"multiple hooks installed for transform_fallback_location, all are\n" +"called with the url returned from the previous hook.The order is\n" +"however undefined." +msgstr "" + +#: en/help_topics/hooks.txt:158 +msgid "" +"CommandHooks\n" +"------------" +msgstr "" + +#: en/help_topics/hooks.txt:161 +msgid "" +"extend_command\n" +"~~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/hooks.txt:164 +msgid "Introduced in: 1.13" +msgstr "" + +#: en/help_topics/hooks.txt:166 +msgid "" +"Called after creating a command object to allow modifications such as\n" +"adding or removing options, docs etc. Called with the new\n" +"bzrlib.commands.Command object." +msgstr "" + +#: en/help_topics/hooks.txt:170 +msgid "" +"get_command\n" +"~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/hooks.txt:173 en/help_topics/hooks.txt:185 +#: en/help_topics/hooks.txt:194 en/help_topics/hooks.txt:467 +msgid "Introduced in: 1.17" +msgstr "" + +#: en/help_topics/hooks.txt:175 +msgid "" +"Called when creating a single command. Called with (cmd_or_None,\n" +"command_name). get_command should either return the cmd_or_None\n" +"parameter, or a replacement Command object that should be used for the\n" +"command. Note that the Command.hooks hooks are core infrastructure.\n" +"Many users will prefer to use bzrlib.commands.register_command or\n" +"plugin_cmds.register_lazy." +msgstr "" + +#: en/help_topics/hooks.txt:182 +msgid "" +"get_missing_command\n" +"~~~~~~~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/hooks.txt:187 +msgid "" +"Called when creating a single command if no command could be found.\n" +"Called with (command_name). get_missing_command should either return\n" +"None, or a Command object to be used for the command." +msgstr "" + +#: en/help_topics/hooks.txt:191 +msgid "" +"list_commands\n" +"~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/hooks.txt:196 +msgid "" +"Called when enumerating commands. Called with a set of cmd_name\n" +"strings for all the commands found so far. This set is safe to mutate\n" +"- e.g. to remove a command. list_commands should return the updated\n" +"set of command names." +msgstr "" + +#: en/help_topics/hooks.txt:215 +msgid "" +"_ConfigHooks\n" +"------------" +msgstr "" + +#: en/help_topics/hooks.txt:218 +msgid "" +"get\n" +"~~~" +msgstr "" + +#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229 +#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244 +#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373 +#: en/help_topics/hooks.txt:446 +msgid "Introduced in: 2.4" +msgstr "" + +#: en/help_topics/hooks.txt:223 +msgid "" +"Invoked when a config option is read. The signature is (stack, name,\n" +"value)." +msgstr "" + +#: en/help_topics/hooks.txt:226 +msgid "" +"load\n" +"~~~~" +msgstr "" + +#: en/help_topics/hooks.txt:231 +msgid "Invoked when a config store is loaded. The signature is (store)." +msgstr "" + +#: en/help_topics/hooks.txt:233 +msgid "" +"remove\n" +"~~~~~~" +msgstr "" + +#: en/help_topics/hooks.txt:238 +msgid "" +"Invoked when a config option is removed. The signature is (stack,\n" +"name)." +msgstr "" + +#: en/help_topics/hooks.txt:241 +msgid "" +"save\n" +"~~~~" +msgstr "" + +#: en/help_topics/hooks.txt:246 +msgid "Invoked when a config store is saved. The signature is (store)." +msgstr "" + +#: en/help_topics/hooks.txt:248 +msgid "" +"set\n" +"~~~" +msgstr "" + +#: en/help_topics/hooks.txt:253 +msgid "" +"Invoked when a config option is set. The signature is (stack, name,\n" +"value)." +msgstr "" + +#: en/help_topics/hooks.txt:256 +msgid "" +"ControlDirHooks\n" +"---------------" +msgstr "" + +#: en/help_topics/hooks.txt:259 +msgid "" +"post_repo_init\n" +"~~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/hooks.txt:264 +msgid "" +"Invoked after a repository has been initialized. post_repo_init is\n" +"called with a bzrlib.controldir.RepoInitHookParams." +msgstr "" + +#: en/help_topics/hooks.txt:267 +msgid "" +"pre_open\n" +"~~~~~~~~" +msgstr "" + +#: en/help_topics/hooks.txt:270 +msgid "Introduced in: 1.14" +msgstr "" + +#: en/help_topics/hooks.txt:272 +msgid "" +"Invoked before attempting to open a ControlDir with the transport that\n" +"the open will use." +msgstr "" + +#: en/help_topics/hooks.txt:275 +msgid "" +"InfoHooks\n" +"---------" +msgstr "" + +#: en/help_topics/hooks.txt:278 +msgid "" +"repository\n" +"~~~~~~~~~~" +msgstr "" + +#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300 +#: en/help_topics/hooks.txt:524 +msgid "Introduced in: 1.15" +msgstr "" + +#: en/help_topics/hooks.txt:283 +msgid "" +"Invoked when displaying the statistics for a repository. repository is\n" +"called with a statistics dictionary as returned by the repository and\n" +"a file-like object to write to." +msgstr "" + +#: en/help_topics/hooks.txt:287 +msgid "" +"LockHooks\n" +"---------" +msgstr "" + +#: en/help_topics/hooks.txt:290 +msgid "" +"lock_acquired\n" +"~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/hooks.txt:295 +msgid "" +"Called with a bzrlib.lock.LockResult when a physical lock is acquired." +msgstr "" + +#: en/help_topics/hooks.txt:297 +msgid "" +"lock_broken\n" +"~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/hooks.txt:302 +msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken." +msgstr "" + +#: en/help_topics/hooks.txt:304 +msgid "" +"lock_released\n" +"~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/hooks.txt:309 +msgid "" +"Called with a bzrlib.lock.LockResult when a physical lock is released." +msgstr "" + +#: en/help_topics/hooks.txt:311 +msgid "" +"MergeHooks\n" +"----------" +msgstr "" + +#: en/help_topics/hooks.txt:314 +msgid "" +"merge_file_content\n" +"~~~~~~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/hooks.txt:317 +msgid "Introduced in: 2.1" +msgstr "" + +#: en/help_topics/hooks.txt:319 +msgid "" +"Called with a bzrlib.merge.Merger object to create a per file merge\n" +"object when starting a merge. Should return either None or a subclass\n" +"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n" +"called per file that needs to be merged (including when one side has\n" +"deleted the file and the other has changed it). See the\n" +"AbstractPerFileMerger API docs for details on how it is used by merge." +msgstr "" + +#: en/help_topics/hooks.txt:326 +msgid "" +"post_merge\n" +"~~~~~~~~~~" +msgstr "" + +#: en/help_topics/hooks.txt:329 en/help_topics/hooks.txt:337 +#: en/help_topics/hooks.txt:387 en/help_topics/hooks.txt:405 +#: en/help_topics/hooks.txt:413 en/help_topics/hooks.txt:512 +msgid "Introduced in: 2.5" +msgstr "" + +#: en/help_topics/hooks.txt:331 +msgid "" +"Called after a merge. Receives a Merger object as the single argument.\n" +"The return value is ignored." +msgstr "" + +#: en/help_topics/hooks.txt:334 +msgid "" +"pre_merge\n" +"~~~~~~~~~" +msgstr "" + +#: en/help_topics/hooks.txt:339 +msgid "" +"Called before a merge. Receives a Merger object as the single\n" +"argument." +msgstr "" + +#: en/help_topics/hooks.txt:342 +msgid "" +"MergeDirectiveHooks\n" +"-------------------" +msgstr "" + +#: en/help_topics/hooks.txt:345 +msgid "" +"merge_request_body\n" +"~~~~~~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/hooks.txt:348 +msgid "Introduced in: 1.15.0" +msgstr "" + +#: en/help_topics/hooks.txt:350 +msgid "" +"Called with a MergeRequestBodyParams when a body is needed for a merge\n" +"request. Callbacks must return a body. If more than one callback is\n" +"registered, the output of one callback is provided to the next." +msgstr "" + +#: en/help_topics/hooks.txt:354 +msgid "" +"MessageEditorHooks\n" +"------------------" +msgstr "" + +#: en/help_topics/hooks.txt:357 +msgid "" +"commit_message_template\n" +"~~~~~~~~~~~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/hooks.txt:360 +msgid "Introduced in: 1.10" +msgstr "" + +#: en/help_topics/hooks.txt:362 +msgid "" +"Called when a commit message is being generated.\n" +"commit_message_template is called with the bzrlib.commit.Commit object\n" +"and the message that is known so far. commit_message_template must\n" +"return a new message to use (which could be the same as it was given).\n" +"When there are multiple hooks registered for commit_message_template,\n" +"they are chained with the result from the first passed into the\n" +"second, and so on." +msgstr "" + +#: en/help_topics/hooks.txt:370 +msgid "" +"set_commit_message\n" +"~~~~~~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/hooks.txt:375 +msgid "" +"Set a fixed commit message. set_commit_message is called with the\n" +"bzrlib.commit.Commit object (so you can also change e.g. revision\n" +"properties by editing commit.builder._revprops) and the message so\n" +"far. set_commit_message must return the message to use or None if it\n" +"should use the message editor as normal." +msgstr "" + +#: en/help_topics/hooks.txt:381 +msgid "" +"MutableTreeHooks\n" +"----------------" +msgstr "" + +#: en/help_topics/hooks.txt:384 +msgid "" +"post_build_tree\n" +"~~~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/hooks.txt:389 +msgid "" +"Called after a completely new tree is built. The hook is called with\n" +"the tree as its only argument." +msgstr "" + +#: en/help_topics/hooks.txt:395 +msgid "Introduced in: 2.0" +msgstr "" + +#: en/help_topics/hooks.txt:397 +msgid "" +"Called after a commit is performed on a tree. The hook is called with\n" +"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n" +"commit was performed on is available via the mutable_tree attribute of\n" +"that object." +msgstr "" + +#: en/help_topics/hooks.txt:402 +msgid "" +"post_transform\n" +"~~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/hooks.txt:407 +msgid "" +"Called after a tree transform has been performed on a tree. The hook\n" +"is called with the tree that is being transformed and the transform." +msgstr "" + +#: en/help_topics/hooks.txt:410 +msgid "" +"pre_transform\n" +"~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/hooks.txt:415 +msgid "" +"Called before a tree transform on this tree. The hook is called with\n" +"the tree that is being transformed and the transform." +msgstr "" + +#: en/help_topics/hooks.txt:418 +msgid "" +"start_commit\n" +"~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/hooks.txt:423 +msgid "" +"Called before a commit is performed on a tree. The start commit hook\n" +"is able to change the tree before the commit takes place. start_commit\n" +"is called with the bzrlib.mutabletree.MutableTree that the commit is\n" +"being performed on." +msgstr "" + +#: en/help_topics/hooks.txt:428 +msgid "" +"SmartClientHooks\n" +"----------------" +msgstr "" + +#: en/help_topics/hooks.txt:431 +msgid "" +"call\n" +"~~~~" +msgstr "" + +#: en/help_topics/hooks.txt:434 +msgid "Introduced in: unknown" +msgstr "" + +#: en/help_topics/hooks.txt:436 +msgid "" +"Called when the smart client is submitting a request to the smart\n" +"server. Called with a bzrlib.smart.client.CallHookParams object.\n" +"Streaming request bodies, and responses, are not accessible." +msgstr "" + +#: en/help_topics/hooks.txt:440 +msgid "" +"SmartServerHooks\n" +"----------------" +msgstr "" + +#: en/help_topics/hooks.txt:443 +msgid "" +"server_exception\n" +"~~~~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/hooks.txt:448 +msgid "" +"Called by the bzr server when an exception occurs. server_exception is\n" +"called with the sys.exc_info() tuple return true for the hook if the\n" +"exception has been handled, in which case the server will exit\n" +"normally." +msgstr "" + +#: en/help_topics/hooks.txt:453 +msgid "" +"server_started\n" +"~~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/hooks.txt:456 en/help_topics/hooks.txt:475 +msgid "Introduced in: 0.16" +msgstr "" + +#: en/help_topics/hooks.txt:458 +msgid "" +"Called by the bzr server when it starts serving a directory.\n" +"server_started is called with (backing urls, public url), where\n" +"backing_url is a list of URLs giving the server-specific directory\n" +"locations, and public_url is the public URL for the directory being\n" +"served." +msgstr "" + +#: en/help_topics/hooks.txt:464 +msgid "" +"server_started_ex\n" +"~~~~~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/hooks.txt:469 +msgid "" +"Called by the bzr server when it starts serving a directory.\n" +"server_started is called with (backing_urls, server_obj)." +msgstr "" + +#: en/help_topics/hooks.txt:472 +msgid "" +"server_stopped\n" +"~~~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/hooks.txt:477 +msgid "" +"Called by the bzr server when it stops serving a directory.\n" +"server_stopped is called with the same parameters as the\n" +"server_started hook: (backing_urls, public_url)." +msgstr "" + +#: en/help_topics/hooks.txt:481 +msgid "" +"StatusHooks\n" +"-----------" +msgstr "" + +#: en/help_topics/hooks.txt:484 +msgid "" +"post_status\n" +"~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498 +msgid "Introduced in: 2.3" +msgstr "" + +#: en/help_topics/hooks.txt:489 +msgid "" +"Called with argument StatusHookParams after Bazaar has displayed the\n" +"status. StatusHookParams has the attributes (old_tree, new_tree,\n" +"to_file, versioned, show_ids, short, verbose). The last four arguments\n" +"correspond to the command line options specified by the user for the\n" +"status command. to_file is the output stream for writing." +msgstr "" + +#: en/help_topics/hooks.txt:495 +msgid "" +"pre_status\n" +"~~~~~~~~~~" +msgstr "" + +#: en/help_topics/hooks.txt:500 +msgid "" +"Called with argument StatusHookParams before Bazaar displays the\n" +"status. StatusHookParams has the attributes (old_tree, new_tree,\n" +"to_file, versioned, show_ids, short, verbose). The last four arguments\n" +"correspond to the command line options specified by the user for the\n" +"status command. to_file is the output stream for writing." +msgstr "" + +#: en/help_topics/hooks.txt:506 +msgid "" +"TransportHooks\n" +"--------------" +msgstr "" + +#: en/help_topics/hooks.txt:509 +msgid "" +"post_connect\n" +"~~~~~~~~~~~~" +msgstr "" + +#: en/help_topics/hooks.txt:514 +msgid "" +"Called after a new connection is established or a reconnect occurs.\n" +"The sole argument passed is either the connected transport or smart\n" +"medium instance." +msgstr "" + +#: en/help_topics/hooks.txt:518 +msgid "" +"RioVersionInfoBuilderHooks\n" +"--------------------------" +msgstr "" + +#: en/help_topics/hooks.txt:521 +msgid "" +"revision\n" +"~~~~~~~~" +msgstr "" + +#: en/help_topics/hooks.txt:526 +msgid "" +"Invoked when adding information about a revision to the RIO stanza\n" +"that is printed. revision is called with a revision object and a RIO\n" +"stanza.\n" +msgstr "" + +#: en/help_topics/location-alias.txt:1 +msgid "" +"Location aliases\n" +"================" +msgstr "" + +#: en/help_topics/location-alias.txt:4 +msgid "" +"Bazaar defines several aliases for locations associated with a branch. " +"These\n" +"can be used with most commands that expect a location, such as `bzr push`." +msgstr "" + +#: en/help_topics/location-alias.txt:7 +msgid "The aliases are::" +msgstr "" + +#: en/help_topics/location-alias.txt:9 +msgid "" +" :bound The branch this branch is bound to, for bound branches.\n" +" :parent The parent of this branch.\n" +" :public The public location of this branch.\n" +" :push The saved location used for `bzr push` with no arguments.\n" +" :submit The submit branch for this branch.\n" +" :this This branch." +msgstr "" + +#: en/help_topics/location-alias.txt:16 +msgid "For example, to push to the parent location::" +msgstr "" + +#: en/help_topics/location-alias.txt:18 +msgid " bzr push :parent\n" +msgstr "" + +#: en/help_topics/log-formats.txt:1 +msgid "" +"Log Formats\n" +"===========" +msgstr "" + +#: en/help_topics/log-formats.txt:4 +msgid "" +"A log format controls how information about each revision is displayed.\n" +"The standard log formats are compared below::" +msgstr "" + +#: en/help_topics/log-formats.txt:7 +msgid "" +" Feature long short line\n" +" ---------------------- ------------- ------------ -------------------\n" +" design goal detailed view concise view 1 revision per line\n" +" committer name+email name only name only\n" +" author name+email - -\n" +" date-time format full date only date only\n" +" commit message full full top line\n" +" tags yes yes yes\n" +" merges indicator - yes -\n" +" status/delta optional optional -\n" +" diff/patch optional optional -\n" +" revision-id optional optional -\n" +" branch nick yes - -\n" +" foreign vcs properties yes yes -\n" +" preferred levels all 1 1\n" +" digital signature optional - -" +msgstr "" + +#: en/help_topics/log-formats.txt:24 +msgid "" +"The default format is ``long``. To change this, define the ``log_format``\n" +"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::" +msgstr "" + +#: en/help_topics/log-formats.txt:27 +msgid "" +" [DEFAULT]\n" +" log_format = short" +msgstr "" + +#: en/help_topics/log-formats.txt:30 +msgid "" +"Alternatively, to change the log format used for a given query, use the\n" +"--long, --short or --line options." +msgstr "" + +#: en/help_topics/log-formats.txt:33 +msgid "" +"If one of the standard log formats does not meet your needs, additional\n" +"formats can be provided by plugins.\n" +msgstr "" + +#: en/help_topics/other-formats.txt:1 +msgid "Other Storage Formats" +msgstr "" + +#: en/help_topics/other-formats.txt:3 +msgid "Experimental formats are shown below." +msgstr "" + +#: en/help_topics/other-formats.txt:5 +msgid "" +":development-colo:\n" +" (native) The 2a format with experimental support for colocated\n" +" branches." +msgstr "" + +#: en/help_topics/other-formats.txt:9 +msgid "" +"\n" +"Deprecated formats are shown below." +msgstr "" + +#: en/help_topics/other-formats.txt:12 +msgid "" +":pack-0.92:\n" +" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n" +" Interoperates with bzr repositories before 0.92 but cannot be read\n" +" by bzr < 0.92." +msgstr "" + +#: en/help_topics/patterns.txt:1 +msgid "" +"Patterns\n" +"========" +msgstr "" + +#: en/help_topics/patterns.txt:4 +msgid "" +"Bazaar uses patterns to match files at various times. For example,\n" +"the ``add`` command skips over files that match ignore patterns\n" +"and preferences can be associated with files using rule patterns.\n" +"The pattern syntax is described below." +msgstr "" + +#: en/help_topics/patterns.txt:9 +msgid "" +"Trailing slashes on patterns are ignored. If the pattern contains a\n" +"slash or is a regular expression, it is compared to the whole path\n" +"from the branch root. Otherwise, it is compared to only the last\n" +"component of the path. To match a file only in the root directory,\n" +"prepend ``./``. Patterns specifying absolute paths are not allowed." +msgstr "" + +#: en/help_topics/patterns.txt:15 +msgid "Patterns may include globbing wildcards such as::" +msgstr "" + +#: en/help_topics/patterns.txt:17 +msgid "" +" ? - Matches any single character except '/'\n" +" * - Matches 0 or more characters except '/'\n" +" /**/ - Matches 0 or more directories in a path\n" +" [a-z] - Matches a single character from within a group of characters" +msgstr "" + +#: en/help_topics/patterns.txt:22 +msgid "" +"Patterns may also be `Python regular expressions`_. Regular expression\n" +"patterns are identified by a ``RE:`` prefix followed by the regular\n" +"expression. Regular expression patterns may not include named or\n" +"numbered groups." +msgstr "" + +#: en/help_topics/patterns.txt:27 +msgid "" +"Case insensitive ignore patterns can be specified with regular expressions\n" +"by using the ``i`` (for ignore case) flag in the pattern." +msgstr "" + +#: en/help_topics/patterns.txt:30 +msgid "" +"For example, a case insensitive match for ``foo`` may be specified as::" +msgstr "" + +#: en/help_topics/patterns.txt:32 +msgid " RE:(?i)foo" +msgstr "" + +#: en/help_topics/patterns.txt:34 +msgid "" +"Ignore patterns may be prefixed with ``!``, which means that a filename\n" +"matched by that pattern will not be ignored." +msgstr "" + +#: en/help_topics/patterns.txt:37 +msgid "" +".. _Python regular expressions: http://docs.python.org/library/re.html" +msgstr "" + +#: en/help_topics/revisionspec.txt:1 +msgid "Revision Identifiers" +msgstr "" + +#: en/help_topics/revisionspec.txt:3 +msgid "" +"A revision identifier refers to a specific state of a branch's history. It\n" +"can be expressed in several ways. It can begin with a keyword to\n" +"unambiguously specify a given lookup type; some examples are 'last:1',\n" +"'before:yesterday' and 'submit:'." +msgstr "" + +#: en/help_topics/revisionspec.txt:8 +msgid "" +"Alternately, it can be given without a keyword, in which case it will be\n" +"checked as a revision number, a tag, a revision id, a date specification, or " +"a\n" +"branch specification, in that order. For example, 'date:today' could be\n" +"written as simply 'today', though if you have a tag called 'today' that " +"will\n" +"be found first." +msgstr "" + +#: en/help_topics/revisionspec.txt:14 +msgid "" +"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n" +"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n" +"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes " +"or\n" +"spaces around the '..')." +msgstr "" + +#: en/help_topics/revisionspec.txt:19 +msgid "" +"Ranges are interpreted differently by different commands. To the \"log\" " +"command,\n" +"a range is a sequence of log messages, but to the \"diff\" command, the " +"range\n" +"denotes a change between revisions (and not a sequence of changes). In\n" +"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" " +"consider it\n" +"to be open-ended, that is, they include one end but not the other. For " +"example:\n" +"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and " +"3649,\n" +"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 " +"and\n" +"3649, but not 3647." +msgstr "" + +#: en/help_topics/revisionspec.txt:28 +msgid "The keywords used as revision selection methods are the following:" +msgstr "" + +#: en/help_topics/revisionspec.txt:30 +msgid "" +":revid:\n" +"\tSelects a revision using the revision id.\n" +":submit:\n" +"\tSelects a common ancestor with the submit branch.\n" +":ancestor:\n" +"\tSelects a common ancestor with a second branch.\n" +":date:\n" +"\tSelects a revision on the basis of a datestamp.\n" +":branch:\n" +"\tSelects the last revision of a specified branch.\n" +":tag:\n" +"\tSelects a revision identified by a tag name.\n" +":revno:\n" +"\tSelects a revision using a number.\n" +":before:\n" +"\tSelects the parent of the revision specified.\n" +":annotate:\n" +"\tSelect the revision that last modified the specified line.\n" +":mainline:\n" +"\tSelect mainline revision that merged the specified revision.\n" +":last:\n" +"\tSelects the nth revision from the end." +msgstr "" + +#: en/help_topics/revisionspec.txt:53 +msgid "In addition, plugins can provide other keywords." +msgstr "" + +#: en/help_topics/revisionspec.txt:55 +msgid "A detailed description of each keyword is given below." +msgstr "" + +#: en/help_topics/revisionspec.txt:57 +msgid ":revid:" +msgstr "" + +#: en/help_topics/revisionspec.txt:59 +msgid "" +" Supply a specific revision id, that can be used to specify any\n" +" revision id in the ancestry of the branch.\n" +" Including merges, and pending merges.\n" +" Examples::" +msgstr "" + +#: en/help_topics/revisionspec.txt:64 +msgid "" +" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'" +msgstr "" + +#: en/help_topics/revisionspec.txt:66 +msgid ":submit:" +msgstr "" + +#: en/help_topics/revisionspec.txt:68 +msgid "" +" Diffing against this shows all the changes that were made in this " +"branch,\n" +" and is a good predictor of what merge will do. The submit branch is\n" +" used by the bundle and merge directive commands. If no submit branch\n" +" is specified, the parent branch is used instead." +msgstr "" + +#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85 +msgid "" +" The common ancestor is the last revision that existed in both\n" +" branches. Usually this is the branch point, but it could also be\n" +" a revision that was merged." +msgstr "" + +#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93 +#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119 +#: en/help_topics/revisionspec.txt:153 +msgid " Examples::" +msgstr "" + +#: en/help_topics/revisionspec.txt:79 +msgid " $ bzr diff -r submit:" +msgstr "" + +#: en/help_topics/revisionspec.txt:81 +msgid ":ancestor:" +msgstr "" + +#: en/help_topics/revisionspec.txt:83 +msgid " Supply the path to a branch to select the common ancestor." +msgstr "" + +#: en/help_topics/revisionspec.txt:89 +msgid "" +" This is frequently used with 'diff' to return all of the changes\n" +" that your branch introduces, while excluding the changes that you\n" +" have not merged from the remote branch." +msgstr "" + +#: en/help_topics/revisionspec.txt:95 +msgid "" +" ancestor:/path/to/branch\n" +" $ bzr diff -r ancestor:../../mainline/branch" +msgstr "" + +#: en/help_topics/revisionspec.txt:98 +msgid ":date:" +msgstr "" + +#: en/help_topics/revisionspec.txt:100 +msgid "" +" Supply a datestamp to select the first revision that matches the date.\n" +" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n" +" Matches the first entry after a given date (either at midnight or\n" +" at a specified time)." +msgstr "" + +#: en/help_topics/revisionspec.txt:105 +msgid " One way to display all the changes since yesterday would be::" +msgstr "" + +#: en/help_topics/revisionspec.txt:107 +msgid " bzr log -r date:yesterday.." +msgstr "" + +#: en/help_topics/revisionspec.txt:111 +msgid "" +" date:yesterday -> select the first revision since " +"yesterday\n" +" date:2006-08-14,17:10:14 -> select the first revision after\n" +" August 14th, 2006 at 5:10pm." +msgstr "" + +#: en/help_topics/revisionspec.txt:115 +msgid ":branch:" +msgstr "" + +#: en/help_topics/revisionspec.txt:117 +msgid " Supply the path to a branch to select its last revision." +msgstr "" + +#: en/help_topics/revisionspec.txt:121 +msgid " branch:/path/to/branch" +msgstr "" + +#: en/help_topics/revisionspec.txt:123 +msgid ":tag:" +msgstr "" + +#: en/help_topics/revisionspec.txt:125 +msgid " Tags are stored in the branch and created by the 'tag' command." +msgstr "" + +#: en/help_topics/revisionspec.txt:127 +msgid ":revno:" +msgstr "" + +#: en/help_topics/revisionspec.txt:129 +msgid "" +" Use an integer to specify a revision in the history of the branch.\n" +" Optionally a branch can be specified. A negative number will count\n" +" from the end of the branch (-1 is the last revision, -2 the previous\n" +" one). If the negative number is larger than the branch's history, the\n" +" first revision is returned.\n" +" Examples::" +msgstr "" + +#: en/help_topics/revisionspec.txt:136 +msgid "" +" revno:1 -> return the first revision of this branch\n" +" revno:3:/path/to/branch -> return the 3rd revision of\n" +" the branch '/path/to/branch'\n" +" revno:-1 -> The last revision in a branch.\n" +" -2:http://other/branch -> The second to last revision in the\n" +" remote branch.\n" +" -1000000 -> Most likely the first revision, unless\n" +" your history is very long." +msgstr "" + +#: en/help_topics/revisionspec.txt:145 +msgid ":before:" +msgstr "" + +#: en/help_topics/revisionspec.txt:147 +msgid "" +" Supply any revision spec to return the parent of that revision. This " +"is\n" +" mostly useful when inspecting revisions that are not in the revision " +"history\n" +" of a branch." +msgstr "" + +#: en/help_topics/revisionspec.txt:151 +msgid "" +" It is an error to request the parent of the null revision (before:0)." +msgstr "" + +#: en/help_topics/revisionspec.txt:155 +msgid "" +" before:1913 -> Return the parent of revno 1913 (revno 1912)\n" +" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n" +" aaaa@bbbb-1234567890\n" +" bzr diff -r before:1913..1913\n" +" -> Find the changes between revision 1913 and its parent " +"(1912).\n" +" (What changes did revision 1913 introduce).\n" +" This is equivalent to: bzr diff -c 1913" +msgstr "" + +#: en/help_topics/revisionspec.txt:163 +msgid ":annotate:" +msgstr "" + +#: en/help_topics/revisionspec.txt:165 +msgid "" +" Select the revision that last modified the specified line. Line is\n" +" specified as path:number. Path is a relative path to the file. " +"Numbers\n" +" start at 1, and are relative to the current version, not the last-\n" +" committed version of the file." +msgstr "" + +#: en/help_topics/revisionspec.txt:170 +msgid ":mainline:" +msgstr "" + +#: en/help_topics/revisionspec.txt:172 +msgid "" +" Select the revision that merged the specified revision into mainline." +msgstr "" + +#: en/help_topics/revisionspec.txt:174 +msgid ":last:" +msgstr "" + +#: en/help_topics/revisionspec.txt:176 +msgid "" +" Supply a positive number to get the nth revision from the end.\n" +" This is the same as supplying negative numbers to the 'revno:' spec.\n" +" Examples::" +msgstr "" + +#: en/help_topics/revisionspec.txt:180 +msgid "" +" last:1 -> return the last revision\n" +" last:3 -> return the revision 2 before the end.\n" +msgstr "" + +#: en/help_topics/rules.txt:1 +msgid "" +"Rules\n" +"=====" +msgstr "" + +#: en/help_topics/rules.txt:7 +msgid "" +"Rules are defined in ini file format where the sections are file glob\n" +"patterns and the contents of each section are the preferences for files\n" +"matching that pattern(s). For example::" +msgstr "" + +#: en/help_topics/rules.txt:11 +msgid "" +" [name *.bat]\n" +" eol = native" +msgstr "" + +#: en/help_topics/rules.txt:14 +msgid "" +" [name *.html *.xml]\n" +" keywords = xml_escape" +msgstr "" + +#: en/help_topics/rules.txt:17 +msgid "" +"Preferences like these are useful for commands and plugins wishing to\n" +"provide custom behaviour for selected files. For more information on \n" +"end of line conversion see :doc:`eol-help`.\n" +"Keyword support is provided by the `keywords plugin\n" +"`_." +msgstr "" + +#: en/help_topics/rules.txt:23 +msgid "" +"Files\n" +"-----" +msgstr "" + +#: en/help_topics/rules.txt:26 +msgid "" +"Default rules for all branches are defined in the optional file\n" +"``BZR_HOME/rules``. " +msgstr "" + +#: en/help_topics/rules.txt:29 +msgid "" +"Rule Patterns\n" +"-------------" +msgstr "" + +#: en/help_topics/rules.txt:32 +msgid "" +"Patterns are ordered and searching stops as soon as one matches.\n" +"As a consequence, more explicit patterns should be placed towards\n" +"the top of the file. Rule patterns use exactly the same conventions\n" +"as ignore patterns. See :doc:`patterns-help` for details." +msgstr "" + +#: en/help_topics/rules.txt:37 +msgid ".. note::" +msgstr "" + +#: en/help_topics/rules.txt:39 +msgid "" +" Patterns containing square brackets or spaces should be\n" +" surrounded in quotes to ensure they are correctly parsed.\n" +msgstr "" + +#: en/help_topics/topics.txt:1 +msgid "" +"authentication Information on configuring authentication\n" +"basic Basic commands\n" +"branches Information on what a branch is\n" +"bugs Bug tracker settings\n" +"checkouts Information on what a checkout is\n" +"commands Basic help for all commands\n" +"configuration Details on the configuration settings available\n" +"conflict-types Types of conflicts and what to do about them\n" +"content-filters Conversion of content into/from working trees\n" +"criss-cross Information on criss-cross merging\n" +"current-formats Current storage formats\n" +"debug-flags Options to show or record debug information\n" +"diverged-branches How to fix diverged branches\n" +"env-variables Environment variable names and values\n" +"eol Information on end-of-line handling\n" +"files Information on configuration and log files\n" +"formats Information on choosing a storage format\n" +"global-options Options that control how Bazaar runs\n" +"hidden-commands All hidden commands\n" +"hooks Points at which custom processing can be added\n" +"launchpad Using Bazaar with Launchpad.net\n" +"location-alias Aliases for remembered locations\n" +"log-formats Details on the logging formats available\n" +"other-formats Experimental and deprecated storage formats\n" +"patterns Information on the pattern syntax\n" +"repositories Basic information on shared repositories.\n" +"revisionspec Explain how to use --revision\n" +"rules Information on defining rule-based preferences\n" +"standalone-trees Information on what a standalone tree is\n" +"standard-options Options that can be used with any command\n" +"status-flags Help on status flags\n" +"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n" +"topics Topics list\n" +"url-special-chars Special character handling in URLs\n" +"urlspec Supported transport protocols\n" +"working-trees Information on working trees\n" +msgstr "" + +#: en/help_topics/url-special-chars.txt:1 +msgid "" +"Special character handling in URLs\n" +"==================================" +msgstr "" + +#: en/help_topics/url-special-chars.txt:4 +msgid "Bazaar allows locations to be specified in multiple ways, either:" +msgstr "" + +#: en/help_topics/url-special-chars.txt:6 +msgid " * Fully qualified URLs" +msgstr "" + +#: en/help_topics/url-special-chars.txt:8 +msgid " * File system paths, relative or absolute" +msgstr "" + +#: en/help_topics/url-special-chars.txt:10 +msgid "" +"Internally bzr treats all locations as URLs. For any file system paths\n" +"that are specified it will automatically determine the appropriate URL\n" +"representation, and escape special characters where necessary." +msgstr "" + +#: en/help_topics/url-special-chars.txt:14 +msgid "" +"There are a few characters which have special meaning in URLs and need " +"careful\n" +"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n" +"value in URLs. Any non-ASCII characters in a file path will automatically " +"be\n" +"urlencoded when the path is converted to a URL." +msgstr "" + +#: en/help_topics/url-special-chars.txt:19 +msgid "" +"URLs represent non-ASCII characters in an encoding defined by the server, " +"but\n" +"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to " +"be\n" +"generous in what it accepts as a URL and to print them in a way that\n" +"will be readable." +msgstr "" + +#: en/help_topics/url-special-chars.txt:24 +msgid "" +"For example, if you have a directory named '/tmp/%2False' these are all " +"valid\n" +"ways of accessing the content (0x2F, or 47, is the ASCII code for forward " +"slash)::" +msgstr "" + +#: en/help_topics/url-special-chars.txt:27 +msgid "" +" cd /tmp\n" +" bzr log /tmp/%2False\n" +" bzr log %2False\n" +" bzr log file:///tmp/%252False\n" +" bzr log file://localhost/tmp/%252False\n" +" bzr log file:%252False" +msgstr "" + +#: en/help_topics/url-special-chars.txt:34 +msgid "These are valid but do not refer to the same file::" +msgstr "" + +#: en/help_topics/url-special-chars.txt:36 +msgid "" +" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n" +" bzr log %252False (refers to a file called /tmp/%252False)" +msgstr "" + +#: en/help_topics/url-special-chars.txt:39 +msgid "" +"Comma also has special meaning in URLs, because it denotes `segment " +"parameters`_" +msgstr "" + +#: en/help_topics/url-special-chars.txt:41 +msgid "" +"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)" +msgstr "" + +#: en/help_topics/url-special-chars.txt:43 +msgid "" +"Comma is also special in any file system paths that are specified. To use a " +"literal\n" +"comma in a file system path, specify a URL and URL encode the comma::" +msgstr "" + +#: en/help_topics/url-special-chars.txt:46 +msgid "" +" bzr log foo,branch=bla # path \"foo\" with the segment parameter " +"\"branch\" set to \"bla\"\n" +" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n" +" bzr log file:foo,branch=bla # path \"foo\" with segment parameter " +"\"branch\" set to \"bla\"\n" +msgstr "" + +#: en/help_topics/urlspec.txt:1 +msgid "URL Identifiers" +msgstr "" + +#: en/help_topics/urlspec.txt:3 +msgid "Supported URL prefixes::" +msgstr "" + +#: en/help_topics/urlspec.txt:5 +msgid "" +" aftp:// Access using active FTP.\n" +" bzr:// Fast access using the Bazaar smart server.\n" +" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n" +" file:// Access using the standard filesystem (default)\n" +" ftp:// Access using passive FTP.\n" +" http:// Read-only access of branches exported on the web.\n" +" https:// Read-only access of branches exported on the web using " +"SSL.\n" +" sftp:// Access using SFTP (most SSH servers provide SFTP)." +msgstr "" + +#: en/help_topics/urlspec.txt:14 +msgid "Supported modifiers::" +msgstr "" + +#: en/help_topics/urlspec.txt:16 +msgid " gio+ Access using any GIO supported protocols." +msgstr "" + +#: en/help_topics/urlspec.txt:18 +msgid "Bazaar supports all of the standard parts within the URL::" +msgstr "" + +#: en/help_topics/urlspec.txt:20 +msgid " ://[user[:password]@]host[:port]/[path]" +msgstr "" + +#: en/help_topics/urlspec.txt:22 +msgid "allowing URLs such as::" +msgstr "" + +#: en/help_topics/urlspec.txt:24 +msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk" +msgstr "" + +#: en/help_topics/urlspec.txt:26 +msgid "" +"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n" +"with '~' as meaning that the rest of the path should be interpreted\n" +"relative to the remote user's home directory. For example if the user\n" +"``remote`` has a home directory of ``/home/remote`` on the server\n" +"shell.example.com, then::" +msgstr "" + +#: en/help_topics/urlspec.txt:32 +msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk" +msgstr "" + +#: en/help_topics/urlspec.txt:34 +msgid "would refer to ``/home/remote/myproject/trunk``." +msgstr "" + +#: en/help_topics/urlspec.txt:36 +msgid "" +"Many commands that accept URLs also accept location aliases too.\n" +"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n" +msgstr "" diff -Nru language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/checkbox.po language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/checkbox.po --- language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/checkbox.po 2012-05-08 22:48:02.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/checkbox.po 2013-01-29 09:36:57.000000000 +0000 @@ -9,15 +9,15 @@ msgstr "" "Project-Id-Version: checkbox\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-14 00:28+0000\n" +"POT-Creation-Date: 2013-01-18 23:32+0000\n" "PO-Revision-Date: 2012-04-14 19:46+0000\n" "Last-Translator: Carlos Gong \n" "Language-Team: Chinese (simplified) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-08 06:43+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2013-01-28 15:47+0000\n" +"X-Generator: Launchpad (build 16451)\n" "Language: \n" #. Title of the user interface @@ -2522,12 +2522,12 @@ msgstr "确认实时时钟(RTC)设备存在" #. description -#: ../jobs/power-management.txt.in:71 +#: ../jobs/power-management.txt.in:72 msgid "Test ACPI Wakealarm (fwts wakealarm) " msgstr "测试 ACPI 的唤醒报警特性（fwts wakealarm） " #. description -#: ../jobs/power-management.txt.in:80 +#: ../jobs/power-management.txt.in:81 msgid "" "Check to see if CONFIG_NO_HZ is set in the kernel (this is just a simple " "regression check)" @@ -2977,7 +2977,7 @@ msgstr "此测试自动进行，并且在 usb/insert 测试运行后执行。" #. description -#: ../jobs/usb.txt.in:111 +#: ../jobs/usb.txt.in:112 msgid "" "This is an automated version of usb/storage-automated and assumes that the " "server has usb storage devices plugged in prior to checkbox execution. It " @@ -2987,7 +2987,7 @@ "自动测试。" #. description -#: ../jobs/usb.txt.in:119 +#: ../jobs/usb.txt.in:120 msgid "" "PURPOSE:\n" " This test will check your USB connection.\n" diff -Nru language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/command-not-found.po language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/command-not-found.po --- language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/command-not-found.po 2012-05-08 22:47:52.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/command-not-found.po 2013-01-29 09:37:14.000000000 +0000 @@ -7,63 +7,144 @@ msgstr "" "Project-Id-Version: command-not-found\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2007-03-20 18:10+0100\n" +"POT-Creation-Date: 2012-05-31 17:42+0300\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: 2012-05-08 05:21+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2013-01-28 14:20+0000\n" +"X-Generator: Launchpad (build 16451)\n" -#: ../CommandNotFound/CommandNotFound.py:135 -msgid "Ubuntu has the following similar programs" -msgstr "Ubuntu 带有以下类似的程序" +#: ../CommandNotFound/CommandNotFound.py:148 +#, python-format +msgid "No command '%s' found, but there are %s similar ones" +msgstr "未找到 '%s' 命令，有%s 个相似命令" + +#: ../CommandNotFound/CommandNotFound.py:150 +#, python-format +msgid "No command '%s' found, did you mean:" +msgstr "未找到 '%s' 命令，您要输入的是否是：" + +#: ../CommandNotFound/CommandNotFound.py:152 +#, python-format +msgid " Command '%s' from package '%s' (%s)" +msgstr " 命令 '%s' 来自于包 '%s' (%s)" + +#: ../CommandNotFound/CommandNotFound.py:210 +msgid "Do you want to install it? (N/y)" +msgstr "您要安装吗？(N/y)" + +#: ../CommandNotFound/CommandNotFound.py:218 +msgid "y" +msgstr "是" + +#: ../CommandNotFound/CommandNotFound.py:245 +#, python-format +msgid "Command '%(command)s' is available in '%(place)s'" +msgstr "命令 '%(command)s' 可在 '%(place)s' 处找到" + +#: ../CommandNotFound/CommandNotFound.py:247 +#, python-format +msgid "Command '%(command)s' is available in the following places" +msgstr "命令 '%(command)s' 可在以下位置找到" + +#: ../CommandNotFound/CommandNotFound.py:252 +#, python-format +msgid "" +"The command could not be located because '%s' is not included in the PATH " +"environment variable." +msgstr "由于%s 不在PATH 环境变量中，故无法找到该命令。" -#: ../CommandNotFound/CommandNotFound.py:139 +#: ../CommandNotFound/CommandNotFound.py:254 +msgid "" +"This is most likely caused by the lack of administrative privileges " +"associated with your user account." +msgstr "这很可能是由您的用户账户没有管理员权限造成的。" + +#: ../CommandNotFound/CommandNotFound.py:269 #, python-format msgid "The program '%s' is currently not installed. " msgstr "程序“%s”尚未安装。 " -#: ../CommandNotFound/CommandNotFound.py:141 -#: ../CommandNotFound/CommandNotFound.py:144 +#: ../CommandNotFound/CommandNotFound.py:271 +#: ../CommandNotFound/CommandNotFound.py:275 msgid "You can install it by typing:" msgstr "您可以使用以下命令安装：" -#: ../CommandNotFound/CommandNotFound.py:147 +#: ../CommandNotFound/CommandNotFound.py:279 #, python-format msgid "" "To run '%(command)s' please ask your administrator to install the package " "'%(package)s'" msgstr "如需运行 '%(command)s'，请要求管理员安装 '%(package)s' 软件包" -#: ../CommandNotFound/CommandNotFound.py:149 -#: ../CommandNotFound/CommandNotFound.py:161 +#: ../CommandNotFound/CommandNotFound.py:281 #, python-format -msgid "Make sure you have the '%s' component enabled" -msgstr "请您确认组件 '%s' 已被启用" +msgid "You will have to enable the component called '%s'" +msgstr "您必须启用%s 组件" -#: ../CommandNotFound/CommandNotFound.py:151 +#: ../CommandNotFound/CommandNotFound.py:284 #, python-format msgid "The program '%s' can be found in the following packages:" msgstr "程序 '%s' 已包含在下列软件包中：" -#: ../CommandNotFound/CommandNotFound.py:155 -#: ../CommandNotFound/CommandNotFound.py:157 +#: ../CommandNotFound/CommandNotFound.py:289 +#, python-format +msgid "You will have to enable component called '%s'" +msgstr "您必须启用%s 组件" + +#: ../CommandNotFound/CommandNotFound.py:291 +#: ../CommandNotFound/CommandNotFound.py:293 #, python-format msgid "Try: %s " msgstr "请尝试：%s <选定的软件包>" -#: ../CommandNotFound/CommandNotFound.py:159 +#: ../CommandNotFound/CommandNotFound.py:295 msgid "Ask your administrator to install one of them" msgstr "请要求管理员安装其中的一个" -#: ../command-not-found:18 +#: ../command-not-found:74 #, c-format msgid "%prog [options] " msgstr "%prog [选项] <命令>" -#: ../command-not-found:20 +#: ../command-not-found:77 msgid "use this path to locate data fields" msgstr "使用该路径以定位数据域" + +#: ../command-not-found:80 +msgid "ignore local binaries and display the available packages" +msgstr "忽略本地二进制文件并显示可用软件包" + +#: ../command-not-found:83 +msgid "don't print ': command not found'" +msgstr "不输出 “：未找到命令”" + +#: ../command-not-found:88 +#, c-format +msgid "%s: command not found" +msgstr "%s：未找到命令" + +#: ../CommandNotFound/util.py:26 +msgid "Sorry, command-not-found has crashed! Please file a bug report at:" +msgstr "抱歉，command-not-found 崩溃了！请在以下地址报告错误：" + +#: ../CommandNotFound/util.py:28 +msgid "Please include the following information with the report:" +msgstr "请在报告中包含以下信息：" + +#: ../CommandNotFound/util.py:30 +#, python-format +msgid "command-not-found version: %s" +msgstr "command-not-found 版本：%s" + +#: ../CommandNotFound/util.py:31 +#, python-format +msgid "Python version: %d.%d.%d %s %d" +msgstr "Python 版本：%d.%d.%d %s %d" + +#: ../CommandNotFound/util.py:37 +msgid "Exception information:" +msgstr "额外信息：" diff -Nru language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/compiz.po language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/compiz.po --- language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/compiz.po 2012-05-08 22:47:52.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/compiz.po 2013-01-29 09:37:12.000000000 +0000 @@ -7,62 +7,62 @@ msgstr "" "Project-Id-Version: Compiz\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-27 12:02+0000\n" -"PO-Revision-Date: 2012-04-27 14:57+0000\n" +"POT-Creation-Date: 2012-12-21 19:28+0000\n" +"PO-Revision-Date: 2012-12-22 07:11+0000\n" "Last-Translator: Sephinroth \n" "Language-Team: Novell Language \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-08 05:17+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2013-01-28 14:17+0000\n" +"X-Generator: Launchpad (build 16451)\n" #: ../gtk/gnome/compiz.desktop.in.h:1 msgid "Compiz" msgstr "Compiz" -#: ../gtk/window-decorator/events.c:134 ../metadata/core.xml.in.h:48 +#: ../gtk/window-decorator/events.c:138 ../metadata/core.xml.in.h:48 msgid "Close Window" msgstr "关闭窗口" -#: ../gtk/window-decorator/events.c:157 ../metadata/core.xml.in.h:58 +#: ../gtk/window-decorator/events.c:161 ../metadata/core.xml.in.h:58 msgid "Unmaximize Window" msgstr "恢复窗口" -#: ../gtk/window-decorator/events.c:160 ../metadata/core.xml.in.h:56 +#: ../gtk/window-decorator/events.c:164 ../metadata/core.xml.in.h:56 msgid "Maximize Window" msgstr "最大化窗口" -#: ../gtk/window-decorator/events.c:210 ../metadata/core.xml.in.h:54 +#: ../gtk/window-decorator/events.c:214 ../metadata/core.xml.in.h:54 msgid "Minimize Window" msgstr "最小化窗口" -#: ../gtk/window-decorator/events.c:230 ../metadata/core.xml.in.h:64 +#: ../gtk/window-decorator/events.c:234 ../metadata/core.xml.in.h:64 msgid "Window Menu" msgstr "窗口菜单" # 此功能完全不能用调整大小来描述，我找这个功能找了N久，才发现：调整大小！ = =； -#: ../gtk/window-decorator/events.c:253 +#: ../gtk/window-decorator/events.c:257 msgid "Shade" msgstr "阴影" -#: ../gtk/window-decorator/events.c:277 +#: ../gtk/window-decorator/events.c:281 msgid "Make Above" msgstr "置于上面" -#: ../gtk/window-decorator/events.c:301 +#: ../gtk/window-decorator/events.c:305 msgid "Stick" msgstr "粘滞窗口" -#: ../gtk/window-decorator/events.c:323 +#: ../gtk/window-decorator/events.c:327 msgid "Unshade" msgstr "去除阴影" -#: ../gtk/window-decorator/events.c:345 +#: ../gtk/window-decorator/events.c:349 msgid "Unmake Above" msgstr "取消顶置" -#: ../gtk/window-decorator/events.c:369 +#: ../gtk/window-decorator/events.c:373 msgid "Unstick" msgstr "取消粘滞" @@ -347,7 +347,7 @@ msgid "Raise Window" msgstr "升起窗口" -#: ../metadata/core.xml.in.h:51 +#: ../gtk/gnome/50-compiz-windows.xml.in.h:12 ../metadata/core.xml.in.h:51 msgid "Raise window above other windows" msgstr "将窗口升起到其它窗口之上" @@ -1409,10 +1409,22 @@ msgstr "允许全屏窗口的绘制不重定向到屏幕外的象素映射" #: ../plugins/composite/composite.xml.in.h:11 +msgid "Unredirect Match" +msgstr "" + +#: ../plugins/composite/composite.xml.in.h:12 +msgid "" +"Specifies which windows will be unredirected when they are fullscreen. You " +"might want to exclude video players for example, to avoid tearing. But this " +"will be at the expense of performance/frame rate. Note: \"class=\" matching " +"requires the regex plugin to work." +msgstr "" + +#: ../plugins/composite/composite.xml.in.h:13 msgid "Force independent output painting." msgstr "强制独立输出绘图" -#: ../plugins/composite/composite.xml.in.h:12 +#: ../plugins/composite/composite.xml.in.h:14 msgid "" "Paint each output device independly, even if the output devices overlap" msgstr "单独绘制每个输出设备，即便输出设备重复" @@ -1877,7 +1889,7 @@ msgid "Move Window" msgstr "移动窗口" -#: ../plugins/move/move.xml.in.h:2 +#: ../gtk/gnome/50-compiz-windows.xml.in.h:10 ../plugins/move/move.xml.in.h:2 msgid "Move window" msgstr "移动窗口" @@ -1961,7 +1973,8 @@ msgid "Window specific settings" msgstr "窗口相关设置" -#: ../plugins/obs/obs.xml.in.h:11 ../plugins/place/place.xml.in.h:32 +#: ../gtk/gnome/50-compiz-windows.xml.in.h:1 ../plugins/obs/obs.xml.in.h:11 +#: ../plugins/place/place.xml.in.h:32 msgid "Windows" msgstr "窗口" @@ -2095,6 +2108,19 @@ msgid "If available use compression for textures converted from images" msgstr "如果可能，对从图片转换来的纹理进行压缩" +#: ../plugins/opengl/opengl.xml.in.h:14 +msgid "Unredirect Driver Blacklist" +msgstr "" + +#: ../plugins/opengl/opengl.xml.in.h:15 +msgid "" +"If non-empty, specifies a POSIX (extended) regular expression to match " +"against the OpenGL driver strings (newline separated): \"GL_VENDOR\\" +"nGL_RENDERER\\nGL_VERSION\". If the regular expression matches a substring " +"of that concatenation then no windows will ever be unredirected while using " +"that particular graphics driver." +msgstr "" + #: ../plugins/place/place.xml.in.h:1 msgid "Place Windows" msgstr "放置窗口" @@ -2272,6 +2298,7 @@ msgid "Resize Window" msgstr "调整窗口大小" +#: ../gtk/gnome/50-compiz-windows.xml.in.h:11 #: ../plugins/resize/resize.xml.in.h:2 msgid "Resize window" msgstr "调整窗口大小" @@ -3166,26 +3193,50 @@ msgstr "每次降雨效果之间的延时(以毫秒为单位)" #: ../plugins/water/water.xml.in.h:13 +msgid "lightVec X" +msgstr "" + +#: ../plugins/water/water.xml.in.h:14 +msgid "Light vector X coordinate" +msgstr "" + +#: ../plugins/water/water.xml.in.h:15 +msgid "lightVec Y" +msgstr "" + +#: ../plugins/water/water.xml.in.h:16 +msgid "Light vector Y coordinate" +msgstr "" + +#: ../plugins/water/water.xml.in.h:17 +msgid "lightVec Z" +msgstr "" + +#: ../plugins/water/water.xml.in.h:18 +msgid "Light vector Z coordinate" +msgstr "" + +#: ../plugins/water/water.xml.in.h:19 msgid "Title wave" msgstr "波浪标题" -#: ../plugins/water/water.xml.in.h:14 +#: ../plugins/water/water.xml.in.h:20 msgid "Wave effect from window title" msgstr "窗口标题的波浪效果" -#: ../plugins/water/water.xml.in.h:15 +#: ../plugins/water/water.xml.in.h:21 msgid "Point" msgstr "点" -#: ../plugins/water/water.xml.in.h:16 +#: ../plugins/water/water.xml.in.h:22 msgid "Add point" msgstr "增加点" -#: ../plugins/water/water.xml.in.h:17 +#: ../plugins/water/water.xml.in.h:23 msgid "Line" msgstr "线" -#: ../plugins/water/water.xml.in.h:18 +#: ../plugins/water/water.xml.in.h:24 msgid "Add line" msgstr "增加线" diff -Nru language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/coreutils.po language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/coreutils.po --- language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/coreutils.po 2012-05-08 22:47:26.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/coreutils.po 2013-01-29 09:37:11.000000000 +0000 @@ -13,15 +13,15 @@ "Project-Id-Version: coreutils 8.11-pre1\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" "POT-Creation-Date: 2011-09-08 17:09+0200\n" -"PO-Revision-Date: 2012-04-26 03:14+0000\n" -"Last-Translator: Wylmer Wang \n" +"PO-Revision-Date: 2012-11-20 02:44+0000\n" +"Last-Translator: Aron Xu \n" "Language-Team: Chinese (simplified) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2012-05-08 02:07+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2013-01-28 10:48+0000\n" +"X-Generator: Launchpad (build 16451)\n" "Language: zh_CN\n" #: lib/argmatch.c:133 @@ -35,7 +35,6 @@ msgstr "%2$s 的参数%1$s 不明确" #: lib/argmatch.c:153 -#, c-format msgid "Valid arguments are:" msgstr "有效的参数为：" @@ -43,30 +42,30 @@ msgid "error closing file" msgstr "关闭文件时出错" -#: lib/closeout.c:112 src/base64.c:110 src/base64.c:122 src/base64.c:128 -#: src/base64.c:169 src/base64.c:225 src/cat.c:187 src/cat.c:203 src/cat.c:287 -#: src/cksum.c:251 src/expand.c:332 src/expand.c:357 src/head.c:299 -#: src/head.c:349 src/head.c:757 src/head.c:798 src/mktemp.c:351 src/od.c:915 -#: src/paste.c:160 src/shuf.c:370 src/split.c:654 src/split.c:891 -#: src/split.c:896 src/tail.c:350 src/tail.c:1200 src/tail.c:1306 -#: src/tail.c:2203 src/tr.c:1621 src/tr.c:1846 src/tr.c:1940 -#: src/unexpand.c:429 src/unexpand.c:445 +#: lib/closeout.c:112 src/base64.c:109 src/base64.c:121 src/base64.c:127 +#: src/base64.c:168 src/base64.c:224 src/cat.c:186 src/cat.c:202 src/cat.c:286 +#: src/cksum.c:251 src/expand.c:330 src/expand.c:355 src/head.c:298 +#: src/head.c:348 src/head.c:764 src/head.c:805 src/mktemp.c:351 src/od.c:919 +#: src/paste.c:160 src/shuf.c:369 src/split.c:742 src/split.c:979 +#: src/split.c:984 src/tail.c:350 src/tail.c:1202 src/tail.c:1308 +#: src/tail.c:2205 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 +#: src/unexpand.c:427 src/unexpand.c:443 #, c-format msgid "write error" msgstr "写入错误" -#: lib/copy-acl.c:638 src/copy.c:1154 src/copy.c:2536 +#: lib/copy-acl.c:611 src/copy.c:1165 src/copy.c:2612 #, c-format msgid "preserving permissions for %s" msgstr "%s 的保留权限" -#: lib/error.c:185 +#: lib/error.c:188 msgid "Unknown system error" msgstr "未知的系统错误" -#: lib/euidaccess-stat.c:128 src/copy.c:1575 src/copy.c:1627 src/copy.c:2206 -#: src/copy.c:2523 src/find-mount-point.c:84 src/install.c:661 src/stat.c:1206 -#: src/truncate.c:353 +#: src/copy.c:1642 src/copy.c:1694 src/copy.c:2277 src/copy.c:2599 +#: src/find-mount-point.c:84 src/install.c:679 src/realpath.c:145 +#: src/stat.c:1237 src/truncate.c:364 #, c-format msgid "cannot stat %s" msgstr "无法获取%s 的文件状态(stat)" @@ -123,79 +122,79 @@ msgid "weird file" msgstr "古怪文件" -#: lib/gai_strerror.c:60 +#: lib/gai_strerror.c:57 msgid "Address family for hostname not supported" msgstr "主机名的地址家族不被支持" -#: lib/gai_strerror.c:61 +#: lib/gai_strerror.c:58 msgid "Temporary failure in name resolution" msgstr "名称解析出现临时错误" -#: lib/gai_strerror.c:62 +#: lib/gai_strerror.c:59 msgid "Bad value for ai_flags" msgstr "错误的ai_flags 值" -#: lib/gai_strerror.c:63 +#: lib/gai_strerror.c:60 msgid "Non-recoverable failure in name resolution" msgstr "名称解析时出现不可恢复的错误" -#: lib/gai_strerror.c:64 +#: lib/gai_strerror.c:61 msgid "ai_family not supported" msgstr "不支持的ai_family" -#: lib/gai_strerror.c:65 +#: lib/gai_strerror.c:62 msgid "Memory allocation failure" msgstr "内存分配失败" -#: lib/gai_strerror.c:66 +#: lib/gai_strerror.c:63 msgid "No address associated with hostname" msgstr "没有与主机名关联的地址" -#: lib/gai_strerror.c:67 +#: lib/gai_strerror.c:64 msgid "Name or service not known" msgstr "名称或服务未知" -#: lib/gai_strerror.c:68 +#: lib/gai_strerror.c:65 msgid "Servname not supported for ai_socktype" msgstr "ai_socktype 不支持 Servname" -#: lib/gai_strerror.c:69 +#: lib/gai_strerror.c:66 msgid "ai_socktype not supported" msgstr "不支持ai_socktype" -#: lib/gai_strerror.c:70 +#: lib/gai_strerror.c:67 msgid "System error" msgstr "系统错误" -#: lib/gai_strerror.c:71 +#: lib/gai_strerror.c:68 msgid "Argument buffer too small" msgstr "参数缓冲区太小" -#: lib/gai_strerror.c:73 +#: lib/gai_strerror.c:70 msgid "Processing request in progress" msgstr "正在处理请求" -#: lib/gai_strerror.c:74 +#: lib/gai_strerror.c:71 msgid "Request canceled" msgstr "请求已取消" -#: lib/gai_strerror.c:75 +#: lib/gai_strerror.c:72 msgid "Request not canceled" msgstr "请求未取消" -#: lib/gai_strerror.c:76 +#: lib/gai_strerror.c:73 msgid "All requests done" msgstr "全部请求已完成" -#: lib/gai_strerror.c:77 +#: lib/gai_strerror.c:74 msgid "Interrupted by a signal" msgstr "被信号中断" -#: lib/gai_strerror.c:78 +#: lib/gai_strerror.c:75 msgid "Parameter string not correctly encoded" msgstr "参数字符串编码不正确" -#: lib/gai_strerror.c:90 +#: lib/gai_strerror.c:87 msgid "Unknown error" msgstr "未知错误" @@ -254,18 +253,19 @@ msgid "%s: option '-W %s' requires an argument\n" msgstr "%s：选项\"-W %s\"必需带参数\n" -#: lib/mkdir-p.c:196 src/install.c:465 +#: lib/mkdir-p.c:196 src/install.c:484 #, c-format msgid "cannot change permissions of %s" msgstr "无法更改%s 的权限" -#: lib/mkdir-p.c:206 src/copy.c:2195 src/install.c:692 src/install.c:705 +#: lib/mkdir-p.c:206 src/copy.c:2266 src/install.c:710 src/install.c:723 #, c-format msgid "cannot create directory %s" msgstr "无法创建目录%s" -#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 src/csplit.c:220 -#: src/split.c:842 +#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 src/csplit.c:219 +#: src/split.c:930 src/tac.c:435 +#, c-format msgid "memory exhausted" msgstr "内存耗尽" @@ -281,105 +281,107 @@ #. TRANSLATORS: #. Get translations for open and closing quotation marks. -#. #. The message catalog should translate "`" to a left #. quotation mark suitable for the locale, and similarly for -#. "'". If the catalog has no translation, -#. locale_quoting_style quotes `like this', and -#. clocale_quoting_style quotes "like this". +#. "'". For example, a French Unicode local should translate +#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), respectively. #. -#. For example, an American English Unicode locale should -#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and -#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION -#. MARK). A British English Unicode locale should instead -#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) -#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively. +#. If the catalog has no translation, we will try to +#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and +#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK). If the +#. current locale is not Unicode, locale_quoting_style +#. will quote 'like this', and clocale_quoting_style will +#. quote "like this". You should always include translations +#. for "`" and "'" even if U+2018 and U+2019 are appropriate +#. for your locale. #. #. If you don't know what to put here, please see -#. +#. #. and use glyphs suitable for your language. -#: lib/quotearg.c:271 +#: lib/quotearg.c:312 msgid "`" msgstr "\"" -#: lib/quotearg.c:272 +#: lib/quotearg.c:313 msgid "'" msgstr "\"" -#: lib/randread.c:125 +#: lib/randread.c:128 #, c-format msgid "%s: end of file" msgstr "%s：文件结束" -#: lib/regcomp.c:133 +#: lib/regcomp.c:130 msgid "Success" msgstr "成功" -#: lib/regcomp.c:136 +#: lib/regcomp.c:133 msgid "No match" msgstr "无匹配" -#: lib/regcomp.c:139 +#: lib/regcomp.c:136 msgid "Invalid regular expression" msgstr "无效的正则表达式" -#: lib/regcomp.c:142 +#: lib/regcomp.c:139 msgid "Invalid collation character" msgstr "无效的校勘字符" -#: lib/regcomp.c:145 +#: lib/regcomp.c:142 msgid "Invalid character class name" msgstr "无效的字符类型名" -#: lib/regcomp.c:148 +#: lib/regcomp.c:145 msgid "Trailing backslash" msgstr "末尾的反斜杠" -#: lib/regcomp.c:151 +#: lib/regcomp.c:148 msgid "Invalid back reference" msgstr "无效的后向引用" -#: lib/regcomp.c:154 +#: lib/regcomp.c:151 msgid "Unmatched [ or [^" msgstr "未匹配的[ 或[^" -#: lib/regcomp.c:157 +#: lib/regcomp.c:154 msgid "Unmatched ( or \\(" msgstr "未匹配的( 或\\(" -#: lib/regcomp.c:160 +#: lib/regcomp.c:157 msgid "Unmatched \\{" msgstr "未匹配的\\{" -#: lib/regcomp.c:163 +#: lib/regcomp.c:160 msgid "Invalid content of \\{\\}" msgstr "\\{\\} 中内容无效" -#: lib/regcomp.c:166 +#: lib/regcomp.c:163 msgid "Invalid range end" msgstr "无效的范围结束符" -#: lib/regcomp.c:169 +#: lib/regcomp.c:166 msgid "Memory exhausted" msgstr "内存耗尽" -#: lib/regcomp.c:172 +#: lib/regcomp.c:169 msgid "Invalid preceding regular expression" msgstr "无效的前置正则表达式" -#: lib/regcomp.c:175 +#: lib/regcomp.c:172 msgid "Premature end of regular expression" msgstr "正则表达式异常结束" -#: lib/regcomp.c:178 +#: lib/regcomp.c:175 msgid "Regular expression too big" msgstr "正则表达式过长" -#: lib/regcomp.c:181 +#: lib/regcomp.c:178 msgid "Unmatched ) or \\)" msgstr "未匹配的 ) 或 \\)" -#: lib/regcomp.c:702 +#: lib/regcomp.c:703 msgid "No previous regular expression" msgstr "缺少之前的正则表达式" @@ -418,7 +420,7 @@ msgid "^[nN]" msgstr "^[nN]" -#: lib/set-mode-acl.c:682 src/copy.c:2218 src/cp.c:519 +#: lib/set-mode-acl.c:697 src/copy.c:2289 src/cp.c:518 #, c-format msgid "setting permissions for %s" msgstr "设置%s 的权限" @@ -559,12 +561,12 @@ msgid "Resource lost" msgstr "资源丢失" -#: lib/strsignal.c:110 +#: lib/strsignal.c:114 #, c-format msgid "Real-time signal %d" msgstr "实时信号%d" -#: lib/strsignal.c:114 +#: lib/strsignal.c:118 #, c-format msgid "Unknown signal %d" msgstr "未知信号%d" @@ -766,7 +768,7 @@ msgid "Report %s bugs to: %s\n" msgstr "请向 %2$s 报告 %1$s 的错误\n" -#: lib/version-etc.c:251 src/system.h:524 +#: lib/version-etc.c:251 src/system.h:565 #, c-format msgid "%s home page: <%s>\n" msgstr "%s 的主页：<%s>\n" @@ -776,7 +778,7 @@ msgid "%s home page: \n" msgstr "%s 项目主页：\n" -#: lib/version-etc.c:256 src/system.h:525 +#: lib/version-etc.c:256 src/system.h:566 msgid "General help using GNU software: \n" msgstr "GNU 软件一般性帮助：\n" @@ -801,7 +803,7 @@ msgid "failed to reopen %s with mode %s" msgstr "以%s 模式重新打开%s 失败" -#: lib/xmemcoll.c:39 src/expr.c:887 +#: lib/xmemcoll.c:39 src/expr.c:886 #, c-format msgid "string comparison failed" msgstr "字符串比较出现错误" @@ -867,7 +869,7 @@ msgid "Try `%s --help' for more information.\n" msgstr "请尝试执行\"%s --help\"来获取更多信息。\n" -#: src/base64.c:61 +#: src/base64.c:60 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" @@ -878,7 +880,7 @@ "使用 Base64 编码/解码文件或标准输入输出。\n" "\n" -#: src/base64.c:65 +#: src/base64.c:64 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -892,7 +894,7 @@ " -w, --wrap=字符数\t在指定的字符数后自动换行(默认为76)，0 为禁用自动换行\n" "\n" -#: src/base64.c:74 src/cat.c:111 src/fmt.c:293 src/shuf.c:72 src/sum.c:72 +#: src/base64.c:73 src/cat.c:110 src/fmt.c:296 src/shuf.c:71 src/sum.c:70 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -900,7 +902,7 @@ "\n" "如果没有指定文件，或者文件为\"-\"，则从标准输入读取。\n" -#: src/base64.c:77 +#: src/base64.c:76 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -912,53 +914,53 @@ "数据以 RFC 3548 规定的 Base64 字母格式进行编码。 解码时，输入数据(加密流)可能包含一些非有效 Base64 " "字符的新行字符。可以尝试用 --ignore-garbage 选项来恢复加密流中任何非 base64 字符。\n" -#: src/base64.c:172 src/base64.c:209 src/csplit.c:264 src/csplit.c:1436 -#: src/join.c:452 src/shuf.c:158 src/shuf.c:362 src/tac-pipe.c:75 -#: src/tee.c:205 src/tr.c:1645 +#: src/base64.c:171 src/base64.c:208 src/csplit.c:263 src/csplit.c:1437 +#: src/join.c:451 src/shuf.c:157 src/shuf.c:361 src/tac-pipe.c:74 +#: src/tee.c:204 src/tr.c:1644 #, c-format msgid "read error" msgstr "读取错误" -#: src/base64.c:228 +#: src/base64.c:227 #, c-format msgid "invalid input" msgstr "输入无效" -#: src/base64.c:265 +#: src/base64.c:264 #, c-format msgid "invalid wrap size: %s" msgstr "无效的换行字符数：%s" -#: src/base64.c:284 src/basename.c:119 src/comm.c:437 src/cp.c:608 -#: src/date.c:438 src/dircolors.c:448 src/dirname.c:97 src/du.c:881 -#: src/hostid.c:75 src/hostname.c:112 src/id.c:169 src/install.c:912 -#: src/join.c:962 src/link.c:86 src/ln.c:520 src/logname.c:72 src/mknod.c:158 -#: src/mv.c:448 src/od.c:1799 src/ptx.c:2082 src/readlink.c:155 src/seq.c:409 -#: src/shuf.c:321 src/shuf.c:340 src/sort.c:4465 src/split.c:1212 -#: src/tr.c:1798 src/tsort.c:556 src/tty.c:113 src/uname.c:253 src/uniq.c:455 -#: src/uniq.c:472 src/unlink.c:82 src/uptime.c:251 src/users.c:147 -#: src/wc.c:667 src/who.c:837 src/whoami.c:80 +#: src/base64.c:283 src/basename.c:173 src/comm.c:435 src/cp.c:607 +#: src/date.c:441 src/dircolors.c:447 src/du.c:937 src/hostid.c:74 +#: src/hostname.c:111 src/id.c:169 src/install.c:930 src/join.c:961 +#: src/link.c:85 src/ln.c:563 src/logname.c:71 src/mknod.c:157 src/mv.c:449 +#: src/nproc.c:119 src/od.c:1802 src/ptx.c:2081 src/readlink.c:154 +#: src/seq.c:519 src/shuf.c:320 src/shuf.c:339 src/sort.c:4532 +#: src/split.c:1327 src/tr.c:1797 src/tsort.c:555 src/tty.c:112 +#: src/uname.c:251 src/uniq.c:454 src/uniq.c:471 src/unlink.c:81 +#: src/uptime.c:250 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79 #, c-format msgid "extra operand %s" msgstr "额外的操作数 %s" -#: src/base64.c:316 src/cat.c:782 +#: src/base64.c:315 src/cat.c:781 #, c-format msgid "closing standard input" msgstr "关闭标准输入" #. This is a proper name. See the gettext manual, section Names. -#: src/basename.c:40 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36 -#: src/comm.c:39 src/cp.c:57 src/csplit.c:42 src/cut.c:45 src/date.c:39 -#: src/dd.c:44 src/df.c:42 src/dirname.c:34 src/du.c:53 src/env.c:33 -#: src/expand.c:50 src/fold.c:36 src/groups.c:35 src/head.c:45 src/id.c:39 -#: src/install.c:50 src/ln.c:40 src/ls.c:125 src/mkdir.c:36 src/mkfifo.c:33 +#: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36 +#: src/comm.c:38 src/cp.c:57 src/csplit.c:42 src/cut.c:45 src/date.c:39 +#: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 +#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:45 src/id.c:39 +#: src/install.c:50 src/ln.c:42 src/ls.c:124 src/mkdir.c:36 src/mkfifo.c:33 #: src/mknod.c:34 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63 -#: src/rm.c:42 src/rmdir.c:38 src/stty.c:65 src/su.c:88 src/sum.c:39 -#: src/tac.c:58 src/tail.c:69 src/tee.c:36 src/touch.c:45 src/tty.c:43 -#: src/uname.c:61 src/unexpand.c:51 src/uniq.c:42 src/uptime.c:46 -#: src/users.c:36 src/wc.c:51 src/who.c:49 src/yes.c:32 +#: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59 +#: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60 +#: src/unexpand.c:50 src/uniq.c:42 src/uptime.c:46 src/users.c:36 src/wc.c:51 +#: src/who.c:49 src/yes.c:32 msgid "David MacKenzie" msgstr "David MacKenzie" @@ -971,7 +973,7 @@ "用法：%s 名称 [后缀]\n" "　或：%s 选项\n" -#: src/basename.c:55 +#: src/basename.c:53 msgid "" "Print NAME with any leading directory components removed.\n" "If specified, also remove a trailing SUFFIX.\n" @@ -994,36 +996,38 @@ " %s /usr/bin/sort 输出\"sort\"。\n" " %s include/stdio.h .h 输出\"stdio\"。\n" -#: src/basename.c:113 src/chcon.c:524 src/chgrp.c:272 src/chmod.c:519 -#: src/chown.c:275 src/chroot.c:187 src/comm.c:429 src/csplit.c:1370 -#: src/dirname.c:91 src/expr.c:327 src/join.c:1148 src/link.c:78 -#: src/mkdir.c:184 src/mkfifo.c:109 src/mknod.c:147 src/nohup.c:112 -#: src/pathchk.c:149 src/printf.c:675 src/readlink.c:147 src/rm.c:315 -#: src/rmdir.c:224 src/seq.c:403 src/setuidgid.c:138 src/sleep.c:121 -#: src/stat.c:1468 src/stdbuf.c:347 src/tr.c:1783 src/unlink.c:76 +#: src/basename.c:167 src/chcon.c:531 src/chgrp.c:277 src/chmod.c:526 +#: src/chown.c:280 src/chroot.c:197 src/comm.c:427 src/csplit.c:1371 +#: src/dirname.c:116 src/expr.c:326 src/join.c:1147 src/link.c:77 +#: src/mkdir.c:183 src/mkfifo.c:108 src/mknod.c:146 src/nohup.c:111 +#: src/pathchk.c:148 src/printf.c:674 src/readlink.c:146 src/realpath.c:236 +#: src/rm.c:321 src/rmdir.c:223 src/seq.c:513 src/setuidgid.c:137 +#: src/sleep.c:119 src/stat.c:1493 src/stdbuf.c:346 src/tr.c:1782 +#: src/unlink.c:75 #, c-format msgid "missing operand" msgstr "缺少操作数" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:48 src/cp.c:56 src/df.c:41 src/du.c:52 src/split.c:49 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: 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:124 src/rm.c:43 src/split.c:50 +#: src/cat.c:49 src/comm.c:37 src/ls.c:123 src/rm.c:43 src/split.c:50 #: src/tee.c:35 src/uniq.c:41 msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:89 src/df.c:814 src/expand.c:105 src/fold.c:67 src/head.c:106 -#: src/ls.c:4596 src/nl.c:183 src/paste.c:436 src/pr.c:2770 src/sum.c:60 -#: src/tac.c:133 src/tail.c:258 src/tee.c:63 src/unexpand.c:115 +#: src/cat.c:88 src/df.c:872 src/expand.c:103 src/fold.c:66 src/head.c:105 +#: src/ls.c:4720 src/nl.c:182 src/paste.c:435 src/pr.c:2768 src/sum.c:58 +#: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" msgstr "用法：%s [选项]... [文件]...\n" -#: src/cat.c:93 +#: src/cat.c:92 msgid "" "Concatenate FILE(s), or standard input, to standard output.\n" "\n" @@ -1043,7 +1047,7 @@ " -n, --number 对输出的所有行编号\n" " -s, --squeeze-blank 不输出多行空行\n" -#: src/cat.c:103 +#: src/cat.c:102 msgid "" " -t equivalent to -vT\n" " -T, --show-tabs display TAB characters as ^I\n" @@ -1055,7 +1059,7 @@ " -u (被忽略)\n" " -v, --show-nonprinting 使用^ 和M- 引用，除了LFD和 TAB 之外\n" -#: src/cat.c:115 +#: src/cat.c:114 #, c-format msgid "" "\n" @@ -1068,17 +1072,17 @@ " %s f - g 先输出f 的内容，然后输出标准输入的内容，最后输出g 的内容。\n" " %s 将标准输入的内容复制到标准输出。\n" -#: src/cat.c:327 +#: src/cat.c:326 #, c-format msgid "cannot do ioctl on %s" msgstr "无法在 %s 上执行 ioctrl" -#: src/cat.c:638 src/dd.c:2053 src/sort.c:381 src/tee.c:166 src/yes.c:87 +#: src/cat.c:637 src/dd.c:2217 src/sort.c:383 src/tee.c:165 src/yes.c:86 #, c-format msgid "standard output" msgstr "标准输出" -#: src/cat.c:717 +#: src/cat.c:716 #, c-format msgid "%s: input file is output file" msgstr "%s：输入文件是输出文件" @@ -1090,14 +1094,14 @@ #. This is a proper name. See the gettext manual, section Names. #: src/chcon.c:37 src/chgrp.c:38 src/chmod.c:40 src/chown.c:37 src/cp.c:58 -#: src/cut.c:46 src/dirname.c:35 src/du.c:55 src/head.c:46 src/hostid.c:33 +#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:46 src/hostid.c:33 #: src/hostname.c:33 src/mktemp.c:36 src/mv.c:43 src/nohup.c:37 src/od.c:36 -#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/setuidgid.c:38 src/sleep.c:35 -#: src/sync.c:31 src/tail.c:71 src/tr.c:37 src/true.c:33 +#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/setuidgid.c:38 src/sleep.c:34 +#: src/sync.c:31 src/tail.c:72 src/tr.c:37 src/true.c:33 msgid "Jim Meyering" msgstr "Jim Meyering" -#: src/chcon.c:100 src/runcon.c:204 src/runcon.c:235 +#: src/chcon.c:100 src/runcon.c:203 src/runcon.c:234 #, c-format msgid "failed to create security context: %s" msgstr "创建安全环境失败：%s" @@ -1107,8 +1111,8 @@ msgid "failed to set %s security context component to %s" msgstr "设置%s 安全环境组件到%s 失败" -#: src/chcon.c:156 src/chcon.c:533 src/copy.c:2156 src/runcon.c:218 -#: src/stat.c:669 +#: src/chcon.c:156 src/chcon.c:540 src/copy.c:2227 src/runcon.c:217 +#: src/stat.c:700 #, c-format msgid "failed to get security context of %s" msgstr "无法取得%s 的安全环境" @@ -1123,13 +1127,13 @@ msgid "failed to change context of %s to %s" msgstr "改变%s 的环境到%s 失败" -#: src/chcon.c:255 src/chmod.c:216 src/chown-core.c:325 src/copy.c:598 -#: src/du.c:443 src/ls.c:2855 +#: src/chcon.c:255 src/chmod.c:216 src/chown-core.c:325 src/copy.c:581 +#: src/du.c:451 src/ls.c:2981 #, c-format msgid "cannot access %s" msgstr "无法访问%s" -#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:423 +#: src/chcon.c:265 src/chmod.c:229 src/chown-core.c:338 src/du.c:431 #, c-format msgid "cannot read directory %s" msgstr "无法读取目录%s" @@ -1139,18 +1143,18 @@ msgid "changing security context of %s\n" msgstr "正在更改%s 的安全环境\n" -#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:626 +#: src/chcon.c:326 src/chmod.c:346 src/chown-core.c:539 src/remove.c:562 #, c-format msgid "fts_read failed" msgstr "fts_read 失败" -#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:605 -#: src/remove.c:640 +#: src/chcon.c:337 src/chmod.c:357 src/chown-core.c:551 src/du.c:629 +#: src/remove.c:576 #, c-format msgid "fts_close failed" msgstr "fts_close 失败" -#: src/chcon.c:352 +#: src/chcon.c:351 #, c-format msgid "" "Usage: %s [OPTION]... CONTEXT FILE...\n" @@ -1222,36 +1226,36 @@ " -P 不遍历任何符号链接(默认)\n" "\n" -#: src/chcon.c:505 src/chgrp.c:259 src/chown.c:262 +#: src/chcon.c:512 src/chgrp.c:264 src/chown.c:267 #, c-format msgid "-R --dereference requires either -H or -L" msgstr "-R --dereference 需要-H 或-L 其中之一" -#: src/chcon.c:511 +#: src/chcon.c:518 #, c-format msgid "-R -h requires -P" msgstr "-R -h 需要-P" -#: src/chcon.c:526 src/chgrp.c:274 src/chmod.c:521 src/chown.c:277 -#: src/comm.c:431 src/csplit.c:1372 src/join.c:1150 src/link.c:80 -#: src/mknod.c:149 src/setuidgid.c:140 src/tr.c:1786 +#: src/chcon.c:533 src/chgrp.c:279 src/chmod.c:528 src/chown.c:282 +#: src/comm.c:429 src/csplit.c:1373 src/join.c:1149 src/link.c:79 +#: src/mknod.c:148 src/setuidgid.c:139 src/tr.c:1785 #, c-format msgid "missing operand after %s" msgstr "%s 后缺少操作数" -#: src/chcon.c:549 src/runcon.c:248 +#: src/chcon.c:556 src/runcon.c:247 #, c-format msgid "invalid context: %s" msgstr "无效模式：%s" -#: src/chcon.c:556 +#: src/chcon.c:563 #, c-format msgid "conflicting security context specifiers given" msgstr "给出的安全环境说明冲突" -#: src/chcon.c:565 src/chgrp.c:282 src/chgrp.c:300 src/chmod.c:529 -#: src/chmod.c:548 src/chown.c:285 src/chown.c:314 src/cp.c:434 src/cp.c:494 -#: src/mv.c:96 src/pwd.c:274 src/rm.c:325 src/touch.c:353 +#: src/chcon.c:572 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:536 +#: src/chmod.c:555 src/chown.c:290 src/chown.c:319 src/cp.c:433 src/cp.c:493 +#: src/mv.c:97 src/pwd.c:273 src/rm.c:331 src/touch.c:348 #, c-format msgid "failed to get attributes of %s" msgstr "无法取得%s 的属性" @@ -1261,7 +1265,7 @@ msgid "invalid group: %s" msgstr "无效的组：%s" -#: src/chgrp.c:109 +#: src/chgrp.c:108 #, c-format msgid "" "Usage: %s [OPTION]... GROUP FILE...\n" @@ -1318,7 +1322,7 @@ " -v, --verbose\t\t\t为处理的所有文件显示诊断信息\n" "\n" -#: src/chgrp.c:153 +#: src/chgrp.c:158 #, c-format msgid "" "\n" @@ -1371,7 +1375,7 @@ msgid "%s: new permissions are %s, not %s" msgstr "%s：新的权限为%s，而非%s" -#: src/chmod.c:372 +#: src/chmod.c:371 #, c-format msgid "" "Usage: %s [OPTION]... MODE[,MODE]... FILE...\n" @@ -1421,12 +1425,12 @@ "\n" "每种 MODE 都应属于这类形式\"[ugoa]*([-+=]([rwxXst]*|[ugo]))+\"。\n" -#: src/chmod.c:506 +#: src/chmod.c:513 #, c-format msgid "cannot combine mode and --reference options" msgstr "无法组合使用 mode 和 --reference 选项" -#: src/chmod.c:537 +#: src/chmod.c:544 #, c-format msgid "invalid mode: %s" msgstr "无效模式：%s" @@ -1501,7 +1505,7 @@ msgid "changing group of %s" msgstr "正在更改%s 的所属组" -#: src/chown.c:80 +#: src/chown.c:79 #, c-format msgid "" "Usage: %s [OPTION]... [OWNER][:[GROUP]] FILE...\n" @@ -1526,7 +1530,7 @@ " -c, --changes\t\t\t类似 verbose，但只在有更改时才显示结果\n" " --dereference\t\t受影响的是符号链接所指示的对象，而非符号链接本身\n" -#: src/chown.c:98 +#: src/chown.c:103 msgid "" " --from=CURRENT_OWNER:CURRENT_GROUP\n" " change the owner and/or group of each file only if\n" @@ -1567,7 +1571,7 @@ "如果没有指定所有者，则不会更改。 所属组若没有指定也不会更改，但当加上\n" "\":\"时 GROUP 会更改为指定所有者的主要组。所有者和所属组可以是数字或名称。\n" -#: src/chown.c:137 +#: src/chown.c:142 #, c-format msgid "" "\n" @@ -1587,22 +1591,22 @@ msgid "Roland McGrath" msgstr "Roland McGrath" -#: src/chroot.c:86 src/install.c:557 src/setuidgid.c:111 src/setuidgid.c:121 +#: src/chroot.c:97 src/install.c:576 src/setuidgid.c:110 src/setuidgid.c:120 #, c-format msgid "invalid group %s" msgstr "无效的组%s" -#: src/chroot.c:98 +#: src/chroot.c:109 #, c-format msgid "invalid group list %s" msgstr "无效的组列表%s" -#: src/chroot.c:106 +#: src/chroot.c:117 #, c-format msgid "failed to set additional groups" msgstr "设置附加组失败" -#: src/chroot.c:122 +#: src/chroot.c:132 #, c-format msgid "" "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n" @@ -1611,7 +1615,7 @@ "用法：%s [选项] 新根 [命令 [参数]...]\n" "　或：%s 选项\n" -#: src/chroot.c:127 +#: src/chroot.c:137 msgid "" "Run COMMAND with root directory set to NEWROOT.\n" "\n" @@ -1619,7 +1623,7 @@ "以指定的新根为运行指定命令时的的根目录。\n" "\n" -#: src/chroot.c:132 +#: src/chroot.c:142 msgid "" " --userspec=USER:GROUP specify user and group (ID or name) to use\n" " --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" @@ -1635,28 +1639,28 @@ "\n" "如果没有指定命令，则运行\"${SHELL} -i\" (默认：/bin/sh)。\n" -#: src/chroot.c:192 +#: src/chroot.c:202 #, c-format msgid "cannot change root directory to %s" msgstr "无法进入目录%s" -#: src/chroot.c:196 +#: src/chroot.c:206 #, c-format msgid "cannot chdir to root directory" msgstr "无法切换到根目录" -#: src/chroot.c:237 +#: src/chroot.c:247 #, c-format msgid "failed to set group-ID" msgstr "设置组ID 失败" -#: src/chroot.c:243 +#: src/chroot.c:253 #, c-format msgid "failed to set user-ID" msgstr "设置用户ID 失败" -#: src/chroot.c:265 src/nohup.c:237 src/setuidgid.c:214 src/stdbuf.c:367 -#: src/timeout.c:400 +#: src/chroot.c:275 src/nohup.c:236 src/setuidgid.c:212 src/stdbuf.c:366 +#: src/timeout.c:428 #, c-format msgid "failed to run command %s" msgstr "无法运行命令%s" @@ -1671,7 +1675,7 @@ msgid "%s: file too long" msgstr "%s：文件太大" -#: src/cksum.c:264 +#: src/cksum.c:263 #, c-format msgid "" "Usage: %s [FILE]...\n" @@ -1680,7 +1684,7 @@ "用法：%s [文件]...\n" "　或：%s [选项]\n" -#: src/cksum.c:269 +#: src/cksum.c:268 msgid "" "Print CRC checksum and byte counts of each FILE.\n" "\n" @@ -1688,16 +1692,16 @@ "输出每个文件的 CRC 校验值和字节统计。\n" "\n" -#: src/comm.c:105 src/join.c:188 +#: src/comm.c:103 src/join.c:187 #, c-format msgid "Usage: %s [OPTION]... FILE1 FILE2\n" msgstr "用法：%s [选项]... 文件1 文件2\n" -#: src/comm.c:109 +#: src/comm.c:107 msgid "Compare sorted files FILE1 and FILE2 line by line.\n" msgstr "逐行比较已排序的文件文件1 和文件2。\n" -#: src/comm.c:112 +#: src/comm.c:110 msgid "" "\n" "With no options, produce three-column output. Column one contains\n" @@ -1707,7 +1711,7 @@ "\n" "如果不附带选项，程序会生成三列输出。第一列包含文件1 特有的行，第二列包含 文件2 特有的行，而第三列包含两个文件共有的行。\n" -#: src/comm.c:118 +#: src/comm.c:116 msgid "" "\n" " -1 suppress column 1 (lines unique to FILE1)\n" @@ -1719,7 +1723,7 @@ " -2\t\t不输出文件2 特有的行\n" " -3\t\t不输出两个文件共有的行\n" -#: src/comm.c:124 +#: src/comm.c:122 msgid "" "\n" " --check-order check that the input is correctly sorted, even\n" @@ -1730,7 +1734,7 @@ " --check-order\t\t\t检查输入是否被正确排序，即使所有输入行均成对\n" " --nocheck-order\t\t不检查输入是否被正确排序\n" -#: src/comm.c:130 +#: src/comm.c:128 msgid " --output-delimiter=STR separate columns with STR\n" msgstr " --output-delimiter=STR\t依照STR 分列\n" @@ -1742,7 +1746,7 @@ "\n" "注意，比较操作遵从\"LC_CPLLATE\"所定义的规则。\n" -#: src/comm.c:139 +#: src/comm.c:137 #, c-format msgid "" "\n" @@ -1755,298 +1759,298 @@ " %s -12 文件1 文件2 只打印在文件1 和文件2 中都有的行\n" " %s -3 文件1 文件2 打印在文件1 中有，而文件2 中没有的行。反之亦然。\n" -#: src/comm.c:224 +#: src/comm.c:222 #, c-format msgid "file %d is not in sorted order" msgstr "文件%d 没有被正确排序" -#: src/comm.c:409 +#: src/comm.c:407 #, c-format msgid "multiple delimiters specified" msgstr "已定义多重分隔符" -#: src/comm.c:413 +#: src/comm.c:411 #, c-format msgid "empty %s not allowed" msgstr "不允许空的%s" -#: src/copy.c:167 src/dd.c:1500 src/dd.c:1847 +#: src/copy.c:168 src/dd.c:1617 src/dd.c:1984 #, c-format msgid "reading %s" msgstr "正在读入%s" -#: src/copy.c:212 src/copy.c:363 src/copy.c:374 src/head.c:427 +#: src/copy.c:195 src/copy.c:346 src/copy.c:357 src/head.c:426 #, c-format msgid "cannot lseek %s" msgstr "无法lseek %s" -#: src/copy.c:224 src/dd.c:1910 src/dd.c:1973 +#: src/copy.c:206 src/dd.c:2047 src/dd.c:2110 #, c-format msgid "writing %s" msgstr "正在写入%s" -#: src/copy.c:330 +#: src/copy.c:313 #, c-format msgid "%s: failed to get extents info" msgstr "%s：无法获得 extent 信息" -#: src/copy.c:390 +#: src/copy.c:373 #, c-format msgid "%s: write failed" msgstr "%s：写入失败" -#: src/copy.c:459 src/copy.c:1077 +#: src/copy.c:442 src/copy.c:1083 #, c-format msgid "failed to extend %s" msgstr "扩展%s 失败" -#: src/copy.c:679 +#: src/copy.c:662 #, c-format msgid "clearing permissions for %s" msgstr "清除%s 的权限" -#: src/copy.c:714 src/copy.c:2404 src/cp.c:332 +#: src/copy.c:697 src/copy.c:2475 src/cp.c:331 #, c-format msgid "failed to preserve ownership for %s" msgstr "无法保留%s 的所有者" -#: src/copy.c:740 +#: src/copy.c:723 #, c-format msgid "failed to lookup file %s" msgstr "查阅文件%s 失败" -#: src/copy.c:745 +#: src/copy.c:728 #, c-format msgid "failed to preserve authorship for %s" msgstr "保留%s 的作者失败" -#: src/copy.c:821 src/csplit.c:639 src/du.c:888 src/fmt.c:428 src/head.c:848 -#: src/sort.c:4477 src/split.c:1219 src/tac.c:544 src/tail.c:1755 src/wc.c:679 +#: src/copy.c:804 src/csplit.c:640 src/du.c:944 src/fmt.c:452 src/head.c:855 +#: src/sort.c:4544 src/split.c:1343 src/tail.c:1757 src/wc.c:678 #, c-format msgid "cannot open %s for reading" msgstr "无法打开%s 读取数据" -#: src/copy.c:827 src/copy.c:968 src/dd.c:1440 src/dd.c:2096 src/tail.c:1591 -#: src/tail.c:1657 src/truncate.c:142 +#: src/copy.c:810 src/copy.c:972 src/dd.c:1554 src/dd.c:2122 src/dd.c:2260 +#: src/tail.c:1593 src/tail.c:1659 src/truncate.c:141 #, c-format msgid "cannot fstat %s" msgstr "无法获取%s 的文件状态(fstat)" -#: src/copy.c:837 +#: src/copy.c:820 #, c-format msgid "skipping file %s, as it was replaced while being copied" msgstr "跳过文件%s，因为在准备复制时它已被其它文件取代" -#: src/copy.c:865 +#: src/copy.c:850 #, c-format msgid "failed to get file system create context" msgstr "获取文件系统创建环境失败" -#: src/copy.c:879 +#: src/copy.c:864 #, c-format msgid "failed to set the security context of %s to %s" msgstr "设置%s 的安全环境为%s 失败" -#: src/copy.c:896 src/copy.c:1512 src/copy.c:1715 src/copy.c:1869 src/ln.c:277 -#: src/remove.c:294 src/remove.c:320 src/remove.c:471 src/remove.c:492 +#: src/copy.c:881 src/copy.c:1579 src/copy.c:1782 src/copy.c:1940 src/ln.c:314 +#: src/remove.c:263 src/remove.c:280 src/remove.c:405 src/remove.c:431 #, c-format msgid "cannot remove %s" msgstr "无法删除%s" -#: src/copy.c:901 src/copy.c:1516 src/copy.c:1710 src/copy.c:1874 -#: src/remove.c:445 +#: src/copy.c:886 src/copy.c:1583 src/copy.c:1777 src/copy.c:1945 +#: src/remove.c:375 #, c-format msgid "removed %s\n" msgstr "已删除%s\n" -#: src/copy.c:939 +#: src/copy.c:926 #, c-format msgid "not writing through dangling symlink %s" msgstr "无法通过符号链接%s 进行操作" -#: src/copy.c:960 +#: src/copy.c:964 #, c-format msgid "cannot create regular file %s" msgstr "无法创建普通文件%s" -#: src/copy.c:981 +#: src/copy.c:985 #, c-format msgid "failed to clone %s from %s" msgstr "" -#: src/copy.c:1092 src/copy.c:2465 +#: src/copy.c:1098 src/copy.c:2536 #, c-format msgid "preserving times for %s" msgstr "正在保留 %s 的时间" -#: src/copy.c:1164 src/copy.c:1170 src/head.c:856 src/touch.c:176 -#: src/truncate.c:389 +#: src/copy.c:1175 src/copy.c:1181 src/head.c:863 src/touch.c:172 +#: src/truncate.c:418 #, c-format msgid "closing %s" msgstr "正在关闭 %s" -#: src/copy.c:1404 +#: src/copy.c:1471 #, c-format msgid "%s: try to overwrite %s, overriding mode %04lo (%s)? " msgstr "%s：是否覆盖%s，而不理会权限模式%04lo (%s)？ " -#: src/copy.c:1411 +#: src/copy.c:1478 #, c-format msgid "%s: overwrite %s? " msgstr "%s：是否覆盖%s？ " -#: src/copy.c:1480 +#: src/copy.c:1547 #, c-format msgid " (backup: %s)" msgstr " (备份：%s)" -#: src/copy.c:1490 +#: src/copy.c:1557 #, c-format msgid "failed to restore the default file creation context" msgstr "恢复默认文件创建环境失败" -#: src/copy.c:1522 +#: src/copy.c:1589 #, c-format msgid "cannot create hard link %s to %s" msgstr "无法创建指向%2$s 的硬链接%1$s" -#: src/copy.c:1583 +#: src/copy.c:1650 #, c-format msgid "omitting directory %s" msgstr "略过目录%s" -#: src/copy.c:1597 +#: src/copy.c:1664 #, c-format msgid "warning: source file %s specified more than once" msgstr "警告：指定来源文件%s 多于一次" -#: src/copy.c:1645 src/ln.c:212 +#: src/copy.c:1712 src/ln.c:246 #, c-format msgid "%s and %s are the same file" msgstr "%s 与%s 为同一文件" -#: src/copy.c:1744 +#: src/copy.c:1811 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "无法以目录%2$s 来覆盖非目录%1$s" -#: src/copy.c:1762 src/ln.c:180 +#: src/copy.c:1829 src/ln.c:214 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "不会以%2$s 覆盖刚创建的%1$s" -#: src/copy.c:1780 +#: src/copy.c:1847 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "无法以非目录来覆盖目录%s" -#: src/copy.c:1794 +#: src/copy.c:1861 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "无法将目录移动至非目录：%s -> %s" -#: src/copy.c:1824 +#: src/copy.c:1891 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "备份%s 会破坏源文件；未移动%s" -#: src/copy.c:1825 +#: src/copy.c:1892 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "备份%s 会破坏源文件；未复制%s" -#: src/copy.c:1844 src/ln.c:242 +#: src/copy.c:1915 src/ln.c:276 #, c-format msgid "cannot backup %s" msgstr "无法备份%s" -#: src/copy.c:1908 +#: src/copy.c:1979 #, c-format msgid "will not copy %s through just-created symlink %s" msgstr "不会以%s 覆盖刚创建的%s" -#: src/copy.c:1985 +#: src/copy.c:2056 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "无法将目录%s 复制到自己%s" -#: src/copy.c:2002 +#: src/copy.c:2073 #, c-format msgid "will not create hard link %s to directory %s" msgstr "不会创建指向目录%2$s 的硬链接%1$s" -#: src/copy.c:2052 +#: src/copy.c:2123 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "无法将目录%s 移动至自身的子目录%s 下" -#: src/copy.c:2095 +#: src/copy.c:2166 #, c-format msgid "cannot move %s to %s" msgstr "无法将%s 移动至%s" -#: src/copy.c:2107 +#: src/copy.c:2178 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "无法进行跨设备的移动：%s 至%s；无法删除目标" -#: src/copy.c:2141 src/install.c:888 src/mkdir.c:190 src/mkfifo.c:115 -#: src/mknod.c:168 +#: src/copy.c:2212 src/install.c:906 src/mkdir.c:189 src/mkfifo.c:114 +#: src/mknod.c:167 #, c-format msgid "failed to set default file creation context to %s" msgstr "无法取得%s 的创建环境" -#: src/copy.c:2175 +#: src/copy.c:2246 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "无法复制循环的符号链接%s" -#: src/copy.c:2284 +#: src/copy.c:2355 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "%s：只能于当前目录中创建相对的符号链接" -#: src/copy.c:2291 +#: src/copy.c:2362 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "无法创建指向%2$s 的符号链接%1$s" -#: src/copy.c:2340 src/mkfifo.c:134 +#: src/copy.c:2411 src/mkfifo.c:133 #, c-format msgid "cannot create fifo %s" msgstr "无法创建先进先出文件%s" -#: src/copy.c:2349 +#: src/copy.c:2420 #, c-format msgid "cannot create special file %s" msgstr "无法创建特殊文件%s" -#: src/copy.c:2360 src/ls.c:3067 src/stat.c:888 +#: src/copy.c:2431 src/ls.c:3185 src/stat.c:919 #, c-format msgid "cannot read symbolic link %s" msgstr "无法读取符号链接%s" -#: src/copy.c:2387 +#: src/copy.c:2458 #, c-format msgid "cannot create symbolic link %s" msgstr "无法创建符号链接%s" -#: src/copy.c:2419 +#: src/copy.c:2490 #, c-format msgid "%s has unknown file type" msgstr "%s 的文件类型不详" -#: src/copy.c:2563 src/ln.c:320 +#: src/copy.c:2639 src/ln.c:358 #, c-format msgid "cannot un-backup %s" msgstr "无法将%s 的备份还原" -#: src/copy.c:2567 +#: src/copy.c:2643 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (还原备份)\n" -#: src/cp.c:157 src/mv.c:285 +#: src/cp.c:156 src/mv.c:286 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -2057,7 +2061,7 @@ "　或：%s [选项]... 源文件... 目录\n" "　或：%s [选项]... -t 目录 源文件...\n" -#: src/cp.c:163 +#: src/cp.c:162 msgid "" "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" "\n" @@ -2065,18 +2069,18 @@ "将源文件复制至目标文件，或将多个源文件复制至目标目录。\n" "\n" -#: src/cp.c:167 src/csplit.c:1460 src/cut.c:198 src/df.c:820 src/du.c:268 -#: src/expand.c:114 src/fmt.c:276 src/fold.c:76 src/head.c:116 -#: src/install.c:595 src/kill.c:87 src/ln.c:353 src/ls.c:4602 src/mkdir.c:62 -#: src/mkfifo.c:57 src/mknod.c:59 src/mv.c:295 src/nl.c:192 src/paste.c:446 -#: src/pr.c:2779 src/ptx.c:1826 src/shred.c:165 src/shuf.c:59 src/sort.c:402 -#: src/split.c:192 src/stdbuf.c:96 src/tac.c:142 src/tail.c:268 -#: src/touch.c:228 src/truncate.c:108 src/unexpand.c:124 src/uniq.c:146 +#: src/cp.c:166 src/csplit.c:1460 src/cut.c:197 src/df.c:878 src/du.c:273 +#: src/expand.c:112 src/fmt.c:276 src/fold.c:75 src/head.c:115 +#: src/install.c:613 src/kill.c:86 src/ln.c:392 src/ls.c:4726 src/mkdir.c:61 +#: src/mkfifo.c:56 src/mknod.c:58 src/mv.c:296 src/nl.c:191 src/paste.c:445 +#: src/pr.c:2777 src/ptx.c:1825 src/shred.c:153 src/shuf.c:58 src/sort.c:403 +#: src/split.c:214 src/stdbuf.c:95 src/tac.c:142 src/tail.c:268 +#: src/touch.c:223 src/truncate.c:107 src/unexpand.c:122 src/uniq.c:145 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "长选项必须使用的参数对于短选项时也是必需使用的。\n" -#: src/cp.c:170 +#: src/cp.c:169 msgid "" " -a, --archive same as -dR --preserve=all\n" " --attributes-only don't copy the file data, just the " @@ -2096,7 +2100,7 @@ " --copy-contents\t\t在递归处理是复制特殊文件内容\n" " -d\t\t\t\t等于--no-dereference --preserve=links\n" -#: src/cp.c:179 +#: src/cp.c:178 msgid "" " -f, --force if an existing destination file cannot be\n" " opened, remove it and try again (redundant " @@ -2112,13 +2116,13 @@ " -i, --interactive\t\t覆盖前询问(使前面的 -n 选项失效)\n" " -H\t\t\t\t跟随源文件中的命令行符号链接\n" -#: src/cp.c:189 +#: src/cp.c:188 msgid "" " -l, --link hard link files instead of copying\n" " -L, --dereference always follow symbolic links in SOURCE\n" msgstr "" -#: src/cp.c:193 +#: src/cp.c:192 msgid "" " -n, --no-clobber do not overwrite an existing file (overrides\n" " a previous -i option)\n" @@ -2127,7 +2131,7 @@ " -n, --no-clobber\t\t不要覆盖已存在的文件(使前面的 -i 选项失效)\n" " -P, --no-dereference\t\t不跟随源文件中的符号链接\n" -#: src/cp.c:198 +#: src/cp.c:197 msgid "" " -p same as --preserve=mode,ownership,timestamps\n" " --preserve[=ATTR_LIST] preserve the specified attributes (default:\n" @@ -2140,7 +2144,7 @@ " --preserve[=属性列表\t保持指定的属性(默认：模式,所有权,时间戳)，如果\n" "\t\t\t\t\t可能保持附加属性：环境、链接、xattr 等\n" -#: src/cp.c:206 +#: src/cp.c:205 msgid "" " --no-preserve=ATTR_LIST don't preserve the specified attributes\n" " --parents use full source file name under DIRECTORY\n" @@ -2148,7 +2152,7 @@ " --sno-preserve=属性列表\t不保留指定的文件属性\n" " --parents\t\t\t复制前在目标目录创建来源文件路径中的所有目录\n" -#: src/cp.c:210 +#: src/cp.c:209 msgid "" " -R, -r, --recursive copy directories recursively\n" " --reflink[=WHEN] control clone/CoW copies. See below\n" @@ -2161,7 +2165,7 @@ " --remove-destination\t尝试打开目标文件前先删除已存在的目的地\n" "\t\t\t\t\t文件 (相对于 --force 选项)\n" -#: src/cp.c:216 +#: src/cp.c:215 msgid "" " --sparse=WHEN control creation of sparse files. See below\n" " --strip-trailing-slashes remove any trailing slashes from each " @@ -2171,7 +2175,7 @@ " --sparse=WHEN\t\t控制创建稀疏文件的方式\n" " --strip-trailing-slashes\t删除参数中所有源文件/目录末端的斜杠\n" -#: src/cp.c:221 +#: src/cp.c:220 msgid "" " -s, --symbolic-link make symbolic links instead of copying\n" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -2185,7 +2189,7 @@ " 复制至目标目录\n" " -T, --no-target-directory\t将目标目录视作普通文件\n" -#: src/cp.c:227 +#: src/cp.c:226 msgid "" " -u, --update copy only when the SOURCE file is newer\n" " than the destination file or when the\n" @@ -2198,7 +2202,7 @@ " -v, --verbose\t\t显示详细的进行步骤\n" " -x, --one-file-system\t不跨越文件系统进行操作\n" -#: src/cp.c:236 +#: src/cp.c:235 msgid "" "\n" "By default, sparse SOURCE files are detected by a crude heuristic and the\n" @@ -2238,7 +2242,7 @@ "变量来选择。以下是可用的变量值：\n" "\n" -#: src/cp.c:255 src/install.c:639 src/ln.c:393 src/mv.c:329 +#: src/cp.c:254 src/install.c:657 src/mv.c:330 msgid "" " none, off never make backups (even if --backup is given)\n" " numbered, t make numbered backups\n" @@ -2250,7 +2254,7 @@ " existing, nil 若有数字的备份文件已经存在则使用数字，否则使用普通方式备份\n" " simple, never 永远使用普通方式备份\n" -#: src/cp.c:261 +#: src/cp.c:260 msgid "" "\n" "As a special case, cp makes a backup of SOURCE when the force and backup\n" @@ -2261,136 +2265,136 @@ "有一个特别情况：如果同时指定--force 和--backup 选项，而源文件和目标文件\n" "是同一个已存在的一般文件的话，cp 会将源文件备份。\n" -#: src/cp.c:320 +#: src/cp.c:319 #, c-format msgid "failed to preserve times for %s" msgstr "无法保留%s 的时间" -#: src/cp.c:351 +#: src/cp.c:350 #, c-format msgid "failed to preserve permissions for %s" msgstr "保留%s 的权限失败" -#: src/cp.c:478 +#: src/cp.c:477 #, c-format msgid "cannot make directory %s" msgstr "无法创建目录%s" -#: src/cp.c:527 src/cp.c:546 +#: src/cp.c:526 src/cp.c:545 #, c-format msgid "%s exists but is not a directory" msgstr "%s 存在但并非目录" -#: src/cp.c:573 src/cp.c:1069 src/install.c:383 src/install.c:827 src/ln.c:117 -#: src/ln.c:147 src/ln.c:168 src/ln.c:473 src/mv.c:152 src/mv.c:400 +#: src/cp.c:572 src/cp.c:1071 src/install.c:402 src/install.c:845 src/ln.c:123 +#: src/ln.c:181 src/ln.c:202 src/ln.c:516 src/mv.c:154 src/mv.c:401 #, c-format msgid "accessing %s" msgstr "正在访问%s" -#: src/cp.c:593 src/install.c:897 src/ln.c:503 src/mv.c:433 src/shred.c:1194 -#: src/touch.c:435 src/truncate.c:344 +#: src/cp.c:592 src/install.c:915 src/ln.c:546 src/mv.c:434 src/shred.c:1182 +#: src/touch.c:430 src/truncate.c:355 #, c-format msgid "missing file operand" msgstr "缺少了文件操作数" -#: src/cp.c:595 src/install.c:899 src/ln.c:517 src/mv.c:435 +#: src/cp.c:594 src/install.c:917 src/ln.c:560 src/mv.c:436 #, c-format msgid "missing destination file operand after %s" msgstr "在%s 后缺少了要操作的目标文件" -#: src/cp.c:604 src/install.c:908 src/mv.c:444 +#: src/cp.c:603 src/install.c:926 src/mv.c:445 #, c-format msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)" msgstr "无法同时使用--target-directory (-t) 和--no-target-directory (-T) 选项" -#: src/cp.c:620 src/cp.c:1071 src/install.c:385 src/install.c:829 -#: src/install.c:921 src/ln.c:119 src/ln.c:475 src/ln.c:531 src/mv.c:402 -#: src/mv.c:458 +#: src/cp.c:619 src/cp.c:1073 src/install.c:404 src/install.c:847 +#: src/install.c:939 src/ln.c:125 src/ln.c:518 src/ln.c:574 src/mv.c:403 +#: src/mv.c:459 #, c-format msgid "target %s is not a directory" msgstr "目标%s 不是目录" -#: src/cp.c:731 +#: src/cp.c:730 #, c-format msgid "with --parents, the destination must be a directory" msgstr "当跟随--parents 选项时，目的地必须是目录" -#: src/cp.c:1064 src/install.c:822 src/ln.c:468 src/mv.c:395 +#: src/cp.c:1066 src/install.c:840 src/ln.c:511 src/mv.c:396 #, c-format msgid "multiple target directories specified" msgstr "指定了多个目标目录" -#: src/cp.c:1109 +#: src/cp.c:1111 #, c-format msgid "cannot make both hard and symbolic links" msgstr "无法同时创建硬链接及符号链接" -#: src/cp.c:1116 src/mv.c:465 +#: src/cp.c:1118 src/mv.c:466 #, c-format msgid "options --backup and --no-clobber are mutually exclusive" msgstr "选项--backup 和 --no-clobber 互斥" -#: src/cp.c:1122 +#: src/cp.c:1124 #, c-format msgid "--reflink can be used only with --sparse=auto" msgstr "--reflink 只能与--sparse=auto 一起用" -#: src/cp.c:1130 src/install.c:882 src/ln.c:539 src/mv.c:473 +#: src/cp.c:1132 src/install.c:900 src/ln.c:582 src/mv.c:474 msgid "backup type" msgstr "备份方式" -#: src/cp.c:1155 +#: src/cp.c:1157 #, c-format msgid "cannot preserve security context without an SELinux-enabled kernel" msgstr "无法在未启用SELinux 支持的内核上使用安全环境" -#: src/cp.c:1161 +#: src/cp.c:1163 #, c-format msgid "" "cannot preserve extended attributes, cp is built without xattr support" msgstr "无法保留扩展属性，当前使用的 cp 副本编译时没有启用 xattr 支持" #. This is a proper name. See the gettext manual, section Names. -#: src/csplit.c:41 src/dd.c:45 +#: src/csplit.c:41 src/dd.c:46 msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:530 +#: src/csplit.c:531 #, c-format msgid "input disappeared" msgstr "输入消失" -#: src/csplit.c:659 src/csplit.c:670 +#: src/csplit.c:660 src/csplit.c:671 #, c-format msgid "%s: line number out of range" msgstr "%s：行数超出范围" -#: src/csplit.c:699 +#: src/csplit.c:700 #, c-format msgid "%s: %s: line number out of range" msgstr "%s：%s：行数超出范围" -#: src/csplit.c:702 src/csplit.c:751 +#: src/csplit.c:703 src/csplit.c:752 #, c-format msgid " on repetition %s\n" msgstr " 在循环位%s\n" -#: src/csplit.c:745 +#: src/csplit.c:746 #, c-format msgid "%s: %s: match not found" msgstr "%s：%s：无匹配" -#: src/csplit.c:809 src/csplit.c:849 src/nl.c:360 src/tac.c:274 +#: src/csplit.c:810 src/csplit.c:850 src/nl.c:359 src/tac.c:274 #, c-format msgid "error in regular expression search" msgstr "正则表达式搜索时出错" -#: src/csplit.c:982 +#: src/csplit.c:983 #, c-format msgid "write error for %s" msgstr "写入%s 时出错" -#: src/csplit.c:1058 +#: src/csplit.c:1059 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s：分界符后应该跟随整数" @@ -2410,62 +2414,62 @@ msgid "%s: closing delimiter `%c' missing" msgstr "%s：闭合定义符\"%c\"缺失" -#: src/csplit.c:1128 +#: src/csplit.c:1129 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s：无效的正则表达式：%s" -#: src/csplit.c:1161 +#: src/csplit.c:1162 #, c-format msgid "%s: invalid pattern" msgstr "%s：无效的模式" -#: src/csplit.c:1164 +#: src/csplit.c:1165 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s：行号必须大于0" -#: src/csplit.c:1170 +#: src/csplit.c:1171 #, c-format msgid "line number %s is smaller than preceding line number, %s" msgstr "行号%s 比先前的行号%s 更小" -#: src/csplit.c:1176 +#: src/csplit.c:1177 #, c-format msgid "warning: line number %s is the same as preceding line number" msgstr "警告：行号%s 比先前的行号更小" -#: src/csplit.c:1254 +#: src/csplit.c:1255 #, c-format msgid "missing conversion specifier in suffix" msgstr "下标中丢失了转换规格" -#: src/csplit.c:1260 +#: src/csplit.c:1261 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "下标中出现无效的转换规格：%c" -#: src/csplit.c:1263 +#: src/csplit.c:1264 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "下标中出现无效的转换规格：\\%.3o" -#: src/csplit.c:1268 +#: src/csplit.c:1269 #, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "无效的转换声明%%%c%c" -#: src/csplit.c:1285 +#: src/csplit.c:1286 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "下标中出现过多的%% 转换规格字符" -#: src/csplit.c:1299 +#: src/csplit.c:1300 #, c-format msgid "missing %% conversion specification in suffix" msgstr "下标中丢失了%% 转换规格字符" -#: src/csplit.c:1346 +#: src/csplit.c:1347 #, c-format msgid "%s: invalid number" msgstr "%s：无效数字" @@ -2543,12 +2547,12 @@ msgid "fields and positions are numbered from 1" msgstr "序号从1 开始计数" -#: src/cut.c:190 +#: src/cut.c:189 #, c-format msgid "Usage: %s OPTION... [FILE]...\n" msgstr "用法：%s [选项]... [文件]...\n" -#: src/cut.c:194 +#: src/cut.c:193 msgid "" "Print selected parts of lines from each FILE to standard output.\n" "\n" @@ -2556,7 +2560,7 @@ "从每个文件中输出指定部分到标准输出。\n" "\n" -#: src/cut.c:201 +#: src/cut.c:200 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2566,7 +2570,7 @@ " -c, --characters=列表\t\t只选中指定的这些字符\n" " -d, --delimiter=分界符\t使用指定分界符代替制表符作为区域分界\n" -#: src/cut.c:206 +#: src/cut.c:205 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2577,13 +2581,13 @@ "\t\t\t\t行，除非-s 选项被指定\n" " -n\t\t\t\t(忽略)\n" -#: src/cut.c:212 +#: src/cut.c:211 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" msgstr " --complement\t\t补全选中的字节、字符或域\n" -#: src/cut.c:216 +#: src/cut.c:215 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2593,7 +2597,7 @@ " --output-delimiter=字符串\t使用指定的字符串作为输出分界符，默认采用输入\n" "\t\t\t\t的分界符\n" -#: src/cut.c:223 +#: src/cut.c:222 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2604,7 +2608,7 @@ "仅使用f -b, -c 或-f 中的一个。每一个列表都是专门为一个类别作出的，或者您可以用逗号隔\n" "开要同时显示的不同类别。您的输入顺序将作为读取顺序，每个仅能输入一次。\n" -#: src/cut.c:229 +#: src/cut.c:228 msgid "" "Each range is one of:\n" "\n" @@ -2623,45 +2627,45 @@ "\n" "当没有文件参数，或者文件不存在时，从标准输入读取\n" -#: src/cut.c:369 src/cut.c:490 +#: src/cut.c:368 src/cut.c:489 msgid "invalid byte or field list" msgstr "无效的字节或域列表" -#: src/cut.c:386 +#: src/cut.c:385 msgid "invalid range with no endpoint: -" msgstr "无终点的无效的范围：-" -#: src/cut.c:400 +#: src/cut.c:399 msgid "invalid decreasing range" msgstr "无效的缩小的范围" -#: src/cut.c:479 +#: src/cut.c:478 #, c-format msgid "byte offset %s is too large" msgstr "字节偏移量%s 过大" -#: src/cut.c:482 +#: src/cut.c:481 #, c-format msgid "field number %s is too large" msgstr "域编号%s 过大" -#: src/cut.c:790 src/cut.c:798 +#: src/cut.c:789 src/cut.c:797 msgid "only one type of list may be specified" msgstr "只能指定列表中的一种类型" -#: src/cut.c:807 +#: src/cut.c:806 msgid "the delimiter must be a single character" msgstr "分界符必须是单个字符" -#: src/cut.c:842 +#: src/cut.c:841 msgid "you must specify a list of bytes, characters, or fields" msgstr "您必须指定一组字节、字符或域的列表" -#: src/cut.c:845 +#: src/cut.c:844 msgid "an input delimiter may be specified only when operating on fields" msgstr "只有当操作域时才可以指定输入分界符" -#: src/cut.c:849 +#: src/cut.c:848 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2669,15 +2673,15 @@ "清除没有分界符的行只有在\n" "\t操作域时才有意义" -#: src/cut.c:865 +#: src/cut.c:864 msgid "missing list of fields" msgstr "缺少域列表" -#: src/cut.c:867 +#: src/cut.c:866 msgid "missing list of positions" msgstr "缺少位置列表" -#: src/date.c:124 +#: src/date.c:123 #, c-format msgid "" "Usage: %s [OPTION]... [+FORMAT]\n" @@ -2698,7 +2702,7 @@ " -d,--date=字符串\t\t显示指定字符串所描述的时间，而非当前时间\n" " -f,--file=日期文件\t\t类似--date，从日期文件中按行读入时间描述\n" -#: src/date.c:135 +#: src/date.c:138 msgid "" " -r, --reference=FILE display the last modification time of FILE\n" " -R, --rfc-2822 output date and time in RFC 2822 format.\n" @@ -2726,7 +2730,7 @@ " -s, --set=字符串 \t设置指定字符串来分开时间\n" " -u, --utc, --universal\t输出或者设置协调的通用时间\n" -#: src/date.c:151 +#: src/date.c:154 msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" @@ -2740,7 +2744,7 @@ " %%\t一个文字的 %\n" " %a\t当前locale 的星期名缩写(例如： 日，代表星期日)\n" -#: src/date.c:158 +#: src/date.c:161 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2752,7 +2756,7 @@ " %B\t当前locale 的月名全称 (如：一月)\n" " %c\t当前locale 的日期和时间 (如：2005年3月3日 星期四 23:05:25)\n" -#: src/date.c:164 +#: src/date.c:167 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2764,7 +2768,7 @@ " %D\t按月计的日期；等于%m/%d/%y\n" " %e\t按月计的日期，添加空格，等于%_d\n" -#: src/date.c:170 +#: src/date.c:173 msgid "" " %F full date; same as %Y-%m-%d\n" " %g last two digits of year of ISO week number (see %G)\n" @@ -2774,7 +2778,7 @@ " %g\tISO-8601 格式年份的最后两位 (参见%G)\n" " %G\tISO-8601 格式年份 (参见%V)，一般只和 %V 结合使用\n" -#: src/date.c:175 +#: src/date.c:178 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2786,7 +2790,7 @@ " %I\t小时(00-12)\n" " %j\t按年计的日期(001-366)\n" -#: src/date.c:181 +#: src/date.c:184 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -2794,7 +2798,7 @@ " %M minute (00..59)\n" msgstr "" -#: src/date.c:187 +#: src/date.c:190 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2812,7 +2816,7 @@ " %R\t24 小时时间的时和分，等价于 %H:%M\n" " %s\t自UTC 时间 1970-01-01 00:00:00 以来所经过的秒数\n" -#: src/date.c:196 +#: src/date.c:199 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2824,7 +2828,7 @@ " %T\t时间，等于%H:%M:%S\n" " %u\t星期，1 代表星期一\n" -#: src/date.c:202 +#: src/date.c:205 msgid "" " %U week number of year, with Sunday as first day of week (00..53)\n" " %V ISO week number, with Monday as first day of week (01..53)\n" @@ -2836,7 +2840,7 @@ " %w\t一星期中的第几日(0-6)，0 代表周一\n" " %W\t一年中的第几周，以周一为每星期第一天(00-53)\n" -#: src/date.c:208 +#: src/date.c:211 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -2848,7 +2852,7 @@ " %y\t年份最后两位数位 (00-99)\n" " %Y\t年份\n" -#: src/date.c:214 +#: src/date.c:217 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -2885,7 +2889,7 @@ " ^ 如果可能，使用大写字母\n" " # 如果可能，使用相反的大小写\n" -#: src/date.c:232 +#: src/date.c:235 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -2898,7 +2902,7 @@ "作为一个可选的修饰声明，它可以是E，在可能的情况下使用本地环境关联的\n" "表示方式；或者是O，在可能的情况下使用本地环境关联的数字符号。\n" -#: src/date.c:239 +#: src/date.c:242 msgid "" "\n" "Examples:\n" @@ -2912,30 +2916,30 @@ " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" msgstr "" -#: src/date.c:272 src/dd.c:2037 src/head.c:839 src/md5sum.c:460 -#: src/md5sum.c:781 src/od.c:859 src/od.c:1911 src/pr.c:1177 src/pr.c:1373 -#: src/pr.c:1495 src/stty.c:843 src/tac.c:535 src/tail.c:343 src/tee.c:127 -#: src/tr.c:1946 src/tsort.c:531 src/wc.c:197 +#: src/date.c:275 src/dd.c:2201 src/head.c:846 src/md5sum.c:498 +#: src/md5sum.c:862 src/od.c:863 src/od.c:1914 src/pr.c:1176 src/pr.c:1372 +#: src/pr.c:1494 src/stty.c:843 src/tac.c:563 src/tail.c:343 src/tee.c:126 +#: src/tr.c:1945 src/tsort.c:530 src/wc.c:196 #, c-format msgid "standard input" msgstr "标准输入" -#: src/date.c:300 src/date.c:520 +#: src/date.c:303 src/date.c:523 #, c-format msgid "invalid date %s" msgstr "无效的日期%s" -#: src/date.c:411 src/date.c:445 +#: src/date.c:414 src/date.c:448 #, c-format msgid "multiple output formats specified" msgstr "指定了多种输出格式" -#: src/date.c:423 +#: src/date.c:426 #, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "被指定的这几种日期显示选项是相互抵触的" -#: src/date.c:430 +#: src/date.c:433 #, c-format msgid "the options to print and set the time may not be used together" msgstr "显示与设置时间的选项不能同时使用" @@ -2950,23 +2954,23 @@ "参数%s 缺少前导的\"+\"；\n" "当使用选项来描述日期是，任何非选项参数都必须以\"+\"所引导的字符串出现" -#: src/date.c:528 +#: src/date.c:531 #, c-format msgid "cannot set date" msgstr "无法设置日期" -#: src/date.c:551 src/du.c:360 +#: src/date.c:554 src/du.c:365 #, 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:43 src/factor.c:43 src/rm.c:41 src/tail.c:68 src/touch.c:42 +#: src/dd.c:44 src/factor.c:109 src/rm.c:41 src/tail.c:69 src/touch.c:41 #: src/wc.c:50 msgid "Paul Rubin" msgstr "Paul Rubin" -#: src/dd.c:482 +#: src/dd.c:521 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3055,7 +3059,7 @@ " sync\t\t将每个输入数据块以NUL 字符填满至ibs 的大小；当配合block\n" "\t\t或unblock 时，会以空格代替NUL 字符填充\n" -#: src/dd.c:527 +#: src/dd.c:568 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3071,7 +3075,7 @@ " fdatasync\t结束前将输出文件数据写入磁盘\n" " fsync\t类似上面，但是元数据也一同写入\n" -#: src/dd.c:535 +#: src/dd.c:576 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3084,59 +3088,59 @@ "\n" " append\t追加模式(仅对输出有意义；隐含了conv=notrunc)\n" -#: src/dd.c:542 +#: src/dd.c:583 msgid " cio use concurrent I/O for data\n" msgstr " cio\t使用并行I/O 存取模式\n" -#: src/dd.c:544 +#: src/dd.c:585 msgid " direct use direct I/O for data\n" msgstr " direct\t使用直接I/O 存取模式\n" -#: src/dd.c:546 +#: src/dd.c:587 msgid " directory fail unless a directory\n" msgstr " directory\t除非是目录，否则 directory 失败\n" -#: src/dd.c:548 +#: src/dd.c:589 msgid " dsync use synchronized I/O for data\n" msgstr " dsync\t\t使用同步I/O 存取模式\n" -#: src/dd.c:550 +#: src/dd.c:591 msgid " sync likewise, but also for metadata\n" msgstr " sync\t\t与上者类似，但同时也对元数据生效\n" -#: src/dd.c:551 +#: src/dd.c:592 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr " fullblock\t为输入积累完整块(仅iflag)\n" -#: src/dd.c:554 +#: src/dd.c:595 msgid " nonblock use non-blocking I/O\n" msgstr " nonblock\t使用无阻塞I/O 存取模式\n" -#: src/dd.c:556 +#: src/dd.c:597 msgid " noatime do not update access time\n" msgstr " noatime\t不更新存取时间\n" -#: src/dd.c:559 +#: src/dd.c:600 msgid " nocache discard cached data\n" msgstr " nocache\t丢弃缓存数据\n" -#: src/dd.c:562 +#: src/dd.c:603 msgid " noctty do not assign controlling terminal from file\n" msgstr " noctty\t不根据文件指派控制终端\n" -#: src/dd.c:565 +#: src/dd.c:606 msgid " nofollow do not follow symlinks\n" msgstr " nofollow\t不跟随链接文件\n" -#: src/dd.c:567 +#: src/dd.c:608 msgid " nolinks fail if multiply-linked\n" msgstr " nolinks\t如果有多重链接，则nolinks 失败\n" -#: src/dd.c:569 +#: src/dd.c:610 msgid " binary use binary I/O for data\n" msgstr " binary\t使用二进制I/O 存取模式\n" -#: src/dd.c:571 +#: src/dd.c:612 msgid " text use text I/O for data\n" msgstr " text\t使用文本I/O 存取模式\n" @@ -3169,7 +3173,7 @@ "可用选项有：\n" "\n" -#: src/dd.c:631 +#: src/dd.c:683 #, c-format msgid "" "%+% records in\n" @@ -3178,19 +3182,19 @@ "记录了%+% 的读入\n" "记录了%+% 的写出\n" -#: src/dd.c:637 +#: src/dd.c:689 #, c-format msgid "% truncated record\n" msgid_plural "% truncated records\n" msgstr[0] "% 个被截断了的块\n" -#: src/dd.c:649 +#: src/dd.c:701 #, c-format msgid "% byte (%s) copied" msgid_plural "% bytes (%s) copied" msgstr[0] "%字节(%s)已复制" -#: src/dd.c:667 +#: src/dd.c:720 msgid "Infinity B" msgstr "无穷量 B" @@ -3204,83 +3208,83 @@ #. but that was incorrect for languages like Polish. To fix this #. bug we now use SI symbols even though they're a bit more #. confusing in English. -#: src/dd.c:680 +#: src/dd.c:733 #, c-format msgid ", %g s, %s/s\n" msgstr "，%g 秒，%s/秒\n" -#: src/dd.c:759 +#: src/dd.c:812 #, c-format msgid "closing input file %s" msgstr "正在关闭输入文件%s" -#: src/dd.c:766 +#: src/dd.c:819 #, c-format msgid "closing output file %s" msgstr "正在关闭输出文件%s" -#: src/dd.c:969 +#: src/dd.c:1022 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "无法关闭O_DIRECT：%s" -#: src/dd.c:1021 src/dd.c:1814 +#: src/dd.c:1093 src/dd.c:1942 #, c-format msgid "writing to %s" msgstr "正在写入%s" -#: src/dd.c:1132 src/dd.c:1186 +#: src/dd.c:1207 src/dd.c:1261 #, c-format msgid "unrecognized operand %s" msgstr "无法识别的操作数%s" -#: src/dd.c:1143 +#: src/dd.c:1218 msgid "invalid conversion" msgstr "转换无效" -#: src/dd.c:1146 +#: src/dd.c:1221 src/dd.c:1297 msgid "invalid input flag" msgstr "输入标志无效" -#: src/dd.c:1149 src/dd.c:1216 +#: src/dd.c:1224 src/dd.c:1291 src/dd.c:1303 msgid "invalid output flag" msgstr "输出标志无效" -#: src/dd.c:1152 +#: src/dd.c:1227 msgid "invalid status flag" msgstr "状态标志无效" -#: src/dd.c:1191 src/truncate.c:300 +#: src/dd.c:1266 src/truncate.c:311 #, c-format msgid "invalid number %s" msgstr "无效的数字%s" -#: src/dd.c:1236 +#: src/dd.c:1348 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "不可将{ascii、ebcdic、idm}中的任意两个结合使用" -#: src/dd.c:1238 +#: src/dd.c:1350 #, c-format msgid "cannot combine block and unblock" msgstr "不可将block 和unblock 结合使用" -#: src/dd.c:1240 +#: src/dd.c:1352 #, c-format msgid "cannot combine lcase and ucase" msgstr "不可将lcase 和ucase 结合使用" -#: src/dd.c:1242 +#: src/dd.c:1354 #, c-format msgid "cannot combine excl and nocreat" msgstr "不可将excl 和nocreat 结合使用" -#: src/dd.c:1245 +#: src/dd.c:1357 #, c-format msgid "cannot combine direct and nocache" msgstr "不可将direct 和nocreat 结合使用" -#: src/dd.c:1402 +#: src/dd.c:1514 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3289,147 +3293,147 @@ "警告：暂时避免有关文件%s 的lseek 内核错误\n" " 错误地址在mt_type=0x%0lx -- 有关mt_type 类型的列表请参考" -#: src/dd.c:1484 +#: src/dd.c:1601 #, c-format msgid "%s: cannot skip" msgstr "%s：无法跳过" -#: src/dd.c:1486 src/dd.c:1508 src/dd.c:1565 +#: src/dd.c:1603 src/dd.c:1622 src/dd.c:1683 #, c-format msgid "%s: cannot seek" msgstr "%s：无法搜索" -#: src/dd.c:1545 +#: src/dd.c:1663 #, c-format msgid "offset overflow while reading file %s" msgstr "读入文件%s 时偏移量溢出" -#: src/dd.c:1557 +#: src/dd.c:1675 #, c-format msgid "warning: invalid file offset after failed read" msgstr "警告：文件读取失败后偏移错误" -#: src/dd.c:1561 +#: src/dd.c:1679 #, c-format msgid "cannot work around kernel bug after all" msgstr "无法避免内核的错误" -#: src/dd.c:1704 +#: src/dd.c:1822 #, c-format msgid "setting flags for %s" msgstr "正在设置%s 的标记" -#: src/dd.c:1757 +#: src/dd.c:1875 #, c-format msgid "memory exhausted by input buffer of size %zu bytes (%s)" msgstr "%zu 字节的输入缓冲导致内存耗尽(%s)" -#: src/dd.c:1771 +#: src/dd.c:1889 #, c-format msgid "memory exhausted by output buffer of size %zu bytes (%s)" msgstr "%zu 字节的输出缓冲导致内存耗尽(%s)" -#: src/dd.c:1797 +#: src/dd.c:1922 #, c-format msgid "%s: cannot skip to specified offset" msgstr "%s：无法跳至指定偏移量" -#: src/dd.c:1982 +#: src/dd.c:2146 #, c-format msgid "fdatasync failed for %s" msgstr "%s 的fdatasync 失败" -#: src/dd.c:1992 +#: src/dd.c:2156 #, c-format msgid "fsync failed for %s" msgstr "%s 的fsync 失败" -#: src/dd.c:2043 src/dd.c:2072 +#: src/dd.c:2207 src/dd.c:2236 #, c-format msgid "opening %s" msgstr "正在打开%s" -#: src/dd.c:2081 +#: src/dd.c:2245 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=% (%lu-byte) " "blocks" msgstr "偏移量过大：无法在seek=% (%lu-字节) 块的长度上实施截断" -#: src/dd.c:2102 +#: src/dd.c:2133 src/dd.c:2266 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "无法针对输出文件%2$s 的%1$ 字节处实施截断" -#: src/dd.c:2118 src/dd.c:2124 +#: src/dd.c:2282 src/dd.c:2288 #, 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:43 src/du.c:54 src/expr.c:153 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:39 src/sleep.c:36 src/sort.c:68 +#: src/df.c:44 src/du.c:55 src/expr.c:153 src/kill.c:33 src/pathchk.c:32 +#: src/shuf.c:39 src/sleep.c:35 src/sort.c:67 msgid "Paul Eggert" msgstr "Paul Eggert" # ## Proof reading to here. -#: src/df.c:139 +#: src/df.c:140 msgid "Filesystem" msgstr "文件系统" -#: src/df.c:140 +#: src/df.c:141 msgid "Type" msgstr "类型" -#: src/df.c:141 +#: src/df.c:142 msgid "blocks" msgstr "块" -#: src/df.c:141 +#: src/df.c:142 msgid "Inodes" msgstr "Inode" -#: src/df.c:141 +#: src/df.c:142 msgid "Size" msgstr "容量" -#: src/df.c:142 +#: src/df.c:143 msgid "Used" msgstr "已用" -#: src/df.c:142 +#: src/df.c:143 msgid "IUsed" msgstr "已用(I)" -#: src/df.c:143 +#: src/df.c:144 msgid "Available" msgstr "可用" -#: src/df.c:143 +#: src/df.c:144 msgid "IFree" msgstr "可用(I)" -#: src/df.c:143 +#: src/df.c:144 msgid "Avail" msgstr "可用" -#: src/df.c:144 +#: src/df.c:145 msgid "Use%" msgstr "已用%" -#: src/df.c:144 +#: src/df.c:145 msgid "IUse%" msgstr "已用(I)%" -#: src/df.c:144 +#: src/df.c:145 msgid "Capacity" msgstr "配额" -#: src/df.c:145 +#: src/df.c:146 msgid "Mounted on" msgstr "挂载点" -#: src/df.c:815 +#: src/df.c:873 msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" @@ -3455,7 +3459,7 @@ " -h, --human-readable\t以可读性较好的格式显示尺寸(例如：1K 234M 2G)\n" " -H, --si\t\t计算时使用1000 为基底而非1024\n" -#: src/df.c:833 +#: src/df.c:891 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3468,7 +3472,7 @@ " -l, --local\t\t只显示本机的文件系统\n" " --no-sync\t\t取得使用量数据前不进行同步动作(默认)\n" -#: src/df.c:840 +#: src/df.c:898 msgid "" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" @@ -3484,20 +3488,20 @@ " -x, --exclude-type=类型\t只显示文件系统不是指定类型信息\n" " -v\t\t\t(忽略)\n" -#: src/df.c:995 +#: src/df.c:1060 #, c-format msgid "file system type %s both selected and excluded" msgstr "不能同时选择和排除文件系统类型%s" -#: src/df.c:1043 +#: src/df.c:1117 msgid "Warning: " msgstr "警告： " -#: src/df.c:1045 src/stat.c:781 +#: src/df.c:1119 src/stat.c:812 msgid "cannot read table of mounted file systems" msgstr "%s 无法读取已挂载上的文件系统的目录" -#: src/df.c:1075 +#: src/df.c:1151 #, c-format msgid "no file systems processed" msgstr "未处理文件系统" @@ -3507,12 +3511,12 @@ msgid "H. Peter Anvin" msgstr "H. Peter Anvin" -#: src/dircolors.c:98 src/uptime.c:197 src/users.c:106 +#: src/dircolors.c:97 src/uptime.c:196 src/users.c:105 #, c-format msgid "Usage: %s [OPTION]... [FILE]\n" msgstr "用法：%s [选项]... [文件]\n" -#: src/dircolors.c:99 +#: src/dircolors.c:98 msgid "" "Output commands to set the LS_COLORS environment variable.\n" "\n" @@ -3540,21 +3544,21 @@ "否则，会使用默认的数据库。如要了解此文件格式的细节，请执行：\n" "\"dircolors --print-database\"。\n" -#: src/dircolors.c:287 +#: src/dircolors.c:286 #, c-format msgid "%s:%lu: invalid line; missing second token" msgstr "%s：%lu：此行无效；缺少了第二栏数据" -#: src/dircolors.c:359 +#: src/dircolors.c:358 #, c-format msgid "%s:%lu: unrecognized keyword %s" msgstr "%s：%lu：无法识别的关键字%s" -#: src/dircolors.c:360 +#: src/dircolors.c:359 msgid "" msgstr "<内部数据>" -#: src/dircolors.c:441 +#: src/dircolors.c:440 #, c-format msgid "" "the options to output dircolors' internal database and\n" @@ -3563,11 +3567,11 @@ "显示 dircolors 内部数据库的选项和选择 shell 语法的选项\n" "是互相抵触的" -#: src/dircolors.c:451 +#: src/dircolors.c:450 msgid "file operands cannot be combined with --print-database (-p)" msgstr "文件操作和--print-database (-p)不能同时使用" -#: src/dircolors.c:474 +#: src/dircolors.c:473 #, c-format msgid "no SHELL environment variable, and no shell type option given" msgstr "没有设置SHELL 环境变量，也没有指定shell 类型的选项" @@ -3604,7 +3608,7 @@ " %s /usr/bin/\t输出\"/usr\"。\n" " %s stdio.h\t\t输出\".\"。\n" -#: src/du.c:260 src/sort.c:393 src/wc.c:113 +#: src/du.c:265 src/sort.c:394 src/wc.c:112 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3613,7 +3617,7 @@ "用法：%s [选项]... [文件]...\n" "　或：%s [选项]... --files0-from=F\n" -#: src/du.c:264 +#: src/du.c:269 msgid "" "Summarize disk usage of each FILE, recursively for directories.\n" "\n" @@ -3650,7 +3654,7 @@ " -c, --total\t\t显示总计信息\n" " -D, --dereference-args\t解除命令行中列出的符号连接\n" -#: src/du.c:288 +#: src/du.c:293 msgid "" " --files0-from=F summarize disk usage of the NUL-terminated file\n" " names specified in file F;\n" @@ -3666,7 +3670,7 @@ " -h, --human-readable\t以可读性较好的方式显示尺寸(例如：1K 234M 2G)\n" " --si\t\t类似-h，但在计算时使用1000 为基底而非1024\n" -#: src/du.c:297 +#: src/du.c:302 msgid "" " -k like --block-size=1K\n" " -l, --count-links count sizes many times if hard linked\n" @@ -3676,7 +3680,7 @@ " -l, --count-links\t如果是硬连接，就多次计算其尺寸\n" " -m\t\t\t等于--block-size=1M\n" -#: src/du.c:302 +#: src/du.c:307 msgid "" " -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " @@ -3692,7 +3696,7 @@ " -S, --separate-dirs\t不包括子目录的占用量\n" " -s, --summarize\t只分别计算命令列中每个参数所占的总用量\n" -#: src/du.c:309 +#: src/du.c:314 msgid "" " -x, --one-file-system skip directories on different file systems\n" " -X, --exclude-from=FILE exclude files that match any pattern in FILE\n" @@ -3727,73 +3731,73 @@ " --time-style=样式\t按照指定样式显示时间(样式解释规则同\"date\"命令)：\n" "\t\t\tfull-iso，long-iso，iso，+FORMAT\n" -#: src/du.c:587 +#: src/du.c:611 #, c-format msgid "fts_read failed: %s" msgstr "fts_read 失败：%s" -#: src/du.c:711 +#: src/du.c:767 #, c-format msgid "invalid maximum depth %s" msgstr "目录最大深度%s 无效" -#: src/du.c:804 +#: src/du.c:860 #, c-format msgid "cannot both summarize and show all entries" msgstr "不能既显示总用量，同时又显示每个项目" -#: src/du.c:811 +#: src/du.c:867 #, c-format msgid "warning: summarizing is the same as using --max-depth=0" msgstr "警告：显示总用量等价于使用--max-depth=0" -#: src/du.c:817 +#: src/du.c:873 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "警告：显示总用量的选项和--max-depth=%lu 互斥" -#: src/du.c:883 src/sort.c:4467 src/wc.c:669 +#: src/du.c:939 src/sort.c:4534 src/wc.c:668 msgid "file operands cannot be combined with --files0-from" msgstr "文件操作数不能于--files0-from 参数一起使用" -#: src/du.c:936 src/md5sum.c:570 src/od.c:899 src/tac.c:239 src/tac.c:350 -#: src/tac.c:481 src/tac.c:557 src/wc.c:734 +#: src/du.c:999 src/md5sum.c:608 src/od.c:903 src/tac.c:239 src/tac.c:350 +#: src/tac.c:506 src/tac.c:586 src/wc.c:733 #, c-format msgid "%s: read error" msgstr "%s：读取出错" -#: src/du.c:950 src/sort.c:4496 src/wc.c:748 +#: src/du.c:1013 src/sort.c:4563 src/wc.c:747 #, c-format msgid "when reading file names from stdin, no file name of %s allowed" msgstr "当从标准输入读取时，不允许指定文件名%s" -#: src/du.c:967 src/du.c:975 src/wc.c:761 src/wc.c:769 +#: src/du.c:1030 src/du.c:1038 src/wc.c:760 src/wc.c:768 msgid "invalid zero-length file name" msgstr "无效的零长度文件名" -#: src/du.c:994 src/head.c:150 src/head.c:263 src/head.c:335 src/head.c:539 -#: src/head.c:621 src/head.c:693 src/head.c:751 src/head.c:775 src/tail.c:412 +#: src/du.c:1058 src/head.c:149 src/head.c:262 src/head.c:334 src/head.c:538 +#: src/head.c:620 src/head.c:700 src/head.c:758 src/head.c:782 src/tail.c:412 #: src/tail.c:500 src/tail.c:549 src/tail.c:642 src/tail.c:770 src/tail.c:818 -#: src/tail.c:857 src/tail.c:1781 src/tail.c:1811 src/uniq.c:396 +#: src/tail.c:855 src/tail.c:1783 src/tail.c:1813 src/uniq.c:395 #, c-format msgid "error reading %s" msgstr "读取%s 时出错" -#: src/du.c:997 src/ls.c:2609 src/wc.c:792 +#: src/du.c:1061 src/ls.c:2649 src/wc.c:791 msgid "total" msgstr "总用量" #. This is a proper name. See the gettext manual, section Names. -#: src/echo.c:27 +#: src/echo.c:26 msgid "Brian Fox" msgstr "Brian Fox" #. This is a proper name. See the gettext manual, section Names. -#: src/echo.c:28 +#: src/echo.c:27 msgid "Chet Ramey" msgstr "Chet Ramey" -#: src/echo.c:43 +#: src/echo.c:41 #, c-format msgid "" "Usage: %s [SHORT-OPTION]... [STRING]...\n" @@ -3802,7 +3806,7 @@ "用法：%s [短选项]... [字符串]...\n" "　或：%s 长选项\n" -#: src/echo.c:47 +#: src/echo.c:45 msgid "" "Echo the STRING(s) to standard output.\n" "\n" @@ -3812,7 +3816,7 @@ "\n" " -n\t\t不尾随换行符\n" -#: src/echo.c:53 +#: src/echo.c:51 msgid "" " -e enable interpretation of backslash escapes (default)\n" " -E disable interpretation of backslash escapes\n" @@ -3820,7 +3824,7 @@ " -e\t\t启用解释反斜杠的转义功能(默认)\n" " -E\t\t禁用解释反斜杠的转义功能\n" -#: src/echo.c:56 +#: src/echo.c:54 msgid "" " -e enable interpretation of backslash escapes\n" " -E disable interpretation of backslash escapes (default)\n" @@ -3828,7 +3832,7 @@ " -e\t\t启用解释反斜杠的转义功能\n" " -E\t\t禁用解释反斜杠的转义功能(默认)\n" -#: src/echo.c:62 +#: src/echo.c:60 msgid "" "\n" "If -e is in effect, the following sequences are recognized:\n" @@ -3838,7 +3842,7 @@ "若-e 可用，则以下序列即可识别：\n" "\n" -#: src/echo.c:67 src/printf.c:106 +#: src/echo.c:65 src/printf.c:105 msgid "" " \\\\ backslash\n" " \\a alert (BEL)\n" @@ -3862,7 +3866,7 @@ " \\t 水平制表符\n" " \\v 竖直制表符\n" -#: src/echo.c:79 +#: src/echo.c:77 msgid "" " \\0NNN byte with octal value NNN (1 to 3 digits)\n" " \\xHH byte with hexadecimal value HH (1 to 2 digits)\n" @@ -3871,16 +3875,16 @@ " \\xHH 字节数以十六进制数 HH (1至2位)表示\n" #. This is a proper name. See the gettext manual, section Names. -#: src/env.c:32 src/printenv.c:45 src/whoami.c:36 +#: src/env.c:32 src/printenv.c:45 src/whoami.c:35 msgid "Richard Mlynarik" msgstr "Richard Mlynarik" -#: src/env.c:53 +#: src/env.c:52 #, c-format msgid "Usage: %s [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]\n" msgstr "用法：%s [选项]... [-] [名称=值]... [命令 [参数]...]\n" -#: src/env.c:56 +#: src/env.c:55 msgid "" "Set each NAME to VALUE in the environment and run COMMAND.\n" "\n" @@ -3894,7 +3898,7 @@ " -0, --null 以空字符而非新行符结束每一输出行\n" " -u, --unset=名称 从当前环境中撤消一个变量\n" -#: src/env.c:65 +#: src/env.c:64 msgid "" "\n" "A mere - implies -i. If no COMMAND, print the resulting environment.\n" @@ -3902,22 +3906,22 @@ "\n" "单纯的 - 意味着 -i。如果没有命令，则打印结果环境。\n" -#: src/env.c:121 +#: src/env.c:120 #, c-format msgid "cannot unset %s" msgstr "无法撤消 %s" -#: src/env.c:132 +#: src/env.c:131 #, c-format msgid "cannot set %s" msgstr "无法设定 %s" -#: src/env.c:149 +#: src/env.c:148 #, c-format msgid "cannot specify --null (-0) with command" msgstr "无法以命令指定--null (-0)" -#: src/expand.c:109 +#: src/expand.c:107 msgid "" "Convert tabs in each FILE to spaces, writing to standard output.\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -3927,7 +3931,7 @@ "如果不指定文件，或者文件为\"-\"，程序将从标准输入读取数据。\n" "\n" -#: src/expand.c:117 +#: src/expand.c:115 msgid "" " -i, --initial do not convert tabs after non blanks\n" " -t, --tabs=NUMBER have tabs NUMBER characters apart, not 8\n" @@ -3935,38 +3939,38 @@ " -i, --initial\t\t不转换非空白符后的制表符\n" " -t, --tabs=数字\t设置每个制表符为指定数字的宽度，而不是默认的8\n" -#: src/expand.c:121 +#: src/expand.c:119 msgid "" " -t, --tabs=LIST use comma separated list of explicit tab positions\n" msgstr " -t, --tabs=列表\t指定制表符位置列表，用逗号分隔\n" -#: src/expand.c:174 src/unexpand.c:193 +#: src/expand.c:172 src/unexpand.c:191 #, c-format msgid "tab stop is too large %s" msgstr "%s：制表符跳格量过大" -#: src/expand.c:182 src/unexpand.c:201 +#: src/expand.c:180 src/unexpand.c:199 #, c-format msgid "tab size contains invalid character(s): %s" msgstr "制表符尺寸中包含无效字符：%s" -#: src/expand.c:208 src/unexpand.c:227 +#: src/expand.c:206 src/unexpand.c:225 #, c-format msgid "tab size cannot be 0" msgstr "制表符尺寸不可为0" -#: src/expand.c:210 src/unexpand.c:229 +#: src/expand.c:208 src/unexpand.c:227 #, c-format msgid "tab sizes must be ascending" msgstr "制表符尺寸必须是升序的" -#: src/expand.c:328 src/expand.c:347 src/unexpand.c:376 src/unexpand.c:421 +#: src/expand.c:326 src/expand.c:345 src/unexpand.c:374 src/unexpand.c:419 #, c-format 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:39 src/mv.c:41 src/tee.c:34 +#: src/expr.c:151 src/ln.c:41 src/mv.c:41 src/tee.c:34 msgid "Mike Parker" msgstr "Mike Parker" @@ -3975,7 +3979,7 @@ msgid "James Youngman" msgstr "James Youngman" -#: src/expr.c:204 +#: src/expr.c:203 #, c-format msgid "" "Usage: %s EXPRESSION\n" @@ -3984,7 +3988,7 @@ "用法：%s 表达式\n" "　或：%s 选项\n" -#: src/expr.c:212 +#: src/expr.c:211 msgid "" "\n" "Print the value of EXPRESSION to standard output. A blank line below\n" @@ -4002,7 +4006,7 @@ "\n" " ARG1 & ARG2 若两边的值都不为0 或为空，则返回ARG1，否则返回 0\n" -#: src/expr.c:221 +#: src/expr.c:220 msgid "" "\n" " ARG1 < ARG2 ARG1 is less than ARG2\n" @@ -4020,7 +4024,7 @@ " ARG1 >= ARG2 ARG1 大于或等于ARG2\n" " ARG1 > ARG2 ARG1 大于ARG2\n" -#: src/expr.c:230 +#: src/expr.c:229 msgid "" "\n" " ARG1 + ARG2 arithmetic sum of ARG1 and ARG2\n" @@ -4030,7 +4034,7 @@ " ARG1 + ARG2 计算 ARG1 与ARG2 相加之和\n" " ARG1 - ARG2 计算 ARG1 与ARG2 相减之差\n" -#: src/expr.c:237 +#: src/expr.c:236 #, no-c-format msgid "" "\n" @@ -4043,7 +4047,7 @@ " ARG1 / ARG2 计算 ARG1 与ARG2 相除之商\n" " ARG1 % ARG2 计算 ARG1 与ARG2 相除之余数\n" -#: src/expr.c:243 +#: src/expr.c:242 msgid "" "\n" " STRING : REGEXP anchored pattern match of REGEXP in STRING\n" @@ -4073,7 +4077,7 @@ "\n" " ( 表达式 )\t\t\t表达式的值\n" -#: src/expr.c:258 +#: src/expr.c:257 msgid "" "\n" "Beware that many operators need to be escaped or quoted for shells.\n" @@ -4088,7 +4092,7 @@ "模式匹配会返回\"\\\"和\"\\\"之间被匹配的子字符串或空(null)；如果未使用\"\\\"和\"\\\"，\n" "则会返回匹配字符数量或是 0。\n" -#: src/expr.c:265 +#: src/expr.c:264 msgid "" "\n" "Exit status is 0 if EXPRESSION is neither null nor 0, 1 if EXPRESSION is " @@ -4099,55 +4103,55 @@ "若表达式的值既不是空也不是 0，退出状态值为 0；若表达式的值为空或为 0，\n" "退出状态值为 1。如果表达式的句法无效，则会在出错时返回退出状态值 3。\n" -#: src/expr.c:279 +#: src/expr.c:278 #, c-format msgid "syntax error" msgstr "语法错误" -#: src/expr.c:600 src/ptx.c:283 +#: src/expr.c:599 src/ptx.c:283 #, c-format msgid "error in regular expression matcher" msgstr "正则表达式匹配器出错" -#: src/expr.c:792 src/expr.c:829 +#: src/expr.c:791 src/expr.c:828 #, c-format msgid "non-integer argument" msgstr "非整数参数" -#: src/expr.c:794 src/truncate.c:304 +#: src/expr.c:793 src/truncate.c:315 #, c-format msgid "division by zero" msgstr "除以零" -#: src/expr.c:888 src/sort.c:2014 +#: src/expr.c:887 src/sort.c:2045 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "请设置LC_ALL='C' 以避免出现问题。" -#: src/expr.c:890 +#: src/expr.c:889 #, c-format msgid "the strings compared were %s and %s" msgstr "已比较的字符串为%s 和%s" -#: src/factor.c:449 +#: src/factor.c:2393 msgid "using arbitrary-precision arithmetic" msgstr "使用任意精度运算" -#: src/factor.c:460 +#: src/factor.c:2377 msgid "using single-precision arithmetic" msgstr "使用单精度运算" -#: src/factor.c:465 src/od.c:1637 src/od.c:1706 +#: src/factor.c:2411 src/od.c:1640 src/od.c:1709 #, c-format msgid "%s is too large" msgstr "%s 太大" -#: src/factor.c:469 +#: src/factor.c:2388 #, c-format msgid "%s is not a valid positive integer" msgstr "%s 不是有效的正整数" -#: src/factor.c:495 +#: src/factor.c:2423 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4156,7 +4160,7 @@ "用法：%s [数字]...\n" "　或：%s 选项\n" -#: src/factor.c:500 +#: src/factor.c:2428 msgid "" "Print the prime factors of each specified integer NUMBER. If none\n" "are specified on the command line, read them from standard input.\n" @@ -4182,7 +4186,7 @@ msgstr "无法获取当前目录的文件状态(stat，当前目录是%s)" #. This is a proper name. See the gettext manual, section Names. -#: src/fmt.c:37 +#: src/fmt.c:38 msgid "Ross Paterson" msgstr "Ross Paterson" @@ -4223,19 +4227,19 @@ " -u, --uniform-spacing\t\t每两个单词间保留一个空格，每句之后保留两个空格\n" " -w, --width=宽度\t\t最大行宽(默认为75 列宽度)\n" -#: src/fmt.c:355 +#: src/fmt.c:360 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" "option; use -w N instead" msgstr "无效选项 -- %c；宽度必须是第一个选项才能被正确识别；请使用 -w N" -#: src/fmt.c:397 +#: src/fmt.c:406 src/fmt.c:417 #, c-format msgid "invalid width: %s" msgstr "无效的宽度：%s" -#: src/fold.c:71 +#: src/fold.c:70 msgid "" "Wrap input lines in each FILE (standard input by default), writing to\n" "standard output.\n" @@ -4244,7 +4248,7 @@ "对每个指定的文件(默认由标准输入读取)设置自动换行，并将重新排版后的结果输出到标准输出。\n" "\n" -#: src/fold.c:79 +#: src/fold.c:78 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4254,22 +4258,23 @@ " -s, --spaces\t\t在空格处断行\n" " -w, --width=宽度\t使用指定的列宽度代替默认的80\n" -#: src/fold.c:290 src/pr.c:837 +#: src/fold.c:289 src/pr.c:836 #, c-format msgid "invalid number of columns: %s" msgstr "无效的列数：%s" #. This is a proper name. See the gettext manual, section Names. -#: src/getlimits.c:29 src/stdbuf.c:37 src/timeout.c:75 src/truncate.c:37 +#: src/getlimits.c:29 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78 +#: src/truncate.c:37 msgid "Padraig Brady" msgstr "Padraig Brady" -#: src/getlimits.c:66 +#: src/getlimits.c:65 #, c-format msgid "Usage: %s\n" msgstr "用法：%s\n" -#: src/getlimits.c:70 +#: src/getlimits.c:69 msgid "" "Output platform dependent limits in a format useful for shell scripts.\n" "\n" @@ -4277,27 +4282,27 @@ "为Shell 脚本格式输出基于操作平台的限制参数。\n" "\n" -#: src/group-list.c:67 src/id.c:305 src/setuidgid.c:185 +#: src/group-list.c:69 src/id.c:365 src/setuidgid.c:184 #, c-format msgid "failed to get groups for user %s" msgstr "获取用户%s 的属组失败" -#: src/group-list.c:72 src/id.c:310 +#: src/group-list.c:74 src/id.c:370 #, c-format msgid "failed to get groups for the current process" msgstr "获取当前进程用户组失败" -#: src/group-list.c:102 +#: src/group-list.c:114 #, c-format msgid "cannot find name for group ID %lu" msgstr "无法找到ID 为%lu 的用户的属组" -#: src/groups.c:54 +#: src/groups.c:53 #, c-format msgid "Usage: %s [OPTION]... [USERNAME]...\n" msgstr "用法：%s [选项]... [用户名]...\n" -#: src/groups.c:55 +#: src/groups.c:54 msgid "" "Print group memberships for each USERNAME or, if no USERNAME is specified, " "for\n" @@ -4309,7 +4314,7 @@ msgid "%s: No such user" msgstr "%s：无此用户" -#: src/head.c:110 +#: src/head.c:109 msgid "" "Print the first 10 lines of each FILE to standard output.\n" "With more than one FILE, precede each with a header giving the file name.\n" @@ -4337,7 +4342,7 @@ "\t\t\t如果附加\"-\"参数，则除了每个文件的最后K 行外显示\n" "\t\t\t剩余全部内容\n" -#: src/head.c:127 +#: src/head.c:126 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4345,7 +4350,7 @@ " -q, --quiet, --silent\t不显示包含给定文件名的文件头\n" " -v, --verbose\t\t总是显示包含给定文件名的文件头\n" -#: src/head.c:133 +#: src/head.c:132 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -4357,63 +4362,63 @@ "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n" "GB 1000*1000*1000, G 1024*1024*1024, 对于T, P, E, Z, Y 同样适用。\n" -#: src/head.c:153 +#: src/head.c:152 #, c-format msgid "error writing %s" msgstr "写入%s 出错" -#: src/head.c:156 +#: src/head.c:155 #, c-format msgid "%s: file has shrunk too much" msgstr "%s：文件被过度收缩" -#: src/head.c:229 src/head.c:1045 +#: src/head.c:228 src/head.c:1052 #, c-format msgid "%s: number of bytes is too large" msgstr "%s：字节数过大" -#: src/head.c:442 +#: src/head.c:441 #, c-format msgid "%s: cannot lseek back to original position" msgstr "%s：lseek 无法回溯到初始位置" -#: src/head.c:614 src/head.c:685 src/tail.c:450 +#: src/head.c:613 src/head.c:692 src/tail.c:450 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s：无法检索到偏移量%s" -#: src/head.c:792 +#: src/head.c:799 #, c-format msgid "cannot reposition file pointer for %s" msgstr "无法复位%s 的文件指针" -#: src/head.c:879 +#: src/head.c:886 #, c-format msgid "%s: %s is so large that it is not representable" msgstr "%s：%s 过大以至于无法表示" -#: src/head.c:880 +#: src/head.c:887 msgid "number of lines" msgstr "参数数目错误" -#: src/head.c:880 +#: src/head.c:887 msgid "number of bytes" msgstr "字节数" -#: src/head.c:887 src/tail.c:1946 +#: src/head.c:894 src/tail.c:1948 msgid "invalid number of lines" msgstr "无效的号码%s" -#: src/head.c:888 src/tail.c:1947 +#: src/head.c:895 src/tail.c:1949 msgid "invalid number of bytes" msgstr "无效的号码%s" -#: src/head.c:975 src/head.c:1033 +#: src/head.c:982 src/head.c:1040 #, c-format msgid "invalid trailing option -- %c" msgstr "无效的加附选项 -- %c" -#: src/hostid.c:43 +#: src/hostid.c:42 #, c-format msgid "" "Usage: %s [OPTION]\n" @@ -4424,7 +4429,7 @@ "显示当前主机的数字标识符(十六进制)。\n" "\n" -#: src/hostname.c:57 +#: src/hostname.c:56 #, c-format msgid "" "Usage: %s [NAME]\n" @@ -4437,32 +4442,32 @@ "显示或设置当前系统的主机名。\n" "\n" -#: src/hostname.c:95 +#: src/hostname.c:94 #, c-format msgid "cannot set name to %s" msgstr "无法设置主机名为%s" -#: src/hostname.c:98 +#: src/hostname.c:97 #, c-format msgid "cannot set hostname; this system lacks the functionality" msgstr "无法设置主机名，此系统似乎不具备此功能" -#: src/hostname.c:106 +#: src/hostname.c:105 #, c-format msgid "cannot determine hostname" msgstr "无法确定主机名" #. This is a proper name. See the gettext manual, section Names. -#: src/id.c:38 src/touch.c:43 +#: src/id.c:38 src/touch.c:42 msgid "Arnold Robbins" msgstr "Arnold Robbins" -#: src/id.c:82 +#: src/id.c:81 #, c-format msgid "Usage: %s [OPTION]... [USERNAME]\n" msgstr "用法：%s [选项]... [用户名]\n" -#: src/id.c:83 +#: src/id.c:82 msgid "" "Print user and group information for the specified USERNAME,\n" "or (when USERNAME omitted) for the current user.\n" @@ -4485,7 +4490,7 @@ " -r, --real\t\t显示真实ID 而非有效ID，与-ugG 一起使用\n" " -u, --user\t\t仅显示有效用户ID\n" -#: src/id.c:97 +#: src/id.c:96 msgid "" "\n" "Without any OPTION, print some useful set of identified information.\n" @@ -4493,7 +4498,7 @@ "\n" "如果不附带任何选项，程序会显示一些可供识别用户身份的有用信息。\n" -#: src/id.c:141 +#: src/id.c:140 #, c-format msgid "--context (-Z) works only on an SELinux-enabled kernel" msgstr "--context (-Z) 选项只能在开启SELinux 支持的内核上使用" @@ -4503,17 +4508,17 @@ msgid "cannot print security context when user specified" msgstr "不能显示特定用户的安全环境" -#: src/id.c:184 +#: src/id.c:199 #, c-format msgid "can't get process context" msgstr "不能得到进程环境" -#: src/id.c:188 +#: src/id.c:178 #, c-format msgid "cannot print \"only\" of more than one choice" msgstr "有多种选择，无法输出唯一的" -#: src/id.c:192 +#: src/id.c:185 #, c-format msgid "cannot print only names or real IDs in default format" msgstr "以默认格式无法只显示名称或只显示真实ID。" @@ -4543,61 +4548,61 @@ msgid " egid=%lu" msgstr " egid=%lu" -#: src/id.c:317 +#: src/id.c:377 msgid " groups=" msgstr " 组=" -#: src/id.c:333 +#: src/id.c:393 #, c-format msgid " context=%s" msgstr " 环境=%s" -#: src/install.c:354 +#: src/install.c:373 #, c-format msgid "warning: %s: failed to change context to %s" msgstr "警告：%s：切换到%s 用户环境失败" -#: src/install.c:395 +#: src/install.c:414 #, c-format msgid "creating directory %s" msgstr "正在创建目录%s" -#: src/install.c:463 +#: src/install.c:482 #, c-format msgid "cannot change ownership of %s" msgstr "无法更改%s 的所有权" -#: src/install.c:487 +#: src/install.c:506 #, c-format msgid "cannot set time stamps for %s" msgstr "无法设置%s 的时间戳" -#: src/install.c:508 src/split.c:339 src/timeout.c:385 +#: src/install.c:527 src/split.c:427 src/timeout.c:413 #, c-format msgid "fork system call failed" msgstr "创建系统进程(fork)出错" -#: src/install.c:512 +#: src/install.c:531 #, c-format msgid "cannot run %s" msgstr "无法运行%s" -#: src/install.c:516 +#: src/install.c:535 #, c-format msgid "waiting for strip" msgstr "等待拆解" -#: src/install.c:518 +#: src/install.c:537 #, c-format msgid "strip process terminated abnormally" msgstr "拆解过程非正常中止" -#: src/install.c:539 +#: src/install.c:558 #, c-format msgid "invalid user %s" msgstr "无效的用户%s" -#: src/install.c:576 +#: src/install.c:594 #, c-format msgid "" "Usage: %s [OPTION]... [-T] SOURCE DEST\n" @@ -4610,7 +4615,7 @@ "　或：%s [选项]... -t 目录 源文件...\n" "　或：%s [选项]... -d 目录...\n" -#: src/install.c:583 +#: src/install.c:601 msgid "" "\n" "This install program copies files (often just compiled) into destination\n" @@ -4633,7 +4638,7 @@ "中同时设置其所有权和权限模式。在第四种形式中，创建给出目标目录中的所有组件。\n" "\n" -#: src/install.c:598 +#: src/install.c:616 msgid "" " --backup[=CONTROL] make a backup of each existing destination file\n" " -b like --backup but does not accept an argument\n" @@ -4650,7 +4655,7 @@ " -C, --compare\t\t比较每组源文件和目标文件，在一些情况下不修改目标文件\n" " -d, --directory\t将所有参数视为目录名称；为指定的目录创建所有组件\n" -#: src/install.c:607 +#: src/install.c:625 msgid "" " -D create all leading components of DEST except the " "last,\n" @@ -4666,7 +4671,7 @@ " -m, --mode=模式\t自行设置权限模式(像chmod)，而不是rwxr-xr-x\n" " -o, --owner=所有者\t自行设置所有者(只适用于超级用户)\n" -#: src/install.c:614 +#: src/install.c:632 msgid "" " -p, --preserve-timestamps apply access/modification times of SOURCE " "files\n" @@ -4687,7 +4692,7 @@ " -T, --no-target-directory\t将目标文件视为普通文件\n" " -v, --verbose\t\t\t创建目录时显示其名称\n" -#: src/install.c:624 +#: src/install.c:642 msgid "" " --preserve-context preserve SELinux security context\n" " -Z, --context=CONTEXT set SELinux security context of files and " @@ -4696,55 +4701,55 @@ " --preserve-context\t保持SELinux 的安全环境\n" " -Z, --context=CONTEXT\t\t设置文件和目录的SELinux 安全环境\n" -#: src/install.c:841 +#: src/install.c:859 #, c-format msgid "" "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled" msgstr "警告：忽略--preserve-context 参数，当前运行的内核没有启用SELinux 支持" -#: src/install.c:851 +#: src/install.c:869 #, c-format msgid "WARNING: ignoring --context (-Z); this kernel is not SELinux-enabled" msgstr "警告：忽略--context (-Z) 参数，当前运行的内核没有启用SELinux 支持" -#: src/install.c:868 +#: src/install.c:886 #, c-format msgid "the strip option may not be used when installing a directory" msgstr "安装目录时不能用strip 选项" -#: src/install.c:871 +#: src/install.c:889 #, c-format msgid "target directory not allowed when installing a directory" msgstr "安装目录时不能用目标目录选项" -#: src/install.c:875 +#: src/install.c:893 #, c-format msgid "cannot force target context to %s and preserve it" msgstr "无法对%s 强制为目标环境，保持原样" -#: src/install.c:929 src/mkdir.c:203 src/stdbuf.c:328 +#: src/install.c:947 src/mkdir.c:202 src/stdbuf.c:327 #, c-format msgid "invalid mode %s" msgstr "无效模式%s" -#: src/install.c:936 +#: src/install.c:954 #, c-format msgid "" "WARNING: ignoring --strip-program option as -s option was not specified" msgstr "警告：忽略--strip-program 选项，因为-s 选项没有指明" -#: src/install.c:941 +#: src/install.c:959 #, c-format msgid "" "options --compare (-C) and --preserve-timestamps are mutually exclusive" msgstr "选项--compare (-C) 和--preserve-timestamps 是互斥的" -#: src/install.c:948 +#: src/install.c:966 #, c-format msgid "options --compare (-C) and --strip are mutually exclusive" msgstr "选项--compare (-C) 和--strip 是互斥的" -#: src/install.c:954 +#: src/install.c:972 #, c-format msgid "" "the --compare (-C) option is ignored when you specify a mode with non-" @@ -4752,7 +4757,7 @@ msgstr "当您使用不允许的比特数指定模式是--compare (-C) 选项被忽略" #. This is a proper name. See the gettext manual, section Names. -#: src/join.c:40 src/sort.c:67 +#: src/join.c:40 src/sort.c:66 msgid "Mike Haertel" msgstr "Mike Haertel" @@ -4786,7 +4791,7 @@ " -o 格式 \t\t按照指定格式构造输出行\n" " -t 字符 \t\t使用指定字符作为输入和输出的分隔符\n" -#: src/join.c:207 +#: src/join.c:206 msgid "" " -v FILENUM like -a FILENUM, but suppress joined output lines\n" " -1 FIELD join on this FIELD of file 1\n" @@ -4833,52 +4838,52 @@ "注意，所进行的比较遵从\"LC_COLLATE\"所指定的的规则。\n" "如果输入没有被排序并导致某些行无法合并，将会显示警告信息。\n" -#: src/join.c:404 +#: src/join.c:403 #, c-format msgid "%s:%ju: is not sorted: %.*s" msgstr "" -#: src/join.c:841 src/join.c:1039 +#: src/join.c:840 src/join.c:1038 #, c-format msgid "invalid field number: %s" msgstr "无效的区块编号%s" -#: src/join.c:862 src/join.c:871 +#: src/join.c:861 src/join.c:870 #, c-format msgid "invalid field specifier: %s" msgstr "无效的区块定义符：%s" -#: src/join.c:878 +#: src/join.c:877 #, c-format msgid "invalid file number in field spec: %s" msgstr "在区块定义中出现无效的文件编号：%s" -#: src/join.c:921 +#: src/join.c:920 #, c-format msgid "incompatible join fields %lu, %lu" msgstr "不兼容的连接区块%lu，%lu" -#: src/join.c:1050 +#: src/join.c:1049 #, c-format msgid "conflicting empty-field replacement strings" msgstr "有冲突的空区块替换字符串" -#: src/join.c:1102 src/sort.c:4402 +#: src/join.c:1101 src/sort.c:4469 #, c-format msgid "multi-character tab %s" msgstr "多字符标签%s" -#: src/join.c:1106 src/sort.c:4407 +#: src/join.c:1105 src/sort.c:4474 #, c-format msgid "incompatible tabs" msgstr "不兼容的标签" -#: src/join.c:1175 +#: src/join.c:1174 #, c-format msgid "both files cannot be standard input" msgstr "不能从标准输入同时读取两个文件" -#: src/kill.c:77 +#: src/kill.c:76 #, c-format msgid "" "Usage: %s [-s SIGNAL | -SIGNAL] PID...\n" @@ -4889,7 +4894,7 @@ "　或：%s -l [信号]...\n" "　或：%s -t [信号]...\n" -#: src/kill.c:83 +#: src/kill.c:82 msgid "" "Send signals to processes, or list signals.\n" "\n" @@ -4897,7 +4902,7 @@ "向进程发送信号，或是列出可用信号。\n" "\n" -#: src/kill.c:90 +#: src/kill.c:89 msgid "" " -s, --signal=SIGNAL, -SIGNAL\n" " specify the name or number of the signal to be sent\n" @@ -4922,32 +4927,32 @@ "信号终止后的退出状态号。\n" "进程号(PID) 是一个整数，如果为负数则表示一个进程组。\n" -#: src/kill.c:207 +#: src/kill.c:206 #, c-format msgid "%s: invalid process id" msgstr "%s：无效的进程号" -#: src/kill.c:261 +#: src/kill.c:260 #, c-format msgid "invalid option -- %c" msgstr "无效的选项 -- %c" -#: src/kill.c:270 +#: src/kill.c:269 #, c-format msgid "%s: multiple signals specified" msgstr "%s：同时指定了多个信号" -#: src/kill.c:284 +#: src/kill.c:283 #, c-format msgid "multiple -l or -t options specified" msgstr "同时指定了多个-l 或-t 选项" -#: src/kill.c:301 +#: src/kill.c:300 #, c-format msgid "cannot combine signal with -l or -t" msgstr "无法将-l 或-t 选项结合使用" -#: src/kill.c:307 +#: src/kill.c:306 #, c-format msgid "no process ID specified" msgstr "未指定进程号" @@ -4972,7 +4977,7 @@ msgid "Michael Stone" msgstr "Michael Ston" -#: src/link.c:46 +#: src/link.c:45 #, c-format msgid "" "Usage: %s FILE1 FILE2\n" @@ -4981,7 +4986,7 @@ "用法：%s 文件1 文件2\n" "　或：%s 选项\n" -#: src/link.c:49 +#: src/link.c:48 msgid "" "Call the link function to create a link named FILE2 to an existing FILE1.\n" "\n" @@ -4989,52 +4994,52 @@ "调用 link 函数创建从既存的文件1 到文件2 的链接。\n" "\n" -#: src/link.c:91 +#: src/link.c:90 #, c-format msgid "cannot create link %s to %s" msgstr "无法创建指向%2$s 的链接%1$s" -#: src/ln.c:156 +#: src/ln.c:190 #, c-format msgid "%s: hard link not allowed for directory" msgstr "%s: 不允许将硬链接指向目录" -#: src/ln.c:221 +#: src/ln.c:255 #, c-format msgid "%s: cannot overwrite directory" msgstr "%s：无法覆盖目录" -#: src/ln.c:226 +#: src/ln.c:260 #, c-format msgid "%s: replace %s? " msgstr "%s：是否替换%s？ " -#: src/ln.c:307 +#: src/ln.c:345 #, c-format msgid "failed to create symbolic link %s" msgstr "无法创建符号链接%s" -#: src/ln.c:308 +#: src/ln.c:346 #, c-format msgid "failed to create symbolic link %s -> %s" msgstr "无法创建符号链接%s -> %s" -#: src/ln.c:310 +#: src/ln.c:348 #, c-format msgid "failed to create hard link to %.0s%s" msgstr "无法创建硬链接%.0s%s" -#: src/ln.c:313 +#: src/ln.c:351 #, c-format msgid "failed to create hard link %s" msgstr "无法创建硬链接%s" -#: src/ln.c:314 +#: src/ln.c:352 #, c-format msgid "failed to create hard link %s => %s" msgstr "无法创建硬链接%s => %s" -#: src/ln.c:336 +#: src/ln.c:374 #, c-format msgid "" "Usage: %s [OPTION]... [-T] TARGET LINK_NAME (1st form)\n" @@ -5066,7 +5071,7 @@ "当链接解析正常时，将其解析为一个与其父目录关联的链接。\n" "\n" -#: src/ln.c:356 +#: src/ln.c:395 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -5124,7 +5129,7 @@ "否则当源为一个符号链接(默认%s)时，会由最后指定的一个选项来控制行为。\n" "\n" -#: src/ln.c:511 +#: src/ln.c:554 #, c-format msgid "cannot combine --target-directory and --no-target-directory" msgstr "无法同时使用 --target-directory 和 --no-target-directory" @@ -5134,12 +5139,12 @@ msgid "FIXME: unknown" msgstr "FIXME：未知" -#: src/logname.c:40 src/sync.c:41 +#: src/logname.c:39 src/sync.c:40 #, c-format msgid "Usage: %s [OPTION]\n" msgstr "用法：%s [选项]\n" -#: src/logname.c:41 +#: src/logname.c:40 msgid "" "Print the name of the current user.\n" "\n" @@ -5147,7 +5152,7 @@ "显示当前用户的名称。\n" "\n" -#: src/logname.c:85 +#: src/logname.c:84 #, c-format msgid "no login name" msgstr "无登录名" @@ -5157,7 +5162,7 @@ #. 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:733 +#: src/ls.c:732 msgid "%b %e %Y" msgstr "%b %e %Y" @@ -5166,7 +5171,7 @@ #. 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:746 +#: src/ls.c:745 msgid "%b %e %H:%M" msgstr "%b %e %H:%M" @@ -5175,84 +5180,84 @@ msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" msgstr "忽略无效的环境变量QUOTING_STYLE 的键值：%s" -#: src/ls.c:1607 +#: src/ls.c:1599 #, c-format msgid "ignoring invalid width in environment variable COLUMNS: %s" msgstr "忽略无效的环境变量 COLUMNS 所示的宽度值：%s" -#: src/ls.c:1637 +#: src/ls.c:1629 #, c-format msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "忽略无效的环境变量 TABSIZE 所示的制表符尺寸值：%s" -#: src/ls.c:1758 src/ptx.c:1977 +#: src/ls.c:1750 src/ptx.c:1976 #, c-format msgid "invalid line width: %s" msgstr "无效的行宽：%s" -#: src/ls.c:1832 +#: src/ls.c:1824 #, c-format msgid "invalid tab size: %s" msgstr "无效的制表符尺寸：%s" -#: src/ls.c:2022 +#: src/ls.c:2033 #, c-format msgid "invalid time style format %s" msgstr "无效的日期时间格式%s" -#: src/ls.c:2061 +#: src/ls.c:2096 #, c-format msgid "error initializing month strings" msgstr "初始化月份字符串出错" -#: src/ls.c:2372 +#: src/ls.c:2407 #, c-format msgid "unrecognized prefix: %s" msgstr "无法识别的前缀：%s" -#: src/ls.c:2402 +#: src/ls.c:2437 #, c-format msgid "unparsable value for LS_COLORS environment variable" msgstr "LS_COLORS 环境变量中存在无法解些的值" -#: src/ls.c:2479 src/pwd.c:162 +#: src/ls.c:2514 src/pwd.c:161 #, c-format msgid "cannot open directory %s" msgstr "无法打开目录%s" -#: src/ls.c:2494 +#: src/ls.c:2529 #, c-format msgid "cannot determine device and inode of %s" msgstr "无法决定%s 所在的设备及inode" -#: src/ls.c:2503 +#: src/ls.c:2538 #, c-format msgid "%s: not listing already-listed directory" msgstr "%s：不会再列出已经列出的目录" -#: src/ls.c:2580 src/pwd.c:230 +#: src/ls.c:2615 src/pwd.c:229 #, c-format msgid "reading directory %s" msgstr "正在读取目录%s" -#: src/ls.c:2590 +#: src/ls.c:2630 #, c-format msgid "closing directory %s" msgstr "关闭目录%s" -#: src/ls.c:3182 +#: src/ls.c:3302 #, c-format msgid "cannot compare file names %s and %s" msgstr "无法比较文件名%s 和 %s" -#: src/ls.c:4597 +#: src/ls.c:4721 msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" "\n" msgstr "" -#: src/ls.c:4605 +#: src/ls.c:4729 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -5311,11 +5316,11 @@ "\t\t\t\t单栏-1，详细-l，垂直-C\n" " --full-time\t\t即-l --time-style=full-iso\n" -#: src/ls.c:4637 +#: src/ls.c:4761 msgid " -g like -l, but do not list owner\n" msgstr " -g\t\t\t\t类似-l，但不列出所有者\n" -#: src/ls.c:4640 +#: src/ls.c:4764 msgid "" " --group-directories-first\n" " group directories before files.\n" @@ -5326,7 +5331,7 @@ "\t\t\t在文件前分组目录。此选项可与--sort 一起使用，\n" "\t\t\t但是一旦使用--sort=none (-U)将禁用分组\n" -#: src/ls.c:4646 +#: src/ls.c:4770 msgid "" " -G, --no-group in a long listing, don't print group names\n" " -h, --human-readable with -l, print sizes in human readable format\n" @@ -5338,7 +5343,7 @@ "\t\t\t\t(例如 1K 234M 2G)\n" " --si\t\t\t同上面类似，但是使用1000 为基底而非1024\n" -#: src/ls.c:4652 +#: src/ls.c:4776 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -5374,7 +5379,7 @@ " -I, --ignore=PATTERN\t\t不显示任何符合指定shell PATTERN 的项目\n" " -k\t\t\t\t即--block-size=1K\n" -#: src/ls.c:4672 +#: src/ls.c:4796 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5388,7 +5393,7 @@ "\t\t\t\t的对象而并非符号链接本身的信息\n" " -m\t\t\t\t所有项目以逗号分隔，并填满整行行宽\n" -#: src/ls.c:4680 +#: src/ls.c:4804 msgid "" " -n, --numeric-uid-gid like -l, but list numeric user and group IDs\n" " -N, --literal print raw entry names (don't treat e.g. " @@ -5421,7 +5426,7 @@ " --quoting-style=方式\t使用指定的quoting 方式显示条目的名称：\n" "\t\t\t\tliteral、locale、shell、shell-always、c、escape\n" -#: src/ls.c:4697 +#: src/ls.c:4821 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -5432,7 +5437,7 @@ " -R, --recursive\t\t递归显示子目录\n" " -s, --size\t\t\t以块数形式显示每个文件分配的尺寸\n" -#: src/ls.c:4702 +#: src/ls.c:4826 msgid "" " -S sort by file size\n" " --sort=WORD sort by WORD instead of name: none -U,\n" @@ -5475,13 +5480,13 @@ " -t\t\t\t\t根据修改时间排序\n" " -T, --tabsize=宽度\t指定制表符(Tab)的宽度，而非8 个字符\n" -#: src/ls.c:4721 +#: src/ls.c:4845 msgid "" " -t sort by modification time, newest first\n" " -T, --tabsize=COLS assume tab stops at each COLS instead of 8\n" msgstr "" -#: src/ls.c:4725 +#: src/ls.c:4849 msgid "" " -u with -lt: sort by, and show, access time\n" " with -l: show access time and sort by name\n" @@ -5495,7 +5500,7 @@ " -U\t\t\t不进行排序；按照目录顺序列出项目\n" " -v\t\t\t在文本中进行数字(版本)的自然排序\n" -#: src/ls.c:4732 +#: src/ls.c:4856 msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" @@ -5509,7 +5514,7 @@ " -X\t\t\t根据扩展名排序\n" " -1\t\t\t每行只列出一个文件\n" -#: src/ls.c:4742 +#: src/ls.c:4866 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -5522,7 +5527,7 @@ "使用 --color=auto 选项，ls 只在标准输出被连至终端时才生成颜色代码。\n" "LS_COLORS 环境变量可改变此设置，可使用 dircolors 命令来设置。\n" -#: src/ls.c:4749 +#: src/ls.c:4873 msgid "" "\n" "Exit status:\n" @@ -5551,7 +5556,7 @@ msgid "David Madore" msgstr "David Madore" -#: src/md5sum.c:160 +#: src/md5sum.c:164 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -5564,31 +5569,31 @@ "若没有文件选项，或者文件处为\"-\"，则从标准输入读取。\n" "\n" -#: src/md5sum.c:170 +#: src/md5sum.c:174 msgid "" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" msgstr " -b, --binary\t\t以二进制模式读取(除非从tty 标准输入读取否则为默认)\n" -#: src/md5sum.c:174 +#: src/md5sum.c:178 msgid " -b, --binary read in binary mode\n" msgstr " -b, --binary\t\t以二进制模式读取\n" -#: src/md5sum.c:177 +#: src/md5sum.c:181 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr " -c, --check\t\t从文件中读取%s 的校验值并予以检查\n" -#: src/md5sum.c:181 +#: src/md5sum.c:188 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr " -t, --text\t\t以纯文本模式读取(从tty 标准输入读取时为默认)\n" -#: src/md5sum.c:185 +#: src/md5sum.c:192 msgid " -t, --text read in text mode (default)\n" msgstr " -t, --text\t\t以纯文本模式读取(默认)\n" -#: src/md5sum.c:188 +#: src/md5sum.c:195 msgid "" "\n" "The following three options are useful only when verifying checksums:\n" @@ -5604,7 +5609,7 @@ " -w, --warn\t\t对格式不准确的校验和行进行警告\n" "\n" -#: src/md5sum.c:196 +#: src/md5sum.c:203 msgid "" " --strict with --check, exit non-zero for any invalid input\n" msgstr "" @@ -5623,84 +5628,84 @@ "样板格式相同。默认的输出模式时输出一行校验和的校验结果，并有一个字符来\n" "表示文件类型(\"*\"代表二进制，\" \"代表纯文本)，并同时显示每个文件的名称。\n" -#: src/md5sum.c:485 +#: src/md5sum.c:523 #, c-format msgid "%s: too many checksum lines" msgstr "%s：校验和的行数过多" -#: src/md5sum.c:509 +#: src/md5sum.c:547 #, c-format msgid "%s: %: improperly formatted %s checksum line" msgstr "%s：%：%s 的校验和行目格式不适当" -#: src/md5sum.c:534 +#: src/md5sum.c:572 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s：打开或读取失败\n" -#: src/md5sum.c:557 +#: src/md5sum.c:595 msgid "FAILED" msgstr "失败" -#: src/md5sum.c:559 +#: src/md5sum.c:597 msgid "OK" msgstr "确定" -#: src/md5sum.c:583 +#: src/md5sum.c:621 #, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "%s：找不到格式适用的%s 校验和" -#: src/md5sum.c:593 +#: src/md5sum.c:631 #, c-format msgid "WARNING: % line is improperly formatted" msgid_plural "WARNING: % lines are improperly formatted" msgstr[0] "警告：% 行的格式不适当" -#: src/md5sum.c:601 +#: src/md5sum.c:639 #, c-format msgid "WARNING: % listed file could not be read" msgid_plural "WARNING: % listed files could not be read" msgstr[0] "警告：% 个列出的文件无法读取" -#: src/md5sum.c:609 +#: src/md5sum.c:647 #, c-format msgid "WARNING: % computed checksum did NOT match" msgid_plural "WARNING: % computed checksums did NOT match" msgstr[0] "警告：% 个校验和不匹配" -#: src/md5sum.c:687 +#: src/md5sum.c:773 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" msgstr "在校验时--binary 和--text 选项是无意义的" -#: src/md5sum.c:695 +#: src/md5sum.c:781 #, c-format msgid "the --status option is meaningful only when verifying checksums" msgstr "只有在校验时--status 选项才有意义" -#: src/md5sum.c:702 +#: src/md5sum.c:788 #, c-format msgid "the --warn option is meaningful only when verifying checksums" msgstr "只有在校验时--warn 选项才有意义" -#: src/md5sum.c:709 +#: src/md5sum.c:795 #, c-format msgid "the --quiet option is meaningful only when verifying checksums" msgstr "只有在校验时--quiet 选项才有意义" -#: src/md5sum.c:716 +#: src/md5sum.c:802 #, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "" -#: src/mkdir.c:57 src/rmdir.c:165 +#: src/mkdir.c:56 src/rmdir.c:164 #, c-format msgid "Usage: %s [OPTION]... DIRECTORY...\n" msgstr "用法：%s [选项]... 目录...\n" -#: src/mkdir.c:58 +#: src/mkdir.c:57 msgid "" "Create the DIRECTORY(ies), if they do not already exist.\n" "\n" @@ -5708,7 +5713,7 @@ "若指定目录不存在则创建目录。\n" "\n" -#: src/mkdir.c:65 +#: src/mkdir.c:64 msgid "" " -m, --mode=MODE set file mode (as in chmod), not a=rwx - umask\n" " -p, --parents no error if existing, make parent directories as needed\n" @@ -5721,17 +5726,17 @@ " -v, --verbose \t每次创建新目录都显示信息\n" " -Z, --context=CTX \t将每个创建的目录的SELinux 安全环境设置为CTX\n" -#: src/mkdir.c:170 +#: src/mkdir.c:169 #, c-format msgid "created directory %s" msgstr "已创建目录 %s" -#: src/mkfifo.c:52 src/pathchk.c:90 +#: src/mkfifo.c:51 src/pathchk.c:89 #, c-format msgid "Usage: %s [OPTION]... NAME...\n" msgstr "用法：%s [选项]... 名称...\n" -#: src/mkfifo.c:53 +#: src/mkfifo.c:52 msgid "" "Create named pipes (FIFOs) with the given NAMEs.\n" "\n" @@ -5739,32 +5744,32 @@ "以指定的名称创建先进先出文件(FIFO)。\n" "\n" -#: src/mkfifo.c:60 src/mknod.c:62 +#: src/mkfifo.c:59 src/mknod.c:61 msgid "" " -m, --mode=MODE set file permission bits to MODE, not a=rw - umask\n" msgstr " -m, --mode=模式 \t设置权限模式(类似chmod)，而不是rwxrwxrwx 减umask\n" -#: src/mkfifo.c:63 +#: src/mkfifo.c:62 msgid "" " -Z, --context=CTX set the SELinux security context of each NAME to CTX\n" msgstr " -Z, --context=CTX \t将每个创建的目录的SELinux 安全环境设置为CTX\n" -#: src/mkfifo.c:123 src/mknod.c:129 +#: src/mkfifo.c:122 src/mknod.c:128 #, c-format msgid "invalid mode" msgstr "无效的权限模式" -#: src/mkfifo.c:128 src/mknod.c:134 +#: src/mkfifo.c:127 src/mknod.c:133 #, c-format msgid "mode must specify only file permission bits" msgstr "模式必须只指定文件许可位" -#: src/mknod.c:53 +#: src/mknod.c:52 #, c-format msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n" msgstr "用法：%s [选项]... 名称 类型 [主设备号 次设备号]\n" -#: src/mknod.c:55 +#: src/mknod.c:54 msgid "" "Create the special file NAME of the given TYPE.\n" "\n" @@ -5772,12 +5777,12 @@ "创建指定类型和名称的特殊文件。\n" "\n" -#: src/mknod.c:65 +#: src/mknod.c:64 msgid "" " -Z, --context=CTX set the SELinux security context of NAME to CTX\n" msgstr " -Z, --context=CTX \t将对应名称文件的SELinux 安全环境设置为CTX\n" -#: src/mknod.c:70 +#: src/mknod.c:69 msgid "" "\n" "Both MAJOR and MINOR must be specified when TYPE is b, c, or u, and they\n" @@ -5791,7 +5796,7 @@ "解析；如果以\"0\"开头，则被视作八进制数；其余情况下被视作十进制数。\n" "可用的类型包括：\n" -#: src/mknod.c:77 +#: src/mknod.c:76 msgid "" "\n" " b create a block (buffered) special file\n" @@ -5803,40 +5808,40 @@ " c, u 创建(没有缓冲的)字符特殊文件\n" " p 创建先进先出(FIFO)特殊文件\n" -#: src/mknod.c:152 +#: src/mknod.c:151 msgid "Special files require major and minor device numbers." msgstr "创建块设备文件时，必需指定主、次设备号。" -#: src/mknod.c:162 +#: src/mknod.c:161 msgid "Fifos do not have major and minor device numbers." msgstr "先进先出(FIFO)文件不需要指定主、次设备号。" -#: src/mknod.c:178 +#: src/mknod.c:177 #, c-format msgid "block special files not supported" msgstr "不支持区块特殊文件" -#: src/mknod.c:187 +#: src/mknod.c:186 #, c-format msgid "character special files not supported" msgstr "不支持字符特殊文件" -#: src/mknod.c:203 +#: src/mknod.c:202 #, c-format msgid "invalid major device number %s" msgstr "无效的主设备号 %s" -#: src/mknod.c:208 +#: src/mknod.c:207 #, c-format msgid "invalid minor device number %s" msgstr "无效的次设备号 %s" -#: src/mknod.c:213 +#: src/mknod.c:212 #, c-format msgid "invalid device %s %s" msgstr "无效的设备文件%s %s" -#: src/mknod.c:227 +#: src/mknod.c:226 #, c-format msgid "invalid device type %s" msgstr "无效的设备类型 %s" @@ -5846,7 +5851,7 @@ msgid "Eric Blake" msgstr "Eric Blake" -#: src/mktemp.c:69 +#: src/mktemp.c:68 #, c-format msgid "Usage: %s [OPTION]... [TEMPLATE]\n" msgstr "用法：%s [选项]... [TEMPLATE]\n" @@ -5861,12 +5866,12 @@ "TEMPLATE 最后部分必须含有至少 3 个连续的 X。\n" "如果 TEMPLATE 没有指定，将会使用 tmp.XXXXXXXXXX。\n" -#: src/mktemp.c:75 +#: src/mktemp.c:74 msgid "" "Files are created u+rw, and directories u+rwx, minus umask restrictions.\n" msgstr "" -#: src/mktemp.c:79 +#: src/mktemp.c:78 msgid "" " -d, --directory create a directory, not a file\n" " -u, --dry-run do not create anything; merely print a name (unsafe)\n" @@ -5876,7 +5881,7 @@ " -u, --dry-run 不创建任何东西，仅打印出名字。(仅供测试)\n" " -q, --quiet 不显示任何有关文件或目录创建错误信息\n" -#: src/mktemp.c:84 +#: src/mktemp.c:83 msgid "" " --suffix=SUFF append SUFF to TEMPLATE. SUFF must not contain " "slash.\n" @@ -5886,7 +5891,7 @@ " --suffix=SUFF 将 SUFF 添加至 TEMPLATE。SUFF 不能带斜杠。\n" " 若 TEMPLATE 不以 X 结尾，则此选项隐式实现。\n" -#: src/mktemp.c:88 +#: src/mktemp.c:87 msgid "" " --tmpdir[=DIR] interpret TEMPLATE relative to DIR. If DIR is not\n" " specified, use $TMPDIR if set, else /tmp. With\n" @@ -5900,7 +5905,7 @@ " 与-t 不同，TEMPLATE 允许带斜线。\n" " 但此种情况下mktemp 仅以斜线后部分生成目录。\n" -#: src/mktemp.c:96 +#: src/mktemp.c:95 msgid "" " -p DIR use DIR as a prefix; implies -t [deprecated]\n" " -t interpret TEMPLATE as a single file name component,\n" @@ -5927,7 +5932,7 @@ msgid "with --suffix, template %s must end in X" msgstr "使用 --suffix，模板 %s 必须以 X 结尾" -#: src/mktemp.c:274 +#: src/mktemp.c:274 src/split.c:1131 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "无效后缀 %s，含有目录分隔符" @@ -5957,7 +5962,7 @@ msgid "failed to create file via template %s" msgstr "无法通过模板%s 创建文件" -#: src/mv.c:291 +#: src/mv.c:292 msgid "" "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" "\n" @@ -5965,7 +5970,7 @@ "将源文件重命名为目标文件，或将源文件移动至指定目录。\n" "\n" -#: src/mv.c:298 +#: src/mv.c:299 msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -5984,7 +5989,7 @@ " -n, --no-clobber 不覆盖已存在文件\n" "如果您指定了-i、-f、-n 中的多个，仅最后一个生效。\n" -#: src/mv.c:307 +#: src/mv.c:308 msgid "" " --strip-trailing-slashes remove any trailing slashes from each " "SOURCE\n" @@ -5994,7 +5999,7 @@ " --strip-trailing-slashes\t去掉每个源文件参数尾部的斜线\n" " -S, --suffix=SUFFIX\t\t替换常用的备份文件后缀\n" -#: src/mv.c:312 +#: src/mv.c:313 msgid "" " -t, --target-directory=DIRECTORY move all SOURCE arguments into " "DIRECTORY\n" @@ -6011,7 +6016,7 @@ "\t\t\t\t不存在时才进行移动\n" " -v, --verbose\t\t详细显示进行的步骤\n" -#: src/nice.c:73 +#: src/nice.c:72 #, c-format msgid "Usage: %s [OPTION] [COMMAND [ARG]...]\n" msgstr "用法：%s [选项] [命令 [参数]...]\n" @@ -6031,22 +6036,22 @@ "\n" " -n, --adjustment=N 对优先级数值加上指定整数N (默认为10)\n" -#: src/nice.c:169 +#: src/nice.c:168 #, c-format msgid "invalid adjustment %s" msgstr "无效的调整值%s" -#: src/nice.c:178 +#: src/nice.c:177 #, c-format msgid "a command must be given with an adjustment" msgstr "命令必须和调整值配合指定" -#: src/nice.c:185 src/nice.c:196 +#: src/nice.c:184 src/nice.c:195 #, c-format msgid "cannot get niceness" msgstr "无法获取优先级" -#: src/nice.c:202 +#: src/nice.c:201 #, c-format msgid "cannot set niceness" msgstr "无法设置优先级" @@ -6056,7 +6061,7 @@ msgid "Scott Bartram" msgstr "Scott Bartram" -#: src/nl.c:187 +#: src/nl.c:186 msgid "" "Write each FILE to standard output, with line numbers added.\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -6066,7 +6071,7 @@ "如果不指定文件或指定文件为\"-\" ，程序将从标准输入读取数据。\n" "\n" -#: src/nl.c:195 +#: src/nl.c:194 msgid "" " -b, --body-numbering=STYLE use STYLE for numbering body lines\n" " -d, --section-delimiter=CC use CC for separating logical pages\n" @@ -6076,7 +6081,7 @@ " -d, --section-delimiter=CC\t使用指定的CC 分割逻辑页数\n" " -f, --footer-numbering=样式\t使用指定样式编号文件的页脚行目\n" -#: src/nl.c:200 +#: src/nl.c:199 msgid "" " -h, --header-numbering=STYLE use STYLE for numbering header lines\n" " -i, --line-increment=NUMBER line number increment at each line\n" @@ -6094,7 +6099,7 @@ " -p, --no-renumber\t\t在逻辑页数切换时不将行号值复位\n" " -s, --number-separator=字符串\t可能的话在行号后添加字符串\n" -#: src/nl.c:208 +#: src/nl.c:207 msgid "" " -v, --starting-line-number=NUMBER first line number on each logical page\n" " -w, --number-width=NUMBER use NUMBER columns for line numbers\n" @@ -6102,7 +6107,7 @@ " -v, --starting-line-number=数字\t每个逻辑页上的第一行的行号\n" " -w, --number-width=数字\t为行号使用指定的栏数\n" -#: src/nl.c:214 +#: src/nl.c:213 msgid "" "\n" "By default, selects -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn. CC are\n" @@ -6114,7 +6119,7 @@ "逻辑页数的两个分界符，其中缺失的第二个字符暗含了\":\"，如果您要指定\"\\\"，\n" "请输入\"\\\\\"。可用的样式如下：\n" -#: src/nl.c:220 +#: src/nl.c:219 msgid "" "\n" " a number all lines\n" @@ -6143,57 +6148,57 @@ " rz \t右对齐，空格用0 填充\n" "\n" -#: src/nl.c:287 +#: src/nl.c:286 #, c-format msgid "line number overflow" msgstr "行号溢出" -#: src/nl.c:487 +#: src/nl.c:486 #, c-format msgid "invalid header numbering style: %s" msgstr "无效的页眉号样式：%s" -#: src/nl.c:495 +#: src/nl.c:494 #, c-format msgid "invalid body numbering style: %s" msgstr "无效的正文号样式：%s" -#: src/nl.c:503 +#: src/nl.c:502 #, c-format msgid "invalid footer numbering style: %s" msgstr "无效的页脚号样式：%s" -#: src/nl.c:512 +#: src/nl.c:511 #, c-format msgid "invalid starting line number: %s" msgstr "无效的起始行号：%s" -#: src/nl.c:518 +#: src/nl.c:517 #, c-format msgid "WARNING: --page-increment is deprecated; use --line-increment instead" msgstr "警告：不推荐使用--page-increment，请使用--line-increment" -#: src/nl.c:525 +#: src/nl.c:524 #, c-format msgid "invalid line number increment: %s" msgstr "无效的行号递增值：%s" -#: src/nl.c:537 +#: src/nl.c:536 #, c-format msgid "invalid number of blank lines: %s" msgstr "无效的空行数：%s" -#: src/nl.c:551 +#: src/nl.c:550 #, c-format msgid "invalid line number field width: %s" msgstr "无效的行宽数值：%s" -#: src/nl.c:570 +#: src/nl.c:569 #, c-format msgid "invalid line numbering format: %s" msgstr "无效的编号格式：%s" -#: src/nohup.c:54 +#: src/nohup.c:53 #, c-format msgid "" "Usage: %s COMMAND [ARG]...\n" @@ -6202,7 +6207,7 @@ "用法：%s 命令 [参数]...\n" "　或：%s 选项\n" -#: src/nohup.c:60 +#: src/nohup.c:59 msgid "" "Run COMMAND, ignoring hangup signals.\n" "\n" @@ -6227,57 +6232,57 @@ "如果标准错误输出是一个终端，重定向它到标准输出。\n" "要保存输出内容到一个文件，使用 \"%s COMMAND > FILE\" 形式的命令。\n" -#: src/nohup.c:128 +#: src/nohup.c:127 #, c-format msgid "failed to render standard input unusable" msgstr "标准输入不可用，无法重定向" -#: src/nohup.c:132 +#: src/nohup.c:131 #, c-format msgid "ignoring input" msgstr "忽略输入" -#: src/nohup.c:164 src/nohup.c:166 +#: src/nohup.c:163 src/nohup.c:165 #, c-format msgid "failed to open %s" msgstr "打开%s 失败" -#: src/nohup.c:176 +#: src/nohup.c:175 #, c-format msgid "ignoring input and appending output to %s" msgstr "忽略输入并把输出追加到%s" -#: src/nohup.c:177 +#: src/nohup.c:176 #, c-format msgid "appending output to %s" msgstr "把输出追加到%s" -#: src/nohup.c:194 +#: src/nohup.c:193 #, c-format msgid "failed to set the copy of stderr to close on exec" msgstr "执行时关闭标准错误失败" -#: src/nohup.c:199 +#: src/nohup.c:198 #, c-format msgid "ignoring input and redirecting stderr to stdout" msgstr "忽略输入重定向错误到标准输出端" -#: src/nohup.c:200 +#: src/nohup.c:199 #, c-format msgid "redirecting stderr to stdout" msgstr "重定向标准错误到标准输出" -#: src/nohup.c:204 +#: src/nohup.c:203 #, c-format msgid "failed to redirect standard error" msgstr "重定向标准错误失败" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:32 +#: src/nproc.c:33 msgid "Giuseppe Scrivano" msgstr "Giuseppe Scrivano" -#: src/nproc.c:57 src/pwd.c:57 src/tty.c:65 src/uname.c:122 src/whoami.c:46 +#: src/nproc.c:57 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "用法：%s [选项]...\n" @@ -6305,7 +6310,7 @@ msgid "%s: invalid number to ignore" msgstr "%s：无效的忽略数" -#: src/od.c:295 +#: src/od.c:294 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -6317,7 +6322,7 @@ "　或：%s [-abcdfilosx]... [文件] [[+]偏移量[.][b]]\n" "　或：%s --traditional [选项]... [文件] [[+]偏移量[.][b] [+][标签][.][b]]\n" -#: src/od.c:301 +#: src/od.c:300 msgid "" "\n" "Write an unambiguous representation, octal bytes by default,\n" @@ -6332,11 +6337,11 @@ "如果没有指定文件，或指定文件为\"-\"，程序从标准输入读取数据。\n" "\n" -#: src/od.c:308 +#: src/od.c:307 msgid "All arguments to long options are mandatory for short options.\n" msgstr "长选项必须用的参数在使用短选项时也是必须的。\n" -#: src/od.c:311 +#: src/od.c:310 msgid "" " -A, --address-radix=RADIX decide how file offsets are printed\n" " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" @@ -6361,7 +6366,7 @@ " -w, --width[=字节数]\t\t每一行只输出指定的字节数\n" " --traditional\t\t接受传统形式提交的参数\n" -#: src/od.c:325 +#: src/od.c:324 msgid "" "\n" "Traditional format specifications may be intermixed; they accumulate:\n" @@ -6377,7 +6382,7 @@ " -c\t即 -t c， 使用ASCII 字符，或者反斜杠正名的特殊字符\n" " -d\t即 -t u2，使用无符号十进制双字节字符\n" -#: src/od.c:333 +#: src/od.c:332 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -6393,7 +6398,7 @@ " -s\t即 -t d2，指定双字节单位十进制数的对照输出格式\n" " -x\t即 -t x2，指定双字节单位十六进制数的对照输出格式\n" -#: src/od.c:341 +#: src/od.c:340 msgid "" "\n" "If first and second call formats both apply, the second format is assumed\n" @@ -6410,7 +6415,7 @@ "随着累积过程递增。偏移量和标签如果冠以\"0x\"或\"0X\"前缀则\n" "表示十六进制数；后缀\".\"代表八进制数，后缀\"b\"表示乘以 512。\n" -#: src/od.c:350 +#: src/od.c:349 msgid "" "\n" "TYPE is made up of one or more of these specifications:\n" @@ -6424,7 +6429,7 @@ " a\t\t重定义字符，忽略高位字节\n" " c\t\tASCII 码字符或者是反斜线字串(如\\n)\n" -#: src/od.c:357 +#: src/od.c:356 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -6438,7 +6443,7 @@ " u[尺寸]\t无符号十进制数，每个整形数占指定尺寸的字节\n" " x[尺寸]\t十六进制数，每个整形数占指定尺寸的字节\n" -#: src/od.c:364 +#: src/od.c:363 msgid "" "\n" "SIZE is a number. For TYPE in doux, SIZE may also be C for\n" @@ -6454,7 +6459,7 @@ "F 代表 sizeof(float)、D 代表sizeof(double)，或 L 代表\n" "sizeof(long double)。\n" -#: src/od.c:371 +#: src/od.c:370 msgid "" "\n" "RADIX is d for decimal, o for octal, x for hexadecimal or n for none.\n" @@ -6474,7 +6479,7 @@ "GB 1000*1000*1000，G 1024*1024*1024，对于T，P，E，Z，Y 同样适用。\n" "为任何类型添加\"z\"后缀都将在每个输出行的行尾显示可显示字符\n" -#: src/od.c:381 +#: src/od.c:380 msgid "" "Option --string without a number implies 3; option --width without a number\n" "implies 32. By default, od uses -A o -t oS -w16.\n" @@ -6482,12 +6487,12 @@ "不带数字的--string 选项代表3；不带数字的--width 选项代表32。\n" "默认情况下od 使用 -A o -t oS -w16 参数。\n" -#: src/od.c:634 src/od.c:753 +#: src/od.c:633 src/od.c:753 #, c-format msgid "invalid type string %s" msgstr "无效类型的字符串%s" -#: src/od.c:644 +#: src/od.c:643 #, c-format msgid "" "invalid type string %s;\n" @@ -6496,7 +6501,7 @@ "无效的类型字符串%s；\n" "系统无法提供对%lu-字节整形类型数值的支持" -#: src/od.c:763 +#: src/od.c:764 #, c-format msgid "" "invalid type string %s;\n" @@ -6510,7 +6515,7 @@ msgid "invalid character `%c' in type string %s" msgstr "无效字符\"%c\"出现在类型字符串%s 中" -#: src/od.c:1044 +#: src/od.c:1047 #, c-format msgid "cannot skip past end of combined input" msgstr "无法略过输入内容的报尾" @@ -6521,21 +6526,21 @@ "invalid output address radix `%c'; it must be one character from [doxn]" msgstr "无效的输出地址基数\"%c\"，它必须是 [doxn] 四个字符中的一个" -#: src/od.c:1726 +#: src/od.c:1729 #, c-format msgid "no type may be specified when dumping strings" msgstr "在转储字符串时不能指定类型" -#: src/od.c:1801 +#: src/od.c:1804 msgid "compatibility mode supports at most one file" msgstr "兼容模式最多支持一个文件" -#: src/od.c:1822 +#: src/od.c:1825 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "略过字节数+ 读入字节数的值过大" -#: src/od.c:1865 +#: src/od.c:1868 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "警告：无效的宽度值%lu，已使用%d 代替" @@ -6550,7 +6555,7 @@ msgid "standard input is closed" msgstr "标准输入已关闭" -#: src/paste.c:440 +#: src/paste.c:439 msgid "" "Write lines consisting of the sequentially corresponding lines from\n" "each FILE, separated by TABs, to standard output.\n" @@ -6561,7 +6566,7 @@ "如果没有指定文件，或指定文件为\"-\"，程序将从标准输入读取数据。\n" "\n" -#: src/paste.c:449 +#: src/paste.c:448 msgid "" " -d, --delimiters=LIST reuse characters from LIST instead of TABs\n" " -s, --serial paste one file at a time instead of in parallel\n" @@ -6569,12 +6574,12 @@ " -d, --delimiters=列表\t改用指定列表里的字符替代制表分隔符\n" " -s, --serial\t\t不使用平行的行目输出模式，而是每个文件占用一行\n" -#: src/paste.c:510 +#: src/paste.c:509 #, c-format msgid "delimiter list ends with an unescaped backslash: %s" msgstr "分割符列表以一个未跳过的反斜线结束：%s" -#: src/pathchk.c:91 +#: src/pathchk.c:90 msgid "" "Diagnose invalid or unportable file names.\n" "\n" @@ -6593,27 +6598,27 @@ msgid "leading `-' in a component of file name %s" msgstr "文件名%s 以\"-\"符号开头" -#: src/pathchk.c:197 +#: src/pathchk.c:196 #, c-format msgid "nonportable character %s in file name %s" msgstr "有不通用的字符%s 被包含在文件名%s 中" -#: src/pathchk.c:273 +#: src/pathchk.c:272 #, c-format msgid "empty file name" msgstr "空文件名" -#: src/pathchk.c:315 +#: src/pathchk.c:314 #, c-format msgid "%s: unable to determine maximum file name length" msgstr "%s：不能确定最大文件名长度" -#: src/pathchk.c:326 +#: src/pathchk.c:325 #, c-format msgid "limit %lu exceeded by length %lu of file name %s" msgstr "文件名%3$s 的长度%2$lu 超出限值%1$lu" -#: src/pathchk.c:412 +#: src/pathchk.c:411 #, c-format msgid "limit %lu exceeded by length %lu of file name component %s" msgstr "文件名成分%3$s 的长度%2$lu 超出限值%1$lu" @@ -6629,80 +6634,80 @@ msgstr "Kaveh Ghazi" #. TRANSLATORS: Real name is unknown; at most 19 characters. -#: src/pinky.c:250 +#: src/pinky.c:242 msgid " ???" msgstr " ???" #. TRANSLATORS: Idle time is unknown; at most 5 characters. -#: src/pinky.c:274 +#: src/pinky.c:266 msgid "?????" msgstr "?????" -#: src/pinky.c:323 +#: src/pinky.c:314 #, c-format msgid "Login name: " msgstr "登录名： " -#: src/pinky.c:326 +#: src/pinky.c:317 #, c-format msgid "In real life: " msgstr "实名： " #. TRANSLATORS: Real name is unknown; no hard limit. -#: src/pinky.c:330 +#: src/pinky.c:321 msgid "???\n" msgstr "???\n" -#: src/pinky.c:350 +#: src/pinky.c:341 #, c-format msgid "Directory: " msgstr "主目录： " -#: src/pinky.c:352 +#: src/pinky.c:343 #, c-format msgid "Shell: " msgstr "Shell： " -#: src/pinky.c:371 +#: src/pinky.c:362 #, c-format msgid "Project: " msgstr "项目： " -#: src/pinky.c:395 +#: src/pinky.c:386 #, c-format msgid "Plan:\n" msgstr "计划：\n" -#: src/pinky.c:414 +#: src/pinky.c:405 msgid "Login" msgstr "登录" -#: src/pinky.c:416 +#: src/pinky.c:407 msgid "Name" msgstr "名字" -#: src/pinky.c:417 +#: src/pinky.c:408 msgid " TTY" msgstr " TTY" -#: src/pinky.c:419 +#: src/pinky.c:410 msgid "Idle" msgstr "空闲" -#: src/pinky.c:420 +#: src/pinky.c:411 msgid "When" msgstr "从" -#: src/pinky.c:423 +#: src/pinky.c:414 msgid "Where" msgstr "来自" -#: src/pinky.c:503 +#: src/pinky.c:493 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "用法: %s [选项]... [用户]...\n" -#: src/pinky.c:504 +#: src/pinky.c:494 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -6718,7 +6723,7 @@ " -p\t在长格式中省略用户的计划文件\n" " -s\t输出短格式信息(默认)\n" -#: src/pinky.c:512 +#: src/pinky.c:502 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -6742,7 +6747,7 @@ "一个轻量级的\"finger\"程序，用于显示用户信息。\n" "用到的utmp 文件为%s。\n" -#: src/pinky.c:605 +#: src/pinky.c:595 #, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "没有指定用户名，当使用-l 选项时至少需要指定一个" @@ -6762,7 +6767,7 @@ msgid "`--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "\"--pages=首页[:末页]\"缺失参数" -#: src/pr.c:915 +#: src/pr.c:914 #, c-format msgid "invalid page range %s" msgstr "页码范围%s 无效" @@ -6792,12 +6797,12 @@ msgid "`-W PAGE_WIDTH' invalid number of characters: %s" msgstr "\"-w \"中含有无效的字符数：%s" -#: src/pr.c:1101 +#: src/pr.c:1100 #, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "在平行输出参数时不能指定栏数" -#: src/pr.c:1105 +#: src/pr.c:1104 #, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "无法同时指定相交输出和平行输出参数" @@ -6807,27 +6812,27 @@ msgid "`-%c' extra characters or invalid number in the argument: %s" msgstr "有多余字符\"-%c\"或无效数字出现在参数%s 中" -#: src/pr.c:1305 +#: src/pr.c:1304 #, c-format msgid "page width too narrow" msgstr "过窄" -#: src/pr.c:2370 +#: src/pr.c:2369 #, c-format msgid "starting page number % exceeds page count %" msgstr "起始页码% 超出了最大页数%" -#: src/pr.c:2397 +#: src/pr.c:2396 #, c-format msgid "page number overflow" msgstr "页码溢出" -#: src/pr.c:2402 +#: src/pr.c:2401 #, c-format msgid "Page %" msgstr "第 % 页" -#: src/pr.c:2775 +#: src/pr.c:2773 msgid "" "Paginate or columnate FILE(s) for printing.\n" "\n" @@ -6835,7 +6840,7 @@ "对指定文件附注打印所需的页码或聚焦。\n" "\n" -#: src/pr.c:2782 +#: src/pr.c:2780 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -6850,7 +6855,7 @@ "\t\t\t输出指定的列数。如果指定了-a 选项，则从上到下列印。\n" "\t\t\t程序会自动在每一页均衡每列占用的行数。\n" -#: src/pr.c:2790 +#: src/pr.c:2788 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -6864,7 +6869,7 @@ "\t\t\t使用头标(^G)和八进制反斜杠标记\n" " -d, --double-space\t加倍输出空白区域\n" -#: src/pr.c:2798 +#: src/pr.c:2796 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -6882,7 +6887,7 @@ " -F, -f, --form-feed\t使用出纸页页标代替新行作为页面间的分隔符\n" "\t\t\t(使用-F 选项时报头为3 行,不使用时为5 行)\n" -#: src/pr.c:2808 +#: src/pr.c:2806 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -6901,7 +6906,7 @@ " -J, --join-lines\t合并整个行，关闭-W 选项的行截断，不使用栏调整，使用\n" "\t\t\t\t--sep-string[=字符串] 设置分隔符\n" -#: src/pr.c:2817 +#: src/pr.c:2815 msgid "" " -l, --length=PAGE_LENGTH\n" " set the page length to PAGE_LENGTH (66) lines\n" @@ -6915,7 +6920,7 @@ " -m, --merge\t\t在同一行显示所有文件，每个文件占用一栏，分割行，但是当\n" "\t\t\t使用-J 时将行合并到完整长度\n" -#: src/pr.c:2824 +#: src/pr.c:2822 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -6930,7 +6935,7 @@ " -N, --first-line-number=数字\n" "\t\t\t从首页的首行以指定数字开始计数(参看\"+首页\")\n" -#: src/pr.c:2832 +#: src/pr.c:2830 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -6944,7 +6949,7 @@ " -r, --no-file-warnings\n" "\t\t\t当文件无法打开时忽略警告\n" -#: src/pr.c:2839 +#: src/pr.c:2837 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -6973,7 +6978,7 @@ "\t\t\t分栏选项无影响\n" " -t, --omit-header\t忽略页眉和页脚\n" -#: src/pr.c:2853 +#: src/pr.c:2851 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -6994,7 +6999,7 @@ "\t\t\t为多栏页面输出将设置为指定的字符数(默认72)，\n" "\t\t\t仅当-s[char] 选项不启用时有效(即保持默认值 72)。\n" -#: src/pr.c:2863 +#: src/pr.c:2861 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -7006,7 +7011,7 @@ "\t\t\t总是将页宽设置为指定的(默认72)字符数，\n" "\t\t\t除非-J 选项启用总是截断行，此参数与-S 或-s 冲突\n" -#: src/pr.c:2871 +#: src/pr.c:2869 msgid "" "\n" "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" @@ -7016,7 +7021,7 @@ "如果页长<=10 则使用-t 选项。如果FILE 没有定义，\n" "或者FILE 是\"-\"，则从标准输入读入。\n" -#: src/printenv.c:63 +#: src/printenv.c:62 #, c-format msgid "" "Usage: %s [OPTION]... [VARIABLE]...\n" @@ -7029,7 +7034,7 @@ "如果没有指定变量，则打印出所有变量的名称和值。\n" "\n" -#: src/printenv.c:70 +#: src/printenv.c:69 msgid "" " -0, --null end each output line with 0 byte rather than newline\n" msgstr " -0, --null 以空字符而非新行符结束每一输出行\n" @@ -7040,7 +7045,7 @@ "warning: %s: character(s) following character constant have been ignored" msgstr "警告：%s：跟随在常量字符后的其它字符已被忽略" -#: src/printf.c:89 +#: src/printf.c:88 #, c-format msgid "" "Usage: %s FORMAT [ARGUMENT]...\n" @@ -7049,7 +7054,7 @@ "用法：%s 格式 [参数]\n" "　或：%s 选项\n" -#: src/printf.c:94 +#: src/printf.c:93 msgid "" "Print ARGUMENT(s) according to FORMAT, or execute according to OPTION:\n" "\n" @@ -7057,7 +7062,7 @@ "按照指定格式打印参数或按照选项执行该参数：\n" "\n" -#: src/printf.c:100 +#: src/printf.c:99 msgid "" "\n" "FORMAT controls the output as in C printf. Interpreted sequences are:\n" @@ -7069,7 +7074,7 @@ "\n" " \\\"\t\t双引号\n" -#: src/printf.c:118 +#: src/printf.c:117 msgid "" " \\NNN byte with octal value NNN (1 to 3 digits)\n" " \\xHH byte with hexadecimal value HH (1 to 2 digits)\n" @@ -7097,42 +7102,42 @@ "同时，所有以diouxXfeEgGcs 结尾的C 格式化说明，将首先把指定的参数转换为\n" "合适的类型。变量的宽度将得到恰当处理。\n" -#: src/printf.c:149 +#: src/printf.c:148 #, c-format msgid "%s: expected a numeric value" msgstr "%s：需要一个数值" -#: src/printf.c:151 +#: src/printf.c:150 #, c-format msgid "%s: value not completely converted" msgstr "%s：给定值不能完全转换" -#: src/printf.c:248 src/printf.c:275 +#: src/printf.c:247 src/printf.c:274 #, c-format msgid "missing hexadecimal number in escape" msgstr "Escape 中缺失十六进制数" -#: src/printf.c:287 +#: src/printf.c:286 #, c-format msgid "invalid universal character name \\%c%0*x" msgstr "无效的通用字符名称\\%c%0*x" -#: src/printf.c:548 +#: src/printf.c:547 #, c-format msgid "invalid field width: %s" msgstr "无效的域宽度：%s" -#: src/printf.c:583 +#: src/printf.c:582 #, c-format msgid "invalid precision: %s" msgstr "无效的精度：%s" -#: src/printf.c:610 +#: src/printf.c:609 #, c-format msgid "%.*s: invalid conversion specification" msgstr "%.*s：无效的转换声明" -#: src/printf.c:693 +#: src/printf.c:692 #, c-format msgid "warning: ignoring excess arguments, starting with %s" msgstr "警告：从%s 开始已忽略超量的参数" @@ -7150,7 +7155,7 @@ msgid "%s (for regexp %s)" msgstr "%s (正则表达式 %s)" -#: src/ptx.c:1818 +#: src/ptx.c:1817 #, c-format msgid "" "Usage: %s [OPTION]... [INPUT]... (without -G)\n" @@ -7159,7 +7164,7 @@ "用法：%s [选项]... [输入]... (不包括 -G 选项)\n" "　或：%s -G [选项]... [输入 [输出]]\n" -#: src/ptx.c:1822 +#: src/ptx.c:1821 msgid "" "Output a permuted index, including context, of the words in the input " "files.\n" @@ -7192,7 +7197,7 @@ " -S, --sentence-regexp=正则表达式\t用于匹配行末或句末\n" " -T, --format=tex\t\t生成TeX 格式输出\n" -#: src/ptx.c:1841 +#: src/ptx.c:1840 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -7208,7 +7213,7 @@ " -i, --ignore-file=文件\t从指定文件中读取忽略单词的列表\n" " -o, --only-file=文件\t\t只从指定文件中读取单词列表\n" -#: src/ptx.c:1849 +#: src/ptx.c:1848 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -7228,12 +7233,12 @@ "如果不指定文件，或者文件为 \"-\"，程序将从标准输入读取数据。默认时隐含\n" "\"-F /\"选项。\n" -#: src/ptx.c:1950 +#: src/ptx.c:1949 #, c-format msgid "invalid gap width: %s" msgstr "无效的间隙宽度：%s" -#: src/pwd.c:58 +#: src/pwd.c:57 msgid "" "Print the full filename of the current working directory.\n" "\n" @@ -7241,7 +7246,7 @@ "输出当前工作目录的完整名称。\n" "\n" -#: src/pwd.c:62 +#: src/pwd.c:61 msgid "" " -L, --logical use PWD from environment, even if it contains symlinks\n" " -P, --physical avoid all symlinks\n" @@ -7249,22 +7254,22 @@ " -L, --logical\t\t使用环境变量中的PWD，即使其中包含符号链接\n" " -P, --physical\t避免所有符号链接\n" -#: src/pwd.c:167 +#: src/pwd.c:166 #, c-format msgid "failed to chdir to %s" msgstr "无法切换到目录%s" -#: src/pwd.c:171 src/pwd.c:278 +#: src/pwd.c:170 src/pwd.c:277 src/split.c:374 #, c-format msgid "failed to stat %s" msgstr "获取%s 的文件状态失败(stat)" -#: src/pwd.c:236 +#: src/pwd.c:235 #, c-format msgid "couldn't find directory entry in %s with matching i-node" msgstr "在匹配的inode %s 上找不到目录入口" -#: src/pwd.c:363 +#: src/pwd.c:362 #, c-format msgid "ignoring non-option arguments" msgstr "忽略不是选项的参数" @@ -7274,12 +7279,12 @@ msgid "Dmitry V. Levin" msgstr "Dmitry V. Levin" -#: src/readlink.c:63 +#: src/readlink.c:62 #, c-format msgid "Usage: %s [OPTION]... FILE\n" msgstr "用法：%s [选项]... 文件\n" -#: src/readlink.c:64 +#: src/readlink.c:63 msgid "" "Print value of a symbolic link or canonical file name\n" "\n" @@ -7287,7 +7292,7 @@ "输出符号链接值或规范文件名。\n" "\n" -#: src/readlink.c:66 +#: src/readlink.c:65 msgid "" " -f, --canonicalize canonicalize by following every symlink in\n" " every component of the given name " @@ -7303,7 +7308,7 @@ " -e, --canonicalize-existing\t递归跟随给定文件名的所有符号链接以规范化，\n" "\t\t\t\t所有组件都必须存在\n" -#: src/readlink.c:76 +#: src/readlink.c:75 msgid "" " -m, --canonicalize-missing canonicalize by following every symlink in\n" " every component of the given name " @@ -7322,12 +7327,12 @@ " -s, --silent\t\t缩减大多数的错误消息\n" " -v, --verbose\t\t报告所有错误消息\n" -#: src/remove.c:313 +#: src/remove.c:273 #, c-format msgid "%s: descend into write-protected directory %s? " msgstr "%s：是否进入有写保护的目录%s ？ " -#: src/remove.c:314 +#: src/remove.c:274 #, c-format msgid "%s: descend into directory %s? " msgstr "%s：是否进入目录%s? " @@ -7336,37 +7341,37 @@ #. translate "%s: remove %s (write-protected) %s? " #. instead. It should avoid grammatical problems #. with the output of file_type. -#: src/remove.c:330 +#: src/remove.c:290 #, c-format msgid "%s: remove write-protected %s %s? " msgstr "%s：是否删除有写保护的%s %s？ " -#: src/remove.c:331 +#: src/remove.c:291 #, c-format msgid "%s: remove %s %s? " msgstr "%s：是否删除%s %s？ " -#: src/remove.c:444 +#: src/remove.c:374 #, c-format msgid "removed directory: %s\n" msgstr "已删除目录：%s\n" -#: src/remove.c:508 +#: src/remove.c:444 #, c-format msgid "cannot remove directory: %s" msgstr "无法删除目录：%s" -#: src/remove.c:564 +#: src/remove.c:500 #, c-format msgid "skipping %s, since it's on a different device" msgstr "跳过%s，因为它位于不同的设备上" -#: src/remove.c:584 +#: src/remove.c:520 #, c-format msgid "traversal failed: %s" msgstr "遍历失败：%s" -#: src/remove.c:590 +#: src/remove.c:526 #, c-format msgid "" "unexpected failure: fts_info=%d: %s\n" @@ -7380,7 +7385,8 @@ msgid "Try `%s ./%s' to remove the file %s.\n" msgstr "尝试使用\"%s ./%s\"删除文件%s。\n" -#: src/rm.c:135 src/shred.c:159 src/stat.c:1322 src/touch.c:217 +#: src/realpath.c:71 src/rm.c:135 src/shred.c:147 src/stat.c:1347 +#: src/touch.c:212 #, c-format msgid "Usage: %s [OPTION]... FILE...\n" msgstr "用法：%s [选项]... 文件...\n" @@ -7434,7 +7440,7 @@ " -r, -R, --recursive\t递归删除目录及其内容\n" " -v, --verbose\t\t详细显示进行的步骤\n" -#: src/rm.c:162 +#: src/rm.c:163 msgid "" "\n" "By default, rm does not remove directories. Use the --recursive (-r or -R)\n" @@ -7460,7 +7466,7 @@ " %s -- -foo\n" " %s ./-foo\n" -#: src/rm.c:176 +#: src/rm.c:177 msgid "" "\n" "Note that if you use rm to remove a file, it might be possible to recover\n" @@ -7471,17 +7477,17 @@ "请注意，如果使用rm 来删除文件，通常仍可以将该文件恢复原状。如果想保证\n" "该文件的内容无法还原，请考虑使用shred。\n" -#: src/rm.c:336 +#: src/rm.c:342 #, c-format msgid "%s: remove all arguments recursively? " msgstr "%s：递归删除所有参数？ " -#: src/rm.c:337 +#: src/rm.c:343 #, c-format msgid "%s: remove all arguments? " msgstr "%s：删除所有参数？ " -#: src/rmdir.c:134 src/rmdir.c:234 +#: src/rmdir.c:134 src/rmdir.c:233 #, c-format msgid "removing directory, %s" msgstr "正在删除目录 %s" @@ -7491,7 +7497,7 @@ msgid "failed to remove directory %s" msgstr "删除目录 %s 失败" -#: src/rmdir.c:166 +#: src/rmdir.c:165 msgid "" "Remove the DIRECTORY(ies), if they are empty.\n" "\n" @@ -7515,12 +7521,12 @@ "\t\t\t与\"rmdir a/b/c a/b a'\" 基本相同\n" " -v, --verbose\t\t输出处理的目录详情\n" -#: src/rmdir.c:243 +#: src/rmdir.c:242 #, c-format msgid "failed to remove %s" msgstr "删除 %s 失败" -#: src/runcon.c:84 +#: src/runcon.c:83 #, c-format msgid "" "Usage: %s CONTEXT COMMAND [args]\n" @@ -7529,7 +7535,7 @@ "用法: %s 环境 命令 [参数]\n" "　或: %s [ -c ] [-u 用户] [-r 角色] [-t 类型] [-l 范围] 命令 [参数]\n" -#: src/runcon.c:88 +#: src/runcon.c:87 msgid "" "Run a program in a different security context.\n" "With neither CONTEXT nor COMMAND, print the current security context.\n" @@ -7553,77 +7559,77 @@ " -l, --range=范围\t级别范围\n" "\n" -#: src/runcon.c:141 +#: src/runcon.c:140 #, c-format msgid "multiple roles" msgstr "多角色" -#: src/runcon.c:146 +#: src/runcon.c:145 #, c-format msgid "multiple types" msgstr "多类型" -#: src/runcon.c:151 +#: src/runcon.c:150 #, c-format msgid "multiple users" msgstr "多用户" -#: src/runcon.c:156 +#: src/runcon.c:155 #, c-format msgid "multiple levelranges" msgstr "复合级别范围" -#: src/runcon.c:174 src/runcon.c:210 +#: src/runcon.c:173 src/runcon.c:209 #, c-format msgid "failed to get current context" msgstr "无法获得当前安全环境" -#: src/runcon.c:184 +#: src/runcon.c:183 #, c-format msgid "you must specify -c, -t, -u, -l, -r, or context" msgstr "您必须指定-c，-t，-u，-l，-r 或环境" -#: src/runcon.c:192 +#: src/runcon.c:191 #, c-format msgid "no command specified" msgstr "没有指定命令" -#: src/runcon.c:198 +#: src/runcon.c:197 #, c-format msgid "%s may be used only on a SELinux kernel" msgstr "%s 只能用于启用了SELinux 支持的内核" -#: src/runcon.c:224 +#: src/runcon.c:223 #, c-format msgid "failed to compute a new context" msgstr "计算新的环境失败" -#: src/runcon.c:238 +#: src/runcon.c:237 #, c-format msgid "failed to set new user %s" msgstr "设置新用户%s 失败" -#: src/runcon.c:240 +#: src/runcon.c:239 #, c-format msgid "failed to set new type %s" msgstr "设置新类型%s 失败" -#: src/runcon.c:242 +#: src/runcon.c:241 #, c-format msgid "failed to set new range %s" msgstr "设置新范围%s 失败" -#: src/runcon.c:244 +#: src/runcon.c:243 #, c-format msgid "failed to set new role %s" msgstr "设置新角色%s 失败" -#: src/runcon.c:252 +#: src/runcon.c:251 #, c-format msgid "unable to set security context %s" msgstr "无法设置安全环境%s" -#: src/seq.c:69 +#: src/seq.c:68 #, c-format msgid "" "Usage: %s [OPTION]... LAST\n" @@ -7634,7 +7640,7 @@ "　或：%s [选项]... 首数 尾数\n" "　或：%s [选项]... 首数 增量 尾数\n" -#: src/seq.c:74 +#: src/seq.c:73 msgid "" "Print numbers from FIRST to LAST, in steps of INCREMENT.\n" "\n" @@ -7648,7 +7654,7 @@ " -s, --separator=字符串\t使用指定字符串分隔数字(默认使用：\\n)\n" " -w, --equal-width\t在列前添加0 使得宽度相同\n" -#: src/seq.c:83 +#: src/seq.c:82 msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" @@ -7671,37 +7677,37 @@ "指定的格式必须适用于显示\"double\"类型的参数；当首数、增量和尾数均为指定\n" "精确度的定点十进制数时默认为\"%.精确度f\"，否则默认为\"%g\"。\n" -#: src/seq.c:137 +#: src/seq.c:136 #, c-format msgid "invalid floating point argument: %s" msgstr "无效的浮点参数：%s" -#: src/seq.c:194 +#: src/seq.c:193 #, c-format msgid "format %s has no %% directive" msgstr "格式%s 没有%% 指令" -#: src/seq.c:211 +#: src/seq.c:210 #, c-format msgid "format %s ends in %%" msgstr "格式%s 以%% 结束" -#: src/seq.c:214 +#: src/seq.c:213 #, c-format msgid "format %s has unknown %%%c directive" msgstr "格式%s 中包含未知%%%c 指令" -#: src/seq.c:218 +#: src/seq.c:217 #, c-format msgid "format %s has too many %% directives" msgstr "格式%s 中%% 指令过多" -#: src/seq.c:432 +#: src/seq.c:528 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "当输出等宽字符串时不应再指定格式字符串" -#: src/setuidgid.c:50 +#: src/setuidgid.c:49 #, c-format msgid "" "Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n" @@ -7710,7 +7716,7 @@ "用法：%s [短选项]... 用户 命令 [参数]...\n" "　或：%s 长选项\n" -#: src/setuidgid.c:56 +#: src/setuidgid.c:55 msgid "" "Drop any supplemental groups, assume the user-ID and group-ID of the " "specified\n" @@ -7726,7 +7732,7 @@ "此程序通常仅在使用root 运行时有用 (root 的用户ID 为0)。\n" "\n" -#: src/setuidgid.c:65 +#: src/setuidgid.c:64 msgid "" " -g GID[,GID1...] also set the primary group-ID to the numeric GID, and\n" " (if specified) supplemental group IDs to GID1, ...\n" @@ -7734,37 +7740,37 @@ " -g GID[,GID1...]\t将主组ID 设置为指定的数字GID，如果指定了GID1，\n" "\t\t\t\t则同时添加这些附加组ID，...\n" -#: src/setuidgid.c:164 +#: src/setuidgid.c:162 #, c-format msgid "unknown user-ID: %s" msgstr "未知的用户ID：%s" -#: src/setuidgid.c:175 +#: src/setuidgid.c:173 #, c-format msgid "to use user-ID %s you need to use -g too" msgstr "您应当将-g 与用户ID %s 一起使用" -#: src/setuidgid.c:192 +#: src/setuidgid.c:190 #, c-format msgid "failed to set supplemental group(s)" msgstr "设置附加组失败" -#: src/setuidgid.c:202 +#: src/setuidgid.c:200 #, c-format msgid "cannot set group-ID to %lu" msgstr "无法设置组ID 为%lu" -#: src/setuidgid.c:206 +#: src/setuidgid.c:204 #, c-format msgid "cannot set user-ID to %lu" msgstr "无法设置用户ID 为%lu" #. This is a proper name. See the gettext manual, section Names. -#: src/shred.c:85 +#: src/shred.c:74 msgid "Colin Plumb" msgstr "Colin Plumb" -#: src/shred.c:160 +#: src/shred.c:148 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" @@ -7773,7 +7779,7 @@ "多次覆盖文件，使得即使是昂贵的硬件探测仪器也难以将数据复原。\n" "\n" -#: src/shred.c:168 +#: src/shred.c:156 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -7786,7 +7792,7 @@ " --random-source=文件\t从指定文件中取出随机字节\n" " -s, --size=N\t\t粉碎数据为指定字节的碎片(可使用K、M 和G 作为单位)\n" -#: src/shred.c:174 +#: src/shred.c:162 msgid "" " -u, --remove truncate and remove file after overwriting\n" " -v, --verbose show progress\n" @@ -7799,7 +7805,7 @@ " -x, --exact\t\t不将文件大小增加至最接近的块大小\n" " -z, --zero \t\t最后一次使用0 进行覆盖以隐藏覆盖动作\n" -#: src/shred.c:183 +#: src/shred.c:171 msgid "" "\n" "If FILE is -, shred standard output.\n" @@ -7818,7 +7824,7 @@ "一般文件时，绝大多数人都会使用--remove 选项。\n" "\n" -#: src/shred.c:193 +#: src/shred.c:181 msgid "" "CAUTION: Note that shred relies on a very important assumption:\n" "that the file system overwrites data in place. This is the traditional\n" @@ -7834,7 +7840,7 @@ "例子：\n" "\n" -#: src/shred.c:201 +#: src/shred.c:189 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -7854,7 +7860,7 @@ "* 会不时进行快照记录的文件系统，像Network Applicance 的NFS 服务器\n" "\n" -#: src/shred.c:211 +#: src/shred.c:199 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -7867,7 +7873,7 @@ "* 压缩文件系统\n" "\n" -#: src/shred.c:218 +#: src/shred.c:206 msgid "" "In the case of ext3 file systems, the above disclaimer applies\n" "(and shred is thus of limited effectiveness) only in data=journal mode,\n" @@ -7885,7 +7891,7 @@ "您可以查看mount 的man 页面以获得详细信息。\n" "\n" -#: src/shred.c:228 +#: src/shred.c:216 msgid "" "In addition, file system backups and remote mirrors may contain copies\n" "of the file that cannot be removed, and that will allow a shredded file\n" @@ -7895,127 +7901,127 @@ "包含不能被删除的文件副本，这将会\n" "允许碎片文件被恢复。\n" -#: src/shred.c:308 +#: src/shred.c:296 #, c-format msgid "%s: fdatasync failed" msgstr "%s：fadatsync 失败" -#: src/shred.c:319 +#: src/shred.c:307 #, c-format msgid "%s: fsync failed" msgstr "%s：fsync 失败" -#: src/shred.c:396 +#: src/shred.c:384 #, c-format msgid "%s: cannot rewind" msgstr "%s：无法反绕操作" -#: src/shred.c:415 +#: src/shred.c:403 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s：第%lu 次，共%lu 次 (%s)..." -#: src/shred.c:465 +#: src/shred.c:453 #, c-format msgid "%s: error writing at offset %s" msgstr "%s：在位置%s 写入时出现错误" -#: src/shred.c:483 +#: src/shred.c:471 #, c-format msgid "%s: lseek failed" msgstr "%s：lseek 失败" -#: src/shred.c:494 +#: src/shred.c:482 #, c-format msgid "%s: file too large" msgstr "%s：文件过大" -#: src/shred.c:517 +#: src/shred.c:505 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s：第%lu 次，共%lu 次 (%s)...%s" -#: src/shred.c:533 +#: src/shred.c:521 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s：第%lu 次，共%lu 次 (%s)...%s/%s %d%%" -#: src/shred.c:780 +#: src/shred.c:768 #, c-format msgid "%s: fstat failed" msgstr "%s：获取文件状态失败(fstat)" -#: src/shred.c:791 +#: src/shred.c:779 #, c-format msgid "%s: invalid file type" msgstr "%s：无效的文件类型" -#: src/shred.c:810 +#: src/shred.c:798 #, c-format msgid "%s: file has negative size" msgstr "%s：文件的大小为负数" -#: src/shred.c:877 +#: src/shred.c:865 src/sort.c:933 src/split.c:379 #, c-format msgid "%s: error truncating" msgstr "%s：截断文件时出错" -#: src/shred.c:893 +#: src/shred.c:881 #, c-format msgid "%s: fcntl failed" msgstr "%s：文件控制操作失败(fcntl)" -#: src/shred.c:898 +#: src/shred.c:886 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "%s：不能对只可追加数据的文件描述符(file descriptor) 进行粉碎" -#: src/shred.c:980 +#: src/shred.c:968 #, c-format msgid "%s: removing" msgstr "%s：正在删除" -#: src/shred.c:1004 +#: src/shred.c:992 #, c-format msgid "%s: renamed to %s" msgstr "%s：名称已更改为 %s" -#: src/shred.c:1026 +#: src/shred.c:1014 #, c-format msgid "%s: failed to remove" msgstr "%s：删除失败" -#: src/shred.c:1030 +#: src/shred.c:1018 #, c-format msgid "%s: removed" msgstr "%s：已删除" -#: src/shred.c:1037 src/shred.c:1080 +#: src/shred.c:1025 src/shred.c:1068 #, c-format msgid "%s: failed to close" msgstr "%s：无法关闭" -#: src/shred.c:1073 +#: src/shred.c:1061 #, c-format msgid "%s: failed to open for writing" msgstr "%s：无法以写模式打开" -#: src/shred.c:1138 +#: src/shred.c:1126 #, c-format msgid "%s: invalid number of passes" msgstr "%s：覆盖次数无效" -#: src/shred.c:1147 src/shuf.c:292 src/sort.c:4375 +#: src/shred.c:1135 src/shuf.c:291 src/sort.c:4442 #, c-format msgid "multiple random sources specified" msgstr "指定了多个随机源" -#: src/shred.c:1161 +#: src/shred.c:1149 #, c-format msgid "%s: invalid file size" msgstr "%s：文件大小无效" -#: src/shuf.c:49 +#: src/shuf.c:48 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" @@ -8026,7 +8032,7 @@ "　或者: %s -e [选项]... [参数]...\n" "　或者: %s -i LO-HI [选项]...\n" -#: src/shuf.c:55 +#: src/shuf.c:54 msgid "" "Write a random permutation of the input lines to standard output.\n" "\n" @@ -8034,7 +8040,7 @@ "把输入行按随机顺序输出到标准输出。\n" "\n" -#: src/shuf.c:62 +#: src/shuf.c:61 msgid "" " -e, --echo treat each ARG as an input line\n" " -i, --input-range=LO-HI treat each number LO through HI as an input " @@ -8051,27 +8057,27 @@ " --random-source=文件\t从指定文件获得随机比特\n" " -z, --zero-terminated\t以0 结束行而非新行\n" -#: src/shuf.c:246 +#: src/shuf.c:245 #, c-format msgid "multiple -i options specified" msgstr "指定了多个-i 选项" -#: src/shuf.c:266 +#: src/shuf.c:265 #, c-format msgid "invalid input range %s" msgstr "无效的输入范围：%s" -#: src/shuf.c:279 +#: src/shuf.c:278 #, c-format msgid "invalid line count %s" msgstr "无效的行数%s" -#: src/shuf.c:286 src/sort.c:4369 +#: src/shuf.c:285 src/sort.c:4436 #, c-format msgid "multiple output files specified" msgstr "指定了多个输出文件" -#: src/shuf.c:312 +#: src/shuf.c:311 #, c-format msgid "cannot combine -e and -i options" msgstr "不能同时指定-e 和-i 选项" @@ -8096,17 +8102,17 @@ "如果参数个数超过2 个，暂停的总时间为各个参数的值的和。\n" "\n" -#: src/sleep.c:137 src/timeout.c:293 +#: src/sleep.c:135 src/timeout.c:298 #, c-format msgid "invalid time interval %s" msgstr "无效的时间间隔%s" -#: src/sleep.c:148 src/tail.c:1218 +#: src/sleep.c:146 src/tail.c:1220 #, c-format msgid "cannot read realtime clock" msgstr "无法读取实时时钟" -#: src/sort.c:398 +#: src/sort.c:399 msgid "" "Write sorted concatenation of all FILE(s) to standard output.\n" "\n" @@ -8114,7 +8120,7 @@ "串联排序所有指定文件并将结果写到标准输出。\n" "\n" -#: src/sort.c:405 +#: src/sort.c:406 msgid "" "Ordering options:\n" "\n" @@ -8122,7 +8128,7 @@ "排序选项：\n" "\n" -#: src/sort.c:409 +#: src/sort.c:410 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -8144,12 +8150,12 @@ " -M, --month-sort\t\t比较 (未知) < \"一月\" < ... < \"十二月\"\n" "\t\t\t\t在LC_ALL=C 时为(unknown) < `JAN' < ... < `DEC'\n" -#: src/sort.c:420 +#: src/sort.c:421 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:423 +#: src/sort.c:424 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -8161,7 +8167,7 @@ " --random-source=文件\t从指定文件中获得随机字节\n" " -r, --reverse\t\t\t逆序输出排序结果\n" -#: src/sort.c:429 +#: src/sort.c:430 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -8176,7 +8182,7 @@ " -V, --version-sort\t\t在文本内进行自然版本排序\n" "\n" -#: src/sort.c:437 +#: src/sort.c:438 msgid "" "Other options:\n" "\n" @@ -8184,7 +8190,7 @@ "其他选项：\n" "\n" -#: src/sort.c:441 +#: src/sort.c:442 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" @@ -8192,7 +8198,7 @@ " --batch-size=NMERGE\t一次最多合并NMERGE 个输入；如果输入更多\n" "\t\t\t\t\t则使用临时文件\n" -#: src/sort.c:445 +#: src/sort.c:446 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 " @@ -8205,7 +8211,7 @@ " --compress-program=程序\t使用指定程序压缩临时文件；使用该程序\n" "\t\t\t\t\t的-d 参数解压缩文件\n" -#: src/sort.c:452 +#: src/sort.c:453 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -8285,7 +8291,7 @@ "\n" "指定的大小可以使用以下单位之一：\n" -#: src/sort.c:496 +#: src/sort.c:497 msgid "" "% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\n" "\n" @@ -8304,107 +8310,107 @@ "本地环境变量会影响排序结果。\n" "如果希望以字节的自然值获得最传统的排序结果，请设置LC_ALL=C。\n" -#: src/sort.c:697 +#: src/sort.c:698 #, c-format msgid "waiting for %s [-d]" msgstr "等待 %s [-d]" -#: src/sort.c:702 +#: src/sort.c:703 #, c-format msgid "%s [-d] terminated abnormally" msgstr "%s [-d] 不正常结束" -#: src/sort.c:856 src/tac.c:458 +#: src/sort.c:857 #, c-format msgid "cannot create temporary file in %s" msgstr "无法在%s 创建临时文件" -#: src/sort.c:942 src/sort.c:1995 src/sort.c:3041 src/sort.c:3743 -#: src/sort.c:3746 +#: src/sort.c:951 src/sort.c:2026 src/sort.c:3072 src/sort.c:3714 +#: src/sort.c:3805 src/sort.c:3808 msgid "open failed" msgstr "打开失败" -#: src/sort.c:962 +#: src/sort.c:971 msgid "fflush failed" msgstr "冲洗流失败(fflush)" -#: src/sort.c:967 src/sort.c:1998 src/sort.c:4634 +#: src/sort.c:976 src/sort.c:2029 src/sort.c:4707 msgid "close failed" msgstr "关闭失败" -#: src/sort.c:976 +#: src/sort.c:987 #, c-format msgid "dup2 failed" msgstr "复制已打开文件描述符失败(dup2)" -#: src/sort.c:1093 +#: src/sort.c:1104 #, c-format msgid "couldn't execute %s" msgstr "无法执行%s" -#: src/sort.c:1100 +#: src/sort.c:1111 msgid "couldn't create temporary file" msgstr "无法创建临时文件" -#: src/sort.c:1139 +#: src/sort.c:1150 #, c-format msgid "couldn't create process for %s -d" msgstr "无法创建进程%s -d" -#: src/sort.c:1153 +#: src/sort.c:1162 #, c-format msgid "couldn't execute %s -d" msgstr "无法执行%s -d" -#: src/sort.c:1212 +#: src/sort.c:1221 #, c-format msgid "warning: cannot remove: %s" msgstr "警告：无法删除：%s" -#: src/sort.c:1298 +#: src/sort.c:1307 #, c-format msgid "invalid --%s argument %s" msgstr "无效的 --%s 参数%s" -#: src/sort.c:1301 +#: src/sort.c:1310 #, c-format msgid "minimum --%s argument is %s" msgstr "最小 --%s 参数是%s" -#: src/sort.c:1316 +#: src/sort.c:1325 #, c-format msgid "--%s argument %s too large" msgstr "--%s 参数%s 太长" -#: src/sort.c:1319 +#: src/sort.c:1328 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "最大 --%s 参数在当前资源限制(rlimit)设置下是%s" -#: src/sort.c:1401 +#: src/sort.c:1410 #, c-format msgid "number in parallel must be nonzero" msgstr "单个的数字必须不为零" -#: src/sort.c:1482 +#: src/sort.c:1495 msgid "stat failed" msgstr "获取文件状态失败(stat)" -#: src/sort.c:1743 +#: src/sort.c:1756 msgid "read failed" msgstr "读取失败" -#: src/sort.c:2013 +#: src/sort.c:2044 #, c-format msgid "string transformation failed" msgstr "字符串转换失败" -#: src/sort.c:2016 +#: src/sort.c:2047 #, c-format msgid "the untransformed string was %s" msgstr "未转换的字符串为%s" -#: src/sort.c:2179 +#: src/sort.c:2210 #, c-format msgid "^ no match for key\n" msgstr "^ 没有匹配项\n" @@ -8414,7 +8420,7 @@ msgid "obsolescent key `%s' used; consider `%s' instead" msgstr "使用了旧的值%s，考虑转为使用%s" -#: src/sort.c:2365 +#: src/sort.c:2396 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "值%lu 宽度为零，忽略" @@ -8425,7 +8431,7 @@ "leading blanks are significant in key %lu; consider also specifying `b'" msgstr "值%lu 开头有大量空格，考虑同时指定\"b\"" -#: src/sort.c:2389 +#: src/sort.c:2420 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "值%lu 为数字且跨多个域" @@ -8441,20 +8447,20 @@ msgid "option `-r' only applies to last-resort comparison" msgstr "选项\"-r\" 仅用于last-resort 比较" -#: src/sort.c:2701 src/sort.c:2710 +#: src/sort.c:2732 src/sort.c:2741 msgid "write failed" msgstr "写入失败" -#: src/sort.c:2753 +#: src/sort.c:2784 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s：%s:%s：无序： " -#: src/sort.c:2756 +#: src/sort.c:2787 msgid "standard error" msgstr "标准错误" -#: src/sort.c:3914 +#: src/sort.c:3977 #, c-format msgid "%s: invalid field specification %s" msgstr "%s：无效的区块规格%s" @@ -8464,7 +8470,7 @@ msgid "options `-%s' are incompatible" msgstr "选项\"-%s\"不兼容" -#: src/sort.c:3976 +#: src/sort.c:4039 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s：在%s 处的计数无效" @@ -8477,24 +8483,24 @@ msgid "invalid number after `.'" msgstr "在\".\"后的编号无效" -#: src/sort.c:4249 src/sort.c:4355 +#: src/sort.c:4316 src/sort.c:4422 msgid "stray character in field spec" msgstr "区块中有孤立字符" -#: src/sort.c:4296 +#: src/sort.c:4363 #, c-format msgid "multiple compress programs specified" msgstr "指定了多个压缩程序" -#: src/sort.c:4313 +#: src/sort.c:4380 msgid "invalid number at field start" msgstr "区块起始处的编号无效" -#: src/sort.c:4317 src/sort.c:4345 +#: src/sort.c:4384 src/sort.c:4412 msgid "field number is zero" msgstr "区块编号为零" -#: src/sort.c:4326 +#: src/sort.c:4393 msgid "character offset is zero" msgstr "字符偏移量为零" @@ -8502,47 +8508,47 @@ msgid "invalid number after `,'" msgstr "在\",\"后的编号无效" -#: src/sort.c:4391 +#: src/sort.c:4458 #, c-format msgid "empty tab" msgstr "空标签" -#: src/sort.c:4484 src/wc.c:693 +#: src/sort.c:4551 src/wc.c:692 #, c-format msgid "cannot read file names from %s" msgstr "无法从%s 中读取文件名" -#: src/sort.c:4506 +#: src/sort.c:4573 #, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "%s：%lu：无效的 0 长度文件名" -#: src/sort.c:4512 +#: src/sort.c:4579 #, c-format msgid "no input from %s" msgstr "没有来自%s 的输入" -#: src/sort.c:4558 +#: src/sort.c:4625 #, c-format msgid "using %s sorting rules" msgstr "使用%s 排序规则" -#: src/sort.c:4561 +#: src/sort.c:4628 #, c-format msgid "using simple byte comparison" msgstr "使用简单字节比较" -#: src/sort.c:4592 +#: src/sort.c:4659 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "不允许额外的操作数%s 与-%c 一起使用" -#: src/split.c:165 +#: src/split.c:187 #, c-format msgid "the suffix length needs to be at least %zu" msgstr "后缀长度至少应为%zu" -#: src/split.c:182 +#: src/split.c:204 #, c-format msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" msgstr "用法：%s [选项]... [输入 [前缀]]\n" @@ -8574,7 +8580,7 @@ " -u, --unbuffered immediately copy input to output with `-n r/...'\n" msgstr "" -#: src/split.c:206 +#: src/split.c:230 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" @@ -8600,137 +8606,137 @@ "r/N\t类似l 但使用轮询分配\n" "r/K/N\t类似r/N 但尽将N 个文件中的第K 个输出到标准输出\n" -#: src/split.c:279 +#: src/split.c:355 #, c-format msgid "output file suffixes exhausted" msgstr "已排除输出文件后缀" -#: src/split.c:291 +#: src/split.c:367 #, c-format msgid "creating file %s\n" msgstr "正在创建文件%s\n" -#: src/split.c:304 +#: src/split.c:392 #, c-format msgid "failed to set FILE environment variable" msgstr "" -#: src/split.c:306 +#: src/split.c:394 #, c-format msgid "executing with FILE=%s\n" msgstr "" -#: src/split.c:308 +#: src/split.c:396 #, c-format msgid "failed to create pipe" msgstr "" -#: src/split.c:322 +#: src/split.c:410 #, c-format msgid "closing prior pipe" msgstr "" -#: src/split.c:324 +#: src/split.c:412 #, c-format msgid "closing output pipe" msgstr "" -#: src/split.c:328 +#: src/split.c:416 #, c-format msgid "moving input pipe" msgstr "" -#: src/split.c:330 +#: src/split.c:418 #, c-format msgid "closing input pipe" msgstr "" -#: src/split.c:335 +#: src/split.c:423 #, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "" -#: src/split.c:341 +#: src/split.c:429 #, c-format msgid "failed to close input pipe" msgstr "" -#: src/split.c:377 +#: src/split.c:465 #, c-format msgid "waiting for child process" msgstr "" -#: src/split.c:387 +#: src/split.c:475 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "" -#: src/split.c:395 +#: src/split.c:483 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "" -#: src/split.c:402 src/timeout.c:447 +#: src/split.c:490 src/timeout.c:468 #, c-format msgid "unknown status from command (0x%X)" msgstr "来自命令的未知状态 (0x%X)" -#: src/split.c:964 +#: src/split.c:1053 #, c-format msgid "cannot split in more than one way" msgstr "无法以多于一种的方式切分输入" -#: src/split.c:977 src/split.c:1108 src/split.c:1245 +#: src/split.c:1066 src/split.c:1206 src/split.c:1377 #, c-format msgid "%s: invalid number of chunks" msgstr "%s：无效的块数" -#: src/split.c:981 +#: src/split.c:1070 #, c-format msgid "%s: invalid chunk number" msgstr "%s：无效块数" -#: src/split.c:1033 +#: src/split.c:1120 #, c-format msgid "%s: invalid suffix length" msgstr "%s：文件类型无效" -#: src/split.c:1047 src/split.c:1055 src/split.c:1078 src/split.c:1083 +#: src/split.c:1145 src/split.c:1153 src/split.c:1176 src/split.c:1181 #, c-format msgid "%s: invalid number of bytes" msgstr "%s：无效的字节数" -#: src/split.c:1066 src/split.c:1196 +#: src/split.c:1164 src/split.c:1311 #, c-format msgid "%s: invalid number of lines" msgstr "%s：无效的行数" -#: src/split.c:1139 +#: src/split.c:1237 #, c-format msgid "line count option -%s%c... is too large" msgstr "行数选项-%s%c... 过大" -#: src/split.c:1162 +#: src/split.c:1277 #, c-format msgid "%s: invalid IO block size" msgstr "%s：无效的IO 块大小" -#: src/split.c:1183 +#: src/split.c:1298 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "" -#: src/split.c:1238 +#: src/split.c:1370 #, c-format msgid "%s: cannot determine file size" msgstr "%s：无法确定文件大小" #. This is a proper name. See the gettext manual, section Names. -#: src/stat.c:169 +#: src/stat.c:173 msgid "Michael Meskes" msgstr "Michael Meskes" -#: src/stat.c:824 +#: src/stat.c:855 #, c-format msgid "failed to canonicalize %s" msgstr "规范化%s 失败" @@ -8740,34 +8746,34 @@ msgid "warning: unrecognized escape `\\%c'" msgstr "警告：无法识别的转义字符\"\\%c\"" -#: src/stat.c:1091 +#: src/stat.c:1122 #, c-format msgid "%s: invalid directive" msgstr "%s：无效指令" -#: src/stat.c:1137 +#: src/stat.c:1168 #, c-format msgid "warning: backslash at end of format" msgstr "警告：格式末尾出现反斜杠" -#: src/stat.c:1168 +#: src/stat.c:1199 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "用 %s 进行标准输入在文件系统模式下无法工作" -#: src/stat.c:1175 +#: src/stat.c:1206 #, c-format msgid "cannot read file system information for %s" msgstr "无法为 %s 读取文件系统信息" -#: src/stat.c:1195 +#: src/stat.c:1226 #, 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:1231 +#: src/stat.c:1262 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -8783,7 +8789,7 @@ #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1256 +#: src/stat.c:1285 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -8793,32 +8799,30 @@ #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1266 +#: src/stat.c:1295 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:1274 +#: src/stat.c:1303 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:1283 +#: src/stat.c:1312 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:1293 +#: src/stat.c:1322 #, c-format msgid "Context: %C\n" msgstr "环境：%C\n" -#. TRANSLATORS: This string uses format specifiers from -#. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1302 +#: src/stat.c:1330 msgid "" "Access: %x\n" "Modify: %y\n" @@ -8830,7 +8834,7 @@ "最近改动：%z\n" "创建时间：%w\n" -#: src/stat.c:1323 +#: src/stat.c:1348 msgid "" "Display file or file system status.\n" "\n" @@ -8842,7 +8846,7 @@ " -L, --dereference\t跟随链接\n" " -f, --file-system\t显示文件系统状态而非文件状态\n" -#: src/stat.c:1329 +#: src/stat.c:1354 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -8977,12 +8981,12 @@ " %t\t十六进制类型描述\n" " %T\t可读性较好的类型描述\n" -#: src/stdbuf.c:91 +#: src/stdbuf.c:90 #, c-format msgid "Usage: %s OPTION... COMMAND\n" msgstr "用法：%s [选项]... 命令\n" -#: src/stdbuf.c:92 +#: src/stdbuf.c:91 msgid "" "Run COMMAND, with modified buffering operations for its standard streams.\n" "\n" @@ -8990,7 +8994,7 @@ "运行标准流缓冲区操作已改变的 COMMAND。\n" "\n" -#: src/stdbuf.c:99 +#: src/stdbuf.c:98 msgid "" " -i, --input=MODE adjust standard input stream buffering\n" " -o, --output=MODE adjust standard output stream buffering\n" @@ -9018,7 +9022,7 @@ "\n" "若 MODE 是 0，则相应的流将不缓冲。\n" -#: src/stdbuf.c:112 +#: src/stdbuf.c:111 msgid "" "\n" "Otherwise MODE is a number which may be followed by one of the following:\n" @@ -9047,17 +9051,17 @@ "还有某些滤件程序(如dd 和cat 之类)，它们不使用输入输出流，\n" "因此不受stdbuf 设置的影响。\n" -#: src/stdbuf.c:228 +#: src/stdbuf.c:227 #, c-format msgid "failed to find %s" msgstr "查找%s 失败" -#: src/stdbuf.c:248 src/stdbuf.c:280 +#: src/stdbuf.c:247 src/stdbuf.c:279 #, c-format msgid "failed to update the environment with %s" msgstr "更新%s 的环境失败" -#: src/stdbuf.c:322 +#: src/stdbuf.c:321 #, c-format msgid "line buffering stdin is meaningless" msgstr "对标准输入进行行缓冲无意义" @@ -9531,7 +9535,7 @@ msgid "%s: no size information for this device" msgstr "%s：此设备没有大小信息" -#: src/stty.c:1905 +#: src/stty.c:1912 #, c-format msgid "invalid integer argument %s" msgstr "无效的整数参数%s" @@ -9614,11 +9618,11 @@ msgstr "警告：无法切换到目录%s" #. This is a proper name. See the gettext manual, section Names. -#: src/sum.c:38 +#: src/sum.c:37 msgid "Kayvan Aghaiepour" msgstr "Kayvan Aghaiepour" -#: src/sum.c:64 +#: src/sum.c:62 msgid "" "Print checksum and block counts for each FILE.\n" "\n" @@ -9630,7 +9634,7 @@ " -r\t\t使用BSD 加和算法，以1 KB 为一个块\n" " -s, --sysv\t使用System V 加和算法，以51双字节为一个块\n" -#: src/sync.c:42 +#: src/sync.c:41 msgid "" "Force changed blocks to disk, update the super block.\n" "\n" @@ -9638,12 +9642,12 @@ "强迫将已更改的数据写入磁盘，并更新超级块。\n" "\n" -#: src/sync.c:70 +#: src/sync.c:69 #, c-format msgid "ignoring all arguments" msgstr "忽略任何参数" -#: src/system.h:323 +#: src/system.h:343 #, c-format msgid "" "\n" @@ -9655,11 +9659,11 @@ "注意：您的shell 内含自己的%s 程序版本，它会覆盖这里所提及的相应\n" "版本。请查阅您的shell 文档获知它所支持的选项。\n" -#: src/system.h:329 +#: src/system.h:349 msgid " --help display this help and exit\n" msgstr " --help\t\t显示此帮助信息并退出\n" -#: src/system.h:331 +#: src/system.h:351 msgid " --version output version information and exit\n" msgstr " --version\t\t显示版本信息并退出\n" @@ -9673,7 +9677,7 @@ "SIZE 可以是一个可选的整数，后面跟着以下单位中的一个：\n" "KB 1000，K 1024，MB 1000*1000，M 1024*1024，还有 G、T、P、E、Z、Y。\n" -#: src/system.h:512 +#: src/system.h:553 #, c-format msgid "" "\n" @@ -9686,7 +9690,7 @@ "及 BLOCKSIZE 环境变量中第一个可用的 SIZE 单位。\n" "否则，默认单位是 1024 字节(或是 512，若设定 POSIXLY_CORRECT 的话)。\n" -#: src/system.h:522 +#: src/system.h:563 #, c-format msgid "" "\n" @@ -9699,17 +9703,17 @@ #. to form one of #. the URLs at http://translationproject.org/team/. Otherwise, replace #. the entire URL with your translation team's email address. -#: src/system.h:536 +#: src/system.h:577 #, c-format msgid "Report %s translation bugs to \n" msgstr "请向 报告%s 的翻译错误\n" -#: src/system.h:540 +#: src/system.h:581 #, c-format msgid "For complete documentation, run: info coreutils '%s invocation'\n" msgstr "要获取完整文档，请运行：info coreutils '%s invocation'\n" -#: src/system.h:565 +#: src/system.h:620 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -9725,7 +9729,7 @@ " %s\n" #. This is a proper name. See the gettext manual, section Names. -#: src/tac.c:57 +#: src/tac.c:58 msgid "Jay Lepreau" msgstr "Jay Lepreau" @@ -9759,23 +9763,23 @@ msgid "record too large" msgstr "记录数据过大" -#: src/tac.c:466 src/truncate.c:376 +#: src/truncate.c:405 #, c-format msgid "cannot open %s for writing" msgstr "无法打开%s 读取数据" -#: src/tac.c:487 src/tac.c:494 +#: src/tac.c:512 src/tac.c:519 #, c-format msgid "%s: write error" msgstr "%s：写入出错" -#: src/tac.c:601 +#: src/tac.c:630 #, c-format msgid "separator cannot be empty" msgstr "分隔符不能为空" #. This is a proper name. See the gettext manual, section Names. -#: src/tail.c:70 +#: src/tail.c:71 msgid "Ian Lance Taylor" msgstr "Ian Lance Taylor" @@ -9902,142 +9906,142 @@ msgid "%s: cannot seek to end-relative offset %s" msgstr "%s：无法检索相对偏移量的末尾 %s" -#: src/tail.c:894 +#: src/tail.c:895 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "无法定位 %s 的位置，回归为 polling 机制" -#: src/tail.c:963 +#: src/tail.c:964 #, c-format msgid "%s has become inaccessible" msgstr "%s 已不可访问" -#: src/tail.c:980 +#: src/tail.c:981 #, c-format msgid "%s has been replaced with an untailable file; giving up on this name" msgstr "%s 已被替换为tail 无法处理的文件，放弃跟踪" -#: src/tail.c:989 +#: src/tail.c:990 #, c-format msgid "%s has been replaced with a remote file. giving up on this name" msgstr "%s 已被替换为一个远程文件，放弃跟踪" -#: src/tail.c:1010 +#: src/tail.c:1011 #, c-format msgid "%s has become accessible" msgstr "%s 已经可以访问" -#: src/tail.c:1018 +#: src/tail.c:1019 #, c-format msgid "%s has appeared; following end of new file" msgstr "%s 已被建立，正在跟随新文件的末尾" -#: src/tail.c:1029 +#: src/tail.c:1030 #, c-format msgid "%s has been replaced; following end of new file" msgstr "%s 已被替换，正在跟随新文件的末尾" -#: src/tail.c:1130 +#: src/tail.c:1131 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s：无法更改非阻塞模式" -#: src/tail.c:1171 src/tail.c:1286 +#: src/tail.c:1173 src/tail.c:1288 #, c-format msgid "%s: file truncated" msgstr "%s：文件已截断" -#: src/tail.c:1195 src/tail.c:1441 +#: src/tail.c:1197 src/tail.c:1443 #, c-format msgid "no files remaining" msgstr "没有剩余文件" -#: src/tail.c:1368 +#: src/tail.c:1370 #, c-format msgid "cannot watch parent directory of %s" msgstr "无法监视%s 的上级目录" -#: src/tail.c:1371 src/tail.c:1386 +#: src/tail.c:1373 src/tail.c:1388 #, c-format msgid "inotify resources exhausted" msgstr "inotify 资源耗尽" -#: src/tail.c:1389 src/tail.c:1518 +#: src/tail.c:1391 src/tail.c:1520 #, c-format msgid "cannot watch %s" msgstr "无法监视%s" -#: src/tail.c:1472 +#: src/tail.c:1474 #, c-format msgid "error monitoring inotify event" msgstr "监视inotify 事件出错" -#: src/tail.c:1492 +#: src/tail.c:1494 #, c-format msgid "error reading inotify event" msgstr "读取inotify 事件出错" -#: src/tail.c:1785 +#: src/tail.c:1787 #, c-format msgid "%s: cannot follow end of this type of file; giving up on this name" msgstr "%s：无法跟随此类型文件的末尾，已放弃" -#: src/tail.c:1902 +#: src/tail.c:1904 #, c-format msgid "number in %s is too large" msgstr "%s 中的数字过大" -#: src/tail.c:1974 +#: src/tail.c:1976 #, c-format msgid "%s: invalid maximum number of unchanged stats between opens" msgstr "%s：两次打开的间隔因过大而无效" -#: src/tail.c:1990 +#: src/tail.c:1992 #, c-format msgid "%s: invalid PID" msgstr "%s：无效的进程号" -#: src/tail.c:2009 +#: src/tail.c:2011 #, c-format msgid "%s: invalid number of seconds" msgstr "%s：无效的秒数" -#: src/tail.c:2025 +#: src/tail.c:2027 #, c-format msgid "option used in invalid context -- %c" msgstr "在未定义环境中的无效选项 -- %c" -#: src/tail.c:2033 +#: src/tail.c:2035 #, c-format msgid "warning: --retry is useful mainly when following by name" msgstr "警告：--retry 参数需要在后面附加名称后使用" -#: src/tail.c:2037 +#: src/tail.c:2039 #, c-format msgid "warning: PID ignored; --pid=PID is useful only when following" msgstr "警告：已忽略进程号，只有在跟随模式下--pid=PID 选项才是有用的" -#: src/tail.c:2040 +#: src/tail.c:2042 #, c-format msgid "warning: --pid=PID is not supported on this system" msgstr "警告：此系统不支持--pid=PID" -#: src/tail.c:2141 +#: src/tail.c:2143 #, c-format msgid "cannot follow %s by name" msgstr "无法按名称跟随%s" -#: src/tail.c:2147 +#: src/tail.c:2149 #, c-format msgid "warning: following standard input indefinitely is ineffective" msgstr "警告：无限期跟随标准输入是无用的" -#: src/tail.c:2208 +#: src/tail.c:2210 #, c-format msgid "inotify cannot be used, reverting to polling" msgstr "无法使用 inotify 机制，回归为 polling 机制" -#: src/tee.c:64 +#: src/tee.c:63 msgid "" "Copy standard input to each FILE, and also to standard output.\n" "\n" @@ -10049,7 +10053,7 @@ " -a, --append\t\t内容追加到给定的文件而非覆盖\n" " -i, --ignore-interrupts\t忽略中断信号\n" -#: src/tee.c:72 +#: src/tee.c:71 msgid "" "\n" "If a FILE is -, copy again to standard output.\n" @@ -10057,52 +10061,52 @@ "\n" "如果文件指定为\"-\"，则将输入内容复制到标准输出。\n" -#: src/test.c:117 +#: src/test.c:123 #, c-format msgid "missing argument after %s" msgstr "%s 后缺少参数" -#: src/test.c:153 +#: src/test.c:159 #, c-format msgid "invalid integer %s" msgstr "无效的整数%s" -#: src/test.c:235 +#: src/test.c:241 msgid "')' expected" msgstr "预期为')'" -#: src/test.c:238 +#: src/test.c:244 #, c-format msgid "')' expected, found %s" msgstr "预期为 ')'，实际为%s" -#: src/test.c:254 src/test.c:600 +#: src/test.c:260 src/test.c:618 #, c-format msgid "%s: unary operator expected" msgstr "%s: 预期为单目运算符" -#: src/test.c:323 +#: src/test.c:329 msgid "-nt does not accept -l" msgstr "-nt 不能与-l 同时使用" -#: src/test.c:336 +#: src/test.c:342 msgid "-ef does not accept -l" msgstr "-ef 不能与-l 同时使用" -#: src/test.c:352 +#: src/test.c:358 msgid "-ot does not accept -l" msgstr "-ot 不能于-l 同时使用" -#: src/test.c:361 +#: src/test.c:367 msgid "unknown binary operator" msgstr "未知双目运算符" -#: src/test.c:628 +#: src/test.c:646 #, c-format msgid "%s: binary operator expected" msgstr "%s: 预期为双目运算符" -#: src/test.c:687 +#: src/test.c:704 msgid "" "Usage: test EXPRESSION\n" " or: test\n" @@ -10116,7 +10120,7 @@ "　或：[ ]\n" "　或：[ 选项\n" -#: src/test.c:694 +#: src/test.c:711 msgid "" "Exit with the status determined by EXPRESSION.\n" "\n" @@ -10124,7 +10128,7 @@ "退出状态值取决于表达式。\n" "\n" -#: src/test.c:700 +#: src/test.c:717 msgid "" "\n" "An omitted EXPRESSION defaults to false. Otherwise,\n" @@ -10134,7 +10138,7 @@ "被省略的表达式的值默认为假，否则可能为真也可能为假，\n" "并会被设为退出状态值。有效的表达式应属于下列之一：\n" -#: src/test.c:705 +#: src/test.c:722 msgid "" "\n" " ( EXPRESSION ) EXPRESSION is true\n" @@ -10148,7 +10152,7 @@ " 表达式1 -a 表达式2\t两个表达式的值都为真时结果为真(与)\n" " 表达式1 -o 表达式2\t两个表达式中任一的值为真时结果为真(或)\n" -#: src/test.c:712 +#: src/test.c:729 msgid "" "\n" " -n STRING the length of STRING is nonzero\n" @@ -10164,7 +10168,7 @@ " 字符串1 = 字符串2\t两个字符串相等\n" " 字符串1 != 字符串2\t两个字符串不等\n" -#: src/test.c:720 +#: src/test.c:737 msgid "" "\n" " INTEGER1 -eq INTEGER2 INTEGER1 is equal to INTEGER2\n" @@ -10182,7 +10186,7 @@ " 整数1 -lt 整数2\t整数1 小于 整数2\n" " 整数1 -ne 整数2\t整数1 不等于整数2\n" -#: src/test.c:729 +#: src/test.c:746 msgid "" "\n" " FILE1 -ef FILE2 FILE1 and FILE2 have the same device and inode numbers\n" @@ -10194,7 +10198,7 @@ " 文件1 -nt 文件2\t文件1 的上次修改时间新于文件2\n" " 文件1 -ot 文件2\t文件1 的上次修改时间旧于文件2\n" -#: src/test.c:735 +#: src/test.c:752 msgid "" "\n" " -b FILE FILE exists and is block special\n" @@ -10208,7 +10212,7 @@ " -d 文件\t\t指定文件存在且为目录\n" " -e 文件\t\t指定文件存在\n" -#: src/test.c:742 +#: src/test.c:759 msgid "" " -f FILE FILE exists and is a regular file\n" " -g FILE FILE exists and is set-group-ID\n" @@ -10222,7 +10226,7 @@ " -h 文件\t\t指定文件存在且为符号链接 (等价于 -L)\n" " -k 文件\t\t指定文件存在且设置了粘附位\n" -#: src/test.c:749 +#: src/test.c:766 msgid "" " -L FILE FILE exists and is a symbolic link (same as -h)\n" " -O FILE FILE exists and is owned by the effective user ID\n" @@ -10236,7 +10240,7 @@ " -r 文件\t\t指定文件存在且具备读取权限\n" " -s 文件\t\t指定文件存在且其大小大于0\n" -#: src/test.c:756 +#: src/test.c:773 msgid "" " -S FILE FILE exists and is a socket\n" " -t FD file descriptor FD is opened on a terminal\n" @@ -10250,7 +10254,7 @@ " -w 文件\t\t指定文件存在且具备写入权限\n" " -x 文件\t\t指定文件存在且具备执行或搜索(针对目录)权限\n" -#: src/test.c:763 +#: src/test.c:780 msgid "" "\n" "Except for -h and -L, all FILE-related tests dereference symbolic links.\n" @@ -10263,7 +10267,7 @@ "请留心您在必要时需由shell 转义圆括号字符(例如使用反斜杠)。\n" "指定整数也可用\"-l 字符串\"表示，这会估算相应字符串的长度。\n" -#: src/test.c:769 +#: src/test.c:786 msgid "" "\n" "NOTE: [ honors the --help and --version options, but test does not.\n" @@ -10273,17 +10277,17 @@ "注意：[ 服从 --help 和 --version 选项但 test 不同。\n" "test 将其和其他非空字符串同能对待。\n" -#: src/test.c:774 +#: src/test.c:791 msgid "test and/or [" msgstr "test 和/或[" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:786 +#: src/test.c:803 msgid "Kevin Braunsdorf" msgstr "Kevin Braunsdorf" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:787 +#: src/test.c:804 msgid "Matthew Bradburn" msgstr "Matthew Bradburn" @@ -10291,22 +10295,22 @@ msgid "missing `]'" msgstr "缺少\"]\"" -#: src/test.c:855 +#: src/test.c:872 #, c-format msgid "extra argument %s" msgstr "多余的参数%s" -#: src/timeout.c:125 +#: src/timeout.c:127 #, c-format msgid "warning: timer_settime" msgstr "" -#: src/timeout.c:130 +#: src/timeout.c:132 #, c-format msgid "warning: timer_create" msgstr "" -#: src/timeout.c:203 +#: src/timeout.c:207 #, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -10315,7 +10319,7 @@ "用法：%s [选项] 停留时间 命令 [参数]...\n" "　或：%s 选项\n" -#: src/timeout.c:207 +#: src/timeout.c:211 msgid "" "Start COMMAND, and kill it if still running after DURATION.\n" "\n" @@ -10363,42 +10367,42 @@ "如果没有指定信号则默认为TERM 信号。TERM 信号在进程没有捕获此信号时杀死进程。\n" "对于另一些进程可能需要使用KILL (9)信号，当然此信号不能被捕获。\n" -#: src/timeout.c:417 +#: src/timeout.c:445 #, c-format msgid "error waiting for command" msgstr "等待命令出错" -#: src/timeout.c:439 +#: src/timeout.c:341 #, c-format msgid "warning: disabling core dumps failed" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/touch.c:44 +#: src/touch.c:43 msgid "Jim Kingdon" msgstr "Jim Kingdon" #. This is a proper name. See the gettext manual, section Names. -#: src/touch.c:46 +#: src/touch.c:45 msgid "Randy Smith" msgstr "Randy Smith" -#: src/touch.c:116 src/touch.c:315 +#: src/touch.c:115 src/touch.c:310 #, c-format msgid "invalid date format %s" msgstr "日期格式%s 无效" -#: src/touch.c:195 +#: src/touch.c:191 #, c-format msgid "cannot touch %s" msgstr "无法创建%s" -#: src/touch.c:201 +#: src/touch.c:197 #, c-format msgid "setting times of %s" msgstr "正在设置%s 的时间" -#: src/touch.c:218 +#: src/touch.c:213 msgid "" "Update the access and modification times of each FILE to the current time.\n" "\n" @@ -10416,7 +10420,7 @@ "如果文件名为\"-\"则特殊处理，更改与标准输出相关的文件的访问时间。\n" "\n" -#: src/touch.c:231 +#: src/touch.c:226 msgid "" " -a change only the access time\n" " -c, --no-create do not create any files\n" @@ -10428,7 +10432,7 @@ " -d, --date=字符串\t使用指定字符串表示时间而非当前时间\n" " -f\t\t\t(忽略)\n" -#: src/touch.c:237 +#: src/touch.c:232 msgid "" " -h, --no-dereference affect each symbolic link instead of any " "referenced\n" @@ -10453,7 +10457,7 @@ " --time=WORD\t\t使用WORD 指定的时间：access、atime、use 都等于-a\n" "\t\t\t选项的效果，而modify、mtime 等于-m 选项的效果\n" -#: src/touch.c:252 +#: src/touch.c:247 msgid "" "\n" "Note that the -d and -t options accept different time-date formats.\n" @@ -10461,7 +10465,7 @@ "\n" "请注意，-d 和-t 选项可接受不同的时间/日期格式。\n" -#: src/touch.c:341 +#: src/touch.c:336 #, c-format msgid "cannot specify times from more than one source" msgstr "无法由多于一种的来源来指定时间" @@ -10472,12 +10476,12 @@ "warning: `touch %s' is obsolete; use `touch -t %04ld%02d%02d%02d%02d.%02d'" msgstr "警告：\"touch %s\"已过时，请使用\"touch -t %04ld%02d%02d%02d%02d.%02d\"代替" -#: src/tr.c:287 +#: src/tr.c:286 #, c-format msgid "Usage: %s [OPTION]... SET1 [SET2]\n" msgstr "用法：%s [选项]... SET1 [SET2]\n" -#: src/tr.c:291 +#: src/tr.c:290 msgid "" "Translate, squeeze, and/or delete characters from standard input,\n" "writing to standard output.\n" @@ -10498,7 +10502,7 @@ "\t\t\t\t重复，在替换时会被统一缩为一个字符的长度\n" " -t, --truncate-set1\t\t先将SET1 的长度截为和SET2 相等\n" -#: src/tr.c:304 +#: src/tr.c:303 msgid "" "\n" "SETs are specified as strings of characters. Most represent themselves.\n" @@ -10525,7 +10529,7 @@ " \\r\t\t回车\n" " \\t\t\t水平制表符\n" -#: src/tr.c:318 +#: src/tr.c:317 msgid "" " \\v vertical tab\n" " CHAR1-CHAR2 all characters from CHAR1 to CHAR2 in ascending order\n" @@ -10547,7 +10551,7 @@ " [:cntrl:]\t所有的控制字符\n" " [:digit:]\t所有的数字\n" -#: src/tr.c:329 +#: src/tr.c:328 msgid "" " [:graph:] all printable characters, not including space\n" " [:lower:] all lower case letters\n" @@ -10568,7 +10572,7 @@ " [=字符=]\t所有和指定字符相等的字符\n" # ## Forward to here. -#: src/tr.c:339 +#: src/tr.c:338 msgid "" "\n" "Translation occurs if -d is not given and both SET1 and SET2 appear.\n" @@ -10587,14 +10591,14 @@ "以升序展开字符；在用于替换时的SET2 中以成对表示大小写转换。-s 作用于SET1，既不\n" "替换也不删除，否则在替换或展开后使用SET2 缩减。\n" -#: src/tr.c:510 +#: src/tr.c:509 #, c-format msgid "" "warning: the ambiguous octal escape \\%c%c%c is being\n" "\tinterpreted as the 2-byte sequence \\0%c%c, %c" msgstr "警告：含义不清的八进制内容 \\%c%c%c 已被视作为双字节序列 \\0%c%c, %c 处理" -#: src/tr.c:519 +#: src/tr.c:518 #, c-format msgid "warning: an unescaped backslash at end of string is not portable" msgstr "警告：在字符串结尾使用为转义的反斜杠是一种不可移植的做法" @@ -10604,7 +10608,7 @@ msgid "range-endpoints of `%s-%s' are in reverse collating sequence order" msgstr "\"%s-%s\"的结束点范围序列已经过反转处理" -#: src/tr.c:830 +#: src/tr.c:829 #, c-format msgid "invalid repeat count %s in [c*n] construct" msgstr "在参数结构 [c*n] 中有无效的重复次数%s" @@ -10619,44 +10623,44 @@ msgid "missing equivalence class character `[==]'" msgstr "缺失类型等值的字符\"[==]\"" -#: src/tr.c:929 +#: src/tr.c:928 #, c-format msgid "invalid character class %s" msgstr "无效的字符类型%s" -#: src/tr.c:948 +#: src/tr.c:947 #, c-format msgid "%s: equivalence class operand must be a single character" msgstr "%s：同类操作数必须是单个字符" -#: src/tr.c:1230 +#: src/tr.c:1229 #, c-format msgid "misaligned [:upper:] and/or [:lower:] construct" msgstr "[:upper:] 和/或[:lower:] 的结构对齐不完整" -#: src/tr.c:1336 +#: src/tr.c:1335 #, c-format msgid "too many characters in set" msgstr "设置中的字符数量过多" -#: src/tr.c:1421 +#: src/tr.c:1420 #, c-format msgid "" "when translating with string1 longer than string2,\n" "the latter string must not end with a character class" msgstr "当字符串1 长度大于字符串2时，后者不能以字符类结尾" -#: src/tr.c:1481 +#: src/tr.c:1480 #, c-format msgid "the [c*] repeat construct may not appear in string1" msgstr "在字符串1 中不能出现[c*] 结构的重复次数声明" -#: src/tr.c:1491 +#: src/tr.c:1490 #, c-format msgid "only one [c*] repeat construct may appear in string2" msgstr "在字符串2 中只能出现一次[c*] 结构的重复次数声明" -#: src/tr.c:1499 +#: src/tr.c:1498 #, c-format msgid "[=c=] expressions may not appear in string2 when translating" msgstr "在替换操作中字符串2 里不能出现表达式[=c=]" @@ -10668,32 +10672,32 @@ "string2 are `upper' and `lower'" msgstr "当进行替换操作时，字符串2 里只能出现一种字符类型，即\"upper\"和\"lower\"" -#: src/tr.c:1521 +#: src/tr.c:1520 #, c-format msgid "when not truncating set1, string2 must be non-empty" msgstr "当不截断设置1 时，字符串2 不能为空" -#: src/tr.c:1530 +#: src/tr.c:1529 #, c-format msgid "" "when translating with complemented character classes,\n" "string2 must map all characters in the domain to one" msgstr "当以反相模式替换字符类型时，字符串2 必须将所有字符映射到一个字域" -#: src/tr.c:1539 +#: src/tr.c:1538 #, c-format msgid "the [c*] construct may appear in string2 only when translating" msgstr "当进行替换操作时[c*] 结构的参数只能出现在字符串2 中" -#: src/tr.c:1789 +#: src/tr.c:1788 msgid "Two strings must be given when both deleting and squeezing repeats." msgstr "当同时重复删除和缩减时必须给出两组字符串。" -#: src/tr.c:1791 +#: src/tr.c:1790 msgid "Two strings must be given when translating." msgstr "当进行替换操作时必须给定两组字符串。" -#: src/tr.c:1801 +#: src/tr.c:1800 msgid "Only one string may be given when deleting without squeezing repeats." msgstr "当进行不含缩减的删除操作时只能给定一组字符串。" @@ -10714,12 +10718,12 @@ msgid "Exit with a status code indicating failure." msgstr "以表示失败的状态值退出" -#: src/truncate.c:97 +#: src/truncate.c:96 #, c-format msgid "Usage: %s OPTION... FILE...\n" msgstr "用法：%s 选项... 文件...\n" -#: src/truncate.c:98 +#: src/truncate.c:97 msgid "" "Shrink or extend the size of each FILE to the specified size\n" "\n" @@ -10738,16 +10742,16 @@ "如果指定文件小于指定大小则用0 补足。\n" "\n" -#: src/truncate.c:111 +#: src/truncate.c:110 msgid " -c, --no-create do not create any files\n" msgstr " -c, --no-create\t不创建文件\n" -#: src/truncate.c:114 +#: src/truncate.c:113 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr " -o, --io-blocks\t将SIZE 视为IO 块数而不使用字节数\n" -#: src/truncate.c:117 +#: src/truncate.c:116 msgid "" " -r, --reference=RFILE base size on RFILE\n" " -s, --size=SIZE set or adjust the file size by SIZE\n" @@ -10770,12 +10774,12 @@ "\"/\" 运算的数学计算式为 m / n * n；\n" "\"%\" 运算的数学计算式为( m + n - 1 ) / n * n\n" -#: src/truncate.c:151 +#: src/truncate.c:150 #, c-format msgid "overflow in % * % byte blocks for file %s" msgstr "在文件%3$s 的%1$ * %2$ 字节块中溢出" -#: src/truncate.c:167 src/truncate.c:355 +#: src/truncate.c:184 src/truncate.c:385 #, c-format msgid "cannot get the size of %s" msgstr "无法获得%s 的大小" @@ -10785,37 +10789,37 @@ msgid "%s has unusable, apparently negative size" msgstr "%s 的文件大小为负数，无法使用" -#: src/truncate.c:194 +#: src/truncate.c:206 #, c-format msgid "overflow rounding up size of file %s" msgstr "处理大于等于文件%s 的指定大小的最大倍数时溢出" -#: src/truncate.c:204 +#: src/truncate.c:216 #, c-format msgid "overflow extending size of file %s" msgstr "扩展文件%s 大小时溢出" -#: src/truncate.c:219 +#: src/truncate.c:231 #, c-format msgid "failed to truncate %s at % bytes" msgstr "在%2$ 字节处截断%1$s 失败" -#: src/truncate.c:293 +#: src/truncate.c:304 #, c-format msgid "multiple relative modifiers specified" msgstr "指定了多个相关修饰符" -#: src/truncate.c:323 +#: src/truncate.c:334 #, c-format msgid "you must specify either %s or %s" msgstr "您必须在%s 或%s 中指定一个" -#: src/truncate.c:330 +#: src/truncate.c:341 #, c-format msgid "you must specify a relative %s with %s" msgstr "您必须为%2$s 中指定一个相关的%1$s" -#: src/truncate.c:337 +#: src/truncate.c:348 #, c-format msgid "%s was specified but %s was not" msgstr "已指定%s 但未指定%s" @@ -10825,7 +10829,7 @@ msgid "Mark Kettenis" msgstr "Mark Kettenis" -#: src/tsort.c:83 +#: src/tsort.c:82 #, c-format msgid "" "Usage: %s [OPTION] [FILE]\n" @@ -10838,17 +10842,17 @@ "如果不指定文件，或者文件为\"-\"，则从标准输入读取数据。\n" "\n" -#: src/tsort.c:473 +#: src/tsort.c:472 #, c-format msgid "%s: input contains an odd number of tokens" msgstr "%s：输入内容的行数为奇数" -#: src/tsort.c:519 +#: src/tsort.c:518 #, c-format msgid "%s: input contains a loop:" msgstr "%s：输入内容中含有循环段落：" -#: src/tty.c:66 +#: src/tty.c:65 msgid "" "Print the file name of the terminal connected to standard input.\n" "\n" @@ -10858,11 +10862,11 @@ "\n" " -s, --silent, --quiet\t什么也不显示，只返回退出状态值\n" -#: src/tty.c:121 +#: src/tty.c:120 msgid "not a tty" msgstr "不是一个 tty" -#: src/uname.c:126 +#: src/uname.c:124 msgid "" "Print certain system information. With no OPTION, same as -s.\n" "\n" @@ -10880,7 +10884,7 @@ " -n, --nodename\t\t输出网络节点上的主机名\n" " -r, --kernel-release\t\t输出内核发行号\n" -#: src/uname.c:135 +#: src/uname.c:133 msgid "" " -v, --kernel-version print the kernel version\n" " -m, --machine print the machine hardware name\n" @@ -10894,7 +10898,7 @@ " -i, --hardware-platform\t输出硬件平台或\"unknown\"\n" " -o, --operating-system\t输出操作系统名称\n" -#: src/uname.c:145 +#: src/uname.c:143 msgid "" "Print machine architecture.\n" "\n" @@ -10902,12 +10906,12 @@ "输出机器的体系结构。\n" "\n" -#: src/uname.c:288 +#: src/uname.c:286 #, c-format msgid "cannot get system name" msgstr "无法获取系统名" -#: src/unexpand.c:119 +#: src/unexpand.c:117 msgid "" "Convert blanks in each FILE to tabs, writing to standard output.\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -10917,7 +10921,7 @@ "如果不指定文件，或者文件为\"-\"，则从标准输入读取数据。\n" "\n" -#: src/unexpand.c:127 +#: src/unexpand.c:125 msgid "" " -a, --all convert all blanks, instead of just initial blanks\n" " --first-only convert only leading sequences of blanks (overrides -a)\n" @@ -10929,22 +10933,22 @@ " -t, --tabs=N\t\t设置制表符宽度为N 而非默认的8(启用-a 选项)\n" " -t, --tabs=列表\t使用逗号分隔的列表列出制表符位置(启用-a 选项)\n" -#: src/unexpand.c:155 +#: src/unexpand.c:153 #, c-format msgid "tabs are too far apart" msgstr "制表符过于分散" -#: src/unexpand.c:507 +#: src/unexpand.c:505 #, c-format msgid "tab stop value is too large" msgstr "制表符限长过大" -#: src/uniq.c:135 +#: src/uniq.c:134 #, c-format msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n" msgstr "用法：%s [选项]... [文件]\n" -#: src/uniq.c:139 +#: src/uniq.c:138 msgid "" "Filter adjacent matching lines from INPUT (or standard input),\n" "writing to OUTPUT (or standard output).\n" @@ -10957,7 +10961,7 @@ "不附加任何选项时匹配行将在首次出现处被合并。\n" "\n" -#: src/uniq.c:149 +#: src/uniq.c:148 msgid "" " -c, --count prefix lines by the number of occurrences\n" " -d, --repeated only print duplicate lines\n" @@ -10965,7 +10969,7 @@ " -c, --count\t\t在每行前加上表示相应行目出现次数的前缀编号\n" " -d, --repeated\t只输出重复的行\n" -#: src/uniq.c:153 +#: src/uniq.c:152 msgid "" " -D, --all-repeated[=delimit-method] print all duplicate lines\n" " delimit-method={none(default),prepend,separate}\n" @@ -10985,11 +10989,11 @@ " -u, --unique\t\t只显示唯一的行\n" " -z, --zero-terminated\t使用'\\0'作为行结束符，而不是新换行\n" -#: src/uniq.c:163 +#: src/uniq.c:162 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:168 +#: src/uniq.c:167 msgid "" "\n" "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n" @@ -11010,29 +11014,29 @@ "如果您想先对输入排序，使用没有uniq 的\"sort -u\"。\n" "同时，比较服从\"LC_COLLATE\" 变量所指定的规则。\n" -#: src/uniq.c:360 +#: src/uniq.c:359 #, c-format msgid "too many repeated lines" msgstr "重复行过多" -#: src/uniq.c:523 +#: src/uniq.c:522 msgid "invalid number of fields to skip" msgstr "要略过的区块数量无效" -#: src/uniq.c:532 +#: src/uniq.c:531 msgid "invalid number of bytes to skip" msgstr "要略过的字节数量无效" -#: src/uniq.c:541 +#: src/uniq.c:540 msgid "invalid number of bytes to compare" msgstr "要对照的字节数量无效" -#: src/uniq.c:560 +#: src/uniq.c:559 #, c-format msgid "printing all duplicated lines and repeat counts is meaningless" msgstr "同时输出重复的行和重复计数是没有意义的" -#: src/unlink.c:46 +#: src/unlink.c:45 #, c-format msgid "" "Usage: %s FILE\n" @@ -11041,7 +11045,7 @@ "用法：%s 文件\n" "　或：%s 选项\n" -#: src/unlink.c:49 +#: src/unlink.c:48 msgid "" "Call the unlink function to remove the specified FILE.\n" "\n" @@ -11049,7 +11053,7 @@ "调用 unlink 函数删除指定的文件。\n" "\n" -#: src/unlink.c:87 +#: src/unlink.c:86 #, c-format msgid "cannot unlink %s" msgstr "无法清除%s 的链接" @@ -11091,7 +11095,7 @@ msgid ", load average: %.2f" msgstr "，平均负载：%.2f" -#: src/uptime.c:198 +#: src/uptime.c:197 #, c-format msgid "" "Print the current time, the length of time the system has been up,\n" @@ -11101,19 +11105,19 @@ "输出当前时间，系统启动时间，当前登录用户数以及最近1、5 和15 分钟系统运行\n" "队列中的平均任务数。" -#: src/uptime.c:207 +#: src/uptime.c:206 #, c-format msgid "" " Processes in\n" "an uninterruptible sleep state also contribute to the load average.\n" msgstr " 处于不可中断睡眠状态的程序同样影响系统平均负载。\n" -#: src/uptime.c:211 +#: src/uptime.c:210 #, c-format msgid "\n" msgstr "\n" -#: src/uptime.c:213 +#: src/uptime.c:212 #, c-format msgid "" "If FILE is not specified, use %s. %s as FILE is common.\n" @@ -11122,7 +11126,7 @@ "如果文件没有指定，则使用%s，%s 是通用的相关文件。\n" "\n" -#: src/users.c:107 +#: src/users.c:106 #, c-format msgid "" "Output who is currently logged in according to FILE.\n" @@ -11133,7 +11137,7 @@ "如果文件未予指定，则使用%s，%s 是通用的相关文件。\n" "\n" -#: src/wc.c:118 +#: src/wc.c:117 msgid "" "Print newline, word, and byte counts for each FILE, and a total line if\n" "more than one FILE is specified. With no FILE, or when FILE is -,\n" @@ -11146,7 +11150,7 @@ " -l, --lines print the newline counts\n" msgstr "" -#: src/wc.c:129 +#: src/wc.c:128 msgid "" " --files0-from=F read input from the files specified by\n" " NUL-terminated names in file F;\n" @@ -11163,39 +11167,39 @@ msgid " old " msgstr " 旧的 " -#: src/who.c:449 +#: src/who.c:440 msgid "system boot" msgstr "系统引导" -#: src/who.c:456 src/who.c:458 +#: src/who.c:447 src/who.c:449 msgid "id=" msgstr "id=" -#: src/who.c:471 src/who.c:476 +#: src/who.c:462 src/who.c:467 msgid "term=" msgstr "终端=" -#: src/who.c:473 src/who.c:477 +#: src/who.c:464 src/who.c:468 msgid "exit=" msgstr "退出=" -#: src/who.c:494 +#: src/who.c:485 msgid "LOGIN" msgstr "登录" -#: src/who.c:514 +#: src/who.c:505 msgid "clock change" msgstr "时钟更改" -#: src/who.c:526 src/who.c:527 +#: src/who.c:517 src/who.c:518 msgid "run-level" msgstr "运行级别" -#: src/who.c:530 src/who.c:531 +#: src/who.c:521 src/who.c:522 msgid "last=" msgstr "最近=" -#: src/who.c:562 +#: src/who.c:553 #, c-format msgid "" "\n" @@ -11204,44 +11208,44 @@ "\n" "# 用户数=%lu\n" -#: src/who.c:568 +#: src/who.c:559 msgid "NAME" msgstr "名称" -#: src/who.c:568 +#: src/who.c:559 msgid "LINE" msgstr "线路" -#: src/who.c:568 +#: src/who.c:559 msgid "TIME" msgstr "时间" -#: src/who.c:568 +#: src/who.c:559 msgid "IDLE" msgstr "空闲" -#: src/who.c:569 +#: src/who.c:560 msgid "PID" msgstr "进程号" -#: src/who.c:569 +#: src/who.c:560 msgid "COMMENT" msgstr "备注" -#: src/who.c:569 +#: src/who.c:560 msgid "EXIT" msgstr "退出" -#: src/who.c:650 +#: src/who.c:640 #, c-format msgid "Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n" msgstr "用法：%s [选项]... [ 文件 | 参数1 参数2 ]\n" -#: src/who.c:651 +#: src/who.c:641 msgid "Print information about users who are currently logged in.\n" msgstr "显示当前已登录的用户信息。\n" -#: src/who.c:654 +#: src/who.c:644 msgid "" "\n" " -a, --all same as -b -d --login -p -r -t -T -u\n" @@ -11255,11 +11259,11 @@ " -d, --dead\t\t显示已死的进程\n" " -H, --heading\t输出头部的标题列\n" -#: src/who.c:661 +#: src/who.c:651 msgid " -l, --login print system login processes\n" msgstr " -l，--login\t\t显示系统登录进程\n" -#: src/who.c:664 +#: src/who.c:654 msgid "" " --lookup attempt to canonicalize hostnames via DNS\n" " -m only hostname and user associated with stdin\n" @@ -11269,7 +11273,7 @@ " -m\t\t\t只针对和标准输入有直接交互的主机和用户\n" " -p, --process\t显示由 init 进程衍生的活动进程\n" -#: src/who.c:669 +#: src/who.c:659 msgid "" " -q, --count all login names and number of users logged on\n" " -r, --runlevel print current runlevel\n" @@ -11280,7 +11284,7 @@ " -r, --runlevel\t显示当前的运行级别\n" " -s, --short\t\t只显示名称、线路和时间(默认)\n" -#: src/who.c:675 +#: src/who.c:665 msgid "" " -T, -w, --mesg add user's message status as +, - or ?\n" " -u, --users list users logged in\n" @@ -11304,7 +11308,7 @@ "如果给定了参数1 和参数2，-m 会假定：\"am i\"或\"mom likes\"\n" "为参数。\n" -#: src/whoami.c:47 +#: src/whoami.c:45 msgid "" "Print the user name associated with the current effective user ID.\n" "Same as id -un.\n" @@ -11319,7 +11323,7 @@ msgid "%s: cannot find name for user ID %lu\n" msgstr "%s：无法找到用户ID 为%lu 的用户名\n" -#: src/yes.c:42 +#: src/yes.c:41 #, c-format msgid "" "Usage: %s [STRING]...\n" diff -Nru language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/cpio.po language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/cpio.po --- language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/cpio.po 2012-05-08 22:47:26.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/cpio.po 2013-01-29 09:37:13.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: 2012-05-08 02:07+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2013-01-28 10:48+0000\n" +"X-Generator: Launchpad (build 16451)\n" #: gnu/argmatch.c:135 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/cpplib-4.4.po language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/cpplib-4.4.po --- language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/cpplib-4.4.po 2012-05-08 22:48:02.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/cpplib-4.4.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,970 +0,0 @@ -# Simplified Chinese translation for cpplib. -# Copyright (C) 2005 Free Software Foundation, Inc. -# This file is distributed under the same license as the gcc package. -# Meng Jie , 2005-2009. -# -msgid "" -msgstr "" -"Project-Id-Version: cpplib 4.4-b20081121\n" -"Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n" -"POT-Creation-Date: 2009-04-22 16:32+0000\n" -"PO-Revision-Date: 2012-04-18 06:31+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: 2012-05-08 06:51+0000\n" -"X-Generator: Launchpad (build 15204)\n" - -#: charset.c:674 -#, c-format -msgid "conversion from %s to %s not supported by iconv" -msgstr "iconv 不支持从 %s 到 %s 的转换" - -#: charset.c:677 -msgid "iconv_open" -msgstr "iconv_open" - -#: charset.c:685 -#, c-format -msgid "no iconv implementation, cannot convert from %s to %s" -msgstr "没有 iconv 的实现，无法从 %s 转换到 %s" - -#: charset.c:773 -#, c-format -msgid "character 0x%lx is not in the basic source character set\n" -msgstr "字符 0x%lx 不在基本源字符集中\n" - -#: charset.c:790 -#: charset.c:1398 -msgid "converting to execution character set" -msgstr "转换到可执行文件的字符集" - -#: charset.c:796 -#, c-format -msgid "character 0x%lx is not unibyte in execution character set" -msgstr "字符 0x%lx 在执行字符集中不是单字节的" - -#: charset.c:920 -#, c-format -msgid "Character %x might not be NFKC" -msgstr "字符 %x 可能不是 NFKC" - -#: charset.c:980 -msgid "universal character names are only valid in C++ and C99" -msgstr "Unicode 字符名只在 C++ 和 C99 中有效" - -#: charset.c:983 -#, c-format -msgid "the meaning of '\\%c' is different in traditional C" -msgstr "‘\\%c’的意义与在传统 C 中不同" - -#: charset.c:992 -msgid "In _cpp_valid_ucn but not a UCN" -msgstr "在 _cpp_valid_ucn 中但不是一个 UCN" - -#: charset.c:1017 -#, c-format -msgid "incomplete universal character name %.*s" -msgstr "不完全的 Unicode 字符名 %.*s" - -#: charset.c:1029 -#, c-format -msgid "%.*s is not a valid universal character" -msgstr "%.*s 不是一个有效的 Unicode 字符" - -#: charset.c:1039 -#: lex.c:486 -msgid "'$' in identifier or number" -msgstr "‘$’出现在标识符或数字中" - -#: charset.c:1049 -#, c-format -msgid "universal character %.*s is not valid in an identifier" -msgstr "Unicode 字符 %.*s 在标识符中无效" - -#: charset.c:1053 -#, c-format -msgid "universal character %.*s is not valid at the start of an identifier" -msgstr "Unicode 字符 %.*s 在标识符开头无效" - -#: charset.c:1085 -#: charset.c:1628 -msgid "converting UCN to source character set" -msgstr "将 UCN 转换到源字符集" - -#: charset.c:1089 -msgid "converting UCN to execution character set" -msgstr "将 UCN 转换到执行字符集" - -#: charset.c:1161 -msgid "the meaning of '\\x' is different in traditional C" -msgstr "‘\\x’的意义与在传统 C 中不同" - -#: charset.c:1178 -msgid "\\x used with no following hex digits" -msgstr "\\x 后没有 16 进制数字" - -#: charset.c:1185 -msgid "hex escape sequence out of range" -msgstr "16 进制转义序列越界" - -#: charset.c:1223 -msgid "octal escape sequence out of range" -msgstr "8 进制转义序列越界" - -#: charset.c:1289 -msgid "the meaning of '\\a' is different in traditional C" -msgstr "‘\\a’的意义与在传统 C 中不同" - -#: charset.c:1296 -#, c-format -msgid "non-ISO-standard escape sequence, '\\%c'" -msgstr "非 ISO 标准的转义序列，‘\\%c’" - -#: charset.c:1304 -#, c-format -msgid "unknown escape sequence '\\%c'" -msgstr "未知的转义序列：‘\\%c’" - -#: charset.c:1312 -#, c-format -msgid "unknown escape sequence: '\\%s'" -msgstr "未知的转义序列：‘\\%s’" - -#: charset.c:1319 -msgid "converting escape sequence to execution character set" -msgstr "将转义序列转换到执行字符集" - -#: charset.c:1463 -#: charset.c:1527 -msgid "character constant too long for its type" -msgstr "字符常量大小超出其类型" - -#: charset.c:1466 -msgid "multi-character character constant" -msgstr "多字节字符常量" - -#: charset.c:1566 -msgid "empty character constant" -msgstr "空的字符常量" - -#: charset.c:1675 -#, c-format -msgid "failure to convert %s to %s" -msgstr "无法从 %s 转换到 %s" - -#: directives.c:216 -#: directives.c:242 -#, c-format -msgid "extra tokens at end of #%s directive" -msgstr "#%s 指示的末尾有多余的标识符" - -#: directives.c:348 -#, c-format -msgid "#%s is a GCC extension" -msgstr "#%s 是一个 GCC 扩展" - -#: directives.c:352 -#, c-format -msgid "#%s is a deprecated GCC extension" -msgstr "#%s 是一个已过时的 GCC 扩展" - -#: directives.c:366 -msgid "suggest not using #elif in traditional C" -msgstr "建议在传统 C 中不使用 #elif" - -#: directives.c:369 -#, c-format -msgid "traditional C ignores #%s with the # indented" -msgstr "当 # 有缩进时传统 C 忽略 #%s" - -#: directives.c:373 -#, c-format -msgid "suggest hiding #%s from traditional C with an indented #" -msgstr "建议使用缩进的 # 以让 #%s 对传统 C 不可见" - -#: directives.c:399 -msgid "embedding a directive within macro arguments is not portable" -msgstr "将一个指示嵌入宏参数中是不可移植的" - -#: directives.c:419 -msgid "style of line directive is a GCC extension" -msgstr "line 指示的风格是一个 GCC 扩展" - -#: directives.c:474 -#, c-format -msgid "invalid preprocessing directive #%s" -msgstr "无效的预处理指示 #%s" - -#: directives.c:542 -msgid "\"defined\" cannot be used as a macro name" -msgstr "“defined”不能被用作宏名" - -#: directives.c:548 -#, c-format -msgid "\"%s\" cannot be used as a macro name as it is an operator in C++" -msgstr "“%s”不能被用作宏名，因为它是 C++ 中的一个操作符" - -#: directives.c:551 -#, c-format -msgid "no macro name given in #%s directive" -msgstr "#%s 指示中未给出宏名" - -#: directives.c:554 -msgid "macro names must be identifiers" -msgstr "宏名必须是标识符" - -#: directives.c:603 -#, c-format -msgid "undefining \"%s\"" -msgstr "取消对“%s”的定义" - -#: directives.c:658 -msgid "missing terminating > character" -msgstr "缺少结尾的 > 字符" - -#: directives.c:713 -#, c-format -msgid "#%s expects \"FILENAME\" or " -msgstr "#%s 需要 \"FILENAME\" 或 " - -#: directives.c:757 -#, c-format -msgid "empty filename in #%s" -msgstr "#%s 中文件名为空" - -#: directives.c:767 -msgid "#include nested too deeply" -msgstr "#include 嵌套过深" - -#: directives.c:808 -msgid "#include_next in primary source file" -msgstr "#include_next 出现在主源文件中" - -#: directives.c:834 -#, c-format -msgid "invalid flag \"%s\" in line directive" -msgstr "line 指示中有无效的标记“%s”" - -#: directives.c:894 -msgid "unexpected end of file after #line" -msgstr "#line 后未预期的文件结束" - -#: directives.c:897 -#, c-format -msgid "\"%s\" after #line is not a positive integer" -msgstr "#line 后的“%s”不是一个正整数" - -#: directives.c:903 -#: directives.c:905 -msgid "line number out of range" -msgstr "行号超出范围" - -#: directives.c:918 -#: directives.c:998 -#, c-format -msgid "\"%s\" is not a valid filename" -msgstr "“%s”不是一个有效的文件名" - -#: directives.c:958 -#, c-format -msgid "\"%s\" after # is not a positive integer" -msgstr "# 后的“%s”不是一个正整数" - -#: directives.c:1042 -#, c-format -msgid "%s" -msgstr "%s" - -#: directives.c:1066 -#, c-format -msgid "invalid #%s directive" -msgstr "无效的 #%s 指示" - -#: directives.c:1129 -#, c-format -msgid "" -"registering pragmas in namespace \"%s\" with mismatched name expansion" -msgstr "在命名空间“%s”中注册 pragma 时名称扩展不匹配" - -#: directives.c:1138 -#, c-format -msgid "registering pragma \"%s\" with name expansion and no namespace" -msgstr "pragma “%s”被注册为一个命名扩展，而没有命名空间" - -#: directives.c:1156 -#, c-format -msgid "registering \"%s\" as both a pragma and a pragma namespace" -msgstr "“%s”既被注册为一个pragma 又被注册为一个 pragma 命名空间" - -#: directives.c:1159 -#, c-format -msgid "#pragma %s %s is already registered" -msgstr "#pragma %s %s 已经被注册" - -#: directives.c:1162 -#, c-format -msgid "#pragma %s is already registered" -msgstr "#pragma %s 已经被注册" - -#: directives.c:1192 -msgid "registering pragma with NULL handler" -msgstr "pragma 注册为被 NULL 处理" - -#: directives.c:1402 -msgid "#pragma once in main file" -msgstr "#pragma once 出现在主文件中" - -#: directives.c:1425 -msgid "invalid #pragma GCC poison directive" -msgstr "无效的 #pragma GCC poison 指示" - -#: directives.c:1434 -#, c-format -msgid "poisoning existing macro \"%s\"" -msgstr "对已存在的宏“%s”投毒" - -#: directives.c:1453 -msgid "#pragma system_header ignored outside include file" -msgstr "#pragma system_heade 在包含文件外被忽略" - -#: directives.c:1477 -#, c-format -msgid "cannot find source file %s" -msgstr "找不到源文件 %s" - -#: directives.c:1481 -#, c-format -msgid "current file is older than %s" -msgstr "当前文件早于 %s" - -#: directives.c:1665 -msgid "_Pragma takes a parenthesized string literal" -msgstr "_Pragma 需要一个括起的字符串字面常量" - -#: directives.c:1766 -msgid "#else without #if" -msgstr "#else 没有匹配的 #if" - -#: directives.c:1771 -msgid "#else after #else" -msgstr "#else 出现在 #else 后" - -#: directives.c:1773 -#: directives.c:1806 -msgid "the conditional began here" -msgstr "条件自此开始" - -#: directives.c:1799 -msgid "#elif without #if" -msgstr "#elif 没有匹配的 #if" - -#: directives.c:1804 -msgid "#elif after #else" -msgstr "#elif 出现在 #else 后" - -#: directives.c:1842 -msgid "#endif without #if" -msgstr "#endif 没有匹配的 #if" - -#: directives.c:1919 -msgid "missing '(' after predicate" -msgstr "谓词后缺少‘(’" - -#: directives.c:1934 -msgid "missing ')' to complete answer" -msgstr "完整的答案缺少‘)’" - -#: directives.c:1954 -msgid "predicate's answer is empty" -msgstr "谓词的答案为空" - -#: directives.c:1981 -msgid "assertion without predicate" -msgstr "断言后没有谓词" - -#: directives.c:1983 -msgid "predicate must be an identifier" -msgstr "谓词必须是一个标识符" - -#: directives.c:2069 -#, c-format -msgid "\"%s\" re-asserted" -msgstr "重断言“%s”" - -#: directives.c:2375 -#, c-format -msgid "unterminated #%s" -msgstr "未终止的 #%s" - -#: directives-only.c:222 -#: lex.c:1149 -#: traditional.c:163 -msgid "unterminated comment" -msgstr "未结束的注释" - -#: errors.c:118 -msgid "warning: " -msgstr "警告： " - -#: errors.c:120 -msgid "internal error: " -msgstr "内部错误： " - -#: errors.c:122 -msgid "error: " -msgstr "错误： " - -#: errors.c:195 -msgid "stdout" -msgstr "stdout" - -#: errors.c:197 -#, c-format -msgid "%s: %s" -msgstr "%s：%s" - -#: expr.c:261 -msgid "too many decimal points in number" -msgstr "数字中有太多小数点" - -#: expr.c:290 -#: expr.c:365 -msgid "fixed-point constants are a GCC extension" -msgstr "定点常量是一个 GCC 扩展" - -#: expr.c:303 -#, c-format -msgid "invalid digit \"%c\" in binary constant" -msgstr "二进制常量中有无效数字“%c”" - -#: expr.c:305 -#, c-format -msgid "invalid digit \"%c\" in octal constant" -msgstr "8 进制常量中有非法字符“%c”" - -#: expr.c:313 -msgid "invalid prefix \"0b\" for floating constant" -msgstr "浮点常量的“0b”前缀无效" - -#: expr.c:319 -msgid "use of C99 hexadecimal floating constant" -msgstr "使用 C99 式的 16 进制浮点常量" - -#: expr.c:328 -msgid "exponent has no digits" -msgstr "指数部分没有数字" - -#: expr.c:335 -msgid "hexadecimal floating constants require an exponent" -msgstr "16 进制浮点常量需要指数部分" - -#: expr.c:341 -#, c-format -msgid "invalid suffix \"%.*s\" on floating constant" -msgstr "浮点常量的“%.*s”后缀无效" - -#: expr.c:351 -#: expr.c:393 -#, c-format -msgid "traditional C rejects the \"%.*s\" suffix" -msgstr "传统 C 不接受“%.*s”后缀" - -#: expr.c:358 -#, c-format -msgid "invalid suffix \"%.*s\" with hexadecimal floating constant" -msgstr "十六进制浮点常量的“%.*s”后缀无效" - -#: expr.c:369 -msgid "decimal float constants are a GCC extension" -msgstr "十进制浮点常量是一个 GCC 扩展" - -#: expr.c:379 -#, c-format -msgid "invalid suffix \"%.*s\" on integer constant" -msgstr "整数常量的“%.*s”后缀无效" - -#: expr.c:401 -msgid "use of C99 long long integer constant" -msgstr "使用 C99 long long 整数常量" - -#: expr.c:409 -msgid "imaginary constants are a GCC extension" -msgstr "虚数常量是一个 GCC 扩展" - -#: expr.c:412 -msgid "binary constants are a GCC extension" -msgstr "二进制常量是一个 GCC 扩展" - -#: expr.c:505 -msgid "integer constant is too large for its type" -msgstr "整数常量值超出其类型" - -#: expr.c:517 -msgid "integer constant is so large that it is unsigned" -msgstr "整数常量太大，认定为 unsigned" - -#: expr.c:612 -msgid "missing ')' after \"defined\"" -msgstr "“defined” 后出现‘)’" - -#: expr.c:619 -msgid "operator \"defined\" requires an identifier" -msgstr "操作符“defined”需要一个标识符" - -#: expr.c:627 -#, c-format -msgid "(\"%s\" is an alternative token for \"%s\" in C++)" -msgstr "(在 C++ 中“%s”会是“%s”的替代标识符)" - -#: expr.c:637 -msgid "this use of \"defined\" may not be portable" -msgstr "使用“defined”可能不利于移植" - -#: expr.c:690 -msgid "floating constant in preprocessor expression" -msgstr "浮点常量出现在预处理表达式中" - -#: expr.c:696 -msgid "imaginary number in preprocessor expression" -msgstr "预处理表达式中出现虚数" - -#: expr.c:743 -#, c-format -msgid "\"%s\" is not defined" -msgstr "“%s”未定义" - -#: expr.c:755 -msgid "assertions are a GCC extension" -msgstr "断言是一个 GCC 扩展" - -#: expr.c:758 -msgid "assertions are a deprecated extension" -msgstr "断言是一个已过时的 GCC 扩展" - -#: expr.c:891 -#: expr.c:920 -#, c-format -msgid "missing binary operator before token \"%s\"" -msgstr "标识符“%s”前缺少二元运算符" - -#: expr.c:911 -#, c-format -msgid "token \"%s\" is not valid in preprocessor expressions" -msgstr "标识符“%s”在预处理表达式中无效" - -#: expr.c:928 -msgid "missing expression between '(' and ')'" -msgstr "‘(’与‘)’之间缺少表达式" - -#: expr.c:931 -#, c-format -msgid "%s with no expression" -msgstr "%s 后没有表达式" - -#: expr.c:934 -#, c-format -msgid "operator '%s' has no right operand" -msgstr "操作符‘%s’没有右操作数" - -#: expr.c:939 -#, c-format -msgid "operator '%s' has no left operand" -msgstr "操作符‘%s’没有左操作数" - -#: expr.c:965 -msgid " ':' without preceding '?'" -msgstr " ‘:’前没有‘?’" - -#: expr.c:993 -#, c-format -msgid "unbalanced stack in %s" -msgstr "%s 中堆栈不平衡" - -#: expr.c:1013 -#, c-format -msgid "impossible operator '%u'" -msgstr "不可能的操作‘%u’" - -#: expr.c:1114 -msgid "missing ')' in expression" -msgstr "表达式中缺少‘)’" - -#: expr.c:1143 -msgid "'?' without following ':'" -msgstr "‘?’后没有‘:’" - -#: expr.c:1153 -msgid "integer overflow in preprocessor expression" -msgstr "预处理表达式中整数溢出" - -#: expr.c:1158 -msgid "missing '(' in expression" -msgstr "表达式中缺少‘(’" - -#: expr.c:1190 -#, c-format -msgid "the left operand of \"%s\" changes sign when promoted" -msgstr "“%s”的左操作数在提升时变换了符号" - -#: expr.c:1195 -#, c-format -msgid "the right operand of \"%s\" changes sign when promoted" -msgstr "“%s”的右操作数在提升时变换了符号" - -#: expr.c:1454 -msgid "traditional C rejects the unary plus operator" -msgstr "传统 C 不接受单目 + 运算符" - -#: expr.c:1537 -msgid "comma operator in operand of #if" -msgstr "#if 操作数中出现逗号" - -#: expr.c:1669 -msgid "division by zero in #if" -msgstr "#if 中用零做除数" - -#: files.c:457 -msgid "NULL directory in find_file" -msgstr "find_file 中有 NULL 目录" - -#: files.c:495 -msgid "one or more PCH files were found, but they were invalid" -msgstr "找到一个或多个 PCH 文件，但它们是无效的" - -#: files.c:498 -msgid "use -Winvalid-pch for more information" -msgstr "使用 -Winvalid-pch 以获得更多信息" - -#: files.c:588 -#, c-format -msgid "%s is a block device" -msgstr "%s 是一个块设备" - -#: files.c:605 -#, c-format -msgid "%s is too large" -msgstr "%s 过大" - -#: files.c:640 -#, c-format -msgid "%s is shorter than expected" -msgstr "%s 短于预期" - -#: files.c:875 -#, c-format -msgid "no include path in which to search for %s" -msgstr "没有包含路径可供搜索 %s" - -#: files.c:1286 -msgid "Multiple include guards may be useful for:\n" -msgstr "多个防止重包含可能对其有用：\n" - -#: init.c:452 -msgid "cppchar_t must be an unsigned type" -msgstr "cppchar_t 必须是无符号型" - -#: init.c:456 -#, c-format -msgid "" -"preprocessor arithmetic has maximum precision of %lu bits; target requires " -"%lu bits" -msgstr "预处理算术的最高精度为 %lu 位；目标需要 %lu 位" - -#: init.c:463 -msgid "CPP arithmetic must be at least as precise as a target int" -msgstr "CPP 算术必须至少具有目标 int 的精度" - -#: init.c:466 -msgid "target char is less than 8 bits wide" -msgstr "目标 char 短于 8 位" - -#: init.c:470 -msgid "target wchar_t is narrower than target char" -msgstr "目录 wchar_t 短于目标 char" - -#: init.c:474 -msgid "target int is narrower than target char" -msgstr "目标 int 短于目标 char" - -#: init.c:479 -msgid "CPP half-integer narrower than CPP character" -msgstr "CPP 半整数短于 CPP 字符" - -#: init.c:483 -#, c-format -msgid "" -"CPP on this host cannot handle wide character constants over %lu bits, but " -"the target requires %lu bits" -msgstr "在此宿主机上，CPP 不能处理长于 %lu 位的宽字符常量，但目标需要 %lu 位" - -#: lex.c:285 -msgid "backslash and newline separated by space" -msgstr "反斜杠和换行为空格所分隔" - -#: lex.c:290 -msgid "backslash-newline at end of file" -msgstr "反斜杠续行出现在文件末尾" - -#: lex.c:305 -#, c-format -msgid "trigraph ??%c converted to %c" -msgstr "三元符 ??%c 转换为 %c" - -#: lex.c:312 -#, c-format -msgid "trigraph ??%c ignored, use -trigraphs to enable" -msgstr "三元符 ??%c 被忽略，请使用 -trigraphs 来启用" - -#: lex.c:358 -msgid "\"/*\" within comment" -msgstr "“/*”出现在注释中" - -#: lex.c:416 -#, c-format -msgid "%s in preprocessing directive" -msgstr "预处理指示中出现 %s" - -#: lex.c:425 -msgid "null character(s) ignored" -msgstr "忽略空字符" - -#: lex.c:462 -#, c-format -msgid "`%.*s' is not in NFKC" -msgstr "‘%.*s’不在 NFKC 中" - -#: lex.c:465 -#, c-format -msgid "`%.*s' is not in NFC" -msgstr "‘%.*s’不在 NFC 中" - -#: lex.c:553 -#, c-format -msgid "attempt to use poisoned \"%s\"" -msgstr "试图使用有毒的“%s”" - -#: lex.c:561 -msgid "__VA_ARGS__ can only appear in the expansion of a C99 variadic macro" -msgstr "__VA_ARGS__ 只能出现在 C99 可变参数宏的展开中" - -#: lex.c:675 -msgid "null character(s) preserved in literal" -msgstr "空字符将保留在字面字符串中" - -#: lex.c:678 -#, c-format -msgid "missing terminating %c character" -msgstr "缺少结尾的 %c 字符" - -#: lex.c:1160 -msgid "C++ style comments are not allowed in ISO C90" -msgstr "C++ 风格的注释在 ISO C90 中不被允许" - -#: lex.c:1162 -msgid "(this will be reported only once per input file)" -msgstr "(此警告为每个输入文件只报告一次)" - -#: lex.c:1167 -msgid "multi-line comment" -msgstr "多行注释" - -#: lex.c:1481 -#, c-format -msgid "unspellable token %s" -msgstr "无法拼出的标识符 %s" - -#: line-map.c:319 -#, c-format -msgid "In file included from %s:%u" -msgstr "在包含自 %s：%u 的文件中" - -#: line-map.c:337 -#, c-format -msgid "" -",\n" -" from %s:%u" -msgstr "" -"，\n" -" 从 %s：%u" - -#: macro.c:87 -#, c-format -msgid "macro \"%s\" is not used" -msgstr "宏“%s”未被使用" - -#: macro.c:126 -#: macro.c:321 -#, c-format -msgid "invalid built-in macro \"%s\"" -msgstr "无效的内建宏“%s”" - -#: macro.c:160 -msgid "could not determine file timestamp" -msgstr "无法决定文件的时间戳" - -#: macro.c:256 -msgid "could not determine date and time" -msgstr "无法决定日期与时间" - -#: macro.c:272 -msgid "__COUNTER__ expanded inside directive with -fdirectives-only" -msgstr "带 -fdirectives-only 时 __COUNTER__ 在指示中扩展" - -#: macro.c:427 -msgid "invalid string literal, ignoring final '\\'" -msgstr "无效的字面字符串，忽略最后的‘\\’" - -#: macro.c:487 -#, c-format -msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token" -msgstr "毗连“%s”和“%s”不能给出一个有效的预处理标识符" - -#: macro.c:562 -msgid "ISO C99 requires rest arguments to be used" -msgstr "ISO C99 需要使用剩余的参数" - -#: macro.c:567 -#, c-format -msgid "macro \"%s\" requires %u arguments, but only %u given" -msgstr "宏“%s”需要 %u 个参数，但只给出了 %u 个" - -#: macro.c:572 -#, c-format -msgid "macro \"%s\" passed %u arguments, but takes just %u" -msgstr "宏“%s”传递了 %u 个参数，但只需要 %u 个" - -#: macro.c:731 -#: traditional.c:681 -#, c-format -msgid "unterminated argument list invoking macro \"%s\"" -msgstr "调用宏“%s”时参数列表未终止" - -#: macro.c:848 -#, c-format -msgid "" -"function-like macro \"%s\" must be used with arguments in traditional C" -msgstr "类似函数的宏“%s”在传统 C 中必须与参数一起使用" - -#: macro.c:1016 -#, c-format -msgid "" -"invoking macro %s argument %d: empty macro arguments are undefined in ISO " -"C90 and ISO C++98" -msgstr "调用宏 %s 的参数 %d：空的宏参数未被 ISO C90 和 ISO C++98 定义" - -#: macro.c:1479 -#, c-format -msgid "duplicate macro parameter \"%s\"" -msgstr "重复的宏参数“%s”" - -#: macro.c:1525 -#, c-format -msgid "\"%s\" may not appear in macro parameter list" -msgstr "“%s”不能出现在宏参数列表中" - -#: macro.c:1533 -msgid "macro parameters must be comma-separated" -msgstr "宏参数必须由逗号隔开" - -#: macro.c:1550 -msgid "parameter name missing" -msgstr "缺少形参名" - -#: macro.c:1567 -msgid "anonymous variadic macros were introduced in C99" -msgstr "匿名可变参数宏在 C99 中被引入" - -#: macro.c:1572 -msgid "ISO C does not permit named variadic macros" -msgstr "ISO C 不允许有名的可变参数宏" - -#: macro.c:1581 -msgid "missing ')' in macro parameter list" -msgstr "在宏参数表中缺少‘)’" - -#: macro.c:1630 -msgid "'##' cannot appear at either end of a macro expansion" -msgstr "‘##’不能出现在宏展开的两端" - -#: macro.c:1664 -msgid "ISO C99 requires whitespace after the macro name" -msgstr "ISO C99 要求宏名后必须有空白" - -#: macro.c:1688 -msgid "missing whitespace after the macro name" -msgstr "宏名后缺少空白" - -#: macro.c:1718 -msgid "'#' is not followed by a macro parameter" -msgstr "‘#’后没有宏参数" - -#: macro.c:1837 -#, c-format -msgid "\"%s\" redefined" -msgstr "“%s”重定义" - -#: macro.c:1842 -msgid "this is the location of the previous definition" -msgstr "这是先前定义的位置" - -#: macro.c:1903 -#, c-format -msgid "macro argument \"%s\" would be stringified in traditional C" -msgstr "宏参数“%s”将在传统 C 中被字符串化" - -#: macro.c:1926 -#, c-format -msgid "invalid hash type %d in cpp_macro_definition" -msgstr "cpp_macro_definition 中有无效的散列类型 %d" - -#: pch.c:84 -#: pch.c:332 -#: pch.c:344 -#: pch.c:362 -#: pch.c:368 -#: pch.c:377 -msgid "while writing precompiled header" -msgstr "在写入预编译头时" - -#: pch.c:484 -#, c-format -msgid "%s: not used because `%.*s' is poisoned" -msgstr "%s:未使用，因为 `%.*s' 被污染" - -#: pch.c:506 -#, c-format -msgid "%s: not used because `%.*s' not defined" -msgstr "%s：未使用因为‘%.*s’未定义" - -#: pch.c:518 -#, c-format -msgid "%s: not used because `%.*s' defined as `%s' not `%.*s'" -msgstr "%s：未使用因为‘%.*s’被定义为‘%s’而非‘%*.s’" - -#: pch.c:559 -#, c-format -msgid "%s: not used because `%s' is defined" -msgstr "%s：未使用因为‘%s’已定义" - -#: pch.c:579 -#, c-format -msgid "%s: not used because `__COUNTER__' is invalid" -msgstr "%s：未使用因为‘__COUNTER__’无效" - -#: pch.c:588 -#: pch.c:758 -msgid "while reading precompiled header" -msgstr "在读取预编译头时" - -#: traditional.c:751 -#, c-format -msgid "detected recursion whilst expanding macro \"%s\"" -msgstr "展开宏“%s”时检测到递归" - -#: traditional.c:969 -msgid "syntax error in macro parameter list" -msgstr "宏参数列表语法错误" diff -Nru language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/cpplib-4.5.po language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/cpplib-4.5.po --- language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/cpplib-4.5.po 2012-05-08 22:48:06.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/cpplib-4.5.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,985 +0,0 @@ -# Simplified Chinese translation for cpplib. -# Copyright (C) 2005 Free Software Foundation, Inc. -# This file is distributed under the same license as the gcc package. -# Meng Jie , 2005-2010. -# -msgid "" -msgstr "" -"Project-Id-Version: cpplib 4.5.0\n" -"Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n" -"POT-Creation-Date: 2010-04-06 14:10+0000\n" -"PO-Revision-Date: 2012-04-16 07:39+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: 2012-05-08 07:16+0000\n" -"X-Generator: Launchpad (build 15204)\n" -"X-Poedit-Country: CHINA\n" -"X-Poedit-Language: Chinese\n" - -#: charset.c:674 -#, c-format -msgid "conversion from %s to %s not supported by iconv" -msgstr "iconv 不支持从 %s 到 %s 的转换" - -#: charset.c:677 -msgid "iconv_open" -msgstr "iconv_open" - -#: charset.c:685 -#, c-format -msgid "no iconv implementation, cannot convert from %s to %s" -msgstr "没有 iconv 的实现，无法从 %s 转换到 %s" - -#: charset.c:781 -#, c-format -msgid "character 0x%lx is not in the basic source character set\n" -msgstr "字符 0x%lx 不在基本源字符集中\n" - -#: charset.c:798 -#: charset.c:1444 -msgid "converting to execution character set" -msgstr "转换到可执行文件的字符集" - -#: charset.c:804 -#, c-format -msgid "character 0x%lx is not unibyte in execution character set" -msgstr "字符 0x%lx 在执行字符集中不是单字节的" - -#: charset.c:928 -#, c-format -msgid "Character %x might not be NFKC" -msgstr "字符 %x 可能不是 NFKC" - -#: charset.c:994 -msgid "universal character names are only valid in C++ and C99" -msgstr "Unicode 字符名只在 C++ 和 C99 中有效" - -#: charset.c:997 -#, c-format -msgid "the meaning of '\\%c' is different in traditional C" -msgstr "‘\\%c’的意义与在传统 C 中不同" - -#: charset.c:1006 -msgid "In _cpp_valid_ucn but not a UCN" -msgstr "在 _cpp_valid_ucn 中但不是一个 UCN" - -#: charset.c:1031 -#, c-format -msgid "incomplete universal character name %.*s" -msgstr "不完全的 Unicode 字符名 %.*s" - -#: charset.c:1046 -#, c-format -msgid "%.*s is not a valid universal character" -msgstr "%.*s 不是一个有效的 Unicode 字符" - -#: charset.c:1056 -#: lex.c:488 -msgid "'$' in identifier or number" -msgstr "‘$’出现在标识符或数字中" - -#: charset.c:1066 -#, c-format -msgid "universal character %.*s is not valid in an identifier" -msgstr "Unicode 字符 %.*s 在标识符中无效" - -#: charset.c:1070 -#, c-format -msgid "universal character %.*s is not valid at the start of an identifier" -msgstr "Unicode 字符 %.*s 在标识符开头无效" - -#: charset.c:1102 -#: charset.c:1674 -msgid "converting UCN to source character set" -msgstr "将 UCN 转换到源字符集" - -#: charset.c:1106 -msgid "converting UCN to execution character set" -msgstr "将 UCN 转换到执行字符集" - -#: charset.c:1178 -msgid "the meaning of '\\x' is different in traditional C" -msgstr "‘\\x’的意义与在传统 C 中不同" - -#: charset.c:1195 -msgid "\\x used with no following hex digits" -msgstr "\\x 后没有 16 进制数字" - -#: charset.c:1202 -msgid "hex escape sequence out of range" -msgstr "16 进制转义序列越界" - -#: charset.c:1240 -msgid "octal escape sequence out of range" -msgstr "8 进制转义序列越界" - -#: charset.c:1306 -msgid "the meaning of '\\a' is different in traditional C" -msgstr "‘\\a’的意义与在传统 C 中不同" - -#: charset.c:1313 -#, c-format -msgid "non-ISO-standard escape sequence, '\\%c'" -msgstr "非 ISO 标准的转义序列，‘\\%c’" - -#: charset.c:1321 -#, c-format -msgid "unknown escape sequence: '\\%c'" -msgstr "未知的转义序列：‘\\%c’" - -#: charset.c:1329 -#, c-format -msgid "unknown escape sequence: '\\%s'" -msgstr "未知的转义序列：‘\\%s’" - -#: charset.c:1336 -msgid "converting escape sequence to execution character set" -msgstr "将转义序列转换到执行字符集" - -#: charset.c:1509 -#: charset.c:1573 -msgid "character constant too long for its type" -msgstr "字符常量大小超出其类型" - -#: charset.c:1512 -msgid "multi-character character constant" -msgstr "多字节字符常量" - -#: charset.c:1612 -msgid "empty character constant" -msgstr "空的字符常量" - -#: charset.c:1721 -#, c-format -msgid "failure to convert %s to %s" -msgstr "无法从 %s 转换到 %s" - -#: directives.c:222 -#: directives.c:248 -#, c-format -msgid "extra tokens at end of #%s directive" -msgstr "#%s 指示的末尾有多余的标识符" - -#: directives.c:354 -#, c-format -msgid "#%s is a GCC extension" -msgstr "#%s 是一个 GCC 扩展" - -#: directives.c:358 -#, c-format -msgid "#%s is a deprecated GCC extension" -msgstr "#%s 是一个已过时的 GCC 扩展" - -#: directives.c:372 -msgid "suggest not using #elif in traditional C" -msgstr "建议在传统 C 中不使用 #elif" - -#: directives.c:375 -#, c-format -msgid "traditional C ignores #%s with the # indented" -msgstr "当 # 有缩进时传统 C 忽略 #%s" - -#: directives.c:379 -#, c-format -msgid "suggest hiding #%s from traditional C with an indented #" -msgstr "建议使用缩进的 # 以让 #%s 对传统 C 不可见" - -#: directives.c:405 -msgid "embedding a directive within macro arguments is not portable" -msgstr "将一个指示嵌入宏参数中是不可移植的" - -#: directives.c:425 -msgid "style of line directive is a GCC extension" -msgstr "line 指示的风格是一个 GCC 扩展" - -#: directives.c:480 -#, c-format -msgid "invalid preprocessing directive #%s" -msgstr "无效的预处理指示 #%s" - -#: directives.c:548 -msgid "\"defined\" cannot be used as a macro name" -msgstr "“defined”不能被用作宏名" - -#: directives.c:554 -#, c-format -msgid "\"%s\" cannot be used as a macro name as it is an operator in C++" -msgstr "“%s”不能被用作宏名，因为它是 C++ 中的一个操作符" - -#: directives.c:557 -#, c-format -msgid "no macro name given in #%s directive" -msgstr "#%s 指示中未给出宏名" - -#: directives.c:560 -msgid "macro names must be identifiers" -msgstr "宏名必须是标识符" - -#: directives.c:609 -#, c-format -msgid "undefining \"%s\"" -msgstr "取消对“%s”的定义" - -#: directives.c:664 -msgid "missing terminating > character" -msgstr "缺少结尾的 > 字符" - -#: directives.c:723 -#, c-format -msgid "#%s expects \"FILENAME\" or " -msgstr "#%s 需要 \"FILENAME\" 或 " - -#: directives.c:769 -#, c-format -msgid "empty filename in #%s" -msgstr "#%s 中文件名为空" - -#: directives.c:779 -msgid "#include nested too deeply" -msgstr "#include 嵌套过深" - -#: directives.c:820 -msgid "#include_next in primary source file" -msgstr "#include_next 出现在主源文件中" - -#: directives.c:846 -#, c-format -msgid "invalid flag \"%s\" in line directive" -msgstr "line 指示中有无效的标记“%s”" - -#: directives.c:906 -msgid "unexpected end of file after #line" -msgstr "#line 后未预期的文件结束" - -#: directives.c:909 -#, c-format -msgid "\"%s\" after #line is not a positive integer" -msgstr "#line 后的“%s”不是一个正整数" - -#: directives.c:915 -#: directives.c:917 -msgid "line number out of range" -msgstr "行号超出范围" - -#: directives.c:930 -#: directives.c:1010 -#, c-format -msgid "\"%s\" is not a valid filename" -msgstr "“%s”不是一个有效的文件名" - -#: directives.c:970 -#, c-format -msgid "\"%s\" after # is not a positive integer" -msgstr "# 后的“%s”不是一个正整数" - -#: directives.c:1062 -#, c-format -msgid "%s" -msgstr "%s" - -#: directives.c:1086 -#, c-format -msgid "invalid #%s directive" -msgstr "无效的 #%s 指示" - -#: directives.c:1149 -#, c-format -msgid "" -"registering pragmas in namespace \"%s\" with mismatched name expansion" -msgstr "在命名空间“%s”中注册 pragma 时名称扩展不匹配" - -#: directives.c:1158 -#, c-format -msgid "registering pragma \"%s\" with name expansion and no namespace" -msgstr "pragma “%s”被注册为一个命名扩展，而没有命名空间" - -#: directives.c:1176 -#, c-format -msgid "registering \"%s\" as both a pragma and a pragma namespace" -msgstr "“%s”既被注册为一个pragma 又被注册为一个 pragma 命名空间" - -#: directives.c:1179 -#, c-format -msgid "#pragma %s %s is already registered" -msgstr "#pragma %s %s 已经被注册" - -#: directives.c:1182 -#, c-format -msgid "#pragma %s is already registered" -msgstr "#pragma %s 已经被注册" - -#: directives.c:1212 -msgid "registering pragma with NULL handler" -msgstr "pragma 注册为被 NULL 处理" - -#: directives.c:1424 -msgid "#pragma once in main file" -msgstr "#pragma once 出现在主文件中" - -#: directives.c:1444 -msgid "invalid #pragma push_macro directive" -msgstr "无效的 #pragma push_macro 指示" - -#: directives.c:1483 -msgid "invalid #pragma pop_macro directive" -msgstr "无效的 #pragma pop_macro 指示" - -#: directives.c:1537 -msgid "invalid #pragma GCC poison directive" -msgstr "无效的 #pragma GCC poison 指示" - -#: directives.c:1546 -#, c-format -msgid "poisoning existing macro \"%s\"" -msgstr "对已存在的宏“%s”投毒" - -#: directives.c:1565 -msgid "#pragma system_header ignored outside include file" -msgstr "#pragma system_heade 在包含文件外被忽略" - -#: directives.c:1590 -#, c-format -msgid "cannot find source file %s" -msgstr "找不到源文件 %s" - -#: directives.c:1594 -#, c-format -msgid "current file is older than %s" -msgstr "当前文件早于 %s" - -#: directives.c:1779 -msgid "_Pragma takes a parenthesized string literal" -msgstr "_Pragma 需要一个括起的字符串字面常量" - -#: directives.c:1884 -msgid "#else without #if" -msgstr "#else 没有匹配的 #if" - -#: directives.c:1889 -msgid "#else after #else" -msgstr "#else 出现在 #else 后" - -#: directives.c:1891 -#: directives.c:1924 -msgid "the conditional began here" -msgstr "条件自此开始" - -#: directives.c:1917 -msgid "#elif without #if" -msgstr "#elif 没有匹配的 #if" - -#: directives.c:1922 -msgid "#elif after #else" -msgstr "#elif 出现在 #else 后" - -#: directives.c:1960 -msgid "#endif without #if" -msgstr "#endif 没有匹配的 #if" - -#: directives.c:2040 -msgid "missing '(' after predicate" -msgstr "谓词后缺少‘(’" - -#: directives.c:2055 -msgid "missing ')' to complete answer" -msgstr "完整的答案缺少‘)’" - -#: directives.c:2075 -msgid "predicate's answer is empty" -msgstr "谓词的答案为空" - -#: directives.c:2102 -msgid "assertion without predicate" -msgstr "断言后没有谓词" - -#: directives.c:2105 -msgid "predicate must be an identifier" -msgstr "谓词必须是一个标识符" - -#: directives.c:2191 -#, c-format -msgid "\"%s\" re-asserted" -msgstr "重断言“%s”" - -#: directives.c:2474 -#, c-format -msgid "unterminated #%s" -msgstr "未终止的 #%s" - -#: directives-only.c:222 -#: lex.c:1516 -#: traditional.c:163 -msgid "unterminated comment" -msgstr "未结束的注释" - -#: errors.c:93 -msgid "stdout" -msgstr "stdout" - -#: errors.c:95 -#, c-format -msgid "%s: %s" -msgstr "%s：%s" - -#: expr.c:282 -msgid "too many decimal points in number" -msgstr "数字中有太多小数点" - -#: expr.c:311 -#: expr.c:396 -msgid "fixed-point constants are a GCC extension" -msgstr "定点常量是一个 GCC 扩展" - -#: expr.c:324 -#, c-format -msgid "invalid digit \"%c\" in binary constant" -msgstr "二进制常量中有无效数字“%c”" - -#: expr.c:326 -#, c-format -msgid "invalid digit \"%c\" in octal constant" -msgstr "8 进制常量中有非法字符“%c”" - -#: expr.c:334 -msgid "invalid prefix \"0b\" for floating constant" -msgstr "浮点常量的“0b”前缀无效" - -#: expr.c:339 -msgid "no digits in hexadecimal floating constant" -msgstr "16 进制浮点常量中没有数字" - -#: expr.c:343 -msgid "use of C99 hexadecimal floating constant" -msgstr "使用 C99 式的 16 进制浮点常量" - -#: expr.c:352 -msgid "exponent has no digits" -msgstr "指数部分没有数字" - -#: expr.c:359 -msgid "hexadecimal floating constants require an exponent" -msgstr "16 进制浮点常量需要指数部分" - -#: expr.c:365 -#, c-format -msgid "invalid suffix \"%.*s\" on floating constant" -msgstr "浮点常量的“%.*s”后缀无效" - -#: expr.c:375 -#: expr.c:424 -#, c-format -msgid "traditional C rejects the \"%.*s\" suffix" -msgstr "传统 C 不接受“%.*s”后缀" - -#: expr.c:383 -msgid "suffix for double constant is a GCC extension" -msgstr "双精度常量后缀是一个 GCC 扩展" - -#: expr.c:389 -#, c-format -msgid "invalid suffix \"%.*s\" with hexadecimal floating constant" -msgstr "十六进制浮点常量的“%.*s”后缀无效" - -#: expr.c:400 -msgid "decimal float constants are a GCC extension" -msgstr "十进制浮点常量是一个 GCC 扩展" - -#: expr.c:410 -#, c-format -msgid "invalid suffix \"%.*s\" on integer constant" -msgstr "整数常量的“%.*s”后缀无效" - -#: expr.c:433 -msgid "use of C++0x long long integer constant" -msgstr "使用 C++0x long long 整数常量" - -#: expr.c:442 -msgid "imaginary constants are a GCC extension" -msgstr "虚数常量是一个 GCC 扩展" - -#: expr.c:445 -msgid "binary constants are a GCC extension" -msgstr "二进制常量是一个 GCC 扩展" - -#: expr.c:538 -msgid "integer constant is too large for its type" -msgstr "整数常量值超出其类型" - -#: expr.c:569 -msgid "integer constant is so large that it is unsigned" -msgstr "整数常量太大，认定为 unsigned" - -#: expr.c:664 -msgid "missing ')' after \"defined\"" -msgstr "“defined” 后出现‘)’" - -#: expr.c:671 -msgid "operator \"defined\" requires an identifier" -msgstr "操作符“defined”需要一个标识符" - -#: expr.c:679 -#, c-format -msgid "(\"%s\" is an alternative token for \"%s\" in C++)" -msgstr "(在 C++ 中“%s”会是“%s”的替代标识符)" - -#: expr.c:689 -msgid "this use of \"defined\" may not be portable" -msgstr "使用“defined”可能不利于移植" - -#: expr.c:742 -msgid "floating constant in preprocessor expression" -msgstr "浮点常量出现在预处理表达式中" - -#: expr.c:748 -msgid "imaginary number in preprocessor expression" -msgstr "预处理表达式中出现虚数" - -#: expr.c:795 -#, c-format -msgid "\"%s\" is not defined" -msgstr "“%s”未定义" - -#: expr.c:807 -msgid "assertions are a GCC extension" -msgstr "断言是一个 GCC 扩展" - -#: expr.c:810 -msgid "assertions are a deprecated extension" -msgstr "断言是一个已过时的 GCC 扩展" - -#: expr.c:943 -#: expr.c:972 -#, c-format -msgid "missing binary operator before token \"%s\"" -msgstr "标识符“%s”前缺少二元运算符" - -#: expr.c:963 -#, c-format -msgid "token \"%s\" is not valid in preprocessor expressions" -msgstr "标识符“%s”在预处理表达式中无效" - -#: expr.c:980 -msgid "missing expression between '(' and ')'" -msgstr "‘(’与‘)’之间缺少表达式" - -#: expr.c:983 -#, c-format -msgid "%s with no expression" -msgstr "%s 后没有表达式" - -#: expr.c:986 -#, c-format -msgid "operator '%s' has no right operand" -msgstr "操作符‘%s’没有右操作数" - -#: expr.c:991 -#, c-format -msgid "operator '%s' has no left operand" -msgstr "操作符‘%s’没有左操作数" - -#: expr.c:1017 -msgid " ':' without preceding '?'" -msgstr " ‘:’前没有‘?’" - -#: expr.c:1045 -#, c-format -msgid "unbalanced stack in %s" -msgstr "%s 中堆栈不平衡" - -#: expr.c:1065 -#, c-format -msgid "impossible operator '%u'" -msgstr "不可能的操作‘%u’" - -#: expr.c:1166 -msgid "missing ')' in expression" -msgstr "表达式中缺少‘)’" - -#: expr.c:1195 -msgid "'?' without following ':'" -msgstr "‘?’后没有‘:’" - -#: expr.c:1205 -msgid "integer overflow in preprocessor expression" -msgstr "预处理表达式中整数溢出" - -#: expr.c:1210 -msgid "missing '(' in expression" -msgstr "表达式中缺少‘(’" - -#: expr.c:1242 -#, c-format -msgid "the left operand of \"%s\" changes sign when promoted" -msgstr "“%s”的左操作数在提升时变换了符号" - -#: expr.c:1247 -#, c-format -msgid "the right operand of \"%s\" changes sign when promoted" -msgstr "“%s”的右操作数在提升时变换了符号" - -#: expr.c:1506 -msgid "traditional C rejects the unary plus operator" -msgstr "传统 C 不接受单目 + 运算符" - -#: expr.c:1589 -msgid "comma operator in operand of #if" -msgstr "#if 操作数中出现逗号" - -#: expr.c:1725 -msgid "division by zero in #if" -msgstr "#if 中用零做除数" - -#: files.c:463 -msgid "NULL directory in find_file" -msgstr "find_file 中有 NULL 目录" - -#: files.c:500 -msgid "one or more PCH files were found, but they were invalid" -msgstr "找到一个或多个 PCH 文件，但它们是无效的" - -#: files.c:503 -msgid "use -Winvalid-pch for more information" -msgstr "使用 -Winvalid-pch 以获得更多信息" - -#: files.c:594 -#, c-format -msgid "%s is a block device" -msgstr "%s 是一个块设备" - -#: files.c:611 -#, c-format -msgid "%s is too large" -msgstr "%s 过大" - -#: files.c:646 -#, c-format -msgid "%s is shorter than expected" -msgstr "%s 短于预期" - -#: files.c:881 -#, c-format -msgid "no include path in which to search for %s" -msgstr "没有包含路径可供搜索 %s" - -#: files.c:1306 -msgid "Multiple include guards may be useful for:\n" -msgstr "多个防止重包含可能对其有用：\n" - -#: init.c:485 -msgid "cppchar_t must be an unsigned type" -msgstr "cppchar_t 必须是无符号型" - -#: init.c:489 -#, c-format -msgid "" -"preprocessor arithmetic has maximum precision of %lu bits; target requires " -"%lu bits" -msgstr "预处理算术的最高精度为 %lu 位；目标需要 %lu 位" - -#: init.c:496 -msgid "CPP arithmetic must be at least as precise as a target int" -msgstr "CPP 算术必须至少具有目标 int 的精度" - -#: init.c:499 -msgid "target char is less than 8 bits wide" -msgstr "目标 char 短于 8 位" - -#: init.c:503 -msgid "target wchar_t is narrower than target char" -msgstr "目录 wchar_t 短于目标 char" - -#: init.c:507 -msgid "target int is narrower than target char" -msgstr "目标 int 短于目标 char" - -#: init.c:512 -msgid "CPP half-integer narrower than CPP character" -msgstr "CPP 半整数短于 CPP 字符" - -#: init.c:516 -#, c-format -msgid "" -"CPP on this host cannot handle wide character constants over %lu bits, but " -"the target requires %lu bits" -msgstr "在此宿主机上，CPP 不能处理长于 %lu 位的宽字符常量，但目标需要 %lu 位" - -#: lex.c:285 -msgid "backslash and newline separated by space" -msgstr "反斜杠和换行为空格所分隔" - -#: lex.c:290 -msgid "backslash-newline at end of file" -msgstr "反斜杠续行出现在文件末尾" - -#: lex.c:305 -#, c-format -msgid "trigraph ??%c converted to %c" -msgstr "三元符 ??%c 转换为 %c" - -#: lex.c:312 -#, c-format -msgid "trigraph ??%c ignored, use -trigraphs to enable" -msgstr "三元符 ??%c 被忽略，请使用 -trigraphs 来启用" - -#: lex.c:360 -msgid "\"/*\" within comment" -msgstr "“/*”出现在注释中" - -#: lex.c:418 -#, c-format -msgid "%s in preprocessing directive" -msgstr "预处理指示中出现 %s" - -#: lex.c:427 -msgid "null character(s) ignored" -msgstr "忽略空字符" - -#: lex.c:464 -#, c-format -msgid "`%.*s' is not in NFKC" -msgstr "‘%.*s’不在 NFKC 中" - -#: lex.c:467 -#, c-format -msgid "`%.*s' is not in NFC" -msgstr "‘%.*s’不在 NFC 中" - -#: lex.c:535 -#: lex.c:612 -#, c-format -msgid "attempt to use poisoned \"%s\"" -msgstr "试图使用有毒的“%s”" - -#: lex.c:543 -#: lex.c:620 -msgid "__VA_ARGS__ can only appear in the expansion of a C99 variadic macro" -msgstr "__VA_ARGS__ 只能出现在 C99 可变参数宏的展开中" - -#: lex.c:549 -#: lex.c:626 -#, c-format -msgid "identifier \"%s\" is a special operator name in C++" -msgstr "标识符“%s”是 C++ 中的一个特殊操作符" - -#: lex.c:771 -msgid "raw string delimiter longer than 16 characters" -msgstr "原始字符串分隔符长过 16 个字符" - -#: lex.c:774 -#, c-format -msgid "invalid character '%c' in raw string delimiter" -msgstr "原始字符串分隔符中有无效字符‘%c’" - -#: lex.c:895 -#: lex.c:917 -msgid "unterminated raw string" -msgstr "未终止的原始字符串" - -#: lex.c:932 -#: lex.c:1031 -msgid "null character(s) preserved in literal" -msgstr "空字符将保留在字面字符串中" - -#: lex.c:1034 -#, c-format -msgid "missing terminating %c character" -msgstr "缺少结尾的 %c 字符" - -#: lex.c:1527 -msgid "C++ style comments are not allowed in ISO C90" -msgstr "C++ 风格的注释在 ISO C90 中不被允许" - -#: lex.c:1529 -msgid "(this will be reported only once per input file)" -msgstr "(此警告为每个输入文件只报告一次)" - -#: lex.c:1534 -msgid "multi-line comment" -msgstr "多行注释" - -#: lex.c:1854 -#, c-format -msgid "unspellable token %s" -msgstr "无法拼出的标识符 %s" - -#: macro.c:87 -#, c-format -msgid "macro \"%s\" is not used" -msgstr "宏“%s”未被使用" - -#: macro.c:126 -#: macro.c:321 -#, c-format -msgid "invalid built-in macro \"%s\"" -msgstr "无效的内建宏“%s”" - -#: macro.c:160 -msgid "could not determine file timestamp" -msgstr "无法决定文件的时间戳" - -#: macro.c:256 -msgid "could not determine date and time" -msgstr "无法决定日期与时间" - -#: macro.c:272 -msgid "__COUNTER__ expanded inside directive with -fdirectives-only" -msgstr "带 -fdirectives-only 时 __COUNTER__ 在指示中扩展" - -#: macro.c:430 -msgid "invalid string literal, ignoring final '\\'" -msgstr "无效的字面字符串，忽略最后的‘\\’" - -#: macro.c:490 -#, c-format -msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token" -msgstr "毗连“%s”和“%s”不能给出一个有效的预处理标识符" - -#: macro.c:565 -msgid "ISO C99 requires rest arguments to be used" -msgstr "ISO C99 需要使用剩余的参数" - -#: macro.c:570 -#, c-format -msgid "macro \"%s\" requires %u arguments, but only %u given" -msgstr "宏“%s”需要 %u 个参数，但只给出了 %u 个" - -#: macro.c:575 -#, c-format -msgid "macro \"%s\" passed %u arguments, but takes just %u" -msgstr "宏“%s”传递了 %u 个参数，但只需要 %u 个" - -#: macro.c:734 -#: traditional.c:681 -#, c-format -msgid "unterminated argument list invoking macro \"%s\"" -msgstr "调用宏“%s”时参数列表未终止" - -#: macro.c:864 -#, c-format -msgid "" -"function-like macro \"%s\" must be used with arguments in traditional C" -msgstr "类似函数的宏“%s”在传统 C 中必须与参数一起使用" - -#: macro.c:1038 -#, c-format -msgid "" -"invoking macro %s argument %d: empty macro arguments are undefined in ISO " -"C90 and ISO C++98" -msgstr "调用宏 %s 的参数 %d：空的宏参数未被 ISO C90 和 ISO C++98 定义" - -#: macro.c:1501 -#, c-format -msgid "duplicate macro parameter \"%s\"" -msgstr "重复的宏参数“%s”" - -#: macro.c:1547 -#, c-format -msgid "\"%s\" may not appear in macro parameter list" -msgstr "“%s”不能出现在宏参数列表中" - -#: macro.c:1555 -msgid "macro parameters must be comma-separated" -msgstr "宏参数必须由逗号隔开" - -#: macro.c:1572 -msgid "parameter name missing" -msgstr "缺少形参名" - -#: macro.c:1589 -msgid "anonymous variadic macros were introduced in C99" -msgstr "匿名可变参数宏在 C99 中被引入" - -#: macro.c:1594 -msgid "ISO C does not permit named variadic macros" -msgstr "ISO C 不允许有名的可变参数宏" - -#: macro.c:1603 -msgid "missing ')' in macro parameter list" -msgstr "在宏参数表中缺少‘)’" - -#: macro.c:1652 -msgid "'##' cannot appear at either end of a macro expansion" -msgstr "‘##’不能出现在宏展开的两端" - -#: macro.c:1687 -msgid "ISO C99 requires whitespace after the macro name" -msgstr "ISO C99 要求宏名后必须有空白" - -#: macro.c:1711 -msgid "missing whitespace after the macro name" -msgstr "宏名后缺少空白" - -#: macro.c:1745 -msgid "'#' is not followed by a macro parameter" -msgstr "‘#’后没有宏参数" - -#: macro.c:1900 -#, c-format -msgid "\"%s\" redefined" -msgstr "“%s”重定义" - -#: macro.c:1905 -msgid "this is the location of the previous definition" -msgstr "这是先前定义的位置" - -#: macro.c:1966 -#, c-format -msgid "macro argument \"%s\" would be stringified in traditional C" -msgstr "宏参数“%s”将在传统 C 中被字符串化" - -#: macro.c:1989 -#, c-format -msgid "invalid hash type %d in cpp_macro_definition" -msgstr "cpp_macro_definition 中有无效的散列类型 %d" - -#: pch.c:86 -#: pch.c:334 -#: pch.c:346 -#: pch.c:364 -#: pch.c:370 -#: pch.c:379 -#: pch.c:386 -msgid "while writing precompiled header" -msgstr "在写入预编译头时" - -#: pch.c:617 -#, c-format -msgid "%s: not used because `%.*s' is poisoned" -msgstr "%s：未使用因为‘%.*s’已被投毒" - -#: pch.c:639 -#, c-format -msgid "%s: not used because `%.*s' not defined" -msgstr "%s：未使用因为‘%.*s’未定义" - -#: pch.c:651 -#, c-format -msgid "%s: not used because `%.*s' defined as `%s' not `%.*s'" -msgstr "%s：未使用因为‘%.*s’被定义为‘%s’而非‘%*.s’" - -#: pch.c:692 -#, c-format -msgid "%s: not used because `%s' is defined" -msgstr "%s：未使用因为‘%s’已定义" - -#: pch.c:712 -#, c-format -msgid "%s: not used because `__COUNTER__' is invalid" -msgstr "%s：未使用因为‘__COUNTER__’无效" - -#: pch.c:721 -#: pch.c:894 -msgid "while reading precompiled header" -msgstr "在读取预编译头时" - -#: traditional.c:751 -#, c-format -msgid "detected recursion whilst expanding macro \"%s\"" -msgstr "展开宏“%s”时检测到递归" - -#: traditional.c:969 -msgid "syntax error in macro parameter list" -msgstr "宏参数列表语法错误" diff -Nru language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/cpplib-4.6.po language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/cpplib-4.6.po --- language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/cpplib-4.6.po 2012-05-08 22:48:08.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/cpplib-4.6.po 2013-01-29 09:36:59.000000000 +0000 @@ -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: 2012-05-08 07:36+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2013-01-28 16:32+0000\n" +"X-Generator: Launchpad (build 16451)\n" "X-Poedit-Country: CHINA\n" "Language: zh_CN\n" "X-Poedit-Language: Chinese\n" diff -Nru language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/cpplib.po language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/cpplib.po --- language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/cpplib.po 2012-05-08 22:47:52.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/cpplib.po 2013-01-29 09:37:07.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: 2012-05-08 05:19+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2013-01-28 14:18+0000\n" +"X-Generator: Launchpad (build 16451)\n" #: charset.c:654 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/cracklib.po language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/cracklib.po --- language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/cracklib.po 2012-05-08 22:47:26.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/cracklib.po 2013-01-29 09:37:09.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: 2012-05-08 02:08+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2013-01-28 10:48+0000\n" +"X-Generator: Launchpad (build 16451)\n" #: lib/fascist.c:550 msgid "you are not registered in the password file" diff -Nru language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/cryptsetup-luks.po language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/cryptsetup-luks.po --- language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/cryptsetup-luks.po 2012-05-08 22:47:38.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/cryptsetup-luks.po 2013-01-29 09:37: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: 2012-05-08 03:33+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2013-01-28 12:27+0000\n" +"X-Generator: Launchpad (build 16451)\n" #: luks/keyencryption.c:61 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/cryptsetup.po language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/cryptsetup.po --- language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/cryptsetup.po 2012-05-08 22:47:38.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/cryptsetup.po 2013-01-29 09:37:12.000000000 +0000 @@ -14,14 +14,14 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-08 03:33+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2013-01-28 12:26+0000\n" +"X-Generator: Launchpad (build 16451)\n" #: lib/libdevmapper.c:184 msgid "Cannot initialize device-mapper. Is dm_mod kernel module loaded?\n" msgstr "" -#: lib/libdevmapper.c:412 +#: lib/libdevmapper.c:423 #, c-format msgid "DM-UUID for device %s was truncated.\n" msgstr "" @@ -42,177 +42,177 @@ msgid "Fatal error during RNG initialisation.\n" msgstr "" -#: lib/random.c:194 +#: lib/random.c:204 msgid "Unknown RNG quality requested.\n" msgstr "" -#: lib/random.c:199 +#: lib/random.c:209 #, c-format msgid "Error %d reading from RNG: %s\n" msgstr "" -#: lib/setup.c:162 +#: lib/setup.c:163 msgid "Cannot initialize crypto RNG backend.\n" msgstr "" -#: lib/setup.c:168 +#: lib/setup.c:169 msgid "Cannot initialize crypto backend.\n" msgstr "" -#: lib/setup.c:190 +#: lib/setup.c:192 #, c-format msgid "Hash algorithm %s not supported.\n" msgstr "" -#: lib/setup.c:193 lib/loopaes/loopaes.c:87 +#: lib/setup.c:195 lib/loopaes/loopaes.c:88 #, c-format msgid "Key processing error (using hash %s).\n" msgstr "" -#: lib/setup.c:229 +#: lib/setup.c:231 msgid "All key slots full.\n" msgstr "" -#: lib/setup.c:236 +#: lib/setup.c:238 #, c-format msgid "Key slot %d is invalid, please select between 0 and %d.\n" msgstr "" -#: lib/setup.c:242 +#: lib/setup.c:244 #, c-format msgid "Key slot %d is full, please select another one.\n" msgstr "" -#: lib/setup.c:340 +#: lib/setup.c:347 #, c-format msgid "Enter passphrase for %s: " msgstr "" -#: lib/setup.c:496 +#: lib/setup.c:507 msgid "Cannot find a free loopback device.\n" msgstr "" -#: lib/setup.c:504 +#: lib/setup.c:515 msgid "" "Attaching loopback device failed (loop device with autoclear flag is " "required).\n" msgstr "" -#: lib/setup.c:560 +#: lib/setup.c:571 #, c-format msgid "LUKS header detected but device %s is too small.\n" msgstr "" -#: lib/setup.c:576 lib/setup.c:1022 +#: lib/setup.c:587 lib/setup.c:1075 msgid "This operation is not supported for this device type.\n" msgstr "" -#: lib/setup.c:618 lib/setup.c:989 lib/setup.c:1724 +#: lib/setup.c:650 lib/setup.c:1042 lib/setup.c:1812 #, c-format msgid "Device %s is not active.\n" msgstr "" -#: lib/setup.c:636 +#: lib/setup.c:668 #, c-format msgid "Underlying device for crypt device %s disappeared.\n" msgstr "" -#: lib/setup.c:750 +#: lib/setup.c:782 msgid "Invalid plain crypt parameters.\n" msgstr "" -#: lib/setup.c:755 lib/setup.c:860 +#: lib/setup.c:787 lib/setup.c:892 msgid "Invalid key size.\n" msgstr "" -#: lib/setup.c:796 +#: lib/setup.c:828 msgid "Can't format LUKS without device.\n" msgstr "" -#: lib/setup.c:834 +#: lib/setup.c:866 #, c-format msgid "Cannot format device %s which is still in use.\n" msgstr "" -#: lib/setup.c:837 +#: lib/setup.c:869 #, c-format msgid "Cannot wipe header on device %s.\n" msgstr "" -#: lib/setup.c:855 +#: lib/setup.c:887 msgid "Can't format LOOPAES without device.\n" msgstr "" -#: lib/setup.c:915 +#: lib/setup.c:947 #, c-format msgid "Unknown crypt device type %s requested.\n" msgstr "" -#: lib/setup.c:1037 +#: lib/setup.c:1090 msgid "Do you really want to change UUID of device?" msgstr "" -#: lib/setup.c:1122 lib/setup.c:1169 lib/setup.c:1217 lib/setup.c:1272 -#: lib/setup.c:1346 lib/setup.c:1415 lib/setup.c:1461 lib/setup.c:1784 -#: lib/setup.c:1889 lib/setup.c:2028 +#: lib/setup.c:1175 lib/setup.c:1222 lib/setup.c:1271 lib/setup.c:1337 +#: lib/setup.c:1413 lib/setup.c:1494 lib/setup.c:1540 lib/setup.c:1877 +#: lib/setup.c:1982 lib/setup.c:2121 msgid "This operation is supported only for LUKS device.\n" msgstr "" -#: lib/setup.c:1129 +#: lib/setup.c:1182 #, c-format msgid "Volume %s is not active.\n" msgstr "" -#: lib/setup.c:1141 +#: lib/setup.c:1194 #, c-format msgid "Volume %s is already suspended.\n" msgstr "" -#: lib/setup.c:1179 lib/setup.c:1227 +#: lib/setup.c:1232 lib/setup.c:1281 #, c-format msgid "Volume %s is not suspended.\n" msgstr "" -#: lib/setup.c:1234 lib/setup.c:1585 lib/setup.c:1599 src/cryptsetup.c:294 +#: lib/setup.c:1288 lib/setup.c:1665 lib/setup.c:1679 src/cryptsetup.c:343 msgid "Enter passphrase: " msgstr "" -#: lib/setup.c:1286 lib/setup.c:1360 +#: lib/setup.c:1351 lib/setup.c:1427 msgid "Cannot add key slot, all slots disabled and no volume key provided.\n" msgstr "" -#: lib/setup.c:1295 lib/setup.c:1366 lib/setup.c:1370 +#: lib/setup.c:1360 lib/setup.c:1433 lib/setup.c:1437 msgid "Enter any passphrase: " msgstr "" -#: lib/setup.c:1312 lib/setup.c:1383 lib/setup.c:1387 lib/setup.c:1438 +#: lib/setup.c:1377 lib/setup.c:1450 lib/setup.c:1454 lib/setup.c:1517 msgid "Enter new passphrase for key slot: " msgstr "" -#: lib/setup.c:1429 lib/setup.c:1678 lib/setup.c:1691 lib/setup.c:1795 +#: lib/setup.c:1508 lib/setup.c:1769 lib/setup.c:1782 lib/setup.c:1888 msgid "Volume key does not match the volume.\n" msgstr "" -#: lib/setup.c:1467 +#: lib/setup.c:1546 #, c-format msgid "Key slot %d is invalid.\n" msgstr "" -#: lib/setup.c:1472 +#: lib/setup.c:1551 #, c-format msgid "Key slot %d is not used.\n" msgstr "" -#: lib/setup.c:1502 lib/setup.c:1573 lib/setup.c:1654 +#: lib/setup.c:1581 lib/setup.c:1653 lib/setup.c:1745 #, c-format msgid "Device %s already exists.\n" msgstr "" -#: lib/setup.c:1665 +#: lib/setup.c:1756 msgid "Incorrect volume key specified for plain device.\n" msgstr "" -#: lib/setup.c:1696 +#: lib/setup.c:1787 msgid "Device type is not properly initialised.\n" msgstr "" @@ -221,20 +221,20 @@ msgid "Device %s is busy.\n" msgstr "" -#: lib/setup.c:1728 +#: lib/setup.c:1816 #, c-format msgid "Invalid device %s.\n" msgstr "" -#: lib/setup.c:1751 +#: lib/setup.c:1844 msgid "Volume key buffer too small.\n" msgstr "" -#: lib/setup.c:1759 +#: lib/setup.c:1852 msgid "Cannot retrieve volume key for plain device.\n" msgstr "" -#: lib/setup.c:1765 +#: lib/setup.c:1858 #, c-format msgid "This operation is not supported for %s crypt device.\n" msgstr "" @@ -286,7 +286,7 @@ msgid "Device %s has zero size.\n" msgstr "" -#: lib/utils.c:415 lib/luks1/keymanage.c:428 +#: lib/utils.c:415 lib/luks1/keymanage.c:532 #, c-format msgid "Device %s is too small.\n" msgstr "" @@ -297,49 +297,49 @@ "Cannot use device %s (crypt segments overlaps or in use by another device).\n" msgstr "" -#: lib/utils.c:450 +#: lib/utils.c:439 msgid "WARNING!!! Possibly insecure memory. Are you root?\n" msgstr "" -#: lib/utils.c:456 +#: lib/utils.c:445 msgid "Cannot get process priority.\n" msgstr "" -#: lib/utils.c:459 lib/utils.c:472 +#: lib/utils.c:448 lib/utils.c:461 #, c-format msgid "setpriority %d failed: %s\n" msgstr "" -#: lib/utils.c:470 +#: lib/utils.c:459 msgid "Cannot unlock memory.\n" msgstr "" -#: lib/utils_crypt.c:212 lib/utils_crypt.c:225 lib/utils_crypt.c:316 -#: lib/utils_crypt.c:325 +#: lib/utils_crypt.c:221 lib/utils_crypt.c:234 lib/utils_crypt.c:338 +#: lib/utils_crypt.c:354 msgid "Out of memory while reading passphrase.\n" msgstr "" -#: lib/utils_crypt.c:217 lib/utils_crypt.c:232 +#: lib/utils_crypt.c:226 lib/utils_crypt.c:241 msgid "Error reading passphrase from terminal.\n" msgstr "" -#: lib/utils_crypt.c:230 +#: lib/utils_crypt.c:239 msgid "Verify passphrase: " msgstr "" -#: lib/utils_crypt.c:237 +#: lib/utils_crypt.c:246 msgid "Passphrases do not match.\n" msgstr "" -#: lib/utils_crypt.c:292 +#: lib/utils_crypt.c:306 msgid "Failed to open key file.\n" msgstr "" -#: lib/utils_crypt.c:301 +#: lib/utils_crypt.c:315 msgid "Failed to stat key file.\n" msgstr "" -#: lib/utils_crypt.c:333 +#: lib/utils_crypt.c:362 msgid "Error reading passphrase.\n" msgstr "" @@ -347,24 +347,24 @@ msgid "Maximum keyfile size exceeeded.\n" msgstr "" -#: lib/utils_crypt.c:356 +#: lib/utils_crypt.c:385 msgid "Cannot read requested amount of data.\n" msgstr "" -#: lib/luks1/keyencryption.c:75 +#: lib/luks1/keyencryption.c:79 #, c-format msgid "Unable to obtain sector size for %s" msgstr "不能为%s获得扇区大小" -#: lib/luks1/keyencryption.c:102 +#: lib/luks1/keyencryption.c:106 msgid "Key size in XTS mode must be 256 or 512 bits.\n" msgstr "" -#: lib/luks1/keyencryption.c:125 +#: lib/luks1/keyencryption.c:129 msgid "Failed to obtain device mapper directory." msgstr "获取设备映射目录失败" -#: lib/luks1/keyencryption.c:141 +#: lib/luks1/keyencryption.c:145 #, c-format msgid "" "Failed to setup dm-crypt key mapping for device %s.\n" @@ -372,390 +372,390 @@ "%s" msgstr "" -#: lib/luks1/keyencryption.c:151 +#: lib/luks1/keyencryption.c:155 msgid "Failed to open temporary keystore device.\n" msgstr "" -#: lib/luks1/keyencryption.c:158 +#: lib/luks1/keyencryption.c:162 msgid "Failed to access temporary keystore device.\n" msgstr "" -#: lib/luks1/keymanage.c:148 +#: lib/luks1/keymanage.c:149 #, c-format msgid "Requested file %s already exist.\n" msgstr "" -#: lib/luks1/keymanage.c:168 lib/luks1/keymanage.c:311 +#: lib/luks1/keymanage.c:169 lib/luks1/keymanage.c:399 #, c-format msgid "Device %s is not a valid LUKS device.\n" msgstr "" -#: lib/luks1/keymanage.c:188 +#: lib/luks1/keymanage.c:189 #, c-format msgid "Cannot write header backup file %s.\n" msgstr "" -#: lib/luks1/keymanage.c:215 +#: lib/luks1/keymanage.c:216 #, c-format msgid "Backup file %s doesn't exist.\n" msgstr "" -#: lib/luks1/keymanage.c:223 +#: lib/luks1/keymanage.c:224 msgid "Backup file doesn't contain valid LUKS header.\n" msgstr "" -#: lib/luks1/keymanage.c:236 +#: lib/luks1/keymanage.c:237 #, c-format msgid "Cannot open header backup file %s.\n" msgstr "" -#: lib/luks1/keymanage.c:242 +#: lib/luks1/keymanage.c:243 #, c-format msgid "Cannot read header backup file %s.\n" msgstr "" -#: lib/luks1/keymanage.c:253 +#: lib/luks1/keymanage.c:254 msgid "" "Data offset or key size differs on device and backup, restore failed.\n" msgstr "" -#: lib/luks1/keymanage.c:261 +#: lib/luks1/keymanage.c:262 #, c-format msgid "Device %s %s%s" msgstr "" -#: lib/luks1/keymanage.c:262 +#: lib/luks1/keymanage.c:263 msgid "" "does not contain LUKS header. Replacing header can destroy data on that " "device." msgstr "" -#: lib/luks1/keymanage.c:263 +#: lib/luks1/keymanage.c:264 msgid "" "already contains LUKS header. Replacing header will destroy existing " "keyslots." msgstr "" -#: lib/luks1/keymanage.c:264 +#: lib/luks1/keymanage.c:265 msgid "" "\n" "WARNING: real device header has different UUID than backup!" msgstr "" -#: lib/luks1/keymanage.c:279 lib/luks1/keymanage.c:401 -#: lib/luks1/keymanage.c:434 +#: lib/luks1/keymanage.c:280 lib/luks1/keymanage.c:504 +#: lib/luks1/keymanage.c:538 #, c-format msgid "Cannot open device %s.\n" msgstr "" -#: lib/luks1/keymanage.c:314 +#: lib/luks1/keymanage.c:402 #, c-format msgid "Unsupported LUKS version %d.\n" msgstr "" -#: lib/luks1/keymanage.c:317 lib/luks1/keymanage.c:506 +#: lib/luks1/keymanage.c:408 lib/luks1/keymanage.c:610 #, c-format msgid "Requested LUKS hash %s is not supported.\n" msgstr "" -#: lib/luks1/keymanage.c:330 +#: lib/luks1/keymanage.c:423 #, c-format msgid "LUKS keyslot %u is invalid.\n" msgstr "" -#: lib/luks1/keymanage.c:373 +#: lib/luks1/keymanage.c:471 #, c-format msgid "Cannot open file %s.\n" msgstr "" -#: lib/luks1/keymanage.c:455 +#: lib/luks1/keymanage.c:559 #, c-format msgid "Error during update of LUKS header on device %s.\n" msgstr "" -#: lib/luks1/keymanage.c:462 +#: lib/luks1/keymanage.c:566 #, c-format msgid "Error re-reading LUKS header after update on device %s.\n" msgstr "" -#: lib/luks1/keymanage.c:474 +#: lib/luks1/keymanage.c:578 #, c-format msgid "Not compatible PBKDF2 options (using hash algorithm %s).\n" msgstr "" -#: lib/luks1/keymanage.c:511 lib/luks1/keymanage.c:593 +#: lib/luks1/keymanage.c:615 lib/luks1/keymanage.c:697 msgid "Wrong LUKS UUID format provided.\n" msgstr "" -#: lib/luks1/keymanage.c:536 +#: lib/luks1/keymanage.c:640 msgid "Cannot create LUKS header: reading random salt failed.\n" msgstr "" -#: lib/luks1/keymanage.c:553 +#: lib/luks1/keymanage.c:657 #, c-format msgid "Cannot create LUKS header: header digest failed (using hash %s).\n" msgstr "" -#: lib/luks1/keymanage.c:618 +#: lib/luks1/keymanage.c:722 #, c-format msgid "Key slot %d active, purge first.\n" msgstr "" -#: lib/luks1/keymanage.c:623 +#: lib/luks1/keymanage.c:727 #, c-format msgid "Key slot %d material includes too few stripes. Header manipulation?\n" msgstr "" -#: lib/luks1/keymanage.c:690 +#: lib/luks1/keymanage.c:794 msgid "Failed to write to key storage.\n" msgstr "" -#: lib/luks1/keymanage.c:775 +#: lib/luks1/keymanage.c:879 msgid "Failed to read from key storage.\n" msgstr "" -#: lib/luks1/keymanage.c:785 +#: lib/luks1/keymanage.c:889 #, c-format msgid "Key slot %d unlocked.\n" msgstr "" -#: lib/luks1/keymanage.c:821 src/cryptsetup.c:644 src/cryptsetup.c:827 +#: lib/luks1/keymanage.c:925 src/cryptsetup.c:732 src/cryptsetup.c:916 msgid "No key available with this passphrase.\n" msgstr "" -#: lib/luks1/keymanage.c:839 +#: lib/luks1/keymanage.c:943 #, c-format msgid "Key slot %d is invalid, please select keyslot between 0 and %d.\n" msgstr "" -#: lib/luks1/keymanage.c:853 +#: lib/luks1/keymanage.c:957 #, c-format msgid "Cannot wipe device %s.\n" msgstr "" -#: lib/loopaes/loopaes.c:142 +#: lib/loopaes/loopaes.c:143 msgid "Detected not yet supported GPG encrypted keyfile.\n" msgstr "" -#: lib/loopaes/loopaes.c:143 +#: lib/loopaes/loopaes.c:144 msgid "Please use gpg --decrypt | cryptsetup --keyfile=- ...\n" msgstr "" -#: lib/loopaes/loopaes.c:175 +#: lib/loopaes/loopaes.c:176 msgid "Incompatible loop-AES keyfile detected.\n" msgstr "" -#: lib/loopaes/loopaes.c:225 +#: lib/loopaes/loopaes.c:226 msgid "Kernel doesn't support loop-AES compatible mapping.\n" msgstr "" -#: src/cryptsetup.c:101 +#: src/cryptsetup.c:105 msgid " " msgstr "<名称> <设备>" -#: src/cryptsetup.c:101 +#: src/cryptsetup.c:105 msgid "create device" msgstr "创建设备" -#: src/cryptsetup.c:102 src/cryptsetup.c:103 src/cryptsetup.c:104 -#: src/cryptsetup.c:113 src/cryptsetup.c:120 +#: src/cryptsetup.c:106 src/cryptsetup.c:107 src/cryptsetup.c:108 +#: src/cryptsetup.c:118 src/cryptsetup.c:125 msgid "" msgstr "<名称>" -#: src/cryptsetup.c:102 +#: src/cryptsetup.c:106 msgid "remove device" msgstr "删除设备" -#: src/cryptsetup.c:103 +#: src/cryptsetup.c:107 msgid "resize active device" msgstr "改变激活分区大小" -#: src/cryptsetup.c:104 +#: src/cryptsetup.c:108 msgid "show device status" msgstr "显示设备状态" -#: src/cryptsetup.c:105 src/cryptsetup.c:107 +#: src/cryptsetup.c:110 src/cryptsetup.c:112 msgid " []" msgstr "<设备> [<新密钥文件>]" -#: src/cryptsetup.c:105 +#: src/cryptsetup.c:110 msgid "formats a LUKS device" msgstr "格式化成一个LUKS设备" -#: src/cryptsetup.c:106 src/cryptsetup.c:119 +#: src/cryptsetup.c:111 src/cryptsetup.c:124 msgid " " msgstr "<设备> <名称> " -#: src/cryptsetup.c:106 +#: src/cryptsetup.c:111 msgid "open LUKS device as mapping " msgstr "打开LUKS设备映射为<名称>" -#: src/cryptsetup.c:107 +#: src/cryptsetup.c:112 msgid "add key to LUKS device" msgstr "添加密钥到LUKS设备" -#: src/cryptsetup.c:108 src/cryptsetup.c:109 +#: src/cryptsetup.c:113 src/cryptsetup.c:114 msgid " []" msgstr "" -#: src/cryptsetup.c:108 +#: src/cryptsetup.c:113 msgid "removes supplied key or key file from LUKS device" msgstr "" -#: src/cryptsetup.c:109 +#: src/cryptsetup.c:114 msgid "changes supplied key or key file of LUKS device" msgstr "" -#: src/cryptsetup.c:110 +#: src/cryptsetup.c:115 msgid " " msgstr "<设备> " -#: src/cryptsetup.c:110 +#: src/cryptsetup.c:115 msgid "wipes key with number from LUKS device" msgstr "从LUKS 设备用数字清除密钥" -#: src/cryptsetup.c:111 src/cryptsetup.c:112 src/cryptsetup.c:114 -#: src/cryptsetup.c:115 src/cryptsetup.c:116 src/cryptsetup.c:117 -#: src/cryptsetup.c:118 +#: src/cryptsetup.c:109 src/cryptsetup.c:116 src/cryptsetup.c:117 +#: src/cryptsetup.c:119 src/cryptsetup.c:120 src/cryptsetup.c:121 +#: src/cryptsetup.c:122 src/cryptsetup.c:123 msgid "" msgstr "<设备>" -#: src/cryptsetup.c:111 +#: src/cryptsetup.c:116 msgid "print UUID of LUKS device" msgstr "显示LUKS设备的UUID" -#: src/cryptsetup.c:112 +#: src/cryptsetup.c:117 msgid "tests for LUKS partition header" msgstr "为LUKS分区头检测<设备>" -#: src/cryptsetup.c:113 +#: src/cryptsetup.c:118 msgid "remove LUKS mapping" msgstr "卸载LUKS 映射" -#: src/cryptsetup.c:114 +#: src/cryptsetup.c:119 msgid "dump LUKS partition information" msgstr "复制LUKS分区信息" -#: src/cryptsetup.c:115 +#: src/cryptsetup.c:120 msgid "Suspend LUKS device and wipe key (all IOs are frozen)." msgstr "" -#: src/cryptsetup.c:116 +#: src/cryptsetup.c:121 msgid "Resume suspended LUKS device." msgstr "" -#: src/cryptsetup.c:117 +#: src/cryptsetup.c:122 msgid "Backup LUKS device header and keyslots" msgstr "" -#: src/cryptsetup.c:118 +#: src/cryptsetup.c:123 msgid "Restore LUKS device header and keyslots" msgstr "" -#: src/cryptsetup.c:119 +#: src/cryptsetup.c:124 msgid "open loop-AES device as mapping " msgstr "" -#: src/cryptsetup.c:120 +#: src/cryptsetup.c:125 msgid "remove loop-AES mapping" msgstr "" -#: src/cryptsetup.c:210 +#: src/cryptsetup.c:233 msgid "Command successful.\n" msgstr "命令成功.\n" -#: src/cryptsetup.c:224 +#: src/cryptsetup.c:247 #, c-format msgid "Command failed with code %i" msgstr "" -#: src/cryptsetup.c:325 +#: src/cryptsetup.c:375 msgid "Option --key-file is required.\n" msgstr "" -#: src/cryptsetup.c:486 +#: src/cryptsetup.c:564 #, c-format msgid "This will overwrite data on %s irrevocably." msgstr "这将不能取消地在 %s 上覆盖数据" -#: src/cryptsetup.c:488 +#: src/cryptsetup.c:566 msgid "memory allocation error in action_luksFormat" msgstr "内存配置错误在 action_luksFormat" -#: src/cryptsetup.c:500 +#: src/cryptsetup.c:578 msgid "No known cipher specification pattern detected.\n" msgstr "" -#: src/cryptsetup.c:506 +#: src/cryptsetup.c:584 #, c-format msgid "Cannot use %s as on-disk header.\n" msgstr "" -#: src/cryptsetup.c:522 src/cryptsetup.c:940 +#: src/cryptsetup.c:599 src/cryptsetup.c:1030 msgid "Enter LUKS passphrase: " msgstr "" -#: src/cryptsetup.c:576 +#: src/cryptsetup.c:654 msgid "Reduced data offset is allowed only for detached LUKS header.\n" msgstr "" -#: src/cryptsetup.c:667 src/cryptsetup.c:722 +#: src/cryptsetup.c:755 src/cryptsetup.c:810 #, c-format msgid "Key slot %d selected for deletion.\n" msgstr "" -#: src/cryptsetup.c:670 +#: src/cryptsetup.c:758 #, c-format msgid "Key %d not active. Can't wipe.\n" msgstr "密钥 %d 没有激活. 不能清除.\n" -#: src/cryptsetup.c:678 src/cryptsetup.c:725 +#: src/cryptsetup.c:766 src/cryptsetup.c:813 msgid "" "This is the last keyslot. Device will become unusable after purging this key." msgstr "这是最后的 keyslot. 设备将不可用在清除这个密钥后." -#: src/cryptsetup.c:679 +#: src/cryptsetup.c:767 msgid "Enter any remaining LUKS passphrase: " msgstr "" -#: src/cryptsetup.c:707 +#: src/cryptsetup.c:795 msgid "Enter LUKS passphrase to be deleted: " msgstr "" -#: src/cryptsetup.c:809 +#: src/cryptsetup.c:898 msgid "Enter LUKS passphrase to be changed: " msgstr "" -#: src/cryptsetup.c:846 +#: src/cryptsetup.c:935 msgid "Enter new LUKS passphrase: " msgstr "" -#: src/cryptsetup.c:859 +#: src/cryptsetup.c:949 #, c-format msgid "Key slot %d changed.\n" msgstr "" -#: src/cryptsetup.c:865 +#: src/cryptsetup.c:955 #, c-format msgid "Replaced with key slot %d.\n" msgstr "" -#: src/cryptsetup.c:870 +#: src/cryptsetup.c:960 msgid "Failed to swap new key slot.\n" msgstr "" -#: src/cryptsetup.c:929 +#: src/cryptsetup.c:1019 msgid "" "LUKS 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:1032 src/cryptsetup.c:1053 +#: src/cryptsetup.c:1124 src/cryptsetup.c:1145 msgid "Option --header-backup-file is required.\n" msgstr "" -#: src/cryptsetup.c:1091 +#: src/cryptsetup.c:1183 msgid "" "\n" " is one of:\n" @@ -763,7 +763,7 @@ "\n" " 是其中之一:\n" -#: src/cryptsetup.c:1097 +#: src/cryptsetup.c:1189 #, c-format msgid "" "\n" @@ -778,7 +778,7 @@ " 是 LUKS key slot 数字去设置\n" " optional key file for the new key for luksAddKey action\n" -#: src/cryptsetup.c:1104 +#: src/cryptsetup.c:1196 #, c-format msgid "" "\n" @@ -787,7 +787,7 @@ "(characters)\n" msgstr "" -#: src/cryptsetup.c:1109 +#: src/cryptsetup.c:1201 #, c-format msgid "" "\n" @@ -797,223 +797,224 @@ "\tLUKS1: %s, Key: %d bits, LUKS header hashing: %s, RNG: %s\n" msgstr "" -#: src/cryptsetup.c:1177 +#: src/cryptsetup.c:1269 msgid "Show this help message" msgstr "显示该帮助信息" -#: src/cryptsetup.c:1178 +#: src/cryptsetup.c:1270 msgid "Display brief usage" msgstr "显示简短用法" -#: src/cryptsetup.c:1182 +#: src/cryptsetup.c:1274 msgid "Help options:" msgstr "帮助选项" -#: src/cryptsetup.c:1183 +#: src/cryptsetup.c:1275 msgid "Print package version" msgstr "显示包版本" -#: src/cryptsetup.c:1184 +#: src/cryptsetup.c:1276 msgid "Shows more detailed error messages" msgstr "显示更多的详细错误信息" -#: src/cryptsetup.c:1185 +#: src/cryptsetup.c:1277 msgid "Show debug messages" msgstr "" -#: src/cryptsetup.c:1186 +#: src/cryptsetup.c:1278 msgid "The cipher used to encrypt the disk (see /proc/crypto)" msgstr "这个密码用于加密这个磁盘(参看 /proc/crypto)" -#: src/cryptsetup.c:1187 +#: src/cryptsetup.c:1279 msgid "The hash used to create the encryption key from the passphrase" msgstr "hash用于从密钥中创建加密密钥" -#: src/cryptsetup.c:1188 +#: src/cryptsetup.c:1280 msgid "Verifies the passphrase by asking for it twice" msgstr "通过两次来校验密钥" -#: src/cryptsetup.c:1189 +#: src/cryptsetup.c:1281 msgid "Read the key from a file." msgstr "" -#: src/cryptsetup.c:1190 +#: src/cryptsetup.c:1282 msgid "Read the volume (master) key from file." msgstr "" -#: src/cryptsetup.c:1191 +#: src/cryptsetup.c:1283 msgid "Dump volume (master) key instead of keyslots info." msgstr "" -#: src/cryptsetup.c:1192 +#: src/cryptsetup.c:1284 msgid "The size of the encryption key" msgstr "加密密码的长度" -#: src/cryptsetup.c:1192 +#: src/cryptsetup.c:1284 msgid "BITS" msgstr "位数" -#: src/cryptsetup.c:1193 +#: src/cryptsetup.c:1285 msgid "Limits the read from keyfile" msgstr "" -#: src/cryptsetup.c:1193 src/cryptsetup.c:1194 +#: src/cryptsetup.c:1285 src/cryptsetup.c:1286 src/cryptsetup.c:1287 +#: src/cryptsetup.c:1288 msgid "bytes" msgstr "" -#: src/cryptsetup.c:1194 +#: src/cryptsetup.c:1287 msgid "Limits the read from newly added keyfile" msgstr "" -#: src/cryptsetup.c:1195 +#: src/cryptsetup.c:1289 msgid "Slot number for new key (default is first free)" msgstr "" -#: src/cryptsetup.c:1196 +#: src/cryptsetup.c:1290 msgid "The size of the device" msgstr "设备尺寸" -#: src/cryptsetup.c:1196 src/cryptsetup.c:1197 src/cryptsetup.c:1198 -#: src/cryptsetup.c:1204 +#: src/cryptsetup.c:1290 src/cryptsetup.c:1291 src/cryptsetup.c:1292 +#: src/cryptsetup.c:1298 msgid "SECTORS" msgstr "扇区数" -#: src/cryptsetup.c:1197 +#: src/cryptsetup.c:1291 msgid "The start offset in the backend device" msgstr "在后台设备中的开始偏移量" -#: src/cryptsetup.c:1198 +#: src/cryptsetup.c:1292 msgid "How many sectors of the encrypted data to skip at the beginning" msgstr "加密数据在开始跳过多少扇区" -#: src/cryptsetup.c:1199 +#: src/cryptsetup.c:1293 msgid "Create a readonly mapping" msgstr "创建一个只读映射" -#: src/cryptsetup.c:1200 +#: src/cryptsetup.c:1294 msgid "PBKDF2 iteration time for LUKS (in ms)" msgstr "用于LUKS的PBKDF2 重复时间 (毫秒内)" -#: src/cryptsetup.c:1200 +#: src/cryptsetup.c:1294 msgid "msecs" msgstr "毫秒" -#: src/cryptsetup.c:1201 +#: src/cryptsetup.c:1295 msgid "Do not ask for confirmation" msgstr "不询问确认" -#: src/cryptsetup.c:1202 +#: src/cryptsetup.c:1296 msgid "Timeout for interactive passphrase prompt (in seconds)" msgstr "交互密钥提示的时间限制(秒数)" -#: src/cryptsetup.c:1202 +#: src/cryptsetup.c:1296 msgid "secs" msgstr "秒" -#: src/cryptsetup.c:1203 +#: src/cryptsetup.c:1297 msgid "How often the input of the passphrase can be retried" msgstr "多久能重试再输入密钥" -#: src/cryptsetup.c:1204 +#: src/cryptsetup.c:1298 msgid "Align payload at sector boundaries - for luksFormat" msgstr "为luksFormat排列有效负荷在扇区边界" -#: src/cryptsetup.c:1205 +#: src/cryptsetup.c:1299 msgid "File with LUKS header and keyslots backup." msgstr "" -#: src/cryptsetup.c:1206 +#: src/cryptsetup.c:1300 msgid "Use /dev/random for generating volume key." msgstr "" -#: src/cryptsetup.c:1207 +#: src/cryptsetup.c:1301 msgid "Use /dev/urandom for generating volume key." msgstr "" -#: src/cryptsetup.c:1208 +#: src/cryptsetup.c:1302 msgid "Share device with another non-overlapping crypt segment." msgstr "" -#: src/cryptsetup.c:1209 +#: src/cryptsetup.c:1303 msgid "UUID for device to use." msgstr "" -#: src/cryptsetup.c:1210 +#: src/cryptsetup.c:1304 msgid "Allow discards (aka TRIM) requests for device." msgstr "" -#: src/cryptsetup.c:1211 +#: src/cryptsetup.c:1305 msgid "Device or file with separated LUKS header." msgstr "" -#: src/cryptsetup.c:1228 +#: src/cryptsetup.c:1324 msgid "[OPTION...] ]" msgstr "[选项...] ]" -#: src/cryptsetup.c:1268 +#: src/cryptsetup.c:1364 msgid "Argument missing." msgstr "缺少参数." -#: src/cryptsetup.c:1274 +#: src/cryptsetup.c:1370 msgid "Unknown action." msgstr "未知参数" -#: src/cryptsetup.c:1289 +#: src/cryptsetup.c:1385 #, c-format msgid "%s: requires %s as arguments" msgstr "%s: requires %s 作为参数" -#: src/cryptsetup.c:1298 +#: src/cryptsetup.c:1394 msgid "Option --shared is allowed only for create operation.\n" msgstr "" -#: src/cryptsetup.c:1307 +#: src/cryptsetup.c:1403 msgid "" "Option --allow-discards is allowed only for luksOpen, loopaesOpen and create " "operation.\n" msgstr "" -#: src/cryptsetup.c:1316 +#: src/cryptsetup.c:1412 msgid "" "Option --key-size is allowed only for luksFormat, create and loopaesOpen.\n" "To limit read from keyfile use --keyfile-size=(bytes)." msgstr "" -#: src/cryptsetup.c:1323 +#: src/cryptsetup.c:1419 msgid "Key size must be a multiple of 8 bits" msgstr "密码长度必须是8的倍数" -#: src/cryptsetup.c:1330 +#: src/cryptsetup.c:1426 msgid "Key slot is invalid." msgstr "" -#: src/cryptsetup.c:1337 +#: src/cryptsetup.c:1433 msgid "" "Option --key-file takes precedence over specified key file argument.\n" msgstr "" -#: src/cryptsetup.c:1344 +#: src/cryptsetup.c:1441 msgid "Negative number for option not permitted." msgstr "" -#: src/cryptsetup.c:1349 +#: src/cryptsetup.c:1446 msgid "Only one of --use-[u]random options is allowed." msgstr "" -#: src/cryptsetup.c:1352 +#: src/cryptsetup.c:1450 msgid "Option --use-[u]random is allowed only for luksFormat." msgstr "" -#: src/cryptsetup.c:1356 +#: src/cryptsetup.c:1454 msgid "Option --uuid is allowed only for luksFormat and luksUUID." msgstr "" -#: src/cryptsetup.c:1361 +#: src/cryptsetup.c:1463 msgid "" "Option --skip is supported only for create and loopaesOpen commands.\n" msgstr "" -#: src/cryptsetup.c:1366 +#: src/cryptsetup.c:1468 msgid "" "Option --offset is supported only for create and loopaesOpen commands.\n" msgstr "" diff -Nru language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/cwidget.po language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/cwidget.po --- language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/cwidget.po 2012-05-08 22:47:59.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/cwidget.po 2013-01-29 09:37:10.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: 2012-05-08 06:18+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2013-01-28 15:21+0000\n" +"X-Generator: Launchpad (build 16451)\n" #: src/cwidget/config/column_definition.cc:273 msgid "Bad format parameter" diff -Nru language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/dctrl-tools.po language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/dctrl-tools.po --- language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/dctrl-tools.po 2012-05-08 22:47:52.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/dctrl-tools.po 2013-01-29 09:36:58.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: 2012-05-08 05:19+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2013-01-28 14:19+0000\n" +"X-Generator: Launchpad (build 16451)\n" #: lib/ifile.c:54 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/debconf.po language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/debconf.po --- language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/debconf.po 2012-05-08 22:47:26.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/debconf.po 2013-01-29 09:37:14.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: 2012-05-08 02:08+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2013-01-28 10:49+0000\n" +"X-Generator: Launchpad (build 16451)\n" "Language: zh_CN\n" #: ../Debconf/AutoSelect.pm:76 @@ -110,7 +110,7 @@ msgid "" "Debconf is not confident this error message was displayed, so it mailed it " "to you." -msgstr "" +msgstr "Debconf 不确定此错误信息有没有显示，所以它被寄给了您。" #: ../Debconf/Element/Noninteractive/Error.pm:67 msgid "Debconf" @@ -194,7 +194,7 @@ "设置文件，这个文件对您来说将会是很熟悉的 -- 它包含一些注释和设定项目。请编辑此文件，更改任何必要的项目，然后保存并离开。同时，debconf " "会读取已修改的文件，并使用您输入的值来配置系统。" -#: ../Debconf/FrontEnd/Gnome.pm:144 ../Debconf/FrontEnd/Kde.pm:100 +#: ../Debconf/FrontEnd/Gnome.pm:161 ../Debconf/FrontEnd/Kde.pm:100 #: ../Debconf/FrontEnd/Kde.pm:104 #, perl-format msgid "Debconf on %s" @@ -333,7 +333,7 @@ msgid "%s is broken or not fully installed" msgstr "%s 已被损坏或未完成安装" -#: ../dpkg-reconfigure:294 +#: ../dpkg-reconfigure:279 #, perl-format msgid "Cannot read status file: %s" msgstr "不能读取状态文件：%s" diff -Nru language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/debian-tasks.po language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/debian-tasks.po --- language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/debian-tasks.po 2012-05-08 22:47:49.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/debian-tasks.po 2013-01-29 09:37:16.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: 2012-05-08 04:51+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2013-01-28 13:48+0000\n" +"X-Generator: Launchpad (build 16451)\n" "Language: \n" #. Description diff -Nru language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/debianutils.po language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/debianutils.po --- language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/debianutils.po 2012-05-08 22:47:26.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/debianutils.po 2013-01-29 09:37:07.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: 2012-05-08 02:08+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2013-01-28 10:49+0000\n" +"X-Generator: Launchpad (build 16451)\n" #. type: TH #: ../add-shell.8:1 diff -Nru language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/devscripts.po language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/devscripts.po --- language-pack-zh-hans-base-12.04+20120508/data/zh_CN/LC_MESSAGES/devscripts.po 2012-05-08 22:47:27.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20130128/data/zh_CN/LC_MESSAGES/devscripts.po 2013-01-29 09:37:00.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: 2012-05-08 02:09+0000\n" -"X-Generator: Launchpad (build 15204)\n" +"X-Launchpad-Export-Date: 2013-01-28 10:51+0000\n" +"X-Generator: Launchpad (build 16451)\n" #. type: TH #: ../scripts/annotate-output.1:1 @@ -36,7 +36,7 @@ msgstr "DEBIAN" #. type: SH -#: ../scripts/annotate-output.1:2 ../scripts/archpath.1:2 ../scripts/bts.pl:39 ../scripts/build-rdeps.pl:18 ../scripts/chdist.pl:18 ../scripts/checkbashisms.1:2 ../scripts/cowpoke.1:18 ../scripts/cvs-debc.1:2 ../scripts/cvs-debi.1:2 ../scripts/cvs-debrelease.1:2 ../scripts/cvs-debuild.1:2 ../scripts/dcmd.1:2 ../scripts/dcontrol.pl:198 ../scripts/dd-list.1:18 ../scripts/debc.1:2 ../scripts/debchange.1:2 ../scripts/debcheckout.pl:24 ../scripts/debclean.1:2 ../scripts/debcommit.pl:3 ../scripts/debdiff.1:2 ../scripts/debi.1:2 ../scripts/debpkg.1:2 ../scripts/debrelease.1:2 ../scripts/debrsign.1:2 ../scripts/debsign.1:2 ../scripts/debsnap.1:3 ../scripts/debuild.1:2 ../scripts/desktop2menu.pl:24 ../scripts/dep3changelog.1:2 ../scripts/devscripts.1:2 ../scripts/dget.pl:489 ../scripts/diff2patches.1:2 ../scripts/dpkg-depcheck.1:2 ../scripts/dpkg-genbuilddeps.1:2 ../doc/edit-patch.1:2 ../scripts/dscextract.1:2 ../scripts/dscverify.1:2 ../scripts/getbuildlog.1:2 ../scripts/grep-excuses.1:2 ../scripts/licensecheck.pl:21 ../scripts/list-unreleased.1:2 ../scripts/manpage-alert.1:2 ../scripts/mass-bug.pl:21 ../scripts/mergechanges.1:2 ../scripts/mk-build-deps.pl:24 ../scripts/namecheck.pl:3 ../scripts/nmudiff.1:2 ../scripts/plotchangelog.1:2 ../scripts/pts-subscribe.1:2 ../scripts/rc-alert.1:2 ../scripts/rmadison.pl:204 ../doc/suspicious-source.1:17 ../scripts/svnpath.pl:3 ../scripts/tagpending.pl:79 ../scripts/transition-check.pl:23 ../scripts/uscan.1:2 ../scripts/uupdate.1:2 ../doc/what-patch.1:2 ../scripts/whodepends.1:2 ../scripts/who-uploads.1:2 ../scripts/wnpp-alert.1:2 ../scripts/wnpp-check.1:2 ../doc/wrap-and-sort.1:16 ../scripts/devscripts.conf.5:2 +#: ../scripts/annotate-output.1:2 ../scripts/archpath.1:2 ../scripts/bts.pl:39 ../scripts/build-rdeps.pl:18 ../scripts/chdist.pl:18 ../scripts/checkbashisms.1:2 ../scripts/cowpoke.1:18 ../scripts/cvs-debc.1:2 ../scripts/cvs-debi.1:2 ../scripts/cvs-debrelease.1:2 ../scripts/cvs-debuild.1:2 ../scripts/dcmd.1:2 ../scripts/dcontrol.pl:198 ../scripts/dd-list.1:18 ../scripts/debc.1:2 ../scripts/debchange.1:2 ../scripts/debcheckout.pl:24 ../scripts/debclean.1:2 ../scripts/debcommit.pl:3 ../scripts/debdiff.1:2 ../scripts/debi.1:2 ../scripts/debpkg.1:2 ../scripts/debrelease.1:2 ../scripts/debrsign.1:2 ../scripts/debsign.1:2 ../scripts/debsnap.1:3 ../scripts/debuild.1:2 ../scripts/desktop2menu.pl:24 ../scripts/dep3changelog.1:2 ../scripts/devscripts.1:2 ../scripts/dget.pl:493 ../scripts/diff2patches.1:2 ../scripts/dpkg-depcheck.1:2 ../scripts/dpkg-genbuilddeps.1:2 ../doc/edit-patch.1:2 ../scripts/dscextract.1:2 ../scripts/dscverify.1:2 ../scripts/getbuildlog.1:2 ../scripts/grep-excuses.1:2 ../scripts/licensecheck.pl:22 ../scripts/list-unreleased.1:2 ../scripts/manpage-alert.1:2 ../scripts/mass-bug.pl:21 ../scripts/mergechanges.1:2 ../scripts/mk-build-deps.pl:24 ../scripts/namecheck.pl:3 ../scripts/nmudiff.1:2 ../scripts/plotchangelog.1:2 ../scripts/pts-subscribe.1:2 ../scripts/rc-alert.1:2 ../scripts/rmadison.pl:204 ../doc/suspicious-source.1:17 ../scripts/svnpath.pl:3 ../scripts/tagpending.pl:79 ../scripts/transition-check.pl:23 ../scripts/uscan.1:2 ../scripts/uupdate.1:2 ../doc/what-patch.1:2 ../scripts/whodepends.1:2 ../scripts/who-uploads.1:2 ../scripts/wnpp-alert.1:2 ../scripts/wnpp-check.1:2 ../doc/wrap-and-sort.1:16 ../scripts/devscripts.conf.5:2 #, no-wrap msgid "NAME" msgstr "名称" @@ -47,7 +47,7 @@ msgstr "annotate-output - 用时间和流信息对程序输出作注解" #. type: SH -#: ../scripts/annotate-output.1:4 ../scripts/archpath.1:4 ../scripts/bts.pl:164 ../scripts/build-rdeps.pl:22 ../scripts/chdist.pl:22 ../scripts/checkbashisms.1:4 ../scripts/cowpoke.1:20 ../scripts/cvs-debc.1:4 ../scripts/cvs-debi.1:4 ../scripts/cvs-debrelease.1:4 ../scripts/cvs-debuild.1:4 ../scripts/dcmd.1:4 ../scripts/dcontrol.pl:202 ../scripts/dd-list.1:21 ../scripts/debc.1:4 ../scripts/debchange.1:4 ../scripts/debcheckout.pl:28 ../scripts/debclean.1:4 ../scripts/debcommit.pl:7 ../scripts/debdiff.1:4 ../scripts/debi.1:4 ../scripts/debpkg.1:4 ../scripts/debrelease.1:4 ../scripts/debrsign.1:4 ../scripts/debsign.1:4 ../scripts/debsnap.1:6 ../scripts/debuild.1:4 ../scripts/desktop2menu.pl:28 ../scripts/dep3changelog.1:4 ../scripts/dget.pl:493 ../scripts/dpkg-depcheck.1:4 ../scripts/dpkg-genbuilddeps.1:4 ../doc/edit-patch.1:6 ../scripts/dscextract.1:4 ../scripts/dscverify.1:4 ../scripts/getbuildlog.1:4 ../scripts/grep-excuses.1:4 ../scripts/licensecheck.pl:25 ../scripts/list-unreleased.1:4 ../scripts/manpage-alert.1:4 ../scripts/mass-bug.pl:25 ../scripts/mergechanges.1:4 ../scripts/mk-build-deps.pl:28 ../scripts/nmudiff.1:4 ../scripts/plotchangelog.1:4 ../scripts/pts-subscribe.1:4 ../scripts/rc-alert.1:4 ../scripts/rmadison.pl:208 ../doc/suspicious-source.1:21 ../scripts/svnpath.pl:7 ../scripts/tagpending.pl:83 ../scripts/transition-check.pl:27 ../scripts/uscan.1:4 ../scripts/uupdate.1:4 ../doc/what-patch.1:5 ../scripts/whodepends.1:4 ../scripts/who-uploads.1:4 ../scripts/wnpp-alert.1:4 ../scripts/wnpp-check.1:4 ../doc/wrap-and-sort.1:18 +#: ../scripts/annotate-output.1:4 ../scripts/archpath.1:4 ../scripts/bts.pl:182 ../scripts/build-rdeps.pl:22 ../scripts/chdist.pl:22 ../scripts/checkbashisms.1:4 ../scripts/cowpoke.1:20 ../scripts/cvs-debc.1:4 ../scripts/cvs-debi.1:4 ../scripts/cvs-debrelease.1:4 ../scripts/cvs-debuild.1:4 ../scripts/dcmd.1:4 ../scripts/dcontrol.pl:202 ../scripts/dd-list.1:21 ../scripts/debc.1:4 ../scripts/debchange.1:4 ../scripts/debcheckout.pl:28 ../scripts/debclean.1:4 ../scripts/debcommit.pl:7 ../scripts/debdiff.1:4 ../scripts/debi.1:4 ../scripts/debpkg.1:4 ../scripts/debrelease.1:4 ../scripts/debrsign.1:4 ../scripts/debsign.1:4 ../scripts/debsnap.1:6 ../scripts/debuild.1:4 ../scripts/desktop2menu.pl:28 ../scripts/dep3changelog.1:4 ../scripts/dget.pl:497 ../scripts/dpkg-depcheck.1:4 ../scripts/dpkg-genbuilddeps.1:4 ../doc/edit-patch.1:6 ../scripts/dscextract.1:4 ../scripts/dscverify.1:4 ../scripts/getbuildlog.1:4 ../scripts/grep-excuses.1:4 ../scripts/licensecheck.pl:26 ../scripts/list-unreleased.1:4 ../scripts/manpage-alert.1:4 ../scripts/mass-bug.pl:25 ../scripts/mergechanges.1:4 ../scripts/mk-build-deps.pl:28 ../scripts/nmudiff.1:4 ../scripts/plotchangelog.1:4 ../scripts/pts-subscribe.1:4 ../scripts/rc-alert.1:4 ../scripts/rmadison.pl:208 ../doc/suspicious-source.1:21 ../scripts/svnpath.pl:7 ../scripts/tagpending.pl:83 ../scripts/transition-check.pl:27 ../scripts/uscan.1:4 ../scripts/uupdate.1:4 ../doc/what-patch.1:5 ../scripts/whodepends.1:4 ../scripts/who-uploads.1:4 ../scripts/wnpp-alert.1:4 ../scripts/wnpp-check.1:4 ../doc/wrap-and-sort.1:18 #, no-wrap msgid "SYNOPSIS" msgstr "概要" @@ -58,7 +58,7 @@ msgstr "" #. type: SH -#: ../scripts/annotate-output.1:6 ../scripts/archpath.1:12 ../scripts/bts.pl:168 ../scripts/build-rdeps.pl:26 ../scripts/chdist.pl:26 ../scripts/checkbashisms.1:8 ../scripts/cowpoke.1:24 ../scripts/cvs-debc.1:6 ../scripts/cvs-debi.1:6 ../scripts/cvs-debrelease.1:7 ../scripts/cvs-debuild.1:7 ../scripts/dcmd.1:7 ../scripts/dcontrol.pl:210 ../scripts/dd-list.1:26 ../scripts/debc.1:6 ../scripts/debchange.1:8 ../scripts/debcheckout.pl:40 ../scripts/debclean.1:6 ../scripts/debcommit.pl:11 ../scripts/debdiff.1:15 ../scripts/debi.1:6 ../scripts/debpkg.1:6 ../scripts/debrelease.1:6 ../scripts/deb-reversion.dbk:82 ../scripts/debrsign.1:7 ../scripts/debsign.1:6 ../scripts/debsnap.1:14 ../scripts/debuild.1:10 ../scripts/desktop2menu.pl:34 ../scripts/dep3changelog.1:6 ../scripts/devscripts.1:4 ../scripts/dget.pl:503 ../scripts/diff2patches.1:10 ../scripts/dpkg-depcheck.1:6 ../scripts/dpkg-genbuilddeps.1:6 ../doc/edit-patch.1:11 ../scripts/dscextract.1:6 ../scripts/dscverify.1:6 ../scripts/getbuildlog.1:8 ../scripts/grep-excuses.1:6 ../scripts/licensecheck.pl:33 ../scripts/list-unreleased.1:6 ../scripts/manpage-alert.1:8 ../scripts/mass-bug.pl:29 ../scripts/mergechanges.1:6 ../scripts/mk-build-deps.pl:34 ../scripts/nmudiff.1:6 ../scripts/plotchangelog.1:7 ../scripts/pts-subscribe.1:8 ../scripts/rc-alert.1:8 ../scripts/rmadison.pl:216 ../doc/suspicious-source.1:24 ../scripts/svnpath.pl:17 ../scripts/tagpending.pl:87 ../scripts/transition-check.pl:33 ../scripts/uscan.1:6 ../scripts/uupdate.1:8 ../doc/what-patch.1:8 ../scripts/whodepends.1:6 ../scripts/who-uploads.1:6 ../scripts/wnpp-alert.1:8 ../scripts/wnpp-check.1:8 ../doc/wrap-and-sort.1:22 ../scripts/devscripts.conf.5:4 +#: ../scripts/annotate-output.1:6 ../scripts/archpath.1:12 ../scripts/bts.pl:186 ../scripts/build-rdeps.pl:26 ../scripts/chdist.pl:26 ../scripts/checkbashisms.1:8 ../scripts/cowpoke.1:24 ../scripts/cvs-debc.1:6 ../scripts/cvs-debi.1:6 ../scripts/cvs-debrelease.1:7 ../scripts/cvs-debuild.1:7 ../scripts/dcmd.1:7 ../scripts/dcontrol.pl:210 ../scripts/dd-list.1:26 ../scripts/debc.1:6 ../scripts/debchange.1:8 ../scripts/debcheckout.pl:40 ../scripts/debclean.1:6 ../scripts/debcommit.pl:11 ../scripts/debdiff.1:15 ../scripts/debi.1:6 ../scripts/debpkg.1:6 ../scripts/debrelease.1:6 ../scripts/deb-reversion.dbk:82 ../scripts/debrsign.1:7 ../scripts/debsign.1:6 ../scripts/debsnap.1:14 ../scripts/debuild.1:10 ../scripts/desktop2menu.pl:34 ../scripts/dep3changelog.1:6 ../scripts/devscripts.1:4 ../scripts/dget.pl:507 ../scripts/diff2patches.1:10 ../scripts/dpkg-depcheck.1:6 ../scripts/dpkg-genbuilddeps.1:6 ../doc/edit-patch.1:11 ../scripts/dscextract.1:6 ../scripts/dscverify.1:6 ../scripts/getbuildlog.1:8 ../scripts/grep-excuses.1:6 ../scripts/licensecheck.pl:35 ../scripts/list-unreleased.1:6 ../scripts/manpage-alert.1:8 ../scripts/mass-bug.pl:29 ../scripts/mergechanges.1:6 ../scripts/mk-build-deps.pl:34 ../scripts/nmudiff.1:6 ../scripts/plotchangelog.1:7 ../scripts/pts-subscribe.1:8 ../scripts/rc-alert.1:8 ../scripts/rmadison.pl:216 ../doc/suspicious-source.1:24 ../scripts/svnpath.pl:17 ../scripts/tagpending.pl:87 ../scripts/transition-check.pl:33 ../scripts/uscan.1:6 ../scripts/uupdate.1:8 ../doc/what-patch.1:8 ../scripts/whodepends.1:6 ../scripts/who-uploads.1:6 ../scripts/wnpp-alert.1:8 ../scripts/wnpp-check.1:8 ../doc/wrap-and-sort.1:22 ../scripts/devscripts.conf.5:4 #, no-wrap msgid "DESCRIPTION" msgstr "描述" @@ -71,7 +71,7 @@ msgstr "B 会执行指定的程序并在每行上添加当前时间、O(标准输出) 和 E(标准错误)。" #. type: SH -#: ../scripts/annotate-output.1:11 ../scripts/bts.pl:220 ../scripts/build-rdeps.pl:30 ../scripts/chdist.pl:33 ../scripts/checkbashisms.1:23 ../scripts/cowpoke.1:29 ../scripts/cvs-debc.1:24 ../scripts/cvs-debi.1:28 ../scripts/cvs-debrelease.1:21 ../scripts/cvs-debuild.1:32 ../scripts/dcmd.1:16 ../scripts/dcontrol.pl:244 ../scripts/dd-list.1:58 ../scripts/debc.1:64 ../scripts/debchange.1:146 ../scripts/debcheckout.pl:68 ../scripts/debclean.1:60 ../scripts/debcommit.pl:19 ../scripts/debdiff.1:50 ../scripts/debi.1:65 ../scripts/debrelease.1:56 ../scripts/deb-reversion.dbk:128 ../scripts/debrsign.1:30 ../scripts/debsign.1:39 ../scripts/debsnap.1:26 ../scripts/debuild.1:219 ../scripts/dep3changelog.1:15 ../scripts/dget.pl:542 ../scripts/diff2patches.1:16 ../scripts/dpkg-depcheck.1:15 ../scripts/dscextract.1:14 ../scripts/dscverify.1:17 ../scripts/getbuildlog.1:24 ../scripts/grep-excuses.1:13 ../scripts/licensecheck.pl:42 ../scripts/list-unreleased.1:12 ../scripts/manpage-alert.1:14 ../scripts/mass-bug.pl:59 ../scripts/mk-build-deps.pl:44 ../scripts/nmudiff.1:21 ../scripts/plotchangelog.1:43 ../scripts/pts-subscribe.1:18 ../scripts/rc-alert.1:17 ../scripts/rmadison.pl:225 ../doc/suspicious-source.1:34 ../scripts/tagpending.pl:93 ../scripts/transition-check.pl:42 ../scripts/uscan.1:336 ../scripts/uupdate.1:52 ../doc/what-patch.1:15 ../scripts/whodepends.1:10 ../scripts/who-uploads.1:15 ../scripts/wnpp-alert.1:17 ../scripts/wnpp-check.1:16 ../doc/wrap-and-sort.1:33 +#: ../scripts/annotate-output.1:11 ../scripts/bts.pl:238 ../scripts/build-rdeps.pl:30 ../scripts/chdist.pl:33 ../scripts/checkbashisms.1:23 ../scripts/cowpoke.1:29 ../scripts/cvs-debc.1:24 ../scripts/cvs-debi.1:28 ../scripts/cvs-debrelease.1:21 ../scripts/cvs-debuild.1:32 ../scripts/dcmd.1:16 ../scripts/dcontrol.pl:244 ../scripts/dd-list.1:58 ../scripts/debc.1:64 ../scripts/debchange.1:145 ../scripts/debcheckout.pl:68 ../scripts/debclean.1:60 ../scripts/debcommit.pl:19 ../scripts/debdiff.1:50 ../scripts/debi.1:65 ../scripts/debrelease.1:56 ../scripts/deb-reversion.dbk:128 ../scripts/debrsign.1:30 ../scripts/debsign.1:39 ../scripts/debsnap.1:26 ../scripts/debuild.1:219 ../scripts/dep3changelog.1:15 ../scripts/dget.pl:546 ../scripts/diff2patches.1:16 ../scripts/dpkg-depcheck.1:15 ../scripts/dscextract.1:14 ../scripts/dscverify.1:17 ../scripts/getbuildlog.1:24 ../scripts/grep-excuses.1:13 ../scripts/licensecheck.pl:44 ../scripts/list-unreleased.1:12 ../scripts/manpage-alert.1:14 ../scripts/mass-bug.pl:59 ../scripts/mk-build-deps.pl:44 ../scripts/nmudiff.1:21 ../scripts/plotchangelog.1:43 ../scripts/pts-subscribe.1:18 ../scripts/rc-alert.1:17 ../scripts/rmadison.pl:225 ../doc/suspicious-source.1:34 ../scripts/tagpending.pl:93 ../scripts/transition-check.pl:42 ../scripts/uscan.1:336 ../scripts/uupdate.1:52 ../doc/what-patch.1:15 ../scripts/whodepends.1:10 ../scripts/who-uploads.1:15 ../scripts/wnpp-alert.1:17 ../scripts/wnpp-check.1:16 ../doc/wrap-and-sort.1:33 #, no-wrap msgid "OPTIONS" msgstr "选项" @@ -89,13 +89,13 @@ msgstr "" #. type: TP -#: ../scripts/annotate-output.1:16 ../scripts/chdist.pl:37 ../scripts/dcontrol.pl:256 ../scripts/dd-list.1:59 ../scripts/debcheckout.pl:93 ../scripts/debsnap.1:57 ../scripts/dget.pl:595 ../scripts/dpkg-depcheck.1:96 ../scripts/getbuildlog.1:25 ../scripts/mk-build-deps.pl:79 ../scripts/rmadison.pl:249 ../doc/suspicious-source.1:35 ../doc/what-patch.1:17 ../doc/wrap-and-sort.1:34 +#: ../scripts/annotate-output.1:16 ../scripts/chdist.pl:37 ../scripts/dcontrol.pl:256 ../scripts/dd-list.1:59 ../scripts/debcheckout.pl:93 ../scripts/debsnap.1:57 ../scripts/dget.pl:599 ../scripts/dpkg-depcheck.1:96 ../scripts/getbuildlog.1:25 ../scripts/mk-build-deps.pl:79 ../scripts/rmadison.pl:249 ../doc/suspicious-source.1:35 ../doc/what-patch.1:17 ../doc/wrap-and-sort.1:34 #, no-wrap msgid "B<-h>, B<--help>" msgstr "B<-h>, B<--help>" #. type: Plain text -#: ../scripts/annotate-output.1:19 ../scripts/debchange.1:376 ../scripts/debclean.1:87 ../scripts/debrelease.1:102 ../scripts/debsign.1:103 ../scripts/dep3changelog.1:19 ../scripts/dscverify.1:39 ../scripts/nmudiff.1:76 ../scripts/pts-subscribe.1:31 ../scripts/uupdate.1:85 ../scripts/who-uploads.1:47 +#: ../scripts/annotate-output.1:19 ../scripts/debchange.1:389 ../scripts/debclean.1:87 ../scripts/debrelease.1:102 ../scripts/debsign.1:103 ../scripts/dep3changelog.1:19 ../scripts/dscverify.1:39 ../scripts/nmudiff.1:76 ../scripts/pts-subscribe.1:31 ../scripts/uupdate.1:85 ../scripts/who-uploads.1:47 msgid "Display a help message and exit successfully." msgstr "显示一条帮助信息并成功退出。" @@ -159,7 +159,7 @@ msgstr "" #. type: SH -#: ../scripts/annotate-output.1:47 ../scripts/bts.pl:4080 ../scripts/checkbashisms.1:60 ../scripts/cowpoke.1:263 ../scripts/cvs-debc.1:58 ../scripts/cvs-debi.1:62 ../scripts/cvs-debrelease.1:64 ../scripts/cvs-debuild.1:53 ../scripts/dcmd.1:98 ../scripts/dcontrol.pl:289 ../scripts/debc.1:115 ../scripts/debchange.1:456 ../scripts/debcheckout.pl:211 ../scripts/debclean.1:107 ../scripts/debcommit.pl:858 ../scripts/debdiff.1:215 ../scripts/debi.1:132 ../scripts/debrelease.1:132 ../scripts/deb-reversion.dbk:247 ../scripts/debrsign.1:66 ../scripts/debsign.1:134 ../scripts/debsnap.1:118 ../scripts/debuild.1:410 ../scripts/dep3changelog.1:28 ../scripts/dget.pl:649 ../scripts/diff2patches.1:45 ../scripts/dpkg-depcheck.1:118 ../scripts/dpkg-genbuilddeps.1:30 ../scripts/dscverify.1:73 ../scripts/grep-excuses.1:38 ../scripts/list-unreleased.1:19 ../scripts/nmudiff.1:108 ../scripts/plotchangelog.1:124 ../scripts/pts-subscribe.1:51 ../scripts/rc-alert.1:121 ../scripts/rmadison.pl:332 ../scripts/tagpending.pl:148 ../scripts/uscan.1:539 ../scripts/uupdate.1:170 ../doc/what-patch.1:35 ../scripts/wnpp-alert.1:29 ../scripts/wnpp-check.1:23 ../scripts/devscripts.conf.5:54 +#: ../scripts/annotate-output.1:47 ../scripts/bts.pl:4105 ../scripts/checkbashisms.1:60 ../scripts/cowpoke.1:263 ../scripts/cvs-debc.1:58 ../scripts/cvs-debi.1:62 ../scripts/cvs-debrelease.1:64 ../scripts/cvs-debuild.1:53 ../scripts/dcmd.1:98 ../scripts/dcontrol.pl:289 ../scripts/debc.1:115 ../scripts/debchange.1:469 ../scripts/debcheckout.pl:222 ../scripts/debclean.1:107 ../scripts/debcommit.pl:858 ../scripts/debdiff.1:215 ../scripts/debi.1:132 ../scripts/debrelease.1:132 ../scripts/deb-reversion.dbk:247 ../scripts/debrsign.1:66 ../scripts/debsign.1:134 ../scripts/debsnap.1:118 ../scripts/debuild.1:410 ../scripts/dep3changelog.1:28 ../scripts/dget.pl:653 ../scripts/diff2patches.1:45 ../scripts/dpkg-depcheck.1:118 ../scripts/dpkg-genbuilddeps.1:30 ../scripts/dscverify.1:73 ../scripts/grep-excuses.1:38 ../scripts/list-unreleased.1:19 ../scripts/nmudiff.1:108 ../scripts/plotchangelog.1:124 ../scripts/pts-subscribe.1:51 ../scripts/rc-alert.1:121 ../scripts/rmadison.pl:332 ../scripts/tagpending.pl:148 ../scripts/uscan.1:541 ../scripts/uupdate.1:170 ../doc/what-patch.1:35 ../scripts/wnpp-alert.1:29 ../scripts/wnpp-check.1:23 ../scripts/devscripts.conf.5:54 #, no-wrap msgid "SEE ALSO" msgstr "参见" @@ -184,7 +184,7 @@ msgstr "本程序是由社区支持（这意味着：您需要自己修补软件缺陷）。欢迎打补丁和提供反馈（正面或负面的）。" #. type: SH -#: ../scripts/annotate-output.1:55 ../scripts/archpath.1:54 ../scripts/build-rdeps.pl:345 ../scripts/checkbashisms.1:62 ../scripts/cowpoke.1:269 ../scripts/cvs-debc.1:64 ../scripts/cvs-debi.1:68 ../scripts/cvs-debrelease.1:69 ../scripts/cvs-debuild.1:59 ../scripts/dcmd.1:101 ../scripts/dcontrol.pl:282 ../scripts/dd-list.1:100 ../scripts/debc.1:120 ../scripts/debchange.1:463 ../scripts/debcheckout.pl:216 ../scripts/debclean.1:111 ../scripts/debcommit.pl:854 ../scripts/debdiff.1:222 ../scripts/debi.1:136 ../scripts/debpkg.1:23 ../scripts/debrelease.1:137 ../scripts/deb-reversion.dbk:292 ../scripts/debrsign.1:71 ../scripts/debsign.1:146 ../scripts/debuild.1:423 ../scripts/desktop2menu.pl:52 ../scripts/dep3changelog.1:26 ../scripts/dget.pl:641 ../scripts/diff2patches.1:48 ../scripts/dpkg-genbuilddeps.1:36 ../scripts/dscextract.1:32 ../scripts/dscverify.1:78 ../scripts/getbuildlog.1:41 ../scripts/grep-excuses.1:40 ../scripts/licensecheck.pl:120 ../scripts/list-unreleased.1:21 ../scripts/manpage-alert.1:20 ../scripts/mass-bug.pl:520 ../scripts/mergechanges.1:18 ../scripts/mk-build-deps.pl:94 ../scripts/namecheck.pl:30 ../scripts/nmudiff.1:113 ../scripts/plotchangelog.1:126 ../scripts/pts-subscribe.1:56 ../scripts/rc-alert.1:125 ../scripts/rmadison.pl:336 ../scripts/svnpath.pl:97 ../scripts/transition-check.pl:81 ../scripts/uscan.1:545 ../scripts/uupdate.1:177 ../scripts/whodepends.1:19 ../scripts/who-uploads.1:71 ../scripts/wnpp-alert.1:31 ../scripts/wnpp-check.1:33 ../scripts/devscripts.conf.5:58 +#: ../scripts/annotate-output.1:55 ../scripts/archpath.1:54 ../scripts/build-rdeps.pl:345 ../scripts/checkbashisms.1:62 ../scripts/cowpoke.1:269 ../scripts/cvs-debc.1:64 ../scripts/cvs-debi.1:68 ../scripts/cvs-debrelease.1:69 ../scripts/cvs-debuild.1:59 ../scripts/dcmd.1:101 ../scripts/dcontrol.pl:282 ../scripts/dd-list.1:100 ../scripts/debc.1:120 ../scripts/debchange.1:476 ../scripts/debcheckout.pl:227 ../scripts/debclean.1:111 ../scripts/debcommit.pl:854 ../scripts/debdiff.1:222 ../scripts/debi.1:136 ../scripts/debpkg.1:23 ../scripts/debrelease.1:137 ../scripts/deb-reversion.dbk:292 ../scripts/debrsign.1:71 ../scripts/debsign.1:146 ../scripts/debuild.1:423 ../scripts/desktop2menu.pl:52 ../scripts/dep3changelog.1:26 ../scripts/dget.pl:645 ../scripts/diff2patches.1:48 ../scripts/dpkg-genbuilddeps.1:36 ../scripts/dscextract.1:32 ../scripts/dscverify.1:78 ../scripts/getbuildlog.1:41 ../scripts/grep-excuses.1:40 ../scripts/licensecheck.pl:129 ../scripts/list-unreleased.1:21 ../scripts/manpage-alert.1:20 ../scripts/mass-bug.pl:520 ../scripts/mergechanges.1:18 ../scripts/mk-build-deps.pl:94 ../scripts/namecheck.pl:30 ../scripts/nmudiff.1:113 ../scripts/plotchangelog.1:126 ../scripts/pts-subscribe.1:56 ../scripts/rc-alert.1:125 ../scripts/rmadison.pl:336 ../scripts/svnpath.pl:93 ../scripts/transition-check.pl:81 ../scripts/uscan.1:547 ../scripts/uupdate.1:177 ../scripts/whodepends.1:19 ../scripts/who-uploads.1:71 ../scripts/wnpp-alert.1:31 ../scripts/wnpp-check.1:33 ../scripts/devscripts.conf.5:58 #, no-wrap msgid "AUTHOR" msgstr "作者" @@ -304,14 +304,14 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:166 +#: ../scripts/bts.pl:184 msgid "" "B [I] I [I] [B<#>I] [B<.>|B<,> " "I [I] [B<#>I]] ..." msgstr "" #. type: textblock -#: ../scripts/bts.pl:170 +#: ../scripts/bts.pl:188 msgid "" "This is a command line interface to the Debian Bug Tracking System (BTS), " "intended mainly for use by developers. It lets the BTS be manipulated using " @@ -322,7 +322,7 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:178 +#: ../scripts/bts.pl:196 msgid "" "In general, the command line interface is the same as what you would write " "in a mail to control@bugs.debian.org, just prefixed with \"bts\". For " @@ -330,7 +330,7 @@ msgstr "" #. type: verbatim -#: ../scripts/bts.pl:182 +#: ../scripts/bts.pl:200 #, no-wrap msgid "" " % bts severity 69042 normal\n" @@ -340,7 +340,7 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:186 +#: ../scripts/bts.pl:204 msgid "" "A few additional commands have been added for your convenience, and this " "program is less strict about what constitutes a valid bug number. For " @@ -350,7 +350,7 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:192 +#: ../scripts/bts.pl:210 msgid "" "Also, for your convenience, this program allows you to abbreviate commands " "to the shortest unique substring (similar to how cvs lets you abbreviate " @@ -358,7 +358,7 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:196 +#: ../scripts/bts.pl:214 msgid "" "It is also possible to include a comment in the mail sent to the BTS. If " "your shell does not strip out the comment in a command like \"bts severity " @@ -370,7 +370,7 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:204 +#: ../scripts/bts.pl:222 msgid "" "You can specify multiple commands by separating them with a single dot, " "rather like B; a single comma may also be used; all the " @@ -380,7 +380,7 @@ msgstr "" #. type: verbatim -#: ../scripts/bts.pl:210 +#: ../scripts/bts.pl:228 #, no-wrap msgid "" " % bts severity 95672 normal , merge 95672 95673 \\#they are the same!\n" @@ -388,14 +388,14 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:212 +#: ../scripts/bts.pl:230 msgid "" "The abbreviation \"it\" may be used to refer to the last mentioned bug " "number, so you could write:" msgstr "" #. type: verbatim -#: ../scripts/bts.pl:215 +#: ../scripts/bts.pl:233 #, no-wrap msgid "" " % bts severity 95672 wishlist , retitle it \"bts: please add a --foo " @@ -404,26 +404,26 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:217 +#: ../scripts/bts.pl:235 msgid "" "Please use this program responsibly, and do take our users into " "consideration." msgstr "" #. type: textblock -#: ../scripts/bts.pl:222 +#: ../scripts/bts.pl:240 msgid "" "B examines the B configuration files as described below. " "Command line options override the configuration file settings, though." msgstr "" #. type: =item -#: ../scripts/bts.pl:228 +#: ../scripts/bts.pl:246 msgid "B<-o>, B<--offline>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:230 +#: ../scripts/bts.pl:248 msgid "" "Make B use cached bugs for the B and B commands, if a cache " "is available for the requested data. See the B command, below for " @@ -431,46 +431,46 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:234 +#: ../scripts/bts.pl:252 msgid "B<--online>, B<--no-offline>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:236 +#: ../scripts/bts.pl:254 msgid "" "Opposite of B<--offline>; overrides any configuration file directive to work " "offline." msgstr "" #. type: =item -#: ../scripts/bts.pl:239 +#: ../scripts/bts.pl:257 msgid "B<-n>, B<--no-action>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:241 +#: ../scripts/bts.pl:259 msgid "Do not send emails but print them to standard output." msgstr "不发送邮件而是打印到标准输出" #. type: =item -#: ../scripts/bts.pl:243 +#: ../scripts/bts.pl:261 msgid "B<--cache>, B<--no-cache>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:245 +#: ../scripts/bts.pl:263 msgid "" "Should we attempt to cache new versions of BTS pages when performing " "B/B commands? Default is to cache." msgstr "" #. type: =item -#: ../scripts/bts.pl:248 +#: ../scripts/bts.pl:266 msgid "B<--cache-mode=>{B|B|B}" msgstr "" #. type: textblock -#: ../scripts/bts.pl:250 +#: ../scripts/bts.pl:268 msgid "" "When running a B command, should we only mirror the basic bug " "(B), or should we also mirror the mbox version (B), or should we " @@ -479,36 +479,36 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:256 +#: ../scripts/bts.pl:274 msgid "B<--cache-delay=>I" msgstr "" #. type: textblock -#: ../scripts/bts.pl:258 +#: ../scripts/bts.pl:276 msgid "" "Time in seconds to delay between each download, to avoid hammering the BTS " "web server. Default is 5 seconds." msgstr "" #. type: =item -#: ../scripts/bts.pl:261 +#: ../scripts/bts.pl:279 msgid "B<--mbox>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:263 +#: ../scripts/bts.pl:281 msgid "" "Open a mail reader to read the mbox corresponding to a given bug number for " "B and B commands." msgstr "" #. type: =item -#: ../scripts/bts.pl:266 +#: ../scripts/bts.pl:284 msgid "B<--mailreader=>I" msgstr "" #. type: textblock -#: ../scripts/bts.pl:268 +#: ../scripts/bts.pl:286 msgid "" "Specify the command to read the mbox. Must contain a \"B<%s>\" string " "(unquoted!), which will be replaced by the name of the mbox file. The " @@ -518,24 +518,24 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:274 +#: ../scripts/bts.pl:292 msgid "B<--cc-addr=>I" msgstr "" #. type: textblock -#: ../scripts/bts.pl:276 +#: ../scripts/bts.pl:294 msgid "" "Send carbon copies to a list of users. I should be a comma-" "separated list of emails." msgstr "" #. type: =item -#: ../scripts/bts.pl:279 +#: ../scripts/bts.pl:297 msgid "B<--use-default-cc>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:281 +#: ../scripts/bts.pl:299 msgid "" "Add the addresses specified in the configuration file option " "B to the list specified using B<--cc-addr>. This is the " @@ -543,23 +543,23 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:285 +#: ../scripts/bts.pl:303 msgid "B<--no-use-default-cc>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:287 +#: ../scripts/bts.pl:305 msgid "" "Do not add addresses specified in B to the carbon copy list." msgstr "" #. type: =item -#: ../scripts/bts.pl:290 ../scripts/mass-bug.pl:103 +#: ../scripts/bts.pl:308 ../scripts/mass-bug.pl:103 msgid "B<--sendmail=>I" msgstr "" #. type: textblock -#: ../scripts/bts.pl:292 +#: ../scripts/bts.pl:310 msgid "" "Specify the B command. The command will be split on white space " "and will not be passed to a shell. Default is F. The " @@ -570,50 +570,50 @@ msgstr "" #. type: TP -#: ../scripts/bts.pl:299 ../scripts/nmudiff.1:31 +#: ../scripts/bts.pl:317 ../scripts/nmudiff.1:31 #, no-wrap msgid "B<--mutt>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:301 +#: ../scripts/bts.pl:319 msgid "" "Use B for sending of mails. Default is not to use B, except for " "some commands." msgstr "" #. type: textblock -#: ../scripts/bts.pl:304 +#: ../scripts/bts.pl:322 msgid "" "Note that one of B<$DEBEMAIL> or B<$EMAIL> must be set in the environment in " "order to use B to send emails." msgstr "" #. type: TP -#: ../scripts/bts.pl:307 ../scripts/nmudiff.1:36 +#: ../scripts/bts.pl:325 ../scripts/nmudiff.1:36 #, no-wrap msgid "B<--no-mutt>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:309 +#: ../scripts/bts.pl:327 msgid "Don't use B for sending of mails." msgstr "" #. type: =item -#: ../scripts/bts.pl:311 +#: ../scripts/bts.pl:329 msgid "B<--smtp-host=>I" msgstr "" #. type: textblock -#: ../scripts/bts.pl:313 +#: ../scripts/bts.pl:331 msgid "" "Specify an SMTP host. If given, B will send mail by talking directly " "to this SMTP host rather than by invoking a B command." msgstr "" #. type: textblock -#: ../scripts/bts.pl:316 +#: ../scripts/bts.pl:334 msgid "" "The host name may be followed by a colon (\":\") and a port number in order " "to use a port other than the default. It may also begin with \"ssmtp://\" " @@ -621,14 +621,14 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:320 +#: ../scripts/bts.pl:338 msgid "" "Note that one of B<$DEBEMAIL> or B<$EMAIL> must be set in the environment in " "order to use direct SMTP connections to send emails." msgstr "" #. type: textblock -#: ../scripts/bts.pl:323 +#: ../scripts/bts.pl:341 msgid "" "Note that when sending directly via an SMTP host, specifying addresses in B<-" "-cc-addr> or B that the SMTP host will not relay will cause " @@ -636,7 +636,7 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:327 +#: ../scripts/bts.pl:345 msgid "" "Note also that the use of the B command may, when either B<--" "interactive> or B<--force-interactive> mode is enabled, lead to the " @@ -648,12 +648,12 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:334 +#: ../scripts/bts.pl:352 msgid "B<--smtp-username=>I, B<--smtp-password=>I" msgstr "" #. type: textblock -#: ../scripts/bts.pl:336 +#: ../scripts/bts.pl:354 msgid "" "Specify the credentials to use when connecting to the SMTP server specified " "by B<--smtp-host>. If the server does not require authentication then these " @@ -661,48 +661,48 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:340 +#: ../scripts/bts.pl:358 msgid "" "If a username is specified but not a password, B will prompt for the " "password before sending the mail." msgstr "" #. type: =item -#: ../scripts/bts.pl:343 +#: ../scripts/bts.pl:361 msgid "B<--smtp-helo=>I" msgstr "" #. type: textblock -#: ../scripts/bts.pl:345 +#: ../scripts/bts.pl:363 msgid "" "Specify the name to use in the I command when connecting to the SMTP " "server; defaults to the contents of the file F, if it exists." msgstr "" #. type: textblock -#: ../scripts/bts.pl:349 +#: ../scripts/bts.pl:367 msgid "" "Note that some SMTP servers may reject the use of a I which either " "does not resolve or does not appear to belong to the host using it." msgstr "" #. type: =item -#: ../scripts/bts.pl:352 +#: ../scripts/bts.pl:370 msgid "B<--bts-server>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:354 +#: ../scripts/bts.pl:372 msgid "Use a debbugs server other than bugs.debian.org." msgstr "" #. type: =item -#: ../scripts/bts.pl:356 +#: ../scripts/bts.pl:374 msgid "B<-f>, B<--force-refresh>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:358 +#: ../scripts/bts.pl:376 msgid "" "Download a bug report again, even if it does not appear to have changed " "since the last B command. Useful if a B<--cache-mode=full> is " @@ -711,116 +711,116 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:364 +#: ../scripts/bts.pl:382 msgid "B<--no-force-refresh>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:366 +#: ../scripts/bts.pl:384 msgid "Suppress any configuration file B<--force-refresh> option." msgstr "" #. type: =item -#: ../scripts/bts.pl:368 +#: ../scripts/bts.pl:386 msgid "B<--only-new>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:370 +#: ../scripts/bts.pl:388 msgid "" "Download only new bugs when caching. Do not check for updates in bugs we " "already have." msgstr "" #. type: =item -#: ../scripts/bts.pl:373 +#: ../scripts/bts.pl:391 msgid "B<--include-resolved>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:375 +#: ../scripts/bts.pl:393 msgid "" "When caching bug reports, include those that are marked as resolved. This " "is the default behaviour." msgstr "" #. type: =item -#: ../scripts/bts.pl:378 +#: ../scripts/bts.pl:396 msgid "B<--no-include-resolved>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:380 +#: ../scripts/bts.pl:398 msgid "" "Reverse the behaviour of the previous option. That is, do not cache bugs " "that are marked as resolved." msgstr "" #. type: =item -#: ../scripts/bts.pl:383 +#: ../scripts/bts.pl:401 msgid "B<--no-ack>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:385 +#: ../scripts/bts.pl:403 msgid "" "Suppress acknowledgment mails from the BTS. Note that this will only affect " "the copies of messages CCed to bugs, not those sent to the control bot." msgstr "" #. type: =item -#: ../scripts/bts.pl:389 +#: ../scripts/bts.pl:407 msgid "B<--ack>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:391 +#: ../scripts/bts.pl:409 msgid "" "Do not suppress acknowledgement mails. This is the default behaviour." msgstr "" #. type: =item -#: ../scripts/bts.pl:393 ../scripts/tagpending.pl:135 +#: ../scripts/bts.pl:411 ../scripts/tagpending.pl:135 msgid "B<-i>, B<--interactive>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:395 +#: ../scripts/bts.pl:413 msgid "" "Before sending an e-mail to the control bot, display the content and allow " "it to be edited, or the sending cancelled." msgstr "" #. type: =item -#: ../scripts/bts.pl:398 +#: ../scripts/bts.pl:416 msgid "B<--force-interactive>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:400 +#: ../scripts/bts.pl:418 msgid "" "Similar to B<--interactive>, with the exception that an editor is spawned " "before prompting for confirmation of the message to be sent." msgstr "" #. type: =item -#: ../scripts/bts.pl:403 +#: ../scripts/bts.pl:421 msgid "B<--no-interactive>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:405 +#: ../scripts/bts.pl:423 msgid "" "Send control e-mails without confirmation. This is the default behaviour." msgstr "" #. type: =item -#: ../scripts/bts.pl:407 ../scripts/dget.pl:550 +#: ../scripts/bts.pl:425 ../scripts/dget.pl:554 msgid "B<-q>, B<--quiet>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:409 +#: ../scripts/bts.pl:427 msgid "" "When running B, only display information about newly cached " "pages, not messages saying already cached. If this option is specified " @@ -828,89 +828,89 @@ msgstr "" #. type: TP -#: ../scripts/bts.pl:413 ../scripts/cvs-debrelease.1:57 ../scripts/cvs-debuild.1:38 ../scripts/debc.1:85 ../scripts/debchange.1:364 ../scripts/debclean.1:77 ../scripts/debdiff.1:151 ../scripts/debi.1:102 ../scripts/debrelease.1:95 ../scripts/debsign.1:96 ../scripts/debuild.1:221 ../scripts/dpkg-depcheck.1:92 ../scripts/dscverify.1:24 ../scripts/grep-excuses.1:14 ../scripts/licensecheck.pl:80 ../scripts/mass-bug.pl:112 ../scripts/nmudiff.1:69 ../scripts/rmadison.pl:281 ../scripts/uscan.1:442 ../scripts/uupdate.1:78 ../scripts/who-uploads.1:40 +#: ../scripts/bts.pl:431 ../scripts/cvs-debrelease.1:57 ../scripts/cvs-debuild.1:38 ../scripts/debc.1:85 ../scripts/debchange.1:377 ../scripts/debclean.1:77 ../scripts/debdiff.1:151 ../scripts/debi.1:102 ../scripts/debrelease.1:95 ../scripts/debsign.1:96 ../scripts/debuild.1:221 ../scripts/dpkg-depcheck.1:92 ../scripts/dscverify.1:24 ../scripts/grep-excuses.1:14 ../scripts/licensecheck.pl:89 ../scripts/mass-bug.pl:112 ../scripts/nmudiff.1:69 ../scripts/rmadison.pl:281 ../scripts/uscan.1:444 ../scripts/uupdate.1:78 ../scripts/who-uploads.1:40 #, no-wrap msgid "B<--no-conf>, B<--noconf>" msgstr "" #. type: Plain text -#: ../scripts/bts.pl:415 ../scripts/cvs-debrelease.1:61 ../scripts/debc.1:89 ../scripts/debchange.1:368 ../scripts/debclean.1:81 ../scripts/debdiff.1:155 ../scripts/debi.1:106 ../scripts/debrelease.1:99 ../scripts/debsign.1:100 ../scripts/debuild.1:225 ../scripts/dpkg-depcheck.1:96 ../scripts/dscverify.1:28 ../scripts/grep-excuses.1:18 ../scripts/mass-bug.pl:114 ../scripts/nmudiff.1:73 ../scripts/uscan.1:446 ../scripts/uupdate.1:82 ../scripts/who-uploads.1:44 +#: ../scripts/bts.pl:433 ../scripts/cvs-debrelease.1:61 ../scripts/debc.1:89 ../scripts/debchange.1:381 ../scripts/debclean.1:81 ../scripts/debdiff.1:155 ../scripts/debi.1:106 ../scripts/debrelease.1:99 ../scripts/debsign.1:100 ../scripts/debuild.1:225 ../scripts/dpkg-depcheck.1:96 ../scripts/dscverify.1:28 ../scripts/grep-excuses.1:18 ../scripts/mass-bug.pl:114 ../scripts/nmudiff.1:73 ../scripts/uscan.1:448 ../scripts/uupdate.1:82 ../scripts/who-uploads.1:44 msgid "" "Do not read any configuration files. This can only be used as the first " "option given on the command-line." msgstr "" #. type: =head1 -#: ../scripts/bts.pl:769 ../scripts/chdist.pl:55 +#: ../scripts/bts.pl:787 ../scripts/chdist.pl:55 msgid "COMMANDS" msgstr "" #. type: textblock -#: ../scripts/bts.pl:771 +#: ../scripts/bts.pl:789 msgid "" "For full details about the commands, see the BTS documentation. " "L" msgstr "" #. type: =item -#: ../scripts/bts.pl:776 +#: ../scripts/bts.pl:794 msgid "" "B [I] [I | I | I | B<:> ] " "[IB<=>I ...]" msgstr "" #. type: =item -#: ../scripts/bts.pl:778 +#: ../scripts/bts.pl:796 msgid "" "B [I] [BI | BI] " "[IB<=>I ...]" msgstr "" #. type: =item -#: ../scripts/bts.pl:780 +#: ../scripts/bts.pl:798 msgid "" "B [I] [BI | BI ] [IB<=>I " "...]" msgstr "" #. type: =item -#: ../scripts/bts.pl:782 +#: ../scripts/bts.pl:800 msgid "B [B | B... | B]" msgstr "" #. type: textblock -#: ../scripts/bts.pl:784 +#: ../scripts/bts.pl:802 msgid "This is a synonym for B." msgstr "" #. type: =item -#: ../scripts/bts.pl:792 +#: ../scripts/bts.pl:810 msgid "" "B [I] [I | I | I | B<:> ] " "[IB<=>I ...]" msgstr "" #. type: =item -#: ../scripts/bts.pl:794 +#: ../scripts/bts.pl:812 msgid "" "B [I] [BI | BI] " "[IB<=>I ...]" msgstr "" #. type: =item -#: ../scripts/bts.pl:796 +#: ../scripts/bts.pl:814 msgid "" "B [I] [BI | BI ] [IB<=>I " "...]" msgstr "" #. type: =item -#: ../scripts/bts.pl:798 +#: ../scripts/bts.pl:816 msgid "B [B | B... | B]" msgstr "" #. type: textblock -#: ../scripts/bts.pl:800 +#: ../scripts/bts.pl:818 msgid "" "Display the page listing the requested bugs in a web browser using sensible-" "browser(1)." @@ -928,17 +928,17 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:810 +#: ../scripts/bts.pl:828 msgid "The meanings of the possible arguments are as follows:" msgstr "" #. type: =item -#: ../scripts/bts.pl:814 +#: ../scripts/bts.pl:832 msgid "(none)" msgstr "" #. type: textblock -#: ../scripts/bts.pl:816 +#: ../scripts/bts.pl:834 msgid "" "If nothing is specified, B will display your bugs, assuming that " "either B or B (examined in that order) is set to the " @@ -946,72 +946,72 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:820 +#: ../scripts/bts.pl:838 msgid "I" msgstr "" #. type: textblock -#: ../scripts/bts.pl:822 +#: ../scripts/bts.pl:840 msgid "Display bug number I." msgstr "" #. type: =item -#: ../scripts/bts.pl:824 +#: ../scripts/bts.pl:842 msgid "I" msgstr "" #. type: textblock -#: ../scripts/bts.pl:826 +#: ../scripts/bts.pl:844 msgid "Display the bugs for the package I." msgstr "" #. type: =item -#: ../scripts/bts.pl:828 +#: ../scripts/bts.pl:846 msgid "BI" msgstr "" #. type: textblock -#: ../scripts/bts.pl:830 +#: ../scripts/bts.pl:848 msgid "Display the bugs for the source package I." msgstr "" #. type: =item -#: ../scripts/bts.pl:832 +#: ../scripts/bts.pl:850 msgid "I" msgstr "" #. type: textblock -#: ../scripts/bts.pl:834 +#: ../scripts/bts.pl:852 msgid "Display the bugs for the maintainer email address I." msgstr "" #. type: =item -#: ../scripts/bts.pl:836 +#: ../scripts/bts.pl:854 msgid "BI" msgstr "" #. type: textblock -#: ../scripts/bts.pl:838 +#: ../scripts/bts.pl:856 msgid "Display the bugs for the submitter email address I." msgstr "" #. type: =item -#: ../scripts/bts.pl:840 +#: ../scripts/bts.pl:858 msgid "BI" msgstr "" #. type: textblock -#: ../scripts/bts.pl:842 +#: ../scripts/bts.pl:860 msgid "Display the bugs which are tagged with I." msgstr "" #. type: =item -#: ../scripts/bts.pl:844 +#: ../scripts/bts.pl:862 msgid "BI" msgstr "" #. type: textblock -#: ../scripts/bts.pl:846 +#: ../scripts/bts.pl:864 msgid "" "Display the bugs which are tagged with usertag I. See the BTS " "documentation for more information on usertags. This will require the use " @@ -1019,12 +1019,12 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:850 +#: ../scripts/bts.pl:868 msgid "B<:>" msgstr "" #. type: textblock -#: ../scripts/bts.pl:852 +#: ../scripts/bts.pl:870 msgid "" "Details of the bug tracking system itself, along with a bug-request page " "with more options than this script, can be found on http://bugs.debian.org/. " @@ -1032,12 +1032,12 @@ msgstr "" #. type: =item -#: ../scripts/bts.pl:857 +#: ../scripts/bts.pl:875 msgid "B, B" msgstr "" #. type: textblock -#: ../scripts/bts.pl:859 +#: ../scripts/bts.pl:877 msgid "" "Display the front page of the release-critical pages on the BTS. This is a " "synonym for http://bugs.debian.org/release-critical/index.html. It is also " @@ -1046,7 +1046,7 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:866 +#: ../scripts/bts.pl:884 msgid "" "After the argument specifying what to display, you can optionally specify " "options to use to format the page or change what it displayed. These are " @@ -1057,7 +1057,7 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:873 +#: ../scripts/bts.pl:891 msgid "" "If caching has been enabled (that is, B<--no-cache> has not been used, and " "B has not been set to B), then any page requested by B commands following this on the command line will be " "executed after the browser has been exited." msgstr "" #. type: textblock -#: ../scripts/bts.pl:887 +#: ../scripts/bts.pl:905 msgid "" "The desired browser can be specified and configured by setting the " "B environment variable. The conventions follow those defined by " @@ -1087,7 +1087,7 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:892 +#: ../scripts/bts.pl:910 msgid "" "The value of B may consist of a colon-separated series of browser " "command parts. These should be tried in order until one succeeds. Each " @@ -1098,7 +1098,7 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:900 +#: ../scripts/bts.pl:918 msgid "" "Rationale: We need to be able to specify multiple browser commands so " "programs obeying this convention can do the right thing in either X or " @@ -1110,161 +1110,161 @@ msgstr "" #. type: textblock -#: ../scripts/bts.pl:908 +#: ../scripts/bts.pl:926 msgid "For example, on most Linux systems a good thing to do would be:" msgstr "" #. type: textblock -#: ../scripts/bts.pl:910 +#: ../scripts/bts.pl:928 msgid "BROWSER='mozilla -raise -remote \"openURL(%s,new-window)\":links'" msgstr "" #. type: =item -#: ../scripts/bts.pl:985 +#: ../scripts/bts.pl:1003 msgid "B