@matheusbsbs / matheus-bagliano / commits / fe52cd621f

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

Generate po/git.pot from v1.8.0-273-g2d242, and there are 14 new and 3 removed messages. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

Jiang Xin committed Nov 23, 2012 at 14:29 UTC fe52cd621feeab72f6cc7e0e1555cbf36d890c24
1 file changed +641 -583
po/git.pot
+641 -583
@@ -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: 2012-10-16 08:38+0800\n"
11 +"POT-Creation-Date: 2012-11-23 14:27+0800\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -60,7 +60,7 @@ msgstr ""
60 msgid "archive format"
61 msgstr ""
62
63 -#: archive.c:323 builtin/log.c:1079
63 +#: archive.c:323 builtin/log.c:1084
64 msgid "prefix"
65 msgstr ""
66
@@ -68,9 +68,9 @@ msgstr ""
68 msgid "prepend prefix to each pathname in the archive"
69 msgstr ""
70
71 -#: archive.c:325 builtin/archive.c:91 builtin/blame.c:2389
72 -#: builtin/blame.c:2390 builtin/config.c:56 builtin/fast-export.c:642
73 -#: builtin/fast-export.c:644 builtin/grep.c:801 builtin/hash-object.c:77
71 +#: archive.c:325 builtin/archive.c:91 builtin/blame.c:2390
72 +#: builtin/blame.c:2391 builtin/config.c:55 builtin/fast-export.c:642
73 +#: builtin/fast-export.c:644 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
76 msgid "file"
@@ -120,6 +120,12 @@ msgstr ""
120 msgid "path to the remote git-upload-archive command"
121 msgstr ""
122
123 +#: attr.c:259
124 +msgid ""
125 +"Negative patterns are forbidden in git attributes\n"
126 +"Use '\\!' for literal leading exclamation."
127 +msgstr ""
128 +
129 #: bundle.c:36
130 #, c-format
131 msgid "'%s' does not look like a v2 bundle file"
@@ -130,7 +136,7 @@ msgstr ""
136 msgid "unrecognized header: %s%s (%d)"
137 msgstr ""
138
133 -#: bundle.c:89 builtin/commit.c:672
139 +#: bundle.c:89 builtin/commit.c:674
140 #, c-format
141 msgid "could not open '%s'"
142 msgstr ""
@@ -140,7 +146,7 @@ msgid "Repository lacks these prerequisite commits:"
146 msgstr ""
147
148 #: bundle.c:164 sequencer.c:562 sequencer.c:994 builtin/log.c:290
143 -#: builtin/log.c:727 builtin/log.c:1313 builtin/log.c:1529 builtin/merge.c:347
149 +#: builtin/log.c:732 builtin/log.c:1319 builtin/log.c:1535 builtin/merge.c:347
150 #: builtin/shortlog.c:181
151 msgid "revision walk setup failed"
152 msgstr ""
@@ -167,7 +173,7 @@ msgstr[1] ""
173 msgid "rev-list died"
174 msgstr ""
175
170 -#: bundle.c:300 builtin/log.c:1209 builtin/shortlog.c:284
176 +#: bundle.c:300 builtin/log.c:1215 builtin/shortlog.c:284
177 #, c-format
178 msgid "unrecognized argument: %s"
179 msgstr ""
@@ -293,24 +299,24 @@ msgid_plural "%lu years ago"
299 msgstr[0] ""
300 msgstr[1] ""
301
296 -#: diff.c:105
302 +#: diff.c:111
303 #, c-format
298 -msgid " Failed to parse dirstat cut-off percentage '%.*s'\n"
304 +msgid " Failed to parse dirstat cut-off percentage '%s'\n"
305 msgstr ""
306
301 -#: diff.c:110
307 +#: diff.c:116
308 #, c-format
303 -msgid " Unknown dirstat parameter '%.*s'\n"
309 +msgid " Unknown dirstat parameter '%s'\n"
310 msgstr ""
311
306 -#: diff.c:210
312 +#: diff.c:219
313 #, c-format
314 msgid ""
315 "Found errors in 'diff.dirstat' config variable:\n"
316 "%s"
317 msgstr ""
318
313 -#: diff.c:3458
319 +#: diff.c:3467
320 #, c-format
321 msgid ""
322 "Failed to parse --dirstat/-X option parameter:\n"
@@ -329,17 +335,17 @@ msgstr ""
335 msgid "gpg failed to sign the data"
336 msgstr ""
337
332 -#: grep.c:1441
338 +#: grep.c:1622
339 #, c-format
340 msgid "'%s': unable to read %s"
341 msgstr ""
342
337 -#: grep.c:1458
343 +#: grep.c:1639
344 #, c-format
345 msgid "'%s': %s"
346 msgstr ""
347
342 -#: grep.c:1469
348 +#: grep.c:1650
349 #, c-format
350 msgid "'%s': short read %s"
351 msgstr ""
@@ -391,6 +397,15 @@ msgid_plural ""
397 msgstr[0] ""
398 msgstr[1] ""
399
400 +#: merge.c:56
401 +msgid "failed to read the cache"
402 +msgstr ""
403 +
404 +#: merge.c:110 builtin/checkout.c:333 builtin/checkout.c:534
405 +#: builtin/clone.c:586
406 +msgid "unable to write new index file"
407 +msgstr ""
408 +
409 #: merge-recursive.c:190
410 #, c-format
411 msgid "(bad commit)\n"
@@ -563,7 +578,7 @@ msgstr ""
578 msgid "Auto-merging %s"
579 msgstr ""
580
566 -#: merge-recursive.c:1633 git-submodule.sh:869
581 +#: merge-recursive.c:1633 git-submodule.sh:893
582 msgid "submodule"
583 msgstr ""
584
@@ -633,7 +648,7 @@ msgstr ""
648 msgid "Could not parse object '%s'"
649 msgstr ""
650
636 -#: merge-recursive.c:2009 builtin/merge.c:696
651 +#: merge-recursive.c:2009 builtin/merge.c:643
652 msgid "Unable to write index."
653 msgstr ""
654
@@ -684,14 +699,14 @@ msgid_plural ""
699 msgstr[0] ""
700 msgstr[1] ""
701
687 -#: sequencer.c:123 builtin/merge.c:864 builtin/merge.c:977
688 -#: builtin/merge.c:1087 builtin/merge.c:1097
702 +#: sequencer.c:123 builtin/merge.c:761 builtin/merge.c:874 builtin/merge.c:984
703 +#: builtin/merge.c:994
704 #, c-format
705 msgid "Could not open '%s' for writing"
706 msgstr ""
707
693 -#: sequencer.c:125 builtin/merge.c:333 builtin/merge.c:867
694 -#: builtin/merge.c:1089 builtin/merge.c:1102
708 +#: sequencer.c:125 builtin/merge.c:333 builtin/merge.c:764 builtin/merge.c:986
709 +#: builtin/merge.c:999
710 #, c-format
711 msgid "Could not write to '%s'"
712 msgstr ""
@@ -1299,7 +1314,7 @@ msgstr ""
1314 msgid "unexpected diff status %c"
1315 msgstr ""
1316
1302 -#: builtin/add.c:67 builtin/commit.c:230
1317 +#: builtin/add.c:67 builtin/commit.c:231
1318 msgid "updating files failed"
1319 msgstr ""
1320
@@ -1317,7 +1332,7 @@ msgstr ""
1332 msgid "Unstaged changes after refreshing the index:"
1333 msgstr ""
1334
1320 -#: builtin/add.c:195 builtin/add.c:460 builtin/rm.c:186
1335 +#: builtin/add.c:195 builtin/add.c:460 builtin/rm.c:260
1336 #, c-format
1337 msgid "pathspec '%s' did not match any files"
1338 msgstr ""
@@ -1360,12 +1375,12 @@ msgstr ""
1375
1376 #: builtin/add.c:319 builtin/clean.c:52 builtin/fetch.c:78 builtin/mv.c:63
1377 #: builtin/prune-packed.c:76 builtin/push.c:388 builtin/remote.c:1253
1363 -#: builtin/rm.c:133
1378 +#: builtin/rm.c:206
1379 msgid "dry run"
1380 msgstr ""
1381
1367 -#: builtin/add.c:320 builtin/apply.c:4354 builtin/commit.c:1154
1368 -#: builtin/count-objects.c:82 builtin/fsck.c:613 builtin/log.c:1477
1382 +#: builtin/add.c:320 builtin/apply.c:4354 builtin/commit.c:1160
1383 +#: builtin/count-objects.c:82 builtin/fsck.c:613 builtin/log.c:1483
1384 #: builtin/mv.c:62 builtin/read-tree.c:112
1385 msgid "be verbose"
1386 msgstr ""
@@ -1374,7 +1389,7 @@ msgstr ""
1389 msgid "interactive picking"
1390 msgstr ""
1391
1377 -#: builtin/add.c:323 builtin/checkout.c:1028 builtin/reset.c:248
1392 +#: builtin/add.c:323 builtin/checkout.c:1031 builtin/reset.c:248
1393 msgid "select hunks interactively"
1394 msgstr ""
1395
@@ -1441,12 +1456,12 @@ msgstr ""
1456 msgid "Maybe you wanted to say 'git add .'?\n"
1457 msgstr ""
1458
1444 -#: builtin/add.c:421 builtin/clean.c:95 builtin/commit.c:290 builtin/mv.c:82
1445 -#: builtin/rm.c:162
1459 +#: builtin/add.c:421 builtin/clean.c:95 builtin/commit.c:291 builtin/mv.c:82
1460 +#: builtin/rm.c:235
1461 msgid "index file corrupt"
1462 msgstr ""
1463
1449 -#: builtin/add.c:481 builtin/apply.c:4450 builtin/mv.c:229 builtin/rm.c:260
1464 +#: builtin/add.c:481 builtin/apply.c:4450 builtin/mv.c:229 builtin/rm.c:355
1465 msgid "Unable to write new index file"
1466 msgstr ""
1467
@@ -1975,95 +1990,95 @@ msgstr ""
1990 msgid "[rev-opts] are documented in git-rev-list(1)"
1991 msgstr ""
1992
1978 -#: builtin/blame.c:2373
1993 +#: builtin/blame.c:2374
1994 msgid "Show blame entries as we find them, incrementally"
1995 msgstr ""
1996
1982 -#: builtin/blame.c:2374
1997 +#: builtin/blame.c:2375
1998 msgid "Show blank SHA-1 for boundary commits (Default: off)"
1999 msgstr ""
2000
1986 -#: builtin/blame.c:2375
2001 +#: builtin/blame.c:2376
2002 msgid "Do not treat root commits as boundaries (Default: off)"
2003 msgstr ""
2004
1990 -#: builtin/blame.c:2376
2005 +#: builtin/blame.c:2377
2006 msgid "Show work cost statistics"
2007 msgstr ""
2008
1994 -#: builtin/blame.c:2377
2009 +#: builtin/blame.c:2378
2010 msgid "Show output score for blame entries"
2011 msgstr ""
2012
1998 -#: builtin/blame.c:2378
2013 +#: builtin/blame.c:2379
2014 msgid "Show original filename (Default: auto)"
2015 msgstr ""
2016
2002 -#: builtin/blame.c:2379
2017 +#: builtin/blame.c:2380
2018 msgid "Show original linenumber (Default: off)"
2019 msgstr ""
2020
2006 -#: builtin/blame.c:2380
2021 +#: builtin/blame.c:2381
2022 msgid "Show in a format designed for machine consumption"
2023 msgstr ""
2024
2010 -#: builtin/blame.c:2381
2025 +#: builtin/blame.c:2382
2026 msgid "Show porcelain format with per-line commit information"
2027 msgstr ""
2028
2014 -#: builtin/blame.c:2382
2029 +#: builtin/blame.c:2383
2030 msgid "Use the same output mode as git-annotate (Default: off)"
2031 msgstr ""
2032
2018 -#: builtin/blame.c:2383
2033 +#: builtin/blame.c:2384
2034 msgid "Show raw timestamp (Default: off)"
2035 msgstr ""
2036
2022 -#: builtin/blame.c:2384
2037 +#: builtin/blame.c:2385
2038 msgid "Show long commit SHA1 (Default: off)"
2039 msgstr ""
2040
2026 -#: builtin/blame.c:2385
2041 +#: builtin/blame.c:2386
2042 msgid "Suppress author name and timestamp (Default: off)"
2043 msgstr ""
2044
2030 -#: builtin/blame.c:2386
2045 +#: builtin/blame.c:2387
2046 msgid "Show author email instead of name (Default: off)"
2047 msgstr ""
2048
2034 -#: builtin/blame.c:2387
2049 +#: builtin/blame.c:2388
2050 msgid "Ignore whitespace differences"
2051 msgstr ""
2052
2038 -#: builtin/blame.c:2388
2053 +#: builtin/blame.c:2389
2054 msgid "Spend extra cycles to find better match"
2055 msgstr ""
2056
2042 -#: builtin/blame.c:2389
2057 +#: builtin/blame.c:2390
2058 msgid "Use revisions from <file> instead of calling git-rev-list"
2059 msgstr ""
2060
2046 -#: builtin/blame.c:2390
2061 +#: builtin/blame.c:2391
2062 msgid "Use <file>'s contents as the final image"
2063 msgstr ""
2064
2050 -#: builtin/blame.c:2391 builtin/blame.c:2392
2065 +#: builtin/blame.c:2392 builtin/blame.c:2393
2066 msgid "score"
2067 msgstr ""
2068
2054 -#: builtin/blame.c:2391
2069 +#: builtin/blame.c:2392
2070 msgid "Find line copies within and across files"
2071 msgstr ""
2072
2058 -#: builtin/blame.c:2392
2073 +#: builtin/blame.c:2393
2074 msgid "Find line movements within and across files"
2075 msgstr ""
2076
2062 -#: builtin/blame.c:2393
2077 +#: builtin/blame.c:2394
2078 msgid "n,m"
2079 msgstr ""
2080
2066 -#: builtin/blame.c:2393
2081 +#: builtin/blame.c:2394
2082 msgid "Process only line range n,m, counting from 1"
2083 msgstr ""
2084
@@ -2097,269 +2112,269 @@ msgid ""
2112 " '%s', even though it is merged to HEAD."
2113 msgstr ""
2114
2100 -#: builtin/branch.c:181
2115 +#: builtin/branch.c:163
2116 +#, c-format
2117 +msgid "Couldn't look up commit object for '%s'"
2118 +msgstr ""
2119 +
2120 +#: builtin/branch.c:167
2121 +#, c-format
2122 +msgid ""
2123 +"The branch '%s' is not fully merged.\n"
2124 +"If you are sure you want to delete it, run 'git branch -D %s'."
2125 +msgstr ""
2126 +
2127 +#: builtin/branch.c:180
2128 +msgid "Update of config-file failed"
2129 +msgstr ""
2130 +
2131 +#: builtin/branch.c:208
2132 msgid "cannot use -a with -d"
2133 msgstr ""
2134
2104 -#: builtin/branch.c:187
2135 +#: builtin/branch.c:214
2136 msgid "Couldn't look up commit object for HEAD"
2137 msgstr ""
2138
2108 -#: builtin/branch.c:192
2139 +#: builtin/branch.c:222
2140 #, c-format
2141 msgid "Cannot delete the branch '%s' which you are currently on."
2142 msgstr ""
2143
2113 -#: builtin/branch.c:203
2144 +#: builtin/branch.c:235
2145 #, c-format
2146 msgid "remote branch '%s' not found."
2147 msgstr ""
2148
2118 -#: builtin/branch.c:204
2149 +#: builtin/branch.c:236
2150 #, c-format
2151 msgid "branch '%s' not found."
2152 msgstr ""
2153
2123 -#: builtin/branch.c:211
2124 -#, c-format
2125 -msgid "Couldn't look up commit object for '%s'"
2126 -msgstr ""
2127 -
2128 -#: builtin/branch.c:217
2129 -#, c-format
2130 -msgid ""
2131 -"The branch '%s' is not fully merged.\n"
2132 -"If you are sure you want to delete it, run 'git branch -D %s'."
2133 -msgstr ""
2134 -
2135 -#: builtin/branch.c:226
2154 +#: builtin/branch.c:250
2155 #, c-format
2156 msgid "Error deleting remote branch '%s'"
2157 msgstr ""
2158
2140 -#: builtin/branch.c:227
2159 +#: builtin/branch.c:251
2160 #, c-format
2161 msgid "Error deleting branch '%s'"
2162 msgstr ""
2163
2145 -#: builtin/branch.c:234
2164 +#: builtin/branch.c:258
2165 #, c-format
2166 msgid "Deleted remote branch %s (was %s).\n"
2167 msgstr ""
2168
2150 -#: builtin/branch.c:235
2169 +#: builtin/branch.c:259
2170 #, c-format
2171 msgid "Deleted branch %s (was %s).\n"
2172 msgstr ""
2173
2155 -#: builtin/branch.c:240
2156 -msgid "Update of config-file failed"
2157 -msgstr ""
2158 -
2159 -#: builtin/branch.c:338
2174 +#: builtin/branch.c:361
2175 #, c-format
2176 msgid "branch '%s' does not point at a commit"
2177 msgstr ""
2178
2164 -#: builtin/branch.c:410
2179 +#: builtin/branch.c:433
2180 #, c-format
2181 msgid "[%s: behind %d]"
2182 msgstr ""
2183
2169 -#: builtin/branch.c:412
2184 +#: builtin/branch.c:435
2185 #, c-format
2186 msgid "[behind %d]"
2187 msgstr ""
2188
2174 -#: builtin/branch.c:416
2189 +#: builtin/branch.c:439
2190 #, c-format
2191 msgid "[%s: ahead %d]"
2192 msgstr ""
2193
2179 -#: builtin/branch.c:418
2194 +#: builtin/branch.c:441
2195 #, c-format
2196 msgid "[ahead %d]"
2197 msgstr ""
2198
2184 -#: builtin/branch.c:421
2199 +#: builtin/branch.c:444
2200 #, c-format
2201 msgid "[%s: ahead %d, behind %d]"
2202 msgstr ""
2203
2189 -#: builtin/branch.c:424
2204 +#: builtin/branch.c:447
2205 #, c-format
2206 msgid "[ahead %d, behind %d]"
2207 msgstr ""
2208
2194 -#: builtin/branch.c:537
2209 +#: builtin/branch.c:560
2210 msgid "(no branch)"
2211 msgstr ""
2212
2198 -#: builtin/branch.c:602
2213 +#: builtin/branch.c:625
2214 msgid "some refs could not be read"
2215 msgstr ""
2216
2202 -#: builtin/branch.c:615
2217 +#: builtin/branch.c:638
2218 msgid "cannot rename the current branch while not on any."
2219 msgstr ""
2220
2206 -#: builtin/branch.c:625
2221 +#: builtin/branch.c:648
2222 #, c-format
2223 msgid "Invalid branch name: '%s'"
2224 msgstr ""
2225
2211 -#: builtin/branch.c:640
2226 +#: builtin/branch.c:663
2227 msgid "Branch rename failed"
2228 msgstr ""
2229
2215 -#: builtin/branch.c:644
2230 +#: builtin/branch.c:667
2231 #, c-format
2232 msgid "Renamed a misnamed branch '%s' away"
2233 msgstr ""
2234
2220 -#: builtin/branch.c:648
2235 +#: builtin/branch.c:671
2236 #, c-format
2237 msgid "Branch renamed to %s, but HEAD is not updated!"
2238 msgstr ""
2239
2225 -#: builtin/branch.c:655
2240 +#: builtin/branch.c:678
2241 msgid "Branch is renamed, but update of config-file failed"
2242 msgstr ""
2243
2229 -#: builtin/branch.c:670
2244 +#: builtin/branch.c:693
2245 #, c-format
2246 msgid "malformed object name %s"
2247 msgstr ""
2248
2234 -#: builtin/branch.c:694
2249 +#: builtin/branch.c:717
2250 #, c-format
2251 msgid "could not write branch description template: %s"
2252 msgstr ""
2253
2239 -#: builtin/branch.c:724
2254 +#: builtin/branch.c:747
2255 msgid "Generic options"
2256 msgstr ""
2257
2243 -#: builtin/branch.c:726
2258 +#: builtin/branch.c:749
2259 msgid "show hash and subject, give twice for upstream branch"
2260 msgstr ""
2261
2247 -#: builtin/branch.c:727
2262 +#: builtin/branch.c:750
2263 msgid "suppress informational messages"
2264 msgstr ""
2265
2251 -#: builtin/branch.c:728
2266 +#: builtin/branch.c:751
2267 msgid "set up tracking mode (see git-pull(1))"
2268 msgstr ""
2269
2255 -#: builtin/branch.c:730
2270 +#: builtin/branch.c:753
2271 msgid "change upstream info"
2272 msgstr ""
2273
2259 -#: builtin/branch.c:734
2274 +#: builtin/branch.c:757
2275 msgid "use colored output"
2276 msgstr ""
2277
2263 -#: builtin/branch.c:735
2278 +#: builtin/branch.c:758
2279 msgid "act on remote-tracking branches"
2280 msgstr ""
2281
2267 -#: builtin/branch.c:738 builtin/branch.c:744 builtin/branch.c:765
2268 -#: builtin/branch.c:771 builtin/commit.c:1362 builtin/commit.c:1363
2269 -#: builtin/commit.c:1364 builtin/commit.c:1365 builtin/tag.c:470
2282 +#: builtin/branch.c:761 builtin/branch.c:767 builtin/branch.c:788
2283 +#: builtin/branch.c:794 builtin/commit.c:1376 builtin/commit.c:1377
2284 +#: builtin/commit.c:1378 builtin/commit.c:1379 builtin/tag.c:470
2285 msgid "commit"
2286 msgstr ""
2287
2273 -#: builtin/branch.c:739 builtin/branch.c:745
2288 +#: builtin/branch.c:762 builtin/branch.c:768
2289 msgid "print only branches that contain the commit"
2290 msgstr ""
2291
2277 -#: builtin/branch.c:751
2292 +#: builtin/branch.c:774
2293 msgid "Specific git-branch actions:"
2294 msgstr ""
2295
2281 -#: builtin/branch.c:752
2296 +#: builtin/branch.c:775
2297 msgid "list both remote-tracking and local branches"
2298 msgstr ""
2299
2285 -#: builtin/branch.c:754
2300 +#: builtin/branch.c:777
2301 msgid "delete fully merged branch"
2302 msgstr ""
2303
2289 -#: builtin/branch.c:755
2304 +#: builtin/branch.c:778
2305 msgid "delete branch (even if not merged)"
2306 msgstr ""
2307
2293 -#: builtin/branch.c:756
2308 +#: builtin/branch.c:779
2309 msgid "move/rename a branch and its reflog"
2310 msgstr ""
2311
2297 -#: builtin/branch.c:757
2312 +#: builtin/branch.c:780
2313 msgid "move/rename a branch, even if target exists"
2314 msgstr ""
2315
2301 -#: builtin/branch.c:758
2316 +#: builtin/branch.c:781
2317 msgid "list branch names"
2318 msgstr ""
2319
2305 -#: builtin/branch.c:759
2320 +#: builtin/branch.c:782
2321 msgid "create the branch's reflog"
2322 msgstr ""
2323
2309 -#: builtin/branch.c:761
2324 +#: builtin/branch.c:784
2325 msgid "edit the description for the branch"
2326 msgstr ""
2327
2313 -#: builtin/branch.c:762
2328 +#: builtin/branch.c:785
2329 msgid "force creation (when already exists)"
2330 msgstr ""
2331
2317 -#: builtin/branch.c:765
2332 +#: builtin/branch.c:788
2333 msgid "print only not merged branches"
2334 msgstr ""
2335
2321 -#: builtin/branch.c:771
2336 +#: builtin/branch.c:794
2337 msgid "print only merged branches"
2338 msgstr ""
2339
2325 -#: builtin/branch.c:775
2340 +#: builtin/branch.c:798
2341 msgid "list branches in columns"
2342 msgstr ""
2343
2329 -#: builtin/branch.c:788
2344 +#: builtin/branch.c:811
2345 msgid "Failed to resolve HEAD as a valid ref."
2346 msgstr ""
2347
2333 -#: builtin/branch.c:793 builtin/clone.c:561
2348 +#: builtin/branch.c:816 builtin/clone.c:561
2349 msgid "HEAD not found below refs/heads!"
2350 msgstr ""
2351
2337 -#: builtin/branch.c:813
2352 +#: builtin/branch.c:836
2353 msgid "--column and --verbose are incompatible"
2354 msgstr ""
2355
2341 -#: builtin/branch.c:864
2356 +#: builtin/branch.c:887
2357 #, c-format
2358 msgid "branch '%s' does not exist"
2359 msgstr ""
2360
2346 -#: builtin/branch.c:876
2361 +#: builtin/branch.c:899
2362 #, c-format
2363 msgid "Branch '%s' has no upstream information"
2364 msgstr ""
2365
2351 -#: builtin/branch.c:891
2366 +#: builtin/branch.c:914
2367 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
2368 msgstr ""
2369
2355 -#: builtin/branch.c:894
2370 +#: builtin/branch.c:917
2371 #, c-format
2372 msgid ""
2373 "The --set-upstream flag is deprecated and will be removed. Consider using --"
2374 "track or --set-upstream-to\n"
2375 msgstr ""
2376
2362 -#: builtin/branch.c:911
2377 +#: builtin/branch.c:934
2378 #, c-format
2379 msgid ""
2380 "\n"
@@ -2367,12 +2382,12 @@ msgid ""
2382 "\n"
2383 msgstr ""
2384
2370 -#: builtin/branch.c:912
2385 +#: builtin/branch.c:935
2386 #, c-format
2387 msgid " git branch -d %s\n"
2388 msgstr ""
2389
2375 -#: builtin/branch.c:913
2390 +#: builtin/branch.c:936
2391 #, c-format
2392 msgid " git branch --set-upstream-to %s\n"
2393 msgstr ""
@@ -2561,11 +2576,6 @@ msgstr ""
2576 msgid "path '%s' is unmerged"
2577 msgstr ""
2578
2564 -#: builtin/checkout.c:333 builtin/checkout.c:534 builtin/clone.c:586
2565 -#: builtin/merge.c:811
2566 -msgid "unable to write new index file"
2567 -msgstr ""
2568 -
2579 #: builtin/checkout.c:448
2580 msgid "you need to resolve your current index first"
2581 msgstr ""
@@ -2594,7 +2604,7 @@ msgstr ""
2604 msgid "Switched to and reset branch '%s'\n"
2605 msgstr ""
2606
2597 -#: builtin/checkout.c:618
2607 +#: builtin/checkout.c:618 builtin/checkout.c:955
2608 #, c-format
2609 msgid "Switched to a new branch '%s'\n"
2610 msgstr ""
@@ -2659,124 +2669,124 @@ msgstr ""
2669 msgid "reference is not a tree: %s"
2670 msgstr ""
2671
2662 -#: builtin/checkout.c:961
2672 +#: builtin/checkout.c:964
2673 msgid "paths cannot be used with switching branches"
2674 msgstr ""
2675
2666 -#: builtin/checkout.c:964 builtin/checkout.c:968
2676 +#: builtin/checkout.c:967 builtin/checkout.c:971
2677 #, c-format
2678 msgid "'%s' cannot be used with switching branches"
2679 msgstr ""
2680
2671 -#: builtin/checkout.c:972 builtin/checkout.c:975 builtin/checkout.c:980
2672 -#: builtin/checkout.c:983
2681 +#: builtin/checkout.c:975 builtin/checkout.c:978 builtin/checkout.c:983
2682 +#: builtin/checkout.c:986
2683 #, c-format
2684 msgid "'%s' cannot be used with '%s'"
2685 msgstr ""
2686
2677 -#: builtin/checkout.c:988
2687 +#: builtin/checkout.c:991
2688 #, c-format
2689 msgid "Cannot switch branch to a non-commit '%s'"
2690 msgstr ""
2691
2682 -#: builtin/checkout.c:1009 builtin/gc.c:177
2692 +#: builtin/checkout.c:1012 builtin/gc.c:177
2693 msgid "suppress progress reporting"
2694 msgstr ""
2695
2686 -#: builtin/checkout.c:1010 builtin/checkout.c:1012 builtin/clone.c:89
2696 +#: builtin/checkout.c:1013 builtin/checkout.c:1015 builtin/clone.c:89
2697 #: builtin/remote.c:169 builtin/remote.c:171
2698 msgid "branch"
2699 msgstr ""
2700
2691 -#: builtin/checkout.c:1011
2701 +#: builtin/checkout.c:1014
2702 msgid "create and checkout a new branch"
2703 msgstr ""
2704
2695 -#: builtin/checkout.c:1013
2705 +#: builtin/checkout.c:1016
2706 msgid "create/reset and checkout a branch"
2707 msgstr ""
2708
2699 -#: builtin/checkout.c:1014
2709 +#: builtin/checkout.c:1017
2710 msgid "create reflog for new branch"
2711 msgstr ""
2712
2703 -#: builtin/checkout.c:1015
2713 +#: builtin/checkout.c:1018
2714 msgid "detach the HEAD at named commit"
2715 msgstr ""
2716
2707 -#: builtin/checkout.c:1016
2717 +#: builtin/checkout.c:1019
2718 msgid "set upstream info for new branch"
2719 msgstr ""
2720
2711 -#: builtin/checkout.c:1018
2721 +#: builtin/checkout.c:1021
2722 msgid "new branch"
2723 msgstr ""
2724
2715 -#: builtin/checkout.c:1018
2725 +#: builtin/checkout.c:1021
2726 msgid "new unparented branch"
2727 msgstr ""
2728
2719 -#: builtin/checkout.c:1019
2729 +#: builtin/checkout.c:1022
2730 msgid "checkout our version for unmerged files"
2731 msgstr ""
2732
2723 -#: builtin/checkout.c:1021
2733 +#: builtin/checkout.c:1024
2734 msgid "checkout their version for unmerged files"
2735 msgstr ""
2736
2727 -#: builtin/checkout.c:1023
2737 +#: builtin/checkout.c:1026
2738 msgid "force checkout (throw away local modifications)"
2739 msgstr ""
2740
2731 -#: builtin/checkout.c:1024
2741 +#: builtin/checkout.c:1027
2742 msgid "perform a 3-way merge with the new branch"
2743 msgstr ""
2744
2735 -#: builtin/checkout.c:1025 builtin/merge.c:215
2745 +#: builtin/checkout.c:1028 builtin/merge.c:215
2746 msgid "update ignored files (default)"
2747 msgstr ""
2748
2739 -#: builtin/checkout.c:1026 builtin/log.c:1111 parse-options.h:241
2749 +#: builtin/checkout.c:1029 builtin/log.c:1116 parse-options.h:241
2750 msgid "style"
2751 msgstr ""
2752
2743 -#: builtin/checkout.c:1027
2753 +#: builtin/checkout.c:1030
2754 msgid "conflict style (merge or diff3)"
2755 msgstr ""
2756
2747 -#: builtin/checkout.c:1030
2757 +#: builtin/checkout.c:1033
2758 msgid "second guess 'git checkout no-such-branch'"
2759 msgstr ""
2760
2751 -#: builtin/checkout.c:1054
2761 +#: builtin/checkout.c:1057
2762 msgid "-b, -B and --orphan are mutually exclusive"
2763 msgstr ""
2764
2755 -#: builtin/checkout.c:1071
2765 +#: builtin/checkout.c:1074
2766 msgid "--track needs a branch name"
2767 msgstr ""
2768
2759 -#: builtin/checkout.c:1078
2769 +#: builtin/checkout.c:1081
2770 msgid "Missing branch name; try -b"
2771 msgstr ""
2772
2763 -#: builtin/checkout.c:1113
2773 +#: builtin/checkout.c:1116
2774 msgid "invalid path specification"
2775 msgstr ""
2776
2767 -#: builtin/checkout.c:1120
2777 +#: builtin/checkout.c:1123
2778 #, c-format
2779 msgid ""
2780 "Cannot update paths and switch to branch '%s' at the same time.\n"
2781 "Did you intend to checkout '%s' which can not be resolved as commit?"
2782 msgstr ""
2783
2774 -#: builtin/checkout.c:1125
2784 +#: builtin/checkout.c:1128
2785 #, c-format
2786 msgid "git checkout: --detach does not take a path argument '%s'"
2787 msgstr ""
2788
2779 -#: builtin/checkout.c:1129
2789 +#: builtin/checkout.c:1132
2790 msgid ""
2791 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
2792 "checking out of the index."
@@ -2798,8 +2808,8 @@ msgstr ""
2808 msgid "remove whole directories"
2809 msgstr ""
2810
2801 -#: builtin/clean.c:56 builtin/describe.c:413 builtin/grep.c:803
2802 -#: builtin/ls-files.c:491 builtin/name-rev.c:231 builtin/show-ref.c:199
2811 +#: builtin/clean.c:56 builtin/describe.c:413 builtin/grep.c:717
2812 +#: builtin/ls-files.c:491 builtin/name-rev.c:231 builtin/show-ref.c:182
2813 msgid "pattern"
2814 msgstr ""
2815
@@ -2920,7 +2930,7 @@ msgstr ""
2930 msgid "path to git-upload-pack on the remote"
2931 msgstr ""
2932
2923 -#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:748
2933 +#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:662
2934 msgid "depth"
2935 msgstr ""
2936
@@ -3134,93 +3144,93 @@ msgid ""
3144 "Otherwise, please use 'git reset'\n"
3145 msgstr ""
3146
3137 -#: builtin/commit.c:257
3147 +#: builtin/commit.c:258
3148 msgid "failed to unpack HEAD tree object"
3149 msgstr ""
3150
3141 -#: builtin/commit.c:299
3151 +#: builtin/commit.c:300
3152 msgid "unable to create temporary index"
3153 msgstr ""
3154
3145 -#: builtin/commit.c:305
3155 +#: builtin/commit.c:306
3156 msgid "interactive add failed"
3157 msgstr ""
3158
3149 -#: builtin/commit.c:338 builtin/commit.c:359 builtin/commit.c:409
3159 +#: builtin/commit.c:339 builtin/commit.c:360 builtin/commit.c:410
3160 msgid "unable to write new_index file"
3161 msgstr ""
3162
3153 -#: builtin/commit.c:390
3163 +#: builtin/commit.c:391
3164 msgid "cannot do a partial commit during a merge."
3165 msgstr ""
3166
3157 -#: builtin/commit.c:392
3167 +#: builtin/commit.c:393
3168 msgid "cannot do a partial commit during a cherry-pick."
3169 msgstr ""
3170
3161 -#: builtin/commit.c:402
3171 +#: builtin/commit.c:403
3172 msgid "cannot read the index"
3173 msgstr ""
3174
3165 -#: builtin/commit.c:422
3175 +#: builtin/commit.c:423
3176 msgid "unable to write temporary index file"
3177 msgstr ""
3178
3169 -#: builtin/commit.c:509 builtin/commit.c:515
3179 +#: builtin/commit.c:511 builtin/commit.c:517
3180 #, c-format
3181 msgid "invalid commit: %s"
3182 msgstr ""
3183
3174 -#: builtin/commit.c:538
3184 +#: builtin/commit.c:540
3185 msgid "malformed --author parameter"
3186 msgstr ""
3187
3178 -#: builtin/commit.c:558
3188 +#: builtin/commit.c:560
3189 #, c-format
3190 msgid "Malformed ident string: '%s'"
3191 msgstr ""
3192
3183 -#: builtin/commit.c:596 builtin/commit.c:629 builtin/commit.c:952
3193 +#: builtin/commit.c:598 builtin/commit.c:631 builtin/commit.c:954
3194 #, c-format
3195 msgid "could not lookup commit %s"
3196 msgstr ""
3197
3188 -#: builtin/commit.c:608 builtin/shortlog.c:296
3198 +#: builtin/commit.c:610 builtin/shortlog.c:296
3199 #, c-format
3200 msgid "(reading log message from standard input)\n"
3201 msgstr ""
3202
3193 -#: builtin/commit.c:610
3203 +#: builtin/commit.c:612
3204 msgid "could not read log from standard input"
3205 msgstr ""
3206
3197 -#: builtin/commit.c:614
3207 +#: builtin/commit.c:616
3208 #, c-format
3209 msgid "could not read log file '%s'"
3210 msgstr ""
3211
3202 -#: builtin/commit.c:620
3212 +#: builtin/commit.c:622
3213 msgid "commit has empty message"
3214 msgstr ""
3215
3206 -#: builtin/commit.c:636
3216 +#: builtin/commit.c:638
3217 msgid "could not read MERGE_MSG"
3218 msgstr ""
3219
3210 -#: builtin/commit.c:640
3220 +#: builtin/commit.c:642
3221 msgid "could not read SQUASH_MSG"
3222 msgstr ""
3223
3214 -#: builtin/commit.c:644
3224 +#: builtin/commit.c:646
3225 #, c-format
3226 msgid "could not read '%s'"
3227 msgstr ""
3228
3219 -#: builtin/commit.c:705
3229 +#: builtin/commit.c:707
3230 msgid "could not write commit template"
3231 msgstr ""
3232
3223 -#: builtin/commit.c:716
3233 +#: builtin/commit.c:718
3234 #, c-format
3235 msgid ""
3236 "\n"
@@ -3230,7 +3240,7 @@ msgid ""
3240 "and try again.\n"
3241 msgstr ""
3242
3233 -#: builtin/commit.c:721
3243 +#: builtin/commit.c:723
3244 #, c-format
3245 msgid ""
3246 "\n"
@@ -3240,356 +3250,364 @@ msgid ""
3250 "and try again.\n"
3251 msgstr ""
3252
3243 -#: builtin/commit.c:733
3253 +#: builtin/commit.c:735
3254 msgid ""
3255 "Please enter the commit message for your changes. Lines starting\n"
3256 "with '#' will be ignored, and an empty message aborts the commit.\n"
3257 msgstr ""
3258
3249 -#: builtin/commit.c:738
3259 +#: builtin/commit.c:740
3260 msgid ""
3261 "Please enter the commit message for your changes. Lines starting\n"
3262 "with '#' will be kept; you may remove them yourself if you want to.\n"
3263 "An empty message aborts the commit.\n"
3264 msgstr ""
3265
3256 -#: builtin/commit.c:751
3266 +#: builtin/commit.c:753
3267 #, c-format
3268 msgid "%sAuthor: %s"
3269 msgstr ""
3270
3261 -#: builtin/commit.c:758
3271 +#: builtin/commit.c:760
3272 #, c-format
3273 msgid "%sCommitter: %s"
3274 msgstr ""
3275
3266 -#: builtin/commit.c:778
3276 +#: builtin/commit.c:780
3277 msgid "Cannot read index"
3278 msgstr ""
3279
3270 -#: builtin/commit.c:815
3280 +#: builtin/commit.c:817
3281 msgid "Error building trees"
3282 msgstr ""
3283
3274 -#: builtin/commit.c:830 builtin/tag.c:361
3284 +#: builtin/commit.c:832 builtin/tag.c:361
3285 #, c-format
3286 msgid "Please supply the message using either -m or -F option.\n"
3287 msgstr ""
3288
3279 -#: builtin/commit.c:927
3289 +#: builtin/commit.c:929
3290 #, c-format
3291 msgid "No existing author found with '%s'"
3292 msgstr ""
3293
3284 -#: builtin/commit.c:942 builtin/commit.c:1142
3294 +#: builtin/commit.c:944 builtin/commit.c:1148
3295 #, c-format
3296 msgid "Invalid untracked files mode '%s'"
3297 msgstr ""
3298
3289 -#: builtin/commit.c:982
3299 +#: builtin/commit.c:984
3300 msgid "Using both --reset-author and --author does not make sense"
3301 msgstr ""
3302
3293 -#: builtin/commit.c:993
3303 +#: builtin/commit.c:995
3304 msgid "You have nothing to amend."
3305 msgstr ""
3306
3297 -#: builtin/commit.c:996
3307 +#: builtin/commit.c:998
3308 msgid "You are in the middle of a merge -- cannot amend."
3309 msgstr ""
3310
3301 -#: builtin/commit.c:998
3311 +#: builtin/commit.c:1000
3312 msgid "You are in the middle of a cherry-pick -- cannot amend."
3313 msgstr ""
3314
3305 -#: builtin/commit.c:1001
3315 +#: builtin/commit.c:1003
3316 msgid "Options --squash and --fixup cannot be used together"
3317 msgstr ""
3318
3309 -#: builtin/commit.c:1011
3319 +#: builtin/commit.c:1013
3320 msgid "Only one of -c/-C/-F/--fixup can be used."
3321 msgstr ""
3322
3313 -#: builtin/commit.c:1013
3323 +#: builtin/commit.c:1015
3324 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
3325 msgstr ""
3326
3317 -#: builtin/commit.c:1021
3327 +#: builtin/commit.c:1023
3328 msgid "--reset-author can be used only with -C, -c or --amend."
3329 msgstr ""
3330
3321 -#: builtin/commit.c:1038
3331 +#: builtin/commit.c:1040
3332 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
3333 msgstr ""
3334
3325 -#: builtin/commit.c:1040
3335 +#: builtin/commit.c:1042
3336 msgid "No paths with --include/--only does not make sense."
3337 msgstr ""
3338
3329 -#: builtin/commit.c:1042
3339 +#: builtin/commit.c:1044
3340 msgid "Clever... amending the last one with dirty index."
3341 msgstr ""
3342
3333 -#: builtin/commit.c:1044
3343 +#: builtin/commit.c:1046
3344 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
3345 msgstr ""
3346
3337 -#: builtin/commit.c:1054 builtin/tag.c:577
3347 +#: builtin/commit.c:1056 builtin/tag.c:577
3348 #, c-format
3349 msgid "Invalid cleanup mode %s"
3350 msgstr ""
3351
3342 -#: builtin/commit.c:1059
3352 +#: builtin/commit.c:1061
3353 msgid "Paths with -a does not make sense."
3354 msgstr ""
3355
3346 -#: builtin/commit.c:1156 builtin/commit.c:1384
3356 +#: builtin/commit.c:1067 builtin/commit.c:1202
3357 +msgid "--long and -z are incompatible"
3358 +msgstr ""
3359 +
3360 +#: builtin/commit.c:1162 builtin/commit.c:1398
3361 msgid "show status concisely"
3362 msgstr ""
3363
3350 -#: builtin/commit.c:1158 builtin/commit.c:1386
3364 +#: builtin/commit.c:1164 builtin/commit.c:1400
3365 msgid "show branch information"
3366 msgstr ""
3367
3354 -#: builtin/commit.c:1160 builtin/commit.c:1388 builtin/push.c:389
3368 +#: builtin/commit.c:1166 builtin/commit.c:1402 builtin/push.c:389
3369 msgid "machine-readable output"
3370 msgstr ""
3371
3358 -#: builtin/commit.c:1163 builtin/commit.c:1390
3372 +#: builtin/commit.c:1169 builtin/commit.c:1404
3373 +msgid "show status in long format (default)"
3374 +msgstr ""
3375 +
3376 +#: builtin/commit.c:1172 builtin/commit.c:1407
3377 msgid "terminate entries with NUL"
3378 msgstr ""
3379
3362 -#: builtin/commit.c:1165 builtin/commit.c:1393 builtin/fast-export.c:636
3380 +#: builtin/commit.c:1174 builtin/commit.c:1410 builtin/fast-export.c:636
3381 #: builtin/fast-export.c:639 builtin/tag.c:461
3382 msgid "mode"
3383 msgstr ""
3384
3367 -#: builtin/commit.c:1166 builtin/commit.c:1393
3385 +#: builtin/commit.c:1175 builtin/commit.c:1410
3386 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
3387 msgstr ""
3388
3371 -#: builtin/commit.c:1169
3389 +#: builtin/commit.c:1178
3390 msgid "show ignored files"
3391 msgstr ""
3392
3375 -#: builtin/commit.c:1170 parse-options.h:151
3393 +#: builtin/commit.c:1179 parse-options.h:151
3394 msgid "when"
3395 msgstr ""
3396
3379 -#: builtin/commit.c:1171
3397 +#: builtin/commit.c:1180
3398 msgid ""
3399 "ignore changes to submodules, optional when: all, dirty, untracked. "
3400 "(Default: all)"
3401 msgstr ""
3402
3385 -#: builtin/commit.c:1173
3403 +#: builtin/commit.c:1182
3404 msgid "list untracked files in columns"
3405 msgstr ""
3406
3389 -#: builtin/commit.c:1242
3407 +#: builtin/commit.c:1256
3408 msgid "couldn't look up newly created commit"
3409 msgstr ""
3410
3393 -#: builtin/commit.c:1244
3411 +#: builtin/commit.c:1258
3412 msgid "could not parse newly created commit"
3413 msgstr ""
3414
3397 -#: builtin/commit.c:1285
3415 +#: builtin/commit.c:1299
3416 msgid "detached HEAD"
3417 msgstr ""
3418
3401 -#: builtin/commit.c:1287
3419 +#: builtin/commit.c:1301
3420 msgid " (root-commit)"
3421 msgstr ""
3422
3405 -#: builtin/commit.c:1354
3423 +#: builtin/commit.c:1368
3424 msgid "suppress summary after successful commit"
3425 msgstr ""
3426
3409 -#: builtin/commit.c:1355
3427 +#: builtin/commit.c:1369
3428 msgid "show diff in commit message template"
3429 msgstr ""
3430
3413 -#: builtin/commit.c:1357
3431 +#: builtin/commit.c:1371
3432 msgid "Commit message options"
3433 msgstr ""
3434
3417 -#: builtin/commit.c:1358 builtin/tag.c:459
3435 +#: builtin/commit.c:1372 builtin/tag.c:459
3436 msgid "read message from file"
3437 msgstr ""
3438
3421 -#: builtin/commit.c:1359
3439 +#: builtin/commit.c:1373
3440 msgid "author"
3441 msgstr ""
3442
3425 -#: builtin/commit.c:1359
3443 +#: builtin/commit.c:1373
3444 msgid "override author for commit"
3445 msgstr ""
3446
3429 -#: builtin/commit.c:1360 builtin/gc.c:178
3447 +#: builtin/commit.c:1374 builtin/gc.c:178
3448 msgid "date"
3449 msgstr ""
3450
3433 -#: builtin/commit.c:1360
3451 +#: builtin/commit.c:1374
3452 msgid "override date for commit"
3453 msgstr ""
3454
3437 -#: builtin/commit.c:1361 builtin/merge.c:206 builtin/notes.c:537
3455 +#: builtin/commit.c:1375 builtin/merge.c:206 builtin/notes.c:537
3456 #: builtin/notes.c:694 builtin/tag.c:457
3457 msgid "message"
3458 msgstr ""
3459
3442 -#: builtin/commit.c:1361
3460 +#: builtin/commit.c:1375
3461 msgid "commit message"
3462 msgstr ""
3463
3446 -#: builtin/commit.c:1362
3464 +#: builtin/commit.c:1376
3465 msgid "reuse and edit message from specified commit"
3466 msgstr ""
3467
3450 -#: builtin/commit.c:1363
3468 +#: builtin/commit.c:1377
3469 msgid "reuse message from specified commit"
3470 msgstr ""
3471
3454 -#: builtin/commit.c:1364
3472 +#: builtin/commit.c:1378
3473 msgid "use autosquash formatted message to fixup specified commit"
3474 msgstr ""
3475
3458 -#: builtin/commit.c:1365
3476 +#: builtin/commit.c:1379
3477 msgid "use autosquash formatted message to squash specified commit"
3478 msgstr ""
3479
3462 -#: builtin/commit.c:1366
3480 +#: builtin/commit.c:1380
3481 msgid "the commit is authored by me now (used with -C/-c/--amend)"
3482 msgstr ""
3483
3466 -#: builtin/commit.c:1367 builtin/log.c:1068 builtin/revert.c:109
3484 +#: builtin/commit.c:1381 builtin/log.c:1073 builtin/revert.c:109
3485 msgid "add Signed-off-by:"
3486 msgstr ""
3487
3470 -#: builtin/commit.c:1368
3488 +#: builtin/commit.c:1382
3489 msgid "use specified template file"
3490 msgstr ""
3491
3474 -#: builtin/commit.c:1369
3492 +#: builtin/commit.c:1383
3493 msgid "force edit of commit"
3494 msgstr ""
3495
3478 -#: builtin/commit.c:1370
3496 +#: builtin/commit.c:1384
3497 msgid "default"
3498 msgstr ""
3499
3482 -#: builtin/commit.c:1370 builtin/tag.c:462
3500 +#: builtin/commit.c:1384 builtin/tag.c:462
3501 msgid "how to strip spaces and #comments from message"
3502 msgstr ""
3503
3486 -#: builtin/commit.c:1371
3504 +#: builtin/commit.c:1385
3505 msgid "include status in commit message template"
3506 msgstr ""
3507
3490 -#: builtin/commit.c:1372 builtin/merge.c:213 builtin/tag.c:463
3508 +#: builtin/commit.c:1386 builtin/merge.c:213 builtin/tag.c:463
3509 msgid "key id"
3510 msgstr ""
3511
3494 -#: builtin/commit.c:1373 builtin/merge.c:214
3512 +#: builtin/commit.c:1387 builtin/merge.c:214
3513 msgid "GPG sign commit"
3514 msgstr ""
3515
3516 #. end commit message options
3499 -#: builtin/commit.c:1376
3517 +#: builtin/commit.c:1390
3518 msgid "Commit contents options"
3519 msgstr ""
3520
3503 -#: builtin/commit.c:1377
3521 +#: builtin/commit.c:1391
3522 msgid "commit all changed files"
3523 msgstr ""
3524
3507 -#: builtin/commit.c:1378
3525 +#: builtin/commit.c:1392
3526 msgid "add specified files to index for commit"
3527 msgstr ""
3528
3511 -#: builtin/commit.c:1379
3529 +#: builtin/commit.c:1393
3530 msgid "interactively add files"
3531 msgstr ""
3532
3515 -#: builtin/commit.c:1380
3533 +#: builtin/commit.c:1394
3534 msgid "interactively add changes"
3535 msgstr ""
3536
3519 -#: builtin/commit.c:1381
3537 +#: builtin/commit.c:1395
3538 msgid "commit only specified files"
3539 msgstr ""
3540
3523 -#: builtin/commit.c:1382
3541 +#: builtin/commit.c:1396
3542 msgid "bypass pre-commit hook"
3543 msgstr ""
3544
3527 -#: builtin/commit.c:1383
3545 +#: builtin/commit.c:1397
3546 msgid "show what would be committed"
3547 msgstr ""
3548
3531 -#: builtin/commit.c:1391
3549 +#: builtin/commit.c:1408
3550 msgid "amend previous commit"
3551 msgstr ""
3552
3535 -#: builtin/commit.c:1392
3553 +#: builtin/commit.c:1409
3554 msgid "bypass post-rewrite hook"
3555 msgstr ""
3556
3539 -#: builtin/commit.c:1397
3557 +#: builtin/commit.c:1414
3558 msgid "ok to record an empty change"
3559 msgstr ""
3560
3543 -#: builtin/commit.c:1400
3561 +#: builtin/commit.c:1417
3562 msgid "ok to record a change with an empty message"
3563 msgstr ""
3564
3547 -#: builtin/commit.c:1432
3565 +#: builtin/commit.c:1449
3566 msgid "could not parse HEAD commit"
3567 msgstr ""
3568
3551 -#: builtin/commit.c:1470 builtin/merge.c:508
3569 +#: builtin/commit.c:1487 builtin/merge.c:508
3570 #, c-format
3571 msgid "could not open '%s' for reading"
3572 msgstr ""
3573
3556 -#: builtin/commit.c:1477
3574 +#: builtin/commit.c:1494
3575 #, c-format
3576 msgid "Corrupt MERGE_HEAD file (%s)"
3577 msgstr ""
3578
3561 -#: builtin/commit.c:1484
3579 +#: builtin/commit.c:1501
3580 msgid "could not read MERGE_MODE"
3581 msgstr ""
3582
3565 -#: builtin/commit.c:1503
3583 +#: builtin/commit.c:1520
3584 #, c-format
3585 msgid "could not read commit message: %s"
3586 msgstr ""
3587
3570 -#: builtin/commit.c:1517
3588 +#: builtin/commit.c:1534
3589 #, c-format
3590 msgid "Aborting commit; you did not edit the message.\n"
3591 msgstr ""
3592
3575 -#: builtin/commit.c:1522
3593 +#: builtin/commit.c:1539
3594 #, c-format
3595 msgid "Aborting commit due to empty commit message.\n"
3596 msgstr ""
3597
3580 -#: builtin/commit.c:1537 builtin/merge.c:935 builtin/merge.c:960
3598 +#: builtin/commit.c:1554 builtin/merge.c:832 builtin/merge.c:857
3599 msgid "failed to write commit object"
3600 msgstr ""
3601
3584 -#: builtin/commit.c:1558
3602 +#: builtin/commit.c:1575
3603 msgid "cannot lock HEAD ref"
3604 msgstr ""
3605
3588 -#: builtin/commit.c:1562
3606 +#: builtin/commit.c:1579
3607 msgid "cannot update HEAD ref"
3608 msgstr ""
3609
3592 -#: builtin/commit.c:1573
3610 +#: builtin/commit.c:1590
3611 msgid ""
3612 "Repository has been updated, but unable to write\n"
3613 "new_index file. Check that disk is not full or quota is\n"
@@ -3600,115 +3618,115 @@ msgstr ""
3618 msgid "git config [options]"
3619 msgstr ""
3620
3603 -#: builtin/config.c:52
3621 +#: builtin/config.c:51
3622 msgid "Config file location"
3623 msgstr ""
3624
3607 -#: builtin/config.c:53
3625 +#: builtin/config.c:52
3626 msgid "use global config file"
3627 msgstr ""
3628
3611 -#: builtin/config.c:54
3629 +#: builtin/config.c:53
3630 msgid "use system config file"
3631 msgstr ""
3632
3615 -#: builtin/config.c:55
3633 +#: builtin/config.c:54
3634 msgid "use repository config file"
3635 msgstr ""
3636
3619 -#: builtin/config.c:56
3637 +#: builtin/config.c:55
3638 msgid "use given config file"
3639 msgstr ""
3640
3623 -#: builtin/config.c:57
3641 +#: builtin/config.c:56
3642 msgid "Action"
3643 msgstr ""
3644
3627 -#: builtin/config.c:58
3645 +#: builtin/config.c:57
3646 msgid "get value: name [value-regex]"
3647 msgstr ""
3648
3631 -#: builtin/config.c:59
3649 +#: builtin/config.c:58
3650 msgid "get all values: key [value-regex]"
3651 msgstr ""
3652
3635 -#: builtin/config.c:60
3653 +#: builtin/config.c:59
3654 msgid "get values for regexp: name-regex [value-regex]"
3655 msgstr ""
3656
3639 -#: builtin/config.c:61
3657 +#: builtin/config.c:60
3658 msgid "replace all matching variables: name value [value_regex]"
3659 msgstr ""
3660
3643 -#: builtin/config.c:62
3661 +#: builtin/config.c:61
3662 msgid "add a new variable: name value"
3663 msgstr ""
3664
3647 -#: builtin/config.c:63
3665 +#: builtin/config.c:62
3666 msgid "remove a variable: name [value-regex]"
3667 msgstr ""
3668
3651 -#: builtin/config.c:64
3669 +#: builtin/config.c:63
3670 msgid "remove all matches: name [value-regex]"
3671 msgstr ""
3672
3655 -#: builtin/config.c:65
3673 +#: builtin/config.c:64
3674 msgid "rename section: old-name new-name"
3675 msgstr ""
3676
3659 -#: builtin/config.c:66
3677 +#: builtin/config.c:65
3678 msgid "remove a section: name"
3679 msgstr ""
3680
3663 -#: builtin/config.c:67
3681 +#: builtin/config.c:66
3682 msgid "list all"
3683 msgstr ""
3684
3667 -#: builtin/config.c:68
3685 +#: builtin/config.c:67
3686 msgid "open an editor"
3687 msgstr ""
3688
3671 -#: builtin/config.c:69 builtin/config.c:70
3689 +#: builtin/config.c:68 builtin/config.c:69
3690 msgid "slot"
3691 msgstr ""
3692
3675 -#: builtin/config.c:69
3693 +#: builtin/config.c:68
3694 msgid "find the color configured: [default]"
3695 msgstr ""
3696
3679 -#: builtin/config.c:70
3697 +#: builtin/config.c:69
3698 msgid "find the color setting: [stdout-is-tty]"
3699 msgstr ""
3700
3683 -#: builtin/config.c:71
3701 +#: builtin/config.c:70
3702 msgid "Type"
3703 msgstr ""
3704
3687 -#: builtin/config.c:72
3705 +#: builtin/config.c:71
3706 msgid "value is \"true\" or \"false\""
3707 msgstr ""
3708
3691 -#: builtin/config.c:73
3709 +#: builtin/config.c:72
3710 msgid "value is decimal number"
3711 msgstr ""
3712
3695 -#: builtin/config.c:74
3713 +#: builtin/config.c:73
3714 msgid "value is --bool or --int"
3715 msgstr ""
3716
3699 -#: builtin/config.c:75
3717 +#: builtin/config.c:74
3718 msgid "value is a path (file or directory name)"
3719 msgstr ""
3720
3703 -#: builtin/config.c:76
3721 +#: builtin/config.c:75
3722 msgid "Other"
3723 msgstr ""
3724
3707 -#: builtin/config.c:77
3725 +#: builtin/config.c:76
3726 msgid "terminate values with NUL byte"
3727 msgstr ""
3728
3711 -#: builtin/config.c:78
3729 +#: builtin/config.c:77
3730 msgid "respect include directives on lookup"
3731 msgstr ""
3732
@@ -3851,31 +3869,31 @@ msgstr ""
3869 msgid "'%s': not a regular file or symlink"
3870 msgstr ""
3871
3854 -#: builtin/diff.c:224
3872 +#: builtin/diff.c:228
3873 #, c-format
3874 msgid "invalid option: %s"
3875 msgstr ""
3876
3859 -#: builtin/diff.c:301
3877 +#: builtin/diff.c:305
3878 msgid "Not a git repository"
3879 msgstr ""
3880
3863 -#: builtin/diff.c:344
3881 +#: builtin/diff.c:348
3882 #, c-format
3883 msgid "invalid object '%s' given."
3884 msgstr ""
3885
3868 -#: builtin/diff.c:349
3886 +#: builtin/diff.c:353
3887 #, c-format
3888 msgid "more than %d trees given: '%s'"
3889 msgstr ""
3890
3873 -#: builtin/diff.c:359
3891 +#: builtin/diff.c:363
3892 #, c-format
3893 msgid "more than two blobs given: '%s'"
3894 msgstr ""
3895
3878 -#: builtin/diff.c:367
3896 +#: builtin/diff.c:371
3897 #, c-format
3898 msgid "unhandled object '%s' given."
3899 msgstr ""
@@ -3988,7 +4006,7 @@ msgstr ""
4006 msgid "deepen history of shallow clone"
4007 msgstr ""
4008
3991 -#: builtin/fetch.c:85 builtin/log.c:1083
4009 +#: builtin/fetch.c:85 builtin/log.c:1088
4010 msgid "dir"
4011 msgstr ""
4012
@@ -4155,8 +4173,8 @@ msgstr ""
4173 msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
4174 msgstr ""
4175
4158 -#: builtin/fmt-merge-msg.c:653 builtin/fmt-merge-msg.c:656 builtin/grep.c:787
4159 -#: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:192
4176 +#: builtin/fmt-merge-msg.c:653 builtin/fmt-merge-msg.c:656 builtin/grep.c:701
4177 +#: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:175
4178 #: builtin/tag.c:448 parse-options.h:133 parse-options.h:235
4179 msgid "n"
4180 msgstr ""
@@ -4312,225 +4330,225 @@ msgstr ""
4330 msgid "grep: failed to create thread: %s"
4331 msgstr ""
4332
4315 -#: builtin/grep.c:455
4333 +#: builtin/grep.c:365
4334 #, c-format
4335 msgid "Failed to chdir: %s"
4336 msgstr ""
4337
4320 -#: builtin/grep.c:531 builtin/grep.c:565
4338 +#: builtin/grep.c:443 builtin/grep.c:478
4339 #, c-format
4340 msgid "unable to read tree (%s)"
4341 msgstr ""
4342
4325 -#: builtin/grep.c:579
4343 +#: builtin/grep.c:493
4344 #, c-format
4345 msgid "unable to grep from object of type %s"
4346 msgstr ""
4347
4330 -#: builtin/grep.c:637
4348 +#: builtin/grep.c:551
4349 #, c-format
4350 msgid "switch `%c' expects a numerical value"
4351 msgstr ""
4352
4335 -#: builtin/grep.c:654
4353 +#: builtin/grep.c:568
4354 #, c-format
4355 msgid "cannot open '%s'"
4356 msgstr ""
4357
4340 -#: builtin/grep.c:729
4358 +#: builtin/grep.c:643
4359 msgid "search in index instead of in the work tree"
4360 msgstr ""
4361
4344 -#: builtin/grep.c:731
4362 +#: builtin/grep.c:645
4363 msgid "find in contents not managed by git"
4364 msgstr ""
4365
4348 -#: builtin/grep.c:733
4366 +#: builtin/grep.c:647
4367 msgid "search in both tracked and untracked files"
4368 msgstr ""
4369
4352 -#: builtin/grep.c:735
4370 +#: builtin/grep.c:649
4371 msgid "search also in ignored files"
4372 msgstr ""
4373
4356 -#: builtin/grep.c:738
4374 +#: builtin/grep.c:652
4375 msgid "show non-matching lines"
4376 msgstr ""
4377
4360 -#: builtin/grep.c:740
4378 +#: builtin/grep.c:654
4379 msgid "case insensitive matching"
4380 msgstr ""
4381
4364 -#: builtin/grep.c:742
4382 +#: builtin/grep.c:656
4383 msgid "match patterns only at word boundaries"
4384 msgstr ""
4385
4368 -#: builtin/grep.c:744
4386 +#: builtin/grep.c:658
4387 msgid "process binary files as text"
4388 msgstr ""
4389
4372 -#: builtin/grep.c:746
4390 +#: builtin/grep.c:660
4391 msgid "don't match patterns in binary files"
4392 msgstr ""
4393
4376 -#: builtin/grep.c:749
4394 +#: builtin/grep.c:663
4395 msgid "descend at most <depth> levels"
4396 msgstr ""
4397
4380 -#: builtin/grep.c:753
4398 +#: builtin/grep.c:667
4399 msgid "use extended POSIX regular expressions"
4400 msgstr ""
4401
4384 -#: builtin/grep.c:756
4402 +#: builtin/grep.c:670
4403 msgid "use basic POSIX regular expressions (default)"
4404 msgstr ""
4405
4388 -#: builtin/grep.c:759
4406 +#: builtin/grep.c:673
4407 msgid "interpret patterns as fixed strings"
4408 msgstr ""
4409
4392 -#: builtin/grep.c:762
4410 +#: builtin/grep.c:676
4411 msgid "use Perl-compatible regular expressions"
4412 msgstr ""
4413
4396 -#: builtin/grep.c:765
4414 +#: builtin/grep.c:679
4415 msgid "show line numbers"
4416 msgstr ""
4417
4400 -#: builtin/grep.c:766
4418 +#: builtin/grep.c:680
4419 msgid "don't show filenames"
4420 msgstr ""
4421
4404 -#: builtin/grep.c:767
4422 +#: builtin/grep.c:681
4423 msgid "show filenames"
4424 msgstr ""
4425
4408 -#: builtin/grep.c:769
4426 +#: builtin/grep.c:683
4427 msgid "show filenames relative to top directory"
4428 msgstr ""
4429
4412 -#: builtin/grep.c:771
4430 +#: builtin/grep.c:685
4431 msgid "show only filenames instead of matching lines"
4432 msgstr ""
4433
4416 -#: builtin/grep.c:773
4434 +#: builtin/grep.c:687
4435 msgid "synonym for --files-with-matches"
4436 msgstr ""
4437
4420 -#: builtin/grep.c:776
4438 +#: builtin/grep.c:690
4439 msgid "show only the names of files without match"
4440 msgstr ""
4441
4424 -#: builtin/grep.c:778
4442 +#: builtin/grep.c:692
4443 msgid "print NUL after filenames"
4444 msgstr ""
4445
4428 -#: builtin/grep.c:780
4446 +#: builtin/grep.c:694
4447 msgid "show the number of matches instead of matching lines"
4448 msgstr ""
4449
4432 -#: builtin/grep.c:781
4450 +#: builtin/grep.c:695
4451 msgid "highlight matches"
4452 msgstr ""
4453
4436 -#: builtin/grep.c:783
4454 +#: builtin/grep.c:697
4455 msgid "print empty line between matches from different files"
4456 msgstr ""
4457
4440 -#: builtin/grep.c:785
4458 +#: builtin/grep.c:699
4459 msgid "show filename only once above matches from same file"
4460 msgstr ""
4461
4444 -#: builtin/grep.c:788
4462 +#: builtin/grep.c:702
4463 msgid "show <n> context lines before and after matches"
4464 msgstr ""
4465
4448 -#: builtin/grep.c:791
4466 +#: builtin/grep.c:705
4467 msgid "show <n> context lines before matches"
4468 msgstr ""
4469
4452 -#: builtin/grep.c:793
4470 +#: builtin/grep.c:707
4471 msgid "show <n> context lines after matches"
4472 msgstr ""
4473
4456 -#: builtin/grep.c:794
4474 +#: builtin/grep.c:708
4475 msgid "shortcut for -C NUM"
4476 msgstr ""
4477
4460 -#: builtin/grep.c:797
4478 +#: builtin/grep.c:711
4479 msgid "show a line with the function name before matches"
4480 msgstr ""
4481
4464 -#: builtin/grep.c:799
4482 +#: builtin/grep.c:713
4483 msgid "show the surrounding function"
4484 msgstr ""
4485
4468 -#: builtin/grep.c:802
4486 +#: builtin/grep.c:716
4487 msgid "read patterns from file"
4488 msgstr ""
4489
4472 -#: builtin/grep.c:804
4490 +#: builtin/grep.c:718
4491 msgid "match <pattern>"
4492 msgstr ""
4493
4476 -#: builtin/grep.c:806
4494 +#: builtin/grep.c:720
4495 msgid "combine patterns specified with -e"
4496 msgstr ""
4497
4480 -#: builtin/grep.c:818
4498 +#: builtin/grep.c:732
4499 msgid "indicate hit with exit status without output"
4500 msgstr ""
4501
4484 -#: builtin/grep.c:820
4502 +#: builtin/grep.c:734
4503 msgid "show only matches from files that match all patterns"
4504 msgstr ""
4505
4488 -#: builtin/grep.c:822
4506 +#: builtin/grep.c:736
4507 msgid "show parse tree for grep expression"
4508 msgstr ""
4509
4492 -#: builtin/grep.c:826
4510 +#: builtin/grep.c:740
4511 msgid "pager"
4512 msgstr ""
4513
4496 -#: builtin/grep.c:826
4514 +#: builtin/grep.c:740
4515 msgid "show matching files in the pager"
4516 msgstr ""
4517
4500 -#: builtin/grep.c:829
4518 +#: builtin/grep.c:743
4519 msgid "allow calling of grep(1) (ignored by this build)"
4520 msgstr ""
4521
4504 -#: builtin/grep.c:830 builtin/show-ref.c:201
4522 +#: builtin/grep.c:744 builtin/show-ref.c:184
4523 msgid "show usage"
4524 msgstr ""
4525
4508 -#: builtin/grep.c:921
4526 +#: builtin/grep.c:811
4527 msgid "no pattern given."
4528 msgstr ""
4529
4512 -#: builtin/grep.c:935
4530 +#: builtin/grep.c:825
4531 #, c-format
4532 msgid "bad object %s"
4533 msgstr ""
4534
4517 -#: builtin/grep.c:976
4535 +#: builtin/grep.c:866
4536 msgid "--open-files-in-pager only works on the worktree"
4537 msgstr ""
4538
4521 -#: builtin/grep.c:999
4539 +#: builtin/grep.c:889
4540 msgid "--cached or --untracked cannot be used with --no-index."
4541 msgstr ""
4542
4525 -#: builtin/grep.c:1004
4543 +#: builtin/grep.c:894
4544 msgid "--no-index or --untracked cannot be used with revs."
4545 msgstr ""
4546
4529 -#: builtin/grep.c:1007
4547 +#: builtin/grep.c:897
4548 msgid "--[no-]exclude-standard cannot be used for tracked contents."
4549 msgstr ""
4550
4533 -#: builtin/grep.c:1015
4551 +#: builtin/grep.c:905
4552 msgid "both --cached and trees are given."
4553 msgstr ""
4554
@@ -5114,219 +5132,219 @@ msgstr ""
5132 msgid "Final output: %d %s\n"
5133 msgstr ""
5134
5117 -#: builtin/log.c:403 builtin/log.c:494
5135 +#: builtin/log.c:405 builtin/log.c:497
5136 #, c-format
5137 msgid "Could not read object %s"
5138 msgstr ""
5139
5122 -#: builtin/log.c:518
5140 +#: builtin/log.c:521
5141 #, c-format
5142 msgid "Unknown type: %d"
5143 msgstr ""
5144
5127 -#: builtin/log.c:608
5145 +#: builtin/log.c:613
5146 msgid "format.headers without value"
5147 msgstr ""
5148
5131 -#: builtin/log.c:682
5149 +#: builtin/log.c:687
5150 msgid "name of output directory is too long"
5151 msgstr ""
5152
5135 -#: builtin/log.c:693
5153 +#: builtin/log.c:698
5154 #, c-format
5155 msgid "Cannot open patch file %s"
5156 msgstr ""
5157
5140 -#: builtin/log.c:707
5158 +#: builtin/log.c:712
5159 msgid "Need exactly one range."
5160 msgstr ""
5161
5144 -#: builtin/log.c:715
5162 +#: builtin/log.c:720
5163 msgid "Not a range."
5164 msgstr ""
5165
5148 -#: builtin/log.c:789
5166 +#: builtin/log.c:794
5167 msgid "Cover letter needs email format"
5168 msgstr ""
5169
5152 -#: builtin/log.c:862
5170 +#: builtin/log.c:867
5171 #, c-format
5172 msgid "insane in-reply-to: %s"
5173 msgstr ""
5174
5157 -#: builtin/log.c:890
5175 +#: builtin/log.c:895
5176 msgid "git format-patch [options] [<since> | <revision range>]"
5177 msgstr ""
5178
5161 -#: builtin/log.c:935
5179 +#: builtin/log.c:940
5180 msgid "Two output directories?"
5181 msgstr ""
5182
5165 -#: builtin/log.c:1063
5183 +#: builtin/log.c:1068
5184 msgid "use [PATCH n/m] even with a single patch"
5185 msgstr ""
5186
5169 -#: builtin/log.c:1066
5187 +#: builtin/log.c:1071
5188 msgid "use [PATCH] even with multiple patches"
5189 msgstr ""
5190
5173 -#: builtin/log.c:1070
5191 +#: builtin/log.c:1075
5192 msgid "print patches to standard out"
5193 msgstr ""
5194
5177 -#: builtin/log.c:1072
5195 +#: builtin/log.c:1077
5196 msgid "generate a cover letter"
5197 msgstr ""
5198
5181 -#: builtin/log.c:1074
5199 +#: builtin/log.c:1079
5200 msgid "use simple number sequence for output file names"
5201 msgstr ""
5202
5185 -#: builtin/log.c:1075
5203 +#: builtin/log.c:1080
5204 msgid "sfx"
5205 msgstr ""
5206
5189 -#: builtin/log.c:1076
5207 +#: builtin/log.c:1081
5208 msgid "use <sfx> instead of '.patch'"
5209 msgstr ""
5210
5193 -#: builtin/log.c:1078
5211 +#: builtin/log.c:1083
5212 msgid "start numbering patches at <n> instead of 1"
5213 msgstr ""
5214
5197 -#: builtin/log.c:1080
5215 +#: builtin/log.c:1085
5216 msgid "Use [<prefix>] instead of [PATCH]"
5217 msgstr ""
5218
5201 -#: builtin/log.c:1083
5219 +#: builtin/log.c:1088
5220 msgid "store resulting files in <dir>"
5221 msgstr ""
5222
5205 -#: builtin/log.c:1086
5223 +#: builtin/log.c:1091
5224 msgid "don't strip/add [PATCH]"
5225 msgstr ""
5226
5209 -#: builtin/log.c:1089
5227 +#: builtin/log.c:1094
5228 msgid "don't output binary diffs"
5229 msgstr ""
5230
5213 -#: builtin/log.c:1091
5231 +#: builtin/log.c:1096
5232 msgid "don't include a patch matching a commit upstream"
5233 msgstr ""
5234
5217 -#: builtin/log.c:1093
5235 +#: builtin/log.c:1098
5236 msgid "show patch format instead of default (patch + stat)"
5237 msgstr ""
5238
5221 -#: builtin/log.c:1095
5239 +#: builtin/log.c:1100
5240 msgid "Messaging"
5241 msgstr ""
5242
5225 -#: builtin/log.c:1096
5243 +#: builtin/log.c:1101
5244 msgid "header"
5245 msgstr ""
5246
5229 -#: builtin/log.c:1097
5247 +#: builtin/log.c:1102
5248 msgid "add email header"
5249 msgstr ""
5250
5233 -#: builtin/log.c:1098 builtin/log.c:1100
5251 +#: builtin/log.c:1103 builtin/log.c:1105
5252 msgid "email"
5253 msgstr ""
5254
5237 -#: builtin/log.c:1098
5255 +#: builtin/log.c:1103
5256 msgid "add To: header"
5257 msgstr ""
5258
5241 -#: builtin/log.c:1100
5259 +#: builtin/log.c:1105
5260 msgid "add Cc: header"
5261 msgstr ""
5262
5245 -#: builtin/log.c:1102
5263 +#: builtin/log.c:1107
5264 msgid "message-id"
5265 msgstr ""
5266
5249 -#: builtin/log.c:1103
5267 +#: builtin/log.c:1108
5268 msgid "make first mail a reply to <message-id>"
5269 msgstr ""
5270
5253 -#: builtin/log.c:1104 builtin/log.c:1107
5271 +#: builtin/log.c:1109 builtin/log.c:1112
5272 msgid "boundary"
5273 msgstr ""
5274
5257 -#: builtin/log.c:1105
5275 +#: builtin/log.c:1110
5276 msgid "attach the patch"
5277 msgstr ""
5278
5261 -#: builtin/log.c:1108
5279 +#: builtin/log.c:1113
5280 msgid "inline the patch"
5281 msgstr ""
5282
5265 -#: builtin/log.c:1112
5283 +#: builtin/log.c:1117
5284 msgid "enable message threading, styles: shallow, deep"
5285 msgstr ""
5286
5269 -#: builtin/log.c:1114
5287 +#: builtin/log.c:1119
5288 msgid "signature"
5289 msgstr ""
5290
5273 -#: builtin/log.c:1115
5291 +#: builtin/log.c:1120
5292 msgid "add a signature"
5293 msgstr ""
5294
5277 -#: builtin/log.c:1117
5295 +#: builtin/log.c:1122
5296 msgid "don't print the patch filenames"
5297 msgstr ""
5298
5281 -#: builtin/log.c:1157
5299 +#: builtin/log.c:1163
5300 #, c-format
5301 msgid "bogus committer info %s"
5302 msgstr ""
5303
5286 -#: builtin/log.c:1202
5304 +#: builtin/log.c:1208
5305 msgid "-n and -k are mutually exclusive."
5306 msgstr ""
5307
5290 -#: builtin/log.c:1204
5308 +#: builtin/log.c:1210
5309 msgid "--subject-prefix and -k are mutually exclusive."
5310 msgstr ""
5311
5294 -#: builtin/log.c:1212
5312 +#: builtin/log.c:1218
5313 msgid "--name-only does not make sense"
5314 msgstr ""
5315
5298 -#: builtin/log.c:1214
5316 +#: builtin/log.c:1220
5317 msgid "--name-status does not make sense"
5318 msgstr ""
5319
5302 -#: builtin/log.c:1216
5320 +#: builtin/log.c:1222
5321 msgid "--check does not make sense"
5322 msgstr ""
5323
5306 -#: builtin/log.c:1239
5324 +#: builtin/log.c:1245
5325 msgid "standard output, or directory, which one?"
5326 msgstr ""
5327
5310 -#: builtin/log.c:1241
5328 +#: builtin/log.c:1247
5329 #, c-format
5330 msgid "Could not create directory '%s'"
5331 msgstr ""
5332
5315 -#: builtin/log.c:1394
5333 +#: builtin/log.c:1400
5334 msgid "Failed to create output files"
5335 msgstr ""
5336
5319 -#: builtin/log.c:1443
5337 +#: builtin/log.c:1449
5338 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
5339 msgstr ""
5340
5323 -#: builtin/log.c:1498
5341 +#: builtin/log.c:1504
5342 #, c-format
5343 msgid ""
5344 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
5345 msgstr ""
5346
5329 -#: builtin/log.c:1511 builtin/log.c:1513 builtin/log.c:1525
5347 +#: builtin/log.c:1517 builtin/log.c:1519 builtin/log.c:1531
5348 #, c-format
5349 msgid "Unknown commit %s"
5350 msgstr ""
@@ -5603,35 +5621,31 @@ msgstr ""
5621 msgid "git write-tree failed to write a tree"
5622 msgstr ""
5623
5606 -#: builtin/merge.c:678
5607 -msgid "failed to read the cache"
5608 -msgstr ""
5609 -
5610 -#: builtin/merge.c:709
5624 +#: builtin/merge.c:656
5625 msgid "Not handling anything other than two heads merge."
5626 msgstr ""
5627
5614 -#: builtin/merge.c:723
5628 +#: builtin/merge.c:670
5629 #, c-format
5630 msgid "Unknown option for merge-recursive: -X%s"
5631 msgstr ""
5632
5619 -#: builtin/merge.c:737
5633 +#: builtin/merge.c:684
5634 #, c-format
5635 msgid "unable to write %s"
5636 msgstr ""
5637
5624 -#: builtin/merge.c:876
5638 +#: builtin/merge.c:773
5639 #, c-format
5640 msgid "Could not read from '%s'"
5641 msgstr ""
5642
5629 -#: builtin/merge.c:885
5643 +#: builtin/merge.c:782
5644 #, c-format
5645 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
5646 msgstr ""
5647
5634 -#: builtin/merge.c:891
5648 +#: builtin/merge.c:788
5649 msgid ""
5650 "Please enter a commit message to explain why this merge is necessary,\n"
5651 "especially if it merges an updated upstream into a topic branch.\n"
@@ -5640,140 +5654,140 @@ msgid ""
5654 "the commit.\n"
5655 msgstr ""
5656
5643 -#: builtin/merge.c:915
5657 +#: builtin/merge.c:812
5658 msgid "Empty commit message."
5659 msgstr ""
5660
5647 -#: builtin/merge.c:927
5661 +#: builtin/merge.c:824
5662 #, c-format
5663 msgid "Wonderful.\n"
5664 msgstr ""
5665
5652 -#: builtin/merge.c:992
5666 +#: builtin/merge.c:889
5667 #, c-format
5668 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
5669 msgstr ""
5670
5657 -#: builtin/merge.c:1008
5671 +#: builtin/merge.c:905
5672 #, c-format
5673 msgid "'%s' is not a commit"
5674 msgstr ""
5675
5662 -#: builtin/merge.c:1049
5676 +#: builtin/merge.c:946
5677 msgid "No current branch."
5678 msgstr ""
5679
5666 -#: builtin/merge.c:1051
5680 +#: builtin/merge.c:948
5681 msgid "No remote for the current branch."
5682 msgstr ""
5683
5670 -#: builtin/merge.c:1053
5684 +#: builtin/merge.c:950
5685 msgid "No default upstream defined for the current branch."
5686 msgstr ""
5687
5674 -#: builtin/merge.c:1058
5688 +#: builtin/merge.c:955
5689 #, c-format
5690 msgid "No remote tracking branch for %s from %s"
5691 msgstr ""
5692
5679 -#: builtin/merge.c:1145 builtin/merge.c:1302
5693 +#: builtin/merge.c:1042 builtin/merge.c:1199
5694 #, c-format
5695 msgid "%s - not something we can merge"
5696 msgstr ""
5697
5684 -#: builtin/merge.c:1213
5698 +#: builtin/merge.c:1110
5699 msgid "There is no merge to abort (MERGE_HEAD missing)."
5700 msgstr ""
5701
5688 -#: builtin/merge.c:1229 git-pull.sh:31
5702 +#: builtin/merge.c:1126 git-pull.sh:31
5703 msgid ""
5704 "You have not concluded your merge (MERGE_HEAD exists).\n"
5705 "Please, commit your changes before you can merge."
5706 msgstr ""
5707
5694 -#: builtin/merge.c:1232 git-pull.sh:34
5708 +#: builtin/merge.c:1129 git-pull.sh:34
5709 msgid "You have not concluded your merge (MERGE_HEAD exists)."
5710 msgstr ""
5711
5698 -#: builtin/merge.c:1236
5712 +#: builtin/merge.c:1133
5713 msgid ""
5714 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
5715 "Please, commit your changes before you can merge."
5716 msgstr ""
5717
5704 -#: builtin/merge.c:1239
5718 +#: builtin/merge.c:1136
5719 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
5720 msgstr ""
5721
5708 -#: builtin/merge.c:1248
5722 +#: builtin/merge.c:1145
5723 msgid "You cannot combine --squash with --no-ff."
5724 msgstr ""
5725
5712 -#: builtin/merge.c:1253
5726 +#: builtin/merge.c:1150
5727 msgid "You cannot combine --no-ff with --ff-only."
5728 msgstr ""
5729
5716 -#: builtin/merge.c:1260
5730 +#: builtin/merge.c:1157
5731 msgid "No commit specified and merge.defaultToUpstream not set."
5732 msgstr ""
5733
5720 -#: builtin/merge.c:1292
5734 +#: builtin/merge.c:1189
5735 msgid "Can merge only exactly one commit into empty head"
5736 msgstr ""
5737
5724 -#: builtin/merge.c:1295
5738 +#: builtin/merge.c:1192
5739 msgid "Squash commit into empty head not supported yet"
5740 msgstr ""
5741
5728 -#: builtin/merge.c:1297
5742 +#: builtin/merge.c:1194
5743 msgid "Non-fast-forward commit does not make sense into an empty head"
5744 msgstr ""
5745
5732 -#: builtin/merge.c:1412
5746 +#: builtin/merge.c:1309
5747 #, c-format
5748 msgid "Updating %s..%s\n"
5749 msgstr ""
5750
5737 -#: builtin/merge.c:1450
5751 +#: builtin/merge.c:1348
5752 #, c-format
5753 msgid "Trying really trivial in-index merge...\n"
5754 msgstr ""
5755
5742 -#: builtin/merge.c:1457
5756 +#: builtin/merge.c:1355
5757 #, c-format
5758 msgid "Nope.\n"
5759 msgstr ""
5760
5747 -#: builtin/merge.c:1489
5761 +#: builtin/merge.c:1387
5762 msgid "Not possible to fast-forward, aborting."
5763 msgstr ""
5764
5751 -#: builtin/merge.c:1512 builtin/merge.c:1591
5765 +#: builtin/merge.c:1410 builtin/merge.c:1489
5766 #, c-format
5767 msgid "Rewinding the tree to pristine...\n"
5768 msgstr ""
5769
5756 -#: builtin/merge.c:1516
5770 +#: builtin/merge.c:1414
5771 #, c-format
5772 msgid "Trying merge strategy %s...\n"
5773 msgstr ""
5774
5761 -#: builtin/merge.c:1582
5775 +#: builtin/merge.c:1480
5776 #, c-format
5777 msgid "No merge strategy handled the merge.\n"
5778 msgstr ""
5779
5766 -#: builtin/merge.c:1584
5780 +#: builtin/merge.c:1482
5781 #, c-format
5782 msgid "Merge with strategy %s failed.\n"
5783 msgstr ""
5784
5771 -#: builtin/merge.c:1593
5785 +#: builtin/merge.c:1491
5786 #, c-format
5787 msgid "Using the %s to prepare resolving by hand.\n"
5788 msgstr ""
5789
5776 -#: builtin/merge.c:1605
5790 +#: builtin/merge.c:1503
5791 #, c-format
5792 msgid "Automatic merge went well; stopped before committing as requested\n"
5793 msgstr ""
@@ -6323,143 +6337,143 @@ msgstr ""
6337 msgid "deflate error (%d)"
6338 msgstr ""
6339
6326 -#: builtin/pack-objects.c:2398
6340 +#: builtin/pack-objects.c:2397
6341 #, c-format
6342 msgid "unsupported index version %s"
6343 msgstr ""
6344
6331 -#: builtin/pack-objects.c:2402
6345 +#: builtin/pack-objects.c:2401
6346 #, c-format
6347 msgid "bad index version '%s'"
6348 msgstr ""
6349
6336 -#: builtin/pack-objects.c:2425
6350 +#: builtin/pack-objects.c:2424
6351 #, c-format
6352 msgid "option %s does not accept negative form"
6353 msgstr ""
6354
6341 -#: builtin/pack-objects.c:2429
6355 +#: builtin/pack-objects.c:2428
6356 #, c-format
6357 msgid "unable to parse value '%s' for option %s"
6358 msgstr ""
6359
6346 -#: builtin/pack-objects.c:2448
6360 +#: builtin/pack-objects.c:2447
6361 msgid "do not show progress meter"
6362 msgstr ""
6363
6350 -#: builtin/pack-objects.c:2450
6364 +#: builtin/pack-objects.c:2449
6365 msgid "show progress meter"
6366 msgstr ""
6367
6354 -#: builtin/pack-objects.c:2452
6368 +#: builtin/pack-objects.c:2451
6369 msgid "show progress meter during object writing phase"
6370 msgstr ""
6371
6358 -#: builtin/pack-objects.c:2455
6372 +#: builtin/pack-objects.c:2454
6373 msgid "similar to --all-progress when progress meter is shown"
6374 msgstr ""
6375
6362 -#: builtin/pack-objects.c:2456
6376 +#: builtin/pack-objects.c:2455
6377 msgid "version[,offset]"
6378 msgstr ""
6379
6366 -#: builtin/pack-objects.c:2457
6380 +#: builtin/pack-objects.c:2456
6381 msgid "write the pack index file in the specified idx format version"
6382 msgstr ""
6383
6370 -#: builtin/pack-objects.c:2460
6384 +#: builtin/pack-objects.c:2459
6385 msgid "maximum size of each output pack file"
6386 msgstr ""
6387
6374 -#: builtin/pack-objects.c:2462
6388 +#: builtin/pack-objects.c:2461
6389 msgid "ignore borrowed objects from alternate object store"
6390 msgstr ""
6391
6378 -#: builtin/pack-objects.c:2464
6392 +#: builtin/pack-objects.c:2463
6393 msgid "ignore packed objects"
6394 msgstr ""
6395
6382 -#: builtin/pack-objects.c:2466
6396 +#: builtin/pack-objects.c:2465
6397 msgid "limit pack window by objects"
6398 msgstr ""
6399
6386 -#: builtin/pack-objects.c:2468
6400 +#: builtin/pack-objects.c:2467
6401 msgid "limit pack window by memory in addition to object limit"
6402 msgstr ""
6403
6390 -#: builtin/pack-objects.c:2470
6404 +#: builtin/pack-objects.c:2469
6405 msgid "maximum length of delta chain allowed in the resulting pack"
6406 msgstr ""
6407
6394 -#: builtin/pack-objects.c:2472
6408 +#: builtin/pack-objects.c:2471
6409 msgid "reuse existing deltas"
6410 msgstr ""
6411
6398 -#: builtin/pack-objects.c:2474
6412 +#: builtin/pack-objects.c:2473
6413 msgid "reuse existing objects"
6414 msgstr ""
6415
6402 -#: builtin/pack-objects.c:2476
6416 +#: builtin/pack-objects.c:2475
6417 msgid "use OFS_DELTA objects"
6418 msgstr ""
6419
6406 -#: builtin/pack-objects.c:2478
6420 +#: builtin/pack-objects.c:2477
6421 msgid "use threads when searching for best delta matches"
6422 msgstr ""
6423
6410 -#: builtin/pack-objects.c:2480
6424 +#: builtin/pack-objects.c:2479
6425 msgid "do not create an empty pack output"
6426 msgstr ""
6427
6414 -#: builtin/pack-objects.c:2482
6428 +#: builtin/pack-objects.c:2481
6429 msgid "read revision arguments from standard input"
6430 msgstr ""
6431
6418 -#: builtin/pack-objects.c:2484
6432 +#: builtin/pack-objects.c:2483
6433 msgid "limit the objects to those that are not yet packed"
6434 msgstr ""
6435
6422 -#: builtin/pack-objects.c:2487
6436 +#: builtin/pack-objects.c:2486
6437 msgid "include objects reachable from any reference"
6438 msgstr ""
6439
6426 -#: builtin/pack-objects.c:2490
6440 +#: builtin/pack-objects.c:2489
6441 msgid "include objects referred by reflog entries"
6442 msgstr ""
6443
6430 -#: builtin/pack-objects.c:2493
6444 +#: builtin/pack-objects.c:2492
6445 msgid "output pack to stdout"
6446 msgstr ""
6447
6434 -#: builtin/pack-objects.c:2495
6448 +#: builtin/pack-objects.c:2494
6449 msgid "include tag objects that refer to objects to be packed"
6450 msgstr ""
6451
6438 -#: builtin/pack-objects.c:2497
6452 +#: builtin/pack-objects.c:2496
6453 msgid "keep unreachable objects"
6454 msgstr ""
6455
6442 -#: builtin/pack-objects.c:2498 parse-options.h:141
6456 +#: builtin/pack-objects.c:2497 parse-options.h:141
6457 msgid "time"
6458 msgstr ""
6459
6446 -#: builtin/pack-objects.c:2499
6460 +#: builtin/pack-objects.c:2498
6461 msgid "unpack unreachable objects newer than <time>"
6462 msgstr ""
6463
6450 -#: builtin/pack-objects.c:2502
6464 +#: builtin/pack-objects.c:2501
6465 msgid "create thin packs"
6466 msgstr ""
6467
6454 -#: builtin/pack-objects.c:2504
6468 +#: builtin/pack-objects.c:2503
6469 msgid "ignore packs that have companion .keep file"
6470 msgstr ""
6471
6458 -#: builtin/pack-objects.c:2506
6472 +#: builtin/pack-objects.c:2505
6473 msgid "pack compression level"
6474 msgstr ""
6475
6462 -#: builtin/pack-objects.c:2508
6476 +#: builtin/pack-objects.c:2507
6477 msgid "do not hide commits by grafts"
6478 msgstr ""
6479
@@ -7280,15 +7294,15 @@ msgstr ""
7294 msgid "git replace -l [<pattern>]"
7295 msgstr ""
7296
7283 -#: builtin/replace.c:118
7297 +#: builtin/replace.c:121
7298 msgid "list replace refs"
7299 msgstr ""
7300
7287 -#: builtin/replace.c:119
7301 +#: builtin/replace.c:122
7302 msgid "delete replace refs"
7303 msgstr ""
7304
7291 -#: builtin/replace.c:120
7305 +#: builtin/replace.c:123
7306 msgid "replace the ref if it exists"
7307 msgstr ""
7308
@@ -7526,57 +7540,64 @@ msgstr ""
7540 msgid "cherry-pick failed"
7541 msgstr ""
7542
7529 -#: builtin/rm.c:14
7543 +#: builtin/rm.c:15
7544 msgid "git rm [options] [--] <file>..."
7545 msgstr ""
7546
7533 -#: builtin/rm.c:109
7547 +#: builtin/rm.c:64 builtin/rm.c:186
7548 +#, c-format
7549 +msgid ""
7550 +"submodule '%s' (or one of its nested submodules) uses a .git directory\n"
7551 +"(use 'rm -rf' if you really want to remove it including all of its history)"
7552 +msgstr ""
7553 +
7554 +#: builtin/rm.c:174
7555 #, c-format
7556 msgid ""
7557 "'%s' has staged content different from both the file and the HEAD\n"
7558 "(use -f to force removal)"
7559 msgstr ""
7560
7540 -#: builtin/rm.c:115
7561 +#: builtin/rm.c:180
7562 #, c-format
7563 msgid ""
7564 "'%s' has changes staged in the index\n"
7565 "(use --cached to keep the file, or -f to force removal)"
7566 msgstr ""
7567
7547 -#: builtin/rm.c:119
7568 +#: builtin/rm.c:191
7569 #, c-format
7570 msgid ""
7571 "'%s' has local modifications\n"
7572 "(use --cached to keep the file, or -f to force removal)"
7573 msgstr ""
7574
7554 -#: builtin/rm.c:134
7575 +#: builtin/rm.c:207
7576 msgid "do not list removed files"
7577 msgstr ""
7578
7558 -#: builtin/rm.c:135
7579 +#: builtin/rm.c:208
7580 msgid "only remove from the index"
7581 msgstr ""
7582
7562 -#: builtin/rm.c:136
7583 +#: builtin/rm.c:209
7584 msgid "override the up-to-date check"
7585 msgstr ""
7586
7566 -#: builtin/rm.c:137
7587 +#: builtin/rm.c:210
7588 msgid "allow recursive removal"
7589 msgstr ""
7590
7570 -#: builtin/rm.c:139
7591 +#: builtin/rm.c:212
7592 msgid "exit with a zero status even if nothing matched"
7593 msgstr ""
7594
7574 -#: builtin/rm.c:194
7595 +#: builtin/rm.c:268
7596 #, c-format
7597 msgid "not removing '%s' recursively without -r"
7598 msgstr ""
7599
7579 -#: builtin/rm.c:230
7600 +#: builtin/rm.c:307
7601 #, c-format
7602 msgid "git rm: unable to remove %s"
7603 msgstr ""
@@ -7696,35 +7717,35 @@ msgstr ""
7717 msgid "git show-ref --exclude-existing[=pattern] < ref-list"
7718 msgstr ""
7719
7699 -#: builtin/show-ref.c:182
7720 +#: builtin/show-ref.c:165
7721 msgid "only show tags (can be combined with heads)"
7722 msgstr ""
7723
7703 -#: builtin/show-ref.c:183
7724 +#: builtin/show-ref.c:166
7725 msgid "only show heads (can be combined with tags)"
7726 msgstr ""
7727
7707 -#: builtin/show-ref.c:184
7728 +#: builtin/show-ref.c:167
7729 msgid "stricter reference checking, requires exact ref path"
7730 msgstr ""
7731
7711 -#: builtin/show-ref.c:187 builtin/show-ref.c:189
7732 +#: builtin/show-ref.c:170 builtin/show-ref.c:172
7733 msgid "show the HEAD reference"
7734 msgstr ""
7735
7715 -#: builtin/show-ref.c:191
7736 +#: builtin/show-ref.c:174
7737 msgid "dereference tags into object IDs"
7738 msgstr ""
7739
7719 -#: builtin/show-ref.c:193
7740 +#: builtin/show-ref.c:176
7741 msgid "only show SHA1 hash using <n> digits"
7742 msgstr ""
7743
7723 -#: builtin/show-ref.c:197
7744 +#: builtin/show-ref.c:180
7745 msgid "do not print results to stdout (useful with --verify)"
7746 msgstr ""
7747
7727 -#: builtin/show-ref.c:199
7748 +#: builtin/show-ref.c:182
7749 msgid "show refs from stdin that aren't in local repository"
7750 msgstr ""
7751
@@ -7732,19 +7753,27 @@ msgstr ""
7753 msgid "git symbolic-ref [options] name [ref]"
7754 msgstr ""
7755
7735 -#: builtin/symbolic-ref.c:38
7756 +#: builtin/symbolic-ref.c:8
7757 +msgid "git symbolic-ref -d [-q] name"
7758 +msgstr ""
7759 +
7760 +#: builtin/symbolic-ref.c:40
7761 msgid "suppress error message for non-symbolic (detached) refs"
7762 msgstr ""
7763
7739 -#: builtin/symbolic-ref.c:39
7764 +#: builtin/symbolic-ref.c:41
7765 +msgid "delete symbolic ref"
7766 +msgstr ""
7767 +
7768 +#: builtin/symbolic-ref.c:42
7769 msgid "shorten ref output"
7770 msgstr ""
7771
7743 -#: builtin/symbolic-ref.c:40 builtin/update-ref.c:18
7772 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
7773 msgid "reason"
7774 msgstr ""
7775
7747 -#: builtin/symbolic-ref.c:40 builtin/update-ref.c:18
7776 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
7777 msgid "reason of the update"
7778 msgstr ""
7779
@@ -7954,111 +7983,111 @@ msgstr ""
7983 msgid "git update-index [options] [--] [<file>...]"
7984 msgstr ""
7985
7957 -#: builtin/update-index.c:717
7986 +#: builtin/update-index.c:718
7987 msgid "continue refresh even when index needs update"
7988 msgstr ""
7989
7961 -#: builtin/update-index.c:720
7990 +#: builtin/update-index.c:721
7991 msgid "refresh: ignore submodules"
7992 msgstr ""
7993
7965 -#: builtin/update-index.c:723
7994 +#: builtin/update-index.c:724
7995 msgid "do not ignore new files"
7996 msgstr ""
7997
7969 -#: builtin/update-index.c:725
7998 +#: builtin/update-index.c:726
7999 msgid "let files replace directories and vice-versa"
8000 msgstr ""
8001
7973 -#: builtin/update-index.c:727
8002 +#: builtin/update-index.c:728
8003 msgid "notice files missing from worktree"
8004 msgstr ""
8005
7977 -#: builtin/update-index.c:729
8006 +#: builtin/update-index.c:730
8007 msgid "refresh even if index contains unmerged entries"
8008 msgstr ""
8009
7981 -#: builtin/update-index.c:732
8010 +#: builtin/update-index.c:733
8011 msgid "refresh stat information"
8012 msgstr ""
8013
7985 -#: builtin/update-index.c:736
8014 +#: builtin/update-index.c:737
8015 msgid "like --refresh, but ignore assume-unchanged setting"
8016 msgstr ""
8017
7989 -#: builtin/update-index.c:740
8018 +#: builtin/update-index.c:741
8019 msgid "<mode> <object> <path>"
8020 msgstr ""
8021
7993 -#: builtin/update-index.c:741
8022 +#: builtin/update-index.c:742
8023 msgid "add the specified entry to the index"
8024 msgstr ""
8025
7997 -#: builtin/update-index.c:745
8026 +#: builtin/update-index.c:746
8027 msgid "(+/-)x"
8028 msgstr ""
8029
8001 -#: builtin/update-index.c:746
8030 +#: builtin/update-index.c:747
8031 msgid "override the executable bit of the listed files"
8032 msgstr ""
8033
8005 -#: builtin/update-index.c:750
8034 +#: builtin/update-index.c:751
8035 msgid "mark files as \"not changing\""
8036 msgstr ""
8037
8009 -#: builtin/update-index.c:753
8038 +#: builtin/update-index.c:754
8039 msgid "clear assumed-unchanged bit"
8040 msgstr ""
8041
8013 -#: builtin/update-index.c:756
8042 +#: builtin/update-index.c:757
8043 msgid "mark files as \"index-only\""
8044 msgstr ""
8045
8017 -#: builtin/update-index.c:759
8046 +#: builtin/update-index.c:760
8047 msgid "clear skip-worktree bit"
8048 msgstr ""
8049
8021 -#: builtin/update-index.c:762
8050 +#: builtin/update-index.c:763
8051 msgid "add to index only; do not add content to object database"
8052 msgstr ""
8053
8025 -#: builtin/update-index.c:764
8054 +#: builtin/update-index.c:765
8055 msgid "remove named paths even if present in worktree"
8056 msgstr ""
8057
8029 -#: builtin/update-index.c:766
8058 +#: builtin/update-index.c:767
8059 msgid "with --stdin: input lines are terminated by null bytes"
8060 msgstr ""
8061
8033 -#: builtin/update-index.c:768
8062 +#: builtin/update-index.c:769
8063 msgid "read list of paths to be updated from standard input"
8064 msgstr ""
8065
8037 -#: builtin/update-index.c:772
8066 +#: builtin/update-index.c:773
8067 msgid "add entries from standard input to the index"
8068 msgstr ""
8069
8041 -#: builtin/update-index.c:776
8070 +#: builtin/update-index.c:777
8071 msgid "repopulate stages #2 and #3 for the listed paths"
8072 msgstr ""
8073
8045 -#: builtin/update-index.c:780
8074 +#: builtin/update-index.c:781
8075 msgid "only update entries that differ from HEAD"
8076 msgstr ""
8077
8049 -#: builtin/update-index.c:784
8078 +#: builtin/update-index.c:785
8079 msgid "ignore files missing from worktree"
8080 msgstr ""
8081
8053 -#: builtin/update-index.c:787
8082 +#: builtin/update-index.c:788
8083 msgid "report actions to standard output"
8084 msgstr ""
8085
8057 -#: builtin/update-index.c:789
8086 +#: builtin/update-index.c:790
8087 msgid "(for porcelains) forget saved unresolved conflicts"
8088 msgstr ""
8089
8061 -#: builtin/update-index.c:793
8090 +#: builtin/update-index.c:794
8091 msgid "write index in this format"
8092 msgstr ""
8093
@@ -8535,7 +8564,7 @@ msgstr ""
8564 #. The working tree and the index file is still based on the
8565 #. $orig_head commit, but we are merging into $curr_head.
8566 #. First update the working tree to match $curr_head.
8538 -#: git-pull.sh:228
8567 +#: git-pull.sh:229
8568 #, sh-format
8569 msgid ""
8570 "Warning: fetch updated the current branch head.\n"
@@ -8543,11 +8572,11 @@ msgid ""
8572 "Warning: commit $orig_head."
8573 msgstr ""
8574
8546 -#: git-pull.sh:253
8575 +#: git-pull.sh:254
8576 msgid "Cannot merge multiple branches into empty head"
8577 msgstr ""
8578
8550 -#: git-pull.sh:257
8579 +#: git-pull.sh:258
8580 msgid "Cannot rebase onto multiple branches"
8581 msgstr ""
8582
@@ -8788,12 +8817,12 @@ msgstr ""
8817 msgid "(To restore them type \"git stash apply\")"
8818 msgstr ""
8819
8791 -#: git-submodule.sh:88
8820 +#: git-submodule.sh:89
8821 #, sh-format
8822 msgid "cannot strip one component off url '$remoteurl'"
8823 msgstr ""
8824
8796 -#: git-submodule.sh:167
8825 +#: git-submodule.sh:168
8826 #, sh-format
8827 msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
8828 msgstr ""
@@ -8808,17 +8837,17 @@ msgstr ""
8837 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
8838 msgstr ""
8839
8811 -#: git-submodule.sh:312
8840 +#: git-submodule.sh:316
8841 #, sh-format
8842 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
8843 msgstr ""
8844
8816 -#: git-submodule.sh:329
8845 +#: git-submodule.sh:333
8846 #, sh-format
8847 msgid "'$sm_path' already exists in the index"
8848 msgstr ""
8849
8821 -#: git-submodule.sh:333
8850 +#: git-submodule.sh:337
8851 #, sh-format
8852 msgid ""
8853 "The following path is ignored by one of your .gitignore files:\n"
@@ -8826,151 +8855,180 @@ msgid ""
8855 "Use -f if you really want to add it."
8856 msgstr ""
8857
8829 -#: git-submodule.sh:344
8858 +#: git-submodule.sh:355
8859 #, sh-format
8860 msgid "Adding existing repo at '$sm_path' to the index"
8861 msgstr ""
8862
8834 -#: git-submodule.sh:346
8863 +#: git-submodule.sh:357
8864 #, sh-format
8865 msgid "'$sm_path' already exists and is not a valid git repo"
8866 msgstr ""
8867
8839 -#: git-submodule.sh:360
8868 +#: git-submodule.sh:365
8869 +#, sh-format
8870 +msgid "A git directory for '$sm_name' is found locally with remote(s):"
8871 +msgstr ""
8872 +
8873 +#: git-submodule.sh:367
8874 +#, sh-format
8875 +msgid ""
8876 +"If you want to reuse this local git directory instead of cloning again from"
8877 +msgstr ""
8878 +
8879 +#: git-submodule.sh:369
8880 +#, sh-format
8881 +msgid ""
8882 +"use the '--force' option. If the local git directory is not the correct repo"
8883 +msgstr ""
8884 +
8885 +#: git-submodule.sh:370
8886 +#, sh-format
8887 +msgid ""
8888 +"or you are unsure what this means choose another name with the '--name' "
8889 +"option."
8890 +msgstr ""
8891 +
8892 +#: git-submodule.sh:372
8893 +#, sh-format
8894 +msgid "Reactivating local git directory for submodule '$sm_name'."
8895 +msgstr ""
8896 +
8897 +#: git-submodule.sh:384
8898 #, sh-format
8899 msgid "Unable to checkout submodule '$sm_path'"
8900 msgstr ""
8901
8844 -#: git-submodule.sh:365
8902 +#: git-submodule.sh:389
8903 #, sh-format
8904 msgid "Failed to add submodule '$sm_path'"
8905 msgstr ""
8906
8849 -#: git-submodule.sh:370
8907 +#: git-submodule.sh:394
8908 #, sh-format
8909 msgid "Failed to register submodule '$sm_path'"
8910 msgstr ""
8911
8854 -#: git-submodule.sh:413
8912 +#: git-submodule.sh:437
8913 #, sh-format
8914 msgid "Entering '$prefix$sm_path'"
8915 msgstr ""
8916
8859 -#: git-submodule.sh:427
8917 +#: git-submodule.sh:451
8918 #, sh-format
8919 msgid "Stopping at '$sm_path'; script returned non-zero status."
8920 msgstr ""
8921
8864 -#: git-submodule.sh:471
8922 +#: git-submodule.sh:495
8923 #, sh-format
8924 msgid "No url found for submodule path '$sm_path' in .gitmodules"
8925 msgstr ""
8926
8869 -#: git-submodule.sh:480
8927 +#: git-submodule.sh:504
8928 #, sh-format
8929 msgid "Failed to register url for submodule path '$sm_path'"
8930 msgstr ""
8931
8874 -#: git-submodule.sh:482
8932 +#: git-submodule.sh:506
8933 #, sh-format
8934 msgid "Submodule '$name' ($url) registered for path '$sm_path'"
8935 msgstr ""
8936
8879 -#: git-submodule.sh:490
8937 +#: git-submodule.sh:514
8938 #, sh-format
8939 msgid "Failed to register update mode for submodule path '$sm_path'"
8940 msgstr ""
8941
8884 -#: git-submodule.sh:590
8942 +#: git-submodule.sh:614
8943 #, sh-format
8944 msgid ""
8945 "Submodule path '$sm_path' not initialized\n"
8946 "Maybe you want to use 'update --init'?"
8947 msgstr ""
8948
8891 -#: git-submodule.sh:603
8949 +#: git-submodule.sh:627
8950 #, sh-format
8951 msgid "Unable to find current revision in submodule path '$sm_path'"
8952 msgstr ""
8953
8896 -#: git-submodule.sh:622
8954 +#: git-submodule.sh:646
8955 #, sh-format
8956 msgid "Unable to fetch in submodule path '$sm_path'"
8957 msgstr ""
8958
8901 -#: git-submodule.sh:636
8959 +#: git-submodule.sh:660
8960 #, sh-format
8961 msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
8962 msgstr ""
8963
8906 -#: git-submodule.sh:637
8964 +#: git-submodule.sh:661
8965 #, sh-format
8966 msgid "Submodule path '$sm_path': rebased into '$sha1'"
8967 msgstr ""
8968
8911 -#: git-submodule.sh:642
8969 +#: git-submodule.sh:666
8970 #, sh-format
8971 msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
8972 msgstr ""
8973
8916 -#: git-submodule.sh:643
8974 +#: git-submodule.sh:667
8975 #, sh-format
8976 msgid "Submodule path '$sm_path': merged in '$sha1'"
8977 msgstr ""
8978
8921 -#: git-submodule.sh:648
8979 +#: git-submodule.sh:672
8980 #, sh-format
8981 msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
8982 msgstr ""
8983
8926 -#: git-submodule.sh:649
8984 +#: git-submodule.sh:673
8985 #, sh-format
8986 msgid "Submodule path '$sm_path': checked out '$sha1'"
8987 msgstr ""
8988
8931 -#: git-submodule.sh:671 git-submodule.sh:995
8989 +#: git-submodule.sh:695 git-submodule.sh:1017
8990 #, sh-format
8991 msgid "Failed to recurse into submodule path '$sm_path'"
8992 msgstr ""
8993
8936 -#: git-submodule.sh:779
8994 +#: git-submodule.sh:803
8995 msgid "The --cached option cannot be used with the --files option"
8996 msgstr ""
8997
8998 #. unexpected type
8941 -#: git-submodule.sh:819
8999 +#: git-submodule.sh:843
9000 #, sh-format
9001 msgid "unexpected mode $mod_dst"
9002 msgstr ""
9003
8946 -#: git-submodule.sh:837
9004 +#: git-submodule.sh:861
9005 #, sh-format
9006 msgid " Warn: $name doesn't contain commit $sha1_src"
9007 msgstr ""
9008
8951 -#: git-submodule.sh:840
9009 +#: git-submodule.sh:864
9010 #, sh-format
9011 msgid " Warn: $name doesn't contain commit $sha1_dst"
9012 msgstr ""
9013
8956 -#: git-submodule.sh:843
9014 +#: git-submodule.sh:867
9015 #, sh-format
9016 msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
9017 msgstr ""
9018
8961 -#: git-submodule.sh:868
9019 +#: git-submodule.sh:892
9020 msgid "blob"
9021 msgstr ""
9022
8965 -#: git-submodule.sh:906
9023 +#: git-submodule.sh:930
9024 msgid "# Submodules changed but not updated:"
9025 msgstr ""
9026
8969 -#: git-submodule.sh:908
9027 +#: git-submodule.sh:932
9028 msgid "# Submodule changes to be committed:"
9029 msgstr ""
9030
8973 -#: git-submodule.sh:1054
9031 +#: git-submodule.sh:1080
9032 #, sh-format
8975 -msgid "Synchronizing submodule url for '$name'"
9033 +msgid "Synchronizing submodule url for '$prefix$sm_path'"
9034 msgstr ""