c6bc7d435b · matheusbsbs/matheus-bagliano

@@ -8,7 +8,7 @@ msgid ""

8 msgstr ""

9 "Project-Id-Version: PACKAGE VERSION\n"

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

11 -"POT-Creation-Date: 2013-04-10 15:16+0800\n"

11 +"POT-Creation-Date: 2013-04-30 08:25+0800\n"

12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

14 "Language-Team: LANGUAGE <LL@li.org>\n"

@@ -60,7 +60,7 @@ msgstr ""

60 msgid "archive format"

61 msgstr ""

62

63 -#: archive.c:324 builtin/log.c:1117

63 +#: archive.c:324 builtin/log.c:1126

64 msgid "prefix"

65 msgstr ""

66

@@ -68,10 +68,10 @@ msgstr ""

68 msgid "prepend prefix to each pathname in the archive"

69 msgstr ""

70

71 -#: archive.c:326 builtin/archive.c:88 builtin/blame.c:2366

72 -#: builtin/blame.c:2367 builtin/config.c:55 builtin/fast-export.c:659

73 -#: builtin/fast-export.c:661 builtin/grep.c:715 builtin/hash-object.c:77

74 -#: builtin/ls-files.c:497 builtin/ls-files.c:500 builtin/notes.c:536

71 +#: archive.c:326 builtin/archive.c:88 builtin/blame.c:2371

72 +#: builtin/blame.c:2372 builtin/config.c:55 builtin/fast-export.c:665

73 +#: builtin/fast-export.c:667 builtin/grep.c:715 builtin/hash-object.c:77

74 +#: builtin/ls-files.c:490 builtin/ls-files.c:493 builtin/notes.c:536

75 #: builtin/notes.c:693 builtin/read-tree.c:107 parse-options.h:149

76 msgid "file"

77 msgstr ""

@@ -126,6 +126,75 @@ msgid ""

126 "Use '\\!' for literal leading exclamation."

127 msgstr ""

128

129 +#: branch.c:60

130 +#, c-format

131 +msgid "Not setting branch %s as its own upstream."

132 +msgstr ""

133 +

134 +#: branch.c:82

135 +#, c-format

136 +msgid "Branch %s set up to track remote branch %s from %s by rebasing."

137 +msgstr ""

138 +

139 +#: branch.c:83

140 +#, c-format

141 +msgid "Branch %s set up to track remote branch %s from %s."

142 +msgstr ""

143 +

144 +#: branch.c:87

145 +#, c-format

146 +msgid "Branch %s set up to track local branch %s by rebasing."

147 +msgstr ""

148 +

149 +#: branch.c:88

150 +#, c-format

151 +msgid "Branch %s set up to track local branch %s."

152 +msgstr ""

153 +

154 +#: branch.c:92

155 +#, c-format

156 +msgid "Branch %s set up to track remote ref %s by rebasing."

157 +msgstr ""

158 +

159 +#: branch.c:93

160 +#, c-format

161 +msgid "Branch %s set up to track remote ref %s."

162 +msgstr ""

163 +

164 +#: branch.c:97

165 +#, c-format

166 +msgid "Branch %s set up to track local ref %s by rebasing."

167 +msgstr ""

168 +

169 +#: branch.c:98

170 +#, c-format

171 +msgid "Branch %s set up to track local ref %s."

172 +msgstr ""

173 +

174 +#: branch.c:118

175 +#, c-format

176 +msgid "Tracking not set up: name too long: %s"

177 +msgstr ""

178 +

179 +#: branch.c:137

180 +#, c-format

181 +msgid "Not tracking: ambiguous information for ref %s"

182 +msgstr ""

183 +

184 +#: branch.c:182

185 +#, c-format

186 +msgid "'%s' is not a valid branch name."

187 +msgstr ""

188 +

189 +#: branch.c:187

190 +#, c-format

191 +msgid "A branch named '%s' already exists."

192 +msgstr ""

193 +

194 +#: branch.c:195

195 +msgid "Cannot force update the current branch."

196 +msgstr ""

197 +

198 #: branch.c:201

199 #, c-format

200 msgid "Cannot setup tracking information; starting point '%s' is not a branch."

@@ -148,6 +217,29 @@ msgid ""

217 "\"git push -u\" to set the upstream config as you push."

218 msgstr ""

219

220 +#: branch.c:250

221 +#, c-format

222 +msgid "Not a valid object name: '%s'."

223 +msgstr ""

224 +

225 +#: branch.c:270

226 +#, c-format

227 +msgid "Ambiguous object name: '%s'."

228 +msgstr ""

229 +

230 +#: branch.c:275

231 +#, c-format

232 +msgid "Not a valid branch point: '%s'."

233 +msgstr ""

234 +

235 +#: branch.c:281

236 +msgid "Failed to lock ref for update"

237 +msgstr ""

238 +

239 +#: branch.c:299

240 +msgid "Failed to write ref"

241 +msgstr ""

242 +

243 #: bundle.c:36

244 #, c-format

245 msgid "'%s' does not look like a v2 bundle file"

@@ -167,9 +259,9 @@ msgstr ""

259 msgid "Repository lacks these prerequisite commits:"

260 msgstr ""

261

170 -#: bundle.c:164 sequencer.c:651 sequencer.c:1083 builtin/log.c:300

171 -#: builtin/log.c:754 builtin/log.c:1350 builtin/log.c:1566 builtin/merge.c:349

172 -#: builtin/shortlog.c:157

262 +#: bundle.c:164 sequencer.c:651 sequencer.c:1101 builtin/log.c:300

263 +#: builtin/log.c:770 builtin/log.c:1344 builtin/log.c:1570 builtin/merge.c:349

264 +#: builtin/shortlog.c:155

265 msgid "revision walk setup failed"

266 msgstr ""

267

@@ -195,7 +287,7 @@ msgstr[1] ""

287 msgid "rev-list died"

288 msgstr ""

289

198 -#: bundle.c:300 builtin/log.c:1246 builtin/shortlog.c:260

290 +#: bundle.c:300 builtin/log.c:1255 builtin/shortlog.c:258

291 #, c-format

292 msgid "unrecognized argument: %s"

293 msgstr ""

@@ -343,14 +435,14 @@ msgid ""

435 "%s"

436 msgstr ""

437

346 -#: diff.c:3480

438 +#: diff.c:3481

439 #, c-format

440 msgid ""

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

442 "%s"

443 msgstr ""

444

353 -#: diff.c:3494

445 +#: diff.c:3495

446 #, c-format

447 msgid "Failed to parse --submodule option parameter: '%s'"

448 msgstr ""

@@ -447,8 +539,8 @@ msgstr[1] ""

539 msgid "failed to read the cache"

540 msgstr ""

541

450 -#: merge.c:110 builtin/checkout.c:362 builtin/checkout.c:563

451 -#: builtin/clone.c:635

542 +#: merge.c:110 builtin/checkout.c:365 builtin/checkout.c:566

543 +#: builtin/clone.c:645

544 msgid "unable to write new index file"

545 msgstr ""

546

@@ -497,7 +589,7 @@ msgstr ""

589 msgid "blob expected for %s '%s'"

590 msgstr ""

591

500 -#: merge-recursive.c:773 builtin/clone.c:303

592 +#: merge-recursive.c:773 builtin/clone.c:313

593 #, c-format

594 msgid "failed to open '%s'"

595 msgstr ""

@@ -1000,11 +1092,21 @@ msgstr ""

1092 msgid "Could not format %s."

1093 msgstr ""

1094

1003 -#: sequencer.c:1101

1095 +#: sequencer.c:1083

1096 +#, c-format

1097 +msgid "%s: can't cherry-pick a %s"

1098 +msgstr ""

1099 +

1100 +#: sequencer.c:1085

1101 +#, c-format

1102 +msgid "%s: bad revision"

1103 +msgstr ""

1104 +

1105 +#: sequencer.c:1119

1106 msgid "Can't revert as initial commit"

1107 msgstr ""

1108

1007 -#: sequencer.c:1102

1109 +#: sequencer.c:1120

1110 msgid "Can't cherry-pick into empty head"

1111 msgstr ""

1112

@@ -1190,254 +1292,249 @@ msgstr ""

1292 msgid "bug: unhandled diff status %c"

1293 msgstr ""

1294

1193 -#: wt-status.c:805

1295 +#: wt-status.c:803

1296 msgid "You have unmerged paths."

1297 msgstr ""

1298

1197 -#: wt-status.c:808 wt-status.c:960

1299 +#: wt-status.c:806 wt-status.c:958

1300 msgid " (fix conflicts and run \"git commit\")"

1301 msgstr ""

1302

1201 -#: wt-status.c:811

1303 +#: wt-status.c:809

1304 msgid "All conflicts fixed but you are still merging."

1305 msgstr ""

1306

1205 -#: wt-status.c:814

1307 +#: wt-status.c:812

1308 msgid " (use \"git commit\" to conclude merge)"

1309 msgstr ""

1310

1209 -#: wt-status.c:824

1311 +#: wt-status.c:822

1312 msgid "You are in the middle of an am session."

1313 msgstr ""

1314

1213 -#: wt-status.c:827

1315 +#: wt-status.c:825

1316 msgid "The current patch is empty."

1317 msgstr ""

1318

1217 -#: wt-status.c:831

1319 +#: wt-status.c:829

1320 msgid " (fix conflicts and then run \"git am --resolved\")"

1321 msgstr ""

1322

1221 -#: wt-status.c:833

1323 +#: wt-status.c:831

1324 msgid " (use \"git am --skip\" to skip this patch)"

1325 msgstr ""

1326

1225 -#: wt-status.c:835

1327 +#: wt-status.c:833

1328 msgid " (use \"git am --abort\" to restore the original branch)"

1329 msgstr ""

1330

1229 -#: wt-status.c:895 wt-status.c:912

1331 +#: wt-status.c:893 wt-status.c:910

1332 #, c-format

1333 msgid "You are currently rebasing branch '%s' on '%s'."

1334 msgstr ""

1335

1234 -#: wt-status.c:900 wt-status.c:917

1336 +#: wt-status.c:898 wt-status.c:915

1337 msgid "You are currently rebasing."

1338 msgstr ""

1339

1238 -#: wt-status.c:903

1340 +#: wt-status.c:901

1341 msgid " (fix conflicts and then run \"git rebase --continue\")"

1342 msgstr ""

1343

1242 -#: wt-status.c:905

1344 +#: wt-status.c:903

1345 msgid " (use \"git rebase --skip\" to skip this patch)"

1346 msgstr ""

1347

1246 -#: wt-status.c:907

1348 +#: wt-status.c:905

1349 msgid " (use \"git rebase --abort\" to check out the original branch)"

1350 msgstr ""

1351

1250 -#: wt-status.c:920

1352 +#: wt-status.c:918

1353 msgid " (all conflicts fixed: run \"git rebase --continue\")"

1354 msgstr ""

1355

1254 -#: wt-status.c:924

1356 +#: wt-status.c:922

1357 #, c-format

1358 msgid ""

1359 "You are currently splitting a commit while rebasing branch '%s' on '%s'."

1360 msgstr ""

1361

1260 -#: wt-status.c:929

1362 +#: wt-status.c:927

1363 msgid "You are currently splitting a commit during a rebase."

1364 msgstr ""

1365

1264 -#: wt-status.c:932

1366 +#: wt-status.c:930

1367 msgid " (Once your working directory is clean, run \"git rebase --continue\")"

1368 msgstr ""

1369

1268 -#: wt-status.c:936

1370 +#: wt-status.c:934

1371 #, c-format

1372 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."

1373 msgstr ""

1374

1273 -#: wt-status.c:941

1375 +#: wt-status.c:939

1376 msgid "You are currently editing a commit during a rebase."

1377 msgstr ""

1378

1277 -#: wt-status.c:944

1379 +#: wt-status.c:942

1380 msgid " (use \"git commit --amend\" to amend the current commit)"

1381 msgstr ""

1382

1281 -#: wt-status.c:946

1383 +#: wt-status.c:944

1384 msgid ""

1385 " (use \"git rebase --continue\" once you are satisfied with your changes)"

1386 msgstr ""

1387

1286 -#: wt-status.c:956

1388 +#: wt-status.c:954

1389 msgid "You are currently cherry-picking."

1390 msgstr ""

1391

1290 -#: wt-status.c:963

1392 +#: wt-status.c:961

1393 msgid " (all conflicts fixed: run \"git commit\")"

1394 msgstr ""

1395

