3495628d4b · matheusbsbs/matheus-bagliano

@@ -135,8 +135,8 @@ msgid ""

135 msgstr ""

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

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

138 -"POT-Creation-Date: 2016-02-28 20:31+0800\n"

139 -"PO-Revision-Date: 2016-03-06 22:12+0800\n"

138 +"POT-Creation-Date: 2016-03-12 22:05+0800\n"

139 +"PO-Revision-Date: 2016-03-16 00:02+0800\n"

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

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

142 "Language: zh_CN\n"

@@ -1250,6 +1250,16 @@ msgstr "未能识别的颜色：%%(color:%s)"

1250 msgid "unrecognized format: %%(%s)"

1251 msgstr "未能识别的格式：%%(%s)"

1252

1253 +#: ref-filter.c:77

1254 +#, c-format

1255 +msgid "%%(body) does not take arguments"

1256 +msgstr "%%(body) 不带参数"

1257 +

1258 +#: ref-filter.c:84

1259 +#, c-format

1260 +msgid "%%(subject) does not take arguments"

1261 +msgstr "%%(subject) 不带参数"

1262 +

1263 #: ref-filter.c:101

1264 #, c-format

1265 msgid "positive value expected contents:lines=%s"

@@ -1290,16 +1300,65 @@ msgstr "未能识别的 %%(align) 参数：%s"

1300 msgid "positive width expected with the %%(align) atom"

1301 msgstr "元素 %%(align) 需要一个正数的宽度"

1302

1303 +#: ref-filter.c:244

1304 +#, c-format

1305 +msgid "malformed field name: %.*s"

1306 +msgstr "非法的字段名：%.*s"

1307 +

1308 +#: ref-filter.c:270

1309 +#, c-format

1310 +msgid "unknown field name: %.*s"

1311 +msgstr "未知的字段名：%.*s"

1312 +

1313 #: ref-filter.c:372

1314 #, c-format

1315 msgid "format: %%(end) atom used without corresponding atom"

1316 msgstr "格式：使用了 %%(end) 元素却没有它的对应元素"

1317

1318 +#: ref-filter.c:424

1319 +#, c-format

1320 +msgid "malformed format string %s"

1321 +msgstr "非法的格式化字符串 %s"

1322 +

1323 +#: ref-filter.c:878

1324 +msgid ":strip= requires a positive integer argument"

1325 +msgstr ":strip= 需要一个正整型参数"

1326 +

1327 +#: ref-filter.c:883

1328 +#, c-format

1329 +msgid "ref '%s' does not have %ld components to :strip"

1330 +msgstr "引用 '%s' 没有提供要脱掉的 %ld 个组件"

1331 +

1332 +#: ref-filter.c:1046

1333 +#, c-format

1334 +msgid "unknown %.*s format %s"

1335 +msgstr "未知 %.*s 格式 %s"

1336 +

1337 +#: ref-filter.c:1066 ref-filter.c:1097

1338 +#, c-format

1339 +msgid "missing object %s for %s"

1340 +msgstr "丢失 %2$s 的对象 %1$s"

1341 +

1342 +#: ref-filter.c:1069 ref-filter.c:1100

1343 +#, c-format

1344 +msgid "parse_object_buffer failed on %s for %s"

1345 +msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"

1346 +

1347 #: ref-filter.c:1311

1348 #, c-format

1349 msgid "malformed object at '%s'"

1350 msgstr "非法的对象于 '%s'"

1351

1352 +#: ref-filter.c:1373

1353 +#, c-format

1354 +msgid "ignoring ref with broken name %s"

1355 +msgstr "忽略带有错误名称 %s 的引用"

1356 +

1357 +#: ref-filter.c:1378

1358 +#, c-format

1359 +msgid "ignoring broken ref %s"

1360 +msgstr "忽略损坏的引用 %s"

1361 +

1362 #: ref-filter.c:1651

1363 #, c-format

1364 msgid "format: %%(end) atom missing"

@@ -1708,6 +1767,20 @@ msgstr "不能拣选到空分支"

1767 msgid "failed to read %s"

1768 msgstr "无法读取 %s"

1769

1770 +#: sha1_file.c:1080

1771 +msgid "offset before end of packfile (broken .idx?)"

1772 +msgstr "偏移量在包文件结束之前（损坏的 .idx？）"

1773 +

1774 +#: sha1_file.c:2459

1775 +#, c-format

