2b911f8185 · matheusbsbs/matheus-bagliano

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

8 msgstr ""

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

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

11 -"POT-Creation-Date: 2012-02-28 09:17+0800\n"

11 +"POT-Creation-Date: 2012-03-08 10:19+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"

@@ -63,49 +63,49 @@ msgstr ""

63 msgid "failed to close rev-list's stdin: %s"

64 msgstr ""

65

66 -#: diff.c:104

66 +#: diff.c:105

67 #, c-format

68 msgid " Failed to parse dirstat cut-off percentage '%.*s'\n"

69 msgstr ""

70

71 -#: diff.c:109

71 +#: diff.c:110

72 #, c-format

73 msgid " Unknown dirstat parameter '%.*s'\n"

74 msgstr ""

75

76 -#: diff.c:205

76 +#: diff.c:210

77 #, c-format

78 msgid ""

79 "Found errors in 'diff.dirstat' config variable:\n"

80 "%s"

81 msgstr ""

82

83 -#: diff.c:1331

83 +#: diff.c:1336

84 msgid " 0 files changed\n"

85 msgstr ""

86

87 -#: diff.c:1335

87 +#: diff.c:1340

88 #, c-format

89 msgid " %d file changed"

90 msgid_plural " %d files changed"

91 msgstr[0] ""

92 msgstr[1] ""

93

94 -#: diff.c:1352

94 +#: diff.c:1357

95 #, c-format

96 msgid ", %d insertion(+)"

97 msgid_plural ", %d insertions(+)"

98 msgstr[0] ""

99 msgstr[1] ""

100

101 -#: diff.c:1363

101 +#: diff.c:1368

102 #, c-format

103 msgid ", %d deletion(-)"

104 msgid_plural ", %d deletions(-)"

105 msgstr[0] ""

106 msgstr[1] ""

107

108 -#: diff.c:3364

108 +#: diff.c:3424

109 #, c-format

110 msgid ""

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

@@ -124,17 +124,17 @@ msgstr ""

124 msgid "gpg failed to sign the data"

125 msgstr ""

126

127 -#: grep.c:1285

127 +#: grep.c:1280

128 #, c-format

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

130 msgstr ""

131

132 -#: grep.c:1302

132 +#: grep.c:1297

133 #, c-format

134 msgid "'%s': %s"

135 msgstr ""

136

137 -#: grep.c:1313

137 +#: grep.c:1308

138 #, c-format

139 msgid "'%s': short read %s"

140 msgstr ""

@@ -172,221 +172,227 @@ msgid_plural ""

172 msgstr[0] ""

173 msgstr[1] ""

174

175 -#: sequencer.c:120 builtin/merge.c:862 builtin/merge.c:983

176 -#: builtin/merge.c:1093 builtin/merge.c:1103

175 +#: sequencer.c:120 builtin/merge.c:864 builtin/merge.c:985

176 +#: builtin/merge.c:1095 builtin/merge.c:1105

177 #, c-format

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

179 msgstr ""

180

181 -#: sequencer.c:122 builtin/merge.c:334 builtin/merge.c:865

182 -#: builtin/merge.c:1095 builtin/merge.c:1108

181 +#: sequencer.c:122 builtin/merge.c:334 builtin/merge.c:867

182 +#: builtin/merge.c:1097 builtin/merge.c:1110

183 #, c-format

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

185 msgstr ""

186

187 -#: sequencer.c:142

187 +#: sequencer.c:143

188 +msgid ""

189 +"after resolving the conflicts, mark the corrected paths\n"

190 +"with 'git add <paths>' or 'git rm <paths>'"

191 +msgstr ""

192 +

193 +#: sequencer.c:146

194 msgid ""

195 "after resolving the conflicts, mark the corrected paths\n"

196 "with 'git add <paths>' or 'git rm <paths>'\n"

197 "and commit the result with 'git commit'"

198 msgstr ""

199

194 -#: sequencer.c:154 sequencer.c:680 sequencer.c:763

200 +#: sequencer.c:159 sequencer.c:685 sequencer.c:768

201 #, c-format

202 msgid "Could not write to %s"

203 msgstr ""

204

199 -#: sequencer.c:157

205 +#: sequencer.c:162

206 #, c-format

207 msgid "Error wrapping up %s"