1294 -#: wt-status.c:972

1396 +#: wt-status.c:970

1397 #, c-format

1398 msgid "You are currently reverting commit %s."

1399 msgstr ""

1400

1299 -#: wt-status.c:977

1401 +#: wt-status.c:975

1402 msgid " (fix conflicts and run \"git revert --continue\")"

1403 msgstr ""

1404

1303 -#: wt-status.c:980

1405 +#: wt-status.c:978

1406 msgid " (all conflicts fixed: run \"git revert --continue\")"

1407 msgstr ""

1408

1307 -#: wt-status.c:982

1409 +#: wt-status.c:980

1410 msgid " (use \"git revert --abort\" to cancel the revert operation)"

1411 msgstr ""

1412

1311 -#: wt-status.c:993

1413 +#: wt-status.c:991

1414 #, c-format

1415 msgid "You are currently bisecting, started from branch '%s'."

1416 msgstr ""

1417

1316 -#: wt-status.c:997

1418 +#: wt-status.c:995

1419 msgid "You are currently bisecting."

1420 msgstr ""

1421

1320 -#: wt-status.c:1000

1422 +#: wt-status.c:998

1423 msgid " (use \"git bisect reset\" to get back to the original branch)"

1424 msgstr ""

1425

1324 -#: wt-status.c:1175

1426 +#: wt-status.c:1173

1427 msgid "On branch "

1428 msgstr ""

1429

1328 -#: wt-status.c:1186

1430 +#: wt-status.c:1184

1431 msgid "HEAD detached at "

1432 msgstr ""

1433

1332 -#: wt-status.c:1188

1434 +#: wt-status.c:1186

1435 msgid "HEAD detached from "

1436 msgstr ""

1437

1336 -#: wt-status.c:1191

1438 +#: wt-status.c:1189

1439 msgid "Not currently on any branch."

1440 msgstr ""

1441

1340 -#: wt-status.c:1208

1442 +#: wt-status.c:1206

1443 msgid "Initial commit"

1444 msgstr ""

1445

1344 -#: wt-status.c:1222

1446 +#: wt-status.c:1220

1447 msgid "Untracked files"

1448 msgstr ""

1449

1348 -#: wt-status.c:1224

1450 +#: wt-status.c:1222

1451 msgid "Ignored files"

1452 msgstr ""

1453

1352 -#: wt-status.c:1228

1454 +#: wt-status.c:1226

1455 #, c-format

1354 -msgid "It took %.2f seconds to enumerate untracked files. 'status -uno'"

1456 +msgid ""

1457 +"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"

1458 +"may speed it up, but you have to be careful not to forget to add\n"

1459 +"new files yourself (see 'git help status')."

1460 msgstr ""

1461

1462 #: wt-status.c:1232

1358 -msgid "may speed it up, but you have to be careful not to forget to add"

1359 -msgstr ""

1360 -

1361 -#: wt-status.c:1235

1362 -msgid "new files yourself (see 'git help status')."

1363 -msgstr ""

1364 -

1365 -#: wt-status.c:1238

1463 #, c-format

1464 msgid "Untracked files not listed%s"

1465 msgstr ""

1466

1370 -#: wt-status.c:1240

1467 +#: wt-status.c:1234

1468 msgid " (use -u option to show untracked files)"

1469 msgstr ""

1470

1374 -#: wt-status.c:1246

1471 +#: wt-status.c:1240

1472 msgid "No changes"

1473 msgstr ""

1474

1378 -#: wt-status.c:1251

1475 +#: wt-status.c:1245

1476 #, c-format

1477 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"

1478 msgstr ""

1479

1383 -#: wt-status.c:1254

1480 +#: wt-status.c:1248

1481 #, c-format

1482 msgid "no changes added to commit\n"

1483 msgstr ""

1484

1388 -#: wt-status.c:1257

1485 +#: wt-status.c:1251

1486 #, c-format

1487 msgid ""

1488 "nothing added to commit but untracked files present (use \"git add\" to "

1489 "track)\n"

1490 msgstr ""

1491

1395 -#: wt-status.c:1260

1492 +#: wt-status.c:1254

1493 #, c-format

1494 msgid "nothing added to commit but untracked files present\n"

1495 msgstr ""

1496

1400 -#: wt-status.c:1263

1497 +#: wt-status.c:1257

1498 #, c-format

1499 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"

1500 msgstr ""

1501

1405 -#: wt-status.c:1266 wt-status.c:1271

1502 +#: wt-status.c:1260 wt-status.c:1265

1503 #, c-format

1504 msgid "nothing to commit\n"

1505 msgstr ""

1506

1410 -#: wt-status.c:1269

1507 +#: wt-status.c:1263

1508 #, c-format

1509 msgid "nothing to commit (use -u to show untracked files)\n"

1510 msgstr ""

1511

1415 -#: wt-status.c:1273

1512 +#: wt-status.c:1267

1513 #, c-format

1514 msgid "nothing to commit, working directory clean\n"

1515 msgstr ""

1516

1420 -#: wt-status.c:1381

1517 +#: wt-status.c:1375

1518 msgid "HEAD (no branch)"

1519 msgstr ""

1520

1424 -#: wt-status.c:1387

1521 +#: wt-status.c:1381

1522 msgid "Initial commit on "

1523 msgstr ""

1524

1428 -#: wt-status.c:1402

1525 +#: wt-status.c:1396

1526 msgid "behind "

1527 msgstr ""

1528

1432 -#: wt-status.c:1405 wt-status.c:1408

1529 +#: wt-status.c:1399 wt-status.c:1402

1530 msgid "ahead "

1531 msgstr ""

1532

1436 -#: wt-status.c:1410

1533 +#: wt-status.c:1404

1534 msgid ", behind "

1535 msgstr ""

1536

1440 -#: compat/precompose_utf8.c:58 builtin/clone.c:342

1537 +#: compat/precompose_utf8.c:58 builtin/clone.c:352

1538 #, c-format

1539 msgid "failed to unlink '%s'"

1540 msgstr ""

@@ -1446,179 +1543,200 @@ msgstr ""

1543 msgid "git add [options] [--] <pathspec>..."

1544 msgstr ""

1545

1449 -#: builtin/add.c:63

1546 +#.

1547 +#. * To be consistent with "git add -p" and most Git

1548 +#. * commands, we should default to being tree-wide, but

1549 +#. * this is not the original behavior and can't be

1550 +#. * changed until users trained themselves not to type

1551 +#. * "git add -u" or "git add -A". For now, we warn and

1552 +#. * keep the old behavior. Later, the behavior can be changed

1553 +#. * to tree-wide, keeping the warning for a while, and

1554 +#. * eventually we can drop the warning.

1555 +#.

1556 +#: builtin/add.c:58

1557 +#, c-format

1558 +msgid ""

1559 +"The behavior of 'git add %s (or %s)' with no path argument from a\n"

1560 +"subdirectory of the tree will change in Git 2.0 and should not be used "

1561 +"anymore.\n"

1562 +"To add content for the whole tree, run:\n"

1563 +"\n"

1564 +" git add %s :/\n"

1565 +" (or git add %s :/)\n"

1566 +"\n"

1567 +"To restrict the command to the current directory, run:\n"

1568 +"\n"

1569 +" git add %s .\n"

1570 +" (or git add %s .)\n"

1571 +"\n"

1572 +"With the current Git version, the command is restricted to the current "

1573 +"directory.\n"

1574 +msgstr ""

1575 +

1576 +#: builtin/add.c:100

1577 +#, c-format

1578 +msgid ""

1579 +"You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n"

1580 +"whose behaviour will change in Git 2.0 with respect to paths you removed.\n"

1581 +"Paths like '%s' that are\n"

1582 +"removed from your working tree are ignored with this version of Git.\n"

1583 +"\n"

1584 +"* 'git add --ignore-removal <pathspec>', which is the current default,\n"

1585 +" ignores paths you removed from your working tree.\n"

1586 +"\n"

1587 +"* 'git add --all <pathspec>' will let you also record the removals.\n"

1588 +"\n"

1589 +"Run 'git status' to check the paths you removed from your working tree.\n"

1590 +msgstr ""

1591 +

1592 +#: builtin/add.c:144

1593 #, c-format

1594 msgid "unexpected diff status %c"

1595 msgstr ""

1596

1454 -#: builtin/add.c:68 builtin/commit.c:233

1597 +#: builtin/add.c:149 builtin/commit.c:233

1598 msgid "updating files failed"

1599 msgstr ""

1600

1458 -#: builtin/add.c:78

1601 +#: builtin/add.c:163

1602 #, c-format

1603 msgid "remove '%s'\n"

1604 msgstr ""

1605

1463 -#: builtin/add.c:148

1606 +#: builtin/add.c:253

1607 msgid "Unstaged changes after refreshing the index:"

1608 msgstr ""

1609

1467 -#: builtin/add.c:151 builtin/add.c:460 builtin/rm.c:275

1610 +#: builtin/add.c:256 builtin/add.c:572 builtin/rm.c:275

1611 #, c-format

1612 msgid "pathspec '%s' did not match any files"

1613 msgstr ""

1614

1472 -#: builtin/add.c:234

1615 +#: builtin/add.c:339

1616 msgid "Could not read the index"

1617 msgstr ""

1618

1476 -#: builtin/add.c:244

1619 +#: builtin/add.c:349

1620 #, c-format

1621 msgid "Could not open '%s' for writing."

1622 msgstr ""

1623

1481 -#: builtin/add.c:248

1624 +#: builtin/add.c:353

1625 msgid "Could not write patch"

1626 msgstr ""

1627

1485 -#: builtin/add.c:253

1628 +#: builtin/add.c:358

1629 #, c-format

1630 msgid "Could not stat '%s'"

1631 msgstr ""

1632

1490 -#: builtin/add.c:255

1633 +#: builtin/add.c:360

1634 msgid "Empty patch. Aborted."

1635 msgstr ""

1636

1494 -#: builtin/add.c:261

1637 +#: builtin/add.c:366

1638 #, c-format

1639 msgid "Could not apply '%s'"

1640 msgstr ""

1641

1499 -#: builtin/add.c:271

1642 +#: builtin/add.c:376

1643 msgid "The following paths are ignored by one of your .gitignore files:\n"

1644 msgstr ""

1645

1503 -#: builtin/add.c:277 builtin/clean.c:161 builtin/fetch.c:78 builtin/mv.c:63

1646 +#: builtin/add.c:393 builtin/clean.c:161 builtin/fetch.c:78 builtin/mv.c:63

1647 #: builtin/prune-packed.c:76 builtin/push.c:425 builtin/remote.c:1253

1648 #: builtin/rm.c:206

1649 msgid "dry run"

1650 msgstr ""

1651

1509 -#: builtin/add.c:278 builtin/apply.c:4409 builtin/check-ignore.c:19

1652 +#: builtin/add.c:394 builtin/apply.c:4409 builtin/check-ignore.c:19

1653 #: builtin/commit.c:1152 builtin/count-objects.c:95 builtin/fsck.c:613

1511 -#: builtin/log.c:1514 builtin/mv.c:62 builtin/read-tree.c:112

1654 +#: builtin/log.c:1518 builtin/mv.c:62 builtin/read-tree.c:112

1655 msgid "be verbose"

1656 msgstr ""

1657

1515 -#: builtin/add.c:280

1658 +#: builtin/add.c:396

1659 msgid "interactive picking"

1660 msgstr ""

1661

1519 -#: builtin/add.c:281 builtin/checkout.c:1060 builtin/reset.c:258

1662 +#: builtin/add.c:397 builtin/checkout.c:1063 builtin/reset.c:258

1663 msgid "select hunks interactively"

1664 msgstr ""

1665

1523 -#: builtin/add.c:282

1666 +#: builtin/add.c:398

1667 msgid "edit current diff and apply"

1668 msgstr ""

1669

1527 -#: builtin/add.c:283

1670 +#: builtin/add.c:399

1671 msgid "allow adding otherwise ignored files"

1672 msgstr ""

1673

1531 -#: builtin/add.c:284

1674 +#: builtin/add.c:400

1675 msgid "update tracked files"

1676 msgstr ""

1677

1535 -#: builtin/add.c:285

1678 +#: builtin/add.c:401

1679 msgid "record only the fact that the path will be added later"

1680 msgstr ""

1681

1539 -#: builtin/add.c:286

1682 +#: builtin/add.c:402

1683 msgid "add changes from all tracked and untracked files"

1684 msgstr ""

1685

