Show More
@@ -5,10 +5,13 b'' | |||||
5 | # Copyright (C) 2009 the Mercurial team |
|
5 | # Copyright (C) 2009 the Mercurial team | |
6 | # Dongsheng Song <dongsheng.song@gmail.com>, 2009 |
|
6 | # Dongsheng Song <dongsheng.song@gmail.com>, 2009 | |
7 | # |
|
7 | # | |
8 |
# $Id: zh.po 11 |
|
8 | # $Id: zh.po 1185 2009-02-17 15:10:31Z dongsheng.song $ | |
|
9 | # | |||
|
10 | # Update with pot file: | |||
|
11 | # msgmerge --update zh.po hg.pot | |||
|
12 | # msgfmt --statistics -c zh.po | |||
9 | # |
|
13 | # | |
10 | # Please test your translation before commit: |
|
14 | # Please test your translation before commit: | |
11 | # msgfmt --statistics -c i18n/zh.po |
|
|||
12 | # python setup.py build_py -c -d . build_ext -i build_mo |
|
15 | # python setup.py build_py -c -d . build_ext -i build_mo | |
13 | # LC_ALL=zh_CN.UTF-8 ./hg |
|
16 | # LC_ALL=zh_CN.UTF-8 ./hg | |
14 | # |
|
17 | # | |
@@ -23,14 +26,20 b'' | |||||
23 | # Dictionary: |
|
26 | # Dictionary: | |
24 | # blame 追溯 |
|
27 | # blame 追溯 | |
25 | # branch 分支 |
|
28 | # branch 分支 | |
|
29 | # changes 改变 | |||
|
30 | # changeset 改变集 | |||
26 | # checkout 检出 |
|
31 | # checkout 检出 | |
27 | # remove 移除(从版本库删除) |
|
32 | # remove 移除(从版本库删除) | |
28 | # delete 删除(只从文件系统删除) |
|
33 | # delete 删除(只从文件系统删除) | |
|
34 | # patchset 补丁集 | |||
|
35 | # pushing to 推到 | |||
|
36 | # pulling from 拉自 | |||
29 | # rename 改名 |
|
37 | # rename 改名 | |
30 | # repository 版本库 |
|
38 | # repository 版本库 | |
31 | # revert 恢复 |
|
39 | # revert 恢复 | |
32 | # revision 版本 |
|
40 | # revision 版本 | |
33 | # tag 标签 |
|
41 | # tag 标签 | |
|
42 | # tip 顶点 | |||
34 | # undo 撤销 |
|
43 | # undo 撤销 | |
35 | # unversioned 未版本控制 |
|
44 | # unversioned 未版本控制 | |
36 | # versioned 受版本控制 |
|
45 | # versioned 受版本控制 | |
@@ -40,8 +49,8 b' msgid ""' | |||||
40 | msgstr "" |
|
49 | msgstr "" | |
41 | "Project-Id-Version: Mercurial 1.2\n" |
|
50 | "Project-Id-Version: Mercurial 1.2\n" | |
42 | "Report-Msgid-Bugs-To: \n" |
|
51 | "Report-Msgid-Bugs-To: \n" | |
43 |
"POT-Creation-Date: 2009-02-1 |
|
52 | "POT-Creation-Date: 2009-02-17 21:43+0800\n" | |
44 |
"PO-Revision-Date: 2009-0 |
|
53 | "PO-Revision-Date: 2009-02-17 23:05+0800\n" | |
45 | "Last-Translator: Dongsheng Song <dongsheng.song@gmail.com>\n" |
|
54 | "Last-Translator: Dongsheng Song <dongsheng.song@gmail.com>\n" | |
46 | "Language-Team: Chinese translation team <i18n-zh@googlegroups.com>\n" |
|
55 | "Language-Team: Chinese translation team <i18n-zh@googlegroups.com>\n" | |
47 | "MIME-Version: 1.0\n" |
|
56 | "MIME-Version: 1.0\n" | |
@@ -929,6 +938,12 b' msgstr ""' | |||||
929 | msgid "show current changeset in ancestor branches" |
|
938 | msgid "show current changeset in ancestor branches" | |
930 | msgstr "" |
|
939 | msgstr "" | |
931 |
|
940 | |||
|
941 | msgid "ignored for compatibility" | |||
|
942 | msgstr "" | |||
|
943 | ||||
|
944 | msgid "hg debugcvsps [OPTION]... [PATH]..." | |||
|
945 | msgstr "" | |||
|
946 | ||||
932 | #, python-format |
|
947 | #, python-format | |
933 | msgid "%s is not a valid revision in current branch" |
|
948 | msgid "%s is not a valid revision in current branch" | |
934 | msgstr "" |
|
949 | msgstr "" | |
@@ -1154,107 +1169,107 b' msgstr ""' | |||||
1154 |
|
1169 | |||
1155 | #, python-format |
|
1170 | #, python-format | |
1156 | msgid "%s is not a local Mercurial repo" |
|
1171 | msgid "%s is not a local Mercurial repo" | |
1157 | msgstr "" |
|
1172 | msgstr "%s 不是本地的水银版本库" | |
1158 |
|
1173 | |||
1159 | #, python-format |
|
1174 | #, python-format | |
1160 | msgid "initializing destination %s repository\n" |
|
1175 | msgid "initializing destination %s repository\n" | |
1161 | msgstr "" |
|
1176 | msgstr "初始化目标版本库 %s\n" | |
1162 |
|
1177 | |||
1163 | msgid "run hg sink pre-conversion action\n" |
|
1178 | msgid "run hg sink pre-conversion action\n" | |
1164 | msgstr "" |
|
1179 | msgstr "执行动作 hg sink pre-conversion\n" | |
1165 |
|
1180 | |||
1166 | msgid "run hg sink post-conversion action\n" |
|
1181 | msgid "run hg sink post-conversion action\n" | |
1167 | msgstr "" |
|
1182 | msgstr "执行动作 hg sink post-conversion action\n" | |
1168 |
|
1183 | |||
1169 | #, python-format |
|
1184 | #, python-format | |
1170 | msgid "pulling from %s into %s\n" |
|
1185 | msgid "pulling from %s into %s\n" | |
1171 | msgstr "" |
|
1186 | msgstr "自 %s 拉到 %s\n" | |
1172 |
|
1187 | |||
1173 | msgid "updating tags\n" |
|
1188 | msgid "updating tags\n" | |
1174 | msgstr "" |
|
1189 | msgstr "正在更新标签\n" | |
1175 |
|
1190 | |||
1176 | #, python-format |
|
1191 | #, python-format | |
1177 | msgid "%s is not a valid start revision" |
|
1192 | msgid "%s is not a valid start revision" | |
1178 | msgstr "" |
|
1193 | msgstr "%s 不是有效的开始版本" | |
1179 |
|
1194 | |||
1180 | #, python-format |
|
1195 | #, python-format | |
1181 | msgid "ignoring: %s\n" |
|
1196 | msgid "ignoring: %s\n" | |
1182 | msgstr "" |
|
1197 | msgstr "忽略: %s\n" | |
1183 |
|
1198 | |||
1184 | msgid "run hg source pre-conversion action\n" |
|
1199 | msgid "run hg source pre-conversion action\n" | |
1185 | msgstr "" |
|
1200 | msgstr "执行动作 hg source pre-conversion\n" | |
1186 |
|
1201 | |||
1187 | msgid "run hg source post-conversion action\n" |
|
1202 | msgid "run hg source post-conversion action\n" | |
1188 | msgstr "" |
|
1203 | msgstr "执行动作 hg source post-conversion\n" | |
1189 |
|
1204 | |||
1190 | #, python-format |
|
1205 | #, python-format | |
1191 | msgid "%s does not look like a monotone repo" |
|
1206 | msgid "%s does not look like a monotone repo" | |
1192 | msgstr "" |
|
1207 | msgstr "%s 不像是单纯的 monotone 版本库" | |
1193 |
|
1208 | |||
1194 | #, python-format |
|
1209 | #, python-format | |
1195 | msgid "copying file in renamed dir from '%s' to '%s'" |
|
1210 | msgid "copying file in renamed dir from '%s' to '%s'" | |
1196 | msgstr "" |
|
1211 | msgstr "从已改名的目录 '%s' 复制文件到 '%s'" | |
1197 |
|
1212 | |||
1198 | msgid "Subversion python bindings could not be loaded" |
|
1213 | msgid "Subversion python bindings could not be loaded" | |
1199 | msgstr "" |
|
1214 | msgstr "不能加载 svn 的 python 绑定" | |
1200 |
|
1215 | |||
1201 | #, python-format |
|
1216 | #, python-format | |
1202 | msgid "Subversion python bindings %d.%d found, 1.4 or later required" |
|
1217 | msgid "Subversion python bindings %d.%d found, 1.4 or later required" | |
1203 | msgstr "" |
|
1218 | msgstr "发现 svn 的 python 绑定版本 %d.%d,需要 1.4 或更新的版本" | |
1204 |
|
1219 | |||
1205 | msgid "Subversion python bindings are too old, 1.4 or later required" |
|
1220 | msgid "Subversion python bindings are too old, 1.4 or later required" | |
1206 | msgstr "" |
|
1221 | msgstr "svn 的 python 绑定太旧,需要 1.4 或更新的版本" | |
1207 |
|
1222 | |||
1208 | #, python-format |
|
1223 | #, python-format | |
1209 | msgid "svn: revision %s is not an integer" |
|
1224 | msgid "svn: revision %s is not an integer" | |
1210 | msgstr "" |
|
1225 | msgstr "svn: 版本 %s 不是整数" | |
1211 |
|
1226 | |||
1212 | #, python-format |
|
1227 | #, python-format | |
1213 | msgid "svn: start revision %s is not an integer" |
|
1228 | msgid "svn: start revision %s is not an integer" | |
1214 | msgstr "" |
|
1229 | msgstr "svn: 开始版本 %s 不是整数" | |
1215 |
|
1230 | |||
1216 | #, python-format |
|
1231 | #, python-format | |
1217 | msgid "no revision found in module %s" |
|
1232 | msgid "no revision found in module %s" | |
1218 | msgstr "" |
|
1233 | msgstr "没有在模块 %s 中发现版本" | |
1219 |
|
1234 | |||
1220 | #, python-format |
|
1235 | #, python-format | |
1221 | msgid "expected %s to be at %r, but not found" |
|
1236 | msgid "expected %s to be at %r, but not found" | |
1222 | msgstr "" |
|
1237 | msgstr "期望 %s 位于 %r,但是没有发现" | |
1223 |
|
1238 | |||
1224 | #, python-format |
|
1239 | #, python-format | |
1225 | msgid "found %s at %r\n" |
|
1240 | msgid "found %s at %r\n" | |
1226 | msgstr "" |
|
1241 | msgstr "发现 %s 位于 %r\n" | |
1227 |
|
1242 | |||
1228 | #, python-format |
|
1243 | #, python-format | |
1229 | msgid "ignoring empty branch %s\n" |
|
1244 | msgid "ignoring empty branch %s\n" | |
1230 | msgstr "" |
|
1245 | msgstr "忽略空的分支 %s\n" | |
1231 |
|
1246 | |||
1232 | #, python-format |
|
1247 | #, python-format | |
1233 | msgid "found branch %s at %d\n" |
|
1248 | msgid "found branch %s at %d\n" | |
1234 | msgstr "" |
|
1249 | msgstr "发现分支 %s 位于 %d\n" | |
1235 |
|
1250 | |||
1236 | msgid "svn: start revision is not supported with with more than one branch" |
|
1251 | msgid "svn: start revision is not supported with with more than one branch" | |
1237 | msgstr "" |
|
1252 | msgstr "svn: 在给出多于一个分支时不支持开始版本" | |
1238 |
|
1253 | |||
1239 | #, python-format |
|
1254 | #, python-format | |
1240 | msgid "svn: no revision found after start revision %d" |
|
1255 | msgid "svn: no revision found after start revision %d" | |
1241 | msgstr "" |
|
1256 | msgstr "svn: 在开始版本 %d 之后没有版本" | |
1242 |
|
1257 | |||
1243 | #, python-format |
|
1258 | #, python-format | |
1244 | msgid "no tags found at revision %d\n" |
|
1259 | msgid "no tags found at revision %d\n" | |
1245 | msgstr "" |
|
1260 | msgstr "在版本 %d 没有发现标签\n" | |
1246 |
|
1261 | |||
1247 | #, python-format |
|
1262 | #, python-format | |
1248 | msgid "ignoring foreign branch %r\n" |
|
1263 | msgid "ignoring foreign branch %r\n" | |
1249 | msgstr "" |
|
1264 | msgstr "忽略外部分支 %r\n" | |
1250 |
|
1265 | |||
1251 | #, python-format |
|
1266 | #, python-format | |
1252 | msgid "%s not found up to revision %d" |
|
1267 | msgid "%s not found up to revision %d" | |
1253 | msgstr "" |
|
1268 | msgstr "没有发现 %s,一直到版本 %d" | |
1254 |
|
1269 | |||
1255 | #, python-format |
|
1270 | #, python-format | |
1256 | msgid "branch renamed from %s to %s at %d\n" |
|
1271 | msgid "branch renamed from %s to %s at %d\n" | |
1257 | msgstr "" |
|
1272 | msgstr "分支从 %s 改名为 %s,在 %d\n" | |
1258 |
|
1273 | |||
1259 | #, python-format |
|
1274 | #, python-format | |
1260 | msgid "reparent to %s\n" |
|
1275 | msgid "reparent to %s\n" | |
@@ -1262,79 +1277,79 b' msgstr ""' | |||||
1262 |
|
1277 | |||
1263 | #, python-format |
|
1278 | #, python-format | |
1264 | msgid "copied to %s from %s@%s\n" |
|
1279 | msgid "copied to %s from %s@%s\n" | |
1265 | msgstr "" |
|
1280 | msgstr "复制到 %s,自 %s@%s\n" | |
1266 |
|
1281 | |||
1267 | #, python-format |
|
1282 | #, python-format | |
1268 | msgid "gone from %s\n" |
|
1283 | msgid "gone from %s\n" | |
1269 | msgstr "" |
|
1284 | msgstr "离开 %s\n" | |
1270 |
|
1285 | |||
1271 | #, python-format |
|
1286 | #, python-format | |
1272 | msgid "found parent directory %s\n" |
|
1287 | msgid "found parent directory %s\n" | |
1273 | msgstr "" |
|
1288 | msgstr "发现父目录 %s\n" | |
1274 |
|
1289 | |||
1275 | #, python-format |
|
1290 | #, python-format | |
1276 | msgid "base, entry %s %s\n" |
|
1291 | msgid "base, entry %s %s\n" | |
1277 | msgstr "" |
|
1292 | msgstr "基本,入口 %s %s\n" | |
1278 |
|
1293 | |||
1279 | msgid "munge-o-matic\n" |
|
1294 | msgid "munge-o-matic\n" | |
1280 | msgstr "" |
|
1295 | msgstr "" | |
1281 |
|
1296 | |||
1282 | #, python-format |
|
1297 | #, python-format | |
1283 | msgid "info: %s %s %s %s\n" |
|
1298 | msgid "info: %s %s %s %s\n" | |
1284 | msgstr "" |
|
1299 | msgstr "信息: %s %s %s %s\n" | |
1285 |
|
1300 | |||
1286 | #, python-format |
|
1301 | #, python-format | |
1287 | msgid "unknown path in revision %d: %s\n" |
|
1302 | msgid "unknown path in revision %d: %s\n" | |
1288 | msgstr "" |
|
1303 | msgstr "版本 %d 有未知路径: %s\n" | |
1289 |
|
1304 | |||
1290 | #, python-format |
|
1305 | #, python-format | |
1291 | msgid "mark %s came from %s:%d\n" |
|
1306 | msgid "mark %s came from %s:%d\n" | |
1292 | msgstr "" |
|
1307 | msgstr "标记 %s 来自 %s:%d\n" | |
1293 |
|
1308 | |||
1294 | #, python-format |
|
1309 | #, python-format | |
1295 | msgid "parsing revision %d (%d changes)\n" |
|
1310 | msgid "parsing revision %d (%d changes)\n" | |
1296 | msgstr "" |
|
1311 | msgstr "解析版本 %d (%d 个改变)\n" | |
1297 |
|
1312 | |||
1298 | #, python-format |
|
1313 | #, python-format | |
1299 | msgid "found parent of branch %s at %d: %s\n" |
|
1314 | msgid "found parent of branch %s at %d: %s\n" | |
1300 | msgstr "" |
|
1315 | msgstr "发现分支 %s 的父亲,在 %d: %s\n" | |
1301 |
|
1316 | |||
1302 | msgid "no copyfrom path, don't know what to do.\n" |
|
1317 | msgid "no copyfrom path, don't know what to do.\n" | |
1303 | msgstr "" |
|
1318 | msgstr "没有 copyfrom 路径,不知道该怎么办。\n" | |
1304 |
|
1319 | |||
1305 | #, python-format |
|
1320 | #, python-format | |
1306 | msgid "fetching revision log for \"%s\" from %d to %d\n" |
|
1321 | msgid "fetching revision log for \"%s\" from %d to %d\n" | |
1307 | msgstr "" |
|
1322 | msgstr "为 \"%s\" 获取版本日志,自 %d 到 %d\n" | |
1308 |
|
1323 | |||
1309 | #, python-format |
|
1324 | #, python-format | |
1310 | msgid "skipping blacklisted revision %d\n" |
|
1325 | msgid "skipping blacklisted revision %d\n" | |
1311 | msgstr "" |
|
1326 | msgstr "忽略黑名单版本 %d\n" | |
1312 |
|
1327 | |||
1313 | #, python-format |
|
1328 | #, python-format | |
1314 | msgid "revision %d has no entries\n" |
|
1329 | msgid "revision %d has no entries\n" | |
1315 | msgstr "" |
|
1330 | msgstr "版本 %d 没有入口\n" | |
1316 |
|
1331 | |||
1317 | #, python-format |
|
1332 | #, python-format | |
1318 | msgid "svn: branch has no revision %s" |
|
1333 | msgid "svn: branch has no revision %s" | |
1319 | msgstr "" |
|
1334 | msgstr "svn: 分支没有版本 %s" | |
1320 |
|
1335 | |||
1321 | #, python-format |
|
1336 | #, python-format | |
1322 | msgid "%r is not under %r, ignoring\n" |
|
1337 | msgid "%r is not under %r, ignoring\n" | |
1323 | msgstr "" |
|
1338 | msgstr "%r 不在 %r 之下,忽略之\n" | |
1324 |
|
1339 | |||
1325 | #, python-format |
|
1340 | #, python-format | |
1326 | msgid "initializing svn repo %r\n" |
|
1341 | msgid "initializing svn repo %r\n" | |
1327 | msgstr "" |
|
1342 | msgstr "初始化 svn 版本库 %r\n" | |
1328 |
|
1343 | |||
1329 | #, python-format |
|
1344 | #, python-format | |
1330 | msgid "initializing svn wc %r\n" |
|
1345 | msgid "initializing svn wc %r\n" | |
1331 | msgstr "" |
|
1346 | msgstr "初始化 svn 工作副本 %r\n" | |
1332 |
|
1347 | |||
1333 | msgid "unexpected svn output:\n" |
|
1348 | msgid "unexpected svn output:\n" | |
1334 | msgstr "" |
|
1349 | msgstr "意外的 svn 输出:\n" | |
1335 |
|
1350 | |||
1336 | msgid "unable to cope with svn output" |
|
1351 | msgid "unable to cope with svn output" | |
1337 | msgstr "" |
|
1352 | msgstr "不能处理 svn 的输出" | |
1338 |
|
1353 | |||
1339 | msgid "XXX TAGS NOT IMPLEMENTED YET\n" |
|
1354 | msgid "XXX TAGS NOT IMPLEMENTED YET\n" | |
1340 | msgstr "" |
|
1355 | msgstr "" | |
@@ -1407,6 +1422,9 b' msgid ""' | |||||
1407 | " " |
|
1422 | " " | |
1408 | msgstr "" |
|
1423 | msgstr "" | |
1409 |
|
1424 | |||
|
1425 | msgid "cannot specify --rev and --change at the same time" | |||
|
1426 | msgstr "不能同时指定 '--rev' 和 '--change'" | |||
|
1427 | ||||
1410 | #, python-format |
|
1428 | #, python-format | |
1411 | msgid "running %r in %s\n" |
|
1429 | msgid "running %r in %s\n" | |
1412 | msgstr "" |
|
1430 | msgstr "" | |
@@ -1443,6 +1461,9 b' msgstr ""' | |||||
1443 | msgid "pass option to comparison program" |
|
1461 | msgid "pass option to comparison program" | |
1444 | msgstr "" |
|
1462 | msgstr "" | |
1445 |
|
1463 | |||
|
1464 | msgid "change made by revision" | |||
|
1465 | msgstr "此版本的修改" | |||
|
1466 | ||||
1446 | msgid "hg extdiff [OPT]... [FILE]..." |
|
1467 | msgid "hg extdiff [OPT]... [FILE]..." | |
1447 | msgstr "" |
|
1468 | msgstr "" | |
1448 |
|
1469 | |||
@@ -1494,7 +1515,7 b' msgstr ""' | |||||
1494 |
|
1515 | |||
1495 | #, python-format |
|
1516 | #, python-format | |
1496 | msgid "pulling from %s\n" |
|
1517 | msgid "pulling from %s\n" | |
1497 | msgstr "" |
|
1518 | msgstr "正在拉自 %s\n" | |
1498 |
|
1519 | |||
1499 | msgid "fetch -r doesn't work for remote repositories yet" |
|
1520 | msgid "fetch -r doesn't work for remote repositories yet" | |
1500 | msgstr "" |
|
1521 | msgstr "" | |
@@ -1724,7 +1745,7 b' msgid "comparing with %s\\n"' | |||||
1724 | msgstr "" |
|
1745 | msgstr "" | |
1725 |
|
1746 | |||
1726 | msgid "no changes found\n" |
|
1747 | msgid "no changes found\n" | |
1727 | msgstr "" |
|
1748 | msgstr "没有发现修改\n" | |
1728 |
|
1749 | |||
1729 | msgid "" |
|
1750 | msgid "" | |
1730 | "show the incoming changesets alongside an ASCII revision graph\n" |
|
1751 | "show the incoming changesets alongside an ASCII revision graph\n" | |
@@ -2290,6 +2311,8 b' msgid ""' | |||||
2290 | "\n" |
|
2311 | "\n" | |
2291 | "removing temporary repo %s\n" |
|
2312 | "removing temporary repo %s\n" | |
2292 | msgstr "" |
|
2313 | msgstr "" | |
|
2314 | "\n" | |||
|
2315 | "正在删除临时版本库 %s\n" | |||
2293 |
|
2316 | |||
2294 | msgid "" |
|
2317 | msgid "" | |
2295 | "expand keywords in working directory\n" |
|
2318 | "expand keywords in working directory\n" | |
@@ -3009,13 +3032,10 b' msgid ""' | |||||
3009 | "\n" |
|
3032 | "\n" | |
3010 | " With no arguments, print the currently active guards.\n" |
|
3033 | " With no arguments, print the currently active guards.\n" | |
3011 | " With arguments, set guards for the named patch.\n" |
|
3034 | " With arguments, set guards for the named patch.\n" | |
3012 | "\n" |
|
3035 | " NOTE: Specifying negative guards now requires '--'.\n" | |
3013 | " To set a negative guard \"-foo\" on topmost patch (\"--\" is needed so\n" |
|
|||
3014 | " hg will not interpret \"-foo\" as an option):\n" |
|
|||
3015 | " hg qguard -- -foo\n" |
|
|||
3016 | "\n" |
|
3036 | "\n" | |
3017 | " To set guards on another patch:\n" |
|
3037 | " To set guards on another patch:\n" | |
3018 | " hg qguard other.patch +2.6.17 -stable\n" |
|
3038 | " hg qguard -- other.patch +2.6.17 -stable\n" | |
3019 | " " |
|
3039 | " " | |
3020 | msgstr "" |
|
3040 | msgstr "" | |
3021 |
|
3041 | |||
@@ -3270,7 +3290,7 b' msgstr ""' | |||||
3270 | msgid "drop all guards" |
|
3290 | msgid "drop all guards" | |
3271 | msgstr "" |
|
3291 | msgstr "" | |
3272 |
|
3292 | |||
3273 | msgid "hg qguard [-l] [-n] [PATCH] [+GUARD]... [-GUARD]..." |
|
3293 | msgid "hg qguard [-l] [-n] -- [PATCH] [+GUARD]... [-GUARD]..." | |
3274 | msgstr "" |
|
3294 | msgstr "" | |
3275 |
|
3295 | |||
3276 | msgid "hg qheader [PATCH]" |
|
3296 | msgid "hg qheader [PATCH]" | |
@@ -3877,11 +3897,11 b' msgstr ""' | |||||
3877 |
|
3897 | |||
3878 | #, python-format |
|
3898 | #, python-format | |
3879 | msgid "Removing file %s\n" |
|
3899 | msgid "Removing file %s\n" | |
3880 | msgstr "" |
|
3900 | msgstr "正在删除文件 %s\n" | |
3881 |
|
3901 | |||
3882 | #, python-format |
|
3902 | #, python-format | |
3883 | msgid "Removing directory %s\n" |
|
3903 | msgid "Removing directory %s\n" | |
3884 | msgstr "" |
|
3904 | msgstr "正在删除目录 %s\n" | |
3885 |
|
3905 | |||
3886 | msgid "abort if an error occurs" |
|
3906 | msgid "abort if an error occurs" | |
3887 | msgstr "" |
|
3907 | msgstr "" | |
@@ -4078,7 +4098,7 b' msgstr ""' | |||||
4078 | msgid "Call rebase after pull if the latter has been invoked with --rebase" |
|
4098 | msgid "Call rebase after pull if the latter has been invoked with --rebase" | |
4079 | msgstr "" |
|
4099 | msgstr "" | |
4080 |
|
4100 | |||
4081 | msgid "--update and --rebase are not compatible" |
|
4101 | msgid "--update and --rebase are not compatible, ignoring the update flag\n" | |
4082 | msgstr "" |
|
4102 | msgstr "" | |
4083 |
|
4103 | |||
4084 | msgid "Replace pull with a decorator to provide --rebase option" |
|
4104 | msgid "Replace pull with a decorator to provide --rebase option" | |
@@ -4213,7 +4233,7 b' msgid "q"' | |||||
4213 | msgstr "" |
|
4233 | msgstr "" | |
4214 |
|
4234 | |||
4215 | msgid "user quit" |
|
4235 | msgid "user quit" | |
4216 | msgstr "" |
|
4236 | msgstr "用户退出" | |
4217 |
|
4237 | |||
4218 | #, python-format |
|
4238 | #, python-format | |
4219 | msgid "examine changes to %s?" |
|
4239 | msgid "examine changes to %s?" | |
@@ -4651,7 +4671,7 b' msgstr ""' | |||||
4651 |
|
4671 | |||
4652 | #, python-format |
|
4672 | #, python-format | |
4653 | msgid "removing %s\n" |
|
4673 | msgid "removing %s\n" | |
4654 | msgstr "" |
|
4674 | msgstr "正在删除 %s\n" | |
4655 |
|
4675 | |||
4656 | #, python-format |
|
4676 | #, python-format | |
4657 | msgid "recording removal of %s as rename to %s (%d%% similar)\n" |
|
4677 | msgid "recording removal of %s as rename to %s (%d%% similar)\n" | |
@@ -4706,63 +4726,63 b' msgid "no files to copy"' | |||||
4706 | msgstr "" |
|
4726 | msgstr "" | |
4707 |
|
4727 | |||
4708 | msgid "(consider using --after)\n" |
|
4728 | msgid "(consider using --after)\n" | |
4709 | msgstr "" |
|
4729 | msgstr "(考虑使用 --after)\n" | |
4710 |
|
4730 | |||
4711 | #, python-format |
|
4731 | #, python-format | |
4712 | msgid "changeset: %d:%s\n" |
|
4732 | msgid "changeset: %d:%s\n" | |
4713 | msgstr "" |
|
4733 | msgstr "修改集: %d:%s\n" | |
4714 |
|
4734 | |||
4715 | #, python-format |
|
4735 | #, python-format | |
4716 | msgid "branch: %s\n" |
|
4736 | msgid "branch: %s\n" | |
4717 | msgstr "" |
|
4737 | msgstr "分支: %s\n" | |
4718 |
|
4738 | |||
4719 | #, python-format |
|
4739 | #, python-format | |
4720 | msgid "tag: %s\n" |
|
4740 | msgid "tag: %s\n" | |
4721 | msgstr "" |
|
4741 | msgstr "标签: %s\n" | |
4722 |
|
4742 | |||
4723 | #, python-format |
|
4743 | #, python-format | |
4724 | msgid "parent: %d:%s\n" |
|
4744 | msgid "parent: %d:%s\n" | |
4725 | msgstr "" |
|
4745 | msgstr "父亲: %d:%s\n" | |
4726 |
|
4746 | |||
4727 | #, python-format |
|
4747 | #, python-format | |
4728 | msgid "manifest: %d:%s\n" |
|
4748 | msgid "manifest: %d:%s\n" | |
4729 | msgstr "" |
|
4749 | msgstr "清单: %d:%s\n" | |
4730 |
|
4750 | |||
4731 | #, python-format |
|
4751 | #, python-format | |
4732 | msgid "user: %s\n" |
|
4752 | msgid "user: %s\n" | |
4733 | msgstr "" |
|
4753 | msgstr "用户: %s\n" | |
4734 |
|
4754 | |||
4735 | #, python-format |
|
4755 | #, python-format | |
4736 | msgid "date: %s\n" |
|
4756 | msgid "date: %s\n" | |
4737 | msgstr "" |
|
4757 | msgstr "日期: %s\n" | |
4738 |
|
4758 | |||
4739 | msgid "files+:" |
|
4759 | msgid "files+:" | |
4740 | msgstr "" |
|
4760 | msgstr "文件+:" | |
4741 |
|
4761 | |||
4742 | msgid "files-:" |
|
4762 | msgid "files-:" | |
4743 | msgstr "" |
|
4763 | msgstr "文件-:" | |
4744 |
|
4764 | |||
4745 | msgid "files:" |
|
4765 | msgid "files:" | |
4746 | msgstr "" |
|
4766 | msgstr "文件:" | |
4747 |
|
4767 | |||
4748 | #, python-format |
|
4768 | #, python-format | |
4749 | msgid "files: %s\n" |
|
4769 | msgid "files: %s\n" | |
4750 | msgstr "" |
|
4770 | msgstr "文件: %s\n" | |
4751 |
|
4771 | |||
4752 | #, python-format |
|
4772 | #, python-format | |
4753 | msgid "copies: %s\n" |
|
4773 | msgid "copies: %s\n" | |
4754 | msgstr "" |
|
4774 | msgstr "复制: %s\n" | |
4755 |
|
4775 | |||
4756 | #, python-format |
|
4776 | #, python-format | |
4757 | msgid "extra: %s=%s\n" |
|
4777 | msgid "extra: %s=%s\n" | |
4758 | msgstr "" |
|
4778 | msgstr "额外: %s=%s\n" | |
4759 |
|
4779 | |||
4760 | msgid "description:\n" |
|
4780 | msgid "description:\n" | |
4761 | msgstr "" |
|
4781 | msgstr "描述:\n" | |
4762 |
|
4782 | |||
4763 | #, python-format |
|
4783 | #, python-format | |
4764 | msgid "summary: %s\n" |
|
4784 | msgid "summary: %s\n" | |
4765 | msgstr "" |
|
4785 | msgstr "摘要: %s\n" | |
4766 |
|
4786 | |||
4767 | #, python-format |
|
4787 | #, python-format | |
4768 | msgid "%s: no key named '%s'" |
|
4788 | msgid "%s: no key named '%s'" | |
@@ -5239,7 +5259,7 b' msgstr ""' | |||||
5239 |
|
5259 | |||
5240 | #, python-format |
|
5260 | #, python-format | |
5241 | msgid "committed changeset %d:%s\n" |
|
5261 | msgid "committed changeset %d:%s\n" | |
5242 | msgstr "" |
|
5262 | msgstr "提交修改集 %d:%s\n" | |
5243 |
|
5263 | |||
5244 | msgid "" |
|
5264 | msgid "" | |
5245 | "mark files as copied for the next commit\n" |
|
5265 | "mark files as copied for the next commit\n" | |
@@ -5472,9 +5492,6 b' msgstr ""' | |||||
5472 | " 更多信息。\n" |
|
5492 | " 更多信息。\n" | |
5473 | " " |
|
5493 | " " | |
5474 |
|
5494 | |||
5475 | msgid "cannot specify --rev and --change at the same time" |
|
|||
5476 | msgstr "不能同时指定 '--rev' 和 '--change'" |
|
|||
5477 |
|
||||
5478 | msgid "" |
|
5495 | msgid "" | |
5479 | "dump the header and diffs for one or more changesets\n" |
|
5496 | "dump the header and diffs for one or more changesets\n" | |
5480 | "\n" |
|
5497 | "\n" | |
@@ -5964,8 +5981,9 b' msgstr ""' | |||||
5964 | msgid "" |
|
5981 | msgid "" | |
5965 | "show aliases for remote repositories\n" |
|
5982 | "show aliases for remote repositories\n" | |
5966 | "\n" |
|
5983 | "\n" | |
5967 |
" |
|
5984 | " Show definition of symbolic path name NAME. If no name is given, show\n" | |
5968 |
" |
|
5985 | " definition of available names.\n" | |
|
5986 | "\n" | |||
5969 | " Path names are defined in the [paths] section of /etc/mercurial/hgrc\n" |
|
5987 | " Path names are defined in the [paths] section of /etc/mercurial/hgrc\n" | |
5970 | " and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.\n" |
|
5988 | " and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.\n" | |
5971 | "\n" |
|
5989 | "\n" | |
@@ -6056,7 +6074,7 b' msgstr ""' | |||||
6056 |
|
6074 | |||
6057 | #, python-format |
|
6075 | #, python-format | |
6058 | msgid "pushing to %s\n" |
|
6076 | msgid "pushing to %s\n" | |
6059 | msgstr "" |
|
6077 | msgstr "正在推到 %s\n" | |
6060 |
|
6078 | |||
6061 | msgid "" |
|
6079 | msgid "" | |
6062 | "raw commit interface (DEPRECATED)\n" |
|
6080 | "raw commit interface (DEPRECATED)\n" | |
@@ -6236,23 +6254,23 b' msgstr ""' | |||||
6236 |
|
6254 | |||
6237 | #, python-format |
|
6255 | #, python-format | |
6238 | msgid "reverting %s\n" |
|
6256 | msgid "reverting %s\n" | |
6239 | msgstr "" |
|
6257 | msgstr "正在恢复 %s\n" | |
6240 |
|
6258 | |||
6241 | #, python-format |
|
6259 | #, python-format | |
6242 | msgid "undeleting %s\n" |
|
6260 | msgid "undeleting %s\n" | |
6243 | msgstr "" |
|
6261 | msgstr "正在撤销删除 %s\n" | |
6244 |
|
6262 | |||
6245 | #, python-format |
|
6263 | #, python-format | |
6246 | msgid "saving current version of %s as %s\n" |
|
6264 | msgid "saving current version of %s as %s\n" | |
6247 | msgstr "" |
|
6265 | msgstr "保存当前版本的 %s 为 %s\n" | |
6248 |
|
6266 | |||
6249 | #, python-format |
|
6267 | #, python-format | |
6250 | msgid "file not managed: %s\n" |
|
6268 | msgid "file not managed: %s\n" | |
6251 | msgstr "" |
|
6269 | msgstr "文件未被控制: %s\n" | |
6252 |
|
6270 | |||
6253 | #, python-format |
|
6271 | #, python-format | |
6254 | msgid "no changes needed to %s\n" |
|
6272 | msgid "no changes needed to %s\n" | |
6255 | msgstr "" |
|
6273 | msgstr "不需要改变 %s\n" | |
6256 |
|
6274 | |||
6257 | msgid "" |
|
6275 | msgid "" | |
6258 | "roll back the last transaction\n" |
|
6276 | "roll back the last transaction\n" | |
@@ -6831,9 +6849,6 b' msgstr ""' | |||||
6831 | msgid "[OPTION]..." |
|
6849 | msgid "[OPTION]..." | |
6832 | msgstr "" |
|
6850 | msgstr "" | |
6833 |
|
6851 | |||
6834 | msgid "change made by revision" |
|
|||
6835 | msgstr "此版本的修改" |
|
|||
6836 |
|
||||
6837 | msgid "[OPTION]... [-r REV1 [-r REV2]] [FILE]..." |
|
6852 | msgid "[OPTION]... [-r REV1 [-r REV2]] [FILE]..." | |
6838 | msgstr "" |
|
6853 | msgstr "" | |
6839 |
|
6854 | |||
@@ -7240,7 +7255,7 b' msgstr ""' | |||||
7240 |
|
7255 | |||
7241 | #, python-format |
|
7256 | #, python-format | |
7242 | msgid "abort: %s\n" |
|
7257 | msgid "abort: %s\n" | |
7243 | msgstr "" |
|
7258 | msgstr "中止: %s\n" | |
7244 |
|
7259 | |||
7245 | #, python-format |
|
7260 | #, python-format | |
7246 | msgid "" |
|
7261 | msgid "" | |
@@ -7258,11 +7273,11 b' msgstr ""' | |||||
7258 |
|
7273 | |||
7259 | #, python-format |
|
7274 | #, python-format | |
7260 | msgid "abort: %s: %s\n" |
|
7275 | msgid "abort: %s: %s\n" | |
7261 | msgstr "" |
|
7276 | msgstr "中止: %s: %s\n" | |
7262 |
|
7277 | |||
7263 | #, python-format |
|
7278 | #, python-format | |
7264 | msgid "abort: could not lock %s: %s\n" |
|
7279 | msgid "abort: could not lock %s: %s\n" | |
7265 | msgstr "" |
|
7280 | msgstr "中止: 不能锁定 %s: %s\n" | |
7266 |
|
7281 | |||
7267 | #, python-format |
|
7282 | #, python-format | |
7268 | msgid "hg %s: %s\n" |
|
7283 | msgid "hg %s: %s\n" | |
@@ -7274,11 +7289,11 b' msgstr ""' | |||||
7274 |
|
7289 | |||
7275 | #, python-format |
|
7290 | #, python-format | |
7276 | msgid "abort: %s!\n" |
|
7291 | msgid "abort: %s!\n" | |
7277 | msgstr "" |
|
7292 | msgstr "中止: %s!\n" | |
7278 |
|
7293 | |||
7279 | #, python-format |
|
7294 | #, python-format | |
7280 | msgid "abort: %s" |
|
7295 | msgid "abort: %s" | |
7281 | msgstr "" |
|
7296 | msgstr "中止: %s" | |
7282 |
|
7297 | |||
7283 | msgid " empty string\n" |
|
7298 | msgid " empty string\n" | |
7284 | msgstr "" |
|
7299 | msgstr "" | |
@@ -7292,40 +7307,42 b' msgstr "hg: \xe6\x9c\xaa\xe7\x9f\xa5\xe5\x91\xbd\xe4\xbb\xa4 \'%s\'\\n"' | |||||
7292 |
|
7307 | |||
7293 | #, python-format |
|
7308 | #, python-format | |
7294 | msgid "abort: could not import module %s!\n" |
|
7309 | msgid "abort: could not import module %s!\n" | |
7295 | msgstr "" |
|
7310 | msgstr "中止: 不能导入模块 %s!\n" | |
7296 |
|
7311 | |||
7297 | msgid "(did you forget to compile extensions?)\n" |
|
7312 | msgid "(did you forget to compile extensions?)\n" | |
7298 | msgstr "" |
|
7313 | msgstr "(你是否忘记了编译扩展?)\n" | |
7299 |
|
7314 | |||
7300 | msgid "(is your Python install correct?)\n" |
|
7315 | msgid "(is your Python install correct?)\n" | |
7301 | msgstr "" |
|
7316 | msgstr "(你的 Python 安装正确吗?)\n" | |
7302 |
|
7317 | |||
7303 | #, python-format |
|
7318 | #, python-format | |
7304 | msgid "abort: error: %s\n" |
|
7319 | msgid "abort: error: %s\n" | |
7305 | msgstr "" |
|
7320 | msgstr "中止: 失败: %s\n" | |
7306 |
|
7321 | |||
7307 | msgid "broken pipe\n" |
|
7322 | msgid "broken pipe\n" | |
7308 | msgstr "" |
|
7323 | msgstr "坏掉的管道\n" | |
7309 |
|
7324 | |||
7310 | msgid "interrupted!\n" |
|
7325 | msgid "interrupted!\n" | |
7311 | msgstr "" |
|
7326 | msgstr "中断!\n" | |
7312 |
|
7327 | |||
7313 | msgid "" |
|
7328 | msgid "" | |
7314 | "\n" |
|
7329 | "\n" | |
7315 | "broken pipe\n" |
|
7330 | "broken pipe\n" | |
7316 | msgstr "" |
|
7331 | msgstr "" | |
|
7332 | "\n" | |||
|
7333 | "坏掉的管道\n" | |||
7317 |
|
7334 | |||
7318 | msgid "abort: out of memory\n" |
|
7335 | msgid "abort: out of memory\n" | |
7319 | msgstr "" |
|
7336 | msgstr "中止: 内存不足\n" | |
7320 |
|
7337 | |||
7321 | msgid "** unknown exception encountered, details follow\n" |
|
7338 | msgid "** unknown exception encountered, details follow\n" | |
7322 | msgstr "" |
|
7339 | msgstr "** 遇到了未知异常,详细信息如下\n" | |
7323 |
|
7340 | |||
7324 | msgid "** report bug details to http://www.selenic.com/mercurial/bts\n" |
|
7341 | msgid "** report bug details to http://www.selenic.com/mercurial/bts\n" | |
7325 | msgstr "" |
|
7342 | msgstr "** 报告问题详情到 http://www.selenic.com/mercurial/bts\n" | |
7326 |
|
7343 | |||
7327 | msgid "** or mercurial@selenic.com\n" |
|
7344 | msgid "** or mercurial@selenic.com\n" | |
7328 | msgstr "" |
|
7345 | msgstr "** 或 mercurial@selenic.com\n" | |
7329 |
|
7346 | |||
7330 | #, python-format |
|
7347 | #, python-format | |
7331 | msgid "** Mercurial Distributed SCM (version %s)\n" |
|
7348 | msgid "** Mercurial Distributed SCM (version %s)\n" | |
@@ -7333,37 +7350,38 b' msgstr "** \xe5\x88\x86\xe5\xb8\x83\xe5\xbc\x8f\xe8\xbd\xaf\xe4\xbb\xb6\xe9\x85\x8d\xe7\xbd\xae\xe7\xae\xa1\xe7\x90\x86\xe5\xb7\xa5\xe5\x85\xb7 - \xe6\xb0\xb4\xe9\x93\xb6 (\xe7\x89\x88\xe6\x9c\xac %s)\\n"' | |||||
7333 |
|
7350 | |||
7334 | #, python-format |
|
7351 | #, python-format | |
7335 | msgid "** Extensions loaded: %s\n" |
|
7352 | msgid "** Extensions loaded: %s\n" | |
7336 | msgstr "" |
|
7353 | msgstr "** 已加载的扩展: %s\n" | |
7337 |
|
7354 | |||
7338 | #, python-format |
|
7355 | #, python-format | |
7339 | msgid "malformed --config option: %s" |
|
7356 | msgid "malformed --config option: %s" | |
7340 | msgstr "" |
|
7357 | msgstr "非法 '--config' 选项: %s" | |
7341 |
|
7358 | |||
7342 | #, python-format |
|
7359 | #, python-format | |
7343 | msgid "extension '%s' overrides commands: %s\n" |
|
7360 | msgid "extension '%s' overrides commands: %s\n" | |
7344 | msgstr "" |
|
7361 | msgstr "扩展 '%s' 覆盖了命令: %s\n" | |
7345 |
|
7362 | |||
7346 | msgid "Option --config may not be abbreviated!" |
|
7363 | msgid "Option --config may not be abbreviated!" | |
7347 | msgstr "" |
|
7364 | msgstr "选项 '--config' 不能简短!" | |
7348 |
|
7365 | |||
7349 | msgid "Option --cwd may not be abbreviated!" |
|
7366 | msgid "Option --cwd may not be abbreviated!" | |
7350 | msgstr "" |
|
7367 | msgstr "选项 '--cwd' 不能简短!" | |
7351 |
|
7368 | |||
7352 | msgid "" |
|
7369 | msgid "" | |
7353 | "Option -R has to be separated from other options (i.e. not -qR) and --" |
|
7370 | "Option -R has to be separated from other options (i.e. not -qR) and --" | |
7354 | "repository may only be abbreviated as --repo!" |
|
7371 | "repository may only be abbreviated as --repo!" | |
7355 | msgstr "" |
|
7372 | msgstr "" | |
|
7373 | "选项 -R 必须隔离使用(也就是不能 -qR),并且 --repository 只能简短为 --repo!" | |||
7356 |
|
7374 | |||
7357 | #, python-format |
|
7375 | #, python-format | |
7358 | msgid "Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n" |
|
7376 | msgid "Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n" | |
7359 | msgstr "" |
|
7377 | msgstr "时间: 实际 %.3f 秒(用户 %.3f+%.3f 系统 %.3f+%.3f)\n" | |
7360 |
|
7378 | |||
7361 | #, python-format |
|
7379 | #, python-format | |
7362 | msgid "repository '%s' is not local" |
|
7380 | msgid "repository '%s' is not local" | |
7363 | msgstr "" |
|
7381 | msgstr "非本地版本库 '%s'" | |
7364 |
|
7382 | |||
7365 | msgid "invalid arguments" |
|
7383 | msgid "invalid arguments" | |
7366 | msgstr "" |
|
7384 | msgstr "非法参数" | |
7367 |
|
7385 | |||
7368 | msgid "exception raised - generating profile anyway\n" |
|
7386 | msgid "exception raised - generating profile anyway\n" | |
7369 | msgstr "" |
|
7387 | msgstr "" | |
@@ -7372,6 +7390,7 b' msgid ""' | |||||
7372 | "lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/" |
|
7390 | "lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/" | |
7373 | "misc/lsprof/" |
|
7391 | "misc/lsprof/" | |
7374 | msgstr "" |
|
7392 | msgstr "" | |
|
7393 | "lsprof 不可用 - 从 http://codespeak.net/svn/user/arigo/hack/misc/lsprof/ 安装" | |||
7375 |
|
7394 | |||
7376 | #, python-format |
|
7395 | #, python-format | |
7377 | msgid "*** failed to import extension %s from %s: %s\n" |
|
7396 | msgid "*** failed to import extension %s from %s: %s\n" | |
@@ -7383,29 +7402,31 b' msgstr "*** \xe5\x8a\xa0\xe8\xbd\xbd\xe6\x89\xa9\xe5\xb1\x95 \'%s\' \xe5\xa4\xb1\xe8\xb4\xa5: %s\\n"' | |||||
7383 |
|
7402 | |||
7384 | #, python-format |
|
7403 | #, python-format | |
7385 | msgid "couldn't find merge tool %s\n" |
|
7404 | msgid "couldn't find merge tool %s\n" | |
7386 | msgstr "" |
|
7405 | msgstr "不能找到合并工具 '%s'\n" | |
7387 |
|
7406 | |||
7388 | #, python-format |
|
7407 | #, python-format | |
7389 | msgid "tool %s can't handle symlinks\n" |
|
7408 | msgid "tool %s can't handle symlinks\n" | |
7390 | msgstr "" |
|
7409 | msgstr "工具 '%s' 不能处理符号链接\n" | |
7391 |
|
7410 | |||
7392 | #, python-format |
|
7411 | #, python-format | |
7393 | msgid "tool %s can't handle binary\n" |
|
7412 | msgid "tool %s can't handle binary\n" | |
7394 | msgstr "" |
|
7413 | msgstr "工具 '%s' 不能处理二进制\n" | |
7395 |
|
7414 | |||
7396 | #, python-format |
|
7415 | #, python-format | |
7397 | msgid "tool %s requires a GUI\n" |
|
7416 | msgid "tool %s requires a GUI\n" | |
7398 | msgstr "" |
|
7417 | msgstr "工具 '%s' 需要 GUI\n" | |
7399 |
|
7418 | |||
7400 | #, python-format |
|
7419 | #, python-format | |
7401 | msgid "picked tool '%s' for %s (binary %s symlink %s)\n" |
|
7420 | msgid "picked tool '%s' for %s (binary %s symlink %s)\n" | |
7402 | msgstr "" |
|
7421 | msgstr "选择工具 '%s',用于 %s(二进制 %s 符号链接 %s)\n" | |
7403 |
|
7422 | |||
7404 | #, python-format |
|
7423 | #, python-format | |
7405 | msgid "" |
|
7424 | msgid "" | |
7406 | " no tool found to merge %s\n" |
|
7425 | " no tool found to merge %s\n" | |
7407 | "keep (l)ocal or take (o)ther?" |
|
7426 | "keep (l)ocal or take (o)ther?" | |
7408 | msgstr "" |
|
7427 | msgstr "" | |
|
7428 | " 没有找到工具合并 %s\n" | |||
|
7429 | "使用本地(l)或者他人(o)的内容?" | |||
7409 |
|
7430 | |||
7410 | msgid "[lo]" |
|
7431 | msgid "[lo]" | |
7411 | msgstr "" |
|
7432 | msgstr "" | |
@@ -7457,9 +7478,9 b' msgstr ""' | |||||
7457 |
|
7478 | |||
7458 | msgid "" |
|
7479 | msgid "" | |
7459 | "\n" |
|
7480 | "\n" | |
7460 | " Some commands allow the user to specify a date:\n" |
|
7481 | " Some commands allow the user to specify a date, e.g.:\n" | |
7461 | " backout, commit, import, tag: Specify the commit date.\n" |
|
7482 | " * backout, commit, import, tag: Specify the commit date.\n" | |
7462 | " log, revert, update: Select revision(s) by date.\n" |
|
7483 | " * log, revert, update: Select revision(s) by date.\n" | |
7463 | "\n" |
|
7484 | "\n" | |
7464 | " Many date formats are valid. Here are some examples:\n" |
|
7485 | " Many date formats are valid. Here are some examples:\n" | |
7465 | "\n" |
|
7486 | "\n" | |
@@ -7987,7 +8008,7 b' msgstr ""' | |||||
7987 | "\n" |
|
8008 | "\n" | |
7988 | " 在 '#' 后面可选的标识符用于指定要取得的分支,标签或改变集。\n" |
|
8009 | " 在 '#' 后面可选的标识符用于指定要取得的分支,标签或改变集。\n" | |
7989 | "\n" |
|
8010 | "\n" | |
7990 |
" 仅当远程水银服务器显式启用时,才能推 |
|
8011 | " 仅当远程水银服务器显式启用时,才能推到 'http://' 和 'https://'。\n" | |
7991 | "\n" |
|
8012 | "\n" | |
7992 | " 在水银中使用 SSH 的一些提示:\n" |
|
8013 | " 在水银中使用 SSH 的一些提示:\n" | |
7993 | " - 使用 SSH 时,需要在远程主机上有可登录帐号,远程路径中还需要有\n" |
|
8014 | " - 使用 SSH 时,需要在远程主机上有可登录帐号,远程路径中还需要有\n" | |
@@ -8025,7 +8046,7 b' msgstr ""' | |||||
8025 |
|
8046 | |||
8026 | #, python-format |
|
8047 | #, python-format | |
8027 | msgid "destination directory: %s\n" |
|
8048 | msgid "destination directory: %s\n" | |
8028 | msgstr "" |
|
8049 | msgstr "目标目录: %s\n" | |
8029 |
|
8050 | |||
8030 | #, python-format |
|
8051 | #, python-format | |
8031 | msgid "destination '%s' already exists" |
|
8052 | msgid "destination '%s' already exists" | |
@@ -8040,23 +8061,23 b' msgid "clone from remote to remote not s' | |||||
8040 | msgstr "" |
|
8061 | msgstr "" | |
8041 |
|
8062 | |||
8042 | msgid "updating working directory\n" |
|
8063 | msgid "updating working directory\n" | |
8043 | msgstr "" |
|
8064 | msgstr "正在更新工作目录\n" | |
8044 |
|
8065 | |||
8045 | msgid "updated" |
|
8066 | msgid "updated" | |
8046 | msgstr "" |
|
8067 | msgstr "已更新" | |
8047 |
|
8068 | |||
8048 | msgid "merged" |
|
8069 | msgid "merged" | |
8049 | msgstr "" |
|
8070 | msgstr "已合并" | |
8050 |
|
8071 | |||
8051 | msgid "removed" |
|
8072 | msgid "removed" | |
8052 | msgstr "" |
|
8073 | msgstr "已删除" | |
8053 |
|
8074 | |||
8054 | msgid "unresolved" |
|
8075 | msgid "unresolved" | |
8055 | msgstr "" |
|
8076 | msgstr "未解决" | |
8056 |
|
8077 | |||
8057 | #, python-format |
|
8078 | #, python-format | |
8058 | msgid "%d files %s" |
|
8079 | msgid "%d files %s" | |
8059 | msgstr "" |
|
8080 | msgstr "%d 个文件%s" | |
8060 |
|
8081 | |||
8061 | msgid "use 'hg resolve' to retry unresolved file merges\n" |
|
8082 | msgid "use 'hg resolve' to retry unresolved file merges\n" | |
8062 | msgstr "" |
|
8083 | msgstr "" | |
@@ -8135,7 +8156,7 b' msgstr ""' | |||||
8135 |
|
8156 | |||
8136 | #, python-format |
|
8157 | #, python-format | |
8137 | msgid "using %s\n" |
|
8158 | msgid "using %s\n" | |
8138 | msgstr "" |
|
8159 | msgstr "使用 %s\n" | |
8139 |
|
8160 | |||
8140 | #, python-format |
|
8161 | #, python-format | |
8141 | msgid "capabilities: %s\n" |
|
8162 | msgid "capabilities: %s\n" | |
@@ -8146,14 +8167,14 b' msgstr ""' | |||||
8146 |
|
8167 | |||
8147 | #, python-format |
|
8168 | #, python-format | |
8148 | msgid "sending %s command\n" |
|
8169 | msgid "sending %s command\n" | |
8149 | msgstr "" |
|
8170 | msgstr "发送命令 '%s'\n" | |
8150 |
|
8171 | |||
8151 | #, python-format |
|
8172 | #, python-format | |
8152 | msgid "sending %s bytes\n" |
|
8173 | msgid "sending %s bytes\n" | |
8153 | msgstr "" |
|
8174 | msgstr "发送 %s 字节\n" | |
8154 |
|
8175 | |||
8155 | msgid "authorization failed" |
|
8176 | msgid "authorization failed" | |
8156 | msgstr "" |
|
8177 | msgstr "授权失败" | |
8157 |
|
8178 | |||
8158 | #, python-format |
|
8179 | #, python-format | |
8159 | msgid "http error while sending %s command\n" |
|
8180 | msgid "http error while sending %s command\n" | |
@@ -8164,15 +8185,15 b' msgstr ""' | |||||
8164 |
|
8185 | |||
8165 | #, python-format |
|
8186 | #, python-format | |
8166 | msgid "real URL is %s\n" |
|
8187 | msgid "real URL is %s\n" | |
8167 | msgstr "" |
|
8188 | msgstr "实际 URL 是 '%s'\n" | |
8168 |
|
8189 | |||
8169 | #, python-format |
|
8190 | #, python-format | |
8170 | msgid "Requested URL: '%s'\n" |
|
8191 | msgid "Requested URL: '%s'\n" | |
8171 | msgstr "" |
|
8192 | msgstr "请求的 URL: '%s'\n" | |
8172 |
|
8193 | |||
8173 | #, python-format |
|
8194 | #, python-format | |
8174 | msgid "'%s' does not appear to be an hg repository" |
|
8195 | msgid "'%s' does not appear to be an hg repository" | |
8175 | msgstr "" |
|
8196 | msgstr "'%s' 似乎不是水银版本库" | |
8176 |
|
8197 | |||
8177 | #, python-format |
|
8198 | #, python-format | |
8178 | msgid "'%s' sent a broken Content-Type header (%s)" |
|
8199 | msgid "'%s' sent a broken Content-Type header (%s)" | |
@@ -8218,7 +8239,7 b' msgstr ""' | |||||
8218 |
|
8239 | |||
8219 | #, python-format |
|
8240 | #, python-format | |
8220 | msgid "repository %s already exists" |
|
8241 | msgid "repository %s already exists" | |
8221 | msgstr "" |
|
8242 | msgstr "版本库 %s 已存在" | |
8222 |
|
8243 | |||
8223 | #, python-format |
|
8244 | #, python-format | |
8224 | msgid "requirement '%s' not supported" |
|
8245 | msgid "requirement '%s' not supported" | |
@@ -8258,20 +8279,20 b' msgid "journal already exists - run hg r' | |||||
8258 | msgstr "" |
|
8279 | msgstr "" | |
8259 |
|
8280 | |||
8260 | msgid "rolling back interrupted transaction\n" |
|
8281 | msgid "rolling back interrupted transaction\n" | |
8261 | msgstr "" |
|
8282 | msgstr "回滚中断的事务\n" | |
8262 |
|
8283 | |||
8263 | msgid "no interrupted transaction available\n" |
|
8284 | msgid "no interrupted transaction available\n" | |
8264 | msgstr "" |
|
8285 | msgstr "" | |
8265 |
|
8286 | |||
8266 | msgid "rolling back last transaction\n" |
|
8287 | msgid "rolling back last transaction\n" | |
8267 | msgstr "" |
|
8288 | msgstr "回滚最近的事务\n" | |
8268 |
|
8289 | |||
8269 | #, python-format |
|
8290 | #, python-format | |
8270 | msgid "Named branch could not be reset, current branch still is: %s\n" |
|
8291 | msgid "Named branch could not be reset, current branch still is: %s\n" | |
8271 | msgstr "" |
|
8292 | msgstr "" | |
8272 |
|
8293 | |||
8273 | msgid "no rollback information available\n" |
|
8294 | msgid "no rollback information available\n" | |
8274 | msgstr "" |
|
8295 | msgstr "没有回滚信息可用\n" | |
8275 |
|
8296 | |||
8276 | #, python-format |
|
8297 | #, python-format | |
8277 | msgid "waiting for lock on %s held by %r\n" |
|
8298 | msgid "waiting for lock on %s held by %r\n" | |
@@ -8298,27 +8319,27 b' msgstr ""' | |||||
8298 |
|
8319 | |||
8299 | #, python-format |
|
8320 | #, python-format | |
8300 | msgid "%s not tracked!\n" |
|
8321 | msgid "%s not tracked!\n" | |
8301 | msgstr "" |
|
8322 | msgstr "%s 没有被跟踪!\n" | |
8302 |
|
8323 | |||
8303 | msgid "unresolved merge conflicts (see hg resolve)" |
|
8324 | msgid "unresolved merge conflicts (see hg resolve)" | |
8304 | msgstr "" |
|
8325 | msgstr "未解决的合并冲突(参见 'hg resolve')" | |
8305 |
|
8326 | |||
8306 | msgid "nothing changed\n" |
|
8327 | msgid "nothing changed\n" | |
8307 | msgstr "" |
|
8328 | msgstr "没有改变\n" | |
8308 |
|
8329 | |||
8309 | #, python-format |
|
8330 | #, python-format | |
8310 | msgid "trouble committing %s!\n" |
|
8331 | msgid "trouble committing %s!\n" | |
8311 | msgstr "" |
|
8332 | msgstr "提交 '%s' 出错!\n" | |
8312 |
|
8333 | |||
8313 | msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed." |
|
8334 | msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed." | |
8314 | msgstr "" |
|
8335 | msgstr "HG: 请输入提交日志。以 'HG:' 开始的行会被删除。" | |
8315 |
|
8336 | |||
8316 | msgid "empty commit message" |
|
8337 | msgid "empty commit message" | |
8317 | msgstr "" |
|
8338 | msgstr "空的提交日志" | |
8318 |
|
8339 | |||
8319 | #, python-format |
|
8340 | #, python-format | |
8320 | msgid "%s does not exist!\n" |
|
8341 | msgid "%s does not exist!\n" | |
8321 | msgstr "" |
|
8342 | msgstr "%s 不存在!\n" | |
8322 |
|
8343 | |||
8323 | #, python-format |
|
8344 | #, python-format | |
8324 | msgid "" |
|
8345 | msgid "" | |
@@ -8351,7 +8372,7 b' msgid "copy failed: %s is not a file or ' | |||||
8351 | msgstr "" |
|
8372 | msgstr "" | |
8352 |
|
8373 | |||
8353 | msgid "searching for changes\n" |
|
8374 | msgid "searching for changes\n" | |
8354 | msgstr "" |
|
8375 | msgstr "正在搜索修改\n" | |
8355 |
|
8376 | |||
8356 | #, python-format |
|
8377 | #, python-format | |
8357 | msgid "examining %s:%s\n" |
|
8378 | msgid "examining %s:%s\n" | |
@@ -8408,7 +8429,7 b' msgid "common changesets up to "' | |||||
8408 | msgstr "" |
|
8429 | msgstr "" | |
8409 |
|
8430 | |||
8410 | msgid "requesting all changes\n" |
|
8431 | msgid "requesting all changes\n" | |
8411 | msgstr "" |
|
8432 | msgstr "正在请求全部修改\n" | |
8412 |
|
8433 | |||
8413 | msgid "" |
|
8434 | msgid "" | |
8414 | "Partial pull cannot be done because other repository doesn't support " |
|
8435 | "Partial pull cannot be done because other repository doesn't support " | |
@@ -8426,7 +8447,7 b' msgstr ""' | |||||
8426 |
|
8447 | |||
8427 | #, python-format |
|
8448 | #, python-format | |
8428 | msgid "%d changesets found\n" |
|
8449 | msgid "%d changesets found\n" | |
8429 | msgstr "" |
|
8450 | msgstr "已发现 %d 个改变集\n" | |
8430 |
|
8451 | |||
8431 | msgid "list of changesets:\n" |
|
8452 | msgid "list of changesets:\n" | |
8432 | msgstr "" |
|
8453 | msgstr "" | |
@@ -8440,16 +8461,16 b' msgid "add changeset %s\\n"' | |||||
8440 | msgstr "" |
|
8461 | msgstr "" | |
8441 |
|
8462 | |||
8442 | msgid "adding changesets\n" |
|
8463 | msgid "adding changesets\n" | |
8443 | msgstr "" |
|
8464 | msgstr "正在增加修改集\n" | |
8444 |
|
8465 | |||
8445 | msgid "received changelog group is empty" |
|
8466 | msgid "received changelog group is empty" | |
8446 | msgstr "" |
|
8467 | msgstr "" | |
8447 |
|
8468 | |||
8448 | msgid "adding manifests\n" |
|
8469 | msgid "adding manifests\n" | |
8449 | msgstr "" |
|
8470 | msgstr "正在增加清单\n" | |
8450 |
|
8471 | |||
8451 | msgid "adding file changes\n" |
|
8472 | msgid "adding file changes\n" | |
8452 | msgstr "" |
|
8473 | msgstr "正在增加文件改变\n" | |
8453 |
|
8474 | |||
8454 | #, python-format |
|
8475 | #, python-format | |
8455 | msgid "adding %s revisions\n" |
|
8476 | msgid "adding %s revisions\n" | |
@@ -8464,7 +8485,7 b' msgstr ""' | |||||
8464 |
|
8485 | |||
8465 | #, python-format |
|
8486 | #, python-format | |
8466 | msgid "added %d changesets with %d changes to %d files%s\n" |
|
8487 | msgid "added %d changesets with %d changes to %d files%s\n" | |
8467 | msgstr "" |
|
8488 | msgstr "已增加 %d 个改变集,包含 %d 个改变,修改了 %d 个文件%s\n" | |
8468 |
|
8489 | |||
8469 | msgid "updating the branch cache\n" |
|
8490 | msgid "updating the branch cache\n" | |
8470 | msgstr "" |
|
8491 | msgstr "" | |
@@ -8558,7 +8579,7 b' msgid "case-folding collision between %s' | |||||
8558 | msgstr "" |
|
8579 | msgstr "" | |
8559 |
|
8580 | |||
8560 | msgid "resolving manifests\n" |
|
8581 | msgid "resolving manifests\n" | |
8561 | msgstr "" |
|
8582 | msgstr "正在解析清单\n" | |
8562 |
|
8583 | |||
8563 | #, python-format |
|
8584 | #, python-format | |
8564 | msgid " overwrite %s partial %s\n" |
|
8585 | msgid " overwrite %s partial %s\n" | |
@@ -8602,7 +8623,7 b' msgstr ""' | |||||
8602 |
|
8623 | |||
8603 | #, python-format |
|
8624 | #, python-format | |
8604 | msgid "getting %s\n" |
|
8625 | msgid "getting %s\n" | |
8605 | msgstr "" |
|
8626 | msgstr "正在检出 %s\n" | |
8606 |
|
8627 | |||
8607 | #, python-format |
|
8628 | #, python-format | |
8608 | msgid "moving %s to %s\n" |
|
8629 | msgid "moving %s to %s\n" | |
@@ -8807,44 +8828,44 b' msgid "invalid entry in fncache, line %s' | |||||
8807 | msgstr "" |
|
8828 | msgstr "" | |
8808 |
|
8829 | |||
8809 | msgid "scanning\n" |
|
8830 | msgid "scanning\n" | |
8810 | msgstr "" |
|
8831 | msgstr "正在扫描\n" | |
8811 |
|
8832 | |||
8812 | #, python-format |
|
8833 | #, python-format | |
8813 | msgid "%d files, %d bytes to transfer\n" |
|
8834 | msgid "%d files, %d bytes to transfer\n" | |
8814 | msgstr "" |
|
8835 | msgstr "需要传输 %d 个文件,%d 字节\n" | |
8815 |
|
8836 | |||
8816 | #, python-format |
|
8837 | #, python-format | |
8817 | msgid "sending %s (%d bytes)\n" |
|
8838 | msgid "sending %s (%d bytes)\n" | |
8818 | msgstr "" |
|
8839 | msgstr "正在发送 %s (%d 字节)\n" | |
8819 |
|
8840 | |||
8820 | msgid "unmatched quotes" |
|
8841 | msgid "unmatched quotes" | |
8821 | msgstr "" |
|
8842 | msgstr "不匹配的引号" | |
8822 |
|
8843 | |||
8823 | #, python-format |
|
8844 | #, python-format | |
8824 | msgid "style not found: %s" |
|
8845 | msgid "style not found: %s" | |
8825 | msgstr "" |
|
8846 | msgstr "没有找到样式: %s" | |
8826 |
|
8847 | |||
8827 | #, python-format |
|
8848 | #, python-format | |
8828 | msgid "%s:%s: parse error" |
|
8849 | msgid "%s:%s: parse error" | |
8829 | msgstr "" |
|
8850 | msgstr "%s:%s: 解析出错" | |
8830 |
|
8851 | |||
8831 | #, python-format |
|
8852 | #, python-format | |
8832 | msgid "template file %s: %s" |
|
8853 | msgid "template file %s: %s" | |
8833 | msgstr "" |
|
8854 | msgstr "模版文件 %s: %s" | |
8834 |
|
8855 | |||
8835 | #, python-format |
|
8856 | #, python-format | |
8836 | msgid "Error expanding '%s%%%s'" |
|
8857 | msgid "Error expanding '%s%%%s'" | |
8837 | msgstr "" |
|
8858 | msgstr "" | |
8838 |
|
8859 | |||
8839 | msgid "transaction abort!\n" |
|
8860 | msgid "transaction abort!\n" | |
8840 | msgstr "" |
|
8861 | msgstr "事务中止!\n" | |
8841 |
|
8862 | |||
8842 | #, python-format |
|
8863 | #, python-format | |
8843 | msgid "failed to truncate %s\n" |
|
8864 | msgid "failed to truncate %s\n" | |
8844 | msgstr "" |
|
8865 | msgstr "截断 '%s' 失败\n" | |
8845 |
|
8866 | |||
8846 | msgid "rollback completed\n" |
|
8867 | msgid "rollback completed\n" | |
8847 | msgstr "" |
|
8868 | msgstr "完成回滚\n" | |
8848 |
|
8869 | |||
8849 | #, python-format |
|
8870 | #, python-format | |
8850 | msgid "Not trusting file %s from untrusted user %s, group %s\n" |
|
8871 | msgid "Not trusting file %s from untrusted user %s, group %s\n" | |
@@ -8855,6 +8876,8 b' msgid ""' | |||||
8855 | "Failed to parse %s\n" |
|
8876 | "Failed to parse %s\n" | |
8856 | "%s" |
|
8877 | "%s" | |
8857 | msgstr "" |
|
8878 | msgstr "" | |
|
8879 | "解析 '%s' 失败\n" | |||
|
8880 | "%s" | |||
8858 |
|
8881 | |||
8859 | #, python-format |
|
8882 | #, python-format | |
8860 | msgid "Ignored: %s\n" |
|
8883 | msgid "Ignored: %s\n" | |
@@ -8907,27 +8930,27 b' msgid "response expected"' | |||||
8907 | msgstr "" |
|
8930 | msgstr "" | |
8908 |
|
8931 | |||
8909 | msgid "password: " |
|
8932 | msgid "password: " | |
8910 | msgstr "" |
|
8933 | msgstr "密码: " | |
8911 |
|
8934 | |||
8912 | msgid "edit failed" |
|
8935 | msgid "edit failed" | |
8913 | msgstr "" |
|
8936 | msgstr "" | |
8914 |
|
8937 | |||
8915 | msgid "http authorization required" |
|
8938 | msgid "http authorization required" | |
8916 | msgstr "" |
|
8939 | msgstr "需要 http 授权" | |
8917 |
|
8940 | |||
8918 | msgid "http authorization required\n" |
|
8941 | msgid "http authorization required\n" | |
8919 | msgstr "" |
|
8942 | msgstr "需要 http 授权\n" | |
8920 |
|
8943 | |||
8921 | #, python-format |
|
8944 | #, python-format | |
8922 | msgid "realm: %s\n" |
|
8945 | msgid "realm: %s\n" | |
8923 | msgstr "" |
|
8946 | msgstr "领域: %s\n" | |
8924 |
|
8947 | |||
8925 | #, python-format |
|
8948 | #, python-format | |
8926 | msgid "user: %s\n" |
|
8949 | msgid "user: %s\n" | |
8927 | msgstr "" |
|
8950 | msgstr "用户: %s\n" | |
8928 |
|
8951 | |||
8929 | msgid "user:" |
|
8952 | msgid "user:" | |
8930 | msgstr "" |
|
8953 | msgstr "用户:" | |
8931 |
|
8954 | |||
8932 | #, python-format |
|
8955 | #, python-format | |
8933 | msgid "proxying through http://%s:%s\n" |
|
8956 | msgid "proxying through http://%s:%s\n" |
General Comments 0
You need to be logged in to leave comments.
Login now