235537a07e · 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: 2013-02-14 14:46+0800\n"

11 +"POT-Creation-Date: 2013-02-19 13:32+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"

@@ -299,36 +299,36 @@ msgid_plural "%lu years ago"

299 msgstr[0] ""

300 msgstr[1] ""

301

302 -#: diff.c:111

302 +#: diff.c:112

303 #, c-format

304 msgid " Failed to parse dirstat cut-off percentage '%s'\n"

305 msgstr ""

306

307 -#: diff.c:116

307 +#: diff.c:117

308 #, c-format

309 msgid " Unknown dirstat parameter '%s'\n"

310 msgstr ""

311

312 -#: diff.c:194

312 +#: diff.c:210

313 #, c-format

314 msgid "Unknown value for 'diff.submodule' config variable: '%s'"

315 msgstr ""

316

317 -#: diff.c:237

317 +#: diff.c:260

318 #, c-format

319 msgid ""

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

321 "%s"

322 msgstr ""

323

324 -#: diff.c:3494

324 +#: diff.c:3468

325 #, c-format

326 msgid ""

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

328 "%s"

329 msgstr ""

330

331 -#: diff.c:3508

331 +#: diff.c:3482

332 #, c-format

333 msgid "Failed to parse --submodule option parameter: '%s'"

334 msgstr ""

@@ -676,27 +676,31 @@ msgstr ""

676 msgid "Unable to write index."

677 msgstr ""

678

679 -#: parse-options.c:485

679 +#: parse-options.c:489

680 msgid "..."

681 msgstr ""

682

683 -#: parse-options.c:503

683 +#: parse-options.c:507

684 #, c-format

685 msgid "usage: %s"

686 msgstr ""

687

688 #. TRANSLATORS: the colon here should align with the

689 #. one in "usage: %s" translation

690 -#: parse-options.c:507

690 +#: parse-options.c:511

691 #, c-format

692 msgid " or: %s"

693 msgstr ""

694

695 -#: parse-options.c:510

695 +#: parse-options.c:514

696 #, c-format

697 msgid " %s"

698 msgstr ""

699

700 +#: parse-options.c:548

701 +msgid "-NUM"

702 +msgstr ""

703 +

704 #: pathspec.c:83

705 #, c-format

706 msgid "Path '%s' is in submodule '%.*s'"

@@ -945,7 +949,7 @@ msgstr ""

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

950 msgstr ""

951

948 -#: sequencer.c:821 builtin/apply.c:4020

952 +#: sequencer.c:821 builtin/apply.c:4056

953 #, c-format

954 msgid "cannot open %s: %s"

955 msgstr ""

@@ -1163,7 +1167,7 @@ msgstr ""

1167 msgid "You have unmerged paths."

1168 msgstr ""

1169

1166 -#: wt-status.c:792 wt-status.c:916

1170 +#: wt-status.c:792 wt-status.c:944

1171 msgid " (fix conflicts and run \"git commit\")"

1172 msgstr ""

1173

@@ -1195,155 +1199,176 @@ msgstr ""

1199 msgid " (use \"git am --abort\" to restore the original branch)"

1200 msgstr ""

1201

1198 -#: wt-status.c:877 wt-status.c:887

1202 +#: wt-status.c:879 wt-status.c:896

1203 +#, c-format

1204 +msgid "You are currently rebasing branch '%s' on '%s'."

1205 +msgstr ""

1206 +

1207 +#: wt-status.c:884 wt-status.c:901

1208 msgid "You are currently rebasing."

1209 msgstr ""

1210

1202 -#: wt-status.c:880

1211 +#: wt-status.c:887

1212 msgid " (fix conflicts and then run \"git rebase --continue\")"

1213 msgstr ""

1214

1206 -#: wt-status.c:882

1215 +#: wt-status.c:889

1216 msgid " (use \"git rebase --skip\" to skip this patch)"

1217 msgstr ""

1218

1210 -#: wt-status.c:884

1219 +#: wt-status.c:891

1220 msgid " (use \"git rebase --abort\" to check out the original branch)"

1221 msgstr ""

1222

1214 -#: wt-status.c:890

1223 +#: wt-status.c:904

1224 msgid " (all conflicts fixed: run \"git rebase --continue\")"

