7795e424c6 · 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-04-28 20:33+0800\n"

11 +"POT-Creation-Date: 2012-05-08 15:45+0800\n"

12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

14 "Language-Team: LANGUAGE <LL@li.org>\n"

@@ -172,14 +172,14 @@ msgid_plural ""

172 msgstr[0] ""

173 msgstr[1] ""

174

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

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

175 +#: sequencer.c:120 builtin/merge.c:865 builtin/merge.c:978

176 +#: builtin/merge.c:1088 builtin/merge.c:1098

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:867

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

181 +#: sequencer.c:122 builtin/merge.c:333 builtin/merge.c:868

182 +#: builtin/merge.c:1090 builtin/merge.c:1103

183 #, c-format

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

185 msgstr ""

@@ -271,7 +271,7 @@ msgid "could not apply %s... %s"

271 msgstr ""

272

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

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

275 #: builtin/shortlog.c:181

276 msgid "revision walk setup failed"

277 msgstr ""

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

962 msgstr ""

963

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

965 -#: builtin/merge.c:811

965 +#: builtin/merge.c:812

966 msgid "unable to write new index file"

967 msgstr ""

968

@@ -1587,7 +1587,7 @@ msgstr ""

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

1588 msgstr ""

1589

1590 -#: builtin/commit.c:1554 builtin/merge.c:935 builtin/merge.c:968

1590 +#: builtin/commit.c:1554 builtin/merge.c:936 builtin/merge.c:961

1591 msgid "failed to write commit object"

1592 msgstr ""

1593

@@ -1722,146 +1722,150 @@ msgstr ""

1722 msgid "Couldn't find remote ref HEAD"

1723 msgstr ""

1724

1725 -#: builtin/fetch.c:252

1725 +#: builtin/fetch.c:253

1726 #, c-format

1727 msgid "object %s not found"

1728 msgstr ""

1729

1730 -#: builtin/fetch.c:258

1730 +#: builtin/fetch.c:259

1731 msgid "[up to date]"

1732 msgstr ""

1733

1734 -#: builtin/fetch.c:272

1734 +#: builtin/fetch.c:273

1735 #, c-format

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

1737 msgstr ""

1738

1739 -#: builtin/fetch.c:273 builtin/fetch.c:351

1739 +#: builtin/fetch.c:274 builtin/fetch.c:360

1740 msgid "[rejected]"

1741 msgstr ""

1742

1743 -#: builtin/fetch.c:284

1743 +#: builtin/fetch.c:285

1744 msgid "[tag update]"

1745 msgstr ""

1746

1747 -#: builtin/fetch.c:286 builtin/fetch.c:313 builtin/fetch.c:331

1747 +#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340

1748 msgid " (unable to update local ref)"

1749 msgstr ""

1750

1751 -#: builtin/fetch.c:298

1751 +#: builtin/fetch.c:305

1752 msgid "[new tag]"

1753 msgstr ""

1754

1755 -#: builtin/fetch.c:302

1755 +#: builtin/fetch.c:308

1756 msgid "[new branch]"

1757 msgstr ""

1758

1759 -#: builtin/fetch.c:347

1759 +#: builtin/fetch.c:311

1760 +msgid "[new ref]"

1761 +msgstr ""

1762 +

1763 +#: builtin/fetch.c:356

1764 msgid "unable to update local ref"

1765 msgstr ""

1766

1763 -#: builtin/fetch.c:347

1767 +#: builtin/fetch.c:356

1768 msgid "forced update"

1769 msgstr ""

1770

1767 -#: builtin/fetch.c:353

1771 +#: builtin/fetch.c:362

1772 msgid "(non-fast-forward)"

1773 msgstr ""

1774

1771 -#: builtin/fetch.c:384 builtin/fetch.c:676

1775 +#: builtin/fetch.c:393 builtin/fetch.c:685

1776 #, c-format

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

1778 msgstr ""

