7ac1c0adeb · matheusbsbs/matheus-bagliano

@@ -12,7 +12,7 @@ msgid ""

12 msgstr ""

13 "Project-Id-Version: Git\n"

14 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"

15 -"POT-Creation-Date: 2012-02-13 14:24+0800\n"

15 +"POT-Creation-Date: 2012-02-28 09:17+0800\n"

16 "PO-Revision-Date: 2012-01-30 00:00+0800\n"

17 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"

18 "Language-Team: GitHub <https://github.com/gotgit/git/>\n"

@@ -82,7 +82,7 @@ msgstr " 无法解析 dirstat 阈值 '%.*s'\n"

82 msgid " Unknown dirstat parameter '%.*s'\n"

83 msgstr " 未知 dirstat 参数 '%.*s'\n"

84

85 -#: diff.c:208

85 +#: diff.c:205

86 #, c-format

87 msgid ""

88 "Found errors in 'diff.dirstat' config variable:\n"

@@ -91,7 +91,29 @@ msgstr ""

91 "配置变量 'diff.dirstat' 出错：\n"

92 "%s"

93

94 -#: diff.c:3308

94 +#: diff.c:1331

95 +msgid " 0 files changed\n"

96 +msgstr "0 个文件被修改\n"

97 +

98 +#: diff.c:1335

99 +#, c-format

100 +msgid " %d file changed"

101 +msgid_plural " %d files changed"

102 +msgstr[0] "%d 个文件被修改"

103 +

104 +#: diff.c:1352

105 +#, c-format

106 +msgid ", %d insertion(+)"

107 +msgid_plural ", %d insertions(+)"

108 +msgstr[0] "，%d 行插入(+)"

109 +

110 +#: diff.c:1363

111 +#, c-format

112 +msgid ", %d deletion(-)"

113 +msgid_plural ", %d deletions(-)"

114 +msgstr[0] "，%d 行删除(-)"

115 +

116 +#: diff.c:3364

117 #, c-format

118 msgid ""

119 "Failed to parse --dirstat/-X option parameter:\n"

@@ -112,7 +134,22 @@ msgstr "gpg 没有接受数据"

134 msgid "gpg failed to sign the data"

135 msgstr "gpg 无法为数据签名"

136

115 -#: help.c:309

137 +#: grep.c:1285

138 +#, c-format

139 +msgid "'%s': unable to read %s"

140 +msgstr "'%s'：无法读取 %s"

141 +

142 +#: grep.c:1302

143 +#, c-format

144 +msgid "'%s': %s"

145 +msgstr "'%s'：%s"

146 +

147 +#: grep.c:1313

148 +#, c-format

149 +msgid "'%s': short read %s"

150 +msgstr "'%s'：读取不完整 %s"

151 +

152 +#: help.c:287

153 #, c-format

154 msgid ""

155 "'%s' appears to be a git command, but we were not\n"

@@ -121,20 +158,20 @@ msgstr ""

158 "'%s' 像是一个 git 命令，但却无法运行。\n"

159 "可能是 git-%s 受损？"

160

124 -#: remote.c:1576

161 +#: remote.c:1607

162 #, c-format

163 msgid "Your branch is ahead of '%s' by %d commit.\n"

164 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"

165 msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"

166

130 -#: remote.c:1582

167 +#: remote.c:1613

168 #, c-format

169 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"

170 msgid_plural ""

171 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"

172 msgstr[0] "您的分支落后 '%s' 共 %d 个提交，且可以快进。\n"

173

137 -#: remote.c:1590

174 +#: remote.c:1621

175 #, c-format

176 msgid ""

177 "Your branch and '%s' have diverged,\n"

@@ -902,7 +939,7 @@ msgstr "不能写分支描述模版：%s\n"

939 msgid "Failed to resolve HEAD as a valid ref."

940 msgstr "无法将 HEAD 解析为有效引用。"

941

905 -#: builtin/branch.c:747 builtin/clone.c:570