1225 msgstr ""

1226

1218 -#: wt-status.c:892

1227 +#: wt-status.c:908

1228 +#, c-format

1229 +msgid ""

1230 +"You are currently splitting a commit while rebasing branch '%s' on '%s'."

1231 +msgstr ""

1232 +

1233 +#: wt-status.c:913

1234 msgid "You are currently splitting a commit during a rebase."

1235 msgstr ""

1236

1222 -#: wt-status.c:895

1237 +#: wt-status.c:916

1238 msgid " (Once your working directory is clean, run \"git rebase --continue\")"

1239 msgstr ""

1240

1226 -#: wt-status.c:897

1241 +#: wt-status.c:920

1242 +#, c-format

1243 +msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."

1244 +msgstr ""

1245 +

1246 +#: wt-status.c:925

1247 msgid "You are currently editing a commit during a rebase."

1248 msgstr ""

1249

1230 -#: wt-status.c:900

1250 +#: wt-status.c:928

1251 msgid " (use \"git commit --amend\" to amend the current commit)"

1252 msgstr ""

1253

1234 -#: wt-status.c:902

1254 +#: wt-status.c:930

1255 msgid ""

1256 " (use \"git rebase --continue\" once you are satisfied with your changes)"

1257 msgstr ""

1258

1239 -#: wt-status.c:912

1259 +#: wt-status.c:940

1260 msgid "You are currently cherry-picking."

1261 msgstr ""

1262

1243 -#: wt-status.c:919

1263 +#: wt-status.c:947

1264 msgid " (all conflicts fixed: run \"git commit\")"

1265 msgstr ""

1266

1247 -#: wt-status.c:928

1267 +#: wt-status.c:958

1268 +#, c-format

1269 +msgid "You are currently bisecting branch '%s'."

1270 +msgstr ""

1271 +

1272 +#: wt-status.c:962

1273 msgid "You are currently bisecting."

1274 msgstr ""

1275

1251 -#: wt-status.c:931

1276 +#: wt-status.c:965

1277 msgid " (use \"git bisect reset\" to get back to the original branch)"

1278 msgstr ""

1279

1255 -#: wt-status.c:982

1280 +#: wt-status.c:1064

1281 msgid "On branch "

1282 msgstr ""

1283

1259 -#: wt-status.c:989

1284 +#: wt-status.c:1071

1285 msgid "Not currently on any branch."

1286 msgstr ""

1287

1263 -#: wt-status.c:1001

1288 +#: wt-status.c:1083

1289 msgid "Initial commit"

1290 msgstr ""

1291

1267 -#: wt-status.c:1015

1292 +#: wt-status.c:1097

1293 msgid "Untracked files"

1294 msgstr ""

1295

1271 -#: wt-status.c:1017

1296 +#: wt-status.c:1099

1297 msgid "Ignored files"

1298 msgstr ""

1299

1275 -#: wt-status.c:1019

1300 +#: wt-status.c:1101

1301 #, c-format

1302 msgid "Untracked files not listed%s"

1303 msgstr ""

1304

1280 -#: wt-status.c:1021

1305 +#: wt-status.c:1103

1306 msgid " (use -u option to show untracked files)"

1307 msgstr ""

1308

1284 -#: wt-status.c:1027

1309 +#: wt-status.c:1109

1310 msgid "No changes"

1311 msgstr ""

1312

1288 -#: wt-status.c:1032

1313 +#: wt-status.c:1114

1314 #, c-format

1315 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"

1316 msgstr ""

1317

1293 -#: wt-status.c:1035

1318 +#: wt-status.c:1117

1319 #, c-format

1320 msgid "no changes added to commit\n"

1321 msgstr ""

1322

1298 -#: wt-status.c:1038

1323 +#: wt-status.c:1120

1324 #, c-format

1325 msgid ""

1326 "nothing added to commit but untracked files present (use \"git add\" to "

1327 "track)\n"

1328 msgstr ""

1329

1305 -#: wt-status.c:1041

1330 +#: wt-status.c:1123

1331 #, c-format

1332 msgid "nothing added to commit but untracked files present\n"

1333 msgstr ""

1334

1310 -#: wt-status.c:1044

1335 +#: wt-status.c:1126