208 msgstr ""

209

204 -#: sequencer.c:172

210 +#: sequencer.c:177

211 msgid "Your local changes would be overwritten by cherry-pick."

212 msgstr ""

213

208 -#: sequencer.c:174

214 +#: sequencer.c:179

215 msgid "Your local changes would be overwritten by revert."

216 msgstr ""

217

212 -#: sequencer.c:177

218 +#: sequencer.c:182

219 msgid "Commit your changes or stash them to proceed."

220 msgstr ""

221

222 #. TRANSLATORS: %s will be "revert" or "cherry-pick"

217 -#: sequencer.c:227

223 +#: sequencer.c:232

224 #, c-format

225 msgid "%s: Unable to write new index file"

226 msgstr ""

227

222 -#: sequencer.c:293

228 +#: sequencer.c:298

229 msgid "Your index file is unmerged."

230 msgstr ""

231

226 -#: sequencer.c:296

232 +#: sequencer.c:301

233 msgid "You do not have a valid HEAD"

234 msgstr ""

235

230 -#: sequencer.c:311

236 +#: sequencer.c:316

237 #, c-format

238 msgid "Commit %s is a merge but no -m option was given."

239 msgstr ""

240

235 -#: sequencer.c:319

241 +#: sequencer.c:324

242 #, c-format

243 msgid "Commit %s does not have parent %d"

244 msgstr ""

245

240 -#: sequencer.c:323

246 +#: sequencer.c:328

247 #, c-format

248 msgid "Mainline was specified but commit %s is not a merge."

249 msgstr ""

250

251 #. TRANSLATORS: The first %s will be "revert" or

252 #. "cherry-pick", the second %s a SHA1

247 -#: sequencer.c:334

253 +#: sequencer.c:339

254 #, c-format

255 msgid "%s: cannot parse parent commit %s"

256 msgstr ""

257

252 -#: sequencer.c:338

258 +#: sequencer.c:343

259 #, c-format

260 msgid "Cannot get commit message for %s"

261 msgstr ""

262

257 -#: sequencer.c:422

263 +#: sequencer.c:427

264 #, c-format

265 msgid "could not revert %s... %s"

266 msgstr ""

267

262 -#: sequencer.c:423

268 +#: sequencer.c:428

269 #, c-format

270 msgid "could not apply %s... %s"

271 msgstr ""

272

267 -#: sequencer.c:445 sequencer.c:904 builtin/log.c:286 builtin/log.c:709

268 -#: builtin/log.c:1325 builtin/log.c:1544 builtin/merge.c:348

273 +#: sequencer.c:450 sequencer.c:909 builtin/log.c:288 builtin/log.c:713

274 +#: builtin/log.c:1329 builtin/log.c:1548 builtin/merge.c:348

275 #: builtin/shortlog.c:181

276 msgid "revision walk setup failed"

277 msgstr ""

278

273 -#: sequencer.c:448

279 +#: sequencer.c:453

280 msgid "empty commit set passed"

281 msgstr ""

282

277 -#: sequencer.c:456

283 +#: sequencer.c:461

284 #, c-format

285 msgid "git %s: failed to read the index"

286 msgstr ""

287

282 -#: sequencer.c:461

288 +#: sequencer.c:466

289 #, c-format

290 msgid "git %s: failed to refresh the index"

291 msgstr ""

292

287 -#: sequencer.c:546

293 +#: sequencer.c:551

294 #, c-format

295 msgid "Cannot %s during a %s"

296 msgstr ""

297

292 -#: sequencer.c:568

298 +#: sequencer.c:573

299 #, c-format

300 msgid "Could not parse line %d."

301 msgstr ""

302

297 -#: sequencer.c:573

303 +#: sequencer.c:578

304 msgid "No commits parsed."

305 msgstr ""

306

301 -#: sequencer.c:586

307 +#: sequencer.c:591

308 #, c-format

309 msgid "Could not open %s"

310 msgstr ""

311

306 -#: sequencer.c:590

312 +#: sequencer.c:595

313 #, c-format

314 msgid "Could not read %s."

315 msgstr ""

316

311 -#: sequencer.c:597

317 +#: sequencer.c:602

318 #, c-format

319 msgid "Unusable instruction sheet: %s"

320 msgstr ""