942 +#: builtin/branch.c:747 builtin/clone.c:558

943 msgid "HEAD not found below refs/heads!"

944 msgstr "未在 /refs/heads 下发现 HEAD！"

945

@@ -967,7 +1004,7 @@ msgstr "冲突的暂存区文件"

1004 msgid "path '%s' is unmerged"

1005 msgstr "路径 '%s' 未合并"

1006

970 -#: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:595

1007 +#: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583

1008 #: builtin/merge.c:809

1009 msgid "unable to write new index file"

1010 msgstr "无法写新的暂存区文件"

@@ -1077,47 +1114,47 @@ msgstr "无效引用：%s"

1114 msgid "reference is not a tree: %s"

1115 msgstr "引用不是一个树：%s"

1116

1080 -#: builtin/checkout.c:961

1117 +#: builtin/checkout.c:972

1118 msgid "-B cannot be used with -b"

1119 msgstr "-B 不能和 -b 共用"

1120

1084 -#: builtin/checkout.c:970

1121 +#: builtin/checkout.c:981

1122 msgid "--patch is incompatible with all other options"

1123 msgstr "--patch 选项和其他选项不兼容"

1124

1088 -#: builtin/checkout.c:973

1125 +#: builtin/checkout.c:984

1126 msgid "--detach cannot be used with -b/-B/--orphan"

1127 msgstr "--detach 不能和 -b/-B/--orphan 共用"

1128

1092 -#: builtin/checkout.c:975

1129 +#: builtin/checkout.c:986

1130 msgid "--detach cannot be used with -t"

1131 msgstr "--detach 不能和 -t 共用"

1132

1096 -#: builtin/checkout.c:981

1133 +#: builtin/checkout.c:992

1134 msgid "--track needs a branch name"

1135 msgstr "--track 需要一个分支名"

1136

1100 -#: builtin/checkout.c:988

1137 +#: builtin/checkout.c:999

1138 msgid "Missing branch name; try -b"

1139 msgstr "缺少分支名；尝试 -b"

1140

1104 -#: builtin/checkout.c:994

1141 +#: builtin/checkout.c:1005

1142 msgid "--orphan and -b|-B are mutually exclusive"

1143 msgstr "--orphan 和 -b|-B 互斥"

1144

1108 -#: builtin/checkout.c:996

1145 +#: builtin/checkout.c:1007

1146 msgid "--orphan cannot be used with -t"

1147 msgstr "--orphan 不能和 -t 共用"

1148

1112 -#: builtin/checkout.c:1006

1149 +#: builtin/checkout.c:1017

1150 msgid "git checkout: -f and -m are incompatible"

1151 msgstr "git checkout: -f 和 -m 不兼容"

1152

1116 -#: builtin/checkout.c:1040

1153 +#: builtin/checkout.c:1051

1154 msgid "invalid path specification"

1155 msgstr "无效的路径"

1156

1120 -#: builtin/checkout.c:1048

1157 +#: builtin/checkout.c:1059

1158 #, c-format

1159 msgid ""

1160 "git checkout: updating paths is incompatible with switching branches.\n"

@@ -1126,15 +1163,15 @@ msgstr ""

1163 "git checkout: 更新路径和切换分支不兼容。\n"

1164 "您是想要检出 '%s' 但未能将其解析为提交么？"

1165

1129 -#: builtin/checkout.c:1050

1166 +#: builtin/checkout.c:1061

1167 msgid "git checkout: updating paths is incompatible with switching branches."

1168 msgstr "git checkout: 更新路径和切换分支不兼容。"

1169

1133 -#: builtin/checkout.c:1055

1170 +#: builtin/checkout.c:1066

1171 msgid "git checkout: --detach does not take a path argument"

1172 msgstr "git checkout: --detach 不跟路径参数"

1173

1137 -#: builtin/checkout.c:1058

1174 +#: builtin/checkout.c:1069

1175 msgid ""

1176 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"

1177 "checking out of the index."