1776 +msgid "offset before start of pack index for %s (corrupt index?)"

1777 +msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）"

1778 +

1779 +#: sha1_file.c:2463

1780 +#, c-format

1781 +msgid "offset beyond end of pack index for %s (truncated index?)"

1782 +msgstr "偏移量越过了 %s 的包索引的结尾（截断的索引？）"

1783 +

1784 #: sha1_name.c:462

1785 msgid ""

1786 "Git normally never creates a ref that ends with 40 hex characters\n"

@@ -1752,6 +1825,11 @@ msgstr "无法移除 %s 的 .gitmodules 条目"

1825 msgid "staging updated .gitmodules failed"

1826 msgstr "将更新后 .gitmodules 添加暂存区失败"

1827

1828 +#: trailer.c:237

1829 +#, c-format

1830 +msgid "running trailer command '%s' failed"

1831 +msgstr "执行 trailer 命令 '%s' 失败"

1832 +

1833 #: trailer.c:492 trailer.c:496 trailer.c:500 trailer.c:554 trailer.c:558

1834 #: trailer.c:562

1835 #, c-format

@@ -4236,6 +4314,10 @@ msgstr "不能对 '%s' 执行 reflog 操作：%s\n"

4314 msgid "HEAD is now at"

4315 msgstr "HEAD 目前位于"

4316

4317 +#: builtin/checkout.c:665 builtin/clone.c:659

4318 +msgid "unable to update HEAD"

4319 +msgstr "不能更新 HEAD"

4320 +

4321 #: builtin/checkout.c:669

4322 #, c-format

4323 msgid "Reset branch '%s'\n"

@@ -4759,6 +4841,14 @@ msgstr "只使用 IPv4 地址"

4841 msgid "use IPv6 addresses only"

4842 msgstr "只使用 IPv6 地址"

4843

4844 +#: builtin/clone.c:239

4845 +msgid ""

4846 +"No directory name could be guessed.\n"

4847 +"Please specify a directory on the command line"

4848 +msgstr ""

4849 +"无法猜到目录名。\n"

4850 +"请在命令行提供一个目录"

4851 +

4852 #: builtin/clone.c:305

4853 #, c-format

4854 msgid "reference repository '%s' as a linked checkout is not supported yet."

@@ -4833,6 +4923,11 @@ msgstr "检查连接... "

4923 msgid "remote did not send all necessary objects"

4924 msgstr "远程没有发送所有必须的对象"

4925

4926 +#: builtin/clone.c:647

4927 +#, c-format

4928 +msgid "unable to update %s"

4929 +msgstr "不能更新 %s"

4930 +

4931 #: builtin/clone.c:696

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

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

@@ -4841,6 +4936,10 @@ msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n"

4936 msgid "unable to checkout working tree"

4937 msgstr "不能检出工作区"

4938

4939 +#: builtin/clone.c:753

4940 +msgid "unable to write parameters to config file"

4941 +msgstr "无法将参数写入配置文件"

4942 +

4943 #: builtin/clone.c:816

4944 msgid "cannot repack to clean up"

4945 msgstr "无法执行 repack 来清理"

@@ -7054,55 +7153,55 @@ msgstr "无法存储索引文件"

7153 msgid "bad pack.indexversion=%<PRIu32>"

7154 msgstr "坏的 pack.indexversion=%<PRIu32>"

7155

7057 -#: builtin/index-pack.c:1479 builtin/index-pack.c:1663

7156 +#: builtin/index-pack.c:1479 builtin/index-pack.c:1664

7157 #, c-format

7158 msgid "no threads support, ignoring %s"

7159 msgstr "没有线程支持，忽略 %s"

7160

7062 -#: builtin/index-pack.c:1537

7161 +#: builtin/index-pack.c:1538

7162 #, c-format

7163 msgid "Cannot open existing pack file '%s'"

7164 msgstr "无法打开现存包文件 '%s'"

7165

7067 -#: builtin/index-pack.c:1539

7166 +#: builtin/index-pack.c:1540

7167 #, c-format

7168 msgid "Cannot open existing pack idx file for '%s'"

7169 msgstr "无法为 %s 打开包索引文件"

7170

7072 -#: builtin/index-pack.c:1586

7171 +#: builtin/index-pack.c:1587

7172 #, c-format

7173 msgid "non delta: %d object"

7174 msgid_plural "non delta: %d objects"