321

316 -#: sequencer.c:625

322 +#: sequencer.c:630

323 #, c-format

324 msgid "Invalid key: %s"

325 msgstr ""

326

321 -#: sequencer.c:628

327 +#: sequencer.c:633

328 #, c-format

329 msgid "Invalid value for %s: %s"

330 msgstr ""

331

326 -#: sequencer.c:640

332 +#: sequencer.c:645

333 #, c-format

334 msgid "Malformed options sheet: %s"

335 msgstr ""

336

331 -#: sequencer.c:661

337 +#: sequencer.c:666

338 msgid "a cherry-pick or revert is already in progress"

339 msgstr ""

340

335 -#: sequencer.c:662

341 +#: sequencer.c:667

342 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""

343 msgstr ""

344

339 -#: sequencer.c:666

345 +#: sequencer.c:671

346 #, c-format

347 msgid "Could not create sequencer directory %s"

348 msgstr ""

349

344 -#: sequencer.c:682 sequencer.c:767

350 +#: sequencer.c:687 sequencer.c:772

351 #, c-format

352 msgid "Error wrapping up %s."

353 msgstr ""

354

349 -#: sequencer.c:701 sequencer.c:835

355 +#: sequencer.c:706 sequencer.c:840

356 msgid "no cherry-pick or revert in progress"

357 msgstr ""

358

353 -#: sequencer.c:703

359 +#: sequencer.c:708

360 msgid "cannot resolve HEAD"

361 msgstr ""

362

357 -#: sequencer.c:705

363 +#: sequencer.c:710

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

365 msgstr ""

366

361 -#: sequencer.c:727

367 +#: sequencer.c:732

368 #, c-format

369 msgid "cannot open %s: %s"

370 msgstr ""

371

366 -#: sequencer.c:730

372 +#: sequencer.c:735

373 #, c-format

374 msgid "cannot read %s: %s"

375 msgstr ""

376

371 -#: sequencer.c:731

377 +#: sequencer.c:736

378 msgid "unexpected end of file"

379 msgstr ""

380

375 -#: sequencer.c:737

381 +#: sequencer.c:742

382 #, c-format

383 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"

384 msgstr ""

385

380 -#: sequencer.c:760

386 +#: sequencer.c:765

387 #, c-format

388 msgid "Could not format %s."

389 msgstr ""

390

385 -#: sequencer.c:922

391 +#: sequencer.c:927

392 msgid "Can't revert as initial commit"

393 msgstr ""

394

389 -#: sequencer.c:923

395 +#: sequencer.c:928

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

397 msgstr ""

398

@@ -845,56 +851,56 @@ msgstr ""

851 msgid "(no branch)"

852 msgstr ""

853

848 -#: builtin/branch.c:562

854 +#: builtin/branch.c:566

855 msgid "some refs could not be read"

856 msgstr ""

857

852 -#: builtin/branch.c:575

858 +#: builtin/branch.c:579

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

860 msgstr ""

861

856 -#: builtin/branch.c:585

862 +#: builtin/branch.c:589

863 #, c-format

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

865 msgstr ""

866

861 -#: builtin/branch.c:600

867 +#: builtin/branch.c:604

868 msgid "Branch rename failed"

869 msgstr ""

870

865 -#: builtin/branch.c:604

871 +#: builtin/branch.c:608

872 #, c-format

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

874 msgstr ""

875

870 -#: builtin/branch.c:608

876 +#: builtin/branch.c:612

877 #, c-format

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

879 msgstr ""

880

875 -#: builtin/branch.c:615

881 +#: builtin/branch.c:619

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

883 msgstr ""

884

879 -#: builtin/branch.c:630

885 +#: builtin/branch.c:634

886 #, c-format

887 msgid "malformed object name %s"

888 msgstr ""

889

884 -#: builtin/branch.c:654

890 +#: builtin/branch.c:658

891 #, c-format

892 msgid "could not write branch description template: %s\n"

893 msgstr ""

894

889 -#: builtin/branch.c:742

895 +#: builtin/branch.c:746

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

897 msgstr ""

898

893 -#: builtin/branch.c:747 builtin/clone.c:558

899 +#: builtin/branch.c:751 builtin/clone.c:558

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

901 msgstr ""

902

897 -#: builtin/branch.c:805