@@ -1142,11 +1179,11 @@ msgstr ""

1179 "git checkout: --ours/--theirs, --force 和 --merge 不兼容当\n"

1180 "检出暂存区时。"

1181

1145 -#: builtin/checkout.c:1077

1182 +#: builtin/checkout.c:1088

1183 msgid "Cannot switch branch to a non-commit."

1184 msgstr "无法切换分支到一个非提交。"

1185

1149 -#: builtin/checkout.c:1080

1186 +#: builtin/checkout.c:1091

1187 msgid "--ours/--theirs is incompatible with switching branches."

1188 msgstr "--ours/--theirs 和切换分支不兼容。"

1189

@@ -1192,128 +1229,128 @@ msgstr "不会删除 %s\n"

1229 msgid "Not removing %s\n"

1230 msgstr "未删除 %s\n"

1231

1195 -#: builtin/clone.c:246

1232 +#: builtin/clone.c:243

1233 #, c-format

1234 msgid "reference repository '%s' is not a local directory."

1235 msgstr "引用版本库 '%s' 不是一个本地目录。"

1236

1200 -#: builtin/clone.c:313

1237 +#: builtin/clone.c:302

1238 #, c-format

1239 msgid "failed to open '%s'"

1240 msgstr "打开 '%s' 失败"

1241

1205 -#: builtin/clone.c:317

1242 +#: builtin/clone.c:306

1243 #, c-format

1244 msgid "failed to create directory '%s'"

1245 msgstr "创建目录 '%s' 失败"

1246

1210 -#: builtin/clone.c:319 builtin/diff.c:75

1247 +#: builtin/clone.c:308 builtin/diff.c:75

1248 #, c-format

1249 msgid "failed to stat '%s'"

1250 msgstr "枚举 '%s' 状态失败"

1251

1215 -#: builtin/clone.c:321

1252 +#: builtin/clone.c:310

1253 #, c-format

1254 msgid "%s exists and is not a directory"

1255 msgstr "%s 存在且不是一个目录"

1256

1220 -#: builtin/clone.c:335

1257 +#: builtin/clone.c:324

1258 #, c-format

1259 msgid "failed to stat %s\n"

1260 msgstr "枚举 %s 状态失败\n"

1261

1225 -#: builtin/clone.c:352

1262 +#: builtin/clone.c:341

1263 #, c-format

1264 msgid "failed to unlink '%s'"

1265 msgstr "删除 '%s' 失败"

1266

1230 -#: builtin/clone.c:357

1267 +#: builtin/clone.c:346

1268 #, c-format

1269 msgid "failed to create link '%s'"

1270 msgstr "创建链接 '%s' 失败"

1271

1235 -#: builtin/clone.c:361

1272 +#: builtin/clone.c:350

1273 #, c-format

1274 msgid "failed to copy file to '%s'"

1275 msgstr "拷贝文件至 '%s' 失败"

1276

1240 -#: builtin/clone.c:384

1277 +#: builtin/clone.c:373

1278 #, c-format

1279 msgid "done.\n"

1280 msgstr "完成。\n"

1281

1245 -#: builtin/clone.c:451

1282 +#: builtin/clone.c:440

1283 #, c-format

1284 msgid "Could not find remote branch %s to clone."

1285 msgstr "无法发现要克隆的远程分支 %s。"

1286

1250 -#: builtin/clone.c:561

1287 +#: builtin/clone.c:549

1288 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"

1289 msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n"

1290

1254 -#: builtin/clone.c:651

1291 +#: builtin/clone.c:639

1292 msgid "Too many arguments."

1293 msgstr "太多参数。"

1294

1258 -#: builtin/clone.c:655

1295 +#: builtin/clone.c:643

1296 msgid "You must specify a repository to clone."

1297 msgstr "你必须指定一个版本库来克隆"

1298

1262 -#: builtin/clone.c:666

1299 +#: builtin/clone.c:654

1300 #, c-format

1301 msgid "--bare and --origin %s options are incompatible."

