9caaf23ef0 · 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-01-25 12:33+0800\n"

11 +"POT-Creation-Date: 2013-02-14 14:46+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"

@@ -18,7 +18,7 @@ msgstr ""

18 "Content-Transfer-Encoding: 8bit\n"

19 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"

20

21 -#: advice.c:45

21 +#: advice.c:49

22 #, c-format

23 msgid "hint: %.*s\n"

24 msgstr ""

@@ -27,7 +27,7 @@ msgstr ""

27 #. * Message used both when 'git commit' fails and when

28 #. * other commands doing a merge do.

29 #.

30 -#: advice.c:75

30 +#: advice.c:79

31 msgid ""

32 "Fix them up in the work tree,\n"

33 "and then use 'git add/rm <file>' as\n"

@@ -68,11 +68,11 @@ msgstr ""

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

69 msgstr ""

70

71 -#: archive.c:326 builtin/archive.c:91 builtin/blame.c:2380

72 -#: builtin/blame.c:2381 builtin/config.c:55 builtin/fast-export.c:653

71 +#: archive.c:326 builtin/archive.c:91 builtin/blame.c:2366

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

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

74 -#: builtin/ls-files.c:494 builtin/ls-files.c:497 builtin/notes.c:540

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

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

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

76 msgid "file"

77 msgstr ""

78

@@ -112,7 +112,7 @@ msgstr ""

112 msgid "retrieve the archive from remote repository <repo>"

113 msgstr ""

114

115 -#: archive.c:347 builtin/archive.c:95 builtin/notes.c:619

115 +#: archive.c:347 builtin/archive.c:95 builtin/notes.c:615

116 msgid "command"

117 msgstr ""

118

@@ -333,7 +333,7 @@ msgstr ""

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

334 msgstr ""

335

336 -#: gpg-interface.c:59

336 +#: gpg-interface.c:59 gpg-interface.c:127

337 msgid "could not run gpg."

338 msgstr ""

339

@@ -345,6 +345,16 @@ msgstr ""

345 msgid "gpg failed to sign the data"

346 msgstr ""

347

348 +#: gpg-interface.c:112

349 +#, c-format

350 +msgid "could not create temporary file '%s': %s"

351 +msgstr ""

352 +

353 +#: gpg-interface.c:115

354 +#, c-format

355 +msgid "failed writing detached signature to '%s': %s"

356 +msgstr ""

357 +

358 #: grep.c:1622

359 #, c-format

360 msgid "'%s': unable to read %s"

@@ -369,35 +379,39 @@ msgstr ""

379 msgid "git commands available from elsewhere on your $PATH"

380 msgstr ""

381

372 -#: help.c:275

382 +#: help.c:235

383 +msgid "The most commonly used git commands are:"

384 +msgstr ""

385 +

386 +#: help.c:292

387 #, c-format

388 msgid ""

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

390 "able to execute it. Maybe git-%s is broken?"

391 msgstr ""

392

379 -#: help.c:332

393 +#: help.c:349

394 msgid "Uh oh. Your system reports no Git commands at all."

395 msgstr ""

396

383 -#: help.c:354

397 +#: help.c:371

398 #, c-format

399 msgid ""

400 "WARNING: You called a Git command named '%s', which does not exist.\n"

401 "Continuing under the assumption that you meant '%s'"

402 msgstr ""

403

390 -#: help.c:359

404 +#: help.c:376

405 #, c-format

406 msgid "in %0.1f seconds automatically..."

407 msgstr ""

408

395 -#: help.c:366

409 +#: help.c:383

410 #, c-format

411 msgid "git: '%s' is not a git command. See 'git --help'."

412 msgstr ""

413

400 -#: help.c:370

414 +#: help.c:387

415 msgid ""

416 "\n"

417 "Did you mean this?"

@@ -683,18 +697,28 @@ msgstr ""

697 msgid " %s"

698 msgstr ""

699

686 -#: remote.c:1686

700 +#: pathspec.c:83

701 +#, c-format

702 +msgid "Path '%s' is in submodule '%.*s'"

703 +msgstr ""

704 +

705 +#: pathspec.c:99

706 +#, c-format

707 +msgid "'%s' is beyond a symbolic link"

708 +msgstr ""

709 +

710 +#: remote.c:1653

711 #, c-format

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

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

714 msgstr[0] ""

715 msgstr[1] ""

716

693 -#: remote.c:1692

717 +#: remote.c:1659

718 msgid " (use \"git push\" to publish your local commits)\n"

719 msgstr ""

720

697 -#: remote.c:1695

721 +#: remote.c:1662

722 #, c-format

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

724 msgid_plural ""

@@ -702,11 +726,11 @@ msgid_plural ""

726 msgstr[0] ""

727 msgstr[1] ""

728

705 -#: remote.c:1703

729 +#: remote.c:1670

730 msgid " (use \"git pull\" to update your local branch)\n"

731 msgstr ""

732

709 -#: remote.c:1706

733 +#: remote.c:1673

734 #, c-format

735 msgid ""

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

@@ -717,18 +741,18 @@ msgid_plural ""

741 msgstr[0] ""

742 msgstr[1] ""

743

720 -#: remote.c:1716

744 +#: remote.c:1683

745 msgid " (use \"git pull\" to merge the remote branch into yours)\n"

746 msgstr ""

747

724 -#: sequencer.c:123 builtin/merge.c:761 builtin/merge.c:875 builtin/merge.c:985

725 -#: builtin/merge.c:995

748 +#: sequencer.c:123 builtin/merge.c:761 builtin/merge.c:874 builtin/merge.c:984

749 +#: builtin/merge.c:994

750 #, c-format

751 msgid "Could not open '%s' for writing"

752 msgstr ""

753

730 -#: sequencer.c:125 builtin/merge.c:333 builtin/merge.c:764 builtin/merge.c:987

731 -#: builtin/merge.c:1000

754 +#: sequencer.c:125 builtin/merge.c:333 builtin/merge.c:764 builtin/merge.c:986

755 +#: builtin/merge.c:999

756 #, c-format

757 msgid "Could not write to '%s'"

758 msgstr ""

@@ -921,7 +945,7 @@ msgstr ""

945 msgid "cannot abort from a branch yet to be born"

946 msgstr ""

947

924 -#: sequencer.c:821 builtin/apply.c:4016

948 +#: sequencer.c:821 builtin/apply.c:4020

949 #, c-format

950 msgid "cannot open %s: %s"

951 msgstr ""

@@ -1135,332 +1159,357 @@ msgstr ""

1159 msgid "bug: unhandled diff status %c"

1160 msgstr ""

1161

1138 -#: wt-status.c:787

1162 +#: wt-status.c:789

1163 msgid "You have unmerged paths."

1164 msgstr ""

1165

1142 -#: wt-status.c:790 wt-status.c:914

1166 +#: wt-status.c:792 wt-status.c:916

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

1168 msgstr ""

1169

1146 -#: wt-status.c:793

1170 +#: wt-status.c:795

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

1172 msgstr ""

1173

1150 -#: wt-status.c:796

1174 +#: wt-status.c:798

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

1176 msgstr ""

1177

1154 -#: wt-status.c:806

1178 +#: wt-status.c:808

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

1180 msgstr ""

1181

1158 -#: wt-status.c:809

1182 +#: wt-status.c:811

1183 msgid "The current patch is empty."

1184 msgstr ""

1185

1162 -#: wt-status.c:813

1186 +#: wt-status.c:815

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

1188 msgstr ""

1189

1166 -#: wt-status.c:815

1190 +#: wt-status.c:817

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

1192 msgstr ""

1193

1170 -#: wt-status.c:817

1194 +#: wt-status.c:819

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

1196 msgstr ""

1197

1174 -#: wt-status.c:875 wt-status.c:885

1198 +#: wt-status.c:877 wt-status.c:887

1199 msgid "You are currently rebasing."

1200 msgstr ""

1201

1178 -#: wt-status.c:878

1202 +#: wt-status.c:880

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

1204 msgstr ""

1205

1182 -#: wt-status.c:880

1206 +#: wt-status.c:882

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

1208 msgstr ""

1209

1186 -#: wt-status.c:882

1210 +#: wt-status.c:884

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

1212 msgstr ""

1213

1190 -#: wt-status.c:888

1214 +#: wt-status.c:890

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

1216 msgstr ""

1217

1194 -#: wt-status.c:890

1218 +#: wt-status.c:892

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

1220 msgstr ""

1221

1198 -#: wt-status.c:893

1222 +#: wt-status.c:895

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

1224 msgstr ""

1225

1202 -#: wt-status.c:895

1226 +#: wt-status.c:897

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

1228 msgstr ""

1229

1206 -#: wt-status.c:898

1230 +#: wt-status.c:900

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

1232 msgstr ""

1233

1210 -#: wt-status.c:900

1234 +#: wt-status.c:902

1235 msgid ""

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

1237 msgstr ""

1238

1215 -#: wt-status.c:910

1239 +#: wt-status.c:912

1240 msgid "You are currently cherry-picking."

1241 msgstr ""

1242

1219 -#: wt-status.c:917

1243 +#: wt-status.c:919

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

1245 msgstr ""

1246

1223 -#: wt-status.c:926

1247 +#: wt-status.c:928

1248 msgid "You are currently bisecting."

1249 msgstr ""

1250

1227 -#: wt-status.c:929

1251 +#: wt-status.c:931

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

1253 msgstr ""

1254

1231 -#: wt-status.c:980

1255 +#: wt-status.c:982

1256 msgid "On branch "

1257 msgstr ""

1258

1235 -#: wt-status.c:987

1259 +#: wt-status.c:989

1260 msgid "Not currently on any branch."

1261 msgstr ""

1262

1239 -#: wt-status.c:999

1263 +#: wt-status.c:1001

1264 msgid "Initial commit"

1265 msgstr ""

1266

1243 -#: wt-status.c:1013

1267 +#: wt-status.c:1015

1268 msgid "Untracked files"

1269 msgstr ""

1270

1247 -#: wt-status.c:1015

1271 +#: wt-status.c:1017

1272 msgid "Ignored files"

1273 msgstr ""

1274

1251 -#: wt-status.c:1017

1275 +#: wt-status.c:1019

1276 #, c-format

1277 msgid "Untracked files not listed%s"

1278 msgstr ""

1279

1256 -#: wt-status.c:1019

1280 +#: wt-status.c:1021

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

1282 msgstr ""

1283

1260 -#: wt-status.c:1025

1284 +#: wt-status.c:1027

1285 msgid "No changes"

1286 msgstr ""

1287

1264 -#: wt-status.c:1030

1288 +#: wt-status.c:1032

1289 #, c-format

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

1291 msgstr ""

1292

1269 -#: wt-status.c:1033

1293 +#: wt-status.c:1035

1294 #, c-format

1295 msgid "no changes added to commit\n"

1296 msgstr ""

1297

1274 -#: wt-status.c:1036

1298 +#: wt-status.c:1038

1299 #, c-format

1300 msgid ""

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

1302 "track)\n"

1303 msgstr ""

1304

1281 -#: wt-status.c:1039

1305 +#: wt-status.c:1041

1306 #, c-format

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

1308 msgstr ""

1309

1286 -#: wt-status.c:1042

1310 +#: wt-status.c:1044

1311 #, c-format

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

1313 msgstr ""

1314

1291 -#: wt-status.c:1045 wt-status.c:1050

1315 +#: wt-status.c:1047 wt-status.c:1052

1316 #, c-format

1317 msgid "nothing to commit\n"

1318 msgstr ""

1319

1296 -#: wt-status.c:1048

1320 +#: wt-status.c:1050

1321 #, c-format

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

1323 msgstr ""

1324

1301 -#: wt-status.c:1052

1325 +#: wt-status.c:1054

1326 #, c-format

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

1328 msgstr ""

1329

1306 -#: wt-status.c:1160

1330 +#: wt-status.c:1162

1331 msgid "HEAD (no branch)"

1332 msgstr ""

1333

1310 -#: wt-status.c:1166

1334 +#: wt-status.c:1168

1335 msgid "Initial commit on "

1336 msgstr ""

1337

1314 -#: wt-status.c:1181

1338 +#: wt-status.c:1183

1339 msgid "behind "

1340 msgstr ""

1341

1318 -#: wt-status.c:1184 wt-status.c:1187

1342 +#: wt-status.c:1186 wt-status.c:1189

1343 msgid "ahead "

1344 msgstr ""

1345

1322 -#: wt-status.c:1189

1346 +#: wt-status.c:1191

1347 msgid ", behind "

1348 msgstr ""

1349

1326 -#: builtin/add.c:19

1327 -msgid "git add [options] [--] <filepattern>..."

1350 +#: compat/precompose_utf8.c:58 builtin/clone.c:341

1351 +#, c-format

1352 +msgid "failed to unlink '%s'"

1353 msgstr ""

1354

1330 -#: builtin/add.c:62

1355 +#: builtin/add.c:20

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

1357 +msgstr ""

1358 +

1359 +#: builtin/add.c:63

1360 #, c-format

1361 msgid "unexpected diff status %c"

1362 msgstr ""

1363

1335 -#: builtin/add.c:67 builtin/commit.c:231

1364 +#: builtin/add.c:68 builtin/commit.c:231

1365 msgid "updating files failed"

1366 msgstr ""

1367

1339 -#: builtin/add.c:77

1368 +#: builtin/add.c:78

1369 #, c-format

1370 msgid "remove '%s'\n"

1371 msgstr ""

1372

1344 -#: builtin/add.c:176

1345 -#, c-format

1346 -msgid "Path '%s' is in submodule '%.*s'"

1347 -msgstr ""

