80d1b4817a · 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: 2015-09-05 09:16+0800\n"

11 +"POT-Creation-Date: 2015-09-15 06:45+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"

@@ -327,8 +327,8 @@ msgstr ""

327 msgid "invalid color value: %.*s"

328 msgstr ""

329

330 -#: commit.c:40 builtin/am.c:451 builtin/am.c:487 builtin/am.c:1489

331 -#: builtin/am.c:2101

330 +#: commit.c:40 builtin/am.c:451 builtin/am.c:487 builtin/am.c:1516

331 +#: builtin/am.c:2128

332 #, c-format

333 msgid "could not parse %s"

334 msgstr ""

@@ -634,7 +634,7 @@ msgstr ""

634 msgid "failed to read the cache"

635 msgstr ""

636

637 -#: merge.c:94 builtin/am.c:1974 builtin/am.c:2009 builtin/checkout.c:375

637 +#: merge.c:94 builtin/am.c:2001 builtin/am.c:2036 builtin/checkout.c:375

638 #: builtin/checkout.c:586 builtin/clone.c:715

639 msgid "unable to write new index file"

640 msgstr ""

@@ -2183,7 +2183,7 @@ msgstr ""

2183 msgid "could not stat %s"

2184 msgstr ""

2185

2186 -#: builtin/am.c:270 builtin/am.c:1318 builtin/commit.c:737

2186 +#: builtin/am.c:270 builtin/am.c:1345 builtin/commit.c:737

2187 #: builtin/merge.c:1079

2188 #, c-format

2189 msgid "could not read '%s'"

@@ -2275,65 +2275,65 @@ msgstr ""

2275 msgid "To restore the original branch and stop patching, run \"%s --abort\"."

2276 msgstr ""

2277

2278 -#: builtin/am.c:1312

2278 +#: builtin/am.c:1339

2279 msgid "Patch is empty. Was it split wrong?"

2280 msgstr ""

2281

2282 -#: builtin/am.c:1386 builtin/log.c:1345

2282 +#: builtin/am.c:1413 builtin/log.c:1345

2283 #, c-format

2284 msgid "invalid ident line: %s"

2285 msgstr ""

2286

2287 -#: builtin/am.c:1413

2287 +#: builtin/am.c:1440

2288 #, c-format

2289 msgid "unable to parse commit %s"

2290 msgstr ""

2291

2292 -#: builtin/am.c:1587

2292 +#: builtin/am.c:1614

2293 msgid "Repository lacks necessary blobs to fall back on 3-way merge."

2294 msgstr ""

2295

2296 -#: builtin/am.c:1589

2296 +#: builtin/am.c:1616

2297 msgid "Using index info to reconstruct a base tree..."

2298 msgstr ""

2299

2300 -#: builtin/am.c:1608

2300 +#: builtin/am.c:1635

2301 msgid ""

2302 "Did you hand edit your patch?\n"

2303 "It does not apply to blobs recorded in its index."

2304 msgstr ""

2305

2306 -#: builtin/am.c:1614

2306 +#: builtin/am.c:1641

2307 msgid "Falling back to patching base and 3-way merge..."

2308 msgstr ""

2309

2310 -#: builtin/am.c:1639

2310 +#: builtin/am.c:1666

2311 msgid "Failed to merge in the changes."

2312 msgstr ""

2313

2314 -#: builtin/am.c:1664 builtin/merge.c:632

2314 +#: builtin/am.c:1691 builtin/merge.c:632

2315 msgid "git write-tree failed to write a tree"

2316 msgstr ""

2317

2318 -#: builtin/am.c:1671

2318 +#: builtin/am.c:1698

2319 msgid "applying to an empty history"

2320 msgstr ""

2321

2322 -#: builtin/am.c:1684 builtin/commit.c:1752 builtin/merge.c:829

2322 +#: builtin/am.c:1711 builtin/commit.c:1752 builtin/merge.c:829

2323 #: builtin/merge.c:854

2324 msgid "failed to write commit object"

2325 msgstr ""

2326

2327 -#: builtin/am.c:1716 builtin/am.c:1720

2327 +#: builtin/am.c:1743 builtin/am.c:1747