903 +#: builtin/branch.c:809

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

905 msgstr ""

906

@@ -956,11 +962,11 @@ msgid "path '%s' is unmerged"

962 msgstr ""

963

964 #: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583

959 -#: builtin/merge.c:809

965 +#: builtin/merge.c:811

966 msgid "unable to write new index file"

967 msgstr ""

968

963 -#: builtin/checkout.c:319 builtin/diff.c:298 builtin/merge.c:406

969 +#: builtin/checkout.c:319 builtin/diff.c:302 builtin/merge.c:408

970 msgid "diff_setup_done failed"

971 msgstr ""

972

@@ -1552,7 +1558,7 @@ msgstr ""

1558 msgid "could not parse HEAD commit"

1559 msgstr ""

1560

1555 -#: builtin/commit.c:1452 builtin/merge.c:507

1561 +#: builtin/commit.c:1452 builtin/merge.c:509

1562 #, c-format

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

1564 msgstr ""

@@ -1576,7 +1582,7 @@ msgstr ""

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

1583 msgstr ""

1584

1579 -#: builtin/commit.c:1514 builtin/merge.c:933 builtin/merge.c:966

1585 +#: builtin/commit.c:1514 builtin/merge.c:935 builtin/merge.c:968

1586 msgid "failed to write commit object"

1587 msgstr ""

1588

@@ -1683,26 +1689,26 @@ msgstr ""

1689 msgid "invalid option: %s"

1690 msgstr ""

1691

1686 -#: builtin/diff.c:293

1692 +#: builtin/diff.c:297

1693 msgid "Not a git repository"

1694 msgstr ""

1695

1690 -#: builtin/diff.c:343

1696 +#: builtin/diff.c:347

1697 #, c-format

1698 msgid "invalid object '%s' given."

1699 msgstr ""

1700

1695 -#: builtin/diff.c:348

1701 +#: builtin/diff.c:352

1702 #, c-format

1703 msgid "more than %d trees given: '%s'"

1704 msgstr ""

1705

1700 -#: builtin/diff.c:358

1706 +#: builtin/diff.c:362

1707 #, c-format

1708 msgid "more than two blobs given: '%s'"

1709 msgstr ""

1710

1705 -#: builtin/diff.c:366

1711 +#: builtin/diff.c:370

1712 #, c-format

1713 msgid "unhandled object '%s' given."

1714 msgstr ""

@@ -1915,32 +1921,32 @@ msgstr ""

1921 msgid "cannot open '%s'"

1922 msgstr ""

1923

1918 -#: builtin/grep.c:889

1924 +#: builtin/grep.c:888

1925 msgid "no pattern given."

1926 msgstr ""

1927

1922 -#: builtin/grep.c:903

1928 +#: builtin/grep.c:902

1929 #, c-format

1930 msgid "bad object %s"

1931 msgstr ""

1932

1927 -#: builtin/grep.c:944

1933 +#: builtin/grep.c:943

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

1935 msgstr ""

1936

1931 -#: builtin/grep.c:967

1937 +#: builtin/grep.c:966

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

1939 msgstr ""

1940

1935 -#: builtin/grep.c:972

1941 +#: builtin/grep.c:971

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

1943 msgstr ""

1944

1939 -#: builtin/grep.c:975

1945 +#: builtin/grep.c:974

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

1947 msgstr ""

1948

1943 -#: builtin/grep.c:983

1949 +#: builtin/grep.c:982

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

1951 msgstr ""

1952

@@ -2086,109 +2092,109 @@ msgstr ""

2092 msgid "Cannot access work tree '%s'"

2093 msgstr ""

2094

2089 -#: builtin/log.c:185

2095 +#: builtin/log.c:187

2096 #, c-format

2097 msgid "Final output: %d %s\n"

2098 msgstr ""

2099

2094 -#: builtin/log.c:393 builtin/log.c:479

2100 +#: builtin/log.c:395 builtin/log.c:483

2101 #, c-format

2102 msgid "Could not read object %s"

2103 msgstr ""

2104

2099 -#: builtin/log.c:503

2105 +#: builtin/log.c:507

2106 #, c-format

2107 msgid "Unknown type: %d"

2108 msgstr ""

2109

2104 -#: builtin/log.c:592