1348 -

1349 -#: builtin/add.c:192

1373 +#: builtin/add.c:148

1374 msgid "Unstaged changes after refreshing the index:"

1375 msgstr ""

1376

1353 -#: builtin/add.c:195 builtin/add.c:460 builtin/rm.c:275

1377 +#: builtin/add.c:151 builtin/add.c:460 builtin/rm.c:275

1378 #, c-format

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

1380 msgstr ""

1381

1358 -#: builtin/add.c:209

1359 -#, c-format

1360 -msgid "'%s' is beyond a symbolic link"

1361 -msgstr ""

1362 -

1363 -#: builtin/add.c:276

1382 +#: builtin/add.c:234

1383 msgid "Could not read the index"

1384 msgstr ""

1385

1367 -#: builtin/add.c:286

1386 +#: builtin/add.c:244

1387 #, c-format

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

1389 msgstr ""

1390

1372 -#: builtin/add.c:290

1391 +#: builtin/add.c:248

1392 msgid "Could not write patch"

1393 msgstr ""

1394

1376 -#: builtin/add.c:295

1395 +#: builtin/add.c:253

1396 #, c-format

1397 msgid "Could not stat '%s'"

1398 msgstr ""

1399

1381 -#: builtin/add.c:297

1400 +#: builtin/add.c:255

1401 msgid "Empty patch. Aborted."

1402 msgstr ""

1403

1385 -#: builtin/add.c:303

1404 +#: builtin/add.c:261

1405 #, c-format

1406 msgid "Could not apply '%s'"

1407 msgstr ""

1408

1390 -#: builtin/add.c:313

1409 +#: builtin/add.c:271

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

1411 msgstr ""

1412

1394 -#: builtin/add.c:319 builtin/clean.c:160 builtin/fetch.c:78 builtin/mv.c:63

1395 -#: builtin/prune-packed.c:76 builtin/push.c:396 builtin/remote.c:1253

1413 +#: builtin/add.c:277 builtin/clean.c:161 builtin/fetch.c:78 builtin/mv.c:63

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

1415 #: builtin/rm.c:206

1416 msgid "dry run"

1417 msgstr ""

1418

1400 -#: builtin/add.c:320 builtin/apply.c:4365 builtin/commit.c:1160

1401 -#: builtin/count-objects.c:82 builtin/fsck.c:613 builtin/log.c:1522

1402 -#: builtin/mv.c:62 builtin/read-tree.c:112

1419 +#: builtin/add.c:278 builtin/apply.c:4369 builtin/check-ignore.c:19

1420 +#: builtin/commit.c:1150 builtin/count-objects.c:82 builtin/fsck.c:613

1421 +#: builtin/log.c:1522 builtin/mv.c:62 builtin/read-tree.c:112

1422 msgid "be verbose"

1423 msgstr ""

1424

1406 -#: builtin/add.c:322

1425 +#: builtin/add.c:280

1426 msgid "interactive picking"

1427 msgstr ""

1428

1410 -#: builtin/add.c:323 builtin/checkout.c:1031 builtin/reset.c:258

1429 +#: builtin/add.c:281 builtin/checkout.c:1031 builtin/reset.c:258

1430 msgid "select hunks interactively"

1431 msgstr ""

1432

1414 -#: builtin/add.c:324

1433 +#: builtin/add.c:282

1434 msgid "edit current diff and apply"

1435 msgstr ""

1436

1418 -#: builtin/add.c:325

1437 +#: builtin/add.c:283

1438 msgid "allow adding otherwise ignored files"

1439 msgstr ""

1440

1422 -#: builtin/add.c:326

1441 +#: builtin/add.c:284

1442 msgid "update tracked files"

1443 msgstr ""

1444

1426 -#: builtin/add.c:327

1445 +#: builtin/add.c:285

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

1447 msgstr ""

1448

1430 -#: builtin/add.c:328

1449 +#: builtin/add.c:286

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

1451 msgstr ""

1452

1434 -#: builtin/add.c:329

1453 +#: builtin/add.c:287

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

1455 msgstr ""

1456

1438 -#: builtin/add.c:330

1457 +#: builtin/add.c:288

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

1459 msgstr ""

1460

1442 -#: builtin/add.c:331

1461 +#: builtin/add.c:289

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

1463 msgstr ""

1464

1446 -#: builtin/add.c:353

1465 +#: builtin/add.c:311

1466 #, c-format

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

1468 msgstr ""

1469

1451 -#: builtin/add.c:354

1470 +#: builtin/add.c:312

1471 msgid "no files added"

1472 msgstr ""

1473

1455 -#: builtin/add.c:360

1474 +#: builtin/add.c:318

1475 msgid "adding files failed"

1476 msgstr ""

1477

1459 -#: builtin/add.c:392

1478 +#.

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

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

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

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

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

1484 +#. * keep the old behavior. Later, this warning can be

1485 +#. * turned into a die(...), and eventually we may

1486 +#. * reallow the command with a new behavior.

1487 +#.

1488 +#: builtin/add.c:335

1489 +#, c-format

1490 +msgid ""

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

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

1493 +"anymore.\n"

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

1495 +"\n"

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

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

1498 +"\n"

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

1500 +"\n"

1501 +" git add %s .\n"

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

1503 +"\n"

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

1505 +"directory."

1506 +msgstr ""

1507 +

1508 +#: builtin/add.c:381

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

1510 msgstr ""

1511

1463 -#: builtin/add.c:394

1512 +#: builtin/add.c:383

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

1514 msgstr ""

1515

@@ -1474,12 +1523,12 @@ msgstr ""

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

1524 msgstr ""

1525

1477 -#: builtin/add.c:421 builtin/clean.c:203 builtin/commit.c:291 builtin/mv.c:82

1478 -#: builtin/rm.c:235

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

1527 +#: builtin/commit.c:291 builtin/mv.c:82 builtin/rm.c:235

1528 msgid "index file corrupt"

1529 msgstr ""

1530

1482 -#: builtin/add.c:481 builtin/apply.c:4461 builtin/mv.c:229 builtin/rm.c:370

1531 +#: builtin/add.c:481 builtin/apply.c:4465 builtin/mv.c:229 builtin/rm.c:370

1532 msgid "Unable to write new index file"

1533 msgstr ""

1534

@@ -1532,17 +1581,17 @@ msgstr ""

1581 msgid "git apply: bad git-diff - expected /dev/null on line %d"

1582 msgstr ""

1583

1535 -#: builtin/apply.c:1420

1584 +#: builtin/apply.c:1422

1585 #, c-format

1586 msgid "recount: unexpected line: %.*s"

1587 msgstr ""

1588

1540 -#: builtin/apply.c:1477

1589 +#: builtin/apply.c:1479

1590 #, c-format

1591 msgid "patch fragment without header at line %d: %.*s"

1592 msgstr ""

1593

1545 -#: builtin/apply.c:1494

1594 +#: builtin/apply.c:1496

1595 #, c-format

1596 msgid ""

1597 "git diff header lacks filename information when removing %d leading pathname "

@@ -1553,396 +1602,396 @@ msgid_plural ""

1602 msgstr[0] ""

1603 msgstr[1] ""

1604

1556 -#: builtin/apply.c:1654

1605 +#: builtin/apply.c:1656

1606 msgid "new file depends on old contents"

1607 msgstr ""

1608

1560 -#: builtin/apply.c:1656

1609 +#: builtin/apply.c:1658

1610 msgid "deleted file still has contents"

1611 msgstr ""

1612

1564 -#: builtin/apply.c:1682

1613 +#: builtin/apply.c:1684

1614 #, c-format

1615 msgid "corrupt patch at line %d"

1616 msgstr ""

1617

1569 -#: builtin/apply.c:1718

1618 +#: builtin/apply.c:1720

1619 #, c-format

1620 msgid "new file %s depends on old contents"

1621 msgstr ""

1622

1574 -#: builtin/apply.c:1720

1623 +#: builtin/apply.c:1722

1624 #, c-format

1625 msgid "deleted file %s still has contents"

1626 msgstr ""

1627

1579 -#: builtin/apply.c:1723

1628 +#: builtin/apply.c:1725

1629 #, c-format

1630 msgid "** warning: file %s becomes empty but is not deleted"

1631 msgstr ""

1632

1584 -#: builtin/apply.c:1869

1633 +#: builtin/apply.c:1871

1634 #, c-format

1635 msgid "corrupt binary patch at line %d: %.*s"

1636 msgstr ""

1637

1638 #. there has to be one hunk (forward hunk)

1590 -#: builtin/apply.c:1898

1639 +#: builtin/apply.c:1900

1640 #, c-format

1641 msgid "unrecognized binary patch at line %d"

1642 msgstr ""

1643

1595 -#: builtin/apply.c:1984

1644 +#: builtin/apply.c:1986

1645 #, c-format

1646 msgid "patch with only garbage at line %d"

1647 msgstr ""

1648

1600 -#: builtin/apply.c:2074

1649 +#: builtin/apply.c:2076

1650 #, c-format

1651 msgid "unable to read symlink %s"

1652 msgstr ""

1653

1605 -#: builtin/apply.c:2078

1654 +#: builtin/apply.c:2080

1655 #, c-format

1656 msgid "unable to open or read %s"

1657 msgstr ""

1658

1610 -#: builtin/apply.c:2682

1659 +#: builtin/apply.c:2684

1660 #, c-format

1661 msgid "invalid start of line: '%c'"

1662 msgstr ""

1663

1615 -#: builtin/apply.c:2800

1664 +#: builtin/apply.c:2802

1665 #, c-format

1666 msgid "Hunk #%d succeeded at %d (offset %d line)."

1667 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."

1668 msgstr[0] ""

1669 msgstr[1] ""

1670

1622 -#: builtin/apply.c:2812

1671 +#: builtin/apply.c:2814

1672 #, c-format

1673 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"

1674 msgstr ""

1675

1627 -#: builtin/apply.c:2818

1676 +#: builtin/apply.c:2820

1677 #, c-format

1678 msgid ""

1679 "while searching for:\n"

1680 "%.*s"

1681 msgstr ""

1682

1634 -#: builtin/apply.c:2837

1683 +#: builtin/apply.c:2839

1684 #, c-format

1685 msgid "missing binary patch data for '%s'"

1686 msgstr ""

1687

1639 -#: builtin/apply.c:2940

1688 +#: builtin/apply.c:2942

1689 #, c-format

1690 msgid "binary patch does not apply to '%s'"

1691 msgstr ""

1692

1644 -#: builtin/apply.c:2946

1693 +#: builtin/apply.c:2948

1694 #, c-format

1695 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"

1696 msgstr ""

1697

1649 -#: builtin/apply.c:2967

1698 +#: builtin/apply.c:2969

1699 #, c-format

1700 msgid "patch failed: %s:%ld"

1701 msgstr ""

1702

1654 -#: builtin/apply.c:3089

1703 +#: builtin/apply.c:3091

1704 #, c-format

1705 msgid "cannot checkout %s"

1706 msgstr ""

1707

1659 -#: builtin/apply.c:3134 builtin/apply.c:3143 builtin/apply.c:3187

1708 +#: builtin/apply.c:3136 builtin/apply.c:3145 builtin/apply.c:3189

1709 #, c-format

1710 msgid "read of %s failed"

1711 msgstr ""

1712

1664 -#: builtin/apply.c:3167 builtin/apply.c:3389

1713 +#: builtin/apply.c:3169 builtin/apply.c:3391

1714 #, c-format

1715 msgid "path %s has been renamed/deleted"

1716 msgstr ""

1717

1669 -#: builtin/apply.c:3248 builtin/apply.c:3403

1718 +#: builtin/apply.c:3250 builtin/apply.c:3405

1719 #, c-format

1720 msgid "%s: does not exist in index"

1721 msgstr ""

1722

1674 -#: builtin/apply.c:3252 builtin/apply.c:3395 builtin/apply.c:3417

1723 +#: builtin/apply.c:3254 builtin/apply.c:3397 builtin/apply.c:3419

1724 #, c-format

1725 msgid "%s: %s"

1726 msgstr ""

1727

1679 -#: builtin/apply.c:3257 builtin/apply.c:3411

1728 +#: builtin/apply.c:3259 builtin/apply.c:3413

1729 #, c-format

1730 msgid "%s: does not match index"

1731 msgstr ""

1732

1684 -#: builtin/apply.c:3359

1733 +#: builtin/apply.c:3361

1734 msgid "removal patch leaves file contents"

1735 msgstr ""

1736

1688 -#: builtin/apply.c:3428

1737 +#: builtin/apply.c:3430

1738 #, c-format

1739 msgid "%s: wrong type"

1740 msgstr ""

1741

1693 -#: builtin/apply.c:3430

1742 +#: builtin/apply.c:3432

1743 #, c-format

1744 msgid "%s has type %o, expected %o"

1745 msgstr ""

1746

1698 -#: builtin/apply.c:3531

1747 +#: builtin/apply.c:3533

1748 #, c-format

1749 msgid "%s: already exists in index"

1750 msgstr ""

1751

1703 -#: builtin/apply.c:3534

1752 +#: builtin/apply.c:3536

1753 #, c-format

1754 msgid "%s: already exists in working directory"

1755 msgstr ""

1756

1708 -#: builtin/apply.c:3554

1757 +#: builtin/apply.c:3556

1758 #, c-format

1759 msgid "new mode (%o) of %s does not match old mode (%o)"

1760 msgstr ""

1761

1713 -#: builtin/apply.c:3559

1762 +#: builtin/apply.c:3561

1763 #, c-format

1764 msgid "new mode (%o) of %s does not match old mode (%o) of %s"

1765 msgstr ""