1543 -#: builtin/add.c:287

1686 +#. takes no arguments

1687 +#: builtin/add.c:405

1688 +msgid "ignore paths removed in the working tree (same as --no-all)"

1689 +msgstr ""

1690 +

1691 +#: builtin/add.c:407

1692 msgid "don't add, only refresh the index"

1693 msgstr ""

1694

1547 -#: builtin/add.c:288

1695 +#: builtin/add.c:408

1696 msgid "just skip files which cannot be added because of errors"

1697 msgstr ""

1698

1551 -#: builtin/add.c:289

1699 +#: builtin/add.c:409

1700 msgid "check if - even missing - files are ignored in dry run"

1701 msgstr ""

1702

1555 -#: builtin/add.c:311

1703 +#: builtin/add.c:431

1704 #, c-format

1705 msgid "Use -f if you really want to add them.\n"

1706 msgstr ""

1707

1560 -#: builtin/add.c:312

1708 +#: builtin/add.c:432

1709 msgid "no files added"

1710 msgstr ""

1711

1564 -#: builtin/add.c:318

1712 +#: builtin/add.c:438

1713 msgid "adding files failed"

1714 msgstr ""

1715

1568 -#.

1569 -#. * To be consistent with "git add -p" and most Git

1570 -#. * commands, we should default to being tree-wide, but

1571 -#. * this is not the original behavior and can't be

1572 -#. * changed until users trained themselves not to type

1573 -#. * "git add -u" or "git add -A". For now, we warn and

1574 -#. * keep the old behavior. Later, the behavior can be changed

1575 -#. * to tree-wide, keeping the warning for a while, and

1576 -#. * eventually we can drop the warning.

1577 -#.

1578 -#: builtin/add.c:335

1579 -#, c-format

1580 -msgid ""

1581 -"The behavior of 'git add %s (or %s)' with no path argument from a\n"

1582 -"subdirectory of the tree will change in Git 2.0 and should not be used "

1583 -"anymore.\n"

1584 -"To add content for the whole tree, run:\n"

1585 -"\n"

1586 -" git add %s :/\n"

1587 -" (or git add %s :/)\n"

1588 -"\n"

1589 -"To restrict the command to the current directory, run:\n"

1590 -"\n"

1591 -" git add %s .\n"

1592 -" (or git add %s .)\n"

1593 -"\n"

1594 -"With the current Git version, the command is restricted to the current "

1595 -"directory."

1596 -msgstr ""

1597 -

1598 -#: builtin/add.c:381

1716 +#: builtin/add.c:477

1717 msgid "-A and -u are mutually incompatible"

1718 msgstr ""

1719

1602 -#: builtin/add.c:383

1720 +#: builtin/add.c:495

1721 msgid "Option --ignore-missing can only be used together with --dry-run"

1722 msgstr ""

1723

1606 -#: builtin/add.c:414

1724 +#: builtin/add.c:525

1725 #, c-format

1726 msgid "Nothing specified, nothing added.\n"

1727 msgstr ""

1728

1611 -#: builtin/add.c:415

1729 +#: builtin/add.c:526

1730 #, c-format

1731 msgid "Maybe you wanted to say 'git add .'?\n"

1732 msgstr ""

1733

1616 -#: builtin/add.c:421 builtin/check-ignore.c:67 builtin/clean.c:204

1734 +#: builtin/add.c:532 builtin/check-ignore.c:66 builtin/clean.c:204

1735 #: builtin/commit.c:293 builtin/mv.c:82 builtin/rm.c:235

1736 msgid "index file corrupt"

1737 msgstr ""

1738

1621 -#: builtin/add.c:481 builtin/apply.c:4505 builtin/mv.c:229 builtin/rm.c:370

1739 +#: builtin/add.c:604 builtin/apply.c:4505 builtin/mv.c:229 builtin/rm.c:370

1740 msgid "Unable to write new index file"

1741 msgstr ""

1742

@@ -1864,7 +1982,7 @@ msgstr ""

1982 msgid "Checking patch %s..."

1983 msgstr ""

1984

1867 -#: builtin/apply.c:3679 builtin/checkout.c:215 builtin/reset.c:124

1985 +#: builtin/apply.c:3679 builtin/checkout.c:216 builtin/reset.c:124

1986 #, c-format

1987 msgid "make_cache_entry failed for path '%s'"

1988 msgstr ""

@@ -2005,7 +2123,7 @@ msgstr ""

2123 msgid "build a temporary index based on embedded index information"

2124 msgstr ""

2125

2008 -#: builtin/apply.c:4388 builtin/checkout-index.c:197 builtin/ls-files.c:463

2126 +#: builtin/apply.c:4388 builtin/checkout-index.c:197 builtin/ls-files.c:456

2127 msgid "paths are separated with NUL character"

2128 msgstr ""

2129

@@ -2139,99 +2257,99 @@ msgstr ""

2257 msgid "git blame [options] [rev-opts] [rev] [--] file"

2258 msgstr ""

2259

2142 -#: builtin/blame.c:30 builtin/shortlog.c:15

2260 +#: builtin/blame.c:30

2261 msgid "[rev-opts] are documented in git-rev-list(1)"

2262 msgstr ""

2263

2146 -#: builtin/blame.c:2350

2264 +#: builtin/blame.c:2355

2265 msgid "Show blame entries as we find them, incrementally"

2266 msgstr ""

2267

2150 -#: builtin/blame.c:2351

2268 +#: builtin/blame.c:2356

2269 msgid "Show blank SHA-1 for boundary commits (Default: off)"

2270 msgstr ""

2271

2154 -#: builtin/blame.c:2352

2272 +#: builtin/blame.c:2357

2273 msgid "Do not treat root commits as boundaries (Default: off)"

2274 msgstr ""

2275

2158 -#: builtin/blame.c:2353

2276 +#: builtin/blame.c:2358

2277 msgid "Show work cost statistics"

2278 msgstr ""

2279

2162 -#: builtin/blame.c:2354

2280 +#: builtin/blame.c:2359

2281 msgid "Show output score for blame entries"

2282 msgstr ""

2283

2166 -#: builtin/blame.c:2355

2284 +#: builtin/blame.c:2360

2285 msgid "Show original filename (Default: auto)"

2286 msgstr ""

2287

2170 -#: builtin/blame.c:2356

2288 +#: builtin/blame.c:2361

2289 msgid "Show original linenumber (Default: off)"

2290 msgstr ""

2291

2174 -#: builtin/blame.c:2357

2292 +#: builtin/blame.c:2362

2293 msgid "Show in a format designed for machine consumption"

2294 msgstr ""

2295

2178 -#: builtin/blame.c:2358

2296 +#: builtin/blame.c:2363

2297 msgid "Show porcelain format with per-line commit information"

2298 msgstr ""

2299

2182 -#: builtin/blame.c:2359

2300 +#: builtin/blame.c:2364

2301 msgid "Use the same output mode as git-annotate (Default: off)"

2302 msgstr ""

2303

2186 -#: builtin/blame.c:2360

2304 +#: builtin/blame.c:2365

2305 msgid "Show raw timestamp (Default: off)"

2306 msgstr ""

2307

2190 -#: builtin/blame.c:2361

2308 +#: builtin/blame.c:2366

2309 msgid "Show long commit SHA1 (Default: off)"

2310 msgstr ""

2311

2194 -#: builtin/blame.c:2362

2312 +#: builtin/blame.c:2367

2313 msgid "Suppress author name and timestamp (Default: off)"

2314 msgstr ""

2315

2198 -#: builtin/blame.c:2363

2316 +#: builtin/blame.c:2368

2317 msgid "Show author email instead of name (Default: off)"

2318 msgstr ""

2319

2202 -#: builtin/blame.c:2364

2320 +#: builtin/blame.c:2369

2321 msgid "Ignore whitespace differences"

2322 msgstr ""

2323

2206 -#: builtin/blame.c:2365

2324 +#: builtin/blame.c:2370

2325 msgid "Spend extra cycles to find better match"

2326 msgstr ""

2327

2210 -#: builtin/blame.c:2366

2328 +#: builtin/blame.c:2371

2329 msgid "Use revisions from <file> instead of calling git-rev-list"

2330 msgstr ""

2331

2214 -#: builtin/blame.c:2367

2332 +#: builtin/blame.c:2372

2333 msgid "Use <file>'s contents as the final image"

2334 msgstr ""

2335

2218 -#: builtin/blame.c:2368 builtin/blame.c:2369

2336 +#: builtin/blame.c:2373 builtin/blame.c:2374

2337 msgid "score"

2338 msgstr ""

2339

2222 -#: builtin/blame.c:2368

2340 +#: builtin/blame.c:2373

2341 msgid "Find line copies within and across files"

2342 msgstr ""

2343

2226 -#: builtin/blame.c:2369

2344 +#: builtin/blame.c:2374

2345 msgid "Find line movements within and across files"

2346 msgstr ""

2347

2230 -#: builtin/blame.c:2370

2348 +#: builtin/blame.c:2375

2349 msgid "n,m"

2350 msgstr ""

2351

2234 -#: builtin/blame.c:2370

2352 +#: builtin/blame.c:2375

2353 msgid "Process only line range n,m, counting from 1"

2354 msgstr ""

2355

@@ -2251,360 +2369,360 @@ msgstr ""

2369 msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"

2370 msgstr ""

2371

2254 -#: builtin/branch.c:146

2372 +#: builtin/branch.c:150

2373 #, c-format

2374 msgid ""

2375 "deleting branch '%s' that has been merged to\n"

2376 " '%s', but not yet merged to HEAD."

2377 msgstr ""

2378

2261 -#: builtin/branch.c:150

2379 +#: builtin/branch.c:154

2380 #, c-format

2381 msgid ""

2382 "not deleting branch '%s' that is not yet merged to\n"

2383 " '%s', even though it is merged to HEAD."

2384 msgstr ""

2385

2268 -#: builtin/branch.c:164

2386 +#: builtin/branch.c:168

2387 #, c-format

2388 msgid "Couldn't look up commit object for '%s'"

2389 msgstr ""

2390

2273 -#: builtin/branch.c:168

2391 +#: builtin/branch.c:172

2392 #, c-format

2393 msgid ""

2394 "The branch '%s' is not fully merged.\n"

2395 "If you are sure you want to delete it, run 'git branch -D %s'."

2396 msgstr ""

2397

2280 -#: builtin/branch.c:181

2398 +#: builtin/branch.c:185

2399 msgid "Update of config-file failed"

2400 msgstr ""

2401

2284 -#: builtin/branch.c:209

2402 +#: builtin/branch.c:213

2403 msgid "cannot use -a with -d"

2404 msgstr ""

2405

2288 -#: builtin/branch.c:215

2406 +#: builtin/branch.c:219

2407 msgid "Couldn't look up commit object for HEAD"

2408 msgstr ""

2409

2292 -#: builtin/branch.c:223

2410 +#: builtin/branch.c:227

2411 #, c-format

2412 msgid "Cannot delete the branch '%s' which you are currently on."

2413 msgstr ""

2414

2297 -#: builtin/branch.c:236

2415 +#: builtin/branch.c:240

2416 #, c-format

2417 msgid "remote branch '%s' not found."

2418 msgstr ""

2419

2302 -#: builtin/branch.c:237

2420 +#: builtin/branch.c:241

2421 #, c-format

2422 msgid "branch '%s' not found."

2423 msgstr ""

2424

2307 -#: builtin/branch.c:251

2425 +#: builtin/branch.c:255

2426 #, c-format

2427 msgid "Error deleting remote branch '%s'"

2428 msgstr ""

2429

2312 -#: builtin/branch.c:252

2430 +#: builtin/branch.c:256

2431 #, c-format

2432 msgid "Error deleting branch '%s'"

2433 msgstr ""

2434

2317 -#: builtin/branch.c:259

2435 +#: builtin/branch.c:263

2436 #, c-format

2437 msgid "Deleted remote branch %s (was %s).\n"

2438 msgstr ""

2439

2322 -#: builtin/branch.c:260

2440 +#: builtin/branch.c:264

2441 #, c-format

2442 msgid "Deleted branch %s (was %s).\n"

2443 msgstr ""

2444

2327 -#: builtin/branch.c:362

2445 +#: builtin/branch.c:366

2446 #, c-format

2447 msgid "branch '%s' does not point at a commit"

2448 msgstr ""

2449

2332 -#: builtin/branch.c:434

2450 +#: builtin/branch.c:453

2451 #, c-format