1336 #, c-format

1337 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"

1338 msgstr ""

1339

1315 -#: wt-status.c:1047 wt-status.c:1052

1340 +#: wt-status.c:1129 wt-status.c:1134

1341 #, c-format

1342 msgid "nothing to commit\n"

1343 msgstr ""

1344

1320 -#: wt-status.c:1050

1345 +#: wt-status.c:1132

1346 #, c-format

1347 msgid "nothing to commit (use -u to show untracked files)\n"

1348 msgstr ""

1349

1325 -#: wt-status.c:1054

1350 +#: wt-status.c:1136

1351 #, c-format

1352 msgid "nothing to commit, working directory clean\n"

1353 msgstr ""

1354

1330 -#: wt-status.c:1162

1355 +#: wt-status.c:1244

1356 msgid "HEAD (no branch)"

1357 msgstr ""

1358

1334 -#: wt-status.c:1168

1359 +#: wt-status.c:1250

1360 msgid "Initial commit on "

1361 msgstr ""

1362

1338 -#: wt-status.c:1183

1363 +#: wt-status.c:1265

1364 msgid "behind "

1365 msgstr ""

1366

1342 -#: wt-status.c:1186 wt-status.c:1189

1367 +#: wt-status.c:1268 wt-status.c:1271

1368 msgid "ahead "

1369 msgstr ""

1370

1346 -#: wt-status.c:1191

1371 +#: wt-status.c:1273

1372 msgid ", behind "

1373 msgstr ""

1374

@@ -1416,7 +1441,7 @@ msgstr ""

1441 msgid "dry run"

1442 msgstr ""

1443

1419 -#: builtin/add.c:278 builtin/apply.c:4369 builtin/check-ignore.c:19

1444 +#: builtin/add.c:278 builtin/apply.c:4405 builtin/check-ignore.c:19

1445 #: builtin/commit.c:1150 builtin/count-objects.c:82 builtin/fsck.c:613

1446 #: builtin/log.c:1522 builtin/mv.c:62 builtin/read-tree.c:112

1447 msgid "be verbose"

@@ -1528,7 +1553,7 @@ msgstr ""

1553 msgid "index file corrupt"

1554 msgstr ""

1555

1531 -#: builtin/add.c:481 builtin/apply.c:4465 builtin/mv.c:229 builtin/rm.c:370

1556 +#: builtin/add.c:481 builtin/apply.c:4501 builtin/mv.c:229 builtin/rm.c:370

1557 msgid "Unable to write new index file"

1558 msgstr ""

1559

@@ -1774,224 +1799,224 @@ msgstr ""

1799 msgid "Checking patch %s..."

1800 msgstr ""

1801

1777 -#: builtin/apply.c:3639 builtin/checkout.c:215 builtin/reset.c:124

1802 +#: builtin/apply.c:3675 builtin/checkout.c:215 builtin/reset.c:124

1803 #, c-format

1804 msgid "make_cache_entry failed for path '%s'"

1805 msgstr ""

1806

1782 -#: builtin/apply.c:3782

1807 +#: builtin/apply.c:3818

1808 #, c-format

1809 msgid "unable to remove %s from index"

1810 msgstr ""

1811

1787 -#: builtin/apply.c:3810

1812 +#: builtin/apply.c:3846

1813 #, c-format

1814 msgid "corrupt patch for subproject %s"

1815 msgstr ""

1816

1792 -#: builtin/apply.c:3814

1817 +#: builtin/apply.c:3850

1818 #, c-format

1819 msgid "unable to stat newly created file '%s'"

1820 msgstr ""

1821

1797 -#: builtin/apply.c:3819

1822 +#: builtin/apply.c:3855

1823 #, c-format

1824 msgid "unable to create backing store for newly created file %s"

1825 msgstr ""

1826

1802 -#: builtin/apply.c:3822 builtin/apply.c:3930

1827 +#: builtin/apply.c:3858 builtin/apply.c:3966

1828 #, c-format

1829 msgid "unable to add cache entry for %s"

1830 msgstr ""

1831

1807 -#: builtin/apply.c:3855

1832 +#: builtin/apply.c:3891

1833 #, c-format

1834 msgid "closing file '%s'"

1835 msgstr ""

1836