2328 #, c-format

2329 msgid "cannot resume: %s does not exist."

2330 msgstr ""

2331

2332 -#: builtin/am.c:1736

2332 +#: builtin/am.c:1763

2333 msgid "cannot be interactive without stdin connected to a terminal."

2334 msgstr ""

2335

2336 -#: builtin/am.c:1741

2336 +#: builtin/am.c:1768

2337 msgid "Commit Body is:"

2338 msgstr ""

2339

@@ -2341,146 +2341,146 @@ msgstr ""

2341 #. in your translation. The program will only accept English

2342 #. input at this point.

2343 #.

2344 -#: builtin/am.c:1751

2344 +#: builtin/am.c:1778

2345 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "

2346 msgstr ""

2347

2348 -#: builtin/am.c:1801

2348 +#: builtin/am.c:1828

2349 #, c-format

2350 msgid "Dirty index: cannot apply patches (dirty: %s)"

2351 msgstr ""

2352

2353 -#: builtin/am.c:1836 builtin/am.c:1907

2353 +#: builtin/am.c:1863 builtin/am.c:1934

2354 #, c-format

2355 msgid "Applying: %.*s"

2356 msgstr ""

2357

2358 -#: builtin/am.c:1852

2358 +#: builtin/am.c:1879

2359 msgid "No changes -- Patch already applied."

2360 msgstr ""

2361

2362 -#: builtin/am.c:1860

2362 +#: builtin/am.c:1887

2363 #, c-format

2364 msgid "Patch failed at %s %.*s"

2365 msgstr ""

2366

2367 -#: builtin/am.c:1866

2367 +#: builtin/am.c:1893

2368 #, c-format

2369 msgid "The copy of the patch that failed is found in: %s"

2370 msgstr ""

2371

2372 -#: builtin/am.c:1910

2372 +#: builtin/am.c:1937

2373 msgid ""

2374 "No changes - did you forget to use 'git add'?\n"

2375 "If there is nothing left to stage, chances are that something else\n"

2376 "already introduced the same changes; you might want to skip this patch."

2377 msgstr ""

2378

2379 -#: builtin/am.c:1917

2379 +#: builtin/am.c:1944

2380 msgid ""

2381 "You still have unmerged paths in your index.\n"

2382 "Did you forget to use 'git add'?"

2383 msgstr ""

2384

2385 -#: builtin/am.c:2025 builtin/am.c:2029 builtin/am.c:2041 builtin/reset.c:308

2385 +#: builtin/am.c:2052 builtin/am.c:2056 builtin/am.c:2068 builtin/reset.c:308

2386 #: builtin/reset.c:316

2387 #, c-format

2388 msgid "Could not parse object '%s'."

2389 msgstr ""

2390

2391 -#: builtin/am.c:2077

2391 +#: builtin/am.c:2104

2392 msgid "failed to clean index"

2393 msgstr ""

2394

2395 -#: builtin/am.c:2111

2395 +#: builtin/am.c:2138

2396 msgid ""

2397 "You seem to have moved HEAD since the last 'am' failure.\n"

2398 "Not rewinding to ORIG_HEAD"

2399 msgstr ""

2400

2401 -#: builtin/am.c:2172

2401 +#: builtin/am.c:2199

2402 #, c-format

2403 msgid "Invalid value for --patch-format: %s"

2404 msgstr ""

2405

2406 -#: builtin/am.c:2194

2406 +#: builtin/am.c:2221

2407 msgid "git am [options] [(<mbox>|<Maildir>)...]"

2408 msgstr ""

2409

2410 -#: builtin/am.c:2195

2410 +#: builtin/am.c:2222

2411 msgid "git am [options] (--continue | --skip | --abort)"

2412 msgstr ""

2413

2414 -#: builtin/am.c:2201

2414 +#: builtin/am.c:2228

2415 msgid "run interactively"

2416 msgstr ""

2417

2418 -#: builtin/am.c:2203

2418 +#: builtin/am.c:2230

2419 msgid "historical option -- no-op"

2420 msgstr ""

2421

2422 -#: builtin/am.c:2205

2422 +#: builtin/am.c:2232