7175 msgstr[0] "非 delta：%d 个对象"

7176 msgstr[1] "非 delta：%d 个对象"

7177

7079 -#: builtin/index-pack.c:1593

7178 +#: builtin/index-pack.c:1594

7179 #, c-format

7180 msgid "chain length = %d: %lu object"

7181 msgid_plural "chain length = %d: %lu objects"

7182 msgstr[0] "链长 = %d: %lu 对象"

7183 msgstr[1] "链长 = %d: %lu 对象"

7184

7086 -#: builtin/index-pack.c:1623

7185 +#: builtin/index-pack.c:1624

7186 msgid "Cannot come back to cwd"

7187 msgstr "无法返回当前工作目录"

7188

7090 -#: builtin/index-pack.c:1675 builtin/index-pack.c:1678

7091 -#: builtin/index-pack.c:1690 builtin/index-pack.c:1694

7189 +#: builtin/index-pack.c:1676 builtin/index-pack.c:1679

7190 +#: builtin/index-pack.c:1691 builtin/index-pack.c:1695

7191 #, c-format

7192 msgid "bad %s"

7193 msgstr "错误选项 %s"

7194

7096 -#: builtin/index-pack.c:1708

7195 +#: builtin/index-pack.c:1709

7196 msgid "--fix-thin cannot be used without --stdin"

7197 msgstr "--fix-thin 不能和 --stdin 同时使用"

7198

7100 -#: builtin/index-pack.c:1712 builtin/index-pack.c:1721

7199 +#: builtin/index-pack.c:1713 builtin/index-pack.c:1722

7200 #, c-format

7201 msgid "packfile name '%s' does not end with '.pack'"

7202 msgstr "包文件名 '%s' 没有以 '.pack' 结尾"

7203

7105 -#: builtin/index-pack.c:1729

7204 +#: builtin/index-pack.c:1730

7205 msgid "--verify with no packfile name given"

7206 msgstr "--verify 没有提供包文件名参数"

7207

@@ -7229,7 +7328,9 @@ msgstr "不能访问工作区 '%s'"

7328 msgid ""

7329 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer "

7330 "<token>[(=|:)<value>])...] [<file>...]"

7232 -msgstr "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值>])...] [<文件>...]"

7331 +msgstr ""

7332 +"git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值"

7333 +">])...] [<文件>...]"

7334

7335 #: builtin/interpret-trailers.c:26

7336 msgid "edit files in place"

@@ -11194,7 +11295,7 @@ msgstr ""

11295 "查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"

11296 "帮助。"

11297

11197 -#: http.c:320

11298 +#: http.c:321

11299 msgid "Public key pinning not supported with cURL < 7.44.0"

11300 msgstr "不支持公钥文件锁定，因为 cURL < 7.44.0"

11301

@@ -11279,8 +11380,8 @@ msgid "Update remote refs along with associated objects"

11380 msgstr "更新远程引用和相关的对象"

11381

11382 #: common-cmds.h:32

11282 -msgid "Forward-port local commits to the updated upstream head"

11283 -msgstr "本地提交转移至更新后的上游分支中"

11383 +msgid "Reapply commits on top of another base tip"

11384 +msgstr "在另一个分支上重新应用提交"

11385

11386 #: common-cmds.h:33

11387 msgid "Reset current HEAD to the specified state"

@@ -12077,6 +12178,9 @@ msgstr "无法递归进子模组路径 '$sm_path'"

12178 msgid "Synchronizing submodule url for '$displaypath'"

12179 msgstr "为 '$displaypath' 同步子模组 url"

12180

12181 +#~ msgid "Forward-port local commits to the updated upstream head"

12182 +#~ msgstr "本地提交转移至更新后的上游分支中"

12183 +

12184 #~ msgid "unable to parse format"

12185 #~ msgstr "不能解析格式"

12186

@@ -12211,9 +12315,6 @@ msgstr "为 '$displaypath' 同步子模组 url"

12315 #~ msgid "unable to parse value '%s' for option %s"

12316 #~ msgstr "不能解析选项 %1$s 的值 '%2$s'"

12317

12214 -#~ msgid "unable to resolve HEAD"

12215 -#~ msgstr "不能解析 HEAD"

12216 -

12318 #~ msgid "-b and -B are mutually exclusive"

12319 #~ msgstr "-b 和 -B 互斥"

12320

l10n: zh_CN: for git v2.8.0 l10n round 2