@matheusbsbs / matheus-bagliano / commits / 6eebb35ec0

l10n: git.pot: v2.4.0 round 2 (1 update)

Generate po/git.pot from v2.4.0-rc1 for git v2.4.0 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

Jiang Xin committed Apr 3, 2015 at 08:16 UTC 6eebb35ec0255011d51c542f2851877281f88f79
1 file changed +233 -233
po/git.pot
+233 -233
@@ -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-03-27 13:33+0800\n"
11 +"POT-Creation-Date: 2015-04-03 08:13+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"
@@ -236,7 +236,7 @@ msgstr ""
236 msgid "unrecognized header: %s%s (%d)"
237 msgstr ""
238
239 -#: bundle.c:87 builtin/commit.c:764
239 +#: bundle.c:87 builtin/commit.c:766
240 #, c-format
241 msgid "could not open '%s'"
242 msgstr ""
@@ -246,7 +246,7 @@ msgid "Repository lacks these prerequisite commits:"
246 msgstr ""
247
248 #: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705
249 -#: builtin/branch.c:659 builtin/commit.c:1043 builtin/log.c:330
249 +#: builtin/branch.c:659 builtin/commit.c:1045 builtin/log.c:330
250 #: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:358
251 #: builtin/shortlog.c:158
252 msgid "revision walk setup failed"
@@ -841,27 +841,27 @@ msgstr ""
841 msgid "Unprocessed path??? %s"
842 msgstr ""
843
844 -#: merge-recursive.c:1898
844 +#: merge-recursive.c:1901
845 msgid "Merging:"
846 msgstr ""
847
848 -#: merge-recursive.c:1911
848 +#: merge-recursive.c:1914
849 #, c-format
850 msgid "found %u common ancestor:"
851 msgid_plural "found %u common ancestors:"
852 msgstr[0] ""
853 msgstr[1] ""
854
855 -#: merge-recursive.c:1948
855 +#: merge-recursive.c:1951
856 msgid "merge returned no commit"
857 msgstr ""
858
859 -#: merge-recursive.c:2005
859 +#: merge-recursive.c:2008
860 #, c-format
861 msgid "Could not parse object '%s'"
862 msgstr ""
863
864 -#: merge-recursive.c:2016 builtin/merge.c:667
864 +#: merge-recursive.c:2019 builtin/merge.c:667
865 msgid "Unable to write index."
866 msgstr ""
867
@@ -984,14 +984,14 @@ msgstr ""
984 msgid "done"
985 msgstr ""
986
987 -#: read-cache.c:1273
987 +#: read-cache.c:1275
988 #, c-format
989 msgid ""
990 "index.version set, but the value is invalid.\n"
991 "Using version %i"
992 msgstr ""
993
994 -#: read-cache.c:1283
994 +#: read-cache.c:1285
995 #, c-format
996 msgid ""
997 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -1091,7 +1091,7 @@ msgid "the receiving end does not support --signed push"
1091 msgstr ""
1092
1093 #: send-pack.c:366
1094 -msgid "server does not support --atomic push"
1094 +msgid "the receiving end does not support --atomic push"
1095 msgstr ""
1096
1097 #: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995
@@ -1294,7 +1294,7 @@ msgstr ""
1294 msgid "cannot abort from a branch yet to be born"
1295 msgstr ""
1296
1297 -#: sequencer.c:908 builtin/apply.c:4286
1297 +#: sequencer.c:908 builtin/apply.c:4288
1298 #, c-format
1299 msgid "cannot open %s: %s"
1300 msgstr ""
@@ -1898,7 +1898,7 @@ msgstr ""
1898 msgid "unexpected diff status %c"
1899 msgstr ""
1900
1901 -#: builtin/add.c:70 builtin/commit.c:275
1901 +#: builtin/add.c:70 builtin/commit.c:277
1902 msgid "updating files failed"
1903 msgstr ""
1904
@@ -1948,8 +1948,8 @@ msgstr ""
1948 msgid "dry run"
1949 msgstr ""
1950
1951 -#: builtin/add.c:249 builtin/apply.c:4575 builtin/check-ignore.c:19
1952 -#: builtin/commit.c:1320 builtin/count-objects.c:63 builtin/fsck.c:608
1951 +#: builtin/add.c:249 builtin/apply.c:4577 builtin/check-ignore.c:19
1952 +#: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:608
1953 #: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114
1954 msgid "be verbose"
1955 msgstr ""
@@ -2026,11 +2026,11 @@ msgid "Maybe you wanted to say 'git add .'?\n"
2026 msgstr ""
2027
2028 #: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:920
2029 -#: builtin/commit.c:333 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299
2029 +#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299
2030 msgid "index file corrupt"
2031 msgstr ""
2032
2033 -#: builtin/add.c:446 builtin/apply.c:4673 builtin/mv.c:279 builtin/rm.c:431
2033 +#: builtin/add.c:446 builtin/apply.c:4675 builtin/mv.c:279 builtin/rm.c:431
2034 msgid "Unable to write new index file"
2035 msgstr ""
2036
@@ -2162,355 +2162,355 @@ msgstr ""
2162 msgid "invalid start of line: '%c'"
2163 msgstr ""
2164
2165 -#: builtin/apply.c:2896
2165 +#: builtin/apply.c:2897
2166 #, c-format
2167 msgid "Hunk #%d succeeded at %d (offset %d line)."
2168 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
2169 msgstr[0] ""
2170 msgstr[1] ""
2171
2172 -#: builtin/apply.c:2908
2172 +#: builtin/apply.c:2909
2173 #, c-format
2174 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
2175 msgstr ""
2176
2177 -#: builtin/apply.c:2914
2177 +#: builtin/apply.c:2915
2178 #, c-format
2179 msgid ""
2180 "while searching for:\n"
2181 "%.*s"
2182 msgstr ""
2183
2184 -#: builtin/apply.c:2933
2184 +#: builtin/apply.c:2935
2185 #, c-format
2186 msgid "missing binary patch data for '%s'"
2187 msgstr ""
2188
2189 -#: builtin/apply.c:3034
2189 +#: builtin/apply.c:3036
2190 #, c-format
2191 msgid "binary patch does not apply to '%s'"
2192 msgstr ""
2193
2194 -#: builtin/apply.c:3040
2194 +#: builtin/apply.c:3042
2195 #, c-format
2196 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
2197 msgstr ""
2198
2199 -#: builtin/apply.c:3061
2199 +#: builtin/apply.c:3063
2200 #, c-format
2201 msgid "patch failed: %s:%ld"
2202 msgstr ""
2203
2204 -#: builtin/apply.c:3185
2204 +#: builtin/apply.c:3187
2205 #, c-format
2206 msgid "cannot checkout %s"
2207 msgstr ""
2208
2209 -#: builtin/apply.c:3230 builtin/apply.c:3241 builtin/apply.c:3286
2209 +#: builtin/apply.c:3232 builtin/apply.c:3243 builtin/apply.c:3288
2210 #, c-format
2211 msgid "read of %s failed"
2212 msgstr ""
2213
2214 -#: builtin/apply.c:3238
2214 +#: builtin/apply.c:3240
2215 #, c-format
2216 msgid "reading from '%s' beyond a symbolic link"
2217 msgstr ""
2218
2219 -#: builtin/apply.c:3266 builtin/apply.c:3488
2219 +#: builtin/apply.c:3268 builtin/apply.c:3490
2220 #, c-format
2221 msgid "path %s has been renamed/deleted"
2222 msgstr ""
2223
2224 -#: builtin/apply.c:3347 builtin/apply.c:3502
2224 +#: builtin/apply.c:3349 builtin/apply.c:3504
2225 #, c-format
2226 msgid "%s: does not exist in index"
2227 msgstr ""
2228
2229 -#: builtin/apply.c:3351 builtin/apply.c:3494 builtin/apply.c:3516
2229 +#: builtin/apply.c:3353 builtin/apply.c:3496 builtin/apply.c:3518
2230 #, c-format
2231 msgid "%s: %s"
2232 msgstr ""
2233
2234 -#: builtin/apply.c:3356 builtin/apply.c:3510
2234 +#: builtin/apply.c:3358 builtin/apply.c:3512
2235 #, c-format
2236 msgid "%s: does not match index"
2237 msgstr ""
2238
2239 -#: builtin/apply.c:3458
2239 +#: builtin/apply.c:3460
2240 msgid "removal patch leaves file contents"
2241 msgstr ""
2242
2243 -#: builtin/apply.c:3527
2243 +#: builtin/apply.c:3529
2244 #, c-format
2245 msgid "%s: wrong type"
2246 msgstr ""
2247
2248 -#: builtin/apply.c:3529
2248 +#: builtin/apply.c:3531
2249 #, c-format
2250 msgid "%s has type %o, expected %o"
2251 msgstr ""
2252
2253 -#: builtin/apply.c:3688 builtin/apply.c:3690
2253 +#: builtin/apply.c:3690 builtin/apply.c:3692
2254 #, c-format
2255 msgid "invalid path '%s'"
2256 msgstr ""
2257
2258 -#: builtin/apply.c:3745
2258 +#: builtin/apply.c:3747
2259 #, c-format
2260 msgid "%s: already exists in index"
2261 msgstr ""
2262
2263 -#: builtin/apply.c:3748
2263 +#: builtin/apply.c:3750
2264 #, c-format
2265 msgid "%s: already exists in working directory"
2266 msgstr ""
2267
2268 -#: builtin/apply.c:3768
2268 +#: builtin/apply.c:3770
2269 #, c-format
2270 msgid "new mode (%o) of %s does not match old mode (%o)"
2271 msgstr ""
2272
2273 -#: builtin/apply.c:3773
2273 +#: builtin/apply.c:3775
2274 #, c-format
2275 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
2276 msgstr ""
2277
2278 -#: builtin/apply.c:3793
2278 +#: builtin/apply.c:3795
2279 #, c-format
2280 msgid "affected file '%s' is beyond a symbolic link"
2281 msgstr ""
2282
2283 -#: builtin/apply.c:3797
2283 +#: builtin/apply.c:3799
2284 #, c-format
2285 msgid "%s: patch does not apply"
2286 msgstr ""
2287
2288 -#: builtin/apply.c:3811
2288 +#: builtin/apply.c:3813
2289 #, c-format
2290 msgid "Checking patch %s..."
2291 msgstr ""
2292
2293 -#: builtin/apply.c:3904 builtin/checkout.c:231 builtin/reset.c:135
2293 +#: builtin/apply.c:3906 builtin/checkout.c:231 builtin/reset.c:135
2294 #, c-format
2295 msgid "make_cache_entry failed for path '%s'"
2296 msgstr ""
2297
2298 -#: builtin/apply.c:4047
2298 +#: builtin/apply.c:4049
2299 #, c-format
2300 msgid "unable to remove %s from index"
2301 msgstr ""
2302
2303 -#: builtin/apply.c:4076
2303 +#: builtin/apply.c:4078
2304 #, c-format
2305 msgid "corrupt patch for submodule %s"
2306 msgstr ""
2307
2308 -#: builtin/apply.c:4080
2308 +#: builtin/apply.c:4082
2309 #, c-format
2310 msgid "unable to stat newly created file '%s'"
2311 msgstr ""
2312
2313 -#: builtin/apply.c:4085
2313 +#: builtin/apply.c:4087
2314 #, c-format
2315 msgid "unable to create backing store for newly created file %s"
2316 msgstr ""
2317
2318 -#: builtin/apply.c:4088 builtin/apply.c:4196
2318 +#: builtin/apply.c:4090 builtin/apply.c:4198
2319 #, c-format
2320 msgid "unable to add cache entry for %s"
2321 msgstr ""
2322
2323 -#: builtin/apply.c:4121
2323 +#: builtin/apply.c:4123
2324 #, c-format
2325 msgid "closing file '%s'"
2326 msgstr ""
2327
2328 -#: builtin/apply.c:4170
2328 +#: builtin/apply.c:4172
2329 #, c-format
2330 msgid "unable to write file '%s' mode %o"
2331 msgstr ""
2332
2333 -#: builtin/apply.c:4257
2333 +#: builtin/apply.c:4259
2334 #, c-format
2335 msgid "Applied patch %s cleanly."
2336 msgstr ""
2337
2338 -#: builtin/apply.c:4265
2338 +#: builtin/apply.c:4267
2339 msgid "internal error"
2340 msgstr ""
2341
2342 -#: builtin/apply.c:4268
2342 +#: builtin/apply.c:4270
2343 #, c-format
2344 msgid "Applying patch %%s with %d reject..."
2345 msgid_plural "Applying patch %%s with %d rejects..."
2346 msgstr[0] ""
2347 msgstr[1] ""
2348
2349 -#: builtin/apply.c:4278
2349 +#: builtin/apply.c:4280
2350 #, c-format
2351 msgid "truncating .rej filename to %.*s.rej"
2352 msgstr ""
2353
2354 -#: builtin/apply.c:4299
2354 +#: builtin/apply.c:4301
2355 #, c-format
2356 msgid "Hunk #%d applied cleanly."
2357 msgstr ""
2358
2359 -#: builtin/apply.c:4302
2359 +#: builtin/apply.c:4304
2360 #, c-format
2361 msgid "Rejected hunk #%d."
2362 msgstr ""
2363
2364 -#: builtin/apply.c:4392
2364 +#: builtin/apply.c:4394
2365 msgid "unrecognized input"
2366 msgstr ""
2367
2368 -#: builtin/apply.c:4403
2368 +#: builtin/apply.c:4405
2369 msgid "unable to read index file"
2370 msgstr ""
2371
2372 -#: builtin/apply.c:4520 builtin/apply.c:4523 builtin/clone.c:92
2372 +#: builtin/apply.c:4522 builtin/apply.c:4525 builtin/clone.c:92
2373 #: builtin/fetch.c:92
2374 msgid "path"
2375 msgstr ""
2376
2377 -#: builtin/apply.c:4521
2377 +#: builtin/apply.c:4523
2378 msgid "don't apply changes matching the given path"
2379 msgstr ""
2380
2381 -#: builtin/apply.c:4524
2381 +#: builtin/apply.c:4526
2382 msgid "apply changes matching the given path"
2383 msgstr ""
2384
2385 -#: builtin/apply.c:4526
2385 +#: builtin/apply.c:4528
2386 msgid "num"
2387 msgstr ""
2388
2389 -#: builtin/apply.c:4527
2389 +#: builtin/apply.c:4529
2390 msgid "remove <num> leading slashes from traditional diff paths"
2391 msgstr ""
2392
2393 -#: builtin/apply.c:4530
2393 +#: builtin/apply.c:4532
2394 msgid "ignore additions made by the patch"
2395 msgstr ""
2396
2397 -#: builtin/apply.c:4532
2397 +#: builtin/apply.c:4534
2398 msgid "instead of applying the patch, output diffstat for the input"
2399 msgstr ""
2400
2401 -#: builtin/apply.c:4536
2401 +#: builtin/apply.c:4538
2402 msgid "show number of added and deleted lines in decimal notation"
2403 msgstr ""
2404
2405 -#: builtin/apply.c:4538
2405 +#: builtin/apply.c:4540
2406 msgid "instead of applying the patch, output a summary for the input"
2407 msgstr ""
2408
2409 -#: builtin/apply.c:4540
2409 +#: builtin/apply.c:4542
2410 msgid "instead of applying the patch, see if the patch is applicable"
2411 msgstr ""
2412
2413 -#: builtin/apply.c:4542
2413 +#: builtin/apply.c:4544
2414 msgid "make sure the patch is applicable to the current index"
2415 msgstr ""
2416
2417 -#: builtin/apply.c:4544
2417 +#: builtin/apply.c:4546
2418 msgid "apply a patch without touching the working tree"
2419 msgstr ""
2420
2421 -#: builtin/apply.c:4546
2421 +#: builtin/apply.c:4548
2422 msgid "accept a patch that touches outside the working area"
2423 msgstr ""
2424
2425 -#: builtin/apply.c:4548
2425 +#: builtin/apply.c:4550
2426 msgid "also apply the patch (use with --stat/--summary/--check)"
2427 msgstr ""
2428
2429 -#: builtin/apply.c:4550
2429 +#: builtin/apply.c:4552
2430 msgid "attempt three-way merge if a patch does not apply"
2431 msgstr ""
2432
2433 -#: builtin/apply.c:4552
2433 +#: builtin/apply.c:4554
2434 msgid "build a temporary index based on embedded index information"
2435 msgstr ""
2436
2437 -#: builtin/apply.c:4554 builtin/checkout-index.c:198 builtin/ls-files.c:412
2437 +#: builtin/apply.c:4556 builtin/checkout-index.c:198 builtin/ls-files.c:412
2438 msgid "paths are separated with NUL character"
2439 msgstr ""
2440
2441 -#: builtin/apply.c:4557
2441 +#: builtin/apply.c:4559
2442 msgid "ensure at least <n> lines of context match"
2443 msgstr ""
2444
2445 -#: builtin/apply.c:4558
2445 +#: builtin/apply.c:4560
2446 msgid "action"
2447 msgstr ""
2448
2449 -#: builtin/apply.c:4559
2449 +#: builtin/apply.c:4561
2450 msgid "detect new or modified lines that have whitespace errors"
2451 msgstr ""
2452
2453 -#: builtin/apply.c:4562 builtin/apply.c:4565
2453 +#: builtin/apply.c:4564 builtin/apply.c:4567
2454 msgid "ignore changes in whitespace when finding context"
2455 msgstr ""
2456
2457 -#: builtin/apply.c:4568
2457 +#: builtin/apply.c:4570
2458 msgid "apply the patch in reverse"
2459 msgstr ""
2460
2461 -#: builtin/apply.c:4570
2461 +#: builtin/apply.c:4572
2462 msgid "don't expect at least one line of context"
2463 msgstr ""
2464
2465 -#: builtin/apply.c:4572
2465 +#: builtin/apply.c:4574
2466 msgid "leave the rejected hunks in corresponding *.rej files"
2467 msgstr ""
2468
2469 -#: builtin/apply.c:4574
2469 +#: builtin/apply.c:4576
2470 msgid "allow overlapping hunks"
2471 msgstr ""
2472
2473 -#: builtin/apply.c:4577
2473 +#: builtin/apply.c:4579
2474 msgid "tolerate incorrectly detected missing new-line at the end of file"
2475 msgstr ""
2476
2477 -#: builtin/apply.c:4580
2477 +#: builtin/apply.c:4582
2478 msgid "do not trust the line counts in the hunk headers"
2479 msgstr ""
2480
2481 -#: builtin/apply.c:4582
2481 +#: builtin/apply.c:4584
2482 msgid "root"
2483 msgstr ""
2484
2485 -#: builtin/apply.c:4583
2485 +#: builtin/apply.c:4585
2486 msgid "prepend <root> to all filenames"
2487 msgstr ""
2488
2489 -#: builtin/apply.c:4605
2489 +#: builtin/apply.c:4607
2490 msgid "--3way outside a repository"
2491 msgstr ""
2492
2493 -#: builtin/apply.c:4613
2493 +#: builtin/apply.c:4615
2494 msgid "--index outside a repository"
2495 msgstr ""
2496
2497 -#: builtin/apply.c:4616
2497 +#: builtin/apply.c:4618
2498 msgid "--cached outside a repository"
2499 msgstr ""
2500
2501 -#: builtin/apply.c:4635
2501 +#: builtin/apply.c:4637
2502 #, c-format
2503 msgid "can't open patch '%s'"
2504 msgstr ""
2505
2506 -#: builtin/apply.c:4649
2506 +#: builtin/apply.c:4651
2507 #, c-format
2508 msgid "squelched %d whitespace error"
2509 msgid_plural "squelched %d whitespace errors"
2510 msgstr[0] ""
2511 msgstr[1] ""
2512
2513 -#: builtin/apply.c:4655 builtin/apply.c:4665
2513 +#: builtin/apply.c:4657 builtin/apply.c:4667
2514 #, c-format
2515 msgid "%d line adds whitespace errors."
2516 msgid_plural "%d lines add whitespace errors."
@@ -2911,8 +2911,8 @@ msgid "act on remote-tracking branches"
2911 msgstr ""
2912
2913 #: builtin/branch.c:834 builtin/branch.c:840 builtin/branch.c:861
2914 -#: builtin/branch.c:867 builtin/commit.c:1580 builtin/commit.c:1581
2915 -#: builtin/commit.c:1582 builtin/commit.c:1583 builtin/tag.c:616
2914 +#: builtin/branch.c:867 builtin/commit.c:1582 builtin/commit.c:1583
2915 +#: builtin/commit.c:1584 builtin/commit.c:1585 builtin/tag.c:616
2916 #: builtin/tag.c:622
2917 msgid "commit"
2918 msgstr ""
@@ -4059,112 +4059,112 @@ msgid ""
4059 "the remaining commits.\n"
4060 msgstr ""
4061
4062 -#: builtin/commit.c:302
4062 +#: builtin/commit.c:304
4063 msgid "failed to unpack HEAD tree object"
4064 msgstr ""
4065
4066 -#: builtin/commit.c:342
4066 +#: builtin/commit.c:344
4067 msgid "unable to create temporary index"
4068 msgstr ""
4069
4070 -#: builtin/commit.c:348
4070 +#: builtin/commit.c:350
4071 msgid "interactive add failed"
4072 msgstr ""
4073
4074 -#: builtin/commit.c:359
4074 +#: builtin/commit.c:361
4075 msgid "unable to write index file"
4076 msgstr ""
4077
4078 -#: builtin/commit.c:361
4078 +#: builtin/commit.c:363
4079 msgid "unable to update temporary index"
4080 msgstr ""
4081
4082 -#: builtin/commit.c:363
4082 +#: builtin/commit.c:365
4083 msgid "Failed to update main cache tree"
4084 msgstr ""
4085
4086 -#: builtin/commit.c:387 builtin/commit.c:412 builtin/commit.c:461
4086 +#: builtin/commit.c:389 builtin/commit.c:414 builtin/commit.c:463
4087 msgid "unable to write new_index file"
4088 msgstr ""
4089
4090 -#: builtin/commit.c:443
4090 +#: builtin/commit.c:445
4091 msgid "cannot do a partial commit during a merge."
4092 msgstr ""
4093
4094 -#: builtin/commit.c:445
4094 +#: builtin/commit.c:447
4095 msgid "cannot do a partial commit during a cherry-pick."
4096 msgstr ""
4097
4098 -#: builtin/commit.c:454
4098 +#: builtin/commit.c:456
4099 msgid "cannot read the index"
4100 msgstr ""
4101
4102 -#: builtin/commit.c:473
4102 +#: builtin/commit.c:475
4103 msgid "unable to write temporary index file"
4104 msgstr ""
4105
4106 -#: builtin/commit.c:578
4106 +#: builtin/commit.c:580
4107 #, c-format
4108 msgid "commit '%s' lacks author header"
4109 msgstr ""
4110
4111 -#: builtin/commit.c:580
4111 +#: builtin/commit.c:582
4112 #, c-format
4113 msgid "commit '%s' has malformed author line"
4114 msgstr ""
4115
4116 -#: builtin/commit.c:599
4116 +#: builtin/commit.c:601
4117 msgid "malformed --author parameter"
4118 msgstr ""
4119
4120 -#: builtin/commit.c:607
4120 +#: builtin/commit.c:609
4121 #, c-format
4122 msgid "invalid date format: %s"
4123 msgstr ""
4124
4125 -#: builtin/commit.c:651
4125 +#: builtin/commit.c:653
4126 msgid ""
4127 "unable to select a comment character that is not used\n"
4128 "in the current commit message"
4129 msgstr ""
4130
4131 -#: builtin/commit.c:688 builtin/commit.c:721 builtin/commit.c:1078
4131 +#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
4132 #, c-format
4133 msgid "could not lookup commit %s"
4134 msgstr ""
4135
4136 -#: builtin/commit.c:700 builtin/shortlog.c:273
4136 +#: builtin/commit.c:702 builtin/shortlog.c:273
4137 #, c-format
4138 msgid "(reading log message from standard input)\n"
4139 msgstr ""
4140
4141 -#: builtin/commit.c:702
4141 +#: builtin/commit.c:704
4142 msgid "could not read log from standard input"
4143 msgstr ""
4144
4145 -#: builtin/commit.c:706
4145 +#: builtin/commit.c:708
4146 #, c-format
4147 msgid "could not read log file '%s'"
4148 msgstr ""
4149
4150 -#: builtin/commit.c:728
4150 +#: builtin/commit.c:730
4151 msgid "could not read MERGE_MSG"
4152 msgstr ""
4153
4154 -#: builtin/commit.c:732
4154 +#: builtin/commit.c:734
4155 msgid "could not read SQUASH_MSG"
4156 msgstr ""
4157
4158 -#: builtin/commit.c:736
4158 +#: builtin/commit.c:738
4159 #, c-format
4160 msgid "could not read '%s'"
4161 msgstr ""
4162
4163 -#: builtin/commit.c:783
4163 +#: builtin/commit.c:785
4164 msgid "could not write commit template"
4165 msgstr ""
4166
4167 -#: builtin/commit.c:801
4167 +#: builtin/commit.c:803
4168 #, c-format
4169 msgid ""
4170 "\n"
@@ -4174,7 +4174,7 @@ msgid ""
4174 "and try again.\n"
4175 msgstr ""
4176
4177 -#: builtin/commit.c:806
4177 +#: builtin/commit.c:808
4178 #, c-format
4179 msgid ""
4180 "\n"
@@ -4184,14 +4184,14 @@ msgid ""
4184 "and try again.\n"
4185 msgstr ""
4186
4187 -#: builtin/commit.c:819
4187 +#: builtin/commit.c:821
4188 #, c-format
4189 msgid ""
4190 "Please enter the commit message for your changes. Lines starting\n"
4191 "with '%c' will be ignored, and an empty message aborts the commit.\n"
4192 msgstr ""
4193
4194 -#: builtin/commit.c:826
4194 +#: builtin/commit.c:828
4195 #, c-format
4196 msgid ""
4197 "Please enter the commit message for your changes. Lines starting\n"
@@ -4199,348 +4199,348 @@ msgid ""
4199 "An empty message aborts the commit.\n"
4200 msgstr ""
4201
4202 -#: builtin/commit.c:846
4202 +#: builtin/commit.c:848
4203 #, c-format
4204 msgid "%sAuthor: %.*s <%.*s>"
4205 msgstr ""
4206
4207 -#: builtin/commit.c:854
4207 +#: builtin/commit.c:856
4208 #, c-format
4209 msgid "%sDate: %s"
4210 msgstr ""
4211
4212 -#: builtin/commit.c:861
4212 +#: builtin/commit.c:863
4213 #, c-format
4214 msgid "%sCommitter: %.*s <%.*s>"
4215 msgstr ""
4216
4217 -#: builtin/commit.c:879
4217 +#: builtin/commit.c:881
4218 msgid "Cannot read index"
4219 msgstr ""
4220
4221 -#: builtin/commit.c:936
4221 +#: builtin/commit.c:938
4222 msgid "Error building trees"
4223 msgstr ""
4224
4225 -#: builtin/commit.c:951 builtin/tag.c:495
4225 +#: builtin/commit.c:953 builtin/tag.c:495
4226 #, c-format
4227 msgid "Please supply the message using either -m or -F option.\n"
4228 msgstr ""
4229
4230 -#: builtin/commit.c:1053
4230 +#: builtin/commit.c:1055
4231 #, c-format
4232 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
4233 msgstr ""
4234
4235 -#: builtin/commit.c:1068 builtin/commit.c:1308
4235 +#: builtin/commit.c:1070 builtin/commit.c:1310
4236 #, c-format
4237 msgid "Invalid untracked files mode '%s'"
4238 msgstr ""
4239
4240 -#: builtin/commit.c:1105
4240 +#: builtin/commit.c:1107
4241 msgid "--long and -z are incompatible"
4242 msgstr ""
4243
4244 -#: builtin/commit.c:1135
4244 +#: builtin/commit.c:1137
4245 msgid "Using both --reset-author and --author does not make sense"
4246 msgstr ""
4247
4248 -#: builtin/commit.c:1144
4248 +#: builtin/commit.c:1146
4249 msgid "You have nothing to amend."
4250 msgstr ""
4251
4252 -#: builtin/commit.c:1147
4252 +#: builtin/commit.c:1149
4253 msgid "You are in the middle of a merge -- cannot amend."
4254 msgstr ""
4255
4256 -#: builtin/commit.c:1149
4256 +#: builtin/commit.c:1151
4257 msgid "You are in the middle of a cherry-pick -- cannot amend."
4258 msgstr ""
4259
4260 -#: builtin/commit.c:1152
4260 +#: builtin/commit.c:1154
4261 msgid "Options --squash and --fixup cannot be used together"
4262 msgstr ""
4263
4264 -#: builtin/commit.c:1162
4264 +#: builtin/commit.c:1164
4265 msgid "Only one of -c/-C/-F/--fixup can be used."
4266 msgstr ""
4267
4268 -#: builtin/commit.c:1164
4268 +#: builtin/commit.c:1166
4269 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
4270 msgstr ""
4271
4272 -#: builtin/commit.c:1172
4272 +#: builtin/commit.c:1174
4273 msgid "--reset-author can be used only with -C, -c or --amend."
4274 msgstr ""
4275
4276 -#: builtin/commit.c:1189
4276 +#: builtin/commit.c:1191
4277 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
4278 msgstr ""
4279
4280 -#: builtin/commit.c:1191
4280 +#: builtin/commit.c:1193
4281 msgid "No paths with --include/--only does not make sense."
4282 msgstr ""
4283
4284 -#: builtin/commit.c:1193
4284 +#: builtin/commit.c:1195
4285 msgid "Clever... amending the last one with dirty index."
4286 msgstr ""
4287
4288 -#: builtin/commit.c:1195
4288 +#: builtin/commit.c:1197
4289 msgid "Explicit paths specified without -i or -o; assuming --only paths..."
4290 msgstr ""
4291
4292 -#: builtin/commit.c:1207 builtin/tag.c:728
4292 +#: builtin/commit.c:1209 builtin/tag.c:728
4293 #, c-format
4294 msgid "Invalid cleanup mode %s"
4295 msgstr ""
4296
4297 -#: builtin/commit.c:1212
4297 +#: builtin/commit.c:1214
4298 msgid "Paths with -a does not make sense."
4299 msgstr ""
4300
4301 -#: builtin/commit.c:1322 builtin/commit.c:1602
4301 +#: builtin/commit.c:1324 builtin/commit.c:1604
4302 msgid "show status concisely"
4303 msgstr ""
4304
4305 -#: builtin/commit.c:1324 builtin/commit.c:1604
4305 +#: builtin/commit.c:1326 builtin/commit.c:1606
4306 msgid "show branch information"
4307 msgstr ""
4308
4309 -#: builtin/commit.c:1326 builtin/commit.c:1606 builtin/push.c:509
4309 +#: builtin/commit.c:1328 builtin/commit.c:1608 builtin/push.c:509
4310 msgid "machine-readable output"
4311 msgstr ""
4312
4313 -#: builtin/commit.c:1329 builtin/commit.c:1608
4313 +#: builtin/commit.c:1331 builtin/commit.c:1610
4314 msgid "show status in long format (default)"
4315 msgstr ""
4316
4317 -#: builtin/commit.c:1332 builtin/commit.c:1611
4317 +#: builtin/commit.c:1334 builtin/commit.c:1613
4318 msgid "terminate entries with NUL"
4319 msgstr ""
4320
4321 -#: builtin/commit.c:1334 builtin/commit.c:1614 builtin/fast-export.c:980
4321 +#: builtin/commit.c:1336 builtin/commit.c:1616 builtin/fast-export.c:980
4322 #: builtin/fast-export.c:983 builtin/tag.c:603
4323 msgid "mode"
4324 msgstr ""
4325
4326 -#: builtin/commit.c:1335 builtin/commit.c:1614
4326 +#: builtin/commit.c:1337 builtin/commit.c:1616
4327 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
4328 msgstr ""
4329
4330 -#: builtin/commit.c:1338
4330 +#: builtin/commit.c:1340
4331 msgid "show ignored files"
4332 msgstr ""
4333
4334 -#: builtin/commit.c:1339 parse-options.h:153
4334 +#: builtin/commit.c:1341 parse-options.h:153
4335 msgid "when"
4336 msgstr ""
4337
4338 -#: builtin/commit.c:1340
4338 +#: builtin/commit.c:1342
4339 msgid ""
4340 "ignore changes to submodules, optional when: all, dirty, untracked. "
4341 "(Default: all)"
4342 msgstr ""
4343
4344 -#: builtin/commit.c:1342
4344 +#: builtin/commit.c:1344
4345 msgid "list untracked files in columns"
4346 msgstr ""
4347
4348 -#: builtin/commit.c:1429
4348 +#: builtin/commit.c:1431
4349 msgid "couldn't look up newly created commit"
4350 msgstr ""
4351
4352 -#: builtin/commit.c:1431
4352 +#: builtin/commit.c:1433
4353 msgid "could not parse newly created commit"
4354 msgstr ""
4355
4356 -#: builtin/commit.c:1476
4356 +#: builtin/commit.c:1478
4357 msgid "detached HEAD"
4358 msgstr ""
4359
4360 -#: builtin/commit.c:1479
4360 +#: builtin/commit.c:1481
4361 msgid " (root-commit)"
4362 msgstr ""
4363
4364 -#: builtin/commit.c:1572
4364 +#: builtin/commit.c:1574
4365 msgid "suppress summary after successful commit"
4366 msgstr ""
4367
4368 -#: builtin/commit.c:1573
4368 +#: builtin/commit.c:1575
4369 msgid "show diff in commit message template"
4370 msgstr ""
4371
4372 -#: builtin/commit.c:1575
4372 +#: builtin/commit.c:1577
4373 msgid "Commit message options"
4374 msgstr ""
4375
4376 -#: builtin/commit.c:1576 builtin/tag.c:601
4376 +#: builtin/commit.c:1578 builtin/tag.c:601
4377 msgid "read message from file"
4378 msgstr ""
4379
4380 -#: builtin/commit.c:1577
4380 +#: builtin/commit.c:1579
4381 msgid "author"
4382 msgstr ""
4383
4384 -#: builtin/commit.c:1577
4384 +#: builtin/commit.c:1579
4385 msgid "override author for commit"
4386 msgstr ""
4387
4388 -#: builtin/commit.c:1578 builtin/gc.c:275
4388 +#: builtin/commit.c:1580 builtin/gc.c:275
4389 msgid "date"
4390 msgstr ""
4391
4392 -#: builtin/commit.c:1578
4392 +#: builtin/commit.c:1580
4393 msgid "override date for commit"
4394 msgstr ""
4395
4396 -#: builtin/commit.c:1579 builtin/merge.c:218 builtin/notes.c:391
4396 +#: builtin/commit.c:1581 builtin/merge.c:218 builtin/notes.c:391
4397 #: builtin/notes.c:554 builtin/tag.c:599
4398 msgid "message"
4399 msgstr ""
4400
4401 -#: builtin/commit.c:1579
4401 +#: builtin/commit.c:1581
4402 msgid "commit message"
4403 msgstr ""
4404
4405 -#: builtin/commit.c:1580
4405 +#: builtin/commit.c:1582
4406 msgid "reuse and edit message from specified commit"
4407 msgstr ""
4408
4409 -#: builtin/commit.c:1581
4409 +#: builtin/commit.c:1583
4410 msgid "reuse message from specified commit"
4411 msgstr ""
4412
4413 -#: builtin/commit.c:1582
4413 +#: builtin/commit.c:1584
4414 msgid "use autosquash formatted message to fixup specified commit"
4415 msgstr ""
4416
4417 -#: builtin/commit.c:1583
4417 +#: builtin/commit.c:1585
4418 msgid "use autosquash formatted message to squash specified commit"
4419 msgstr ""
4420
4421 -#: builtin/commit.c:1584
4421 +#: builtin/commit.c:1586
4422 msgid "the commit is authored by me now (used with -C/-c/--amend)"
4423 msgstr ""
4424
4425 -#: builtin/commit.c:1585 builtin/log.c:1191 builtin/revert.c:86
4425 +#: builtin/commit.c:1587 builtin/log.c:1191 builtin/revert.c:86
4426 msgid "add Signed-off-by:"
4427 msgstr ""
4428
4429 -#: builtin/commit.c:1586
4429 +#: builtin/commit.c:1588
4430 msgid "use specified template file"
4431 msgstr ""
4432
4433 -#: builtin/commit.c:1587
4433 +#: builtin/commit.c:1589
4434 msgid "force edit of commit"
4435 msgstr ""
4436
4437 -#: builtin/commit.c:1588
4437 +#: builtin/commit.c:1590
4438 msgid "default"
4439 msgstr ""
4440
4441 -#: builtin/commit.c:1588 builtin/tag.c:604
4441 +#: builtin/commit.c:1590 builtin/tag.c:604
4442 msgid "how to strip spaces and #comments from message"
4443 msgstr ""
4444
4445 -#: builtin/commit.c:1589
4445 +#: builtin/commit.c:1591
4446 msgid "include status in commit message template"
4447 msgstr ""
4448
4449 -#: builtin/commit.c:1590 builtin/merge.c:225 builtin/revert.c:92
4449 +#: builtin/commit.c:1592 builtin/merge.c:225 builtin/revert.c:92
4450 #: builtin/tag.c:605
4451 msgid "key-id"
4452 msgstr ""
4453
4454 -#: builtin/commit.c:1591 builtin/merge.c:226 builtin/revert.c:93
4454 +#: builtin/commit.c:1593 builtin/merge.c:226 builtin/revert.c:93
4455 msgid "GPG sign commit"
4456 msgstr ""
4457
4458 -#: builtin/commit.c:1594
4458 +#: builtin/commit.c:1596
4459 msgid "Commit contents options"
4460 msgstr ""
4461
4462 -#: builtin/commit.c:1595
4462 +#: builtin/commit.c:1597
4463 msgid "commit all changed files"
4464 msgstr ""
4465
4466 -#: builtin/commit.c:1596
4466 +#: builtin/commit.c:1598
4467 msgid "add specified files to index for commit"
4468 msgstr ""
4469
4470 -#: builtin/commit.c:1597
4470 +#: builtin/commit.c:1599
4471 msgid "interactively add files"
4472 msgstr ""
4473
4474 -#: builtin/commit.c:1598
4474 +#: builtin/commit.c:1600
4475 msgid "interactively add changes"
4476 msgstr ""
4477
4478 -#: builtin/commit.c:1599
4478 +#: builtin/commit.c:1601
4479 msgid "commit only specified files"
4480 msgstr ""
4481
4482 -#: builtin/commit.c:1600
4482 +#: builtin/commit.c:1602
4483 msgid "bypass pre-commit hook"
4484 msgstr ""
4485
4486 -#: builtin/commit.c:1601
4486 +#: builtin/commit.c:1603
4487 msgid "show what would be committed"
4488 msgstr ""
4489
4490 -#: builtin/commit.c:1612
4490 +#: builtin/commit.c:1614
4491 msgid "amend previous commit"
4492 msgstr ""
4493
4494 -#: builtin/commit.c:1613
4494 +#: builtin/commit.c:1615
4495 msgid "bypass post-rewrite hook"
4496 msgstr ""
4497
4498 -#: builtin/commit.c:1618
4498 +#: builtin/commit.c:1620
4499 msgid "ok to record an empty change"
4500 msgstr ""
4501
4502 -#: builtin/commit.c:1620
4502 +#: builtin/commit.c:1622
4503 msgid "ok to record a change with an empty message"
4504 msgstr ""
4505
4506 -#: builtin/commit.c:1649
4506 +#: builtin/commit.c:1651
4507 msgid "could not parse HEAD commit"
4508 msgstr ""
4509
4510 -#: builtin/commit.c:1688 builtin/merge.c:519
4510 +#: builtin/commit.c:1690 builtin/merge.c:519
4511 #, c-format
4512 msgid "could not open '%s' for reading"
4513 msgstr ""
4514
4515 -#: builtin/commit.c:1695
4515 +#: builtin/commit.c:1697
4516 #, c-format
4517 msgid "Corrupt MERGE_HEAD file (%s)"
4518 msgstr ""
4519
4520 -#: builtin/commit.c:1702
4520 +#: builtin/commit.c:1704
4521 msgid "could not read MERGE_MODE"
4522 msgstr ""
4523
4524 -#: builtin/commit.c:1721
4524 +#: builtin/commit.c:1723
4525 #, c-format
4526 msgid "could not read commit message: %s"
4527 msgstr ""
4528
4529 -#: builtin/commit.c:1732
4529 +#: builtin/commit.c:1734
4530 #, c-format
4531 msgid "Aborting commit; you did not edit the message.\n"
4532 msgstr ""
4533
4534 -#: builtin/commit.c:1737
4534 +#: builtin/commit.c:1739
4535 #, c-format
4536 msgid "Aborting commit due to empty commit message.\n"
4537 msgstr ""
4538
4539 -#: builtin/commit.c:1752 builtin/merge.c:851 builtin/merge.c:876
4539 +#: builtin/commit.c:1754 builtin/merge.c:851 builtin/merge.c:876
4540 msgid "failed to write commit object"
4541 msgstr ""
4542
4543 -#: builtin/commit.c:1785
4543 +#: builtin/commit.c:1787
4544 msgid ""
4545 "Repository has been updated, but unable to write\n"
4546 "new_index file. Check that disk is not full and quota is\n"
@@ -9411,115 +9411,115 @@ msgstr ""
9411 msgid "git update-index [<options>] [--] [<file>...]"
9412 msgstr ""
9413
9414 -#: builtin/update-index.c:756
9414 +#: builtin/update-index.c:757
9415 msgid "continue refresh even when index needs update"
9416 msgstr ""
9417
9418 -#: builtin/update-index.c:759
9418 +#: builtin/update-index.c:760
9419 msgid "refresh: ignore submodules"
9420 msgstr ""
9421
9422 -#: builtin/update-index.c:762
9422 +#: builtin/update-index.c:763
9423 msgid "do not ignore new files"
9424 msgstr ""
9425
9426 -#: builtin/update-index.c:764
9426 +#: builtin/update-index.c:765
9427 msgid "let files replace directories and vice-versa"
9428 msgstr ""
9429
9430 -#: builtin/update-index.c:766
9430 +#: builtin/update-index.c:767
9431 msgid "notice files missing from worktree"
9432 msgstr ""
9433
9434 -#: builtin/update-index.c:768
9434 +#: builtin/update-index.c:769
9435 msgid "refresh even if index contains unmerged entries"
9436 msgstr ""
9437
9438 -#: builtin/update-index.c:771
9438 +#: builtin/update-index.c:772
9439 msgid "refresh stat information"
9440 msgstr ""
9441
9442 -#: builtin/update-index.c:775
9442 +#: builtin/update-index.c:776
9443 msgid "like --refresh, but ignore assume-unchanged setting"
9444 msgstr ""
9445
9446 -#: builtin/update-index.c:779
9446 +#: builtin/update-index.c:780
9447 msgid "<mode>,<object>,<path>"
9448 msgstr ""
9449
9450 -#: builtin/update-index.c:780
9450 +#: builtin/update-index.c:781
9451 msgid "add the specified entry to the index"
9452 msgstr ""
9453
9454 -#: builtin/update-index.c:784
9454 +#: builtin/update-index.c:785
9455 msgid "(+/-)x"
9456 msgstr ""
9457
9458 -#: builtin/update-index.c:785
9458 +#: builtin/update-index.c:786
9459 msgid "override the executable bit of the listed files"
9460 msgstr ""
9461
9462 -#: builtin/update-index.c:789
9462 +#: builtin/update-index.c:790
9463 msgid "mark files as \"not changing\""
9464 msgstr ""
9465
9466 -#: builtin/update-index.c:792
9466 +#: builtin/update-index.c:793
9467 msgid "clear assumed-unchanged bit"
9468 msgstr ""
9469
9470 -#: builtin/update-index.c:795
9470 +#: builtin/update-index.c:796
9471 msgid "mark files as \"index-only\""
9472 msgstr ""
9473
9474 -#: builtin/update-index.c:798
9474 +#: builtin/update-index.c:799
9475 msgid "clear skip-worktree bit"
9476 msgstr ""
9477
9478 -#: builtin/update-index.c:801
9478 +#: builtin/update-index.c:802
9479 msgid "add to index only; do not add content to object database"
9480 msgstr ""
9481
9482 -#: builtin/update-index.c:803
9482 +#: builtin/update-index.c:804
9483 msgid "remove named paths even if present in worktree"
9484 msgstr ""
9485
9486 -#: builtin/update-index.c:805
9486 +#: builtin/update-index.c:806
9487 msgid "with --stdin: input lines are terminated by null bytes"
9488 msgstr ""
9489
9490 -#: builtin/update-index.c:807
9490 +#: builtin/update-index.c:808
9491 msgid "read list of paths to be updated from standard input"
9492 msgstr ""
9493
9494 -#: builtin/update-index.c:811
9494 +#: builtin/update-index.c:812
9495 msgid "add entries from standard input to the index"
9496 msgstr ""
9497
9498 -#: builtin/update-index.c:815
9498 +#: builtin/update-index.c:816
9499 msgid "repopulate stages #2 and #3 for the listed paths"
9500 msgstr ""
9501
9502 -#: builtin/update-index.c:819
9502 +#: builtin/update-index.c:820
9503 msgid "only update entries that differ from HEAD"
9504 msgstr ""
9505
9506 -#: builtin/update-index.c:823
9506 +#: builtin/update-index.c:824
9507 msgid "ignore files missing from worktree"
9508 msgstr ""
9509
9510 -#: builtin/update-index.c:826
9510 +#: builtin/update-index.c:827
9511 msgid "report actions to standard output"
9512 msgstr ""
9513
9514 -#: builtin/update-index.c:828
9514 +#: builtin/update-index.c:829
9515 msgid "(for porcelains) forget saved unresolved conflicts"
9516 msgstr ""
9517
9518 -#: builtin/update-index.c:832
9518 +#: builtin/update-index.c:833
9519 msgid "write index in this format"
9520 msgstr ""
9521
9522 -#: builtin/update-index.c:834
9522 +#: builtin/update-index.c:835
9523 msgid "enable or disable split index"
9524 msgstr ""
9525