2452 msgid "[%s: behind %d]"

2453 msgstr ""

2454

2337 -#: builtin/branch.c:436

2455 +#: builtin/branch.c:455

2456 #, c-format

2457 msgid "[behind %d]"

2458 msgstr ""

2459

2342 -#: builtin/branch.c:440

2460 +#: builtin/branch.c:459

2461 #, c-format

2462 msgid "[%s: ahead %d]"

2463 msgstr ""

2464

2347 -#: builtin/branch.c:442

2465 +#: builtin/branch.c:461

2466 #, c-format

2467 msgid "[ahead %d]"

2468 msgstr ""

2469

2352 -#: builtin/branch.c:445

2470 +#: builtin/branch.c:464

2471 #, c-format

2472 msgid "[%s: ahead %d, behind %d]"

2473 msgstr ""

2474

2357 -#: builtin/branch.c:448

2475 +#: builtin/branch.c:467

2476 #, c-format

2477 msgid "[ahead %d, behind %d]"

2478 msgstr ""

2479

2362 -#: builtin/branch.c:470

2480 +#: builtin/branch.c:490

2481 msgid " **** invalid ref ****"

2482 msgstr ""

2483

2366 -#: builtin/branch.c:562

2484 +#: builtin/branch.c:582

2485 #, c-format

2486 msgid "(no branch, rebasing %s)"

2487 msgstr ""

2488

2371 -#: builtin/branch.c:565

2489 +#: builtin/branch.c:585

2490 #, c-format

2491 msgid "(no branch, bisect started on %s)"

2492 msgstr ""

2493

2376 -#: builtin/branch.c:568

2494 +#: builtin/branch.c:588

2495 #, c-format

2496 msgid "(detached from %s)"

2497 msgstr ""

2498

2381 -#: builtin/branch.c:571

2499 +#: builtin/branch.c:591

2500 msgid "(no branch)"

2501 msgstr ""

2502

2385 -#: builtin/branch.c:617

2503 +#: builtin/branch.c:637

2504 #, c-format

2505 msgid "object '%s' does not point to a commit"

2506 msgstr ""

2507

2390 -#: builtin/branch.c:649

2508 +#: builtin/branch.c:669

2509 msgid "some refs could not be read"

2510 msgstr ""

2511

2394 -#: builtin/branch.c:662

2512 +#: builtin/branch.c:682

2513 msgid "cannot rename the current branch while not on any."

2514 msgstr ""

2515

2398 -#: builtin/branch.c:672

2516 +#: builtin/branch.c:692

2517 #, c-format

2518 msgid "Invalid branch name: '%s'"

2519 msgstr ""

2520

2403 -#: builtin/branch.c:687

2521 +#: builtin/branch.c:707

2522 msgid "Branch rename failed"

2523 msgstr ""

2524

2407 -#: builtin/branch.c:691

2525 +#: builtin/branch.c:711

2526 #, c-format

2527 msgid "Renamed a misnamed branch '%s' away"

2528 msgstr ""

2529

2412 -#: builtin/branch.c:695

2530 +#: builtin/branch.c:715

2531 #, c-format

2532 msgid "Branch renamed to %s, but HEAD is not updated!"

2533 msgstr ""

2534

2417 -#: builtin/branch.c:702

2535 +#: builtin/branch.c:722

2536 msgid "Branch is renamed, but update of config-file failed"

2537 msgstr ""

2538

2421 -#: builtin/branch.c:717

2539 +#: builtin/branch.c:737

2540 #, c-format

2541 msgid "malformed object name %s"

2542 msgstr ""

2543

2426 -#: builtin/branch.c:741

2544 +#: builtin/branch.c:761

2545 #, c-format

2546 msgid "could not write branch description template: %s"

2547 msgstr ""

2548

2431 -#: builtin/branch.c:771

2549 +#: builtin/branch.c:791

2550 msgid "Generic options"

2551 msgstr ""

2552

2435 -#: builtin/branch.c:773

2553 +#: builtin/branch.c:793

2554 msgid "show hash and subject, give twice for upstream branch"

2555 msgstr ""

2556

2439 -#: builtin/branch.c:774

2557 +#: builtin/branch.c:794

2558 msgid "suppress informational messages"

2559 msgstr ""

2560

2443 -#: builtin/branch.c:775

2561 +#: builtin/branch.c:795

2562 msgid "set up tracking mode (see git-pull(1))"

2563 msgstr ""

2564

2447 -#: builtin/branch.c:777

2565 +#: builtin/branch.c:797

2566 msgid "change upstream info"

2567 msgstr ""

2568

2451 -#: builtin/branch.c:781

2569 +#: builtin/branch.c:801

2570 msgid "use colored output"

2571 msgstr ""

2572

2455 -#: builtin/branch.c:782

2573 +#: builtin/branch.c:802

2574 msgid "act on remote-tracking branches"

2575 msgstr ""

2576

2459 -#: builtin/branch.c:785 builtin/branch.c:791 builtin/branch.c:812

2460 -#: builtin/branch.c:818 builtin/commit.c:1368 builtin/commit.c:1369

2577 +#: builtin/branch.c:805 builtin/branch.c:811 builtin/branch.c:832

2578 +#: builtin/branch.c:838 builtin/commit.c:1368 builtin/commit.c:1369

2579 #: builtin/commit.c:1370 builtin/commit.c:1371 builtin/tag.c:468

2580 msgid "commit"

2581 msgstr ""

2582

2465 -#: builtin/branch.c:786 builtin/branch.c:792

2583 +#: builtin/branch.c:806 builtin/branch.c:812

2584 msgid "print only branches that contain the commit"

2585 msgstr ""

2586

2469 -#: builtin/branch.c:798

2587 +#: builtin/branch.c:818

2588 msgid "Specific git-branch actions:"

2589 msgstr ""

2590

2473 -#: builtin/branch.c:799

2591 +#: builtin/branch.c:819

2592 msgid "list both remote-tracking and local branches"

2593 msgstr ""

2594

2477 -#: builtin/branch.c:801

2595 +#: builtin/branch.c:821

2596 msgid "delete fully merged branch"

2597 msgstr ""

2598

2481 -#: builtin/branch.c:802

2599 +#: builtin/branch.c:822

2600 msgid "delete branch (even if not merged)"

2601 msgstr ""

2602

2485 -#: builtin/branch.c:803

2603 +#: builtin/branch.c:823

2604 msgid "move/rename a branch and its reflog"

2605 msgstr ""

2606

2489 -#: builtin/branch.c:804

2607 +#: builtin/branch.c:824

2608 msgid "move/rename a branch, even if target exists"

2609 msgstr ""

2610

2493 -#: builtin/branch.c:805

2611 +#: builtin/branch.c:825

2612 msgid "list branch names"

2613 msgstr ""

2614

2497 -#: builtin/branch.c:806

2615 +#: builtin/branch.c:826

2616 msgid "create the branch's reflog"

2617 msgstr ""

2618

2501 -#: builtin/branch.c:808

2619 +#: builtin/branch.c:828

2620 msgid "edit the description for the branch"

2621 msgstr ""

2622

2505 -#: builtin/branch.c:809

2623 +#: builtin/branch.c:829

2624 msgid "force creation (when already exists)"

2625 msgstr ""

2626

2509 -#: builtin/branch.c:812

2627 +#: builtin/branch.c:832

2628 msgid "print only not merged branches"

2629 msgstr ""

2630

2513 -#: builtin/branch.c:818

2631 +#: builtin/branch.c:838

2632 msgid "print only merged branches"

2633 msgstr ""

2634

2517 -#: builtin/branch.c:822

2635 +#: builtin/branch.c:842

2636 msgid "list branches in columns"

2637 msgstr ""

2638

2521 -#: builtin/branch.c:835

2639 +#: builtin/branch.c:855

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

2641 msgstr ""

2642

2525 -#: builtin/branch.c:840 builtin/clone.c:609

2643 +#: builtin/branch.c:860 builtin/clone.c:619

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

2645 msgstr ""

2646

2529 -#: builtin/branch.c:863

2647 +#: builtin/branch.c:883

2648 msgid "--column and --verbose are incompatible"

2649 msgstr ""

2650

2533 -#: builtin/branch.c:869 builtin/branch.c:908

2651 +#: builtin/branch.c:889 builtin/branch.c:928

2652 msgid "branch name required"

2653 msgstr ""

2654

2537 -#: builtin/branch.c:884

2655 +#: builtin/branch.c:904

2656 msgid "Cannot give description to detached HEAD"

2657 msgstr ""

2658

2541 -#: builtin/branch.c:889

2659 +#: builtin/branch.c:909

2660 msgid "cannot edit description of more than one branch"

2661 msgstr ""

2662

2545 -#: builtin/branch.c:896

2663 +#: builtin/branch.c:916

2664 #, c-format

2665 msgid "No commit on branch '%s' yet."

2666 msgstr ""

2667

2550 -#: builtin/branch.c:899

2668 +#: builtin/branch.c:919

2669 #, c-format

2670 msgid "No branch named '%s'."

2671 msgstr ""

2672

2555 -#: builtin/branch.c:914

2673 +#: builtin/branch.c:934

2674 msgid "too many branches for a rename operation"

2675 msgstr ""

2676

2559 -#: builtin/branch.c:919

2677 +#: builtin/branch.c:939

2678 msgid "too many branches to set new upstream"

2679 msgstr ""

2680

2563 -#: builtin/branch.c:923

2681 +#: builtin/branch.c:943

2682 #, c-format

2683 msgid ""

2684 "could not set upstream of HEAD to %s when it does not point to any branch."

2685 msgstr ""

2686

2569 -#: builtin/branch.c:926 builtin/branch.c:948 builtin/branch.c:970

2687 +#: builtin/branch.c:946 builtin/branch.c:968 builtin/branch.c:990

2688 #, c-format

2689 msgid "no such branch '%s'"

2690 msgstr ""

2691

2574 -#: builtin/branch.c:930

2692 +#: builtin/branch.c:950

2693 #, c-format

2694 msgid "branch '%s' does not exist"

2695 msgstr ""

2696

2579 -#: builtin/branch.c:942

2697 +#: builtin/branch.c:962

2698 msgid "too many branches to unset upstream"

2699 msgstr ""

2700

2583 -#: builtin/branch.c:946

2701 +#: builtin/branch.c:966

2702 msgid "could not unset upstream of HEAD when it does not point to any branch."

2703 msgstr ""

2704

2587 -#: builtin/branch.c:952

2705 +#: builtin/branch.c:972

2706 #, c-format

2707 msgid "Branch '%s' has no upstream information"

2708 msgstr ""

2709

2592 -#: builtin/branch.c:967

2710 +#: builtin/branch.c:987

2711 msgid "it does not make sense to create 'HEAD' manually"

2712 msgstr ""

2713

2596 -#: builtin/branch.c:973

2714 +#: builtin/branch.c:993

2715 msgid "-a and -r options to 'git branch' do not make sense with a branch name"

2716 msgstr ""

2717

2600 -#: builtin/branch.c:976

2718 +#: builtin/branch.c:996

2719 #, c-format

2720 msgid ""

2721 "The --set-upstream flag is deprecated and will be removed. Consider using --"

2722 "track or --set-upstream-to\n"

2723 msgstr ""

2724

2607 -#: builtin/branch.c:993

2725 +#: builtin/branch.c:1013

2726 #, c-format

2727 msgid ""

2728 "\n"

@@ -2612,12 +2730,12 @@ msgid ""

2730 "\n"

2731 msgstr ""

2732

2615 -#: builtin/branch.c:994

2733 +#: builtin/branch.c:1014

2734 #, c-format

2735 msgid " git branch -d %s\n"

2736 msgstr ""

2737

2620 -#: builtin/branch.c:995

2738 +#: builtin/branch.c:1015

2739 #, c-format

2740 msgid " git branch --set-upstream-to %s\n"

2741 msgstr ""

@@ -2635,43 +2753,43 @@ msgstr ""

2753 msgid "Need a repository to unbundle."

2754 msgstr ""

2755

2638 -#: builtin/cat-file.c:247

2756 +#: builtin/cat-file.c:176

2757 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"

2758 msgstr ""

2759

2642 -#: builtin/cat-file.c:248

2760 +#: builtin/cat-file.c:177

2761 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"

2762 msgstr ""

2763

2646 -#: builtin/cat-file.c:266

2764 +#: builtin/cat-file.c:195

2765 msgid "<type> can be one of: blob, tree, commit, tag"