1302 msgstr "--bare 和 --origin %s 选项不兼容。"

1303

1267 -#: builtin/clone.c:680

1304 +#: builtin/clone.c:668

1305 #, c-format

1306 msgid "repository '%s' does not exist"

1307 msgstr "版本库 '%s' 不存在"

1308

1272 -#: builtin/clone.c:685

1309 +#: builtin/clone.c:673

1310 msgid "--depth is ignored in local clones; use file:// instead."

1311 msgstr "--depth 在本地克隆被忽略，改为 file:// 协议试试。"

1312

1276 -#: builtin/clone.c:695

1313 +#: builtin/clone.c:683

1314 #, c-format

1315 msgid "destination path '%s' already exists and is not an empty directory."

1316 msgstr "目标路径 '%s' 已经存在且不是一个空目录。"

1317

1281 -#: builtin/clone.c:705

1318 +#: builtin/clone.c:693

1319 #, c-format

1320 msgid "working tree '%s' already exists."

1321 msgstr "工作区 '%s' 已经存在。"

1322

1286 -#: builtin/clone.c:718 builtin/clone.c:732

1323 +#: builtin/clone.c:706 builtin/clone.c:720

1324 #, c-format

1325 msgid "could not create leading directories of '%s'"

1326 msgstr "无法为 '%s' 创建目录"

1327

1291 -#: builtin/clone.c:721

1328 +#: builtin/clone.c:709

1329 #, c-format

1330 msgid "could not create work tree dir '%s'."

1331 msgstr "无法为 '%s' 创建工作区目录。"

1332

1296 -#: builtin/clone.c:740

1333 +#: builtin/clone.c:728

1334 #, c-format

1335 msgid "Cloning into bare repository '%s'...\n"

1336 msgstr "克隆到裸版本库 '%s'...\n"

1337

1301 -#: builtin/clone.c:742

1338 +#: builtin/clone.c:730

1339 #, c-format

1340 msgid "Cloning into '%s'...\n"

1341 msgstr "正克隆到 '%s'...\n"

1342

1306 -#: builtin/clone.c:798

1343 +#: builtin/clone.c:786

1344 #, c-format

1345 msgid "Don't know how to clone %s"

1346 msgstr "不知道如何克隆 %s"

1347

1311 -#: builtin/clone.c:847

1348 +#: builtin/clone.c:835

1349 #, c-format

1350 msgid "Remote branch %s not found in upstream %s"

1351 msgstr "远程分支 %s 在上游 %s 未发现"

1352

1316 -#: builtin/clone.c:854

1353 +#: builtin/clone.c:842

1354 msgid "You appear to have cloned an empty repository."

1355 msgstr "您似乎克隆了一个空版本库。"

1356

@@ -1520,7 +1557,7 @@ msgstr "无法读取暂存区"

1557 msgid "Error building trees"

1558 msgstr "无法创建树对象"

1559

1523 -#: builtin/commit.c:895 builtin/tag.c:324

1560 +#: builtin/commit.c:895 builtin/tag.c:357

1561 #, c-format

1562 msgid "Please supply the message using either -m or -F option.\n"

1563 msgstr "请使用 -m 或者 -F 选项提供说明。\n"

@@ -1581,7 +1618,7 @@ msgstr "聪明... 在暂存区不干净下修补最后的提交。"

1618 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."

1619 msgstr "没有用 -i 或 -o 选项而显式地提供路径，认为是 --only paths..."

1620

1584 -#: builtin/commit.c:1096 builtin/tag.c:500

1621 +#: builtin/commit.c:1096 builtin/tag.c:556

1622 #, c-format

1623 msgid "Invalid cleanup mode %s"

1624 msgstr "无效的清理模式 %s"

@@ -1959,77 +1996,62 @@ msgid ""

1996 "There are too many unreachable loose objects; run 'git prune' to remove them."

1997 msgstr "有太多无指向的松散对象，运行 'git prune' 删除它们。"

1998