1779

1776 -#: builtin/fetch.c:393

1780 +#: builtin/fetch.c:402

1781 #, c-format

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

1783 msgstr ""

1784

1781 -#: builtin/fetch.c:479

1785 +#: builtin/fetch.c:488

1786 #, c-format

1787 msgid "From %.*s\n"

1788 msgstr ""

1789

1786 -#: builtin/fetch.c:490

1790 +#: builtin/fetch.c:499

1791 #, c-format

1792 msgid ""

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

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

1795 msgstr ""

1796

1793 -#: builtin/fetch.c:540

1797 +#: builtin/fetch.c:549

1798 #, c-format

1799 msgid " (%s will become dangling)\n"

1800 msgstr ""

1801

1798 -#: builtin/fetch.c:541

1802 +#: builtin/fetch.c:550

1803 #, c-format

1804 msgid " (%s has become dangling)\n"

1805 msgstr ""

1806

1803 -#: builtin/fetch.c:548

1807 +#: builtin/fetch.c:557

1808 msgid "[deleted]"

1809 msgstr ""

1810

1807 -#: builtin/fetch.c:549

1811 +#: builtin/fetch.c:558

1812 msgid "(none)"

1813 msgstr ""

1814

1811 -#: builtin/fetch.c:666

1815 +#: builtin/fetch.c:675

1816 #, c-format

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

1818 msgstr ""

1819

1816 -#: builtin/fetch.c:700

1820 +#: builtin/fetch.c:709

1821 #, c-format

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

1823 msgstr ""

1824

1821 -#: builtin/fetch.c:777

1825 +#: builtin/fetch.c:786

1826 #, c-format

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

1828 msgstr ""

1829

1826 -#: builtin/fetch.c:780

1830 +#: builtin/fetch.c:789

1831 #, c-format

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

1833 msgstr ""

1834

1831 -#: builtin/fetch.c:879

1835 +#: builtin/fetch.c:888

1836 #, c-format

1837 msgid "Fetching %s\n"

1838 msgstr ""

1839

1836 -#: builtin/fetch.c:881

1840 +#: builtin/fetch.c:890

1841 #, c-format

1842 msgid "Could not fetch %s"

1843 msgstr ""

1844

1841 -#: builtin/fetch.c:898

1845 +#: builtin/fetch.c:907

1846 msgid ""

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

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

1849 msgstr ""

1850

1847 -#: builtin/fetch.c:918

1851 +#: builtin/fetch.c:927

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

1853 msgstr ""

1854

1851 -#: builtin/fetch.c:970

1855 +#: builtin/fetch.c:979

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

1857 msgstr ""

1858

1855 -#: builtin/fetch.c:972

1859 +#: builtin/fetch.c:981

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

1861 msgstr ""

1862

1859 -#: builtin/fetch.c:983

1863 +#: builtin/fetch.c:992

1864 #, c-format

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

1866 msgstr ""

1867

1864 -#: builtin/fetch.c:991

1868 +#: builtin/fetch.c:1000

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

1870 msgstr ""

1871

@@ -2204,56 +2208,56 @@ msgstr ""

2208 msgid "Unknown commit %s"

2209 msgstr ""

2210

2207 -#: builtin/merge.c:91

2211 +#: builtin/merge.c:90

2212 msgid "switch `m' requires a value"

2213 msgstr ""

2214

2211 -#: builtin/merge.c:128

2215 +#: builtin/merge.c:127

2216 #, c-format

2217 msgid "Could not find merge strategy '%s'.\n"

2218 msgstr ""

2219

2216 -#: builtin/merge.c:129

2220 +#: builtin/merge.c:128

2221 #, c-format

2222 msgid "Available strategies are:"

2223 msgstr ""

2224

2221 -#: builtin/merge.c:134

2225 +#: builtin/merge.c:133

2226 #, c-format

2227 msgid "Available custom strategies are:"