1766

1718 -#: builtin/apply.c:3567

1767 +#: builtin/apply.c:3569

1768 #, c-format

1769 msgid "%s: patch does not apply"

1770 msgstr ""

1771

1723 -#: builtin/apply.c:3580

1772 +#: builtin/apply.c:3582

1773 #, c-format

1774 msgid "Checking patch %s..."

1775 msgstr ""

1776

1728 -#: builtin/apply.c:3635 builtin/checkout.c:215 builtin/reset.c:124

1777 +#: builtin/apply.c:3639 builtin/checkout.c:215 builtin/reset.c:124

1778 #, c-format

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

1780 msgstr ""

1781

1733 -#: builtin/apply.c:3778

1782 +#: builtin/apply.c:3782

1783 #, c-format

1784 msgid "unable to remove %s from index"

1785 msgstr ""

1786

1738 -#: builtin/apply.c:3806

1787 +#: builtin/apply.c:3810

1788 #, c-format

1789 msgid "corrupt patch for subproject %s"

1790 msgstr ""

1791

1743 -#: builtin/apply.c:3810

1792 +#: builtin/apply.c:3814

1793 #, c-format

1794 msgid "unable to stat newly created file '%s'"

1795 msgstr ""

1796

1748 -#: builtin/apply.c:3815

1797 +#: builtin/apply.c:3819

1798 #, c-format

1799 msgid "unable to create backing store for newly created file %s"

1800 msgstr ""

1801

1753 -#: builtin/apply.c:3818 builtin/apply.c:3926

1802 +#: builtin/apply.c:3822 builtin/apply.c:3930

1803 #, c-format

1804 msgid "unable to add cache entry for %s"

1805 msgstr ""

1806

1758 -#: builtin/apply.c:3851

1807 +#: builtin/apply.c:3855

1808 #, c-format

1809 msgid "closing file '%s'"

1810 msgstr ""

1811

1763 -#: builtin/apply.c:3900

1812 +#: builtin/apply.c:3904

1813 #, c-format

1814 msgid "unable to write file '%s' mode %o"

1815 msgstr ""

1816

1768 -#: builtin/apply.c:3987

1817 +#: builtin/apply.c:3991

1818 #, c-format

1819 msgid "Applied patch %s cleanly."

1820 msgstr ""

1821

1773 -#: builtin/apply.c:3995

1822 +#: builtin/apply.c:3999

1823 msgid "internal error"

1824 msgstr ""

1825

1826 #. Say this even without --verbose

1778 -#: builtin/apply.c:3998

1827 +#: builtin/apply.c:4002

1828 #, c-format

1829 msgid "Applying patch %%s with %d reject..."

1830 msgid_plural "Applying patch %%s with %d rejects..."

1831 msgstr[0] ""

1832 msgstr[1] ""

1833

1785 -#: builtin/apply.c:4008

1834 +#: builtin/apply.c:4012

1835 #, c-format

1836 msgid "truncating .rej filename to %.*s.rej"

1837 msgstr ""

1838

1790 -#: builtin/apply.c:4029

1839 +#: builtin/apply.c:4033

1840 #, c-format

1841 msgid "Hunk #%d applied cleanly."

1842 msgstr ""

1843

1795 -#: builtin/apply.c:4032

1844 +#: builtin/apply.c:4036

1845 #, c-format

1846 msgid "Rejected hunk #%d."

1847 msgstr ""

1848

1800 -#: builtin/apply.c:4182

1849 +#: builtin/apply.c:4186

1850 msgid "unrecognized input"

1851 msgstr ""

1852

1804 -#: builtin/apply.c:4193

1853 +#: builtin/apply.c:4197

1854 msgid "unable to read index file"

1855 msgstr ""

1856

1808 -#: builtin/apply.c:4312 builtin/apply.c:4315 builtin/clone.c:91

1857 +#: builtin/apply.c:4316 builtin/apply.c:4319 builtin/clone.c:91

1858 #: builtin/fetch.c:63

1859 msgid "path"

1860 msgstr ""

1861

1813 -#: builtin/apply.c:4313

1862 +#: builtin/apply.c:4317

1863 msgid "don't apply changes matching the given path"

1864 msgstr ""

1865

1817 -#: builtin/apply.c:4316

1866 +#: builtin/apply.c:4320

1867 msgid "apply changes matching the given path"

1868 msgstr ""

1869

1821 -#: builtin/apply.c:4318

1870 +#: builtin/apply.c:4322

1871 msgid "num"

1872 msgstr ""

1873

1825 -#: builtin/apply.c:4319

1874 +#: builtin/apply.c:4323

1875 msgid "remove <num> leading slashes from traditional diff paths"

1876 msgstr ""

1877

1829 -#: builtin/apply.c:4322

1878 +#: builtin/apply.c:4326

1879 msgid "ignore additions made by the patch"

1880 msgstr ""

1881

1833 -#: builtin/apply.c:4324

1882 +#: builtin/apply.c:4328

1883 msgid "instead of applying the patch, output diffstat for the input"

1884 msgstr ""

1885

1837 -#: builtin/apply.c:4328

1886 +#: builtin/apply.c:4332

1887 msgid "show number of added and deleted lines in decimal notation"

1888 msgstr ""

1889

1841 -#: builtin/apply.c:4330

1890 +#: builtin/apply.c:4334

1891 msgid "instead of applying the patch, output a summary for the input"

1892 msgstr ""

1893

1845 -#: builtin/apply.c:4332

1894 +#: builtin/apply.c:4336

1895 msgid "instead of applying the patch, see if the patch is applicable"

1896 msgstr ""

1897

1849 -#: builtin/apply.c:4334

1898 +#: builtin/apply.c:4338

1899 msgid "make sure the patch is applicable to the current index"

1900 msgstr ""

1901

1853 -#: builtin/apply.c:4336

1902 +#: builtin/apply.c:4340

1903 msgid "apply a patch without touching the working tree"

1904 msgstr ""

1905

1857 -#: builtin/apply.c:4338

1906 +#: builtin/apply.c:4342

1907 msgid "also apply the patch (use with --stat/--summary/--check)"

1908 msgstr ""

1909

1861 -#: builtin/apply.c:4340

1910 +#: builtin/apply.c:4344

1911 msgid "attempt three-way merge if a patch does not apply"

1912 msgstr ""

1913

1865 -#: builtin/apply.c:4342

1914 +#: builtin/apply.c:4346

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

1916 msgstr ""

1917

1869 -#: builtin/apply.c:4344 builtin/checkout-index.c:197 builtin/ls-files.c:460

1918 +#: builtin/apply.c:4348 builtin/checkout-index.c:197 builtin/ls-files.c:463

1919 msgid "paths are separated with NUL character"

1920 msgstr ""

1921

1873 -#: builtin/apply.c:4347

1922 +#: builtin/apply.c:4351

1923 msgid "ensure at least <n> lines of context match"

1924 msgstr ""

1925

1877 -#: builtin/apply.c:4348

1926 +#: builtin/apply.c:4352

1927 msgid "action"

1928 msgstr ""

1929

1881 -#: builtin/apply.c:4349

1930 +#: builtin/apply.c:4353

1931 msgid "detect new or modified lines that have whitespace errors"

1932 msgstr ""

1933

1885 -#: builtin/apply.c:4352 builtin/apply.c:4355

1934 +#: builtin/apply.c:4356 builtin/apply.c:4359

1935 msgid "ignore changes in whitespace when finding context"

1936 msgstr ""

1937

1889 -#: builtin/apply.c:4358

1938 +#: builtin/apply.c:4362

1939 msgid "apply the patch in reverse"

1940 msgstr ""

1941

1893 -#: builtin/apply.c:4360

1942 +#: builtin/apply.c:4364

1943 msgid "don't expect at least one line of context"

1944 msgstr ""

1945

1897 -#: builtin/apply.c:4362

1946 +#: builtin/apply.c:4366

1947 msgid "leave the rejected hunks in corresponding *.rej files"

1948 msgstr ""

1949

1901 -#: builtin/apply.c:4364

1950 +#: builtin/apply.c:4368

1951 msgid "allow overlapping hunks"

1952 msgstr ""

1953

1905 -#: builtin/apply.c:4367

1954 +#: builtin/apply.c:4371

1955 msgid "tolerate incorrectly detected missing new-line at the end of file"

1956 msgstr ""

1957

1909 -#: builtin/apply.c:4370

1958 +#: builtin/apply.c:4374

1959 msgid "do not trust the line counts in the hunk headers"

1960 msgstr ""

1961

1913 -#: builtin/apply.c:4372

1962 +#: builtin/apply.c:4376

1963 msgid "root"

1964 msgstr ""

1965

1917 -#: builtin/apply.c:4373

1966 +#: builtin/apply.c:4377

1967 msgid "prepend <root> to all filenames"

1968 msgstr ""

1969

1921 -#: builtin/apply.c:4395

1970 +#: builtin/apply.c:4399

1971 msgid "--3way outside a repository"

1972 msgstr ""

1973

1925 -#: builtin/apply.c:4403

1974 +#: builtin/apply.c:4407

1975 msgid "--index outside a repository"

1976 msgstr ""

1977

1929 -#: builtin/apply.c:4406

1978 +#: builtin/apply.c:4410

1979 msgid "--cached outside a repository"

1980 msgstr ""

1981

1933 -#: builtin/apply.c:4422

1982 +#: builtin/apply.c:4426

1983 #, c-format

1984 msgid "can't open patch '%s'"

1985 msgstr ""

1986

1938 -#: builtin/apply.c:4436

1987 +#: builtin/apply.c:4440

1988 #, c-format

1989 msgid "squelched %d whitespace error"

1990 msgid_plural "squelched %d whitespace errors"

1991 msgstr[0] ""

1992 msgstr[1] ""

1993

1945 -#: builtin/apply.c:4442 builtin/apply.c:4452

1994 +#: builtin/apply.c:4446 builtin/apply.c:4456

1995 #, c-format

1996 msgid "%d line adds whitespace errors."

1997 msgid_plural "%d lines add whitespace errors."

@@ -2004,95 +2053,95 @@ msgstr ""

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

2054 msgstr ""

2055

2007 -#: builtin/blame.c:2364

2056 +#: builtin/blame.c:2350

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

2058 msgstr ""

2059

2011 -#: builtin/blame.c:2365

2060 +#: builtin/blame.c:2351

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

2062 msgstr ""

2063

2015 -#: builtin/blame.c:2366

2064 +#: builtin/blame.c:2352

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

2066 msgstr ""

2067

2019 -#: builtin/blame.c:2367

2068 +#: builtin/blame.c:2353

2069 msgid "Show work cost statistics"

2070 msgstr ""

2071

2023 -#: builtin/blame.c:2368

2072 +#: builtin/blame.c:2354

2073 msgid "Show output score for blame entries"

2074 msgstr ""

2075

2027 -#: builtin/blame.c:2369

2076 +#: builtin/blame.c:2355

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

2078 msgstr ""

2079

2031 -#: builtin/blame.c:2370

2080 +#: builtin/blame.c:2356

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

2082 msgstr ""

2083

2035 -#: builtin/blame.c:2371

2084 +#: builtin/blame.c:2357

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

2086 msgstr ""

2087

2039 -#: builtin/blame.c:2372

2088 +#: builtin/blame.c:2358

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

2090 msgstr ""

2091

2043 -#: builtin/blame.c:2373

2092 +#: builtin/blame.c:2359

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

2094 msgstr ""

2095

2047 -#: builtin/blame.c:2374

2096 +#: builtin/blame.c:2360

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

2098 msgstr ""

2099

2051 -#: builtin/blame.c:2375

2100 +#: builtin/blame.c:2361

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

2102 msgstr ""

2103

2055 -#: builtin/blame.c:2376

2104 +#: builtin/blame.c:2362

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

2106 msgstr ""

2107

2059 -#: builtin/blame.c:2377

2108 +#: builtin/blame.c:2363

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

2110 msgstr ""

2111

2063 -#: builtin/blame.c:2378

2112 +#: builtin/blame.c:2364

2113 msgid "Ignore whitespace differences"

2114 msgstr ""

2115

2067 -#: builtin/blame.c:2379

2116 +#: builtin/blame.c:2365

2117 msgid "Spend extra cycles to find better match"

2118 msgstr ""

2119

2071 -#: builtin/blame.c:2380

2120 +#: builtin/blame.c:2366

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

2122 msgstr ""

2123

2075 -#: builtin/blame.c:2381

2124 +#: builtin/blame.c:2367

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

2126 msgstr ""

2127

2079 -#: builtin/blame.c:2382 builtin/blame.c:2383

2128 +#: builtin/blame.c:2368 builtin/blame.c:2369

2129 msgid "score"

2130 msgstr ""

2131

2083 -#: builtin/blame.c:2382

2132 +#: builtin/blame.c:2368

2133 msgid "Find line copies within and across files"

2134 msgstr ""

2135

2087 -#: builtin/blame.c:2383

2136 +#: builtin/blame.c:2369

2137 msgid "Find line movements within and across files"

2138 msgstr ""

2139

2091 -#: builtin/blame.c:2384

2140 +#: builtin/blame.c:2370

2141 msgid "n,m"

2142 msgstr ""

2143

2095 -#: builtin/blame.c:2384

2144 +#: builtin/blame.c:2370

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

2146 msgstr ""

2147

@@ -2220,10 +2269,19 @@ msgstr ""

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

2270 msgstr ""

2271

2272 +#: builtin/branch.c:469

2273 +msgid " **** invalid ref ****"

2274 +msgstr ""

2275 +

2276 #: builtin/branch.c:560

2277 msgid "(no branch)"