1962 -#: builtin/grep.c:275

1999 +#: builtin/grep.c:216

2000 #, c-format

2001 msgid "grep: failed to create thread: %s"

2002 msgstr "grep: 无法创建线程：%s"

2003

1967 -#: builtin/grep.c:390

1968 -#, c-format

1969 -msgid "'%s': unable to read %s"

1970 -msgstr "'%s'：无法读取 %s"

1971 -

1972 -#: builtin/grep.c:441

1973 -#, c-format

1974 -msgid "'%s': %s"

1975 -msgstr "'%s'：%s"

1976 -

1977 -#: builtin/grep.c:452

1978 -#, c-format

1979 -msgid "'%s': short read %s"

1980 -msgstr "'%s'：读取不完整 %s"

1981 -

1982 -#: builtin/grep.c:514

2004 +#: builtin/grep.c:402

2005 #, c-format

2006 msgid "Failed to chdir: %s"

2007 msgstr "无法切换目录：%s"

2008

1987 -#: builtin/grep.c:590 builtin/grep.c:624

2009 +#: builtin/grep.c:478 builtin/grep.c:512

2010 #, c-format

2011 msgid "unable to read tree (%s)"

2012 msgstr "无法读取代码树（%s）"

2013

1992 -#: builtin/grep.c:638

2014 +#: builtin/grep.c:526

2015 #, c-format

2016 msgid "unable to grep from object of type %s"

2017 msgstr "无法抓取来自于 %s 类型的对象"

2018

1997 -#: builtin/grep.c:696

2019 +#: builtin/grep.c:584

2020 #, c-format

2021 msgid "switch `%c' expects a numerical value"

2022 msgstr "开关 `%c' 期望一个数字值"

2023

2002 -#: builtin/grep.c:713

2024 +#: builtin/grep.c:601

2025 #, c-format

2026 msgid "cannot open '%s'"

2027 msgstr "不能打开 '%s'"

2028

2007 -#: builtin/grep.c:1001

2029 +#: builtin/grep.c:889

2030 msgid "no pattern given."

2031 msgstr "未提供模式匹配。"

2032

2011 -#: builtin/grep.c:1015

2033 +#: builtin/grep.c:903

2034 #, c-format

2035 msgid "bad object %s"

2036 msgstr "坏对象 %s"

2037

2016 -#: builtin/grep.c:1058

2038 +#: builtin/grep.c:944

2039 msgid "--open-files-in-pager only works on the worktree"

2040 msgstr "--open-files-in-pager 仅用于工作区"

2041

2020 -#: builtin/grep.c:1081

2042 +#: builtin/grep.c:967

2043 msgid "--cached or --untracked cannot be used with --no-index."

2044 msgstr "--cached 或 --untracked 不能与 --no-index 共用"

2045

2024 -#: builtin/grep.c:1086

2046 +#: builtin/grep.c:972

2047 msgid "--no-index or --untracked cannot be used with revs."

2048 msgstr "--no-index 或 --untracked 不能和版本共用。"

2049

2028 -#: builtin/grep.c:1089

2050 +#: builtin/grep.c:975

2051 msgid "--[no-]exclude-standard cannot be used for tracked contents."

2052 msgstr "--[no-]exclude-standard 不能用于跟踪内容。"

2053

2032 -#: builtin/grep.c:1097

2054 +#: builtin/grep.c:983

2055 msgid "both --cached and trees are given."

2056 msgstr "同时给出了 --cached 和树对象。"

2057

@@ -2495,51 +2517,51 @@ msgstr "到空分支的非快进式提交没有意义"

2517 msgid "%s - not something we can merge"

2518 msgstr "%s - 不是我们可以合并的东西"

2519

2498 -#: builtin/merge.c:1382

2520 +#: builtin/merge.c:1383

2521 #, c-format

2522 msgid "Updating %s..%s\n"

2523 msgstr "更新 %s..%s\n"

2524

2503 -#: builtin/merge.c:1420