2228 msgstr ""

2229

2226 -#: builtin/merge.c:241

2230 +#: builtin/merge.c:240

2231 msgid "could not run stash."

2232 msgstr ""

2233

2230 -#: builtin/merge.c:246

2234 +#: builtin/merge.c:245

2235 msgid "stash failed"

2236 msgstr ""

2237

2234 -#: builtin/merge.c:251

2238 +#: builtin/merge.c:250

2239 #, c-format

2240 msgid "not a valid object: %s"

2241 msgstr ""

2242

2239 -#: builtin/merge.c:270 builtin/merge.c:287

2243 +#: builtin/merge.c:269 builtin/merge.c:286

2244 msgid "read-tree failed"

2245 msgstr ""

2246

2243 -#: builtin/merge.c:317

2247 +#: builtin/merge.c:316

2248 msgid " (nothing to squash)"

2249 msgstr ""

2250

2247 -#: builtin/merge.c:330

2251 +#: builtin/merge.c:329

2252 #, c-format

2253 msgid "Squash commit -- not updating HEAD\n"

2254 msgstr ""

2255

2252 -#: builtin/merge.c:362

2256 +#: builtin/merge.c:361

2257 msgid "Writing SQUASH_MSG"

2258 msgstr ""

2259

2256 -#: builtin/merge.c:364

2260 +#: builtin/merge.c:363

2261 msgid "Finishing SQUASH_MSG"

2262 msgstr ""

2263

@@ -2280,35 +2284,35 @@ msgstr ""

2284 msgid "failed to read the cache"

2285 msgstr ""

2286

2283 -#: builtin/merge.c:696

2287 +#: builtin/merge.c:697

2288 msgid "Unable to write index."

2289 msgstr ""

2290

2287 -#: builtin/merge.c:709

2291 +#: builtin/merge.c:710

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

2293 msgstr ""

2294

2291 -#: builtin/merge.c:723

2295 +#: builtin/merge.c:724

2296 #, c-format

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

2298 msgstr ""

2299

2296 -#: builtin/merge.c:737

2300 +#: builtin/merge.c:738

2301 #, c-format

2302 msgid "unable to write %s"

2303 msgstr ""

2304

2301 -#: builtin/merge.c:876

2305 +#: builtin/merge.c:877

2306 #, c-format

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

2308 msgstr ""

2309

2306 -#: builtin/merge.c:885

2310 +#: builtin/merge.c:886

2311 #, c-format

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

2313 msgstr ""

2314

2311 -#: builtin/merge.c:891

2315 +#: builtin/merge.c:892

2316 msgid ""

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

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

@@ -2317,140 +2321,140 @@ msgid ""

2321 "the commit.\n"

2322 msgstr ""

2323

2320 -#: builtin/merge.c:915

2324 +#: builtin/merge.c:916

2325 msgid "Empty commit message."

2326 msgstr ""

2327

2324 -#: builtin/merge.c:927

2328 +#: builtin/merge.c:928

2329 #, c-format

2330 msgid "Wonderful.\n"

2331 msgstr ""

2332

2329 -#: builtin/merge.c:1000

2333 +#: builtin/merge.c:993

2334 #, c-format

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

2336 msgstr ""

2337

2334 -#: builtin/merge.c:1016

2338 +#: builtin/merge.c:1009

2339 #, c-format

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

2341 msgstr ""

2342

2339 -#: builtin/merge.c:1057

2343 +#: builtin/merge.c:1050

2344 msgid "No current branch."

2345 msgstr ""

2346

2343 -#: builtin/merge.c:1059

2347 +#: builtin/merge.c:1052

2348 msgid "No remote for the current branch."

2349 msgstr ""

2350

2347 -#: builtin/merge.c:1061

2351 +#: builtin/merge.c:1054

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

2353 msgstr ""

2354

2351 -#: builtin/merge.c:1066

2355 +#: builtin/merge.c:1059