2278 msgstr ""

2279

2280 +#: builtin/branch.c:593

2281 +#, c-format

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

2283 +msgstr ""

2284 +

2285 #: builtin/branch.c:625

2286 msgid "some refs could not be read"

2287 msgstr ""

@@ -2294,8 +2352,8 @@ msgid "act on remote-tracking branches"

2352 msgstr ""

2353

2354 #: builtin/branch.c:761 builtin/branch.c:767 builtin/branch.c:788

2297 -#: builtin/branch.c:794 builtin/commit.c:1378 builtin/commit.c:1379

2298 -#: builtin/commit.c:1380 builtin/commit.c:1381 builtin/tag.c:470

2355 +#: builtin/branch.c:794 builtin/commit.c:1366 builtin/commit.c:1367

2356 +#: builtin/commit.c:1368 builtin/commit.c:1369 builtin/tag.c:468

2357 msgid "commit"

2358 msgstr ""

2359

@@ -2363,32 +2421,58 @@ msgstr ""

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

2422 msgstr ""

2423

2366 -#: builtin/branch.c:836

2424 +#: builtin/branch.c:839

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

2426 msgstr ""

2427

2370 -#: builtin/branch.c:887

2428 +#: builtin/branch.c:845

2429 +msgid "branch name required"

2430 +msgstr ""

2431 +

2432 +#: builtin/branch.c:860

2433 +msgid "Cannot give description to detached HEAD"

2434 +msgstr ""

2435 +

2436 +#: builtin/branch.c:865

2437 +msgid "cannot edit description of more than one branch"

2438 +msgstr ""

2439 +

2440 +#: builtin/branch.c:872

2441 +#, c-format

2442 +msgid "No commit on branch '%s' yet."

2443 +msgstr ""

2444 +

2445 +#: builtin/branch.c:875

2446 +#, c-format

2447 +msgid "No branch named '%s'."

2448 +msgstr ""

2449 +

2450 +#: builtin/branch.c:888

2451 +msgid "too many branches for a rename operation"

2452 +msgstr ""

2453 +

2454 +#: builtin/branch.c:893

2455 #, c-format

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

2457 msgstr ""

2458

2375 -#: builtin/branch.c:899

2459 +#: builtin/branch.c:905

2460 #, c-format

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

2462 msgstr ""

2463

2380 -#: builtin/branch.c:914

2464 +#: builtin/branch.c:920

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

2466 msgstr ""

2467

2384 -#: builtin/branch.c:917

2468 +#: builtin/branch.c:923

2469 #, c-format

2470 msgid ""

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

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

2473 msgstr ""

2474

2391 -#: builtin/branch.c:934

2475 +#: builtin/branch.c:940

2476 #, c-format

2477 msgid ""

2478 "\n"

@@ -2396,12 +2480,12 @@ msgid ""

2480 "\n"

2481 msgstr ""

2482

2399 -#: builtin/branch.c:935

2483 +#: builtin/branch.c:941

2484 #, c-format

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

2486 msgstr ""

2487

2404 -#: builtin/branch.c:936

2488 +#: builtin/branch.c:942

2489 #, c-format

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

2491 msgstr ""

@@ -2475,14 +2559,38 @@ msgstr ""

2559 msgid "use .gitattributes only from the index"

2560 msgstr ""

2561

2478 -#: builtin/check-attr.c:21 builtin/hash-object.c:75

2562 +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75

2563 msgid "read file names from stdin"

2564 msgstr ""

2565

2482 -#: builtin/check-attr.c:23

2566 +#: builtin/check-attr.c:23 builtin/check-ignore.c:24

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

2568 msgstr ""

2569

2570 +#: builtin/check-ignore.c:18 builtin/checkout.c:1012 builtin/gc.c:177

2571 +msgid "suppress progress reporting"

2572 +msgstr ""

2573 +

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

2575 +msgid "cannot specify pathnames with --stdin"

2576 +msgstr ""

2577 +

2578 +#: builtin/check-ignore.c:154

2579 +msgid "-z only makes sense with --stdin"

2580 +msgstr ""

2581 +

2582 +#: builtin/check-ignore.c:156

2583 +msgid "no path specified"

2584 +msgstr ""

2585 +

2586 +#: builtin/check-ignore.c:160

2587 +msgid "--quiet is only valid with a single pathname"

2588 +msgstr ""

2589 +

2590 +#: builtin/check-ignore.c:162

2591 +msgid "cannot have both --quiet and --verbose"

2592 +msgstr ""

2593 +

2594 #: builtin/checkout-index.c:126

2595 msgid "git checkout-index [options] [--] [<file>...]"

2596 msgstr ""

@@ -2703,10 +2811,6 @@ msgstr ""

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

2812 msgstr ""

2813

2706 -#: builtin/checkout.c:1012 builtin/gc.c:177

2707 -msgid "suppress progress reporting"

2708 -msgstr ""

2709 -

2814 #: builtin/checkout.c:1013 builtin/checkout.c:1015 builtin/clone.c:89

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

2816 msgid "branch"

@@ -2835,45 +2939,45 @@ msgstr ""

2939 msgid "failed to remove %s"

2940 msgstr ""

2941

2838 -#: builtin/clean.c:159

2942 +#: builtin/clean.c:160

2943 msgid "do not print names of files removed"

2944 msgstr ""

2945

2842 -#: builtin/clean.c:161

2946 +#: builtin/clean.c:162

2947 msgid "force"

2948 msgstr ""

2949

2846 -#: builtin/clean.c:163

2950 +#: builtin/clean.c:164

2951 msgid "remove whole directories"

2952 msgstr ""

2953

2850 -#: builtin/clean.c:164 builtin/describe.c:413 builtin/grep.c:717

2851 -#: builtin/ls-files.c:491 builtin/name-rev.c:231 builtin/show-ref.c:182

2954 +#: builtin/clean.c:165 builtin/describe.c:413 builtin/grep.c:717

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

2956 msgid "pattern"

2957 msgstr ""

2958

2855 -#: builtin/clean.c:165

2959 +#: builtin/clean.c:166

2960 msgid "add <pattern> to ignore rules"

2961 msgstr ""

2962

2859 -#: builtin/clean.c:166

2963 +#: builtin/clean.c:167

2964 msgid "remove ignored files, too"

2965 msgstr ""

2966

2863 -#: builtin/clean.c:168

2967 +#: builtin/clean.c:169

2968 msgid "remove only ignored files"

2969 msgstr ""

2970

2867 -#: builtin/clean.c:186

2971 +#: builtin/clean.c:187

2972 msgid "-x and -X cannot be used together"

2973 msgstr ""

2974

2871 -#: builtin/clean.c:190

2975 +#: builtin/clean.c:191

2976 msgid ""

2977 "clean.requireForce set to true and neither -n nor -f given; refusing to clean"

2978 msgstr ""

2979

2876 -#: builtin/clean.c:193

2980 +#: builtin/clean.c:194

2981 msgid ""

2982 "clean.requireForce defaults to true and neither -n nor -f given; refusing to "

2983 "clean"

@@ -2884,7 +2988,7 @@ msgid "git clone [options] [--] <repo> [<dir>]"

2988 msgstr ""

2989

2990 #: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:212

2887 -#: builtin/push.c:407

2991 +#: builtin/push.c:436

2992 msgid "force progress reporting"

2993 msgstr ""

2994

@@ -2997,11 +3101,6 @@ msgstr ""

3101 msgid "failed to stat %s\n"

3102 msgstr ""

3103

3000 -#: builtin/clone.c:341

3001 -#, c-format

3002 -msgid "failed to unlink '%s'"

3003 -msgstr ""

3004 -

3104 #: builtin/clone.c:346

3105 #, c-format

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

@@ -3062,7 +3161,7 @@ msgstr ""

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

3162 msgstr ""

3163

3065 -#: builtin/clone.c:759 builtin/clone.c:773

3164 +#: builtin/clone.c:759 builtin/clone.c:771

3165 #, c-format

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

3167 msgstr ""

@@ -3072,27 +3171,27 @@ msgstr ""

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

3172 msgstr ""

3173

3075 -#: builtin/clone.c:783

3174 +#: builtin/clone.c:781

3175 #, c-format

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

3177 msgstr ""

3178

3080 -#: builtin/clone.c:785

3179 +#: builtin/clone.c:783

3180 #, c-format

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

3182 msgstr ""

3183

3085 -#: builtin/clone.c:827

3184 +#: builtin/clone.c:818

3185 #, c-format

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

3187 msgstr ""

3188

3090 -#: builtin/clone.c:876

3189 +#: builtin/clone.c:867

3190 #, c-format

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

3192 msgstr ""

3193

3095 -#: builtin/clone.c:883

3194 +#: builtin/clone.c:874

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

3196 msgstr ""

3197

@@ -3129,11 +3228,11 @@ msgid "--command must be the first argument"

3228 msgstr ""

3229

3230 #: builtin/commit.c:34

3132 -msgid "git commit [options] [--] <filepattern>..."

3231 +msgid "git commit [options] [--] <pathspec>..."

3232 msgstr ""

3233

3234 #: builtin/commit.c:39

3136 -msgid "git status [options] [--] <filepattern>..."

3235 +msgid "git status [options] [--] <pathspec>..."

3236 msgstr ""

3237

3238 #: builtin/commit.c:44

@@ -3274,15 +3373,17 @@ msgid ""

3373 msgstr ""

3374

3375 #: builtin/commit.c:735

3376 +#, c-format

3377 msgid ""

3378 "Please enter the commit message for your changes. Lines starting\n"

3279 -"with '#' will be ignored, and an empty message aborts the commit.\n"

3379 +"with '%c' will be ignored, and an empty message aborts the commit.\n"

3380 msgstr ""

3381

3382 #: builtin/commit.c:740

3383 +#, c-format

3384 msgid ""

3385 "Please enter the commit message for your changes. Lines starting\n"

3285 -"with '#' will be kept; you may remove them yourself if you want to.\n"

3386 +"with '%c' will be kept; you may remove them yourself if you want to.\n"

3387 "An empty message aborts the commit.\n"

3388 msgstr ""

3389

@@ -3304,7 +3405,7 @@ msgstr ""

3405 msgid "Error building trees"

3406 msgstr ""

3407

3307 -#: builtin/commit.c:832 builtin/tag.c:361

3408 +#: builtin/commit.c:832 builtin/tag.c:359

3409 #, c-format

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

3411 msgstr ""

@@ -3314,323 +3415,323 @@ msgstr ""

3415 msgid "No existing author found with '%s'"

3416 msgstr ""

3417

3317 -#: builtin/commit.c:944 builtin/commit.c:1148

3418 +#: builtin/commit.c:944 builtin/commit.c:1138

3419 #, c-format

3420 msgid "Invalid untracked files mode '%s'"

3421 msgstr ""

3422

3322 -#: builtin/commit.c:984

3423 +#: builtin/commit.c:974

3424 msgid "Using both --reset-author and --author does not make sense"

3425 msgstr ""

3426

3326 -#: builtin/commit.c:995

3427 +#: builtin/commit.c:985

3428 msgid "You have nothing to amend."

3429 msgstr ""

3430

3330 -#: builtin/commit.c:998

3431 +#: builtin/commit.c:988

3432 msgid "You are in the middle of a merge -- cannot amend."

3433 msgstr ""

3434

3334 -#: builtin/commit.c:1000

3435 +#: builtin/commit.c:990

3436 msgid "You are in the middle of a cherry-pick -- cannot amend."

3437 msgstr ""

3438

3338 -#: builtin/commit.c:1003

3439 +#: builtin/commit.c:993

3440 msgid "Options --squash and --fixup cannot be used together"

3441 msgstr ""

3442

3342 -#: builtin/commit.c:1013

3443 +#: builtin/commit.c:1003

3444 msgid "Only one of -c/-C/-F/--fixup can be used."

3445 msgstr ""

3446

3346 -#: builtin/commit.c:1015

3447 +#: builtin/commit.c:1005

3448 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."

3449 msgstr ""

3450

3350 -#: builtin/commit.c:1023

3451 +#: builtin/commit.c:1013

3452 msgid "--reset-author can be used only with -C, -c or --amend."

3453 msgstr ""

3454

3354 -#: builtin/commit.c:1040

3455 +#: builtin/commit.c:1030

3456 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."

3457 msgstr ""

3458

3358 -#: builtin/commit.c:1042

3459 +#: builtin/commit.c:1032

3460 msgid "No paths with --include/--only does not make sense."

3461 msgstr ""

3462

3362 -#: builtin/commit.c:1044

3463 +#: builtin/commit.c:1034

3464 msgid "Clever... amending the last one with dirty index."

3465 msgstr ""

3466

3366 -#: builtin/commit.c:1046

3467 +#: builtin/commit.c:1036

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

3469 msgstr ""

3470

3370 -#: builtin/commit.c:1056 builtin/tag.c:577

3471 +#: builtin/commit.c:1046 builtin/tag.c:575

3472 #, c-format

3473 msgid "Invalid cleanup mode %s"

3474 msgstr ""

3475

3375 -#: builtin/commit.c:1061

3476 +#: builtin/commit.c:1051

3477 msgid "Paths with -a does not make sense."

3478 msgstr ""

3479

3379 -#: builtin/commit.c:1067 builtin/commit.c:1202

3480 +#: builtin/commit.c:1057 builtin/commit.c:1192

3481 msgid "--long and -z are incompatible"

3482 msgstr ""

3483

3383 -#: builtin/commit.c:1162 builtin/commit.c:1400

3484 +#: builtin/commit.c:1152 builtin/commit.c:1388

3485 msgid "show status concisely"