2110 +#: builtin/log.c:596

2111 msgid "format.headers without value"

2112 msgstr ""

2113

2108 -#: builtin/log.c:665

2114 +#: builtin/log.c:669

2115 msgid "name of output directory is too long"

2116 msgstr ""

2117

2112 -#: builtin/log.c:676

2118 +#: builtin/log.c:680

2119 #, c-format

2120 msgid "Cannot open patch file %s"

2121 msgstr ""

2122

2117 -#: builtin/log.c:690

2123 +#: builtin/log.c:694

2124 msgid "Need exactly one range."

2125 msgstr ""

2126

2121 -#: builtin/log.c:698

2127 +#: builtin/log.c:702

2128 msgid "Not a range."

2129 msgstr ""

2130

2125 -#: builtin/log.c:735

2131 +#: builtin/log.c:739

2132 msgid "Could not extract email from committer identity."

2133 msgstr ""

2134

2129 -#: builtin/log.c:781

2135 +#: builtin/log.c:785

2136 msgid "Cover letter needs email format"

2137 msgstr ""

2138

2133 -#: builtin/log.c:875

2139 +#: builtin/log.c:879

2140 #, c-format

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

2142 msgstr ""

2143

2138 -#: builtin/log.c:948

2144 +#: builtin/log.c:952

2145 msgid "Two output directories?"

2146 msgstr ""

2147

2142 -#: builtin/log.c:1169

2148 +#: builtin/log.c:1173

2149 #, c-format

2150 msgid "bogus committer info %s"

2151 msgstr ""

2152

2147 -#: builtin/log.c:1214

2153 +#: builtin/log.c:1218

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

2155 msgstr ""

2156

2151 -#: builtin/log.c:1216

2157 +#: builtin/log.c:1220

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

2159 msgstr ""

2160

2155 -#: builtin/log.c:1221 builtin/shortlog.c:284

2161 +#: builtin/log.c:1225 builtin/shortlog.c:284

2162 #, c-format

2163 msgid "unrecognized argument: %s"

2164 msgstr ""

2165

2160 -#: builtin/log.c:1224

2166 +#: builtin/log.c:1228

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

2168 msgstr ""

2169

2164 -#: builtin/log.c:1226

2170 +#: builtin/log.c:1230

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

2172 msgstr ""

2173

2168 -#: builtin/log.c:1228

2174 +#: builtin/log.c:1232

2175 msgid "--check does not make sense"

2176 msgstr ""

2177

2172 -#: builtin/log.c:1251

2178 +#: builtin/log.c:1255

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

2180 msgstr ""

2181

2176 -#: builtin/log.c:1253

2182 +#: builtin/log.c:1257

2183 #, c-format

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

2185 msgstr ""

2186

2181 -#: builtin/log.c:1406

2187 +#: builtin/log.c:1410

2188 msgid "Failed to create output files"

2189 msgstr ""

2190

2185 -#: builtin/log.c:1510

2191 +#: builtin/log.c:1514

2192 #, c-format

2193 msgid ""

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

2195 msgstr ""

2196

2191 -#: builtin/log.c:1526 builtin/log.c:1528 builtin/log.c:1540

2197 +#: builtin/log.c:1530 builtin/log.c:1532 builtin/log.c:1544

2198 #, c-format

2199 msgid "Unknown commit %s"

2200 msgstr ""

@@ -2251,53 +2257,53 @@ msgstr ""

2257 msgid "No merge message -- not updating HEAD\n"

2258 msgstr ""

2259

2254 -#: builtin/merge.c:435

2260 +#: builtin/merge.c:437

2261 #, c-format

2262 msgid "'%s' does not point to a commit"

2263 msgstr ""

2264

2259 -#: builtin/merge.c:534

2265 +#: builtin/merge.c:536

2266 #, c-format

2267 msgid "Bad branch.%s.mergeoptions string: %s"

2268 msgstr ""

2269

2264 -#: builtin/merge.c:627

2270 +#: builtin/merge.c:629

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

2272 msgstr ""

2273

2268 -#: builtin/merge.c:677

2274 +#: builtin/merge.c:679

2275 msgid "failed to read the cache"

2276 msgstr ""

2277

2272 -#: builtin/merge.c:694

2278 +#: builtin/merge.c:696