2525 +#: builtin/merge.c:1421

2526 #, c-format

2527 msgid "Trying really trivial in-index merge...\n"

2528 msgstr "尝试非常小的暂存区内合并...\n"

2529

2508 -#: builtin/merge.c:1427

2530 +#: builtin/merge.c:1428

2531 #, c-format

2532 msgid "Nope.\n"

2533 msgstr "无。\n"

2534

2513 -#: builtin/merge.c:1459

2535 +#: builtin/merge.c:1460

2536 msgid "Not possible to fast-forward, aborting."

2537 msgstr "不可能快进式，终止。"

2538

2517 -#: builtin/merge.c:1482 builtin/merge.c:1559

2539 +#: builtin/merge.c:1483 builtin/merge.c:1560

2540 #, c-format

2541 msgid "Rewinding the tree to pristine...\n"

2542 msgstr "将树回滚至原始状态...\n"

2543

2522 -#: builtin/merge.c:1486

2544 +#: builtin/merge.c:1487

2545 #, c-format

2546 msgid "Trying merge strategy %s...\n"

2547 msgstr "尝试合并策略 %s...\n"

2548

2527 -#: builtin/merge.c:1550

2549 +#: builtin/merge.c:1551

2550 #, c-format

2551 msgid "No merge strategy handled the merge.\n"

2552 msgstr "没有合并策略处理此合并。\n"

2553

2532 -#: builtin/merge.c:1552

2554 +#: builtin/merge.c:1553

2555 #, c-format

2556 msgid "Merge with strategy %s failed.\n"

2557 msgstr "使用策略 %s 合并失败。\n"

2558

2537 -#: builtin/merge.c:1561

2559 +#: builtin/merge.c:1562

2560 #, c-format

2561 msgid "Using the %s to prepare resolving by hand.\n"

2562 msgstr "使用 %s 以准备手工解决。\n"

2563

2542 -#: builtin/merge.c:1572

2564 +#: builtin/merge.c:1573

2565 #, c-format

2566 msgid "Automatic merge went well; stopped before committing as requested\n"

2567 msgstr "自动合并进展顺利，按要求在提交前停止\n"

@@ -2625,7 +2647,7 @@ msgstr "无法为对象 '%s' 的 'show' 关闭管道"

2647 msgid "failed to finish 'show' for object '%s'"

2648 msgstr "无法为对象 '%s' 完成 'show'"

2649

2628 -#: builtin/notes.c:175 builtin/tag.c:310

2650 +#: builtin/notes.c:175 builtin/tag.c:343

2651 #, c-format

2652 msgid "could not create file '%s'"

2653 msgstr "不能创建文件 '%s'"

@@ -2648,12 +2670,12 @@ msgstr "不能写注解对象"

2670 msgid "The note contents has been left in %s"

2671 msgstr "注解内容被留在文件 %s 中"

2672

2651 -#: builtin/notes.c:251 builtin/tag.c:465

2673 +#: builtin/notes.c:251 builtin/tag.c:521

2674 #, c-format

2675 msgid "cannot read '%s'"

2676 msgstr "不能读取 '%s'"

2677

2656 -#: builtin/notes.c:253 builtin/tag.c:468

2678 +#: builtin/notes.c:253 builtin/tag.c:524

2679 #, c-format

2680 msgid "could not open or read '%s'"

2681 msgstr "不能打开或读取 '%s'"

@@ -2661,7 +2683,7 @@ msgstr "不能打开或读取 '%s'"

2683 #: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447

2684 #: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644

2685 #: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766

2664 -#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:481

2686 +#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:537

2687 #, c-format

2688 msgid "Failed to resolve '%s' as a valid ref."

2689 msgstr "无法解析 '%s' 为一个有效引用"

@@ -2760,6 +2782,26 @@ msgstr "对象 %s 没有注解\n"

2782 msgid "Unknown subcommand: %s"

2783 msgstr "未知子命令：%s"

2784

2785 +#: builtin/pack-objects.c:2310