3486 msgstr ""

3487

3387 -#: builtin/commit.c:1164 builtin/commit.c:1402

3488 +#: builtin/commit.c:1154 builtin/commit.c:1390

3489 msgid "show branch information"

3490 msgstr ""

3491

3391 -#: builtin/commit.c:1166 builtin/commit.c:1404 builtin/push.c:397

3492 +#: builtin/commit.c:1156 builtin/commit.c:1392 builtin/push.c:426

3493 msgid "machine-readable output"

3494 msgstr ""

3495

3395 -#: builtin/commit.c:1169 builtin/commit.c:1406

3496 +#: builtin/commit.c:1159 builtin/commit.c:1394

3497 msgid "show status in long format (default)"

3498 msgstr ""

3499

3399 -#: builtin/commit.c:1172 builtin/commit.c:1409

3500 +#: builtin/commit.c:1162 builtin/commit.c:1397

3501 msgid "terminate entries with NUL"

3502 msgstr ""

3503

3403 -#: builtin/commit.c:1174 builtin/commit.c:1412 builtin/fast-export.c:647

3404 -#: builtin/fast-export.c:650 builtin/tag.c:461

3504 +#: builtin/commit.c:1164 builtin/commit.c:1400 builtin/fast-export.c:647

3505 +#: builtin/fast-export.c:650 builtin/tag.c:459

3506 msgid "mode"

3507 msgstr ""

3508

3408 -#: builtin/commit.c:1175 builtin/commit.c:1412

3509 +#: builtin/commit.c:1165 builtin/commit.c:1400

3510 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"

3511 msgstr ""

3512

3412 -#: builtin/commit.c:1178

3513 +#: builtin/commit.c:1168

3514 msgid "show ignored files"

3515 msgstr ""

3516

3416 -#: builtin/commit.c:1179 parse-options.h:151

3517 +#: builtin/commit.c:1169 parse-options.h:151

3518 msgid "when"

3519 msgstr ""

3520

3420 -#: builtin/commit.c:1180

3521 +#: builtin/commit.c:1170

3522 msgid ""

3523 "ignore changes to submodules, optional when: all, dirty, untracked. "

3524 "(Default: all)"

3525 msgstr ""

3526

3426 -#: builtin/commit.c:1182

3527 +#: builtin/commit.c:1172

3528 msgid "list untracked files in columns"

3529 msgstr ""

3530

3430 -#: builtin/commit.c:1256

3531 +#: builtin/commit.c:1246

3532 msgid "couldn't look up newly created commit"

3533 msgstr ""

3534

3434 -#: builtin/commit.c:1258

3535 +#: builtin/commit.c:1248

3536 msgid "could not parse newly created commit"

3537 msgstr ""

3538

3438 -#: builtin/commit.c:1299

3539 +#: builtin/commit.c:1289

3540 msgid "detached HEAD"

3541 msgstr ""

3542

3442 -#: builtin/commit.c:1301

3543 +#: builtin/commit.c:1291

3544 msgid " (root-commit)"

3545 msgstr ""

3546

3446 -#: builtin/commit.c:1370

3547 +#: builtin/commit.c:1358

3548 msgid "suppress summary after successful commit"

3549 msgstr ""

3550

3450 -#: builtin/commit.c:1371

3551 +#: builtin/commit.c:1359

3552 msgid "show diff in commit message template"

3553 msgstr ""

3554

3454 -#: builtin/commit.c:1373

3555 +#: builtin/commit.c:1361

3556 msgid "Commit message options"

3557 msgstr ""

3558

3458 -#: builtin/commit.c:1374 builtin/tag.c:459

3559 +#: builtin/commit.c:1362 builtin/tag.c:457

3560 msgid "read message from file"

3561 msgstr ""

3562

3462 -#: builtin/commit.c:1375

3563 +#: builtin/commit.c:1363

3564 msgid "author"

3565 msgstr ""

3566

3466 -#: builtin/commit.c:1375

3567 +#: builtin/commit.c:1363

3568 msgid "override author for commit"

3569 msgstr ""

3570

3470 -#: builtin/commit.c:1376 builtin/gc.c:178

3571 +#: builtin/commit.c:1364 builtin/gc.c:178

3572 msgid "date"

3573 msgstr ""

3574

3474 -#: builtin/commit.c:1376

3575 +#: builtin/commit.c:1364

3576 msgid "override date for commit"

3577 msgstr ""

3578

3478 -#: builtin/commit.c:1377 builtin/merge.c:206 builtin/notes.c:537

3479 -#: builtin/notes.c:694 builtin/tag.c:457

3579 +#: builtin/commit.c:1365 builtin/merge.c:206 builtin/notes.c:533

3580 +#: builtin/notes.c:690 builtin/tag.c:455

3581 msgid "message"

3582 msgstr ""

3583

3483 -#: builtin/commit.c:1377

3584 +#: builtin/commit.c:1365

3585 msgid "commit message"

3586 msgstr ""

3587

3487 -#: builtin/commit.c:1378

3588 +#: builtin/commit.c:1366

3589 msgid "reuse and edit message from specified commit"

3590 msgstr ""

3591

3491 -#: builtin/commit.c:1379

3592 +#: builtin/commit.c:1367

3593 msgid "reuse message from specified commit"

3594 msgstr ""

3595

3495 -#: builtin/commit.c:1380

3596 +#: builtin/commit.c:1368

3597 msgid "use autosquash formatted message to fixup specified commit"

3598 msgstr ""

3599

3499 -#: builtin/commit.c:1381

3600 +#: builtin/commit.c:1369

3601 msgid "use autosquash formatted message to squash specified commit"

3602 msgstr ""

3603

3503 -#: builtin/commit.c:1382

3604 +#: builtin/commit.c:1370

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

3606 msgstr ""

3607

3507 -#: builtin/commit.c:1383 builtin/log.c:1102 builtin/revert.c:109

3608 +#: builtin/commit.c:1371 builtin/log.c:1102 builtin/revert.c:109

3609 msgid "add Signed-off-by:"

3610 msgstr ""

3611

3511 -#: builtin/commit.c:1384

3612 +#: builtin/commit.c:1372

3613 msgid "use specified template file"

3614 msgstr ""

3615

3515 -#: builtin/commit.c:1385

3616 +#: builtin/commit.c:1373

3617 msgid "force edit of commit"

3618 msgstr ""

3619

3519 -#: builtin/commit.c:1386

3620 +#: builtin/commit.c:1374

3621 msgid "default"

3622 msgstr ""

3623

3523 -#: builtin/commit.c:1386 builtin/tag.c:462

3624 +#: builtin/commit.c:1374 builtin/tag.c:460

3625 msgid "how to strip spaces and #comments from message"

3626 msgstr ""

3627

3527 -#: builtin/commit.c:1387

3628 +#: builtin/commit.c:1375

3629 msgid "include status in commit message template"

3630 msgstr ""

3631

3531 -#: builtin/commit.c:1388 builtin/merge.c:213 builtin/tag.c:463

3632 +#: builtin/commit.c:1376 builtin/merge.c:213 builtin/tag.c:461

3633 msgid "key id"

3634 msgstr ""

3635

3535 -#: builtin/commit.c:1389 builtin/merge.c:214

3636 +#: builtin/commit.c:1377 builtin/merge.c:214

3637 msgid "GPG sign commit"

3638 msgstr ""

3639

3640 #. end commit message options

3540 -#: builtin/commit.c:1392

3641 +#: builtin/commit.c:1380

3642 msgid "Commit contents options"

3643 msgstr ""

3644

3544 -#: builtin/commit.c:1393

3645 +#: builtin/commit.c:1381

3646 msgid "commit all changed files"

3647 msgstr ""

3648

3548 -#: builtin/commit.c:1394

3649 +#: builtin/commit.c:1382

3650 msgid "add specified files to index for commit"

3651 msgstr ""

3652

3552 -#: builtin/commit.c:1395

3653 +#: builtin/commit.c:1383

3654 msgid "interactively add files"

3655 msgstr ""

3656

3556 -#: builtin/commit.c:1396

3657 +#: builtin/commit.c:1384

3658 msgid "interactively add changes"

3659 msgstr ""

3660

3560 -#: builtin/commit.c:1397

3661 +#: builtin/commit.c:1385

3662 msgid "commit only specified files"

3663 msgstr ""

3664

3564 -#: builtin/commit.c:1398

3665 +#: builtin/commit.c:1386

3666 msgid "bypass pre-commit hook"

3667 msgstr ""

3668

3568 -#: builtin/commit.c:1399

3669 +#: builtin/commit.c:1387

3670 msgid "show what would be committed"

3671 msgstr ""

3672

3572 -#: builtin/commit.c:1410

3673 +#: builtin/commit.c:1398

3674 msgid "amend previous commit"

3675 msgstr ""

3676

3576 -#: builtin/commit.c:1411

3677 +#: builtin/commit.c:1399

3678 msgid "bypass post-rewrite hook"

3679 msgstr ""

3680

3580 -#: builtin/commit.c:1416

3681 +#: builtin/commit.c:1404

3682 msgid "ok to record an empty change"

3683 msgstr ""

3684

3584 -#: builtin/commit.c:1419

3685 +#: builtin/commit.c:1407

3686 msgid "ok to record a change with an empty message"

3687 msgstr ""

3688

3588 -#: builtin/commit.c:1451

3689 +#: builtin/commit.c:1439

3690 msgid "could not parse HEAD commit"

3691 msgstr ""

3692

3592 -#: builtin/commit.c:1489 builtin/merge.c:508

3693 +#: builtin/commit.c:1477 builtin/merge.c:508

3694 #, c-format

3695 msgid "could not open '%s' for reading"

3696 msgstr ""

3697

3597 -#: builtin/commit.c:1496

3698 +#: builtin/commit.c:1484

3699 #, c-format

3700 msgid "Corrupt MERGE_HEAD file (%s)"

3701 msgstr ""

3702

3602 -#: builtin/commit.c:1503

3703 +#: builtin/commit.c:1491

3704 msgid "could not read MERGE_MODE"

3705 msgstr ""

3706

3606 -#: builtin/commit.c:1522

3707 +#: builtin/commit.c:1510

3708 #, c-format

3709 msgid "could not read commit message: %s"

3710 msgstr ""

3711

3611 -#: builtin/commit.c:1536

3712 +#: builtin/commit.c:1524

3713 #, c-format

3714 msgid "Aborting commit; you did not edit the message.\n"

3715 msgstr ""

3716

3616 -#: builtin/commit.c:1541

3717 +#: builtin/commit.c:1529

3718 #, c-format

3719 msgid "Aborting commit due to empty commit message.\n"

3720 msgstr ""

3721

3621 -#: builtin/commit.c:1556 builtin/merge.c:833 builtin/merge.c:858

3722 +#: builtin/commit.c:1544 builtin/merge.c:832 builtin/merge.c:857

3723 msgid "failed to write commit object"

3724 msgstr ""

3725

3625 -#: builtin/commit.c:1577

3726 +#: builtin/commit.c:1565

3727 msgid "cannot lock HEAD ref"

3728 msgstr ""

3729

3629 -#: builtin/commit.c:1581

3730 +#: builtin/commit.c:1569

3731 msgid "cannot update HEAD ref"

3732 msgstr ""

3733

3633 -#: builtin/commit.c:1592

3734 +#: builtin/commit.c:1580

3735 msgid ""

3736 "Repository has been updated, but unable to write\n"

3737 "new_index file. Check that disk is not full or quota is\n"

@@ -4029,166 +4130,178 @@ msgstr ""

4130 msgid "deepen history of shallow clone"

4131 msgstr ""

4132

4032 -#: builtin/fetch.c:85 builtin/log.c:1119

4133 +#: builtin/fetch.c:86

4134 +msgid "convert to a complete repository"

4135 +msgstr ""

4136 +

4137 +#: builtin/fetch.c:88 builtin/log.c:1119

4138 msgid "dir"

4139 msgstr ""

4140

4036 -#: builtin/fetch.c:86

4141 +#: builtin/fetch.c:89

4142 msgid "prepend this to submodule path output"

4143 msgstr ""

4144

4040 -#: builtin/fetch.c:89

4145 +#: builtin/fetch.c:92

4146 msgid "default mode for recursion"

4147 msgstr ""

4148

4044 -#: builtin/fetch.c:201

4149 +#: builtin/fetch.c:204

4150 msgid "Couldn't find remote ref HEAD"

4151 msgstr ""

4152

4048 -#: builtin/fetch.c:254

4153 +#: builtin/fetch.c:257

4154 #, c-format

4155 msgid "object %s not found"

4156 msgstr ""

4157

4053 -#: builtin/fetch.c:259

4158 +#: builtin/fetch.c:262

4159 msgid "[up to date]"

4160 msgstr ""

4161

4057 -#: builtin/fetch.c:273

4162 +#: builtin/fetch.c:276

4163 #, c-format

4164 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"

4165 msgstr ""

4166

4062 -#: builtin/fetch.c:274 builtin/fetch.c:360

4167 +#: builtin/fetch.c:277 builtin/fetch.c:363

4168 msgid "[rejected]"

4169 msgstr ""

4170

4066 -#: builtin/fetch.c:285

4171 +#: builtin/fetch.c:288

4172 msgid "[tag update]"

4173 msgstr ""

4174

4070 -#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340

4175 +#: builtin/fetch.c:290 builtin/fetch.c:325 builtin/fetch.c:343

4176 msgid " (unable to update local ref)"

4177 msgstr ""

4178

4074 -#: builtin/fetch.c:305

4179 +#: builtin/fetch.c:308

4180 msgid "[new tag]"

4181 msgstr ""