2766 msgstr ""

2767

2650 -#: builtin/cat-file.c:267

2768 +#: builtin/cat-file.c:196

2769 msgid "show object type"

2770 msgstr ""

2771

2654 -#: builtin/cat-file.c:268

2772 +#: builtin/cat-file.c:197

2773 msgid "show object size"

2774 msgstr ""

2775

2658 -#: builtin/cat-file.c:270

2776 +#: builtin/cat-file.c:199

2777 msgid "exit with zero when there's no error"

2778 msgstr ""

2779

2662 -#: builtin/cat-file.c:271

2780 +#: builtin/cat-file.c:200

2781 msgid "pretty-print object's content"

2782 msgstr ""

2783

2666 -#: builtin/cat-file.c:273

2784 +#: builtin/cat-file.c:202

2785 msgid "for blob objects, run textconv on object's content"

2786 msgstr ""

2787

2670 -#: builtin/cat-file.c:275

2788 +#: builtin/cat-file.c:204

2789 msgid "show info and content of objects fed from the standard input"

2790 msgstr ""

2791

2674 -#: builtin/cat-file.c:278

2792 +#: builtin/cat-file.c:207

2793 msgid "show info about objects fed from the standard input"

2794 msgstr ""

2795

@@ -2699,27 +2817,27 @@ msgstr ""

2817 msgid "input paths are terminated by a null character"

2818 msgstr ""

2819

2702 -#: builtin/check-ignore.c:18 builtin/checkout.c:1041 builtin/gc.c:177

2820 +#: builtin/check-ignore.c:18 builtin/checkout.c:1044 builtin/gc.c:177

2821 msgid "suppress progress reporting"

2822 msgstr ""

2823

2706 -#: builtin/check-ignore.c:151

2824 +#: builtin/check-ignore.c:146

2825 msgid "cannot specify pathnames with --stdin"

2826 msgstr ""

2827

2710 -#: builtin/check-ignore.c:154

2828 +#: builtin/check-ignore.c:149

2829 msgid "-z only makes sense with --stdin"

2830 msgstr ""

2831

2714 -#: builtin/check-ignore.c:156

2832 +#: builtin/check-ignore.c:151

2833 msgid "no path specified"

2834 msgstr ""

2835

2718 -#: builtin/check-ignore.c:160

2836 +#: builtin/check-ignore.c:155

2837 msgid "--quiet is only valid with a single pathname"

2838 msgstr ""

2839

2722 -#: builtin/check-ignore.c:162

2840 +#: builtin/check-ignore.c:157

2841 msgid "cannot have both --quiet and --verbose"

2842 msgstr ""

2843

@@ -2775,106 +2893,106 @@ msgstr ""

2893 msgid "git checkout [options] [<branch>] -- <file>..."

2894 msgstr ""

2895

2778 -#: builtin/checkout.c:116 builtin/checkout.c:149

2896 +#: builtin/checkout.c:117 builtin/checkout.c:150

2897 #, c-format

2898 msgid "path '%s' does not have our version"

2899 msgstr ""

2900

2783 -#: builtin/checkout.c:118 builtin/checkout.c:151

2901 +#: builtin/checkout.c:119 builtin/checkout.c:152

2902 #, c-format

2903 msgid "path '%s' does not have their version"

2904 msgstr ""

2905

2788 -#: builtin/checkout.c:134

2906 +#: builtin/checkout.c:135

2907 #, c-format

2908 msgid "path '%s' does not have all necessary versions"

2909 msgstr ""

2910

2793 -#: builtin/checkout.c:178

2911 +#: builtin/checkout.c:179

2912 #, c-format

2913 msgid "path '%s' does not have necessary versions"

2914 msgstr ""

2915

2798 -#: builtin/checkout.c:195

2916 +#: builtin/checkout.c:196

2917 #, c-format

2918 msgid "path '%s': cannot merge"

2919 msgstr ""

2920

2803 -#: builtin/checkout.c:212

2921 +#: builtin/checkout.c:213

2922 #, c-format

2923 msgid "Unable to add merge result for '%s'"

2924 msgstr ""

2925

2808 -#: builtin/checkout.c:236 builtin/checkout.c:239 builtin/checkout.c:242

2809 -#: builtin/checkout.c:245

2926 +#: builtin/checkout.c:237 builtin/checkout.c:240 builtin/checkout.c:243

2927 +#: builtin/checkout.c:246

2928 #, c-format

2929 msgid "'%s' cannot be used with updating paths"

2930 msgstr ""

2931

2814 -#: builtin/checkout.c:248 builtin/checkout.c:251

2932 +#: builtin/checkout.c:249 builtin/checkout.c:252

2933 #, c-format

2934 msgid "'%s' cannot be used with %s"

2935 msgstr ""

2936

2819 -#: builtin/checkout.c:254

2937 +#: builtin/checkout.c:255

2938 #, c-format

2939 msgid "Cannot update paths and switch to branch '%s' at the same time."

2940 msgstr ""

2941

2824 -#: builtin/checkout.c:265 builtin/checkout.c:455

2942 +#: builtin/checkout.c:266 builtin/checkout.c:458

2943 msgid "corrupt index file"

2944 msgstr ""

2945

2828 -#: builtin/checkout.c:326 builtin/checkout.c:333

2946 +#: builtin/checkout.c:329 builtin/checkout.c:336

2947 #, c-format

2948 msgid "path '%s' is unmerged"

2949 msgstr ""

2950

2833 -#: builtin/checkout.c:477

2951 +#: builtin/checkout.c:480

2952 msgid "you need to resolve your current index first"

2953 msgstr ""

2954

2837 -#: builtin/checkout.c:598

2955 +#: builtin/checkout.c:601

2956 #, c-format

2957 msgid "Can not do reflog for '%s'\n"

2958 msgstr ""

2959

2842 -#: builtin/checkout.c:631

2960 +#: builtin/checkout.c:634

2961 msgid "HEAD is now at"

2962 msgstr ""

2963

2846 -#: builtin/checkout.c:638

2964 +#: builtin/checkout.c:641

2965 #, c-format

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

2967 msgstr ""

2968

2851 -#: builtin/checkout.c:641

2969 +#: builtin/checkout.c:644

2970 #, c-format

2971 msgid "Already on '%s'\n"

2972 msgstr ""

2973

2856 -#: builtin/checkout.c:645

2974 +#: builtin/checkout.c:648

2975 #, c-format

2976 msgid "Switched to and reset branch '%s'\n"

2977 msgstr ""

2978

2861 -#: builtin/checkout.c:647 builtin/checkout.c:984

2979 +#: builtin/checkout.c:650 builtin/checkout.c:987

2980 #, c-format

2981 msgid "Switched to a new branch '%s'\n"

2982 msgstr ""

2983

2866 -#: builtin/checkout.c:649

2984 +#: builtin/checkout.c:652

2985 #, c-format

2986 msgid "Switched to branch '%s'\n"

2987 msgstr ""

2988

2871 -#: builtin/checkout.c:705

2989 +#: builtin/checkout.c:708

2990 #, c-format

2991 msgid " ... and %d more.\n"

2992 msgstr ""

2993

2994 #. The singular version

2877 -#: builtin/checkout.c:711

2995 +#: builtin/checkout.c:714

2996 #, c-format

2997 msgid ""

2998 "Warning: you are leaving %d commit behind, not connected to\n"

@@ -2889,7 +3007,7 @@ msgid_plural ""

3007 msgstr[0] ""

3008 msgstr[1] ""

3009

2892 -#: builtin/checkout.c:729

3010 +#: builtin/checkout.c:732

3011 #, c-format

3012 msgid ""

3013 "If you want to keep them by creating a new branch, this may be a good time\n"

@@ -2899,144 +3017,148 @@ msgid ""

3017 "\n"

3018 msgstr ""

3019

2902 -#: builtin/checkout.c:759

3020 +#: builtin/checkout.c:762

3021 msgid "internal error in revision walk"

3022 msgstr ""

3023

2906 -#: builtin/checkout.c:763

3024 +#: builtin/checkout.c:766

3025 msgid "Previous HEAD position was"

3026 msgstr ""

3027

2910 -#: builtin/checkout.c:790 builtin/checkout.c:979

3028 +#: builtin/checkout.c:793 builtin/checkout.c:982

3029 msgid "You are on a branch yet to be born"

3030 msgstr ""

3031

3032 #. case (1)

2915 -#: builtin/checkout.c:915

3033 +#: builtin/checkout.c:918

3034 #, c-format

3035 msgid "invalid reference: %s"

3036 msgstr ""

3037

3038 #. case (1): want a tree

2921 -#: builtin/checkout.c:954

3039 +#: builtin/checkout.c:957

3040 #, c-format

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

3042 msgstr ""

3043

2926 -#: builtin/checkout.c:993

3044 +#: builtin/checkout.c:996

3045 msgid "paths cannot be used with switching branches"

3046 msgstr ""

3047

2930 -#: builtin/checkout.c:996 builtin/checkout.c:1000

3048 +#: builtin/checkout.c:999 builtin/checkout.c:1003

3049 #, c-format

3050 msgid "'%s' cannot be used with switching branches"

3051 msgstr ""

3052

2935 -#: builtin/checkout.c:1004 builtin/checkout.c:1007 builtin/checkout.c:1012

2936 -#: builtin/checkout.c:1015

3053 +#: builtin/checkout.c:1007 builtin/checkout.c:1010 builtin/checkout.c:1015

3054 +#: builtin/checkout.c:1018

3055 #, c-format

3056 msgid "'%s' cannot be used with '%s'"

3057 msgstr ""

3058

2941 -#: builtin/checkout.c:1020

3059 +#: builtin/checkout.c:1023

3060 #, c-format

3061 msgid "Cannot switch branch to a non-commit '%s'"

3062 msgstr ""

3063

2946 -#: builtin/checkout.c:1042 builtin/checkout.c:1044 builtin/clone.c:90

3064 +#: builtin/checkout.c:1045 builtin/checkout.c:1047 builtin/clone.c:90

3065 #: builtin/remote.c:169 builtin/remote.c:171

3066 msgid "branch"

3067 msgstr ""

3068

2951 -#: builtin/checkout.c:1043

3069 +#: builtin/checkout.c:1046

3070 msgid "create and checkout a new branch"

3071 msgstr ""

3072

2955 -#: builtin/checkout.c:1045

3073 +#: builtin/checkout.c:1048

3074 msgid "create/reset and checkout a branch"

3075 msgstr ""

3076

2959 -#: builtin/checkout.c:1046

3077 +#: builtin/checkout.c:1049

3078 msgid "create reflog for new branch"

3079 msgstr ""

3080

2963 -#: builtin/checkout.c:1047

3081 +#: builtin/checkout.c:1050

3082 msgid "detach the HEAD at named commit"

3083 msgstr ""

3084

2967 -#: builtin/checkout.c:1048

3085 +#: builtin/checkout.c:1051

3086 msgid "set upstream info for new branch"

3087 msgstr ""

3088

2971 -#: builtin/checkout.c:1050

3089 +#: builtin/checkout.c:1053

3090 msgid "new branch"

3091 msgstr ""

3092

2975 -#: builtin/checkout.c:1050

3093 +#: builtin/checkout.c:1053

3094 msgid "new unparented branch"

3095 msgstr ""

3096

2979 -#: builtin/checkout.c:1051

3097 +#: builtin/checkout.c:1054

3098 msgid "checkout our version for unmerged files"

3099 msgstr ""

3100

2983 -#: builtin/checkout.c:1053

3101 +#: builtin/checkout.c:1056

3102 msgid "checkout their version for unmerged files"

3103 msgstr ""

3104

2987 -#: builtin/checkout.c:1055

3105 +#: builtin/checkout.c:1058

3106 msgid "force checkout (throw away local modifications)"

3107 msgstr ""

3108

2991 -#: builtin/checkout.c:1056

3109 +#: builtin/checkout.c:1059

3110 msgid "perform a 3-way merge with the new branch"

3111 msgstr ""

3112

2995 -#: builtin/checkout.c:1057 builtin/merge.c:217

3113 +#: builtin/checkout.c:1060 builtin/merge.c:217

3114 msgid "update ignored files (default)"

3115 msgstr ""

3116

2999 -#: builtin/checkout.c:1058 builtin/log.c:1149 parse-options.h:245

3117 +#: builtin/checkout.c:1061 builtin/log.c:1158 parse-options.h:245

3118 msgid "style"

3119 msgstr ""

3120