2356 #, c-format

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

2358 msgstr ""

2359

2356 -#: builtin/merge.c:1188

2360 +#: builtin/merge.c:1146 builtin/merge.c:1303

2361 +#, c-format

2362 +msgid "%s - not something we can merge"

2363 +msgstr ""

2364 +

2365 +#: builtin/merge.c:1214

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

2367 msgstr ""

2368

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

2369 +#: builtin/merge.c:1230 git-pull.sh:31

2370 msgid ""

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

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

2373 msgstr ""

2374

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

2375 +#: builtin/merge.c:1233 git-pull.sh:34

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

2377 msgstr ""

2378

2370 -#: builtin/merge.c:1211

2379 +#: builtin/merge.c:1237

2380 msgid ""

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

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

2383 msgstr ""

2384

2376 -#: builtin/merge.c:1214

2385 +#: builtin/merge.c:1240

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

2387 msgstr ""

2388

2380 -#: builtin/merge.c:1223

2389 +#: builtin/merge.c:1249

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

2391 msgstr ""

2392

2384 -#: builtin/merge.c:1228

2393 +#: builtin/merge.c:1254

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

2395 msgstr ""

2396

2388 -#: builtin/merge.c:1235

2397 +#: builtin/merge.c:1261

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

2399 msgstr ""

2400

2392 -#: builtin/merge.c:1266

2401 +#: builtin/merge.c:1293

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

2403 msgstr ""

2404

2396 -#: builtin/merge.c:1269

2405 +#: builtin/merge.c:1296

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

2407 msgstr ""

2408

2400 -#: builtin/merge.c:1271

2409 +#: builtin/merge.c:1298

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

2411 msgstr ""

2412

2404 -#: builtin/merge.c:1275 builtin/merge.c:1319

2405 -#, c-format

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

2407 -msgstr ""

2408 -

2409 -#: builtin/merge.c:1382

2413 +#: builtin/merge.c:1413

2414 #, c-format

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

2416 msgstr ""

2417

2414 -#: builtin/merge.c:1420

2418 +#: builtin/merge.c:1451

2419 #, c-format

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

2421 msgstr ""

2422

2419 -#: builtin/merge.c:1427

2423 +#: builtin/merge.c:1458

2424 #, c-format

2425 msgid "Nope.\n"

2426 msgstr ""

2427

2424 -#: builtin/merge.c:1459

2428 +#: builtin/merge.c:1490

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

2430 msgstr ""

2431

2428 -#: builtin/merge.c:1482 builtin/merge.c:1559

2432 +#: builtin/merge.c:1513 builtin/merge.c:1592

2433 #, c-format

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

2435 msgstr ""

2436

2433 -#: builtin/merge.c:1486

2437 +#: builtin/merge.c:1517

2438 #, c-format

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

2440 msgstr ""

2441

2438 -#: builtin/merge.c:1550

2442 +#: builtin/merge.c:1583

2443 #, c-format

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

2445 msgstr ""

2446

2443 -#: builtin/merge.c:1552

2447 +#: builtin/merge.c:1585

2448 #, c-format

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

2450 msgstr ""

2451

2448 -#: builtin/merge.c:1561

2452 +#: builtin/merge.c:1594

2453 #, c-format

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

2455 msgstr ""

2456

2453 -#: builtin/merge.c:1572

2457 +#: builtin/merge.c:1606

2458 #, c-format

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

2460 msgstr ""

@@ -2886,11 +2890,11 @@ msgstr ""

2890 msgid "program error"

2891 msgstr ""

2892

2889 -#: builtin/revert.c:209

2893 +#: builtin/revert.c:212

2894 msgid "revert failed"

2895 msgstr ""

2896

2893 -#: builtin/revert.c:224

2897 +#: builtin/revert.c:227

2898 msgid "cherry-pick failed"

2899 msgstr ""

2900

l10n: Update git.pot (1 new messages)