4182

4078 -#: builtin/fetch.c:308

4183 +#: builtin/fetch.c:311

4184 msgid "[new branch]"

4185 msgstr ""

4186

4082 -#: builtin/fetch.c:311

4187 +#: builtin/fetch.c:314

4188 msgid "[new ref]"

4189 msgstr ""

4190

4086 -#: builtin/fetch.c:356

4191 +#: builtin/fetch.c:359

4192 msgid "unable to update local ref"

4193 msgstr ""

4194

4090 -#: builtin/fetch.c:356

4195 +#: builtin/fetch.c:359

4196 msgid "forced update"

4197 msgstr ""

4198

4094 -#: builtin/fetch.c:362

4199 +#: builtin/fetch.c:365

4200 msgid "(non-fast-forward)"

4201 msgstr ""

4202

4098 -#: builtin/fetch.c:393 builtin/fetch.c:685

4203 +#: builtin/fetch.c:396 builtin/fetch.c:688

4204 #, c-format

4205 msgid "cannot open %s: %s\n"

4206 msgstr ""

4207

4103 -#: builtin/fetch.c:402

4208 +#: builtin/fetch.c:405

4209 #, c-format

4210 msgid "%s did not send all necessary objects\n"

4211 msgstr ""

4212

4108 -#: builtin/fetch.c:488

4213 +#: builtin/fetch.c:491

4214 #, c-format

4215 msgid "From %.*s\n"

4216 msgstr ""

4217

4113 -#: builtin/fetch.c:499

4218 +#: builtin/fetch.c:502

4219 #, c-format

4220 msgid ""

4221 "some local refs could not be updated; try running\n"

4222 " 'git remote prune %s' to remove any old, conflicting branches"

4223 msgstr ""

4224

4120 -#: builtin/fetch.c:549

4225 +#: builtin/fetch.c:552

4226 #, c-format

4227 msgid " (%s will become dangling)"

4228 msgstr ""

4229

4125 -#: builtin/fetch.c:550

4230 +#: builtin/fetch.c:553

4231 #, c-format

4232 msgid " (%s has become dangling)"

4233 msgstr ""

4234

4130 -#: builtin/fetch.c:557

4235 +#: builtin/fetch.c:560

4236 msgid "[deleted]"

4237 msgstr ""

4238

4134 -#: builtin/fetch.c:558 builtin/remote.c:1055

4239 +#: builtin/fetch.c:561 builtin/remote.c:1055

4240 msgid "(none)"

4241 msgstr ""

4242

4138 -#: builtin/fetch.c:675

4243 +#: builtin/fetch.c:678

4244 #, c-format

4245 msgid "Refusing to fetch into current branch %s of non-bare repository"

4246 msgstr ""

4247

4143 -#: builtin/fetch.c:709

4248 +#: builtin/fetch.c:712

4249 #, c-format

4250 msgid "Don't know how to fetch from %s"

4251 msgstr ""

4252

4148 -#: builtin/fetch.c:786

4253 +#: builtin/fetch.c:789

4254 #, c-format

4255 msgid "Option \"%s\" value \"%s\" is not valid for %s"

4256 msgstr ""

4257

4153 -#: builtin/fetch.c:789

4258 +#: builtin/fetch.c:792

4259 #, c-format

4260 msgid "Option \"%s\" is ignored for %s\n"

4261 msgstr ""

4262

4158 -#: builtin/fetch.c:891

4263 +#: builtin/fetch.c:894

4264 #, c-format

4265 msgid "Fetching %s\n"

4266 msgstr ""

4267

4163 -#: builtin/fetch.c:893 builtin/remote.c:100

4268 +#: builtin/fetch.c:896 builtin/remote.c:100

4269 #, c-format

4270 msgid "Could not fetch %s"

4271 msgstr ""

4272

4168 -#: builtin/fetch.c:912

4273 +#: builtin/fetch.c:915

4274 msgid ""

4275 "No remote repository specified. Please, specify either a URL or a\n"

4276 "remote name from which new revisions should be fetched."

4277 msgstr ""

4278

4174 -#: builtin/fetch.c:932

4279 +#: builtin/fetch.c:935

4280 msgid "You need to specify a tag name."

4281 msgstr ""

4282

4178 -#: builtin/fetch.c:984

4283 +#: builtin/fetch.c:981

4284 +msgid "--depth and --unshallow cannot be used together"

4285 +msgstr ""

4286 +

4287 +#: builtin/fetch.c:983

4288 +msgid "--unshallow on a complete repository does not make sense"

4289 +msgstr ""

4290 +

4291 +#: builtin/fetch.c:1002

4292 msgid "fetch --all does not take a repository argument"

4293 msgstr ""

4294

4182 -#: builtin/fetch.c:986

4295 +#: builtin/fetch.c:1004

4296 msgid "fetch --all does not make sense with refspecs"

4297 msgstr ""

4298

4186 -#: builtin/fetch.c:997

4299 +#: builtin/fetch.c:1015

4300 #, c-format

4301 msgid "No such remote or remote group: %s"

4302 msgstr ""

4303

4191 -#: builtin/fetch.c:1005

4304 +#: builtin/fetch.c:1023

4305 msgid "Fetching a group and specifying refspecs does not make sense"

4306 msgstr ""

4307

@@ -4198,7 +4311,7 @@ msgstr ""

4311

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

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

4201 -#: builtin/tag.c:448 parse-options.h:133 parse-options.h:239

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

4315 msgid "n"

4316 msgstr ""

4317

@@ -4555,23 +4668,23 @@ msgstr ""

4668 msgid "bad object %s"

4669 msgstr ""

4670

4558 -#: builtin/grep.c:866

4671 +#: builtin/grep.c:868

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

4673 msgstr ""

4674

4562 -#: builtin/grep.c:889

4675 +#: builtin/grep.c:891

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

4677 msgstr ""

4678

4566 -#: builtin/grep.c:894

4679 +#: builtin/grep.c:896

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

4681 msgstr ""

4682

4570 -#: builtin/grep.c:897

4683 +#: builtin/grep.c:899

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

4685 msgstr ""

4686

4574 -#: builtin/grep.c:905

4687 +#: builtin/grep.c:907

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

4689 msgstr ""

4690

@@ -4609,86 +4722,82 @@ msgstr ""

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

4723 msgstr ""

4724

4612 -#: builtin/help.c:43

4725 +#: builtin/help.c:42

4726 msgid "print all available commands"

4727 msgstr ""

4728

4616 -#: builtin/help.c:44

4729 +#: builtin/help.c:43

4730 msgid "show man page"

4731 msgstr ""

4732

4620 -#: builtin/help.c:45

4733 +#: builtin/help.c:44

4734 msgid "show manual in web browser"

4735 msgstr ""

4736

4624 -#: builtin/help.c:47

4737 +#: builtin/help.c:46

4738 msgid "show info page"

4739 msgstr ""

4740

4628 -#: builtin/help.c:53

4741 +#: builtin/help.c:52

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

4743 msgstr ""

4744

4632 -#: builtin/help.c:65

4745 +#: builtin/help.c:64

4746 #, c-format

4747 msgid "unrecognized help format '%s'"

4748 msgstr ""

4749

4637 -#: builtin/help.c:93

4750 +#: builtin/help.c:92

4751 msgid "Failed to start emacsclient."

4752 msgstr ""

4753

4641 -#: builtin/help.c:106

4754 +#: builtin/help.c:105

4755 msgid "Failed to parse emacsclient version."

4756 msgstr ""

4757

4645 -#: builtin/help.c:114

4758 +#: builtin/help.c:113

4759 #, c-format

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

4761 msgstr ""

4762

4650 -#: builtin/help.c:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177

4763 +#: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176

4764 #, c-format

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

4766 msgstr ""

4767

4655 -#: builtin/help.c:217

4768 +#: builtin/help.c:216

4769 #, c-format

4770 msgid ""

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

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

4773 msgstr ""

4774

4662 -#: builtin/help.c:229

4775 +#: builtin/help.c:228

4776 #, c-format

4777 msgid ""

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

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

4780 msgstr ""

4781

4669 -#: builtin/help.c:299

4670 -msgid "The most commonly used git commands are:"

4671 -msgstr ""

4672 -

4673 -#: builtin/help.c:367

4782 +#: builtin/help.c:349

4783 #, c-format

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

4785 msgstr ""

4786

4678 -#: builtin/help.c:384

4787 +#: builtin/help.c:366

4788 msgid "no man viewer handled the request"

4789 msgstr ""

4790

4682 -#: builtin/help.c:392

4791 +#: builtin/help.c:374

4792 msgid "no info viewer handled the request"

4793 msgstr ""

4794

4686 -#: builtin/help.c:447 builtin/help.c:454

4795 +#: builtin/help.c:429 builtin/help.c:436

4796 #, c-format

4797 msgid "usage: %s%s"

4798 msgstr ""

4799

4691 -#: builtin/help.c:470

4800 +#: builtin/help.c:452

4801 #, c-format

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

4803 msgstr ""

@@ -5088,8 +5197,8 @@ msgstr ""

5197

5198 #: builtin/init-db.c:467

5199 msgid ""

5091 -"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared"

5092 -"[=<permissions>]] [directory]"

5200 +"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"

5201 +"shared[=<permissions>]] [directory]"

5202 msgstr ""

5203

5204 #: builtin/init-db.c:490

@@ -5380,95 +5489,95 @@ msgstr ""

5489 msgid "Unknown commit %s"

5490 msgstr ""

5491

5383 -#: builtin/ls-files.c:408

5492 +#: builtin/ls-files.c:409

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

5494 msgstr ""

5495

5387 -#: builtin/ls-files.c:463

5496 +#: builtin/ls-files.c:466

5497 msgid "identify the file status with tags"

5498 msgstr ""

5499

5391 -#: builtin/ls-files.c:465

5500 +#: builtin/ls-files.c:468

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

5502 msgstr ""

5503

5395 -#: builtin/ls-files.c:467

5504 +#: builtin/ls-files.c:470

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

5506 msgstr ""

5507

5399 -#: builtin/ls-files.c:469

5508 +#: builtin/ls-files.c:472

5509 msgid "show deleted files in the output"

5510 msgstr ""

5511

5403 -#: builtin/ls-files.c:471

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

5513 msgid "show modified files in the output"

5514 msgstr ""

5515

5407 -#: builtin/ls-files.c:473

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

5517 msgid "show other files in the output"

5518 msgstr ""

5519

5411 -#: builtin/ls-files.c:475

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

5521 msgid "show ignored files in the output"

5522 msgstr ""

5523

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

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

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

5526 msgstr ""

5527

5419 -#: builtin/ls-files.c:480

5528 +#: builtin/ls-files.c:483

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

5530 msgstr ""

5531

5423 -#: builtin/ls-files.c:482

5532 +#: builtin/ls-files.c:485

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

5534 msgstr ""

5535

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

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

5537 msgid "don't show empty directories"

5538 msgstr ""

5539

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

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

5541 msgid "show unmerged files in the output"

5542 msgstr ""

5543

5435 -#: builtin/ls-files.c:490

5544 +#: builtin/ls-files.c:493

5545 msgid "show resolve-undo information"

5546 msgstr ""

5547

5439 -#: builtin/ls-files.c:492

5548 +#: builtin/ls-files.c:495

5549 msgid "skip files matching pattern"

5550 msgstr ""

5551

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

5552 +#: builtin/ls-files.c:498

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

5554 msgstr ""

5555

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

5556 +#: builtin/ls-files.c:501

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

5558 msgstr ""

5559

5451 -#: builtin/ls-files.c:500

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

5561 msgid "add the standard git exclusions"

5562 msgstr ""

5563

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

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

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

5566 msgstr ""

5567

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

5568 +#: builtin/ls-files.c:509

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

5570 msgstr ""

5571

5463 -#: builtin/ls-files.c:507

5572 +#: builtin/ls-files.c:510

5573 msgid "tree-ish"

5574 msgstr ""

5575

5467 -#: builtin/ls-files.c:508

5576 +#: builtin/ls-files.c:511

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

5578 msgstr ""

5579

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

5580 +#: builtin/ls-files.c:513

5581 msgid "show debugging data"

5582 msgstr ""

5583

@@ -5575,7 +5684,7 @@ msgstr ""

5684 msgid "abort if fast-forward is not possible"

5685 msgstr ""

5686

5578 -#: builtin/merge.c:202 builtin/notes.c:870 builtin/revert.c:112

5687 +#: builtin/merge.c:202 builtin/notes.c:866 builtin/revert.c:112

5688 msgid "strategy"

5689 msgstr ""

5690

@@ -5677,148 +5786,149 @@ msgid "Not committing merge; use 'git commit' to complete the merge.\n"

5786 msgstr ""

5787

5788 #: builtin/merge.c:788

5789 +#, c-format

5790 msgid ""

5791 "Please enter a commit message to explain why this merge is necessary,\n"

5792 "especially if it merges an updated upstream into a topic branch.\n"

5793 "\n"

5684 -"Lines starting with '#' will be ignored, and an empty message aborts\n"

5794 +"Lines starting with '%c' will be ignored, and an empty message aborts\n"

5795 "the commit.\n"

5796 msgstr ""

5797

5688 -#: builtin/merge.c:813

5798 +#: builtin/merge.c:812

5799 msgid "Empty commit message."

5800 msgstr ""

5801

5692 -#: builtin/merge.c:825

5802 +#: builtin/merge.c:824

5803 #, c-format

5804 msgid "Wonderful.\n"

5805 msgstr ""

5806

5697 -#: builtin/merge.c:890

5807 +#: builtin/merge.c:889

5808 #, c-format