2786 +#, c-format

2787 +msgid "unsupported index version %s"

2788 +msgstr "不支持的暂存区版本 %s"

2789 +

2790 +#: builtin/pack-objects.c:2314

2791 +#, c-format

2792 +msgid "bad index version '%s'"

2793 +msgstr "错误的暂存区版本 '%s'"

2794 +

2795 +#: builtin/pack-objects.c:2322

2796 +#, c-format

2797 +msgid "option %s does not accept negative form"

2798 +msgstr "选项 '%s' 不接受否定格式"

2799 +

2800 +#: builtin/pack-objects.c:2326

2801 +#, c-format

2802 +msgid "unable to parse value '%s' for option %s"

2803 +msgstr "不能解析值 '%s' 针对于选项 %s"

2804 +

2805 #: builtin/push.c:44

2806 msgid "tag shorthand without <tag>"

2807 msgstr "tag 简写没有跟 <tag> 参数"

@@ -2872,11 +2914,11 @@ msgstr "--mirror 不能和引用表达式共用"

2914 msgid "--all and --mirror are incompatible"

2915 msgstr "--all 和 --mirror 不兼容"

2916

2875 -#: builtin/push.c:272

2917 +#: builtin/push.c:274

2918 msgid "--delete is incompatible with --all, --mirror and --tags"

2919 msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"

2920

2879 -#: builtin/push.c:274

2921 +#: builtin/push.c:276

2922 msgid "--delete doesn't make sense without any refs"

2923 msgstr "--delete 未接任何引用没有意义"

2924

@@ -3021,27 +3063,32 @@ msgstr "git rm：不能删除 %s"

3063 msgid "Missing author: %s"

3064 msgstr "缺少作者：%s"

3065

3024 -#: builtin/tag.c:172

3066 +#: builtin/tag.c:58

3067 +#, c-format

3068 +msgid "malformed object at '%s'"

3069 +msgstr "非法的对象于 '%s'"

3070 +

3071 +#: builtin/tag.c:205

3072 #, c-format

3073 msgid "tag name too long: %.*s..."

3074 msgstr "tag 名字太长：%.*s..."

3075

3029 -#: builtin/tag.c:177

3076 +#: builtin/tag.c:210

3077 #, c-format

3078 msgid "tag '%s' not found."

3079 msgstr "tag '%s' 未发现。"

3080

3034 -#: builtin/tag.c:192

3081 +#: builtin/tag.c:225

3082 #, c-format

3083 msgid "Deleted tag '%s' (was %s)\n"

3084 msgstr "已删除 tag '%s'（曾为 %s）\n"

3085

3039 -#: builtin/tag.c:204

3086 +#: builtin/tag.c:237

3087 #, c-format

3088 msgid "could not verify the tag '%s'"

3089 msgstr "不能校验 tag '%s'"

3090

3044 -#: builtin/tag.c:214

3091 +#: builtin/tag.c:247

3092 msgid ""

3093 "\n"

3094 "#\n"

@@ -3055,7 +3102,7 @@ msgstr ""

3102 "# 以 '#' 开头的行将被忽略。\n"

3103 "#\n"

3104

3058 -#: builtin/tag.c:221

3105 +#: builtin/tag.c:254

3106 msgid ""

3107 "\n"

3108 "#\n"

@@ -3070,68 +3117,81 @@ msgstr ""

3117 "# 以 '#' 开头的行将被忽略，您可以删除它们如果您想这样做。\n"

3118 "#\n"

3119

3073 -#: builtin/tag.c:261

3120 +#: builtin/tag.c:294

3121 msgid "unable to sign the tag"

3122 msgstr "无法签署 tag"

3123

3077 -#: builtin/tag.c:263

3124 +#: builtin/tag.c:296

3125 msgid "unable to write tag file"

3126 msgstr "无法写 tag 文件"

3127

3081 -#: builtin/tag.c:288

3128 +#: builtin/tag.c:321

3129 msgid "bad object type."