2423 msgid "allow fall back on 3way merging if needed"

2424 msgstr ""

2425

2426 -#: builtin/am.c:2206 builtin/init-db.c:509 builtin/prune-packed.c:57

2426 +#: builtin/am.c:2233 builtin/init-db.c:509 builtin/prune-packed.c:57

2427 #: builtin/repack.c:171

2428 msgid "be quiet"

2429 msgstr ""

2430

2431 -#: builtin/am.c:2208

2431 +#: builtin/am.c:2235

2432 msgid "add a Signed-off-by line to the commit message"

2433 msgstr ""

2434

2435 -#: builtin/am.c:2211

2435 +#: builtin/am.c:2238

2436 msgid "recode into utf8 (default)"

2437 msgstr ""

2438

2439 -#: builtin/am.c:2213

2439 +#: builtin/am.c:2240

2440 msgid "pass -k flag to git-mailinfo"

2441 msgstr ""

2442

2443 -#: builtin/am.c:2215

2443 +#: builtin/am.c:2242

2444 msgid "pass -b flag to git-mailinfo"

2445 msgstr ""

2446

2447 -#: builtin/am.c:2217

2447 +#: builtin/am.c:2244

2448 msgid "pass -m flag to git-mailinfo"

2449 msgstr ""

2450

2451 -#: builtin/am.c:2219

2451 +#: builtin/am.c:2246

2452 msgid "pass --keep-cr flag to git-mailsplit for mbox format"

2453 msgstr ""

2454

2455 -#: builtin/am.c:2222

2455 +#: builtin/am.c:2249

2456 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"

2457 msgstr ""

2458

2459 -#: builtin/am.c:2225

2459 +#: builtin/am.c:2252

2460 msgid "strip everything before a scissors line"

2461 msgstr ""

2462

2463 -#: builtin/am.c:2226 builtin/apply.c:4563

2463 +#: builtin/am.c:2253 builtin/apply.c:4563

2464 msgid "action"

2465 msgstr ""

2466

2467 -#: builtin/am.c:2227 builtin/am.c:2230 builtin/am.c:2233 builtin/am.c:2236

2468 -#: builtin/am.c:2239 builtin/am.c:2242 builtin/am.c:2245 builtin/am.c:2248

2469 -#: builtin/am.c:2254

2467 +#: builtin/am.c:2254 builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263

2468 +#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275

2469 +#: builtin/am.c:2281

2470 msgid "pass it through git-apply"

2471 msgstr ""

2472

2473 -#: builtin/am.c:2235 builtin/apply.c:4587

2473 +#: builtin/am.c:2262 builtin/apply.c:4587

2474 msgid "root"

2475 msgstr ""

2476

2477 -#: builtin/am.c:2238 builtin/am.c:2241 builtin/apply.c:4525

2477 +#: builtin/am.c:2265 builtin/am.c:2268 builtin/apply.c:4525

2478 #: builtin/apply.c:4528 builtin/clone.c:85 builtin/fetch.c:93

2479 #: builtin/pull.c:167

2480 msgid "path"

2481 msgstr ""

2482

2483 -#: builtin/am.c:2244 builtin/fmt-merge-msg.c:669 builtin/fmt-merge-msg.c:672

2483 +#: builtin/am.c:2271 builtin/fmt-merge-msg.c:669 builtin/fmt-merge-msg.c:672

2484 #: builtin/grep.c:698 builtin/merge.c:198 builtin/pull.c:127

2485 #: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:664

2486 #: builtin/show-ref.c:180 builtin/tag.c:591 parse-options.h:132

@@ -2488,82 +2488,82 @@ msgstr ""

2488 msgid "n"

2489 msgstr ""

2490

2491 -#: builtin/am.c:2247 builtin/apply.c:4531

2491 +#: builtin/am.c:2274 builtin/apply.c:4531

2492 msgid "num"

2493 msgstr ""

2494

2495 -#: builtin/am.c:2250 builtin/for-each-ref.c:34 builtin/replace.c:438

2495 +#: builtin/am.c:2277 builtin/for-each-ref.c:34 builtin/replace.c:438

2496 msgid "format"

2497 msgstr ""

2498