3003 -#: builtin/checkout.c:1059

3121 +#: builtin/checkout.c:1062

3122 msgid "conflict style (merge or diff3)"

3123 msgstr ""

3124

3007 -#: builtin/checkout.c:1062

3125 +#: builtin/checkout.c:1065

3126 +msgid "do not limit pathspecs to sparse entries only"

3127 +msgstr ""

3128 +

3129 +#: builtin/checkout.c:1067

3130 msgid "second guess 'git checkout no-such-branch'"

3131 msgstr ""

3132

3011 -#: builtin/checkout.c:1086

3133 +#: builtin/checkout.c:1091

3134 msgid "-b, -B and --orphan are mutually exclusive"

3135 msgstr ""

3136

3015 -#: builtin/checkout.c:1103

3137 +#: builtin/checkout.c:1108

3138 msgid "--track needs a branch name"

3139 msgstr ""

3140

3019 -#: builtin/checkout.c:1110

3141 +#: builtin/checkout.c:1115

3142 msgid "Missing branch name; try -b"

3143 msgstr ""

3144

3023 -#: builtin/checkout.c:1145

3145 +#: builtin/checkout.c:1150

3146 msgid "invalid path specification"

3147 msgstr ""

3148

3027 -#: builtin/checkout.c:1152

3149 +#: builtin/checkout.c:1157

3150 #, c-format

3151 msgid ""

3152 "Cannot update paths and switch to branch '%s' at the same time.\n"

3153 "Did you intend to checkout '%s' which can not be resolved as commit?"

3154 msgstr ""

3155

3034 -#: builtin/checkout.c:1157

3156 +#: builtin/checkout.c:1162

3157 #, c-format

3158 msgid "git checkout: --detach does not take a path argument '%s'"

3159 msgstr ""

3160

3039 -#: builtin/checkout.c:1161

3161 +#: builtin/checkout.c:1166

3162 msgid ""

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

3164 "checking out of the index."

@@ -3084,7 +3206,7 @@ msgid "remove whole directories"

3206 msgstr ""

3207

3208 #: builtin/clean.c:165 builtin/describe.c:412 builtin/grep.c:717

3087 -#: builtin/ls-files.c:494 builtin/name-rev.c:231 builtin/show-ref.c:182

3209 +#: builtin/ls-files.c:487 builtin/name-rev.c:231 builtin/show-ref.c:182

3210 msgid "pattern"

3211 msgstr ""

3212

@@ -3208,137 +3330,137 @@ msgstr ""

3330 msgid "set config inside the new repository"

3331 msgstr ""

3332

3211 -#: builtin/clone.c:244

3333 +#: builtin/clone.c:254

3334 #, c-format

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

3335 +msgid "reference repository '%s' is not a local repository."

3336 msgstr ""

3337

3216 -#: builtin/clone.c:307

3338 +#: builtin/clone.c:317

3339 #, c-format

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

3341 msgstr ""

3342

3221 -#: builtin/clone.c:309 builtin/diff.c:77

3343 +#: builtin/clone.c:319 builtin/diff.c:77

3344 #, c-format

3345 msgid "failed to stat '%s'"

3346 msgstr ""

3347

3226 -#: builtin/clone.c:311

3348 +#: builtin/clone.c:321

3349 #, c-format

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

3351 msgstr ""

3352

3231 -#: builtin/clone.c:325

3353 +#: builtin/clone.c:335

3354 #, c-format

3355 msgid "failed to stat %s\n"

3356 msgstr ""

3357

3236 -#: builtin/clone.c:347

3358 +#: builtin/clone.c:357

3359 #, c-format

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

3361 msgstr ""

3362

3241 -#: builtin/clone.c:351

3363 +#: builtin/clone.c:361

3364 #, c-format

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

3366 msgstr ""

3367

3246 -#: builtin/clone.c:374

3368 +#: builtin/clone.c:384

3369 #, c-format

3370 msgid "done.\n"

3371 msgstr ""

3372

3251 -#: builtin/clone.c:387

3373 +#: builtin/clone.c:397

3374 msgid ""

3375 "Clone succeeded, but checkout failed.\n"

3376 "You can inspect what was checked out with 'git status'\n"

3377 "and retry the checkout with 'git checkout -f HEAD'\n"

3378 msgstr ""

3379

3258 -#: builtin/clone.c:466

3380 +#: builtin/clone.c:476

3381 #, c-format

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

3383 msgstr ""

3384

3263 -#: builtin/clone.c:540

3385 +#: builtin/clone.c:550

3386 msgid "remote did not send all necessary objects"

3387 msgstr ""

3388

3267 -#: builtin/clone.c:600

3389 +#: builtin/clone.c:610

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

3391 msgstr ""

3392

3271 -#: builtin/clone.c:631

3393 +#: builtin/clone.c:641

3394 msgid "unable to checkout working tree"

3395 msgstr ""

3396

3275 -#: builtin/clone.c:739

3397 +#: builtin/clone.c:749

3398 msgid "Too many arguments."

3399 msgstr ""

3400

3279 -#: builtin/clone.c:743

3401 +#: builtin/clone.c:753

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

3403 msgstr ""

3404

3283 -#: builtin/clone.c:754

3405 +#: builtin/clone.c:764

3406 #, c-format

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

3408 msgstr ""

3409

3288 -#: builtin/clone.c:757

3410 +#: builtin/clone.c:767

3411 msgid "--bare and --separate-git-dir are incompatible."

3412 msgstr ""

3413

3292 -#: builtin/clone.c:770

3414 +#: builtin/clone.c:780

3415 #, c-format

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

3417 msgstr ""

3418

3297 -#: builtin/clone.c:775

3419 +#: builtin/clone.c:785

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

3421 msgstr ""

3422

3301 -#: builtin/clone.c:785

3423 +#: builtin/clone.c:795

3424 #, c-format

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

3426 msgstr ""

3427

3306 -#: builtin/clone.c:795

3428 +#: builtin/clone.c:805

3429 #, c-format

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

3431 msgstr ""

3432

3311 -#: builtin/clone.c:808 builtin/clone.c:820

3433 +#: builtin/clone.c:818 builtin/clone.c:830

3434 #, c-format

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

3436 msgstr ""

3437

3316 -#: builtin/clone.c:811

3438 +#: builtin/clone.c:821

3439 #, c-format

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

3441 msgstr ""

3442

3321 -#: builtin/clone.c:830

3443 +#: builtin/clone.c:840

3444 #, c-format

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

3446 msgstr ""

3447

3326 -#: builtin/clone.c:832

3448 +#: builtin/clone.c:842

3449 #, c-format

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

3451 msgstr ""

3452

3331 -#: builtin/clone.c:867

3453 +#: builtin/clone.c:877

3454 #, c-format

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

3456 msgstr ""

3457

3336 -#: builtin/clone.c:916

3458 +#: builtin/clone.c:926

3459 #, c-format

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

3461 msgstr ""

3462

3341 -#: builtin/clone.c:923

3463 +#: builtin/clone.c:933

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

3465 msgstr ""

3466

@@ -3464,7 +3586,7 @@ msgstr ""

3586 msgid "could not lookup commit %s"

3587 msgstr ""

3588

3467 -#: builtin/commit.c:612 builtin/shortlog.c:272

3589 +#: builtin/commit.c:612 builtin/shortlog.c:270

3590 #, c-format

3591 msgid "(reading log message from standard input)\n"

3592 msgstr ""

@@ -3648,8 +3770,8 @@ msgstr ""

3770 msgid "terminate entries with NUL"

3771 msgstr ""

3772

3651 -#: builtin/commit.c:1166 builtin/commit.c:1402 builtin/fast-export.c:653

3652 -#: builtin/fast-export.c:656 builtin/tag.c:459

3773 +#: builtin/commit.c:1166 builtin/commit.c:1402 builtin/fast-export.c:659

3774 +#: builtin/fast-export.c:662 builtin/tag.c:459

3775 msgid "mode"

3776 msgstr ""

3777

@@ -3752,7 +3874,7 @@ msgstr ""

3874 msgid "the commit is authored by me now (used with -C/-c/--amend)"

3875 msgstr ""

3876

3755 -#: builtin/commit.c:1373 builtin/log.c:1104 builtin/revert.c:109

3877 +#: builtin/commit.c:1373 builtin/log.c:1113 builtin/revert.c:109

3878 msgid "add Signed-off-by:"

3879 msgstr ""

3880

@@ -4002,7 +4124,11 @@ msgid "respect include directives on lookup"

4124 msgstr ""

4125

4126 #: builtin/count-objects.c:82

4005 -msgid "git count-objects [-v]"

4127 +msgid "git count-objects [-v] [-H | --human-readable]"

4128 +msgstr ""

4129 +

4130 +#: builtin/count-objects.c:97

4131 +msgid "print sizes in human readable format"

4132 msgstr ""

4133

4134 #: builtin/describe.c:15

@@ -4173,39 +4299,39 @@ msgstr ""

4299 msgid "git fast-export [rev-list-opts]"

4300 msgstr ""

4301

4176 -#: builtin/fast-export.c:652

4302 +#: builtin/fast-export.c:658

4303 msgid "show progress after <n> objects"

4304 msgstr ""

4305

4180 -#: builtin/fast-export.c:654

4306 +#: builtin/fast-export.c:660

4307 msgid "select handling of signed tags"

4308 msgstr ""

4309

4184 -#: builtin/fast-export.c:657

4310 +#: builtin/fast-export.c:663

4311 msgid "select handling of tags that tag filtered objects"

4312 msgstr ""

4313

4188 -#: builtin/fast-export.c:660

4314 +#: builtin/fast-export.c:666

4315 msgid "Dump marks to this file"

4316 msgstr ""

4317

4192 -#: builtin/fast-export.c:662

4318 +#: builtin/fast-export.c:668

4319 msgid "Import marks from this file"

4320 msgstr ""

4321

4196 -#: builtin/fast-export.c:664

4322 +#: builtin/fast-export.c:670

4323 msgid "Fake a tagger when tags lack one"

4324 msgstr ""

4325

4200 -#: builtin/fast-export.c:666

4326 +#: builtin/fast-export.c:672

4327 msgid "Output full tree for each commit"

4328 msgstr ""

4329

4204 -#: builtin/fast-export.c:668

4330 +#: builtin/fast-export.c:674

4331 msgid "Use the done feature to terminate the stream"

4332 msgstr ""

4333

4208 -#: builtin/fast-export.c:669

4334 +#: builtin/fast-export.c:675

4335 msgid "Skip output of blob data"

4336 msgstr ""

4337

@@ -4281,7 +4407,7 @@ msgstr ""

4407 msgid "convert to a complete repository"

4408 msgstr ""

4409

4284 -#: builtin/fetch.c:88 builtin/log.c:1121

4410 +#: builtin/fetch.c:88 builtin/log.c:1130

4411 msgid "dir"

4412 msgstr ""

4413

@@ -4456,29 +4582,29 @@ msgstr ""

4582 msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"

4583 msgstr ""

4584

4459 -#: builtin/fmt-merge-msg.c:659 builtin/fmt-merge-msg.c:662 builtin/grep.c:701

4460 -#: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:175

4585 +#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:701

4586 +#: builtin/merge.c:188 builtin/show-branch.c:655 builtin/show-ref.c:175

4587 #: builtin/tag.c:446 parse-options.h:133 parse-options.h:239

4588 msgid "n"

4589 msgstr ""

4590

4465 -#: builtin/fmt-merge-msg.c:660

4591 +#: builtin/fmt-merge-msg.c:664

4592 msgid "populate log with at most <n> entries from shortlog"

4593 msgstr ""

4594

4469 -#: builtin/fmt-merge-msg.c:663

4595 +#: builtin/fmt-merge-msg.c:667

4596 msgid "alias for --log (deprecated)"

4597 msgstr ""

4598

4473 -#: builtin/fmt-merge-msg.c:666

4599 +#: builtin/fmt-merge-msg.c:670

4600 msgid "text"

4601 msgstr ""

4602

4477 -#: builtin/fmt-merge-msg.c:667

4603 +#: builtin/fmt-merge-msg.c:671

4604 msgid "use <text> as start of message"

4605 msgstr ""

4606

4481 -#: builtin/fmt-merge-msg.c:668

4607 +#: builtin/fmt-merge-msg.c:672

4608 msgid "file to read from"

4609 msgstr ""

4610

@@ -4864,82 +4990,118 @@ msgstr ""

4990 msgid "process file as it were from this path"