2279 msgid "Unable to write index."

2280 msgstr ""

2281

2276 -#: builtin/merge.c:707

2282 +#: builtin/merge.c:709

2283 msgid "Not handling anything other than two heads merge."

2284 msgstr ""

2285

2280 -#: builtin/merge.c:721

2286 +#: builtin/merge.c:723

2287 #, c-format

2288 msgid "Unknown option for merge-recursive: -X%s"

2289 msgstr ""

2290

2285 -#: builtin/merge.c:735

2291 +#: builtin/merge.c:737

2292 #, c-format

2293 msgid "unable to write %s"

2294 msgstr ""

2295

2290 -#: builtin/merge.c:874

2296 +#: builtin/merge.c:876

2297 #, c-format

2298 msgid "Could not read from '%s'"

2299 msgstr ""

2300

2295 -#: builtin/merge.c:883

2301 +#: builtin/merge.c:885

2302 #, c-format

2303 msgid "Not committing merge; use 'git commit' to complete the merge.\n"

2304 msgstr ""

2305

2300 -#: builtin/merge.c:889

2306 +#: builtin/merge.c:891

2307 msgid ""

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

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

@@ -2306,140 +2312,140 @@ msgid ""

2312 "the commit.\n"

2313 msgstr ""

2314

2309 -#: builtin/merge.c:913

2315 +#: builtin/merge.c:915

2316 msgid "Empty commit message."

2317 msgstr ""

2318

2313 -#: builtin/merge.c:925

2319 +#: builtin/merge.c:927

2320 #, c-format

2321 msgid "Wonderful.\n"

2322 msgstr ""

2323

2318 -#: builtin/merge.c:998

2324 +#: builtin/merge.c:1000

2325 #, c-format

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

2327 msgstr ""

2328

2323 -#: builtin/merge.c:1014

2329 +#: builtin/merge.c:1016

2330 #, c-format

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

2332 msgstr ""

2333

2328 -#: builtin/merge.c:1055

2334 +#: builtin/merge.c:1057

2335 msgid "No current branch."

2336 msgstr ""

2337

2332 -#: builtin/merge.c:1057

2338 +#: builtin/merge.c:1059

2339 msgid "No remote for the current branch."

2340 msgstr ""

2341

2336 -#: builtin/merge.c:1059

2342 +#: builtin/merge.c:1061

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

2344 msgstr ""

2345

2340 -#: builtin/merge.c:1064

2346 +#: builtin/merge.c:1066

2347 #, c-format

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

2349 msgstr ""

2350

2345 -#: builtin/merge.c:1186

2351 +#: builtin/merge.c:1188

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

2353 msgstr ""

2354

2349 -#: builtin/merge.c:1202 git-pull.sh:31

2355 +#: builtin/merge.c:1204 git-pull.sh:31

2356 msgid ""

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

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

2359 msgstr ""

2360

2355 -#: builtin/merge.c:1205 git-pull.sh:34

2361 +#: builtin/merge.c:1207 git-pull.sh:34

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

2363 msgstr ""

2364

2359 -#: builtin/merge.c:1209

2365 +#: builtin/merge.c:1211

2366 msgid ""

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

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

2369 msgstr ""

2370

2365 -#: builtin/merge.c:1212

2371 +#: builtin/merge.c:1214

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

2373 msgstr ""

2374

2369 -#: builtin/merge.c:1221

2375 +#: builtin/merge.c:1223

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

2377 msgstr ""

2378

2373 -#: builtin/merge.c:1226

2379 +#: builtin/merge.c:1228

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

2381 msgstr ""

2382

2377 -#: builtin/merge.c:1233

2383 +#: builtin/merge.c:1235

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

2385 msgstr ""

2386

2381 -#: builtin/merge.c:1264

2387 +#: builtin/merge.c:1266

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

2389 msgstr ""

2390

2385 -#: builtin/merge.c:1267

2391 +#: builtin/merge.c:1269

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

2393 msgstr ""

2394

2389 -#: builtin/merge.c:1269

2395 +#: builtin/merge.c:1271

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

2397 msgstr ""

2398

2393 -#: builtin/merge.c:1273 builtin/merge.c:1317

2399 +#: builtin/merge.c:1275 builtin/merge.c:1319

2400 #, c-format

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