1812 -#: builtin/apply.c:3904

1837 +#: builtin/apply.c:3940

1838 #, c-format

1839 msgid "unable to write file '%s' mode %o"

1840 msgstr ""

1841

1817 -#: builtin/apply.c:3991

1842 +#: builtin/apply.c:4027

1843 #, c-format

1844 msgid "Applied patch %s cleanly."

1845 msgstr ""

1846

1822 -#: builtin/apply.c:3999

1847 +#: builtin/apply.c:4035

1848 msgid "internal error"

1849 msgstr ""

1850

1851 #. Say this even without --verbose

1827 -#: builtin/apply.c:4002

1852 +#: builtin/apply.c:4038

1853 #, c-format

1854 msgid "Applying patch %%s with %d reject..."

1855 msgid_plural "Applying patch %%s with %d rejects..."

1856 msgstr[0] ""

1857 msgstr[1] ""

1858

1834 -#: builtin/apply.c:4012

1859 +#: builtin/apply.c:4048

1860 #, c-format

1861 msgid "truncating .rej filename to %.*s.rej"

1862 msgstr ""

1863

1839 -#: builtin/apply.c:4033

1864 +#: builtin/apply.c:4069

1865 #, c-format

1866 msgid "Hunk #%d applied cleanly."

1867 msgstr ""

1868

1844 -#: builtin/apply.c:4036

1869 +#: builtin/apply.c:4072

1870 #, c-format

1871 msgid "Rejected hunk #%d."

1872 msgstr ""

1873

1849 -#: builtin/apply.c:4186

1874 +#: builtin/apply.c:4222

1875 msgid "unrecognized input"

1876 msgstr ""

1877

1853 -#: builtin/apply.c:4197

1878 +#: builtin/apply.c:4233

1879 msgid "unable to read index file"

1880 msgstr ""

1881

1857 -#: builtin/apply.c:4316 builtin/apply.c:4319 builtin/clone.c:91

1882 +#: builtin/apply.c:4352 builtin/apply.c:4355 builtin/clone.c:91

1883 #: builtin/fetch.c:63

1884 msgid "path"

1885 msgstr ""

1886

1862 -#: builtin/apply.c:4317

1887 +#: builtin/apply.c:4353

1888 msgid "don't apply changes matching the given path"

1889 msgstr ""

1890

1866 -#: builtin/apply.c:4320

1891 +#: builtin/apply.c:4356

1892 msgid "apply changes matching the given path"

1893 msgstr ""

1894

1870 -#: builtin/apply.c:4322

1895 +#: builtin/apply.c:4358

1896 msgid "num"

1897 msgstr ""

1898

1874 -#: builtin/apply.c:4323

1899 +#: builtin/apply.c:4359

1900 msgid "remove <num> leading slashes from traditional diff paths"

1901 msgstr ""

1902

1878 -#: builtin/apply.c:4326

1903 +#: builtin/apply.c:4362

1904 msgid "ignore additions made by the patch"

1905 msgstr ""

1906

1882 -#: builtin/apply.c:4328

1907 +#: builtin/apply.c:4364

1908 msgid "instead of applying the patch, output diffstat for the input"

1909 msgstr ""

1910

1886 -#: builtin/apply.c:4332

1911 +#: builtin/apply.c:4368

1912 msgid "show number of added and deleted lines in decimal notation"

1913 msgstr ""

1914

1890 -#: builtin/apply.c:4334

1915 +#: builtin/apply.c:4370

1916 msgid "instead of applying the patch, output a summary for the input"

1917 msgstr ""

1918

1894 -#: builtin/apply.c:4336

1919 +#: builtin/apply.c:4372

1920 msgid "instead of applying the patch, see if the patch is applicable"

1921 msgstr ""

1922

1898 -#: builtin/apply.c:4338

1923 +#: builtin/apply.c:4374

1924 msgid "make sure the patch is applicable to the current index"

1925 msgstr ""

1926

1902 -#: builtin/apply.c:4340

1927 +#: builtin/apply.c:4376

1928 msgid "apply a patch without touching the working tree"

1929 msgstr ""

1930

1906 -#: builtin/apply.c:4342

1931 +#: builtin/apply.c:4378

1932 msgid "also apply the patch (use with --stat/--summary/--check)"