4991 msgstr ""

4992

4867 -#: builtin/help.c:42

4993 +#: builtin/help.c:43

4994 msgid "print all available commands"

4995 msgstr ""

4996

4871 -#: builtin/help.c:43

4997 +#: builtin/help.c:44

4998 +msgid "print list of useful guides"

4999 +msgstr ""

5000 +

5001 +#: builtin/help.c:45

5002 msgid "show man page"

5003 msgstr ""

5004

4875 -#: builtin/help.c:44

5005 +#: builtin/help.c:46

5006 msgid "show manual in web browser"

5007 msgstr ""

5008

4879 -#: builtin/help.c:46

5009 +#: builtin/help.c:48

5010 msgid "show info page"

5011 msgstr ""

5012

4883 -#: builtin/help.c:52

4884 -msgid "git help [--all] [--man|--web|--info] [command]"

5013 +#: builtin/help.c:54

5014 +msgid "git help [--all] [--guides] [--man|--web|--info] [command]"

5015 msgstr ""

5016

4887 -#: builtin/help.c:64

5017 +#: builtin/help.c:66

5018 #, c-format

5019 msgid "unrecognized help format '%s'"

5020 msgstr ""

5021

4892 -#: builtin/help.c:92

5022 +#: builtin/help.c:94

5023 msgid "Failed to start emacsclient."

5024 msgstr ""

5025

4896 -#: builtin/help.c:105

5026 +#: builtin/help.c:107

5027 msgid "Failed to parse emacsclient version."

5028 msgstr ""

5029

4900 -#: builtin/help.c:113

5030 +#: builtin/help.c:115

5031 #, c-format

5032 msgid "emacsclient version '%d' too old (< 22)."

5033 msgstr ""

5034

4905 -#: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176

5035 +#: builtin/help.c:133 builtin/help.c:161 builtin/help.c:170 builtin/help.c:178

5036 #, c-format

5037 msgid "failed to exec '%s': %s"

5038 msgstr ""

5039

4910 -#: builtin/help.c:216

5040 +#: builtin/help.c:218

5041 #, c-format

5042 msgid ""

5043 "'%s': path for unsupported man viewer.\n"

5044 "Please consider using 'man.<tool>.cmd' instead."

5045 msgstr ""

5046

4917 -#: builtin/help.c:228

5047 +#: builtin/help.c:230

5048 #, c-format

5049 msgid ""

5050 "'%s': cmd for supported man viewer.\n"

5051 "Please consider using 'man.<tool>.path' instead."

5052 msgstr ""

5053

4924 -#: builtin/help.c:349

5054 +#: builtin/help.c:351

5055 #, c-format

5056 msgid "'%s': unknown man viewer."

5057 msgstr ""

5058

4929 -#: builtin/help.c:366

5059 +#: builtin/help.c:368

5060 msgid "no man viewer handled the request"

5061 msgstr ""

5062

4933 -#: builtin/help.c:374

5063 +#: builtin/help.c:376

5064 msgid "no info viewer handled the request"

5065 msgstr ""

5066

4937 -#: builtin/help.c:429 builtin/help.c:436

5067 +#: builtin/help.c:422

5068 +msgid "Defining attributes per path"

5069 +msgstr ""

5070 +

5071 +#: builtin/help.c:423

5072 +msgid "A Git glossary"

5073 +msgstr ""

5074 +

5075 +#: builtin/help.c:424

5076 +msgid "Specifies intentionally untracked files to ignore"

5077 +msgstr ""

5078 +

5079 +#: builtin/help.c:425

5080 +msgid "Defining submodule properties"

5081 +msgstr ""

5082 +

5083 +#: builtin/help.c:426

5084 +msgid "Specifying revisions and ranges for Git"

5085 +msgstr ""

5086 +

5087 +#: builtin/help.c:427

5088 +msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"

5089 +msgstr ""

5090 +

5091 +#: builtin/help.c:428

5092 +msgid "An overview of recommended workflows with Git"

5093 +msgstr ""

5094 +

5095 +#: builtin/help.c:440

5096 +msgid "The common Git guides are:\n"

5097 +msgstr ""

5098 +

5099 +#: builtin/help.c:462 builtin/help.c:478

5100 #, c-format

5101 msgid "usage: %s%s"

5102 msgstr ""

5103

4942 -#: builtin/help.c:452

5104 +#: builtin/help.c:494

5105 #, c-format

5106 msgid "`git %s' is aliased to `%s'"

5107 msgstr ""

@@ -5382,7 +5544,7 @@ msgid "Cannot access work tree '%s'"

5544 msgstr ""

5545

5546 #: builtin/log.c:40

5385 -msgid "git log [<options>] [<since>..<until>] [[--] <path>...]\n"

5547 +msgid "git log [<options>] [<revision range>] [[--] <path>...]\n"

5548 msgstr ""

5549

5550 #: builtin/log.c:41

@@ -5420,301 +5582,301 @@ msgstr ""

5582 msgid "Unknown type: %d"

5583 msgstr ""

5584

5423 -#: builtin/log.c:630

5585 +#: builtin/log.c:638

5586 msgid "format.headers without value"

5587 msgstr ""

5588

5427 -#: builtin/log.c:704

5589 +#: builtin/log.c:720

5590 msgid "name of output directory is too long"

5591 msgstr ""

5592

5431 -#: builtin/log.c:720

5593 +#: builtin/log.c:736

5594 #, c-format

5595 msgid "Cannot open patch file %s"

5596 msgstr ""

5597

5436 -#: builtin/log.c:734

5598 +#: builtin/log.c:750

5599 msgid "Need exactly one range."

5600 msgstr ""

5601

5440 -#: builtin/log.c:742

5602 +#: builtin/log.c:758

5603 msgid "Not a range."

5604 msgstr ""

5605

5444 -#: builtin/log.c:815

5606 +#: builtin/log.c:860

5607 msgid "Cover letter needs email format"

5608 msgstr ""

5609

5448 -#: builtin/log.c:888

5610 +#: builtin/log.c:936

5611 #, c-format

5612 msgid "insane in-reply-to: %s"

5613 msgstr ""

5614

5453 -#: builtin/log.c:916

5615 +#: builtin/log.c:964

5616 msgid "git format-patch [options] [<since> | <revision range>]"

5617 msgstr ""

5618

5457 -#: builtin/log.c:961

5619 +#: builtin/log.c:1009

5620 msgid "Two output directories?"

5621 msgstr ""

5622

5461 -#: builtin/log.c:1099

5623 +#: builtin/log.c:1108

5624 msgid "use [PATCH n/m] even with a single patch"

5625 msgstr ""

5626

5465 -#: builtin/log.c:1102

5627 +#: builtin/log.c:1111

5628 msgid "use [PATCH] even with multiple patches"

5629 msgstr ""

5630

5469 -#: builtin/log.c:1106

5631 +#: builtin/log.c:1115

5632 msgid "print patches to standard out"

5633 msgstr ""

5634

5473 -#: builtin/log.c:1108

5635 +#: builtin/log.c:1117

5636 msgid "generate a cover letter"

5637 msgstr ""

5638

5477 -#: builtin/log.c:1110

5639 +#: builtin/log.c:1119

5640 msgid "use simple number sequence for output file names"

5641 msgstr ""

5642

5481 -#: builtin/log.c:1111

5643 +#: builtin/log.c:1120

5644 msgid "sfx"

5645 msgstr ""

5646

5485 -#: builtin/log.c:1112

5647 +#: builtin/log.c:1121

5648 msgid "use <sfx> instead of '.patch'"

5649 msgstr ""

5650

5489 -#: builtin/log.c:1114

5651 +#: builtin/log.c:1123

5652 msgid "start numbering patches at <n> instead of 1"

5653 msgstr ""

5654

5493 -#: builtin/log.c:1116

5655 +#: builtin/log.c:1125

5656 msgid "mark the series as Nth re-roll"

5657 msgstr ""

5658

5497 -#: builtin/log.c:1118

5659 +#: builtin/log.c:1127

5660 msgid "Use [<prefix>] instead of [PATCH]"

5661 msgstr ""

5662

5501 -#: builtin/log.c:1121

5663 +#: builtin/log.c:1130

5664 msgid "store resulting files in <dir>"

5665 msgstr ""

5666

5505 -#: builtin/log.c:1124

5667 +#: builtin/log.c:1133

5668 msgid "don't strip/add [PATCH]"

5669 msgstr ""

5670

5509 -#: builtin/log.c:1127

5671 +#: builtin/log.c:1136

5672 msgid "don't output binary diffs"

5673 msgstr ""

5674

5513 -#: builtin/log.c:1129

5675 +#: builtin/log.c:1138

5676 msgid "don't include a patch matching a commit upstream"

5677 msgstr ""

5678

5517 -#: builtin/log.c:1131

5679 +#: builtin/log.c:1140

5680 msgid "show patch format instead of default (patch + stat)"

5681 msgstr ""

5682

5521 -#: builtin/log.c:1133

5683 +#: builtin/log.c:1142

5684 msgid "Messaging"

5685 msgstr ""

5686

5525 -#: builtin/log.c:1134

5687 +#: builtin/log.c:1143

5688 msgid "header"

5689 msgstr ""

5690

5529 -#: builtin/log.c:1135

5691 +#: builtin/log.c:1144

5692 msgid "add email header"

5693 msgstr ""

5694

5533 -#: builtin/log.c:1136 builtin/log.c:1138

5695 +#: builtin/log.c:1145 builtin/log.c:1147

5696 msgid "email"

5697 msgstr ""

5698

5537 -#: builtin/log.c:1136

5699 +#: builtin/log.c:1145

5700 msgid "add To: header"

5701 msgstr ""

5702

5541 -#: builtin/log.c:1138

5703 +#: builtin/log.c:1147

5704 msgid "add Cc: header"

5705 msgstr ""

5706

5545 -#: builtin/log.c:1140

5707 +#: builtin/log.c:1149

5708 msgid "message-id"

5709 msgstr ""

5710

5549 -#: builtin/log.c:1141

5711 +#: builtin/log.c:1150

5712 msgid "make first mail a reply to <message-id>"

5713 msgstr ""

5714

5553 -#: builtin/log.c:1142 builtin/log.c:1145

5715 +#: builtin/log.c:1151 builtin/log.c:1154

5716 msgid "boundary"

5717 msgstr ""

5718

5557 -#: builtin/log.c:1143

5719 +#: builtin/log.c:1152

5720 msgid "attach the patch"

5721 msgstr ""

5722

5561 -#: builtin/log.c:1146

5723 +#: builtin/log.c:1155

5724 msgid "inline the patch"

5725 msgstr ""

5726

5565 -#: builtin/log.c:1150

5727 +#: builtin/log.c:1159

5728 msgid "enable message threading, styles: shallow, deep"

5729 msgstr ""

5730

5569 -#: builtin/log.c:1152

5731 +#: builtin/log.c:1161

5732 msgid "signature"

5733 msgstr ""

5734

5573 -#: builtin/log.c:1153

5735 +#: builtin/log.c:1162

5736 msgid "add a signature"

5737 msgstr ""

5738

5577 -#: builtin/log.c:1155

5739 +#: builtin/log.c:1164

5740 msgid "don't print the patch filenames"

5741 msgstr ""

5742

5581 -#: builtin/log.c:1239

5743 +#: builtin/log.c:1248

5744 msgid "-n and -k are mutually exclusive."

5745 msgstr ""

5746

5585 -#: builtin/log.c:1241

5747 +#: builtin/log.c:1250

5748 msgid "--subject-prefix and -k are mutually exclusive."

5749 msgstr ""

5750

5589 -#: builtin/log.c:1249

5751 +#: builtin/log.c:1258

5752 msgid "--name-only does not make sense"

5753 msgstr ""

5754

5593 -#: builtin/log.c:1251

5755 +#: builtin/log.c:1260

5756 msgid "--name-status does not make sense"

5757 msgstr ""

5758

5597 -#: builtin/log.c:1253

5759 +#: builtin/log.c:1262

5760 msgid "--check does not make sense"

5761 msgstr ""

5762

5601 -#: builtin/log.c:1276

5763 +#: builtin/log.c:1285

5764 msgid "standard output, or directory, which one?"

5765 msgstr ""

5766

5605 -#: builtin/log.c:1278

5767 +#: builtin/log.c:1287

5768 #, c-format

5769 msgid "Could not create directory '%s'"

5770 msgstr ""

5771

5610 -#: builtin/log.c:1431