5809 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"

5810 msgstr ""

5811

5702 -#: builtin/merge.c:906

5812 +#: builtin/merge.c:905

5813 #, c-format

5814 msgid "'%s' is not a commit"

5815 msgstr ""

5816

5707 -#: builtin/merge.c:947

5817 +#: builtin/merge.c:946

5818 msgid "No current branch."

5819 msgstr ""

5820

5711 -#: builtin/merge.c:949

5821 +#: builtin/merge.c:948

5822 msgid "No remote for the current branch."

5823 msgstr ""

5824

5715 -#: builtin/merge.c:951

5825 +#: builtin/merge.c:950

5826 msgid "No default upstream defined for the current branch."

5827 msgstr ""

5828

5719 -#: builtin/merge.c:956

5829 +#: builtin/merge.c:955

5830 #, c-format

5831 msgid "No remote tracking branch for %s from %s"

5832 msgstr ""

5833

5724 -#: builtin/merge.c:1043 builtin/merge.c:1200

5834 +#: builtin/merge.c:1042 builtin/merge.c:1199

5835 #, c-format

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

5837 msgstr ""

5838

5729 -#: builtin/merge.c:1111

5839 +#: builtin/merge.c:1110

5840 msgid "There is no merge to abort (MERGE_HEAD missing)."

5841 msgstr ""

5842

5733 -#: builtin/merge.c:1127 git-pull.sh:31

5843 +#: builtin/merge.c:1126 git-pull.sh:31

5844 msgid ""

5845 "You have not concluded your merge (MERGE_HEAD exists).\n"

5846 "Please, commit your changes before you can merge."

5847 msgstr ""

5848

5739 -#: builtin/merge.c:1130 git-pull.sh:34

5849 +#: builtin/merge.c:1129 git-pull.sh:34

5850 msgid "You have not concluded your merge (MERGE_HEAD exists)."

5851 msgstr ""

5852

5743 -#: builtin/merge.c:1134

5853 +#: builtin/merge.c:1133

5854 msgid ""

5855 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"

5856 "Please, commit your changes before you can merge."

5857 msgstr ""

5858

5749 -#: builtin/merge.c:1137

5859 +#: builtin/merge.c:1136

5860 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."

5861 msgstr ""

5862

5753 -#: builtin/merge.c:1146

5863 +#: builtin/merge.c:1145

5864 msgid "You cannot combine --squash with --no-ff."

5865 msgstr ""

5866

5757 -#: builtin/merge.c:1151

5867 +#: builtin/merge.c:1150

5868 msgid "You cannot combine --no-ff with --ff-only."

5869 msgstr ""

5870

5761 -#: builtin/merge.c:1158

5871 +#: builtin/merge.c:1157

5872 msgid "No commit specified and merge.defaultToUpstream not set."

5873 msgstr ""

5874

5765 -#: builtin/merge.c:1190

5875 +#: builtin/merge.c:1189

5876 msgid "Can merge only exactly one commit into empty head"

5877 msgstr ""

5878

5769 -#: builtin/merge.c:1193

5879 +#: builtin/merge.c:1192

5880 msgid "Squash commit into empty head not supported yet"

5881 msgstr ""

5882

5773 -#: builtin/merge.c:1195

5883 +#: builtin/merge.c:1194

5884 msgid "Non-fast-forward commit does not make sense into an empty head"

5885 msgstr ""

5886

5777 -#: builtin/merge.c:1311

5887 +#: builtin/merge.c:1310

5888 #, c-format

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

5890 msgstr ""

5891

5782 -#: builtin/merge.c:1350

5892 +#: builtin/merge.c:1349

5893 #, c-format

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

5895 msgstr ""

5896

5787 -#: builtin/merge.c:1357

5897 +#: builtin/merge.c:1356

5898 #, c-format

5899 msgid "Nope.\n"

5900 msgstr ""

5901

5792 -#: builtin/merge.c:1389

5902 +#: builtin/merge.c:1388

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

5904 msgstr ""

5905

5796 -#: builtin/merge.c:1412 builtin/merge.c:1491

5906 +#: builtin/merge.c:1411 builtin/merge.c:1490

5907 #, c-format

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

5909 msgstr ""

5910

5801 -#: builtin/merge.c:1416

5911 +#: builtin/merge.c:1415

5912 #, c-format

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

5914 msgstr ""

5915

5806 -#: builtin/merge.c:1482

5916 +#: builtin/merge.c:1481

5917 #, c-format

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

5919 msgstr ""

5920

5811 -#: builtin/merge.c:1484

5921 +#: builtin/merge.c:1483

5922 #, c-format

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

5924 msgstr ""

5925

5816 -#: builtin/merge.c:1493

5926 +#: builtin/merge.c:1492

5927 #, c-format

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

5929 msgstr ""

5930

5821 -#: builtin/merge.c:1505

5931 +#: builtin/merge.c:1504

5932 #, c-format

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

5934 msgstr ""

@@ -6124,233 +6234,228 @@ msgstr ""

6234 msgid "git notes get-ref"

6235 msgstr ""

6236

6127 -#: builtin/notes.c:142

6237 +#: builtin/notes.c:139

6238 #, c-format

6239 msgid "unable to start 'show' for object '%s'"

6240 msgstr ""

6241

6132 -#: builtin/notes.c:148

6133 -msgid "can't fdopen 'show' output fd"

6134 -msgstr ""

6135 -

6136 -#: builtin/notes.c:158

6137 -#, c-format

6138 -msgid "failed to close pipe to 'show' for object '%s'"

6242 +#: builtin/notes.c:143

6243 +msgid "could not read 'show' output"

6244 msgstr ""

6245

6141 -#: builtin/notes.c:161

6246 +#: builtin/notes.c:151

6247 #, c-format

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

6249 msgstr ""

6250

6146 -#: builtin/notes.c:178 builtin/tag.c:347

6251 +#: builtin/notes.c:169 builtin/tag.c:341

6252 #, c-format

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

6254 msgstr ""

6255

6151 -#: builtin/notes.c:192

6256 +#: builtin/notes.c:188

6257 msgid "Please supply the note contents using either -m or -F option"

6258 msgstr ""

6259

6155 -#: builtin/notes.c:213 builtin/notes.c:976

6260 +#: builtin/notes.c:209 builtin/notes.c:972

6261 #, c-format

6262 msgid "Removing note for object %s\n"

6263 msgstr ""

6264

6160 -#: builtin/notes.c:218

6265 +#: builtin/notes.c:214

6266 msgid "unable to write note object"

6267 msgstr ""

6268

6164 -#: builtin/notes.c:220

6269 +#: builtin/notes.c:216

6270 #, c-format

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

6272 msgstr ""

6273

6169 -#: builtin/notes.c:254 builtin/tag.c:542

6274 +#: builtin/notes.c:250 builtin/tag.c:540

6275 #, c-format

6276 msgid "cannot read '%s'"

6277 msgstr ""

6278

6174 -#: builtin/notes.c:256 builtin/tag.c:545

6279 +#: builtin/notes.c:252 builtin/tag.c:543

6280 #, c-format

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

6282 msgstr ""

6283

6179 -#: builtin/notes.c:275 builtin/notes.c:448 builtin/notes.c:450

6180 -#: builtin/notes.c:510 builtin/notes.c:564 builtin/notes.c:647

6181 -#: builtin/notes.c:652 builtin/notes.c:727 builtin/notes.c:769

6182 -#: builtin/notes.c:971 builtin/tag.c:558

6284 +#: builtin/notes.c:271 builtin/notes.c:444 builtin/notes.c:446

6285 +#: builtin/notes.c:506 builtin/notes.c:560 builtin/notes.c:643

6286 +#: builtin/notes.c:648 builtin/notes.c:723 builtin/notes.c:765

6287 +#: builtin/notes.c:967 builtin/tag.c:556

6288 #, c-format

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

6290 msgstr ""

6291

6187 -#: builtin/notes.c:278

6292 +#: builtin/notes.c:274

6293 #, c-format

6294 msgid "Failed to read object '%s'."

6295 msgstr ""

6296

6192 -#: builtin/notes.c:302

6297 +#: builtin/notes.c:298

6298 msgid "Cannot commit uninitialized/unreferenced notes tree"

6299 msgstr ""

6300

6196 -#: builtin/notes.c:343

6301 +#: builtin/notes.c:339

6302 #, c-format

6303 msgid "Bad notes.rewriteMode value: '%s'"

6304 msgstr ""

6305

6201 -#: builtin/notes.c:353

6306 +#: builtin/notes.c:349

6307 #, c-format

6308 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"

6309 msgstr ""

6310

6311 #. TRANSLATORS: The first %s is the name of the

6312 #. environment variable, the second %s is its value

6208 -#: builtin/notes.c:380

6313 +#: builtin/notes.c:376

6314 #, c-format

6315 msgid "Bad %s value: '%s'"

6316 msgstr ""

6317

6213 -#: builtin/notes.c:444

6318 +#: builtin/notes.c:440

6319 #, c-format

6320 msgid "Malformed input line: '%s'."

6321 msgstr ""

6322

6218 -#: builtin/notes.c:459

6323 +#: builtin/notes.c:455

6324 #, c-format

6325 msgid "Failed to copy notes from '%s' to '%s'"

6326 msgstr ""

6327

6223 -#: builtin/notes.c:503 builtin/notes.c:557 builtin/notes.c:630

6224 -#: builtin/notes.c:642 builtin/notes.c:715 builtin/notes.c:762

6225 -#: builtin/notes.c:1036

6328 +#: builtin/notes.c:499 builtin/notes.c:553 builtin/notes.c:626

6329 +#: builtin/notes.c:638 builtin/notes.c:711 builtin/notes.c:758

6330 +#: builtin/notes.c:1032

6331 msgid "too many parameters"

6332 msgstr ""

6333

6229 -#: builtin/notes.c:516 builtin/notes.c:775

6334 +#: builtin/notes.c:512 builtin/notes.c:771

6335 #, c-format

6336 msgid "No note found for object %s."

6337 msgstr ""

6338

6234 -#: builtin/notes.c:538 builtin/notes.c:695

6339 +#: builtin/notes.c:534 builtin/notes.c:691

6340 msgid "note contents as a string"

6341 msgstr ""

6342

6238 -#: builtin/notes.c:541 builtin/notes.c:698

6343 +#: builtin/notes.c:537 builtin/notes.c:694

6344 msgid "note contents in a file"

6345 msgstr ""

6346

6242 -#: builtin/notes.c:543 builtin/notes.c:546 builtin/notes.c:700

6243 -#: builtin/notes.c:703 builtin/tag.c:476

6347 +#: builtin/notes.c:539 builtin/notes.c:542 builtin/notes.c:696

6348 +#: builtin/notes.c:699 builtin/tag.c:474

6349 msgid "object"

6350 msgstr ""

6351

6247 -#: builtin/notes.c:544 builtin/notes.c:701

6352 +#: builtin/notes.c:540 builtin/notes.c:697

6353 msgid "reuse and edit specified note object"

6354 msgstr ""

6355

6251 -#: builtin/notes.c:547 builtin/notes.c:704

6356 +#: builtin/notes.c:543 builtin/notes.c:700

6357 msgid "reuse specified note object"

6358 msgstr ""

6359

6255 -#: builtin/notes.c:549 builtin/notes.c:617

6360 +#: builtin/notes.c:545 builtin/notes.c:613

6361 msgid "replace existing notes"

6362 msgstr ""

6363

6259 -#: builtin/notes.c:583

6364 +#: builtin/notes.c:579

6365 #, c-format

6366 msgid ""

6367 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "

6368 "existing notes"

6369 msgstr ""

6370

6266 -#: builtin/notes.c:588 builtin/notes.c:665

6371 +#: builtin/notes.c:584 builtin/notes.c:661

6372 #, c-format

6373 msgid "Overwriting existing notes for object %s\n"

6374 msgstr ""

6375

6271 -#: builtin/notes.c:618

6376 +#: builtin/notes.c:614

6377 msgid "read objects from stdin"

6378 msgstr ""

6379

6275 -#: builtin/notes.c:620

6380 +#: builtin/notes.c:616

6381 msgid "load rewriting config for <command> (implies --stdin)"

6382 msgstr ""

6383

6279 -#: builtin/notes.c:638

6384 +#: builtin/notes.c:634

6385 msgid "too few parameters"

6386 msgstr ""

6387

6283 -#: builtin/notes.c:659

6388 +#: builtin/notes.c:655

6389 #, c-format

6390 msgid ""

6391 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "

6392 "existing notes"

6393 msgstr ""

6394

6290 -#: builtin/notes.c:671

6395 +#: builtin/notes.c:667

6396 #, c-format

6397 msgid "Missing notes on source object %s. Cannot copy."

6398 msgstr ""

6399

6295 -#: builtin/notes.c:720

6400 +#: builtin/notes.c:716

6401 #, c-format

6402 msgid ""

6403 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"

6404 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"

6405 msgstr ""

6406

6302 -#: builtin/notes.c:867

6407 +#: builtin/notes.c:863

6408 msgid "General options"

6409 msgstr ""

6410

6306 -#: builtin/notes.c:869

6411 +#: builtin/notes.c:865

6412 msgid "Merge options"

6413 msgstr ""

6414

6310 -#: builtin/notes.c:871

6415 +#: builtin/notes.c:867

6416 msgid ""

6417 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"

6418 "cat_sort_uniq)"

6419 msgstr ""

6420

6316 -#: builtin/notes.c:873

6421 +#: builtin/notes.c:869

6422 msgid "Committing unmerged notes"

6423 msgstr ""

6424

6320 -#: builtin/notes.c:875