2402 msgstr ""

2403

2398 -#: builtin/merge.c:1383

2404 +#: builtin/merge.c:1385

2405 #, c-format

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

2407 msgstr ""

2408

2403 -#: builtin/merge.c:1421

2409 +#: builtin/merge.c:1423

2410 #, c-format

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

2412 msgstr ""

2413

2408 -#: builtin/merge.c:1428

2414 +#: builtin/merge.c:1430

2415 #, c-format

2416 msgid "Nope.\n"

2417 msgstr ""

2418

2413 -#: builtin/merge.c:1460

2419 +#: builtin/merge.c:1462

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

2421 msgstr ""

2422

2417 -#: builtin/merge.c:1483 builtin/merge.c:1560

2423 +#: builtin/merge.c:1485 builtin/merge.c:1562

2424 #, c-format

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

2426 msgstr ""

2427

2422 -#: builtin/merge.c:1487

2428 +#: builtin/merge.c:1489

2429 #, c-format

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

2431 msgstr ""

2432

2427 -#: builtin/merge.c:1551

2433 +#: builtin/merge.c:1553

2434 #, c-format

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

2436 msgstr ""

2437

2432 -#: builtin/merge.c:1553

2438 +#: builtin/merge.c:1555

2439 #, c-format

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

2441 msgstr ""

2442

2437 -#: builtin/merge.c:1562

2443 +#: builtin/merge.c:1564

2444 #, c-format

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

2446 msgstr ""

2447

2442 -#: builtin/merge.c:1573

2448 +#: builtin/merge.c:1575

2449 #, c-format

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

2451 msgstr ""

@@ -3038,76 +3044,76 @@ msgstr ""

3044 msgid "You need to set your committer info first"

3045 msgstr ""

3046

3041 -#: git-am.sh:135

3047 +#: git-am.sh:136

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

3049 msgstr ""

3050

3045 -#: git-am.sh:144

3051 +#: git-am.sh:147

3052 msgid ""

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

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

3055 msgstr ""

3056

3051 -#: git-am.sh:153

3057 +#: git-am.sh:156

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

3059 msgstr ""

3060

3055 -#: git-am.sh:265

3061 +#: git-am.sh:268

3062 msgid "Only one StGIT patch series can be applied at once"

3063 msgstr ""

3064

3059 -#: git-am.sh:352

3065 +#: git-am.sh:355

3066 #, sh-format

3067 msgid "Patch format $patch_format is not supported."

3068 msgstr ""

3069

3064 -#: git-am.sh:354

3070 +#: git-am.sh:357

3071 msgid "Patch format detection failed."

3072 msgstr ""

3073

3068 -#: git-am.sh:406

3074 +#: git-am.sh:409

3075 msgid "-d option is no longer supported. Do not use."

3076 msgstr ""

3077

3072 -#: git-am.sh:469

3078 +#: git-am.sh:472

3079 #, sh-format

3080 msgid "previous rebase directory $dotest still exists but mbox given."

3081 msgstr ""

3082

3077 -#: git-am.sh:474

3083 +#: git-am.sh:477

3084 msgid "Please make up your mind. --skip or --abort?"

3085 msgstr ""

3086

3081 -#: git-am.sh:501

3087 +#: git-am.sh:504

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

3089 msgstr ""

3090

3085 -#: git-am.sh:567

3091 +#: git-am.sh:570

3092 #, sh-format

3093 msgid "Dirty index: cannot apply patches (dirty: $files)"

3094 msgstr ""

3095

3090 -#: git-am.sh:743

3096 +#: git-am.sh:746

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

3098 msgstr ""

3099

3100 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]

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

3102 #. input at this point.

3097 -#: git-am.sh:754

3103 +#: git-am.sh:757

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

3105 msgstr ""

3106

3101 -#: git-am.sh:790

3107 +#: git-am.sh:793

3108 #, sh-format

3109 msgid "Applying: $FIRSTLINE"

3110 msgstr ""

3111

3106 -#: git-am.sh:835

3112 +#: git-am.sh:838

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

3114 msgstr ""

3115

3110 -#: git-am.sh:861

3116 +#: git-am.sh:864

3117 msgid "applying to an empty history"

3118 msgstr ""

3119

l10n: Update git.pot (1 new message)