2499 -#: builtin/am.c:2251

2499 +#: builtin/am.c:2278

2500 msgid "format the patch(es) are in"

2501 msgstr ""

2502

2503 -#: builtin/am.c:2257

2503 +#: builtin/am.c:2284

2504 msgid "override error message when patch failure occurs"

2505 msgstr ""

2506

2507 -#: builtin/am.c:2259

2507 +#: builtin/am.c:2286

2508 msgid "continue applying patches after resolving a conflict"

2509 msgstr ""

2510

2511 -#: builtin/am.c:2262

2511 +#: builtin/am.c:2289

2512 msgid "synonyms for --continue"

2513 msgstr ""

2514

2515 -#: builtin/am.c:2265

2515 +#: builtin/am.c:2292

2516 msgid "skip the current patch"

2517 msgstr ""

2518

2519 -#: builtin/am.c:2268

2519 +#: builtin/am.c:2295

2520 msgid "restore the original branch and abort the patching operation."

2521 msgstr ""

2522

2523 -#: builtin/am.c:2272

2523 +#: builtin/am.c:2299

2524 msgid "lie about committer date"

2525 msgstr ""

2526

2527 -#: builtin/am.c:2274

2527 +#: builtin/am.c:2301

2528 msgid "use current timestamp for author date"

2529 msgstr ""

2530

2531 -#: builtin/am.c:2276 builtin/commit.c:1590 builtin/merge.c:225

2531 +#: builtin/am.c:2303 builtin/commit.c:1590 builtin/merge.c:225

2532 #: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:606

2533 msgid "key-id"

2534 msgstr ""

2535

2536 -#: builtin/am.c:2277

2536 +#: builtin/am.c:2304

2537 msgid "GPG-sign commits"

2538 msgstr ""

2539

2540 -#: builtin/am.c:2280

2540 +#: builtin/am.c:2307

2541 msgid "(internal use for git-rebase)"

2542 msgstr ""

2543

2544 -#: builtin/am.c:2295

2544 +#: builtin/am.c:2322

2545 msgid ""

2546 "The -b/--binary option has been a no-op for long time, and\n"

2547 "it will be removed. Please do not use it anymore."

2548 msgstr ""

2549

2550 -#: builtin/am.c:2302

2550 +#: builtin/am.c:2329

2551 msgid "failed to read the index"

2552 msgstr ""

2553

2554 -#: builtin/am.c:2317

2554 +#: builtin/am.c:2344

2555 #, c-format

2556 msgid "previous rebase directory %s still exists but mbox given."

2557 msgstr ""

2558

2559 -#: builtin/am.c:2341

2559 +#: builtin/am.c:2368

2560 #, c-format

2561 msgid ""

2562 "Stray %s directory found.\n"

2563 "Use \"git am --abort\" to remove it."

2564 msgstr ""

2565

2566 -#: builtin/am.c:2347

2566 +#: builtin/am.c:2374

2567 msgid "Resolve operation not in progress, we are not resuming."

2568 msgstr ""

2569

@@ -8213,10 +8213,6 @@ msgstr ""

8213 msgid "Options related to merging"

8214 msgstr ""

8215

8216 -#: builtin/pull.c:115

8217 -msgid "false|true|preserve"

8218 -msgstr ""

8219 -

8216 #: builtin/pull.c:116

8217 msgid "incorporate changes by rebasing rather than merging"

8218 msgstr ""

@@ -9778,7 +9774,7 @@ msgid ""

9774 msgstr ""

9775

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

9781 -msgid "git show-ref --exclude-existing[=pattern] < ref-list"

9777 +msgid "git show-ref --exclude-existing[=<pattern>] < <ref-list>"

9778 msgstr ""

9779

9780 #: builtin/show-ref.c:170

@@ -9990,7 +9986,7 @@ msgid "replace the tag if exists"

9986 msgstr ""

9987

9988 #: builtin/tag.c:609 builtin/update-ref.c:368

9993 -msgid "create_reflog"

9989 +msgid "create a reflog"

9990 msgstr ""

9991

9992 #: builtin/tag.c:611

l10n: git.pot: v2.6.0 round 2 (3 improvements)