3130 msgstr "无效的对象类型"

3131

3085 -#: builtin/tag.c:301

3132 +#: builtin/tag.c:334

3133 msgid "tag header too big."

3134 msgstr "tag 头信息太大"

3135

3089 -#: builtin/tag.c:333

3136 +#: builtin/tag.c:366

3137 msgid "no tag message?"

3138 msgstr "无 tag 说明？"

3139

3093 -#: builtin/tag.c:339

3140 +#: builtin/tag.c:372

3141 #, c-format

3142 msgid "The tag message has been left in %s\n"

3143 msgstr "tag 说明被保留在 %s\n"

3144

3098 -#: builtin/tag.c:448

3145 +#: builtin/tag.c:421

3146 +msgid "switch 'points-at' requires an object"

3147 +msgstr "开关 'points-at' 需要一个对象"

3148 +

3149 +#: builtin/tag.c:423

3150 +#, c-format

3151 +msgid "malformed object name '%s'"

3152 +msgstr "非法的对象名 '%s'"

3153 +

3154 +#: builtin/tag.c:502

3155 msgid "-n option is only allowed with -l."

3156 msgstr "-n 选项只允许和 -l 共用。"

3157

3102 -#: builtin/tag.c:450

3158 +#: builtin/tag.c:504

3159 msgid "--contains option is only allowed with -l."

3160 msgstr "--contains 选项只允许和 -l 共用。"

3161

3106 -#: builtin/tag.c:458

3162 +#: builtin/tag.c:506

3163 +msgid "--points-at option is only allowed with -l."

3164 +msgstr "--points-at 选项只允许和 -l 共用。"

3165 +

3166 +#: builtin/tag.c:514

3167 msgid "only one -F or -m option is allowed."

3168 msgstr "只允许一个 -F 或 -m 选项。"

3169

3110 -#: builtin/tag.c:478

3170 +#: builtin/tag.c:534

3171 msgid "too many params"

3172 msgstr "太多参数"

3173

3114 -#: builtin/tag.c:484

3174 +#: builtin/tag.c:540

3175 #, c-format

3176 msgid "'%s' is not a valid tag name."

3177 msgstr "'%s' 不是一个有效的tag名称"

3178

3119 -#: builtin/tag.c:489

3179 +#: builtin/tag.c:545

3180 #, c-format

3181 msgid "tag '%s' already exists"

3182 msgstr "tag '%s' 已存在"

3183

3124 -#: builtin/tag.c:507

3184 +#: builtin/tag.c:563

3185 #, c-format

3186 msgid "%s: cannot lock the ref"

3187 msgstr "%s：不能锁定引用"

3188

3129 -#: builtin/tag.c:509

3189 +#: builtin/tag.c:565

3190 #, c-format

3191 msgid "%s: cannot update the ref"

3192 msgstr "%s：不能更新引用"

3193

3134 -#: builtin/tag.c:511

3194 +#: builtin/tag.c:567

3195 #, c-format

3196 msgid "Updated tag '%s' (was %s)\n"

3197 msgstr "已更新tag '%s'（曾为 %s）\n"

@@ -3328,15 +3388,15 @@ msgstr ""

3388 msgid "Pull is not possible because you have unmerged files."

3389 msgstr "Pull 不可用，因为你尚有未合并的文件。"

3390

3331 -#: git-pull.sh:193

3391 +#: git-pull.sh:197

3392 msgid "updating an unborn branch with changes added to the index"

3393 msgstr "更新尚未诞生的分支，变更添加至暂存区"

3394

3335 -#: git-pull.sh:249

3395 +#: git-pull.sh:253

3396 msgid "Cannot merge multiple branches into empty head"

3397 msgstr "无法将多个分支合并到空分支"

3398

3339 -#: git-pull.sh:253

3399 +#: git-pull.sh:257

3400 msgid "Cannot rebase onto multiple branches"

3401 msgstr "无法变基到多个分支"

3402

l10n: update Chinese translation to the new git.po