1933 msgstr ""

1934

1910 -#: builtin/apply.c:4344

1935 +#: builtin/apply.c:4380

1936 msgid "attempt three-way merge if a patch does not apply"

1937 msgstr ""

1938

1914 -#: builtin/apply.c:4346

1939 +#: builtin/apply.c:4382

1940 msgid "build a temporary index based on embedded index information"

1941 msgstr ""

1942

1918 -#: builtin/apply.c:4348 builtin/checkout-index.c:197 builtin/ls-files.c:463

1943 +#: builtin/apply.c:4384 builtin/checkout-index.c:197 builtin/ls-files.c:463

1944 msgid "paths are separated with NUL character"

1945 msgstr ""

1946

1922 -#: builtin/apply.c:4351

1947 +#: builtin/apply.c:4387

1948 msgid "ensure at least <n> lines of context match"

1949 msgstr ""

1950

1926 -#: builtin/apply.c:4352

1951 +#: builtin/apply.c:4388

1952 msgid "action"

1953 msgstr ""

1954

1930 -#: builtin/apply.c:4353

1955 +#: builtin/apply.c:4389

1956 msgid "detect new or modified lines that have whitespace errors"

1957 msgstr ""

1958

1934 -#: builtin/apply.c:4356 builtin/apply.c:4359

1959 +#: builtin/apply.c:4392 builtin/apply.c:4395

1960 msgid "ignore changes in whitespace when finding context"

1961 msgstr ""

1962

1938 -#: builtin/apply.c:4362

1963 +#: builtin/apply.c:4398

1964 msgid "apply the patch in reverse"

1965 msgstr ""

1966

1942 -#: builtin/apply.c:4364

1967 +#: builtin/apply.c:4400

1968 msgid "don't expect at least one line of context"

1969 msgstr ""

1970

1946 -#: builtin/apply.c:4366

1971 +#: builtin/apply.c:4402

1972 msgid "leave the rejected hunks in corresponding *.rej files"

1973 msgstr ""

1974

1950 -#: builtin/apply.c:4368

1975 +#: builtin/apply.c:4404

1976 msgid "allow overlapping hunks"

1977 msgstr ""

1978

1954 -#: builtin/apply.c:4371

1979 +#: builtin/apply.c:4407

1980 msgid "tolerate incorrectly detected missing new-line at the end of file"

1981 msgstr ""

1982

1958 -#: builtin/apply.c:4374

1983 +#: builtin/apply.c:4410

1984 msgid "do not trust the line counts in the hunk headers"

1985 msgstr ""

1986

1962 -#: builtin/apply.c:4376

1987 +#: builtin/apply.c:4412

1988 msgid "root"

1989 msgstr ""

1990

1966 -#: builtin/apply.c:4377

1991 +#: builtin/apply.c:4413

1992 msgid "prepend <root> to all filenames"

1993 msgstr ""

1994

1970 -#: builtin/apply.c:4399

1995 +#: builtin/apply.c:4435

1996 msgid "--3way outside a repository"

1997 msgstr ""

1998

1974 -#: builtin/apply.c:4407

1999 +#: builtin/apply.c:4443

2000 msgid "--index outside a repository"

2001 msgstr ""

2002

1978 -#: builtin/apply.c:4410

2003 +#: builtin/apply.c:4446

2004 msgid "--cached outside a repository"

2005 msgstr ""

2006

1982 -#: builtin/apply.c:4426

2007 +#: builtin/apply.c:4462

2008 #, c-format

2009 msgid "can't open patch '%s'"

2010 msgstr ""

2011

1987 -#: builtin/apply.c:4440

2012 +#: builtin/apply.c:4476

2013 #, c-format

2014 msgid "squelched %d whitespace error"

2015 msgid_plural "squelched %d whitespace errors"

2016 msgstr[0] ""

2017 msgstr[1] ""

2018

1994 -#: builtin/apply.c:4446 builtin/apply.c:4456

2019 +#: builtin/apply.c:4482 builtin/apply.c:4492

2020 #, c-format

2021 msgid "%d line adds whitespace errors."

2022 msgid_plural "%d lines add whitespace errors."

l10n: git.pot: v1.8.2 round 3 (5 new)