5772 +#: builtin/log.c:1435

5773 msgid "Failed to create output files"

5774 msgstr ""

5775

5614 -#: builtin/log.c:1480

5776 +#: builtin/log.c:1484

5777 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"

5778 msgstr ""

5779

5618 -#: builtin/log.c:1535

5780 +#: builtin/log.c:1539

5781 #, c-format

5782 msgid ""

5783 "Could not find a tracked remote branch, please specify <upstream> manually.\n"

5784 msgstr ""

5785

5624 -#: builtin/log.c:1548 builtin/log.c:1550 builtin/log.c:1562

5786 +#: builtin/log.c:1552 builtin/log.c:1554 builtin/log.c:1566

5787 #, c-format

5788 msgid "Unknown commit %s"

5789 msgstr ""

5790

5629 -#: builtin/ls-files.c:409

5791 +#: builtin/ls-files.c:402

5792 msgid "git ls-files [options] [<file>...]"

5793 msgstr ""

5794

5633 -#: builtin/ls-files.c:466

5795 +#: builtin/ls-files.c:459

5796 msgid "identify the file status with tags"

5797 msgstr ""

5798

5637 -#: builtin/ls-files.c:468

5799 +#: builtin/ls-files.c:461

5800 msgid "use lowercase letters for 'assume unchanged' files"

5801 msgstr ""

5802

5641 -#: builtin/ls-files.c:470

5803 +#: builtin/ls-files.c:463

5804 msgid "show cached files in the output (default)"

5805 msgstr ""

5806

5645 -#: builtin/ls-files.c:472

5807 +#: builtin/ls-files.c:465

5808 msgid "show deleted files in the output"

5809 msgstr ""

5810

5649 -#: builtin/ls-files.c:474

5811 +#: builtin/ls-files.c:467

5812 msgid "show modified files in the output"

5813 msgstr ""

5814

5653 -#: builtin/ls-files.c:476

5815 +#: builtin/ls-files.c:469

5816 msgid "show other files in the output"

5817 msgstr ""

5818

5657 -#: builtin/ls-files.c:478

5819 +#: builtin/ls-files.c:471

5820 msgid "show ignored files in the output"

5821 msgstr ""

5822

5661 -#: builtin/ls-files.c:481

5823 +#: builtin/ls-files.c:474

5824 msgid "show staged contents' object name in the output"

5825 msgstr ""

5826

5665 -#: builtin/ls-files.c:483

5827 +#: builtin/ls-files.c:476

5828 msgid "show files on the filesystem that need to be removed"

5829 msgstr ""

5830

5669 -#: builtin/ls-files.c:485

5831 +#: builtin/ls-files.c:478

5832 msgid "show 'other' directories' name only"

5833 msgstr ""

5834

5673 -#: builtin/ls-files.c:488

5835 +#: builtin/ls-files.c:481

5836 msgid "don't show empty directories"

5837 msgstr ""

5838

5677 -#: builtin/ls-files.c:491

5839 +#: builtin/ls-files.c:484

5840 msgid "show unmerged files in the output"

5841 msgstr ""

5842

5681 -#: builtin/ls-files.c:493

5843 +#: builtin/ls-files.c:486

5844 msgid "show resolve-undo information"

5845 msgstr ""

5846

5685 -#: builtin/ls-files.c:495

5847 +#: builtin/ls-files.c:488

5848 msgid "skip files matching pattern"

5849 msgstr ""

5850

5689 -#: builtin/ls-files.c:498

5851 +#: builtin/ls-files.c:491

5852 msgid "exclude patterns are read from <file>"

5853 msgstr ""

5854

5693 -#: builtin/ls-files.c:501

5855 +#: builtin/ls-files.c:494

5856 msgid "read additional per-directory exclude patterns in <file>"

5857 msgstr ""

5858

5697 -#: builtin/ls-files.c:503

5859 +#: builtin/ls-files.c:496

5860 msgid "add the standard git exclusions"

5861 msgstr ""

5862

5701 -#: builtin/ls-files.c:506

5863 +#: builtin/ls-files.c:499

5864 msgid "make the output relative to the project top directory"

5865 msgstr ""

5866

5705 -#: builtin/ls-files.c:509

5867 +#: builtin/ls-files.c:502

5868 msgid "if any <file> is not in the index, treat this as an error"

5869 msgstr ""

5870

5709 -#: builtin/ls-files.c:510

5871 +#: builtin/ls-files.c:503

5872 msgid "tree-ish"

5873 msgstr ""

5874

5713 -#: builtin/ls-files.c:511

5875 +#: builtin/ls-files.c:504

5876 msgid "pretend that paths removed since <tree-ish> are still present"

5877 msgstr ""

5878

5717 -#: builtin/ls-files.c:513

5879 +#: builtin/ls-files.c:506

5880 msgid "show debugging data"

5881 msgstr ""

5882

@@ -7780,7 +7942,7 @@ msgid ""

7942 msgstr ""

7943

7944 #: builtin/revert.c:22

7783 -msgid "git revert [options] <commit-ish>"

7945 +msgid "git revert [options] <commit-ish>..."

7946 msgstr ""

7947

7948 #: builtin/revert.c:23

@@ -7788,7 +7950,7 @@ msgid "git revert <subcommand>"

7950 msgstr ""

7951

7952 #: builtin/revert.c:28

7791 -msgid "git cherry-pick [options] <commit-ish>"

7953 +msgid "git cherry-pick [options] <commit-ish>..."

7954 msgstr ""

7955

7956 #: builtin/revert.c:29

@@ -7931,31 +8093,31 @@ msgid "git rm: unable to remove %s"

8093 msgstr ""

8094

8095 #: builtin/shortlog.c:13

7934 -msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]"

8096 +msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]"

8097 msgstr ""

8098

7937 -#: builtin/shortlog.c:133

8099 +#: builtin/shortlog.c:131

8100 #, c-format

8101 msgid "Missing author: %s"

8102 msgstr ""

8103

7942 -#: builtin/shortlog.c:229

8104 +#: builtin/shortlog.c:227

8105 msgid "sort output according to the number of commits per author"

8106 msgstr ""

8107

7946 -#: builtin/shortlog.c:231

8108 +#: builtin/shortlog.c:229

8109 msgid "Suppress commit descriptions, only provides commit count"

8110 msgstr ""

8111

7950 -#: builtin/shortlog.c:233

8112 +#: builtin/shortlog.c:231

8113 msgid "Show the email address of each author"

8114 msgstr ""

8115

7954 -#: builtin/shortlog.c:234

8116 +#: builtin/shortlog.c:232

8117 msgid "w[,i1[,i2]]"

8118 msgstr ""

8119

7958 -#: builtin/shortlog.c:235

8120 +#: builtin/shortlog.c:233

8121 msgid "Linewrap output"

8122 msgstr ""

8123

@@ -7971,67 +8133,67 @@ msgstr ""

8133 msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"

8134 msgstr ""

8135

7974 -#: builtin/show-branch.c:651

8136 +#: builtin/show-branch.c:650

8137 msgid "show remote-tracking and local branches"

8138 msgstr ""

8139

7978 -#: builtin/show-branch.c:653

8140 +#: builtin/show-branch.c:652

8141 msgid "show remote-tracking branches"

8142 msgstr ""

8143

7982 -#: builtin/show-branch.c:655

8144 +#: builtin/show-branch.c:654

8145 msgid "color '*!+-' corresponding to the branch"

8146 msgstr ""

8147

7986 -#: builtin/show-branch.c:657

8148 +#: builtin/show-branch.c:656

8149 msgid "show <n> more commits after the common ancestor"

8150 msgstr ""

8151

7990 -#: builtin/show-branch.c:659

8152 +#: builtin/show-branch.c:658

8153 msgid "synonym to more=-1"

8154 msgstr ""

8155

7994 -#: builtin/show-branch.c:660

8156 +#: builtin/show-branch.c:659

8157 msgid "suppress naming strings"

8158 msgstr ""

8159

7998 -#: builtin/show-branch.c:662

8160 +#: builtin/show-branch.c:661

8161 msgid "include the current branch"

8162 msgstr ""

8163

8002 -#: builtin/show-branch.c:664

8164 +#: builtin/show-branch.c:663

8165 msgid "name commits with their object names"

8166 msgstr ""

8167

8006 -#: builtin/show-branch.c:666

8168 +#: builtin/show-branch.c:665

8169 msgid "show possible merge bases"

8170 msgstr ""

8171

8010 -#: builtin/show-branch.c:668

8172 +#: builtin/show-branch.c:667

8173 msgid "show refs unreachable from any other ref"

8174 msgstr ""

8175

8014 -#: builtin/show-branch.c:670

8176 +#: builtin/show-branch.c:669

8177 msgid "show commits in topological order"

8178 msgstr ""

8179

8018 -#: builtin/show-branch.c:672

8180 +#: builtin/show-branch.c:671

8181 msgid "show only commits not on the first branch"

8182 msgstr ""

8183

8022 -#: builtin/show-branch.c:674

8184 +#: builtin/show-branch.c:673

8185 msgid "show merges reachable from only one tip"

8186 msgstr ""

8187

8026 -#: builtin/show-branch.c:676

8188 +#: builtin/show-branch.c:675

8189 msgid "show commits where no parent comes before its children"

8190 msgstr ""

8191

8030 -#: builtin/show-branch.c:678

8192 +#: builtin/show-branch.c:677

8193 msgid "<n>[,<base>]"

8194 msgstr ""

8195

8034 -#: builtin/show-branch.c:679

8196 +#: builtin/show-branch.c:678

8197 msgid "show <n> most recent ref-log entries starting at base"

8198 msgstr ""

8199

@@ -8478,7 +8640,10 @@ msgid "only useful for debugging"

8640 msgstr ""

8641

8642 #: git.c:16

8481 -msgid "See 'git help <command>' for more information on a specific command."

8643 +msgid ""

8644 +"'git help -a' and 'git help -g' lists available subcommands and some\n"

8645 +"concept guides. See 'git help <command>' or 'git help <concept>'\n"

8646 +"to read about a specific subcommand or concept."

8647 msgstr ""

8648

8649 #: parse-options.h:156

@@ -8815,59 +8980,59 @@ msgid ""

8980 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"

8981 msgstr ""

8982

8818 -#: git-bisect.sh:347 git-bisect.sh:474

8983 +#: git-bisect.sh:363 git-bisect.sh:490

8984 msgid "We are not bisecting."

8985 msgstr ""

8986

8822 -#: git-bisect.sh:354

8987 +#: git-bisect.sh:370

8988 #, sh-format

8989 msgid "'$invalid' is not a valid commit"

8990 msgstr ""

8991

8827 -#: git-bisect.sh:363

8992 +#: git-bisect.sh:379

8993 #, sh-format

8994 msgid ""

8995 "Could not check out original HEAD '$branch'.\n"

8996 "Try 'git bisect reset <commit>'."

8997 msgstr ""

8998

8834 -#: git-bisect.sh:390

8999 +#: git-bisect.sh:406

9000 msgid "No logfile given"

9001 msgstr ""

9002

8838 -#: git-bisect.sh:391

9003 +#: git-bisect.sh:407

9004 #, sh-format

9005 msgid "cannot read $file for replaying"

9006 msgstr ""

9007

8843 -#: git-bisect.sh:408

9008 +#: git-bisect.sh:424

9009 msgid "?? what are you talking about?"

9010 msgstr ""

9011

8847 -#: git-bisect.sh:420

9012 +#: git-bisect.sh:436

9013 #, sh-format

9014 msgid "running $command"

9015 msgstr ""

9016

8852 -#: git-bisect.sh:427

9017 +#: git-bisect.sh:443

9018 #, sh-format

9019 msgid ""

9020 "bisect run failed:\n"

9021 "exit code $res from '$command' is < 0 or >= 128"

9022 msgstr ""

9023

8859 -#: git-bisect.sh:453

9024 +#: git-bisect.sh:469

9025 msgid "bisect run cannot continue any more"

9026 msgstr ""

9027

8863 -#: git-bisect.sh:459

9028 +#: git-bisect.sh:475

9029 #, sh-format

9030 msgid ""

9031 "bisect run failed:\n"

9032 "'bisect_state $state' exited with error code $res"

9033 msgstr ""

9034

8870 -#: git-bisect.sh:466

9035 +#: git-bisect.sh:482

9036 msgid "bisect run success"

9037 msgstr ""

9038

l10n: git.pot: v1.8.3 round 2 (44 new, 12 removed)