6425 +#: builtin/notes.c:871

6426 msgid "finalize notes merge by committing unmerged notes"

6427 msgstr ""

6428

6324 -#: builtin/notes.c:877

6429 +#: builtin/notes.c:873

6430 msgid "Aborting notes merge resolution"

6431 msgstr ""

6432

6328 -#: builtin/notes.c:879

6433 +#: builtin/notes.c:875

6434 msgid "abort notes merge"

6435 msgstr ""

6436

6332 -#: builtin/notes.c:974

6437 +#: builtin/notes.c:970

6438 #, c-format

6439 msgid "Object %s has no note\n"

6440 msgstr ""

6441

6337 -#: builtin/notes.c:986

6442 +#: builtin/notes.c:982

6443 msgid "attempt to remove non-existent note is not an error"

6444 msgstr ""

6445

6341 -#: builtin/notes.c:989

6446 +#: builtin/notes.c:985

6447 msgid "read object names from the standard input"

6448 msgstr ""

6449

6345 -#: builtin/notes.c:1070

6450 +#: builtin/notes.c:1066

6451 msgid "notes_ref"

6452 msgstr ""

6453

6349 -#: builtin/notes.c:1071

6454 +#: builtin/notes.c:1067

6455 msgid "use notes from <notes_ref>"

6456 msgstr ""

6457

6353 -#: builtin/notes.c:1106 builtin/remote.c:1598

6458 +#: builtin/notes.c:1102 builtin/remote.c:1598

6459 #, c-format

6460 msgid "Unknown subcommand: %s"

6461 msgstr ""

@@ -6654,26 +6759,40 @@ msgstr ""

6759

6760 #: builtin/push.c:224

6761 msgid ""

6657 -"Updates were rejected because the destination reference already exists\n"

6658 -"in the remote."

6762 +"Updates were rejected because the remote contains work that you do\n"

6763 +"not have locally. This is usually caused by another repository pushing\n"

6764 +"to the same ref. You may want to first merge the remote changes (e.g.,\n"

6765 +"'git pull') before pushing again.\n"

6766 +"See the 'Note about fast-forwards' in 'git push --help' for details."

6767 msgstr ""

6768

6661 -#: builtin/push.c:269

6769 +#: builtin/push.c:231

6770 +msgid "Updates were rejected because the tag already exists in the remote."

6771 +msgstr ""

6772 +

6773 +#: builtin/push.c:234

6774 +msgid ""

6775 +"You cannot update a remote ref that points at a non-commit object,\n"

6776 +"or update a remote ref to make it point at a non-commit object,\n"

6777 +"without using the '--force' option.\n"

6778 +msgstr ""

6779 +

6780 +#: builtin/push.c:294

6781 #, c-format

6782 msgid "Pushing to %s\n"

6783 msgstr ""

6784

6666 -#: builtin/push.c:273

6785 +#: builtin/push.c:298

6786 #, c-format

6787 msgid "failed to push some refs to '%s'"

6788 msgstr ""

6789

6671 -#: builtin/push.c:302

6790 +#: builtin/push.c:331

6791 #, c-format

6792 msgid "bad repository '%s'"

6793 msgstr ""

6794

6676 -#: builtin/push.c:303

6795 +#: builtin/push.c:332

6796 msgid ""

6797 "No configured push destination.\n"

6798 "Either specify the URL from the command-line or configure a remote "

@@ -6686,79 +6805,83 @@ msgid ""

6805 " git push <name>\n"

6806 msgstr ""

6807

6689 -#: builtin/push.c:318

6808 +#: builtin/push.c:347

6809 msgid "--all and --tags are incompatible"

6810 msgstr ""

6811

6693 -#: builtin/push.c:319

6812 +#: builtin/push.c:348

6813 msgid "--all can't be combined with refspecs"

6814 msgstr ""

6815

6697 -#: builtin/push.c:324

6816 +#: builtin/push.c:353

6817 msgid "--mirror and --tags are incompatible"

6818 msgstr ""

6819

6701 -#: builtin/push.c:325

6820 +#: builtin/push.c:354

6821 msgid "--mirror can't be combined with refspecs"

6822 msgstr ""

6823

6705 -#: builtin/push.c:330

6824 +#: builtin/push.c:359

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

6826 msgstr ""

6827

6709 -#: builtin/push.c:390

6828 +#: builtin/push.c:419

6829 msgid "repository"

6830 msgstr ""

6831

6713 -#: builtin/push.c:391

6832 +#: builtin/push.c:420

6833 msgid "push all refs"

6834 msgstr ""

6835

6717 -#: builtin/push.c:392

6836 +#: builtin/push.c:421

6837 msgid "mirror all refs"

6838 msgstr ""

6839

6721 -#: builtin/push.c:394

6840 +#: builtin/push.c:423

6841 msgid "delete refs"

6842 msgstr ""

6843

6725 -#: builtin/push.c:395

6844 +#: builtin/push.c:424

6845 msgid "push tags (can't be used with --all or --mirror)"

6846 msgstr ""

6847

6729 -#: builtin/push.c:398

6848 +#: builtin/push.c:427

6849 msgid "force updates"

6850 msgstr ""

6851

6733 -#: builtin/push.c:399

6852 +#: builtin/push.c:428

6853 msgid "check"

6854 msgstr ""

6855

6737 -#: builtin/push.c:400

6856 +#: builtin/push.c:429

6857 msgid "control recursive pushing of submodules"

6858 msgstr ""

6859

6741 -#: builtin/push.c:402

6860 +#: builtin/push.c:431

6861 msgid "use thin pack"

6862 msgstr ""

6863

6745 -#: builtin/push.c:403 builtin/push.c:404

6864 +#: builtin/push.c:432 builtin/push.c:433

6865 msgid "receive pack program"

6866 msgstr ""

6867

6749 -#: builtin/push.c:405

6868 +#: builtin/push.c:434

6869 msgid "set upstream for git pull/status"

6870 msgstr ""

6871

6753 -#: builtin/push.c:408

6872 +#: builtin/push.c:437

6873 msgid "prune locally removed refs"

6874 msgstr ""

6875

6757 -#: builtin/push.c:418

6876 +#: builtin/push.c:439

6877 +msgid "bypass pre-push hook"

6878 +msgstr ""

6879 +

6880 +#: builtin/push.c:448

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

6882 msgstr ""

6883

6761 -#: builtin/push.c:420

6884 +#: builtin/push.c:450

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

6886 msgstr ""

6887

@@ -7748,8 +7871,8 @@ msgstr ""

7871

7872 #: builtin/show-ref.c:10

7873 msgid ""

7751 -"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--hash"

7752 -"[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "

7874 +"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"

7875 +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "

7876 msgstr ""

7877

7878 #: builtin/show-ref.c:11

@@ -7861,159 +7984,157 @@ msgid "could not verify the tag '%s'"

7984 msgstr ""

7985

7986 #: builtin/tag.c:249

7987 +#, c-format

7988 msgid ""

7989 "\n"

7866 -"#\n"

7867 -"# Write a tag message\n"

7868 -"# Lines starting with '#' will be ignored.\n"

7869 -"#\n"

7990 +"Write a tag message\n"

7991 +"Lines starting with '%c' will be ignored.\n"

7992 msgstr ""

7993

7872 -#: builtin/tag.c:256

7994 +#: builtin/tag.c:253

7995 +#, c-format

7996 msgid ""

7997 "\n"

7875 -"#\n"

7876 -"# Write a tag message\n"

7877 -"# Lines starting with '#' will be kept; you may remove them yourself if you "

7998 +"Write a tag message\n"

7999 +"Lines starting with '%c' will be kept; you may remove them yourself if you "

8000 "want to.\n"

7879 -"#\n"

8001 msgstr ""

8002

7882 -#: builtin/tag.c:298

8003 +#: builtin/tag.c:292

8004 msgid "unable to sign the tag"

8005 msgstr ""

8006

7886 -#: builtin/tag.c:300

8007 +#: builtin/tag.c:294

8008 msgid "unable to write tag file"

8009 msgstr ""

8010

7890 -#: builtin/tag.c:325

8011 +#: builtin/tag.c:319

8012 msgid "bad object type."

8013 msgstr ""

8014

7894 -#: builtin/tag.c:338

8015 +#: builtin/tag.c:332

8016 msgid "tag header too big."

8017 msgstr ""

8018

7898 -#: builtin/tag.c:370

8019 +#: builtin/tag.c:368

8020 msgid "no tag message?"

8021 msgstr ""

8022

7902 -#: builtin/tag.c:376

8023 +#: builtin/tag.c:374

8024 #, c-format

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

8026 msgstr ""

8027

7907 -#: builtin/tag.c:425

8028 +#: builtin/tag.c:423

8029 msgid "switch 'points-at' requires an object"

8030 msgstr ""

8031

7911 -#: builtin/tag.c:427

8032 +#: builtin/tag.c:425

8033 #, c-format

8034 msgid "malformed object name '%s'"

8035 msgstr ""

8036

7916 -#: builtin/tag.c:447

8037 +#: builtin/tag.c:445

8038 msgid "list tag names"

8039 msgstr ""

8040

7920 -#: builtin/tag.c:449

8041 +#: builtin/tag.c:447

8042 msgid "print <n> lines of each tag message"

8043 msgstr ""

8044

7924 -#: builtin/tag.c:451

8045 +#: builtin/tag.c:449

8046 msgid "delete tags"

8047 msgstr ""

8048

7928 -#: builtin/tag.c:452

8049 +#: builtin/tag.c:450

8050 msgid "verify tags"

8051 msgstr ""

8052

7932 -#: builtin/tag.c:454

8053 +#: builtin/tag.c:452

8054 msgid "Tag creation options"

8055 msgstr ""

8056

7936 -#: builtin/tag.c:456

8057 +#: builtin/tag.c:454

8058 msgid "annotated tag, needs a message"

8059 msgstr ""

8060

7940 -#: builtin/tag.c:458

8061 +#: builtin/tag.c:456

8062 msgid "tag message"

8063 msgstr ""

8064

7944 -#: builtin/tag.c:460

8065 +#: builtin/tag.c:458

8066 msgid "annotated and GPG-signed tag"

8067 msgstr ""

8068

7948 -#: builtin/tag.c:464

8069 +#: builtin/tag.c:462

8070 msgid "use another key to sign the tag"

8071 msgstr ""

8072

7952 -#: builtin/tag.c:465

8073 +#: builtin/tag.c:463

8074 msgid "replace the tag if exists"

8075 msgstr ""

8076

7956 -#: builtin/tag.c:466

8077 +#: builtin/tag.c:464

8078 msgid "show tag list in columns"

8079 msgstr ""

8080

7960 -#: builtin/tag.c:468

8081 +#: builtin/tag.c:466

8082 msgid "Tag listing options"

8083 msgstr ""

8084

7964 -#: builtin/tag.c:471

8085 +#: builtin/tag.c:469

8086 msgid "print only tags that contain the commit"

8087 msgstr ""

8088

7968 -#: builtin/tag.c:477

8089 +#: builtin/tag.c:475

8090 msgid "print only tags of the object"

8091 msgstr ""

8092

7972 -#: builtin/tag.c:506

8093 +#: builtin/tag.c:504

8094 msgid "--column and -n are incompatible"

8095 msgstr ""

8096

7976 -#: builtin/tag.c:523

8097 +#: builtin/tag.c:521

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

8099 msgstr ""

8100

7980 -#: builtin/tag.c:525

8101 +#: builtin/tag.c:523

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

8103 msgstr ""

8104

7984 -#: builtin/tag.c:527

8105 +#: builtin/tag.c:525

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

8107 msgstr ""

8108

7988 -#: builtin/tag.c:535

8109 +#: builtin/tag.c:533

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

8111 msgstr ""

8112

7992 -#: builtin/tag.c:555

8113 +#: builtin/tag.c:553

8114 msgid "too many params"

8115 msgstr ""

8116

7996 -#: builtin/tag.c:561

8117 +#: builtin/tag.c:559

8118 #, c-format

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

8120 msgstr ""

8121

8001 -#: builtin/tag.c:566

8122 +#: builtin/tag.c:564

8123 #, c-format

8124 msgid "tag '%s' already exists"

8125 msgstr ""

8126

8006 -#: builtin/tag.c:584

8127 +#: builtin/tag.c:582

8128 #, c-format

8129 msgid "%s: cannot lock the ref"

8130 msgstr ""

8131

8011 -#: builtin/tag.c:586

8132 +#: builtin/tag.c:584

8133 #, c-format

8134 msgid "%s: cannot update the ref"

8135 msgstr ""

8136

8016 -#: builtin/tag.c:588

8137 +#: builtin/tag.c:586

8138 #, c-format

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

8140 msgstr ""

@@ -8247,7 +8368,7 @@ msgid "Print lines matching a pattern"

8368 msgstr ""

8369

8370 #: common-cmds.h:17

8250 -msgid "Create an empty git repository or reinitialize an existing one"

8371 +msgid "Create an empty Git repository or reinitialize an existing one"

8372 msgstr ""

8373

8374 #: common-cmds.h:18

@@ -9060,11 +9181,11 @@ msgid "blob"

9181 msgstr ""

9182

9183 #: git-submodule.sh:979

9063 -msgid "# Submodules changed but not updated:"

9184 +msgid "Submodules changed but not updated:"

9185 msgstr ""

9186

9187 #: git-submodule.sh:981

9067 -msgid "# Submodule changes to be committed:"

9188 +msgid "Submodule changes to be committed:"

9189 msgstr ""

9190

9191 #: git-submodule.sh:1129

l10n: Update git.pot (35 new, 14 removed messages)