History - Kiln » TortoiseHg » TortoiseHg

Kiln »

TortoiseHg »

TortoiseHg

Clone URL:

Pushed to one repository ·

View In Graph Contained in 1.0.1, 1.0.2, and 1.0.3

stable i18n: update translations

Changeset f09e44ba74ac …

Parent 93b5732ea021 …

by Yuki KODAMA Mar 9 10 at 9:08 AM

Changes to 4 files · Browse files at f09e44ba74ac Showing diff from parent 93b5732ea021 Diff from another changeset...

Change 1 of 4 Show Changes Only Show Entire File Loading... i18n/tortoisehg/da.po Stacked
8 9 10 11 12 13 14 15 16 17 18 19 20 5998 5999 6000 6001 6002 6003 6004 6010 6011 6012 6013 6014 6015 6016 6035 6036 6037 6038 6039 6040 6041 6042 6043 6044 6045 6046 6047 6048 6049 6050 6051 6052 6053 6054 6055 6056 6057 6058 6059 6060 6061 6062 6063 6064 6065	8 9 10 11 12 13 14 15 16 17 18 19 20 5998 5999 6000 6001 6002 6003 6004 6010 6011 6012 6013 6014 6015 6016 6035 6036 6037 6038 6039 6040 6041 6042 6043 6044 6045 6046 6047 6048 6049 6050 6051 6052 6053 6054 6055 6056 6057 6058 6059 6060 6061 6062 6063 6064 6065	@@ -8,13 +8,13 @@ `"Project-Id-Version: tortoisehg\n"` `"Report-Msgid-Bugs-To: Peer Sommerlund <peer.sommerlund@gmail.com>\n"` `"POT-Creation-Date: 2010-02-22 23:55+0000\n"`-`"PO-Revision-Date: 2010-03-04 14:52+0000\n"`+`"PO-Revision-Date: 2010-03-07 06:05+0000\n"` `"Last-Translator: peso <peer.sommerlund@gmail.com>\n"` `"Language-Team: Danish <da@li.org>\n"` `"MIME-Version: 1.0\n"` `"Content-Type: text/plain; charset=UTF-8\n"` `"Content-Transfer-Encoding: 8bit\n"`-`"X-Launchpad-Export-Date: 2010-03-05 05:03+0000\n"`+`"X-Launchpad-Export-Date: 2010-03-08 05:40+0000\n"` `"X-Generator: Launchpad (build Unknown)\n"` `#: thgtaskbar.py:36`@@ -5998,7 +5998,7 @@ `#: tortoisehg\util\prej.py:143` `msgid "patching file %s\n"`-`msgstr ""`+`msgstr "lapper filen %s\n"` `#: tortoisehg\util\prej.py:190` `msgid "%d out of %d hunk%s FAILED -- saving rejects to file %s\n"`@@ -6010,7 +6010,7 @@ `#: tortoisehg\util\prej.py:235` `msgid "file %s already exists\n"`-`msgstr ""`+`msgstr "fil %s findes allerede\n"` `#: tortoisehg\util\prej.py:287` `msgid "Hunk #%d succeeded at %d with fuzz %d (offset %d lines).\n"`@@ -6035,31 +6035,31 @@ `#: tortoisehg\util\prej.py:550` `msgid "could not extract binary patch"`-`msgstr ""`+`msgstr "kunne ikke udtrække binær lap"` `#: tortoisehg\util\prej.py:566` `msgid "binary patch is %d bytes, not %d"`-`msgstr ""`+`msgstr "binær lap er %d byte, ikke %d"` `#: tortoisehg\util\prej.py:591` `msgid "unable to strip away %d dirs from %s"`-`msgstr ""`+`msgstr "kan ikke fjerne %d kataloger fra %s"` `#: tortoisehg\util\prej.py:613` `msgid "unable to find %s or %s for patching"`-`msgstr ""`+`msgstr "kan ikke finde %s eller %s til lapning"` `#: tortoisehg\util\prej.py:792` `msgid "malformed patch %s %s"`-`msgstr ""`+`msgstr "misformet lap %s %s"` `#: tortoisehg\util\prej.py:803` `msgid "No valid hunks found"`-`msgstr ""`+`msgstr "Ingen gyldige stumper fundet"` `#: tortoisehg\util\version.py:17` `msgid "repository %s not found"`-`msgstr ""`+`msgstr "depot %s ikke fundet"` `#~ msgid "Ignore filter for "` `#~ msgstr "Ignorer filter for "`

Change 1 of 20 Show Changes Only Show Entire File Loading... i18n/tortoisehg/pl.po Stacked
7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 2030 2031 2032 2033 2034 2035 2036 2037 2038 2039 2040 2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079 2080 2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117 2118 2119 2120 2121 2122 2123 2124 2125 2126 2127 2128 2129 2130 2131 2132 2133 2134 2135 2136 2137 2138 2139 2140 2141 2142 2143 2144 2145 2146 2147 2148 2149 2150 2151 2152 2153 2154 2155 2156 2157 2158 2159 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189 2190 2191 2192 2193 2194 2195 2196 2197 2198 2199 2200 2201 2202 2203 2204 2205 2206 2207 2208 2209 2210 2211 2212 2213 2214 2215 2216 2217 2218 2219 2220 2221 2222 2223 2224 2225 2226 2227 2228 2229 2230 2231 2232 2233 2234 2235 2236 2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 2248 2249 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294 2295 2296 2297 2298 2299 2300 2301 2302 2303 2304 2305 2306 2307 2308 2309 2310 2311 2312 2313 2314 2315 2316 2317 2318 2319 2320 2321 2322 2323 2324 2325 2326 2327 2328 2329 2330 2331 2332 2333 2334 2335 2336 2337 2338 2339 2340 2341 2342 2343 2344 2345 2346 2347 2348 2349 2350 2351 2352 2353 2354 2355 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 2376 2377 2378 2379 2380 2381 2382 2383 2384 2385 2386 2387 2388 2389 2390 2391 2392 2393 2394 2395 2396 2397 2398 2399 2400 2401 2402 2403 2404 2405 2406 2407 2408 2409 2410 2411 2412 2413 2414 2415 2416 2417 2418 2419 2420 2421 2422 2423 2424 2425 2426 2427 2428 2429 2430 2431 2432 2433 2434 2435 2436 2437 2438 2439 2440 2441 2442 2443 2444 2445 2446 2447 2448 2449 2450 2451 2452 2453 2454 2455 2456 2457 2458 2459 2460 2461 2462 2463 2464 2465 2466 2467 2468 2469 2470 2471 2472 2473 2474 2475 2476 2477 2478 2479 2480 2481 2482 2483 2484 2485 2486 2487 2488 2489 2490 2491 2492 2493 2494 2495 2496 2497 2498 2499 2500 2501 2502 2503 2504 2505 2506 2507 2508 2509 2510 2511 2512 2513 2514 2515 2516 2517 2518 2519 2520 2521 2522 2523 2524 2525 2526 2527 2528 2529 2530 2531 2532 2533 2534 2535 2536 2537 2538 2539 2540 2541 2542 2543 2544 2545 2546 2547 2548 2549 2550 2551 2552 2553 2554 2555 2556 2557 2558 2559 2560 2561 2562 2563 2564 2565 2566 2567 2568 2569 2570 2571 2572 2573 2574 2575 2576 2577 2578 2579 2580 2581 2582 2583 2584 2585 2586 2587 2588 2589 2590 2591 2592 2593 2594 2595 2596 2597 2598 2599 2600 2601 2602 2603 2604 2605 2606 2607 2608 2609 2610 2611 2612 2613 2614 2615 2616 2617 2618 2619 2620 2621 2622 2623 2624 2625 2626 2627 2628 2629 2630 2631 2632 2633 2634 2635 2636 2637 2638 2639 2640 2641 2642 2643 2644 2645 2646 2647 2648 2649 2650 2651 2652 2653 2654 2655 2656 2657 2658 2659 2660 2661 2662 2663 2664 2665 2666 2667 2668 2703 2704 2705 2706 2707 2708 2709 2710 2711 2712 2713 2714 2715 2716 2717 2718 2719 2720 2721 2722 2723 2724 2725 2726 2727 2728 2729 2730 2731 2732 2733 2734 2735 2736 2737 2738 2739 2740 2741 2742 2743 2744 2745 2746 2747 2748 2749 2750 2751 2752 2753 2754 2755 2756 2757 2758 2759 2760 2761 2762 2763 2764 2765 2766 2767 2768 2769 2770 2771 2772 2773 2774 2775 2776 2777 2778 2779 2780 2781 2782 2783 2784 2785 2786 2787 2788 2789 2790 2791 2792 2793 2794 2795 2796 2797 2798 2799 2800 2801 2802 2803 2804 2805 2806 2807 2808 2809 2810 2811 2812 2813 2814 2815 2816 2817 2818 2819 2820 2821 2822 2823 2824 2825 2826 2827 2828 2829 2830 2831 2832 2833 2834 2835 2836 2837 2838 2839 2840 2841 2842 2843 2844 2845 2846 2847 2848 2849 2850 2851 2852 2853 2854 2855 2856 2857 2858 2859 2860 2861 2862 2863 2864 2865 2866 2867 2868 2869 2870 2871 2872 2873 2874 2875 2876 2877 2878 2879 2880 2881 2882 2883 2884 2885 2886 2887 2888 2889 2890 2891 2892 2893 2894 2895 2896 2897 2898 2899 2900 2901 2902 2903 2904 2905 2906 2907 2908 2909 2910 2911 2912 2913 2914 2915 2916 2917 2918 2919 2920 2921 2922 2923 2924 2925 2926 2927 2928 2929 2930 2931 2932 2933 2934 2935 2936 2937 2938 2939 2940 2941 2942 2943 2944 2945 2946 2947 2948 2949 2950 2951 2952 2953 2954 2955 2956 2957 2958 2959 2960 2961 2962 2963 2964 2965 2966 2967 2968 2969 2970 2971 2972 2973 2974 2975 2976 2977 2978 2979 2980 2981 2982 2983 2984 2985 2986 2987 2988 2989 2990 2991 2992 2993 2994 2995 2996 2997 2998 2999 3000 3001 3002 3003 3004 3005 3006 3007 3008 3009 3010 3011 3012 3013 3014 3015 3016 3017 3018 3019 3020 3021 3022 3023 3024 3025 3026 3027 3028 3029 3030 3031 3032 3033 3034 3035 3036 3037 3038 3039 3040 3041 3042 3043 3044 3045 3046 3047 3048 3049 3050 3051 3052 3053 3054 3055 3056 3057 3058 3059 3060 3061 3062 3063 3064 3065 3066 3067 3068 3069 3070 3071 3072 3073 3074 3075 3076 3077 3078 3079 3080 3081 3082 3083 3084 3085 3086 3087 3088 3089 3090 3091 3092 3093 3094 3095 3096 3097 3098 3099 3100 3101 3102 3103 3104 3105 3106 3107 3108 3109 3110 3111 3112 3113 3114 3115 3116 3117 3118 3119 3120 3121 3122 3123 3124 3125 3126 3127 3128 3129 3130 3131 3132 3133 3134 3135 3136 3137 3138 3139 3140 3141 3142 3143 3144 3145 3146 3147 3148 3149 3150 3151 3152 3153 3154 3155 3156 3157 3158 3159 3160 3161 3162 3163 3164 3165 3166 3167 3168 3169 3170 3171 3172 3173 3174 3175 3176 3177 3178 3179 3180 3181 3182 3183 3184 3185 3186 3187 3188 3189 3190 3191 3192 3193 3194 3195 3196 3197 3198 3199 3200 3201 3202 3203 3204 3205 3206 3207 3208 3209 3210 3211 3212 3213 3214 3215 3216 3217 3218 3219 3240 3241 3242 3243 3244 3245 3246 3264 3265 3266 3267 3268 3269 3270 3271 3272 3273 3274 3275 3276 3277 3278 3279 3280 3281 3282 3283 3284 3285 3286 3287 3288 3289 3290 3291 3292 3293 3294 3295 3296 3297 3298 3299 3300 3301 3302 3303 3304 3305 3306 3307 3308 3309 3310 3332 3333 3334 3335 3336 3337 3338 3339 3340 3341 3342 3348 3349 3350 3351 3352 3353 3354 3355 3356 3357 3358 3359 3360 3361 3362 3363 3364 3365 3366 3367 3368 3369 3370 3371 3372 3373 3374 3375 3376 3377 3378 3379 3380 3381 3382 3383 3384 3385 3386 3387 3388 3389 3390 3391 3392 3393 3394 3395 3396 3397 3398 3399 3400 3401 3402 3403 3404 3405 3406 3407 3408 3409 3410 3411 3412 3413 3414 3415 3416 3417 3418 3419 3420 3421 3422 3423 3424 3425 3426 3427 3428 3429 3430 3431 3432 3433 3434 3435 3436 3437 3438 3439 3440 3441 3442 3443 3444 3445 3446 3447 3448 3449 3450 3451 3452 3453 3454 3455 3456 3457 3458 3459 3460 3461 3462 3463 3464 3465 3466 3467 3468 3469 3470 3471 3472 3473 3474 3475 3476 3477 3478 3479 3480 3481 3482 3483 3484 3485 3486 3487 3488 3489 3490 3491 3495 3496 3497 3498 3499 3500 3501 3502 3503 3504 3505 3506 3507 3508 3509 3510 3511 3512 3513 3514 3515 3516 3517 3518 3519 3520 3521 3522 3523 3524 3525 3526 3527 3528 3529 3530 3531 3532 3533 3534 3535 3536 3537 3538 3539 3540 3541 3542 3543 3544 3545 3546 3547 3548 3549 3550 3551 3552 3553 3554 3555 3556 3557 3558 3559 3560 3561 3562 3563 3564 3565 3566 3567 3568 3569 3570 3571 3572 3573 3574 3575 3576 3577 3578 3579 3580 3581 3582 3583 3584 3585 3586 3587 3588 3589 3590 3591 3592 3593 3594 3595 3596 3597 3598 3599 3600 3601 3602 3603 3604 3605 3606 3607 3608 3609 3610 3611 3612 3613 3614 3615 3616 3617 3618 3619 3620 3621 3622 3623 3624 3625 3626 3627 3628 3629 3630 3631 3632 3633 3634 3635 3636 3637 3638 3639 3640 3641 3642 3643 3644 3645 3646 3647 3648 3649 3650 3651 3652 3653 3654 3655 3656 3657 3658 3659 3660 3661 3662 3663 3664 3665 3666 3667 3668 3669 3670 3671 3672 3673 3674 3675 3676 3677 3678 3679 3680 3681 3682 3683 3684 3685 3686 3687 3688 3689 3690 3691 3692 3693 3694 3695 3696 3697 3698 3699 3700 3701 3702 3703 3704 3705 3706 3707 3708 3709 3710 3711 3712 3713 3714 3716 3717 3718 3719 3720 3721 3722 3723 3724 3725 3726 3727 3728 3729 3730 3731 3732 3733 3734 3735 3736 3737 3738 3739 3740 3741 3742 3743 3744 3745 3746 3747 3748 3749 3750 3751 3752 3753 3754 3755 3756 3757 3758 3759 3760 3761 3762 3763 3764 3765 3766 3767 3768 3769 3770 3771 3772 3773 3774 3775 3776 3777 3778 3779 3780 3781 3782 3783 3784 3785 3786 3787 3788 3789 3790 3791 3792 3793 3794 3795 3796 3797 3798 3799 3800 3801 3802 3803 3804 3805 3806 3807 3808 3809 3810 3811 3812 3813 3814 3815 3816 3817 3818 3819 3820 3821 3822 3823 3824 3825 3826 3827 3828 3829 3830 3831 3832 3833 3834 3835 3836 3837 3838 3839 3840 3841 3842 3846 3847 3848 3849 3850 3851 3852 3853 3854 3855 3856 3859 3860 3861 3862 3863 3864 3865 3866 3867 3868 3869 3870 3871 3872 3873 3874 3875 3876 3877 3878 3879 3880 3881 3882 3883 3884 3885 3886 3887 3888 3889 3890 3891 3892 3893 3894 3895 3896 3897 3898 3899 3900 3901 3902 3903 3904 3905 3906 3907 3908 3909 3910 3911 3912 3913 3914 3915 3916 3917 3918 3919 3920 3921 3922 3923 3924 3925 3926 3927 3928 3929 3930 3931 3932 3933 3934 3935 3936 3937 3938 3939 3943 3944 3945 3946 3947 3948 3949 3950 3951 3952 3953 3954 3955 3956 3957 3958 3959 3960 3961 3962 3963 3964 3965 3966 3967 3968 3969 3970 3971 3972 3973 3974 3975 3976 3977 3978 3979 3980 3981 3982 3983 3984 3985 3986 3987 3988 3989 3990 3991 3992 3993 3994 3995 3996 3997 3998 3999 4000 4001 4002 4003 4004 4005 4006 4007 4008 4009 4010 4011 4012 4013 4014 4015 4016 4017 4018 4019 4020 4021 4022 4023 4024 4025 4026 4027 4028 4029 4030 4031 4032 4033 4034 4035 4036 4037 4038 4039 4040 4041 4042 4043 4044 4045 4046 4047 4048 4049 4050 4051 4052 4053 4054 4055 4056 4057 4058 4059 4060 4061 4062 4063 4064 4065 4066 4067 4068 4069 4070 4071 4072 4073 4074 4075 4076 4077 4078 4079 4080 4081 4082 4083 4084 4085 4086 4087 4088 4089 4090 4091 4092 4093 4094 4095 4096 4097 4098 4099 4100 4101 4102 4103 4104 4105 4106 4107 4108 4109 4110 4111 4112 4113 4114 4115 4116 4117 4118 4119 4120 4121 4122 4123 4124 4125 4126 4127 4128 4129 4130 4131 4132 4133 4134 4135 4136 4137 4138 4139 4140 4141 4142 4143 4144 4145 4146 4147 4148 4149 4150 4151 4152 4153 4154 4155 4156 4157 4158 4159 4160 4161 4162 4163 4164 4165 4166 4167 4168 4169 4170 4171 4172 4173 4174 4175 4176 4177 4178 4179 4180 4181 4182 4183 4184 4185 4186 4187 4188 4189 4190 4191 4192 4193 4194 4195 4196 4197 4198 4199 4200 4201 4202 4203 4204 4205 4206 4207 4208 4209 4210 4211 4212 4213 4214 4215 4216 4217 4218 4219 4220 4221 4222 4223 4224 4225 4226 4227 4228 4229 4230 4231 4232 4233 4234 4235 4236 4237 4238 4239 4240 4241 4242 4243 4244 4245 4246 4247 4248 4249 4250 4251 4252 4253 4254 4255 4256 4257 4258 4259 4260 4261 4262 4263 4264 4265 4266 4267 4268 4269 4270 4271 4272 4273 4274 4275 4276 4277 4278 4279 4280 4281 4282 4283 4284 4285 4286 4287 4288 4289 4290 4291 4292 4293 4294 4295 4296 4297 4298 4299 4300 4301 4302 4303 4304 4305 4306 4307 4308 4309 4310 4311 4312 4313 4314 4315 4316 4317 4318 4319 4320 4321 4322 4323 4324 4325 4326 4327 4328 4329 4330 4331 4332 4333 4334 4335 4336 4337 4352 4353 4354 4355 4356 4357 4358 4375 4376 4377 4378 4379 4380 4381 4382 4383 4384 4385 4386 4387 4388 4389 4390 4391 4392 4393 4394 4395 4396 4397 4398 4399 4400 4401 4402 4403 4404 4405 4406 4407 4408 4409 4410 4411 4412 4413 4414 4415 4416 4417 4418 4419 4420 4421 4422 4423 4424 4425 4426 4427 4428 4429 4430 4431 4432 4433 4434 4435 4436 4437 4438 4439 4440 4441 4442 4443 4444 4445 4446 4447 4448 4449 4450 4451 4452 4453 4454 4455 4456 4457 4458 4459 4460 4461 4462 4463 4464 4465 4466 4467 4468 4469 4470 4471 4472 4473 4474 4475 4476 4477 4478 4479 4480 4481 4482 4483 4484 4485 4486 4487 4488 4489 4490 4491 4492 4493 4494 4495 4496 4497 4498 4499 4500 4501 4502 4503 4504 4505 4506 4507 4508 4509 4510 4511 4512 4513 4514 4515 4516 4517 4518 4519 4520 4521 4522 4523 4524 4525 4526 4527 4528 4529 4530 4531 4532 4533 4534 4535 4536 4537 4538 4539 4540 4541 4542 4543 4544 4545 4546 4547 4548 4549 4550 4551 4552 4553 4554 4555 4556 4557 4558 4559 4560 4561 4562 4563 4564 4565 4566 4567 4568 4569 4570 4571 4572 4573 4574 4575 4576 4577 4578 4579 4580 4581 4582 4583 4584 4585 4586 4587 4588 4589 4590 4591 4592 4593 4594 4595 4596 4597 4598 4599 4600 4601 4602 4603 4604 4605 4606 4607 4608 4609 4610 4611 4612 4613 4614 4615 4616 4617 4618 4619 4620 4621 4622 4623 4624 4625 4626 4627 4628 4629 4630 4631 4632 4633 4634 4635 4636 4637 4638 4639 4640 4641 4642 4643 4644 4645 4646 4647 4648 4649 4650 4651 4652 4653 4654 4655 4656 4657 4658 4659 4660 4661 4662 4663 4664 4665 4666 4667 4668 4669 4670 4671 4672 4673 4674 4675 4676 4677 4678 4679 4680 4681 4682 4683 4684 4685 4686 4687 4688 4689 4690 4691 4692 4693 4694 4695 4696 4697 4698 4699 4700 4701 4702 4703 4704 4705 4706 4707 4708 4709 4710 4711 4712 4713 4714 4715 4716 4717 4718 4719 4720 4721 4722 4723 4724 4725 4726 4727 4728 4729 4730 4731 4732 4733 4734 4735 4736 4737 4738 4739 4740 4741 4742 4743 4744 4745 4746 4747 4748 4749 4750 4751 4752 4753 4754 4755 4756 4757 4758 4759 4760 4761 4762 4763 4764 4765 4766 4767 4768 4769 4770 4771 4772 4773 4774 4775 4776 4777 4778 4779 4780 4781 4782 4783 4784 4785 4786 4787 4788 4789 4790 4791 4792 4793 4794 4795 4796 4797 4798 4799 4800 4801 4802 4803 4804 4805 4806 4807 4808 4809 4810 4811 4812 4813 4814 4815 4816 4817 4818 4819 4820 4821 4822 4823 4824 4825 4826 4827 4828 4829 4830 4831 4832 4833 4834 4835 4836 4837 4838 4839 4840 4841 4842 4843 4844 4845 4846 4847 4848 4849 4850 4851 4852 4853 4854 4855 4856 4857 4858 4859 4860 4861 4862 4863 4864 4865 4866 4867 4868 4869 4870 4871 4872 4873 4874 4875 4876 4877 4878 4879 4880 4881 4882 4883 4884 4885 4886 4887 4888 4889 4890 4891 4892 4893 4894 4895 4896 4897 4898 4899 4900 4901 4902 4903 4904 4905 4906 4907 4908 4909 4910 4911 4912 4913 4914 4915 4916 4917 4918 4919 4920 4921 4922 4923 4924 4925 4926 4927 4928 4929 4930 4931 4932 4933 4934 4935 4936 4937 4938 4939 4940 4941 4942 4943 4944 4945 4946 4947 4948 4949 4950 4951 4952 4953 4954 4955 4956 4957 4958 4959 4960 4961 4962 4963 4964 4965 4966 4967 4968 4969 4970 4971 4972 4973 4974 4975 4976 4977 4978	7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 2030 2031 2032 2033 2034 2035 2036 2037 2038 2039 2040 2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079 2080 2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117 2118 2119 2120 2121 2122 2123 2124 2125 2126 2127 2128 2129 2130 2131 2132 2133 2134 2135 2136 2137 2138 2139 2140 2141 2142 2143 2144 2155 2156 2157 2158 2159 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189 2190 2191 2192 2193 2194 2195 2196 2197 2198 2199 2200 2201 2202 2203 2204 2205 2206 2207 2208 2209 2210 2211 2212 2213 2214 2215 2216 2217 2218 2219 2220 2221 2222 2223 2224 2225 2226 2227 2228 2229 2230 2231 2232 2233 2234 2235 2236 2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 2248 2249 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294 2295 2296 2297 2298 2299 2300 2301 2302 2303 2304 2305 2306 2307 2308 2309 2310 2311 2312 2313 2314 2315 2316 2317 2318 2319 2320 2321 2322 2323 2324 2325 2326 2327 2328 2329 2330 2331 2332 2333 2334 2335 2336 2337 2338 2339 2340 2341 2342 2343 2344 2345 2346 2347 2348 2349 2350 2351 2352 2353 2354 2355 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 2376 2377 2378 2379 2380 2381 2382 2383 2384 2385 2386 2387 2388 2389 2390 2391 2392 2393 2394 2395 2396 2397 2398 2399 2400 2401 2402 2403 2404 2405 2406 2407 2408 2409 2410 2411 2412 2413 2414 2415 2416 2417 2418 2419 2420 2421 2422 2423 2424 2425 2426 2427 2428 2429 2430 2431 2432 2433 2434 2435 2436 2437 2438 2439 2440 2441 2442 2443 2444 2445 2446 2447 2448 2449 2450 2451 2452 2453 2454 2455 2456 2457 2458 2459 2460 2461 2462 2463 2464 2465 2466 2467 2468 2469 2470 2471 2472 2473 2474 2475 2476 2477 2478 2479 2480 2481 2482 2483 2484 2485 2486 2487 2488 2489 2490 2491 2492 2493 2494 2495 2496 2497 2498 2499 2500 2501 2502 2503 2504 2505 2506 2507 2508 2509 2510 2511 2512 2513 2514 2515 2516 2517 2518 2519 2520 2521 2522 2523 2524 2525 2526 2527 2528 2529 2530 2531 2532 2533 2534 2535 2536 2537 2538 2539 2540 2541 2542 2543 2544 2545 2546 2547 2548 2549 2550 2551 2552 2553 2554 2555 2556 2557 2558 2559 2560 2561 2562 2563 2564 2565 2566 2567 2568 2569 2570 2571 2572 2573 2574 2575 2576 2577 2578 2579 2580 2581 2582 2583 2584 2585 2586 2587 2588 2589 2590 2591 2592 2593 2594 2595 2596 2597 2598 2599 2600 2601 2602 2603 2604 2605 2606 2607 2608 2609 2610 2611 2612 2613 2614 2615 2616 2617 2618 2619 2620 2621 2622 2623 2624 2625 2626 2627 2628 2629 2630 2631 2632 2633 2634 2635 2636 2637 2638 2639 2640 2641 2642 2643 2644 2645 2646 2647 2648 2649 2650 2651 2652 2653 2654 2655 2656 2657 2658 2659 2660 2661 2662 2663 2664 2665 2666 2667 2668 2669 2670 2671 2672 2673 2674 2675 2676 2677 2678 2679 2680 2681 2682 2683 2684 2685 2686 2687 2688 2689 2690 2691 2692 2693 2694 2695 2696 2697 2698 2699 2700 2701 2702 2703 2704 2705 2706 2707 2708 2709 2710 2711 2712 2713 2714 2715 2716 2717 2718 2719 2720 2721 2722 2723 2724 2725 2726 2727 2728 2729 2730 2731 2732 2733 2734 2735 2736 2737 2738 2739 2740 2741 2742 2743 2744 2745 2746 2747 2748 2749 2750 2751 2752 2753 2754 2755 2756 2757 2758 2759 2760 2761 2762 2763 2764 2765 2766 2767 2768 2769 2770 2771 2772 2773 2774 2775 2776 2777 2778 2779 2780 2781 2782 2783 2784 2785 2786 2787 2788 2789 2790 2791 2792 2793 2794 2795 2796 2797 2798 2799 2800 2801 2802 2803 2804 2805 2806 2807 2808 2809 2810 2811 2812 2813 2814 2815 2816 2817 2818 2819 2820 2821 2822 2823 2824 2825 2826 2827 2828 2829 2830 2831 2832 2833 2834 2835 2836 2837 2838 2839 2840 2841 2842 2843 2844 2845 2846 2847 2848 2849 2850 2851 2852 2853 2854 2855 2856 2857 2858 2859 2860 2861 2862 2863 2864 2865 2866 2867 2868 2869 2870 2871 2872 2873 2874 2875 2876 2877 2878 2879 2880 2881 2882 2883 2884 2885 2886 2887 2888 2889 2890 2891 2892 2893 2894 2895 2896 2897 2898 2899 2900 2901 2902 2903 2904 2905 2906 2907 2908 2909 2910 2911 2912 2913 2914 2915 2916 2917 2918 2919 2920 2921 2922 2923 2924 2925 2926 2927 2928 2929 2930 2931 2932 2933 2934 2935 2936 2937 2938 2939 2940 2941 2942 2943 2944 2945 2946 2947 2948 2949 2950 2951 2952 2953 2954 2955 2956 2957 2958 2959 2960 2961 2962 2963 2964 2965 2966 2967 2968 2969 2970 2971 2972 2973 2974 2975 2976 2977 2978 2979 2980 2981 2982 2983 2984 2985 2986 2987 2988 2989 2990 2991 2992 2993 2994 2995 2996 2997 2998 2999 3000 3001 3002 3003 3004 3005 3006 3007 3008 3009 3010 3011 3012 3013 3014 3015 3016 3017 3018 3019 3020 3021 3022 3023 3024 3025 3026 3027 3028 3029 3030 3031 3032 3033 3034 3035 3036 3037 3038 3039 3040 3041 3042 3043 3044 3045 3046 3047 3048 3049 3050 3051 3052 3053 3054 3055 3056 3057 3058 3059 3060 3061 3062 3063 3064 3065 3066 3067 3068 3069 3070 3071 3072 3073 3074 3075 3076 3077 3078 3079 3080 3081 3082 3083 3084 3085 3086 3087 3088 3089 3090 3091 3092 3093 3094 3095 3096 3097 3098 3099 3100 3101 3102 3103 3104 3105 3106 3107 3108 3109 3110 3111 3112 3113 3114 3115 3116 3117 3118 3119 3120 3121 3122 3123 3124 3125 3126 3127 3128 3129 3130 3131 3132 3133 3134 3135 3136 3137 3138 3139 3140 3141 3142 3143 3144 3145 3146 3147 3148 3149 3150 3151 3152 3153 3154 3155 3156 3157 3158 3159 3160 3161 3162 3163 3164 3165 3166 3167 3168 3169 3170 3171 3172 3173 3174 3175 3176 3177 3178 3179 3180 3181 3182 3183 3184 3185 3186 3187 3188 3189 3190 3191 3192 3193 3194 3195 3196 3197 3198 3199 3200 3201 3202 3203 3204 3205 3206 3207 3208 3209 3210 3211 3212 3213 3214 3215 3216 3217 3218 3219 3220 3221 3222 3223 3224 3225 3226 3227 3228 3229 3230 3231 3232 3233 3234 3235 3236 3237 3238 3239 3240 3241 3242 3243 3244 3245 3246 3247 3248 3249 3250 3251 3252 3253 3254 3255 3256 3257 3258 3259 3260 3261 3262 3263 3264 3265 3266 3267 3268 3269 3270 3271 3272 3273 3274 3275 3276 3277 3278 3279 3280 3281 3282 3283 3284 3285 3286 3287 3288 3289 3290 3291 3292 3293 3328 3329 3330 3331 3332 3333 3334 3335 3336 3337 3338 3339 3340 3341 3342 3343 3344 3345 3346 3347 3348 3349 3350 3351 3352 3353 3354 3355 3356 3357 3358 3359 3360 3361 3362 3363 3364 3365 3366 3367 3368 3369 3370 3371 3372 3373 3374 3375 3376 3377 3378 3379 3380 3381 3382 3383 3384 3385 3386 3387 3388 3389 3390 3391 3392 3393 3394 3395 3396 3397 3398 3399 3400 3401 3402 3403 3404 3405 3406 3407 3408 3409 3410 3411 3412 3413 3414 3415 3416 3417 3418 3419 3420 3421 3422 3423 3424 3425 3426 3427 3428 3429 3430 3431 3432 3433 3434 3435 3436 3437 3438 3439 3440 3441 3442 3443 3444 3445 3446 3447 3448 3449 3450 3451 3452 3453 3454 3455 3456 3457 3458 3459 3460 3461 3462 3463 3464 3465 3466 3467 3468 3469 3470 3471 3472 3473 3474 3475 3476 3477 3478 3479 3480 3481 3482 3483 3484 3485 3486 3487 3488 3489 3490 3491 3492 3493 3494 3495 3496 3497 3498 3499 3500 3501 3502 3503 3504 3505 3506 3507 3508 3509 3510 3511 3512 3513 3514 3515 3516 3517 3518 3519 3520 3521 3522 3523 3524 3525 3526 3527 3528 3529 3530 3531 3532 3533 3534 3535 3536 3537 3538 3539 3540 3541 3542 3543 3544 3545 3546 3547 3548 3549 3550 3551 3552 3553 3554 3555 3556 3557 3558 3559 3560 3561 3562 3563 3564 3565 3566 3567 3568 3569 3570 3571 3572 3573 3574 3575 3576 3577 3578 3579 3580 3581 3582 3583 3584 3585 3586 3587 3588 3589 3590 3591 3592 3593 3594 3595 3596 3597 3598 3599 3600 3601 3602 3603 3604 3605 3606 3607 3608 3609 3610 3611 3612 3613 3614 3615 3616 3617 3618 3619 3620 3621 3622 3623 3624 3625 3626 3627 3628 3629 3630 3631 3632 3633 3634 3635 3636 3637 3638 3639 3640 3641 3642 3643 3644 3645 3646 3647 3648 3649 3650 3651 3652 3653 3654 3655 3656 3657 3658 3659 3660 3661 3662 3663 3664 3665 3666 3667 3668 3669 3670 3671 3672 3673 3674 3675 3676 3677 3678 3679 3680 3681 3682 3683 3684 3685 3686 3687 3688 3689 3690 3691 3692 3693 3694 3695 3696 3697 3698 3699 3700 3701 3702 3703 3704 3705 3706 3707 3708 3709 3710 3711 3712 3713 3714 3715 3716 3717 3718 3719 3720 3721 3722 3723 3724 3725 3726 3727 3728 3729 3730 3731 3732 3733 3734 3735 3736 3737 3738 3739 3740 3741 3742 3743 3744 3745 3746 3747 3748 3749 3750 3751 3752 3753 3754 3755 3756 3757 3758 3759 3760 3761 3762 3763 3764 3765 3766 3767 3768 3769 3770 3771 3772 3773 3774 3775 3776 3777 3778 3779 3780 3781 3782 3783 3784 3785 3786 3787 3788 3789 3790 3791 3792 3793 3794 3795 3796 3797 3798 3799 3800 3801 3802 3803 3804 3805 3806 3807 3808 3809 3810 3811 3812 3813 3814 3815 3816 3817 3818 3819 3820 3821 3822 3823 3824 3825 3826 3827 3828 3829 3830 3831 3832 3833 3834 3835 3836 3837 3838 3839 3840 3841 3842 3843 3844 3845 3846 3847 3848 3849 3850 3851 3852 3853 3854 3855 3856 3857 3858 3859 3860 3861 3862 3863 3864 3865 3866 3867 3868 3869 3870 3871 3872 3873 3874 3875 3876 3877 3878 3879 3880 3881 3882 3883 3884 3885 3886 3887 3888 3889 3890 3891 3892 3893 3894 3895 3896 3897 3898 3899 3900 3901 3902 3903 3904 3905 3906 3907 3908 3909 3910 3911 3912 3913 3914 3915 3916 3917 3918 3919 3920 3921 3922 3923 3924 3925 3926 3927 3928 3929 3930 3931 3932 3953 3954 3955 3956 3957 3958 3959 3977 3978 3979 3980 3981 3982 3983 3984 3985 3986 3987 3988 3989 3990 3991 3992 3993 3994 3995 3996 3997 3998 3999 4000 4001 4002 4003 4004 4005 4006 4007 4008 4009 4010 4011 4012 4013 4014 4015 4016 4017 4018 4019 4020 4021 4022 4023 4045 4046 4047 4048 4049 4050 4051 4052 4053 4054 4055 4056 4057 4058 4059 4065 4066 4067 4068 4069 4070 4071 4072 4073 4074 4075 4076 4077 4078 4079 4080 4081 4082 4083 4084 4085 4086 4087 4088 4089 4090 4091 4092 4093 4094 4095 4096 4097 4098 4099 4100 4101 4102 4103 4104 4105 4106 4107 4108 4109 4110 4111 4112 4113 4114 4115 4116 4117 4118 4119 4120 4121 4122 4123 4124 4125 4126 4127 4128 4129 4130 4131 4132 4133 4134 4135 4136 4137 4138 4139 4140 4141 4142 4143 4144 4145 4146 4147 4148 4149 4150 4151 4152 4156 4157 4158 4159 4160 4161 4162 4163 4164 4165 4166 4167 4168 4169 4170 4171 4172 4173 4174 4175 4176 4177 4178 4179 4180 4181 4182 4183 4184 4185 4186 4187 4188 4189 4190 4191 4192 4193 4194 4195 4196 4197 4198 4199 4200 4201 4202 4203 4204 4205 4206 4207 4208 4209 4210 4211 4212 4213 4214 4215 4216 4217 4218 4219 4220 4221 4222 4223 4224 4225 4226 4227 4228 4229 4230 4231 4232 4233 4234 4235 4236 4237 4238 4239 4240 4241 4242 4243 4244 4245 4246 4247 4248 4249 4250 4251 4252 4253 4254 4255 4256 4257 4258 4259 4260 4261 4262 4263 4264 4265 4266 4267 4268 4269 4270 4271 4272 4273 4274 4275 4276 4277 4278 4279 4280 4281 4282 4283 4284 4285 4286 4287 4288 4289 4290 4291 4292 4293 4294 4295 4296 4297 4298 4299 4300 4301 4302 4303 4304 4305 4306 4307 4308 4309 4310 4311 4312 4313 4314 4315 4316 4317 4318 4319 4320 4321 4322 4323 4324 4325 4326 4327 4328 4329 4330 4331 4332 4333 4334 4335 4336 4337 4338 4339 4340 4341 4342 4343 4344 4345 4346 4347 4348 4349 4350 4351 4352 4353 4354 4355 4356 4357 4358 4360 4361 4362 4363 4364 4365 4366 4367 4368 4369 4370 4371 4372 4373 4374 4375 4376 4377 4378 4379 4380 4381 4382 4383 4384 4385 4386 4387 4388 4389 4390 4391 4392 4393 4394 4395 4396 4397 4398 4399 4400 4401 4402 4403 4404 4405 4406 4407 4408 4409 4410 4411 4412 4413 4414 4415 4416 4417 4418 4419 4420 4421 4422 4423 4424 4425 4426 4427 4428 4429 4430 4431 4432 4433 4434 4435 4436 4437 4438 4439 4440 4441 4442 4443 4444 4445 4446 4447 4448 4449 4450 4451 4452 4453 4454 4455 4456 4457 4458 4459 4460 4461 4462 4463 4464 4465 4466 4467 4468 4469 4470 4471 4472 4473 4474 4475 4476 4477 4478 4479 4480 4481 4482 4483 4484 4485 4486 4487 4488 4489 4490 4491 4492 4493 4494 4495 4496 4500 4501 4502 4503 4504 4505 4506 4507 4508 4509 4510 4513 4514 4515 4516 4517 4518 4519 4520 4521 4522 4523 4524 4525 4526 4527 4528 4529 4530 4531 4532 4533 4534 4535 4536 4537 4538 4539 4540 4541 4542 4543 4544 4545 4546 4547 4548 4549 4550 4551 4552 4553 4554 4555 4556 4557 4558 4559 4560 4561 4562 4563 4564 4565 4566 4567 4568 4569 4570 4571 4572 4573 4574 4575 4576 4577 4578 4579 4580 4581 4582 4583 4584 4585 4586 4587 4588 4589 4590 4591 4592 4593 4597 4598 4599 4600 4601 4602 4603 4604 4605 4606 4607 4608 4609 4610 4611 4612 4613 4614 4615 4616 4617 4618 4619 4620 4621 4622 4623 4624 4625 4626 4627 4628 4629 4630 4631 4632 4633 4634 4635 4636 4637 4638 4639 4640 4641 4642 4643 4644 4645 4646 4647 4648 4649 4650 4651 4652 4653 4654 4655 4656 4657 4658 4659 4660 4661 4662 4663 4664 4665 4666 4667 4668 4669 4670 4671 4672 4673 4674 4675 4676 4677 4678 4679 4680 4681 4682 4683 4684 4685 4686 4687 4688 4689 4690 4691 4692 4693 4694 4695 4696 4697 4698 4699 4700 4701 4702 4703 4704 4705 4706 4707 4708 4709 4710 4711 4712 4713 4714 4715 4716 4717 4718 4719 4720 4721 4722 4723 4724 4725 4726 4727 4728 4729 4730 4731 4732 4733 4734 4735 4736 4737 4738 4739 4740 4741 4742 4743 4744 4745 4746 4747 4748 4749 4750 4751 4752 4753 4754 4755 4756 4757 4758 4759 4760 4761 4762 4763 4764 4765 4766 4767 4768 4769 4770 4771 4772 4773 4774 4775 4776 4777 4778 4779 4780 4781 4782 4783 4784 4785 4786 4787 4788 4789 4790 4791 4792 4793 4794 4795 4796 4797 4798 4799 4800 4801 4802 4803 4804 4805 4806 4807 4808 4809 4810 4811 4812 4813 4814 4815 4816 4817 4818 4819 4820 4821 4822 4823 4824 4825 4826 4827 4828 4829 4830 4831 4832 4833 4834 4835 4836 4837 4838 4839 4840 4841 4842 4843 4844 4845 4846 4847 4848 4849 4850 4851 4852 4853 4854 4855 4856 4857 4858 4859 4860 4861 4862 4863 4864 4865 4866 4867 4868 4869 4870 4871 4872 4873 4874 4875 4876 4877 4878 4879 4880 4881 4882 4883 4884 4885 4886 4887 4888 4889 4890 4891 4892 4893 4894 4895 4896 4897 4898 4899 4900 4901 4902 4903 4904 4905 4906 4907 4908 4909 4910 4911 4912 4913 4914 4915 4916 4917 4918 4919 4920 4921 4922 4923 4924 4925 4926 4927 4928 4929 4930 4931 4932 4933 4934 4935 4936 4937 4938 4939 4940 4941 4942 4943 4944 4945 4946 4947 4948 4949 4950 4951 4952 4953 4954 4955 4956 4957 4958 4959 4960 4961 4962 4963 4964 4965 4966 4967 4968 4969 4970 4971 4972 4973 4974 4975 4976 4977 4978 4979 4980 4981 4982 4983 4984 4985 4986 4987 4988 4989 4990 4991 4992 4993 4994 4995 4996 4997 4998 4999 5000 5001 5002 5003 5004 5005 5006 5007 5008 5009 5010 5011 5012 5013 5014 5015 5016 5017 5018 5019 5020 5021 5022 5023 5024 5025 5026 5027 5028 5029 5030 5031 5032 5033 5034 5035 5036 5037 5038 5039 5040 5041 5042 5043 5044 5045 5046 5047 5048 5049 5050 5051 5052 5053 5054 5055 5056 5057 5058 5059 5060 5061 5062 5063 5064 5065 5066 5067 5068 5069 5070 5071 5072 5073 5074 5075 5076 5077 5078 5079 5080 5081 5082 5083 5084 5085 5086 5087 5088 5089 5090 5091 5092 5093 5094 5095 5096 5097 5098 5099 5100 5101 5102 5103 5104 5105 5106 5107 5108 5109 5110 5111 5112 5113 5114 5115 5116 5117 5118 5119 5120 5121 5122 5123 5124 5125 5126 5127 5128 5129 5130 5131 5132 5133 5134 5135 5136 5137 5138 5139 5140 5141 5142 5143 5144 5145 5146 5147 5148 5163 5164 5165 5166 5167 5168 5169 5186 5187 5188 5189 5190 5191 5192 5193 5194 5195 5196 5197 5198 5199 5200 5201 5202 5203 5204 5205 5206 5207 5208 5209 5210 5211 5212 5213 5214 5215 5216 5217 5218 5219 5220 5221 5222 5223 5224 5225 5226 5227 5228 5229 5230 5231 5232 5233 5234 5235 5236 5237 5238 5239 5240 5241 5242 5243 5244 5245 5246 5247 5248 5249 5250 5251 5252 5253 5254 5255 5256 5257 5258 5259 5260 5261 5262 5263 5264 5265 5266 5267 5268 5269 5270 5271 5272 5273 5274 5275 5276 5277 5278 5279 5280 5281 5282 5283 5284 5285 5286 5287 5288 5289 5290 5291 5292 5293 5294 5295 5296 5297 5298 5299 5300 5301 5302 5303 5304 5305 5306 5307 5308 5309 5310 5311 5312 5313 5314 5315 5316 5317 5318 5319 5320 5321 5322 5323 5324 5325 5326 5327 5328 5329 5330 5331 5332 5333 5334 5335 5336 5337 5338 5339 5340 5341 5342 5343 5344 5345 5346 5347 5348 5349 5350 5351 5352 5353 5354 5355 5356 5357 5358 5359 5360 5361 5362 5363 5364 5365 5366 5367 5368 5369 5370 5371 5372 5373 5374 5375 5376 5377 5378 5379 5380 5381 5382 5383 5384 5385 5386 5387 5388 5389 5390 5391 5392 5393 5394 5395 5396 5397 5398 5399 5400 5401 5402 5403 5404 5405 5406 5407 5408 5409 5410 5411 5412 5413 5414 5415 5416 5417 5418 5419 5420 5421 5422 5423 5424 5425 5426 5427 5428 5429 5430 5431 5432 5433 5434 5435 5436 5437 5438 5439 5440 5441 5442 5443 5444 5445 5446 5447 5448 5449 5450 5451 5452 5453 5454 5455 5456 5457 5458 5459 5460 5461 5462 5463 5464 5465 5466 5467 5468 5469 5470 5471 5472 5473 5474 5475 5476 5477 5478 5479 5480 5481 5482 5483 5484 5485 5486 5487 5488 5489 5490 5491 5492 5493 5494 5495 5496 5497 5498 5499 5500 5501 5502 5503 5504 5505 5506 5507 5508 5509 5510 5511 5512 5513 5514 5515 5516 5517 5518 5519 5520 5521 5522 5523 5524 5525 5526 5527 5528 5529 5530 5531 5532 5533 5534 5535 5536 5537 5538 5539 5540 5541 5542 5543 5544 5545 5546 5547 5548 5549 5550 5551 5552 5553 5554 5555 5556 5557 5558 5559 5560 5561 5562 5563 5564 5565 5566 5567 5568 5569 5570 5571 5572 5573 5574 5575 5576 5577 5578 5579 5580 5581 5582 5583 5584 5585 5586 5587 5588 5589 5590 5591 5592 5593 5594 5595 5596 5597 5598 5599 5600 5601 5602 5603 5604 5605 5606 5607 5608 5609 5610 5611 5612 5613 5614 5615 5616 5617 5618 5619 5620 5621 5622 5623 5624 5625 5626 5627 5628 5629 5630 5631 5632 5633 5634 5635 5636 5637 5638 5639 5640 5641 5642 5643 5644 5645 5646 5647 5648 5649 5650 5651 5652 5653 5654 5655 5656 5657 5658 5659 5660 5661 5662 5663 5664 5665 5666 5667 5668 5669 5670 5671 5672 5673 5674 5675 5676 5677 5678 5679 5680 5681 5682 5683 5684 5685 5686 5687 5688 5689 5690 5691 5692 5693 5694 5695 5696 5697 5698 5699 5700 5701 5702 5703 5704 5705 5706 5707 5708 5709 5710 5711 5712 5713 5714 5715 5716 5717 5718 5719 5720 5721 5722 5723 5724 5725 5726 5727 5728 5729 5730 5731 5732 5733 5734 5735 5736 5737 5738 5739 5740 5741 5742 5743 5744 5745 5746 5747 5748 5749 5750 5751 5752 5753 5754 5755 5756 5757 5758 5759 5760 5761 5762 5763 5764 5765 5766 5767 5768 5769 5770 5771 5772 5773 5774 5775 5776 5777 5778 5779 5780 5781 5782 5783 5784 5785 5786 5787 5788 5789 5790 5791 5792 5793 5794 5795 5796 5797 5798 5799 5800 5801 5802 5803 5804 5805 5806 5807 5808 5809 5810 5811 5812 5813 5814 5815 5816 5817 5818 5819 5820 5821 5822 5823 5824 5825 5826 5827 5828 5829 5830 5831 5832 5833 5834 5835 5836 5837 5838 5839 5840 5841 5842 5843 5844 5845 5846 5847 5848 5849 5850 5851 5852 5853 5854 5855 5856 5857 5858 5859 5860 5861 5862 5863 5864 5865 5866 5867 5868 5869 5870 5871 5872 5873 5874	@@ -7,811 +7,997 @@ `msgstr ""` `"Project-Id-Version: tortoisehg\n"` `"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"`-`"POT-Creation-Date: 2009-10-27 13:01+0000\n"`-`"PO-Revision-Date: 2009-09-21 22:22+0000\n"`-`"Last-Translator: peso <peer.sommerlund@gmail.com>\n"`+`"POT-Creation-Date: 2010-02-22 23:55+0000\n"`+`"PO-Revision-Date: 2010-03-05 16:13+0000\n"`+`"Last-Translator: Amfidiusz <Unknown>\n"` `"Language-Team: Polish <pl@li.org>\n"` `"MIME-Version: 1.0\n"` `"Content-Type: text/plain; charset=UTF-8\n"` `"Content-Transfer-Encoding: 8bit\n"`-`"X-Launchpad-Export-Date: 2009-10-28 01:56+0000\n"`+`"X-Launchpad-Export-Date: 2010-03-06 05:13+0000\n"` `"X-Generator: Launchpad (build Unknown)\n"` -`#: thgtaskbar.py:38`-`msgid "TortoiseHg RPC server"`-`msgstr ""`--`#: thgtaskbar.py:115`-`msgid "Options..."`+`#: thgtaskbar.py:36`+`msgid "TortoiseHg Overlay Icon Server"` `msgstr ""` `#: thgtaskbar.py:117` `msgid "Exit"`-`msgstr ""`--`#: tortoisehg\hgtk\about.py:62`+`msgstr "Zakończ"`++`#: tortoisehg\hgtk\about.py:42` `msgid "Several icons are courtesy of the TortoiseSVN project"` `msgstr ""` -`#: tortoisehg\hgtk\about.py:66`+`#: tortoisehg\hgtk\about.py:70`+`msgid "A new version of TortoiseHg is ready for download!"`+`msgstr "Nowa wersja TortoiseHG jest dostępna do pobrania!"`++`#: tortoisehg\hgtk\about.py:76` `msgid "(version %s)"`-`msgstr ""`--`#: tortoisehg\hgtk\about.py:69`-`msgid "Copyright 2009 TK Soh and others"`-`msgstr ""`--`#: tortoisehg\hgtk\about.py:85`+`msgstr "(wersja %s)"`++`#: tortoisehg\hgtk\about.py:79`+`msgid "Copyright 2008-2010 Steve Borho and others"`+`msgstr ""`++`#: tortoisehg\hgtk\about.py:95` `msgid "with %s"`-`msgstr ""`--`#: tortoisehg\hgtk\archive.py:20`+`msgstr "z %s"`++`#: tortoisehg\hgtk\archive.py:18` `msgid "= Working Directory Parent ="` `msgstr ""` -`#: tortoisehg\hgtk\archive.py:37`+`#: tortoisehg\hgtk\archive.py:29`+`msgid "Archive - %s"`+`msgstr "Archiwum - %s"`++`#: tortoisehg\hgtk\archive.py:59`+`msgid "Archive revision:"`+`msgstr "Wersje archiwalne:"`++`#: tortoisehg\hgtk\archive.py:65 tortoisehg\hgtk\clone.py:70`+`#: tortoisehg\hgtk\hginit.py:54 tortoisehg\hgtk\thgconfig.py:323`+`#: tortoisehg\hgtk\thgimport.py:63`+`msgid "Browse..."`+`msgstr "Przeglądaj..."`++`#: tortoisehg\hgtk\archive.py:68 tortoisehg\hgtk\clone.py:106`+`msgid "Destination path:"`+`msgstr ""`++`#: tortoisehg\hgtk\archive.py:71`+`msgid "Directory of files"`+`msgstr ""`++`#: tortoisehg\hgtk\archive.py:73`+`msgid "Archive types:"`+`msgstr ""`++`#: tortoisehg\hgtk\archive.py:79`+`msgid "Uncompressed tar archive"`+`msgstr ""`++`#: tortoisehg\hgtk\archive.py:80`+`msgid "Tar archive compressed using bzip2"`+`msgstr ""`++`#: tortoisehg\hgtk\archive.py:81`+`msgid "Tar archive compressed using gzip"`+`msgstr ""`++`#: tortoisehg\hgtk\archive.py:82`+`msgid "Uncompressed zip archive"`+`msgstr "Rozpakuj archiwum zip"`++`#: tortoisehg\hgtk\archive.py:83`+`msgid "Zip archive compressed using deflate"`+`msgstr ""`++`#: tortoisehg\hgtk\archive.py:92` `msgid "Archive"` `msgstr ""` -`#: tortoisehg\hgtk\archive.py:46`-`msgid "Archive - %s"`-`msgstr ""`--`#: tortoisehg\hgtk\archive.py:71`-`msgid "Archive revision:"`-`msgstr ""`--`#: tortoisehg\hgtk\archive.py:77 tortoisehg\hgtk\clone.py:74`-`#: tortoisehg\hgtk\hginit.py:52 tortoisehg\hgtk\thgconfig.py:301`-`msgid "Browse..."`-`msgstr ""`--`#: tortoisehg\hgtk\archive.py:80 tortoisehg\hgtk\clone.py:103`-`msgid "Destination path:"`-`msgstr ""`--`#: tortoisehg\hgtk\archive.py:83`-`msgid "Directory of files"`-`msgstr ""`--`#: tortoisehg\hgtk\archive.py:85`-`msgid "Archive types:"`-`msgstr ""`--`#: tortoisehg\hgtk\archive.py:91`-`msgid "Uncompressed tar archive"`-`msgstr ""`--`#: tortoisehg\hgtk\archive.py:92`-`msgid "Tar archive compressed using bzip2"`-`msgstr ""`--`#: tortoisehg\hgtk\archive.py:93`-`msgid "Tar archive compressed using gzip"`-`msgstr ""`--`#: tortoisehg\hgtk\archive.py:94`-`msgid "Uncompressed zip archive"`-`msgstr ""`--`#: tortoisehg\hgtk\archive.py:95`-`msgid "Zip archive compressed using deflate"`-`msgstr ""`--`#: tortoisehg\hgtk\archive.py:113 tortoisehg\hgtk\backout.py:114`-`#: tortoisehg\hgtk\clone.py:165 tortoisehg\hgtk\merge.py:142`-`#: tortoisehg\hgtk\quickop.py:182 tortoisehg\hgtk\thgstrip.py:168`-`#: tortoisehg\hgtk\update.py:123`-`msgid "Abort"`-`msgstr ""`--`#: tortoisehg\hgtk\archive.py:127 tortoisehg\hgtk\backout.py:141`-`#: tortoisehg\hgtk\clone.py:188 tortoisehg\hgtk\merge.py:162`-`#: tortoisehg\hgtk\quickop.py:197 tortoisehg\hgtk\thgstrip.py:293`-`#: tortoisehg\hgtk\update.py:138`-`msgid "Confirm Abort"`-`msgstr ""`--`#: tortoisehg\hgtk\archive.py:128 tortoisehg\hgtk\backout.py:142`-`#: tortoisehg\hgtk\clone.py:189 tortoisehg\hgtk\merge.py:163`-`#: tortoisehg\hgtk\quickop.py:198 tortoisehg\hgtk\thgstrip.py:294`-`#: tortoisehg\hgtk\update.py:139`-`msgid "Do you want to abort?"`-`msgstr ""`--`#: tortoisehg\hgtk\archive.py:138 tortoisehg\hgtk\backout.py:153`-`#: tortoisehg\hgtk\clone.py:199 tortoisehg\hgtk\merge.py:183`-`#: tortoisehg\hgtk\quickop.py:207 tortoisehg\hgtk\thgstrip.py:304`-`#: tortoisehg\hgtk\update.py:149`-`msgid "unexpected response id: %s"`-`msgstr ""`--`#: tortoisehg\hgtk\archive.py:194`+`#: tortoisehg\hgtk\archive.py:107`+`msgid "Archived successfully"`+`msgstr ""`++`#: tortoisehg\hgtk\archive.py:109`+`msgid "Canceled archiving"`+`msgstr ""`++`#: tortoisehg\hgtk\archive.py:111`+`msgid "Failed to archive"`+`msgstr ""`++`#: tortoisehg\hgtk\archive.py:167` `msgid "Tar archives"`-`msgstr ""`+`msgstr "Archiwa tar"`++`#: tortoisehg\hgtk\archive.py:170`+`msgid "Bzip2 tar archives"`+`msgstr ""`++`#: tortoisehg\hgtk\archive.py:173`+`msgid "Gzip tar archives"`+`msgstr ""`++`#: tortoisehg\hgtk\archive.py:179`+`msgid "Compressed zip archives"`+`msgstr ""`++`#: tortoisehg\hgtk\archive.py:191 tortoisehg\hgtk\clone.py:107`+`#: tortoisehg\hgtk\hginit.py:91`+`msgid "Select Destination Folder"`+`msgstr "Wybierz katalog docelowy"` `#: tortoisehg\hgtk\archive.py:197`-`msgid "Bzip2 tar archives"`-`msgstr ""`--`#: tortoisehg\hgtk\archive.py:200`-`msgid "Gzip tar archives"`-`msgstr ""`--`#: tortoisehg\hgtk\archive.py:206`-`msgid "Compressed zip archives"`-`msgstr ""`--`#: tortoisehg\hgtk\archive.py:218 tortoisehg\hgtk\clone.py:104`-`#: tortoisehg\hgtk\hginit.py:77`-`msgid "Select Destination Folder"`-`msgstr ""`--`#: tortoisehg\hgtk\archive.py:224` `msgid "Select Destination File"` `msgstr ""` -`#: tortoisehg\hgtk\archive.py:226`+`#: tortoisehg\hgtk\archive.py:199` `msgid "All Files (.)"` `msgstr ""` -`#: tortoisehg\hgtk\archive.py:238 tortoisehg\hgtk\backout.py:181`-`#: tortoisehg\hgtk\clone.py:223 tortoisehg\hgtk\merge.py:198`-`#: tortoisehg\hgtk\quickop.py:219 tortoisehg\hgtk\thgstrip.py:336`-`#: tortoisehg\hgtk\update.py:161`-`msgid "unknown mode name: %s"`-`msgstr ""`--`#: tortoisehg\hgtk\archive.py:254 tortoisehg\hgtk\archive.py:260`-`#: tortoisehg\hgtk\gtklib.py:243 tortoisehg\hgtk\thgconfig.py:481`-`#: tortoisehg\hgtk\thgconfig.py:831`+`#: tortoisehg\hgtk\archive.py:209 tortoisehg\hgtk\archive.py:215`+`#: tortoisehg\hgtk\gtklib.py:359 tortoisehg\hgtk\thgconfig.py:503`+`#: tortoisehg\hgtk\thgconfig.py:931` `msgid "Confirm Overwrite"` `msgstr ""` -`#: tortoisehg\hgtk\archive.py:255`+`#: tortoisehg\hgtk\archive.py:210` `msgid ""` `"The destination \"%s\" already exists!\n"` `"\n"` `"Do you want to overwrite it?"` `msgstr ""` -`#: tortoisehg\hgtk\archive.py:261`+`#: tortoisehg\hgtk\archive.py:216` `msgid ""` `"The directory \"%s\" isn't empty!\n"` `"\n"` `"Do you want to overwrite it?"` `msgstr ""` -`#: tortoisehg\hgtk\archive.py:280`-`msgid "Archived successfully"`-`msgstr ""`--`#: tortoisehg\hgtk\archive.py:282`-`msgid "Canceled archiving"`-`msgstr ""`--`#: tortoisehg\hgtk\archive.py:284`-`msgid "Failed to archive"`-`msgstr ""`--`#: tortoisehg\hgtk\backout.py:29`+`#: tortoisehg\hgtk\backout.py:28` `msgid "Backout changeset - %s"` `msgstr ""` -`#: tortoisehg\hgtk\backout.py:38`-`msgid "Backout"`-`msgstr ""`--`#: tortoisehg\hgtk\backout.py:51`+`#: tortoisehg\hgtk\backout.py:41` `msgid "Backed out changeset: "` `msgstr ""` -`#: tortoisehg\hgtk\backout.py:56`+`#: tortoisehg\hgtk\backout.py:46` `msgid "Changeset Description"` `msgstr ""` -`#: tortoisehg\hgtk\backout.py:62`+`#: tortoisehg\hgtk\backout.py:52` `msgid "Backout commit message"` `msgstr ""` -`#: tortoisehg\hgtk\backout.py:85`+`#: tortoisehg\hgtk\backout.py:76` `msgid ""` `"Commit message text for new changeset that reverses the effect of the "` `"change being backed out."` `msgstr ""` -`#: tortoisehg\hgtk\backout.py:91`+`#: tortoisehg\hgtk\backout.py:82` `msgid "Use English backout message"` `msgstr ""` -`#: tortoisehg\hgtk\backout.py:97`+`#: tortoisehg\hgtk\backout.py:88` `msgid "Merge with old dirstate parent after backout"` `msgstr ""` -`#: tortoisehg\hgtk\backout.py:163 tortoisehg\hgtk\commit.py:437`+`#: tortoisehg\hgtk\backout.py:93`+`msgid "Backout"`+`msgstr ""`++`#: tortoisehg\hgtk\backout.py:112`+`msgid "Backed out successfully"`+`msgstr ""`++`#: tortoisehg\hgtk\backout.py:114`+`msgid "Canceled backout"`+`msgstr ""`++`#: tortoisehg\hgtk\backout.py:116`+`msgid "Failed to backout"`+`msgstr ""`++`#: tortoisehg\hgtk\backout.py:139 tortoisehg\hgtk\commit.py:564` `msgid "Confirm Discard Message"` `msgstr ""` -`#: tortoisehg\hgtk\backout.py:164`+`#: tortoisehg\hgtk\backout.py:140` `msgid "Discard current backout message?"` `msgstr ""` -`#: tortoisehg\hgtk\backout.py:205`-`msgid "Backed out successfully"`-`msgstr ""`--`#: tortoisehg\hgtk\backout.py:207`-`msgid "Canceled backout"`-`msgstr ""`--`#: tortoisehg\hgtk\backout.py:209`-`msgid "Failed to backout"`-`msgstr ""`--`#: tortoisehg\hgtk\bugreport.py:26`+`#: tortoisehg\hgtk\bookmark.py:37`+`msgid "Bookmark - %s"`+`msgstr ""`++`#: tortoisehg\hgtk\bookmark.py:48 tortoisehg\hgtk\hgignore.py:50`+`#: tortoisehg\hgtk\hgignore.py:58 tortoisehg\hgtk\quickop.py:19`+`#: tortoisehg\hgtk\tagadd.py:39`+`msgid "Add"`+`msgstr ""`++`#: tortoisehg\hgtk\bookmark.py:49 tortoisehg\hgtk\commit.py:252`+`#: tortoisehg\hgtk\status.py:163`+`msgid "Move"`+`msgstr ""`++`#: tortoisehg\hgtk\bookmark.py:50 tortoisehg\hgtk\quickop.py:22`+`#: tortoisehg\hgtk\tagadd.py:40`+`msgid "Remove"`+`msgstr ""`++`#: tortoisehg\hgtk\bookmark.py:52`+`msgid "Rename"`+`msgstr ""`++`#: tortoisehg\hgtk\bookmark.py:54`+`msgid "Set Current"`+`msgstr ""`++`#: tortoisehg\hgtk\bookmark.py:56 tortoisehg\hgtk\bookmark.py:182`+`#: tortoisehg\hgtk\merge.py:178`+`msgid "unexpected type: %s"`+`msgstr ""`++`#: tortoisehg\hgtk\bookmark.py:69`+`msgid "Old name:"`+`msgstr ""`++`#: tortoisehg\hgtk\bookmark.py:71`+`msgid "Bookmark:"`+`msgstr ""`++`#: tortoisehg\hgtk\bookmark.py:83 tortoisehg\hgtk\csinfo.py:198`+`#: tortoisehg\hgtk\csinfo.py:199 tortoisehg\hgtk\cslist.py:142`+`#: tortoisehg\hgtk\tagadd.py:65`+`msgid "Revision:"`+`msgstr ""`++`#: tortoisehg\hgtk\bookmark.py:86`+`msgid "New Name:"`+`msgstr ""`++`#: tortoisehg\hgtk\bookmark.py:92`+`msgid "Make new/moved bookmark current"`+`msgstr ""`++`#: tortoisehg\hgtk\bookmark.py:167 tortoisehg\hgtk\gdialog.py:902`+`#: tortoisehg\hgtk\hginit.py:83 tortoisehg\hgtk\tagadd.py:202`+`msgid "unexpected response id: %s"`+`msgstr ""`++`#: tortoisehg\hgtk\bookmark.py:208 tortoisehg\hgtk\bookmark.py:238`+`#: tortoisehg\hgtk\bookmark.py:292 tortoisehg\hgtk\bookmark.py:324`+`msgid "Bookmark input is empty"`+`msgstr ""`++`#: tortoisehg\hgtk\bookmark.py:209 tortoisehg\hgtk\bookmark.py:239`+`#: tortoisehg\hgtk\bookmark.py:293 tortoisehg\hgtk\bookmark.py:325`+`msgid "Please enter bookmark name"`+`msgstr ""`++`#: tortoisehg\hgtk\bookmark.py:216 tortoisehg\hgtk\bookmark.py:246`+`#: tortoisehg\hgtk\bookmark.py:274 tortoisehg\hgtk\bookmark.py:306`+`#: tortoisehg\hgtk\bookmark.py:332`+`msgid "Bookmarking completed"`+`msgstr ""`++`#: tortoisehg\hgtk\bookmark.py:217`+`msgid "Bookmark \"%s\" has been added"`+`msgstr ""`++`#: tortoisehg\hgtk\bookmark.py:224 tortoisehg\hgtk\bookmark.py:227`+`#: tortoisehg\hgtk\bookmark.py:254 tortoisehg\hgtk\bookmark.py:257`+`#: tortoisehg\hgtk\bookmark.py:278 tortoisehg\hgtk\bookmark.py:281`+`#: tortoisehg\hgtk\bookmark.py:311 tortoisehg\hgtk\bookmark.py:314`+`#: tortoisehg\hgtk\bookmark.py:337 tortoisehg\hgtk\bookmark.py:340`+`msgid "Error in bookmarking"`+`msgstr ""`++`#: tortoisehg\hgtk\bookmark.py:247`+`msgid "Bookmark \"%s\" has been moved"`+`msgstr ""`++`#: tortoisehg\hgtk\bookmark.py:267`+`msgid "Bookmark name is empty"`+`msgstr ""`++`#: tortoisehg\hgtk\bookmark.py:268`+`msgid "Please select bookmark name to remove"`+`msgstr ""`++`#: tortoisehg\hgtk\bookmark.py:275`+`msgid "Bookmark \"%s\" has been removed"`+`msgstr ""`++`#: tortoisehg\hgtk\bookmark.py:298`+`msgid "Bookmark new name input is empty"`+`msgstr ""`++`#: tortoisehg\hgtk\bookmark.py:299`+`msgid "Please enter new bookmark name"`+`msgstr ""`++`#: tortoisehg\hgtk\bookmark.py:307`+`msgid "Bookmark \"%s\" has been renamed to \"%s\""`+`msgstr ""`++`#: tortoisehg\hgtk\bookmark.py:333`+`msgid "Bookmark \"%s\" has been made current"`+`msgstr ""`++`#: tortoisehg\hgtk\bookmark.py:346 tortoisehg\hgtk\bookmark.py:373`+`msgid "a bookmark named \"%s\" already exists"`+`msgstr ""`++`#: tortoisehg\hgtk\bookmark.py:355 tortoisehg\hgtk\bookmark.py:382`+`msgid "No bookmark named \"%s\" exists"`+`msgstr ""`++`#: tortoisehg\hgtk\bookmark.py:364`+`msgid "Bookmark '%s' does not exist"`+`msgstr ""`++`#: tortoisehg\hgtk\browse.py:112 tortoisehg\hgtk\quickop.py:100`+`#: tortoisehg\hgtk\status.py:134`+`msgid "status"`+`msgstr ""`++`#: tortoisehg\hgtk\browse.py:136`+`msgid "type"`+`msgstr ""`++`#: tortoisehg\hgtk\browse.py:142 tortoisehg\hgtk\quickop.py:103`+`#: tortoisehg\hgtk\status.py:322`+`msgid "path"`+`msgstr ""`++`#: tortoisehg\hgtk\browse.py:344 tortoisehg\hgtk\browse.py:346`+`msgid "browser"`+`msgstr ""`++`#: tortoisehg\hgtk\bugreport.py:25` `msgid "TortoiseHg Bug Report"` `msgstr ""` -`#: tortoisehg\hgtk\bugreport.py:46`+`#: tortoisehg\hgtk\bugreport.py:45` `msgid "Save as.."` `msgstr ""` -`#: tortoisehg\hgtk\bugreport.py:49 tortoisehg\hgtk\hgcmd.py:48`-`#: tortoisehg\hgtk\taskbarui.py:33`+`#: tortoisehg\hgtk\bugreport.py:48 tortoisehg\hgtk\hgcmd.py:48` `msgid "Close"` `msgstr ""` -`#: tortoisehg\hgtk\bugreport.py:58`+`#: tortoisehg\hgtk\bugreport.py:57` `msgid ""` `"** Please report this bug to http://bitbucket.org/tortoisehg/stable/issues "` `"or tortoisehg-discuss@lists.sourceforge.net\n"` `msgstr ""` -`#: tortoisehg\hgtk\bugreport.py:74`+`#: tortoisehg\hgtk\bugreport.py:73` `msgid "Save error report to"` `msgstr ""` -`#: tortoisehg\hgtk\changeset.py:30`+`#: tortoisehg\hgtk\changeset.py:43` `msgid "%s changeset "` `msgstr ""` -`#: tortoisehg\hgtk\changeset.py:142 tortoisehg\hgtk\changeset.py:168`+`#: tortoisehg\hgtk\changeset.py:165 tortoisehg\hgtk\changeset.py:195` `msgid "[All Files]"` `msgstr ""` -`#: tortoisehg\hgtk\changeset.py:203`+`#: tortoisehg\hgtk\changeset.py:230` `msgid "unknown hunk type: %s"` `msgstr ""` -`#: tortoisehg\hgtk\changeset.py:271`+`#: tortoisehg\hgtk\changeset.py:329` `msgid " %s is larger than the specified max diff size"` `msgstr ""` -`#: tortoisehg\hgtk\changeset.py:280`+`#: tortoisehg\hgtk\changeset.py:338` `msgid "Repository Error: %s, refresh suggested"` `msgstr ""` -`#: tortoisehg\hgtk\changeset.py:327`+`#: tortoisehg\hgtk\changeset.py:385` `msgid "[no hunks to display]"` `msgstr ""` -`#: tortoisehg\hgtk\changeset.py:388 tortoisehg\hgtk\status.py:1505`+`#: tortoisehg\hgtk\changeset.py:440 tortoisehg\hgtk\status.py:1655` `msgid "_Visual Diff"` `msgstr ""` -`#: tortoisehg\hgtk\changeset.py:389`+`#: tortoisehg\hgtk\changeset.py:442` `msgid "Diff to _local"` `msgstr ""` -`#: tortoisehg\hgtk\changeset.py:391`+`#: tortoisehg\hgtk\changeset.py:444` `msgid "_View at Revision"` `msgstr ""` -`#: tortoisehg\hgtk\changeset.py:392`+`#: tortoisehg\hgtk\changeset.py:445` `msgid "_Save at Revision..."` `msgstr ""` -`#: tortoisehg\hgtk\changeset.py:396`+`#: tortoisehg\hgtk\changeset.py:448 tortoisehg\hgtk\datamine.py:147`+`#: tortoisehg\hgtk\datamine.py:162` `msgid "_File History"` `msgstr ""` -`#: tortoisehg\hgtk\changeset.py:397`+`#: tortoisehg\hgtk\changeset.py:449 tortoisehg\hgtk\datamine.py:146` `msgid "_Annotate File"` `msgstr ""` -`#: tortoisehg\hgtk\changeset.py:400`+`#: tortoisehg\hgtk\changeset.py:452` `msgid "_Revert File Contents"` `msgstr ""` -`#: tortoisehg\hgtk\changeset.py:485`+`#: tortoisehg\hgtk\changeset.py:536` `msgid "Changeset:"` `msgstr ""` -`#: tortoisehg\hgtk\changeset.py:487 tortoisehg\hgtk\update.py:103`+`#: tortoisehg\hgtk\changeset.py:538 tortoisehg\hgtk\update.py:90` `msgid "Parent:"` `msgstr ""` -`#: tortoisehg\hgtk\changeset.py:489`+`#: tortoisehg\hgtk\changeset.py:540` `msgid "Child:"` `msgstr ""` -`#: tortoisehg\hgtk\changeset.py:491`+`#: tortoisehg\hgtk\changeset.py:542 tortoisehg\hgtk\cslist.py:143` `msgid "Patch:"` `msgstr ""` -`#: tortoisehg\hgtk\changeset.py:618`-`msgid "Stat"`-`msgstr ""`--`#: tortoisehg\hgtk\changeset.py:620 tortoisehg\hgtk\hgignore.py:128`-`msgid "Files"`-`msgstr ""`--`#: tortoisehg\hgtk\changeset.py:635`+`#: tortoisehg\hgtk\changeset.py:739` `msgid "Diff to second Parent"` `msgstr ""` -`#: tortoisehg\hgtk\changeset.py:758`+`#: tortoisehg\hgtk\changeset.py:915` `msgid "Save file to"` `msgstr ""` -`#: tortoisehg\hgtk\changeset.py:832`+`#: tortoisehg\hgtk\changeset.py:925`+`msgid "Unable to save file"`+`msgstr ""`++`#: tortoisehg\hgtk\changeset.py:997` `msgid "Confirm revert file to old revision"` `msgstr ""` -`#: tortoisehg\hgtk\changeset.py:833`+`#: tortoisehg\hgtk\changeset.py:998` `msgid "Revert %s to contents at revision %d?"` `msgstr ""` -`#: tortoisehg\hgtk\changeset.py:845 tortoisehg\hgtk\synch.py:672`-`msgid "Toggle _Wordwrap"`-`msgstr ""`--`#: tortoisehg\hgtk\clone.py:28`+`#: tortoisehg\hgtk\changeset.py:1011`+`msgid "Enable _Wordwrap"`+`msgstr ""`++`#: tortoisehg\hgtk\clone.py:37` `msgid "TortoiseHg Clone"` `msgstr ""` -`#: tortoisehg\hgtk\clone.py:36`+`#: tortoisehg\hgtk\clone.py:75`+`msgid "Bundle..."`+`msgstr ""`++`#: tortoisehg\hgtk\clone.py:77`+`msgid "Select a Mercurial Bundle"`+`msgstr ""`++`#: tortoisehg\hgtk\clone.py:90`+`msgid "Source path:"`+`msgstr ""`++`#: tortoisehg\hgtk\clone.py:91`+`msgid "Select Source Folder"`+`msgstr ""`++`#: tortoisehg\hgtk\clone.py:117 tortoisehg\hgtk\tagadd.py:68`+`msgid "Advanced options"`+`msgstr ""`++`#: tortoisehg\hgtk\clone.py:127`+`msgid "Clone to revision:"`+`msgstr ""`++`#: tortoisehg\hgtk\clone.py:135`+`msgid "Starting P4 Changelist:"`+`msgstr ""`++`#: tortoisehg\hgtk\clone.py:141`+`msgid "Do not update the new working directory"`+`msgstr ""`++`#: tortoisehg\hgtk\clone.py:142`+`msgid "Use pull protocol to copy metadata"`+`msgstr ""`++`#: tortoisehg\hgtk\clone.py:143`+`msgid "Use uncompressed transfer"`+`msgstr ""`++`#: tortoisehg\hgtk\clone.py:149 tortoisehg\hgtk\history.py:402`+`#: tortoisehg\hgtk\synch.py:183`+`msgid "Use proxy server"`+`msgstr ""`++`#: tortoisehg\hgtk\clone.py:159 tortoisehg\hgtk\synch.py:204`+`msgid "Remote command:"`+`msgstr ""`++`#: tortoisehg\hgtk\clone.py:165` `msgid "Clone"` `msgstr ""` -`#: tortoisehg\hgtk\clone.py:87`-`msgid "Source path:"`-`msgstr ""`--`#: tortoisehg\hgtk\clone.py:88`-`msgid "Select Source Folder"`-`msgstr ""`--`#: tortoisehg\hgtk\clone.py:114 tortoisehg\hgtk\tagadd.py:68`-`msgid "Advanced options"`-`msgstr ""`--`#: tortoisehg\hgtk\clone.py:124`-`msgid "Clone to revision:"`-`msgstr ""`--`#: tortoisehg\hgtk\clone.py:129`-`msgid "Do not update the new working directory"`-`msgstr ""`--`#: tortoisehg\hgtk\clone.py:130`-`msgid "Use pull protocol to copy metadata"`-`msgstr ""`--`#: tortoisehg\hgtk\clone.py:131`-`msgid "Use uncompressed transfer"`-`msgstr ""`--`#: tortoisehg\hgtk\clone.py:137 tortoisehg\hgtk\history.py:233`-`#: tortoisehg\hgtk\synch.py:184`-`msgid "Use proxy server"`-`msgstr ""`--`#: tortoisehg\hgtk\clone.py:147 tortoisehg\hgtk\synch.py:205`-`msgid "Remote command:"`-`msgstr ""`--`#: tortoisehg\hgtk\clone.py:276`+`#: tortoisehg\hgtk\clone.py:187`+`msgid "Cloned successfully"`+`msgstr ""`++`#: tortoisehg\hgtk\clone.py:189 tortoisehg\hgtk\update.py:151`+`msgid "Canceled updating"`+`msgstr ""`++`#: tortoisehg\hgtk\clone.py:191`+`msgid "Failed to clone"`+`msgstr ""`++`#: tortoisehg\hgtk\clone.py:220`+`msgid "Mercurial bundles"`+`msgstr ""`++`#: tortoisehg\hgtk\clone.py:282` `msgid "Source path is empty"` `msgstr ""` -`#: tortoisehg\hgtk\clone.py:277`+`#: tortoisehg\hgtk\clone.py:283` `msgid "Please enter a valid source path"` `msgstr ""` -`#: tortoisehg\hgtk\clone.py:282`+`#: tortoisehg\hgtk\clone.py:288` `msgid "Source and destination are the same"` `msgstr ""` -`#: tortoisehg\hgtk\clone.py:283`+`#: tortoisehg\hgtk\clone.py:289` `msgid "Please specify different paths"` `msgstr ""` -`#: tortoisehg\hgtk\clone.py:331`-`msgid "Cloned successfully"`-`msgstr ""`--`#: tortoisehg\hgtk\clone.py:333`-`msgid "Canceled cloning"`-`msgstr ""`--`#: tortoisehg\hgtk\clone.py:335`-`msgid "Failed to clone"`-`msgstr ""`--`#: tortoisehg\hgtk\commit.py:34`+`#: tortoisehg\hgtk\commit.py:33` `msgid "Branch Operations"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:39`+`#: tortoisehg\hgtk\commit.py:43` `msgid "Select branch of merge commit"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:51`+`#: tortoisehg\hgtk\commit.py:55`+`msgid "No branch changes"`+`msgstr ""`++`#: tortoisehg\hgtk\commit.py:57`+`msgid "Open a new named branch"`+`msgstr ""`++`#: tortoisehg\hgtk\commit.py:65`+`msgid "Close current named branch"`+`msgstr ""`++`#: tortoisehg\hgtk\commit.py:72` `msgid "Changes take effect on next commit"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:52`-`msgid "No branch changes"`-`msgstr ""`--`#: tortoisehg\hgtk\commit.py:54`-`msgid "Open a new named branch"`-`msgstr ""`--`#: tortoisehg\hgtk\commit.py:56`-`msgid "Close current named branch"`-`msgstr ""`--`#: tortoisehg\hgtk\commit.py:148`+`#: tortoisehg\hgtk\commit.py:164`+`msgid "merging "`+`msgstr ""`++`#: tortoisehg\hgtk\commit.py:170` `msgid " - qnew"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:151`+`#: tortoisehg\hgtk\commit.py:173` `msgid " - qrefresh "` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:152`+`#: tortoisehg\hgtk\commit.py:174` `msgid " - commit"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:183 tortoisehg\hgtk\history.py:175`+`#: tortoisehg\hgtk\commit.py:217 tortoisehg\hgtk\commit.py:299`+`#: tortoisehg\hgtk\history.py:213 tortoisehg\hgtk\history.py:309`+`#: tortoisehg\hgtk\thgimport.py:107`+`msgid "Patch Queue"`+`msgstr ""`++`#: tortoisehg\hgtk\commit.py:222 tortoisehg\hgtk\history.py:326` `msgid "_View"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:184`+`#: tortoisehg\hgtk\commit.py:223 tortoisehg\hgtk\history.py:332`+`msgid "Toolbar"`+`msgstr ""`++`#: tortoisehg\hgtk\commit.py:225` `msgid "Advanced"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:186 tortoisehg\hgtk\history.py:691`-`#: tortoisehg\hgtk\history.py:1014`+`#: tortoisehg\hgtk\commit.py:227 tortoisehg\hgtk\history.py:64`+`#: tortoisehg\hgtk\history.py:414 tortoisehg\hgtk\history.py:1088` `msgid "Parents"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:189 tortoisehg\hgtk\hgignore.py:138`-`#: tortoisehg\hgtk\history.py:188`+`#: tortoisehg\hgtk\commit.py:231 tortoisehg\hgtk\hgignore.py:142`+`#: tortoisehg\hgtk\history.py:339` `msgid "Refresh"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:190`+`#: tortoisehg\hgtk\commit.py:233 tortoisehg\hgtk\history.py:353`+`msgid "Ignore Max Diff Size"`+`msgstr ""`++`#: tortoisehg\hgtk\commit.py:235 tortoisehg\hgtk\history.py:355`+`msgid "Always Show Output"`+`msgstr ""`++`#: tortoisehg\hgtk\commit.py:238` `msgid "_Operations"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:191 tortoisehg\hgtk\commit.py:237`-`#: tortoisehg\hgtk\commit.py:598`+`#: tortoisehg\hgtk\commit.py:239 tortoisehg\hgtk\commit.py:293`+`#: tortoisehg\hgtk\commit.py:753` `msgid "_Commit"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:193 tortoisehg\hgtk\commit.py:235`+`#: tortoisehg\hgtk\commit.py:241 tortoisehg\hgtk\commit.py:291` `msgid "_Undo"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:196 tortoisehg\hgtk\status.py:158`+`#: tortoisehg\hgtk\commit.py:244 tortoisehg\hgtk\status.py:154` `msgid "_Diff"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:198 tortoisehg\hgtk\status.py:161`+`#: tortoisehg\hgtk\commit.py:246 tortoisehg\hgtk\status.py:157` `msgid "Re_vert"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:200 tortoisehg\hgtk\status.py:164`-`#: tortoisehg\hgtk\status.py:1515 tortoisehg\hgtk\thgconfig.py:905`+`#: tortoisehg\hgtk\commit.py:248 tortoisehg\hgtk\status.py:160`+`#: tortoisehg\hgtk\status.py:1665 tortoisehg\hgtk\thgconfig.py:1019` `msgid "_Add"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:202 tortoisehg\hgtk\status.py:170`-`#: tortoisehg\hgtk\thgconfig.py:915`+`#: tortoisehg\hgtk\commit.py:250 tortoisehg\hgtk\status.py:166`+`#: tortoisehg\hgtk\thgconfig.py:1029` `msgid "_Remove"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:204 tortoisehg\hgtk\status.py:167`-`msgid "Move"`-`msgstr ""`--`#: tortoisehg\hgtk\commit.py:206 tortoisehg\hgtk\status.py:173`-`#: tortoisehg\hgtk\status.py:1514`+`#: tortoisehg\hgtk\commit.py:254 tortoisehg\hgtk\status.py:169`+`#: tortoisehg\hgtk\status.py:1664` `msgid "_Forget"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:236`+`#: tortoisehg\hgtk\commit.py:292` `msgid "undo recent commit"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:238 tortoisehg\hgtk\commit.py:482`+`#: tortoisehg\hgtk\commit.py:294 tortoisehg\hgtk\commit.py:630` `msgid "commit"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:250 tortoisehg\hgtk\merge.py:169`-`#: tortoisehg\hgtk\thgconfig.py:712`+`#: tortoisehg\hgtk\commit.py:300 tortoisehg\hgtk\history.py:215`+`msgid "Show/Hide Patch Queue"`+`msgstr ""`++`#: tortoisehg\hgtk\commit.py:313 tortoisehg\hgtk\merge.py:190`+`#: tortoisehg\hgtk\thgconfig.py:798` `msgid "Confirm Exit"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:251`+`#: tortoisehg\hgtk\commit.py:314` `msgid "Save commit message at exit?"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:252 tortoisehg\hgtk\commit.py:967`-`#: tortoisehg\hgtk\commit.py:971 tortoisehg\hgtk\history.py:81`-`#: tortoisehg\hgtk\history.py:1419 tortoisehg\hgtk\status.py:1270`-`#: tortoisehg\hgtk\status.py:1289 tortoisehg\hgtk\status.py:1582`-`#: tortoisehg\hgtk\thgconfig.py:715 tortoisehg\hgtk\thgmq.py:328`-`#: tortoisehg\hgtk\update.py:231`+`#: tortoisehg\hgtk\commit.py:315 tortoisehg\hgtk\commit.py:1116`+`#: tortoisehg\hgtk\commit.py:1120 tortoisehg\hgtk\history.py:175`+`#: tortoisehg\hgtk\history.py:1915 tortoisehg\hgtk\status.py:1388`+`#: tortoisehg\hgtk\status.py:1407 tortoisehg\hgtk\status.py:1731`+`#: tortoisehg\hgtk\thgconfig.py:801 tortoisehg\hgtk\thgmq.py:345`+`#: tortoisehg\hgtk\update.py:236` `msgid "&Cancel"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:252 tortoisehg\hgtk\commit.py:967`-`#: tortoisehg\hgtk\commit.py:971 tortoisehg\hgtk\status.py:1582`-`#: tortoisehg\hgtk\thgconfig.py:714 tortoisehg\hgtk\thgmq.py:327`+`#: tortoisehg\hgtk\commit.py:315 tortoisehg\hgtk\commit.py:1116`+`#: tortoisehg\hgtk\commit.py:1120 tortoisehg\hgtk\status.py:1731`+`#: tortoisehg\hgtk\thgconfig.py:800 tortoisehg\hgtk\thgmq.py:345` `msgid "&Yes"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:252 tortoisehg\hgtk\commit.py:967`-`#: tortoisehg\hgtk\commit.py:971 tortoisehg\hgtk\thgstrip.py:362`+`#: tortoisehg\hgtk\commit.py:315 tortoisehg\hgtk\commit.py:1116`+`#: tortoisehg\hgtk\commit.py:1120 tortoisehg\hgtk\thgstrip.py:217` `msgid "&No"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:294`+`#: tortoisehg\hgtk\commit.py:361` `msgid "Committer:"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:308`+`#: tortoisehg\hgtk\commit.py:375` `msgid "Auto-includes:"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:311`+`#: tortoisehg\hgtk\commit.py:378` `msgid "Push after commit"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:345`+`#: tortoisehg\hgtk\commit.py:413` `msgid "Recent commit messages..."` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:382`+`#: tortoisehg\hgtk\commit.py:486` `msgid "Parent: %(rev)s"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:391`-`msgid "not at head revision"`-`msgstr ""`--`#: tortoisehg\hgtk\commit.py:413 tortoisehg\hgtk\status.py:480`+`#: tortoisehg\hgtk\commit.py:494`+`msgid "Not at head"`+`msgstr ""`++`#: tortoisehg\hgtk\commit.py:519 tortoisehg\hgtk\status.py:534` `msgid "Patch Preview"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:415 tortoisehg\hgtk\status.py:484`+`#: tortoisehg\hgtk\commit.py:521 tortoisehg\hgtk\status.py:538` `msgid "Commit Preview"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:438`+`#: tortoisehg\hgtk\commit.py:565` `msgid "Discard current commit message?"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:481 tortoisehg\hgtk\commit.py:743`-`#: tortoisehg\hgtk\commit.py:793 tortoisehg\hgtk\gdialog.py:472`-`#: tortoisehg\hgtk\merge.py:94 tortoisehg\hgtk\thgconfig.py:600`+`#: tortoisehg\hgtk\commit.py:629 tortoisehg\hgtk\commit.py:902`+`#: tortoisehg\hgtk\commit.py:953 tortoisehg\hgtk\commit.py:1182`+`#: tortoisehg\hgtk\gdialog.py:485 tortoisehg\hgtk\history.py:224`+`#: tortoisehg\hgtk\merge.py:130 tortoisehg\hgtk\thgconfig.py:664` `msgid "Commit"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:485`+`#: tortoisehg\hgtk\commit.py:633` `msgid "QNew"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:486`+`#: tortoisehg\hgtk\commit.py:634` `msgid "create new MQ patch"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:488`+`#: tortoisehg\hgtk\commit.py:636` `msgid "QRefresh"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:489`+`#: tortoisehg\hgtk\commit.py:637` `msgid "refresh top MQ patch"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:491`+`#: tortoisehg\hgtk\commit.py:639` `msgid "_Commit (+1 head)"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:491`+`#: tortoisehg\hgtk\commit.py:639` `msgid "_Commit (-1 head)"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:496`+`#: tortoisehg\hgtk\commit.py:645`+`msgid "commit to merge one head"`+`msgstr ""`++`#: tortoisehg\hgtk\commit.py:648`+`msgid "neither parent is a head, commit to add a new head"`+`msgstr ""`++`#: tortoisehg\hgtk\commit.py:653` `msgid "parent is not a head, commit to add a new head"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:501`-`msgid "commit to merge one head"`-`msgstr ""`--`#: tortoisehg\hgtk\commit.py:504`-`msgid "no parent is a head, commit to add a new head"`-`msgstr ""`--`#: tortoisehg\hgtk\commit.py:608`+`#: tortoisehg\hgtk\commit.py:763` `msgid "new branch: "` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:610`+`#: tortoisehg\hgtk\commit.py:765` `msgid "close branch: "` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:612`+`#: tortoisehg\hgtk\commit.py:767` `msgid "branch: "` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:631`+`#: tortoisehg\hgtk\commit.py:786` `msgid "Merge "` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:667`+`#: tortoisehg\hgtk\commit.py:822` `msgid "Patch Contents"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:725 tortoisehg\hgtk\commit.py:878`+`#: tortoisehg\hgtk\commit.py:886 tortoisehg\hgtk\commit.py:1028` `msgid "Nothing Commited"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:726`+`#: tortoisehg\hgtk\commit.py:887` `msgid "No committable files selected"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:744`+`#: tortoisehg\hgtk\commit.py:903` `msgid "Unable to create "` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:794`+`#: tortoisehg\hgtk\commit.py:954` `msgid "Unable to apply patch"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:823`+`#: tortoisehg\hgtk\commit.py:983` `msgid "Confirm Undo Commit"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:824`+`#: tortoisehg\hgtk\commit.py:984` `msgid "Undo last commit"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:830 tortoisehg\hgtk\commit.py:845`+`#: tortoisehg\hgtk\commit.py:990 tortoisehg\hgtk\commit.py:1005` `msgid "Undo Commit"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:831`+`#: tortoisehg\hgtk\commit.py:991` `msgid ""` `"Unable to undo!\n"` `"\n"` `"Tip revision differs from last commit."` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:846`+`#: tortoisehg\hgtk\commit.py:1006` `msgid "Errors during rollback!"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:859`+`#: tortoisehg\hgtk\commit.py:1012` `msgid "Confirm Add/Remove"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:860`+`#: tortoisehg\hgtk\commit.py:1013` `msgid "Add/Remove the following files?"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:879 tortoisehg\hgtk\tagadd.py:167`+`#: tortoisehg\hgtk\commit.py:1029 tortoisehg\hgtk\tagadd.py:224` `msgid "Please enter commit message"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:887`+`#: tortoisehg\hgtk\commit.py:1036` `msgid "Error"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:888`+`#: tortoisehg\hgtk\commit.py:1037` `msgid "Message format configuration error"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:897 tortoisehg\hgtk\commit.py:905`-`#: tortoisehg\hgtk\commit.py:917`+`#: tortoisehg\hgtk\commit.py:1046 tortoisehg\hgtk\commit.py:1054`+`#: tortoisehg\hgtk\commit.py:1066` `msgid "Confirm Commit"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:898`+`#: tortoisehg\hgtk\commit.py:1047` `msgid ""` `"The summary line length of %i is greater than %i.\n"` `"\n"` `"Ignore format policy and continue commit?"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:906`+`#: tortoisehg\hgtk\commit.py:1055` `msgid ""` `"The summary line is not followed by a blank line.\n"` `"\n"` `"Ignore format policy and continue commit?"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:918`+`#: tortoisehg\hgtk\commit.py:1067` `msgid ""` `"The following lines are over the %i-character limit: %s.\n"` `"\n"` `"Ignore format policy and continue commit?"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:930`+`#: tortoisehg\hgtk\commit.py:1079` `msgid "Commit: Invalid username"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:931`+`#: tortoisehg\hgtk\commit.py:1080` `msgid ""` `"Your username has not been configured.\n"` `"\n"` `"Please configure your username and try again"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:964`+`#: tortoisehg\hgtk\commit.py:1113` `msgid "Confirm Override Branch"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:965`+`#: tortoisehg\hgtk\commit.py:1114` `msgid ""` `"A branch named \"%s\" already exists,\n"` `"override?"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:969`+`#: tortoisehg\hgtk\commit.py:1118` `msgid "Confirm New Branch"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:970`+`#: tortoisehg\hgtk\commit.py:1119` `msgid "Create new named branch \"%s\"?"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:1045`+`#: tortoisehg\hgtk\commit.py:1173`+`msgid "Finish committing"`+`msgstr ""`++`#: tortoisehg\hgtk\commit.py:1175`+`msgid "Aborted committing"`+`msgstr ""`++`#: tortoisehg\hgtk\commit.py:1177`+`msgid "Failed to commit"`+`msgstr ""`++`#: tortoisehg\hgtk\commit.py:1181`+`msgid "Committing changes..."`+`msgstr ""`++`#: tortoisehg\hgtk\commit.py:1183 tortoisehg\hgtk\history.py:537`+`#: tortoisehg\hgtk\history.py:562 tortoisehg\hgtk\history.py:1620`+`#: tortoisehg\hgtk\history.py:1699 tortoisehg\hgtk\history.py:1829`+`#: tortoisehg\hgtk\history.py:1869 tortoisehg\hgtk\history.py:1936`+`#: tortoisehg\hgtk\history.py:2277 tortoisehg\hgtk\history.py:2307`+`#: tortoisehg\hgtk\history.py:2499 tortoisehg\hgtk\history.py:2527`+`#: tortoisehg\hgtk\recovery.py:161 tortoisehg\hgtk\synch.py:540`+`msgid "Cannot run now"`+`msgstr ""`++`#: tortoisehg\hgtk\commit.py:1184 tortoisehg\hgtk\history.py:538`+`#: tortoisehg\hgtk\history.py:563 tortoisehg\hgtk\history.py:1621`+`#: tortoisehg\hgtk\history.py:1700 tortoisehg\hgtk\history.py:1830`+`#: tortoisehg\hgtk\history.py:1870 tortoisehg\hgtk\history.py:1937`+`#: tortoisehg\hgtk\history.py:2278 tortoisehg\hgtk\history.py:2308`+`#: tortoisehg\hgtk\history.py:2500 tortoisehg\hgtk\history.py:2528`+`msgid "Please try again after running operation is completed"`+`msgstr ""`++`#: tortoisehg\hgtk\commit.py:1210` `msgid "Paste _Filenames"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:1046`+`#: tortoisehg\hgtk\commit.py:1211` `msgid "App_ly Format"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:1047`-`msgid "C_onfigure Format"`-`msgstr ""`--`#: tortoisehg\hgtk\commit.py:1073`+`#: tortoisehg\hgtk\commit.py:1212`+`msgid "C_onfigure Format..."`+`msgstr ""`++`#: tortoisehg\hgtk\commit.py:1257` `msgid "Info Required"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:1074`+`#: tortoisehg\hgtk\commit.py:1258` `msgid "Message format needs to be configured"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:1086 tortoisehg\hgtk\commit.py:1091`+`#: tortoisehg\hgtk\commit.py:1270 tortoisehg\hgtk\commit.py:1275` `msgid "Warning"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:1087`+`#: tortoisehg\hgtk\commit.py:1271` `msgid "The summary line length of %i is greater than %i"` `msgstr ""` -`#: tortoisehg\hgtk\commit.py:1092`+`#: tortoisehg\hgtk\commit.py:1276` `msgid "The summary line is not followed by a blank line"` `msgstr ""` @@ -823,222 +1009,251 @@ `msgid "must be specified 'type' in style"` `msgstr ""` -`#: tortoisehg\hgtk\csinfo.py:191 tortoisehg\hgtk\csinfo.py:192`-`#: tortoisehg\hgtk\tagadd.py:65`-`msgid "Revision:"`-`msgstr ""`--`#: tortoisehg\hgtk\csinfo.py:192`+`#: tortoisehg\hgtk\csinfo.py:199` `msgid "Summary:"` `msgstr ""` -`#: tortoisehg\hgtk\csinfo.py:193`+`#: tortoisehg\hgtk\csinfo.py:200` `msgid "Age:"` `msgstr ""` -`#: tortoisehg\hgtk\csinfo.py:193`+`#: tortoisehg\hgtk\csinfo.py:200 tortoisehg\hgtk\csinfo.py:201`+`msgid "Date:"`+`msgstr ""`++`#: tortoisehg\hgtk\csinfo.py:200 tortoisehg\hgtk\csinfo.py:205` `msgid "User:"` `msgstr ""` -`#: tortoisehg\hgtk\csinfo.py:193 tortoisehg\hgtk\csinfo.py:194`-`msgid "Date:"`-`msgstr ""`--`#: tortoisehg\hgtk\csinfo.py:194 tortoisehg\hgtk\csinfo.py:195`+`#: tortoisehg\hgtk\csinfo.py:201 tortoisehg\hgtk\csinfo.py:202` `msgid "Branch:"` `msgstr ""` -`#: tortoisehg\hgtk\csinfo.py:195 tortoisehg\hgtk\csinfo.py:196`+`#: tortoisehg\hgtk\csinfo.py:202 tortoisehg\hgtk\csinfo.py:203` `msgid "Tags:"` `msgstr ""` -`#: tortoisehg\hgtk\csinfo.py:196`+`#: tortoisehg\hgtk\csinfo.py:203` `msgid "Transplant:"` `msgstr ""` -`#: tortoisehg\hgtk\datamine.py:47`+`#: tortoisehg\hgtk\csinfo.py:204`+`msgid "Perforce:"`+`msgstr ""`++`#: tortoisehg\hgtk\csinfo.py:204`+`msgid "Subversion:"`+`msgstr ""`++`#: tortoisehg\hgtk\cslist.py:88`+`msgid "Show all"`+`msgstr ""`++`#: tortoisehg\hgtk\cslist.py:91`+`msgid "Use compact view"`+`msgstr ""`++`#: tortoisehg\hgtk\cslist.py:384`+`msgid "No items to display"`+`msgstr ""`++`#: tortoisehg\hgtk\cslist.py:397`+`msgid "Updating..."`+`msgstr ""`++`#: tortoisehg\hgtk\cslist.py:400`+`msgid "Selecting %(sel)d of %(total)d, displaying all items"`+`msgstr ""`++`#: tortoisehg\hgtk\cslist.py:403`+`msgid "Selecting %(sel)d, displaying %(count)d of %(total)d items"`+`msgstr ""`++`#: tortoisehg\hgtk\cslist.py:407`+`msgid "Displaying all items"`+`msgstr ""`++`#: tortoisehg\hgtk\cslist.py:409`+`msgid "Displaying %(count)d of %(total)d items"`+`msgstr ""`++`#: tortoisehg\hgtk\datamine.py:45` `msgid "%s - datamine"` `msgstr ""` -`#: tortoisehg\hgtk\datamine.py:56 tortoisehg\hgtk\hgcmd.py:44`-`#: tortoisehg\hgtk\recovery.py:46 tortoisehg\hgtk\serve.py:62`-`#: tortoisehg\hgtk\synch.py:59`+`#: tortoisehg\hgtk\datamine.py:54 tortoisehg\hgtk\hgcmd.py:44`+`#: tortoisehg\hgtk\history.py:383 tortoisehg\hgtk\recovery.py:46`+`#: tortoisehg\hgtk\serve.py:65 tortoisehg\hgtk\synch.py:59` `msgid "Stop"` `msgstr ""` +`#: tortoisehg\hgtk\datamine.py:56`+`msgid "Stop operation on current tab"`+`msgstr ""`+ `#: tortoisehg\hgtk\datamine.py:58`-`msgid "Stop operation on current tab"`+`msgid "New Search"` `msgstr ""` `#: tortoisehg\hgtk\datamine.py:60`-`msgid "New Search"`-`msgstr ""`--`#: tortoisehg\hgtk\datamine.py:62` `msgid "Open new search tab"` `msgstr ""` -`#: tortoisehg\hgtk\datamine.py:73 tortoisehg\hgtk\thgconfig.py:1112`+`#: tortoisehg\hgtk\datamine.py:71 tortoisehg\hgtk\rename.py:29`+`#: tortoisehg\hgtk\thgconfig.py:1307` `msgid "Invalid path"` `msgstr ""` -`#: tortoisehg\hgtk\datamine.py:74`+`#: tortoisehg\hgtk\datamine.py:72` `msgid "Cannot annotate directory: %s"` `msgstr ""` -`#: tortoisehg\hgtk\datamine.py:128`+`#: tortoisehg\hgtk\datamine.py:134` `msgid "Filename"` `msgstr ""` -`#: tortoisehg\hgtk\datamine.py:131 tortoisehg\hgtk\datamine.py:634`-`#: tortoisehg\hgtk\history.py:336 tortoisehg\hgtk\history.py:1057`-`#: tortoisehg\hgtk\logview\treeview.py:444 tortoisehg\hgtk\thgconfig.py:194`-`#: tortoisehg\hgtk\thgconfig.py:277`+`#: tortoisehg\hgtk\datamine.py:136 tortoisehg\hgtk\datamine.py:650`+`#: tortoisehg\hgtk\history.py:101 tortoisehg\hgtk\history.py:435`+`#: tortoisehg\hgtk\history.py:619 tortoisehg\hgtk\logview\treeview.py:486`+`#: tortoisehg\hgtk\thgconfig.py:191 tortoisehg\hgtk\thgconfig.py:299` `msgid "User"` `msgstr ""` -`#: tortoisehg\hgtk\datamine.py:139 tortoisehg\hgtk\datamine.py:149`-`msgid "di_splay change"`-`msgstr ""`--`#: tortoisehg\hgtk\datamine.py:140`-`msgid "_annotate file"`-`msgstr ""`--`#: tortoisehg\hgtk\datamine.py:141 tortoisehg\hgtk\datamine.py:153`-`msgid "_file history"`-`msgstr ""`--`#: tortoisehg\hgtk\datamine.py:142 tortoisehg\hgtk\datamine.py:152`-`msgid "_view file at revision"`-`msgstr ""`--`#: tortoisehg\hgtk\datamine.py:148`-`msgid "_zoom to change"`-`msgstr ""`--`#: tortoisehg\hgtk\datamine.py:150`-`msgid "_annotate parent"`-`msgstr ""`--`#: tortoisehg\hgtk\datamine.py:176`+`#: tortoisehg\hgtk\datamine.py:144 tortoisehg\hgtk\datamine.py:157`+`#: tortoisehg\hgtk\history.py:1128`+`msgid "Di_splay Change"`+`msgstr ""`++`#: tortoisehg\hgtk\datamine.py:148 tortoisehg\hgtk\datamine.py:161`+`msgid "_View File at Revision"`+`msgstr ""`++`#: tortoisehg\hgtk\datamine.py:155`+`msgid "_Zoom to Change"`+`msgstr ""`++`#: tortoisehg\hgtk\datamine.py:159`+`msgid "_Annotate Parent"`+`msgstr ""`++`#: tortoisehg\hgtk\datamine.py:186` `msgid "No parent file"` `msgstr ""` -`#: tortoisehg\hgtk\datamine.py:177`+`#: tortoisehg\hgtk\datamine.py:187` `msgid "Unable to annotate"` `msgstr ""` -`#: tortoisehg\hgtk\datamine.py:301`+`#: tortoisehg\hgtk\datamine.py:316` `msgid "Search"` `msgstr ""` -`#: tortoisehg\hgtk\datamine.py:302 tortoisehg\hgtk\hgignore.py:61`+`#: tortoisehg\hgtk\datamine.py:317 tortoisehg\hgtk\hgignore.py:60` `msgid "Regexp:"` `msgstr ""` -`#: tortoisehg\hgtk\datamine.py:304`+`#: tortoisehg\hgtk\datamine.py:319` `msgid "Includes:"` `msgstr ""` -`#: tortoisehg\hgtk\datamine.py:306`+`#: tortoisehg\hgtk\datamine.py:321` `msgid "Excludes:"` `msgstr ""` -`#: tortoisehg\hgtk\datamine.py:309`+`#: tortoisehg\hgtk\datamine.py:324` `msgid "Start this search"` `msgstr ""` -`#: tortoisehg\hgtk\datamine.py:310`+`#: tortoisehg\hgtk\datamine.py:325` `msgid "Regular expression search pattern"` `msgstr ""` -`#: tortoisehg\hgtk\datamine.py:311`+`#: tortoisehg\hgtk\datamine.py:326` `msgid ""` `"Comma separated list of inclusion patterns. By default, the entire "` `"repository is searched."` `msgstr ""` -`#: tortoisehg\hgtk\datamine.py:314`+`#: tortoisehg\hgtk\datamine.py:329` `msgid ""` `"Comma separated list of exclusion patterns. Exclusion patterns are applied "` `"after inclusion patterns."` `msgstr ""` -`#: tortoisehg\hgtk\datamine.py:320`+`#: tortoisehg\hgtk\datamine.py:335` `msgid "Follow copies and renames"` `msgstr ""` -`#: tortoisehg\hgtk\datamine.py:321`+`#: tortoisehg\hgtk\datamine.py:336` `msgid "Ignore case"` `msgstr ""` -`#: tortoisehg\hgtk\datamine.py:322`+`#: tortoisehg\hgtk\datamine.py:337` `msgid "Show line numbers"` `msgstr ""` -`#: tortoisehg\hgtk\datamine.py:323`+`#: tortoisehg\hgtk\datamine.py:338` `msgid "Show all matching revisions"` `msgstr ""` -`#: tortoisehg\hgtk\datamine.py:355 tortoisehg\hgtk\datamine.py:632`-`#: tortoisehg\hgtk\logview\treeview.py:395`+`#: tortoisehg\hgtk\datamine.py:369 tortoisehg\hgtk\datamine.py:648`+`#: tortoisehg\hgtk\logview\treeview.py:415` `msgid "Rev"` `msgstr ""` -`#: tortoisehg\hgtk\datamine.py:356 tortoisehg\hgtk\datamine.py:633`+`#: tortoisehg\hgtk\datamine.py:370 tortoisehg\hgtk\datamine.py:649` `msgid "File"` `msgstr ""` -`#: tortoisehg\hgtk\datamine.py:357`+`#: tortoisehg\hgtk\datamine.py:371` `msgid "Matches"` `msgstr ""` -`#: tortoisehg\hgtk\datamine.py:379`+`#: tortoisehg\hgtk\datamine.py:393` `msgid "Search %d"` `msgstr ""` -`#: tortoisehg\hgtk\datamine.py:422`+`#: tortoisehg\hgtk\datamine.py:436` `msgid "No regular expression given"` `msgstr ""` -`#: tortoisehg\hgtk\datamine.py:423`+`#: tortoisehg\hgtk\datamine.py:437` `msgid "You must provide a search expression"` `msgstr ""` -`#: tortoisehg\hgtk\datamine.py:429`+`#: tortoisehg\hgtk\datamine.py:443` `msgid "Invalid regular expression"` `msgstr ""` -`#: tortoisehg\hgtk\datamine.py:430 tortoisehg\hgtk\thgshelve.py:210`+`#: tortoisehg\hgtk\datamine.py:444 tortoisehg\hgtk\thgshelve.py:210` `msgid "Error: %s"` `msgstr ""` -`#: tortoisehg\hgtk\datamine.py:452 tortoisehg\hgtk\history.py:1339`+`#: tortoisehg\hgtk\datamine.py:466 tortoisehg\hgtk\datamine.py:767` `msgid "Abort: %s"` `msgstr ""` -`#: tortoisehg\hgtk\datamine.py:464`+`#: tortoisehg\hgtk\datamine.py:478` `msgid "Search \"%s\""` `msgstr ""` -`#: tortoisehg\hgtk\datamine.py:579`+`#: tortoisehg\hgtk\datamine.py:593` `msgid "File is unrevisioned"` `msgstr ""` -`#: tortoisehg\hgtk\datamine.py:580`+`#: tortoisehg\hgtk\datamine.py:594` `msgid "Unable to annotate "` `msgstr ""` -`#: tortoisehg\hgtk\datamine.py:631`+`#: tortoisehg\hgtk\datamine.py:647` `msgid "Line"` `msgstr ""` -`#: tortoisehg\hgtk\datamine.py:635 tortoisehg\hgtk\guess.py:158`+`#: tortoisehg\hgtk\datamine.py:651 tortoisehg\hgtk\guess.py:158` `msgid "Source"` `msgstr ""` -`#: tortoisehg\hgtk\datamine.py:693`+`#: tortoisehg\hgtk\datamine.py:709` `msgid "Loading history..."` `msgstr ""` @@ -1046,113 +1261,139 @@ `msgid "TortoiseHg Prompt"` `msgstr ""` -`#: tortoisehg\hgtk\gdialog.py:469`+`#: tortoisehg\hgtk\gdialog.py:482` `msgid "_Tools"` `msgstr ""` -`#: tortoisehg\hgtk\gdialog.py:470 tortoisehg\hgtk\thgconfig.py:603`-`msgid "Changelog"`-`msgstr ""`--`#: tortoisehg\hgtk\gdialog.py:474`+`#: tortoisehg\hgtk\gdialog.py:483 tortoisehg\hgtk\history.py:185`+`#: tortoisehg\hgtk\thgconfig.py:665 tortoisehg\util\menuthg.py:49`+`msgid "Repository Explorer"`+`msgstr ""`++`#: tortoisehg\hgtk\gdialog.py:487 tortoisehg\hgtk\history.py:227` `msgid "Datamine"` `msgstr ""` -`#: tortoisehg\hgtk\gdialog.py:476`+`#: tortoisehg\hgtk\gdialog.py:489 tortoisehg\hgtk\history.py:230` `msgid "Recovery"` `msgstr ""` -`#: tortoisehg\hgtk\gdialog.py:478`+`#: tortoisehg\hgtk\gdialog.py:491 tortoisehg\hgtk\history.py:233` `msgid "Serve"` `msgstr ""` -`#: tortoisehg\hgtk\gdialog.py:480 tortoisehg\hgtk\synch.py:89`-`#: tortoisehg\hgtk\thgshelve.py:71 tortoisehg\hgtk\thgshelve.py:139`-`#: tortoisehg\hgtk\thgshelve.py:145 tortoisehg\hgtk\thgshelve.py:153`+`#: tortoisehg\hgtk\gdialog.py:493 tortoisehg\hgtk\history.py:236`+`#: tortoisehg\hgtk\synch.py:89 tortoisehg\hgtk\thgshelve.py:71`+`#: tortoisehg\hgtk\thgshelve.py:139 tortoisehg\hgtk\thgshelve.py:145`+`#: tortoisehg\hgtk\thgshelve.py:153` `msgid "Shelve"` `msgstr ""` -`#: tortoisehg\hgtk\gdialog.py:482 tortoisehg\hgtk\history.py:114`-`#: tortoisehg\util\menuthg.py:71`+`#: tortoisehg\hgtk\gdialog.py:495 tortoisehg\hgtk\thgconfig.py:667`+`#: tortoisehg\util\menuthg.py:55` `msgid "Synchronize"` `msgstr ""` -`#: tortoisehg\hgtk\gdialog.py:484`+`#: tortoisehg\hgtk\gdialog.py:497` `msgid "Settings"` `msgstr ""` -`#: tortoisehg\hgtk\gdialog.py:487`+`#: tortoisehg\hgtk\gdialog.py:500` `msgid "_Help"` `msgstr ""` -`#: tortoisehg\hgtk\gdialog.py:488`+`#: tortoisehg\hgtk\gdialog.py:501` `msgid "Contents"` `msgstr ""` -`#: tortoisehg\hgtk\gdialog.py:490 tortoisehg\hgtk\taskbarui.py:31`+`#: tortoisehg\hgtk\gdialog.py:503 tortoisehg\hgtk\thgmq.py:831`+`msgid "Index"`+`msgstr ""`++`#: tortoisehg\hgtk\gdialog.py:505` `msgid "About"` `msgstr ""` -`#: tortoisehg\hgtk\gdialog.py:587`+`#: tortoisehg\hgtk\gdialog.py:582` `msgid " Aborted"` `msgstr ""` -`#: tortoisehg\hgtk\gdialog.py:598`+`#: tortoisehg\hgtk\gdialog.py:593` `msgid " Messages and Errors"` `msgstr ""` -`#: tortoisehg\hgtk\gdialog.py:641`+`#: tortoisehg\hgtk\gdialog.py:636` `msgid "making snapshot of %d files from rev %s\n"` `msgstr ""` -`#: tortoisehg\hgtk\gdialog.py:676`+`#: tortoisehg\hgtk\gdialog.py:670` `msgid "edit failed"` `msgstr ""` -`#: tortoisehg\hgtk\gdialog.py:684 tortoisehg\hgtk\thgconfig.py:686`+`#: tortoisehg\hgtk\gdialog.py:678 tortoisehg\hgtk\gtklib.py:171` `msgid "No visual editor configured"` `msgstr ""` -`#: tortoisehg\hgtk\gdialog.py:685 tortoisehg\hgtk\thgconfig.py:687`+`#: tortoisehg\hgtk\gdialog.py:679 tortoisehg\hgtk\gtklib.py:172` `msgid "Please configure a visual editor."` `msgstr ""` -`#: tortoisehg\hgtk\gorev.py:26`+`#: tortoisehg\hgtk\gdialog.py:808`+`msgid "unknown mode name: %s"`+`msgstr ""`++`#: tortoisehg\hgtk\gdialog.py:848`+`msgid "Abort"`+`msgstr "Przerwij"`++`#: tortoisehg\hgtk\gdialog.py:888`+`msgid "Confirm Abort"`+`msgstr "Potwierdź przerwanie"`++`#: tortoisehg\hgtk\gdialog.py:889`+`msgid "Do you want to abort?"`+`msgstr "Czy chcesz przewać?"`++`#: tortoisehg\hgtk\gorev.py:27` `msgid "Select"` `msgstr ""` -`#: tortoisehg\hgtk\gorev.py:30`+`#: tortoisehg\hgtk\gorev.py:31` `msgid "Select Revision"` `msgstr ""` -`#: tortoisehg\hgtk\gorev.py:43`+`#: tortoisehg\hgtk\gorev.py:44` `msgid "revision number, changeset ID, branch or tag"` `msgstr ""` -`#: tortoisehg\hgtk\gorev.py:58`+`#: tortoisehg\hgtk\gorev.py:59`+`msgid "Ambiguous Revision"`+`msgstr ""`++`#: tortoisehg\hgtk\gorev.py:63` `msgid "Invalid Revision"` `msgstr ""` -`#: tortoisehg\hgtk\gtklib.py:149`+`#: tortoisehg\hgtk\gtklib.py:246` `msgid "Save File"` `msgstr ""` -`#: tortoisehg\hgtk\gtklib.py:150`+`#: tortoisehg\hgtk\gtklib.py:247` `msgid "All files"` `msgstr ""` -`#: tortoisehg\hgtk\gtklib.py:244`+`#: tortoisehg\hgtk\gtklib.py:360` `msgid ""` `"The file \"%s\" already exists!\n"` `"\n"` `"Do you want to overwrite it?"` `msgstr ""` -`#: tortoisehg\hgtk\gtklib.py:255`+`#: tortoisehg\hgtk\gtklib.py:371` `msgid "Select Folder"` `msgstr ""` -`#: tortoisehg\hgtk\gtklib.py:642`+`#: tortoisehg\hgtk\gtklib.py:854` `msgid ""` `"Select language for spell checking.\n"` `"\n"`@@ -1163,11 +1404,11 @@ `"examples: en, en_GB, en_US"` `msgstr ""` -`#: tortoisehg\hgtk\gtklib.py:648`+`#: tortoisehg\hgtk\gtklib.py:860` `msgid "Lang \"%s\" can not be set.\n"` `msgstr ""` -`#: tortoisehg\hgtk\gtklib.py:661 tortoisehg\hgtk\thgconfig.py:591`+`#: tortoisehg\hgtk\gtklib.py:873 tortoisehg\hgtk\thgconfig.py:657` `msgid "Spell Check Language"` `msgstr ""` @@ -1207,198 +1448,198 @@ `msgid "Differences from Source to Dest"` `msgstr ""` -`#: tortoisehg\hgtk\guess.py:273`+`#: tortoisehg\hgtk\guess.py:274` `msgid "finding source of "` `msgstr ""` -`#: tortoisehg\hgtk\guess.py:372`+`#: tortoisehg\hgtk\guess.py:373` `msgid ""` `"== %s and %s have identical contents ==\n"` `"\n"` `msgstr ""` -`#: tortoisehg\hgtk\hgcmd.py:179 tortoisehg\hgtk\hgcmd.py:514`+`#: tortoisehg\hgtk\hgcmd.py:186 tortoisehg\hgtk\hgcmd.py:529` `msgid ""` `"\n"` `"[command interrupted]"` `msgstr ""` -`#: tortoisehg\hgtk\hgcmd.py:265`+`#: tortoisehg\hgtk\hgcmd.py:278` `msgid "unknown CmdWidget style: %s"` `msgstr ""` -`#: tortoisehg\hgtk\hgcmd.py:278`+`#: tortoisehg\hgtk\hgcmd.py:291` `msgid "Toggle log window"` `msgstr ""` -`#: tortoisehg\hgtk\hgcmd.py:311`+`#: tortoisehg\hgtk\hgcmd.py:324` `msgid "Stop transaction"` `msgstr ""` -`#: tortoisehg\hgtk\hgcmd.py:313`+`#: tortoisehg\hgtk\hgcmd.py:326` `msgid "Close this"` `msgstr ""` -`#: tortoisehg\hgtk\hgcmd.py:449 tortoisehg\hgtk\hgcmd.py:466`+`#: tortoisehg\hgtk\hgcmd.py:464 tortoisehg\hgtk\hgcmd.py:481` `msgid "invalid state"` `msgstr ""` -`#: tortoisehg\hgtk\hgcmd.py:597`+`#: tortoisehg\hgtk\hgcmd.py:613` `msgid "Command Log"` `msgstr ""` +`#: tortoisehg\hgtk\hgemail.py:36`+`msgid "Send"`+`msgstr ""`+ `#: tortoisehg\hgtk\hgemail.py:38`-`msgid "Send"`-`msgstr ""`--`#: tortoisehg\hgtk\hgemail.py:40` `msgid "Send emails"` `msgstr ""` +`#: tortoisehg\hgtk\hgemail.py:39`+`msgid "Test"`+`msgstr ""`+ `#: tortoisehg\hgtk\hgemail.py:41`-`msgid "Test"`-`msgstr ""`--`#: tortoisehg\hgtk\hgemail.py:43` `msgid "Show emails which would be sent"` `msgstr ""` -`#: tortoisehg\hgtk\hgemail.py:45 tortoisehg\hgtk\serve.py:70`+`#: tortoisehg\hgtk\hgemail.py:43 tortoisehg\hgtk\serve.py:73` `#: tortoisehg\hgtk\synch.py:96` `msgid "Configure"` `msgstr ""` -`#: tortoisehg\hgtk\hgemail.py:47`+`#: tortoisehg\hgtk\hgemail.py:45` `msgid "Configure email settings"` `msgstr ""` +`#: tortoisehg\hgtk\hgemail.py:55`+`msgid "Email outgoing changes"`+`msgstr ""`+ `#: tortoisehg\hgtk\hgemail.py:57`-`msgid "Email outgoing changes"`+`msgid "Email revisions "` `msgstr ""` `#: tortoisehg\hgtk\hgemail.py:59`-`msgid "Email revisions "`-`msgstr ""`--`#: tortoisehg\hgtk\hgemail.py:61` `msgid "Email Mercurial Patches"` `msgstr ""` -`#: tortoisehg\hgtk\hgemail.py:65`+`#: tortoisehg\hgtk\hgemail.py:63` `msgid "Envelope"` `msgstr ""` -`#: tortoisehg\hgtk\hgemail.py:66 tortoisehg\hgtk\taskbarui.py:47`+`#: tortoisehg\hgtk\hgemail.py:64` `msgid "Options"` `msgstr ""` -`#: tortoisehg\hgtk\hgemail.py:78`+`#: tortoisehg\hgtk\hgemail.py:76` `msgid "To:"` `msgstr ""` -`#: tortoisehg\hgtk\hgemail.py:89`+`#: tortoisehg\hgtk\hgemail.py:81` `msgid "Cc:"` `msgstr ""` -`#: tortoisehg\hgtk\hgemail.py:100`+`#: tortoisehg\hgtk\hgemail.py:86` `msgid "From:"` `msgstr ""` -`#: tortoisehg\hgtk\hgemail.py:109`+`#: tortoisehg\hgtk\hgemail.py:90` `msgid "In-Reply-To:"` `msgstr ""` -`#: tortoisehg\hgtk\hgemail.py:116`+`#: tortoisehg\hgtk\hgemail.py:92` `msgid "Message identifier to reply to, for threading"` `msgstr ""` -`#: tortoisehg\hgtk\hgemail.py:122`-`msgid "Send changesets as HG patches"`-`msgstr ""`--`#: tortoisehg\hgtk\hgemail.py:125`+`#: tortoisehg\hgtk\hgemail.py:99`+`msgid "Send changesets as Hg patches"`+`msgstr ""`++`#: tortoisehg\hgtk\hgemail.py:102` `msgid ""`-`"HG patches (as generated by export command) are compatible with most patch "`+`"Hg patches (as generated by export command) are compatible with most patch "` `"programs. They include a header which contains the most important changeset "` `"metadata."` `msgstr ""` -`#: tortoisehg\hgtk\hgemail.py:130`+`#: tortoisehg\hgtk\hgemail.py:107` `msgid "Use extended (git) patch format"` `msgstr ""` -`#: tortoisehg\hgtk\hgemail.py:133`+`#: tortoisehg\hgtk\hgemail.py:110` `msgid ""` `"Git patches can describe binary files, copies, and permission changes, but "` `"recipients may not be able to use them if they are not using git or "` `"Mercurial."` `msgstr ""` -`#: tortoisehg\hgtk\hgemail.py:138`-`msgid "Plain, do not prepend HG header"`-`msgstr ""`--`#: tortoisehg\hgtk\hgemail.py:141`+`#: tortoisehg\hgtk\hgemail.py:115`+`msgid "Plain, do not prepend Hg header"`+`msgstr ""`++`#: tortoisehg\hgtk\hgemail.py:118` `msgid ""` `"Stripping Mercurial header removes username and parent information. Only "` `"useful if recipient is not using Mercurial (and does not like to see the "` `"headers)."` `msgstr ""` -`#: tortoisehg\hgtk\hgemail.py:146`+`#: tortoisehg\hgtk\hgemail.py:123` `msgid "Send single binary bundle, not patches"` `msgstr ""` -`#: tortoisehg\hgtk\hgemail.py:150`+`#: tortoisehg\hgtk\hgemail.py:127` `msgid ""` `"Bundles store complete changesets in binary form. Upstream users can pull "` `"from them. This is the safest way to send changes to recipient Mercurial "` `"users."` `msgstr ""` -`#: tortoisehg\hgtk\hgemail.py:156`+`#: tortoisehg\hgtk\hgemail.py:133` `msgid ""` `"This feature is only available when sending outgoing changesets. It is not "` `"applicable with revision ranges."` `msgstr ""` -`#: tortoisehg\hgtk\hgemail.py:162`+`#: tortoisehg\hgtk\hgemail.py:136` `msgid "attach"` `msgstr ""` -`#: tortoisehg\hgtk\hgemail.py:164`+`#: tortoisehg\hgtk\hgemail.py:138` `msgid "send patches as attachments"` `msgstr ""` -`#: tortoisehg\hgtk\hgemail.py:165`+`#: tortoisehg\hgtk\hgemail.py:139` `msgid "inline"` `msgstr ""` -`#: tortoisehg\hgtk\hgemail.py:167`+`#: tortoisehg\hgtk\hgemail.py:141` `msgid "send patches as inline attachments"` `msgstr ""` -`#: tortoisehg\hgtk\hgemail.py:168`+`#: tortoisehg\hgtk\hgemail.py:142` `msgid "diffstat"` `msgstr ""` -`#: tortoisehg\hgtk\hgemail.py:170`+`#: tortoisehg\hgtk\hgemail.py:144` `msgid "add diffstat output to messages"` `msgstr ""` -`#: tortoisehg\hgtk\hgemail.py:179`+`#: tortoisehg\hgtk\hgemail.py:152` `msgid "Subject:"` `msgstr ""` -`#: tortoisehg\hgtk\hgemail.py:193`+`#: tortoisehg\hgtk\hgemail.py:166` `msgid "Flags:"` `msgstr ""` -`#: tortoisehg\hgtk\hgemail.py:205`+`#: tortoisehg\hgtk\hgemail.py:180` `msgid "Patch Series (Bundle) Description"` `msgstr ""` -`#: tortoisehg\hgtk\hgemail.py:246`+`#: tortoisehg\hgtk\hgemail.py:221` `msgid ""` `"Patch series description is sent in initial summary email with [PATCH 0 of "` `"N] subject. It should describe the effects of the entire patch series. "`@@ -1407,105 +1648,108 @@ `"subject prefix."` `msgstr ""` -`#: tortoisehg\hgtk\hgemail.py:293 tortoisehg\hgtk\hgemail.py:298`-`#: tortoisehg\hgtk\hgemail.py:307`+`#: tortoisehg\hgtk\hgemail.py:268 tortoisehg\hgtk\hgemail.py:273`+`#: tortoisehg\hgtk\hgemail.py:282` `msgid "Info required"` `msgstr ""` -`#: tortoisehg\hgtk\hgemail.py:294`+`#: tortoisehg\hgtk\hgemail.py:269` `msgid "You must specify a recipient"` `msgstr ""` -`#: tortoisehg\hgtk\hgemail.py:299`+`#: tortoisehg\hgtk\hgemail.py:274` `msgid "You must specify a sender address"` `msgstr ""` -`#: tortoisehg\hgtk\hgemail.py:308`+`#: tortoisehg\hgtk\hgemail.py:283` `msgid "You must configure SMTP"` `msgstr ""` -`#: tortoisehg\hgtk\hgignore.py:35`+`#: tortoisehg\hgtk\hgignore.py:34` `msgid "Ignore filter - %s"` `msgstr ""` -`#: tortoisehg\hgtk\hgignore.py:51 tortoisehg\hgtk\hgignore.py:59`-`#: tortoisehg\hgtk\quickop.py:50 tortoisehg\hgtk\tagadd.py:37`-`msgid "Add"`-`msgstr ""`--`#: tortoisehg\hgtk\hgignore.py:53`+`#: tortoisehg\hgtk\hgignore.py:52` `msgid "Glob:"` `msgstr ""` -`#: tortoisehg\hgtk\hgignore.py:76`+`#: tortoisehg\hgtk\hgignore.py:77 tortoisehg\hgtk\thgconfig.py:599`+`msgid "Edit File"`+`msgstr ""`++`#: tortoisehg\hgtk\hgignore.py:79` `msgid "Apply to:"` `msgstr ""` -`#: tortoisehg\hgtk\hgignore.py:84`+`#: tortoisehg\hgtk\hgignore.py:88` `msgid "Filters"` `msgstr ""` -`#: tortoisehg\hgtk\hgignore.py:100`+`#: tortoisehg\hgtk\hgignore.py:104` `msgid "Patterns"` `msgstr ""` -`#: tortoisehg\hgtk\hgignore.py:108`+`#: tortoisehg\hgtk\hgignore.py:112` `msgid "Remove Selected"` `msgstr ""` -`#: tortoisehg\hgtk\hgignore.py:114`+`#: tortoisehg\hgtk\hgignore.py:118` `msgid "Unknown Files"` `msgstr ""` -`#: tortoisehg\hgtk\hgignore.py:190`+`#: tortoisehg\hgtk\hgignore.py:132`+`msgid "Files"`+`msgstr ""`++`#: tortoisehg\hgtk\hgignore.py:197` `msgid "Invalid glob expression"` `msgstr ""` -`#: tortoisehg\hgtk\hgignore.py:206`+`#: tortoisehg\hgtk\hgignore.py:213` `msgid "Invalid regexp expression"` `msgstr ""` -`#: tortoisehg\hgtk\hginit.py:22 tortoisehg\util\menuthg.py:42`-`msgid "Create a new repository"`+`#: tortoisehg\hgtk\hginit.py:22`+`msgid "TortoiseHg Init"` `msgstr ""` `#: tortoisehg\hgtk\hginit.py:30` `msgid "Create"` `msgstr ""` -`#: tortoisehg\hgtk\hginit.py:55`+`#: tortoisehg\hgtk\hginit.py:57` `msgid "Destination:"` `msgstr ""` -`#: tortoisehg\hgtk\hginit.py:59`+`#: tortoisehg\hgtk\hginit.py:61` `msgid "Add special files (.hgignore, ...)"` `msgstr ""` -`#: tortoisehg\hgtk\hginit.py:61`+`#: tortoisehg\hgtk\hginit.py:63` `msgid "Make repo compatible with Mercurial 1.0"` `msgstr ""` -`#: tortoisehg\hgtk\hginit.py:88`+`#: tortoisehg\hgtk\hginit.py:102` `msgid "Destination path is empty"` `msgstr ""` -`#: tortoisehg\hgtk\hginit.py:89`+`#: tortoisehg\hgtk\hginit.py:103` `msgid "Please enter the directory path"` `msgstr ""` -`#: tortoisehg\hgtk\hginit.py:103`+`#: tortoisehg\hgtk\hginit.py:117` `msgid "Unable to create new repository"` `msgstr ""` -`#: tortoisehg\hgtk\hginit.py:107 tortoisehg\hgtk\hginit.py:112`+`#: tortoisehg\hgtk\hginit.py:121 tortoisehg\hgtk\hginit.py:126` `msgid "Error when creating repository"` `msgstr ""` -`#: tortoisehg\hgtk\hginit.py:129`+`#: tortoisehg\hgtk\hginit.py:143` `msgid "New repository created"` `msgstr ""` -`#: tortoisehg\hgtk\hginit.py:130`+`#: tortoisehg\hgtk\hginit.py:144` `msgid "in directory %s"` `msgstr ""` @@ -1530,330 +1774,371 @@ `msgid "abort: "` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:61`+`#: tortoisehg\hgtk\hgtk.py:66` `msgid ""` `"\n"` `"Caught keyboard interrupt, aborting.\n"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:110`+`#: tortoisehg\hgtk\hgtk.py:118` `msgid "can not read file \"%s\". Ignored.\n"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:189`+`#: tortoisehg\hgtk\hgtk.py:197` `msgid "hgtk %s: %s\n"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:192`+`#: tortoisehg\hgtk\hgtk.py:200` `msgid "hgtk: %s\n"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:195`+`#: tortoisehg\hgtk\hgtk.py:203` `msgid ""` `"hgtk: command '%s' is ambiguous:\n"` `" %s\n"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:198`+`#: tortoisehg\hgtk\hgtk.py:206` `msgid "hgtk: unknown command '%s'\n"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:201`+`#: tortoisehg\hgtk\hgtk.py:209` `msgid "abort: %s!\n"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:256 tortoisehg\hgtk\hgtk.py:404`+`#: tortoisehg\hgtk\hgtk.py:256 tortoisehg\hgtk\hgtk.py:455` `msgid "There is no Mercurial repository here (.hg not found)"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:266`+`#: tortoisehg\hgtk\hgtk.py:268` `msgid "invalid arguments"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:344`+`#: tortoisehg\hgtk\hgtk.py:274`+`msgid "unrecognized profiling format '%s' - Ignored\n"`+`msgstr ""`++`#: tortoisehg\hgtk\hgtk.py:289`+`msgid ""`+`"lsprof not available - install from "`+`"http://codespeak.net/svn/user/arigo/hack/misc/lsprof/"`+`msgstr ""`++`#: tortoisehg\hgtk\hgtk.py:395` `msgid "Rename error"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:345`+`#: tortoisehg\hgtk\hgtk.py:396` `msgid "rename takes one or two path arguments"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:455`+`#: tortoisehg\hgtk\hgtk.py:503`+`msgid "mpatch error"`+`msgstr ""`++`#: tortoisehg\hgtk\hgtk.py:506`+`msgid "mpatch expects .rej file argument\n"`+`msgstr ""`++`#: tortoisehg\hgtk\hgtk.py:508 tortoisehg\hgtk\hgtk.py:515`+`msgid "%s does not exist\n"`+`msgstr ""`++`#: tortoisehg\hgtk\hgtk.py:534` `msgid "global options:"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:457`+`#: tortoisehg\hgtk\hgtk.py:536` `msgid "use \"hgtk help\" for the full list of commands"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:461`+`#: tortoisehg\hgtk\hgtk.py:540` `msgid ""` `"use \"hgtk help\" for the full list of commands or \"hgtk -v\" for details"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:464`+`#: tortoisehg\hgtk\hgtk.py:543` `msgid "use \"hgtk -v help%s\" to show aliases and global options"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:467`+`#: tortoisehg\hgtk\hgtk.py:546` `msgid "use \"hgtk -v help %s\" to show global options"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:479 tortoisehg\hgtk\hgtk.py:581`+`#: tortoisehg\hgtk\hgtk.py:558 tortoisehg\hgtk\hgtk.py:665` `msgid ""` `"list of commands:\n"` `"\n"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:487`+`#: tortoisehg\hgtk\hgtk.py:566` `msgid ""` `"\n"` `"aliases: %s\n"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:492 tortoisehg\hgtk\hgtk.py:518`-`#: tortoisehg\hgtk\hgtk.py:550`+`#: tortoisehg\hgtk\hgtk.py:571 tortoisehg\hgtk\hgtk.py:634` `msgid "(No help text available)"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:500`+`#: tortoisehg\hgtk\hgtk.py:579` `msgid "options:\n"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:523`+`#: tortoisehg\hgtk\hgtk.py:603`+`msgid "(no help text available)"`+`msgstr ""`++`#: tortoisehg\hgtk\hgtk.py:608` `msgid "no commands defined\n"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:574`+`#: tortoisehg\hgtk\hgtk.py:658` `msgid "Hgtk - TortoiseHg's GUI tools for Mercurial SCM (Hg)\n"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:579`+`#: tortoisehg\hgtk\hgtk.py:663` `msgid ""` `"basic commands:\n"` `"\n"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:595`+`#: tortoisehg\hgtk\hgtk.py:679` `msgid " (default: %s)"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:608`+`#: tortoisehg\hgtk\hgtk.py:692` `msgid "TortoiseHg Dialogs (version %s), Mercurial (version %s)\n"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:642`+`#: tortoisehg\hgtk\hgtk.py:726` `msgid "repository root directory or symbolic path name"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:643`+`#: tortoisehg\hgtk\hgtk.py:727` `msgid "enable additional output"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:644`+`#: tortoisehg\hgtk\hgtk.py:728` `msgid "suppress output"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:645`+`#: tortoisehg\hgtk\hgtk.py:729` `msgid "display help and exit"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:646`+`#: tortoisehg\hgtk\hgtk.py:730` `msgid "start debugger"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:647`+`#: tortoisehg\hgtk\hgtk.py:731`+`msgid "print command execution profile"`+`msgstr ""`++`#: tortoisehg\hgtk\hgtk.py:732` `msgid "do not fork GUI process"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:648`+`#: tortoisehg\hgtk\hgtk.py:733` `msgid "always fork GUI process"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:649`+`#: tortoisehg\hgtk\hgtk.py:734` `msgid "read file list from file"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:653`+`#: tortoisehg\hgtk\hgtk.py:738` `msgid "hgtk about"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:654`+`#: tortoisehg\hgtk\hgtk.py:739` `msgid "hgtk add [FILE]..."` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:655`+`#: tortoisehg\hgtk\hgtk.py:740` `msgid "hgtk clone SOURCE [DEST]"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:657`+`#: tortoisehg\hgtk\hgtk.py:742` `msgid "record user as committer"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:658`+`#: tortoisehg\hgtk\hgtk.py:743` `msgid "record datecode as commit date"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:659`+`#: tortoisehg\hgtk\hgtk.py:744` `msgid "hgtk commit [OPTIONS] [FILE]..."` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:660`+`#: tortoisehg\hgtk\hgtk.py:745` `msgid "hgtk datamine"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:661`+`#: tortoisehg\hgtk\hgtk.py:746` `msgid "hgtk hgignore [FILE]"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:662`+`#: tortoisehg\hgtk\hgtk.py:747` `msgid "hgtk init [DEST]"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:664`+`#: tortoisehg\hgtk\hgtk.py:749` `msgid "limit number of changes displayed"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:665`+`#: tortoisehg\hgtk\hgtk.py:750` `msgid "hgtk log [OPTIONS] [FILE]"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:667`+`#: tortoisehg\hgtk\hgtk.py:752` `msgid "revision to merge with"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:668`+`#: tortoisehg\hgtk\hgtk.py:753` `msgid "hgtk merge"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:669`+`#: tortoisehg\hgtk\hgtk.py:754` `msgid "hgtk recovery"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:670`+`#: tortoisehg\hgtk\hgtk.py:755` `msgid "hgtk shelve"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:671`+`#: tortoisehg\hgtk\hgtk.py:756` `msgid "hgtk synch"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:673`+`#: tortoisehg\hgtk\hgtk.py:758` `msgid "revisions to compare"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:674`+`#: tortoisehg\hgtk\hgtk.py:759` `msgid "hgtk status [FILE]..."` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:676 tortoisehg\hgtk\hgtk.py:679`+`#: tortoisehg\hgtk\hgtk.py:761 tortoisehg\hgtk\hgtk.py:764` `msgid "field to give initial focus"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:677`+`#: tortoisehg\hgtk\hgtk.py:762` `msgid "hgtk userconfig"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:680`+`#: tortoisehg\hgtk\hgtk.py:765` `msgid "hgtk repoconfig"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:681`+`#: tortoisehg\hgtk\hgtk.py:766` `msgid "hgtk guess"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:682`+`#: tortoisehg\hgtk\hgtk.py:767` `msgid "hgtk remove [FILE]..."` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:683`+`#: tortoisehg\hgtk\hgtk.py:768` `msgid "hgtk rename SOURCE [DEST]"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:684`+`#: tortoisehg\hgtk\hgtk.py:769` `msgid "hgtk revert [FILE]..."` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:685`+`#: tortoisehg\hgtk\hgtk.py:770` `msgid "hgtk forget [FILE]..."` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:688`+`#: tortoisehg\hgtk\hgtk.py:773` `msgid "name of the webdir config file"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:689`+`#: tortoisehg\hgtk\hgtk.py:774` `msgid "hgtk serve [OPTION]..."` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:691`+`#: tortoisehg\hgtk\hgtk.py:776` `msgid "wait until the second ticks over"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:692`+`#: tortoisehg\hgtk\hgtk.py:777` `msgid "notify the shell for paths given"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:693`+`#: tortoisehg\hgtk\hgtk.py:778` `msgid "remove the status cache"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:694`+`#: tortoisehg\hgtk\hgtk.py:779` `msgid "show the contents of the status cache (no update)"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:696`+`#: tortoisehg\hgtk\hgtk.py:781` `msgid "udpate all repos in current dir"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:697`+`#: tortoisehg\hgtk\hgtk.py:782` `msgid "hgtk thgstatus [OPTION]"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:699 tortoisehg\hgtk\hgtk.py:715`+`#: tortoisehg\hgtk\hgtk.py:784 tortoisehg\hgtk\hgtk.py:799` `msgid "revision to update"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:702`+`#: tortoisehg\hgtk\hgtk.py:787` `msgid "changeset to view in diff tool"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:703`+`#: tortoisehg\hgtk\hgtk.py:788` `msgid "revisions to view in diff tool"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:704`+`#: tortoisehg\hgtk\hgtk.py:789` `msgid "bundle file to preview"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:705`-`msgid "directly use raw extdiff command"`-`msgstr ""`--`#: tortoisehg\hgtk\hgtk.py:706`+`#: tortoisehg\hgtk\hgtk.py:790` `msgid "launch visual diff tool"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:708`+`#: tortoisehg\hgtk\hgtk.py:792` `msgid "print license"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:709`+`#: tortoisehg\hgtk\hgtk.py:793` `msgid "hgtk version [OPTION]"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:711`+`#: tortoisehg\hgtk\hgtk.py:795` `msgid "show the command options"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:712`+`#: tortoisehg\hgtk\hgtk.py:796` `msgid "[-o] CMD"` `msgstr ""` -`#: tortoisehg\hgtk\hgtk.py:713`+`#: tortoisehg\hgtk\hgtk.py:797` `msgid "hgtk help [COMMAND]"` `msgstr ""` +`#: tortoisehg\hgtk\hgtk.py:805`+`msgid "import to the repository"`+`msgstr ""`++`#: tortoisehg\hgtk\hgtk.py:806`+`msgid "import to the patch queue (MQ)"`+`msgstr ""`++`#: tortoisehg\hgtk\hgtk.py:807`+`msgid "hgtk import [OPTION] [SOURCE]..."`+`msgstr ""`++`#: tortoisehg\hgtk\hgtk.py:812`+`msgid "hgtk shellconfig"`+`msgstr ""`+ `#: tortoisehg\hgtk\histdetails.py:35` `msgid "Log Details"` `msgstr ""`@@ -1870,799 +2155,1139 @@ `msgid "Move Down"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:75`+`#: tortoisehg\hgtk\history.py:51 tortoisehg\hgtk\history.py:408`+`msgid "All"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:56 tortoisehg\hgtk\history.py:410`+`msgid "Tagged"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:60 tortoisehg\hgtk\history.py:412`+`msgid "Ancestry"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:68 tortoisehg\hgtk\history.py:416`+`#: tortoisehg\hgtk\history.py:1094`+`msgid "Heads"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:72 tortoisehg\hgtk\history.py:418`+`msgid "Merges"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:76 tortoisehg\hgtk\history.py:440`+`msgid "Hide Merges"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:81`+`msgid "Branch Filter"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:87`+`msgid "Branches..."`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:94`+`msgid "Custom Filter"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:100`+`msgid "Rev Range"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:100 tortoisehg\hgtk\history.py:426`+`msgid "File Patterns"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:101 tortoisehg\hgtk\history.py:429`+`msgid "Keywords"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:101 tortoisehg\hgtk\history.py:432`+`msgid "Date"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:169` `msgid ""` `"New changesets from the preview bundle are still pending.\n"` `"\n"` `"Accept or reject the new changesets?"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:78`+`#: tortoisehg\hgtk\history.py:172` `msgid "Accept new Changesets"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:81`+`#: tortoisehg\hgtk\history.py:175` `msgid "&Accept"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:81`+`#: tortoisehg\hgtk\history.py:175` `msgid "&Reject"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:91`-`msgid "%s - changelog"`-`msgstr ""`--`#: tortoisehg\hgtk\history.py:93`+`#: tortoisehg\hgtk\history.py:187` `msgid " (Bundle Preview)"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:109 tortoisehg\hgtk\status.py:177`+`#: tortoisehg\hgtk\history.py:203 tortoisehg\hgtk\status.py:173` `msgid "Re_fresh"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:111`+`#: tortoisehg\hgtk\history.py:205 tortoisehg\hgtk\history.py:1393` `msgid "Reload revision history"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:116`-`msgid "Launch synchronize tool"`-`msgstr ""`--`#: tortoisehg\hgtk\history.py:121 tortoisehg\hgtk\history.py:170`-`msgid "Patch Queue"`-`msgstr ""`--`#: tortoisehg\hgtk\history.py:123`-`msgid "Show/Hide Patch Queue"`-`msgstr ""`--`#: tortoisehg\hgtk\history.py:166`+`#: tortoisehg\hgtk\history.py:207`+`msgid "Reset _Marks"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:209`+`msgid "Reset revision marks"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:226`+`msgid "Launch commit tool"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:229`+`msgid "Launch data mining tool"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:232`+`msgid "Launch recovery tool"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:235`+`msgid "Launch web server"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:238`+`msgid "Launch shelve tool"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:283`+`msgid "Branches"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:296 tortoisehg\hgtk\history.py:623`+`#: tortoisehg\hgtk\logview\treeview.py:533`+`msgid "Tags"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:304` `msgid "Sync Bar"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:176`+`#: tortoisehg\hgtk\history.py:316`+`msgid "_Perforce"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:317`+`msgid "Identify"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:319`+`msgid "Pending"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:327 tortoisehg\hgtk\history.py:1317` `msgid "Load more Revisions"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:178`+`#: tortoisehg\hgtk\history.py:329 tortoisehg\hgtk\history.py:1320` `msgid "Load all Revisions"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:181`-`msgid "Toolbar"`-`msgstr ""`--`#: tortoisehg\hgtk\history.py:184`+`#: tortoisehg\hgtk\history.py:335` `msgid "Filter Bar"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:190`+`#: tortoisehg\hgtk\history.py:341` `msgid "Reset Marks"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:193`+`#: tortoisehg\hgtk\history.py:344` `msgid "Choose Details..."` `msgstr ""` -`#: tortoisehg\hgtk\history.py:195`+`#: tortoisehg\hgtk\history.py:347` `msgid "Compact Graph"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:197`+`#: tortoisehg\hgtk\history.py:350` `msgid "Color by Branch"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:200`-`msgid "Ignore Max Diff Size"`-`msgstr ""`--`#: tortoisehg\hgtk\history.py:204`+`#: tortoisehg\hgtk\history.py:360` `msgid "_Navigate"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:205`+`#: tortoisehg\hgtk\history.py:361` `msgid "Tip"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:206`+`#: tortoisehg\hgtk\history.py:363` `msgid "Working Parent"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:208`+`#: tortoisehg\hgtk\history.py:365`+`msgid "Previously Selected"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:368` `msgid "Revision..."` `msgstr ""` -`#: tortoisehg\hgtk\history.py:211`+`#: tortoisehg\hgtk\history.py:372` `msgid "_Synchronize"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:212 tortoisehg\hgtk\synch.py:63`+`#: tortoisehg\hgtk\history.py:373 tortoisehg\hgtk\history.py:1698`+`#: tortoisehg\hgtk\synch.py:63` `msgid "Incoming"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:214`+`#: tortoisehg\hgtk\history.py:375 tortoisehg\hgtk\history.py:1828` `msgid "Pull"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:216 tortoisehg\hgtk\synch.py:74`+`#: tortoisehg\hgtk\history.py:377 tortoisehg\hgtk\history.py:1868`+`#: tortoisehg\hgtk\synch.py:74` `msgid "Outgoing"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:218 tortoisehg\hgtk\synch.py:79`+`#: tortoisehg\hgtk\history.py:379 tortoisehg\hgtk\history.py:1935`+`#: tortoisehg\hgtk\synch.py:79` `msgid "Push"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:220`+`#: tortoisehg\hgtk\history.py:381` `msgid "Email..."` `msgstr ""` -`#: tortoisehg\hgtk\history.py:223`+`#: tortoisehg\hgtk\history.py:386`+`msgid "Accept Bundle"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:389`+`msgid "Reject Bundle"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:393`+`msgid "Import..."`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:395` `msgid "Add Bundle..."` `msgstr ""` -`#: tortoisehg\hgtk\history.py:226`-`msgid "Accept Bundle"`-`msgstr ""`--`#: tortoisehg\hgtk\history.py:229`-`msgid "Reject Bundle"`-`msgstr ""`--`#: tortoisehg\hgtk\history.py:235`+`#: tortoisehg\hgtk\history.py:399`+`msgid "Configure Paths..."`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:404` `msgid "Force push"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:325 tortoisehg\hgtk\logview\treeview.py:381`+`#: tortoisehg\hgtk\history.py:407`+`msgid "_Filter"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:420 tortoisehg\hgtk\logview\treeview.py:452`+`msgid "Branch"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:422`+`msgid "Custom"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:423`+`msgid "Revision Range"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:515 tortoisehg\hgtk\p4pending.py:83`+`#: tortoisehg\hgtk\p4pending.py:105 tortoisehg\hgtk\p4pending.py:110`+`msgid "Submitted"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:519`+`msgid "Unable to parse p4pending output"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:521`+`msgid "%d pending changelists found"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:523`+`msgid "No pending Perforce changelists"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:525`+`msgid "Aborted p4pending"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:527`+`msgid "Unable to determine pending changesets"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:535`+`msgid "Finding pending Perforce changelists..."`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:536`+`msgid "Pending Perforce changelists"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:548`+`msgid "Perforce changelist %s"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:553`+`msgid "Unable to find rev %s"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:555`+`msgid "Aborted p4identify"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:557`+`msgid "Unable to identify Perforce tip"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:560`+`msgid "Finding tip Perforce changelist..."`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:561`+`msgid "Identifying Perforce tip"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:606 tortoisehg\hgtk\logview\treeview.py:400` `msgid "Graph"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:332`+`#: tortoisehg\hgtk\history.py:613` `msgid "Revision Number"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:333`+`#: tortoisehg\hgtk\history.py:614` `msgid "Changeset ID"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:334`+`#: tortoisehg\hgtk\history.py:615`+`msgid "Revision Number/ID"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:616` `msgid "Branch Name"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:335 tortoisehg\hgtk\logview\treeview.py:433`-`#: tortoisehg\hgtk\thgmq.py:187`+`#: tortoisehg\hgtk\history.py:617 tortoisehg\hgtk\logview\treeview.py:464`+`msgid "Changes"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:618 tortoisehg\hgtk\logview\treeview.py:475`+`#: tortoisehg\hgtk\thgmq.py:203 tortoisehg\hgtk\thgmq.py:833` `msgid "Summary"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:337 tortoisehg\hgtk\logview\treeview.py:455`+`#: tortoisehg\hgtk\history.py:620 tortoisehg\hgtk\logview\treeview.py:497` `msgid "Local Date"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:338`+`#: tortoisehg\hgtk\history.py:621` `msgid "UTC Date"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:339 tortoisehg\hgtk\logview\treeview.py:479`+`#: tortoisehg\hgtk\history.py:622 tortoisehg\hgtk\logview\treeview.py:521` `msgid "Age"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:340 tortoisehg\hgtk\logview\treeview.py:491`-`msgid "Tags"`-`msgstr ""`--`#: tortoisehg\hgtk\history.py:389`+`#: tortoisehg\hgtk\history.py:692` `msgid "Invalid revision range"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:401`+`#: tortoisehg\hgtk\history.py:699` `msgid "Invalid date specification"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:641`+`#: tortoisehg\hgtk\history.py:754`+`msgid "'%s' filter:"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:1037` `msgid "Filter"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:646`+`#: tortoisehg\hgtk\history.py:1042` `msgid "%s branch"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:647`+`#: tortoisehg\hgtk\history.py:1043` `msgid "Branch '%s'"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:653`+`#: tortoisehg\hgtk\history.py:1049` `msgid "file history: "` `msgstr ""` -`#: tortoisehg\hgtk\history.py:657`-`msgid "custom filter"`-`msgstr ""`--`#: tortoisehg\hgtk\history.py:665`+`#: tortoisehg\hgtk\history.py:1062` `msgid "merges"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:668`+`#: tortoisehg\hgtk\history.py:1065` `msgid "only Merges"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:670`+`#: tortoisehg\hgtk\history.py:1067` `msgid "revision ancestry"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:675`+`#: tortoisehg\hgtk\history.py:1072` `msgid "Ancestry of %s"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:677`+`#: tortoisehg\hgtk\history.py:1074` `msgid "tagged revisions"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:685`+`#: tortoisehg\hgtk\history.py:1082` `msgid "Tagged Revisions"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:687`+`#: tortoisehg\hgtk\history.py:1084` `msgid "working parents"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:693`+`#: tortoisehg\hgtk\history.py:1090` `msgid "heads"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:697 tortoisehg\hgtk\history.py:1018`-`msgid "Heads"`-`msgstr ""`--`#: tortoisehg\hgtk\history.py:699`+`#: tortoisehg\hgtk\history.py:1096` `msgid "no Merges"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:717`+`#: tortoisehg\hgtk\history.py:1115`+`msgid "Current patch: %s, "`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:1117`+`msgid "%(count)d of %(total)d applied patches"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:1126` `msgid "Visualize Change"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:718`-`msgid "Di_splay Change"`-`msgstr ""`--`#: tortoisehg\hgtk\history.py:719`-`msgid "Diff to local"`-`msgstr ""`--`#: tortoisehg\hgtk\history.py:721`-`msgid "_Copy hash"`-`msgstr ""`--`#: tortoisehg\hgtk\history.py:725`-`msgid "Pull to here"`-`msgstr ""`--`#: tortoisehg\hgtk\history.py:732`-`msgid "Push to here"`-`msgstr ""`--`#: tortoisehg\hgtk\history.py:734`+`#: tortoisehg\hgtk\history.py:1129`+`msgid "Diff to Local"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:1131`+`msgid "_Copy Hash"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:1135`+`msgid "Pull to Here"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:1143`+`msgid "Push to Here"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:1145` `msgid "_Update..."` `msgstr ""` -`#: tortoisehg\hgtk\history.py:735 tortoisehg\hgtk\history.py:819`+`#: tortoisehg\hgtk\history.py:1146 tortoisehg\hgtk\history.py:1265` `msgid "_Merge with..."` `msgstr ""` -`#: tortoisehg\hgtk\history.py:738`+`#: tortoisehg\hgtk\history.py:1147`+`msgid "Backout..."`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:1148 tortoisehg\hgtk\status.py:1660`+`msgid "_Revert"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:1150`+`msgid "Export"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:1152`+`msgid "Tag"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:1171`+`msgid "Mercurial Queues"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:1176`+`msgid "Transp_lant to Local"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:1180`+`msgid "Bisect"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:1188` `msgid "_Export Patch..."` `msgstr ""` -`#: tortoisehg\hgtk\history.py:739`+`#: tortoisehg\hgtk\history.py:1189` `msgid "E_mail Patch..."` `msgstr ""` -`#: tortoisehg\hgtk\history.py:740`+`#: tortoisehg\hgtk\history.py:1190` `msgid "_Bundle rev:tip..."` `msgstr ""` -`#: tortoisehg\hgtk\history.py:742`+`#: tortoisehg\hgtk\history.py:1192`+`msgid "_Archive..."`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:1197` `msgid "Add/Remove _Tag..."` `msgstr ""` -`#: tortoisehg\hgtk\history.py:743`-`msgid "Backout Revision..."`-`msgstr ""`--`#: tortoisehg\hgtk\history.py:745 tortoisehg\hgtk\status.py:1510`-`msgid "_Revert"`-`msgstr ""`--`#: tortoisehg\hgtk\history.py:746`-`msgid "_Archive..."`-`msgstr ""`--`#: tortoisehg\hgtk\history.py:764`-`msgid "Transp_lant to local"`-`msgstr ""`--`#: tortoisehg\hgtk\history.py:769`-`msgid "qimport"`-`msgstr ""`--`#: tortoisehg\hgtk\history.py:770`+`#: tortoisehg\hgtk\history.py:1199`+`msgid "Add/Move/Remove B_ookmark..."`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:1200`+`msgid "Rename Bookmark..."`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:1203`+`msgid "Set Current Bookmark..."`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:1209`+`msgid "Import Revision to MQ"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:1211` `msgid "Strip Revision..."` `msgstr ""` -`#: tortoisehg\hgtk\history.py:802`+`#: tortoisehg\hgtk\history.py:1234`+`msgid "Reset"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:1235`+`msgid "Mark as Good"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:1236`+`msgid "Mark as Bad"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:1237`+`msgid "Skip Testing"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:1248` `msgid "_Diff with selected"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:803`+`#: tortoisehg\hgtk\history.py:1249` `msgid "Visual Diff with selected"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:812`+`#: tortoisehg\hgtk\history.py:1258` `msgid "Email from here to selected..."` `msgstr ""` -`#: tortoisehg\hgtk\history.py:814`+`#: tortoisehg\hgtk\history.py:1260` `msgid "Bundle from here to selected..."` `msgstr ""` -`#: tortoisehg\hgtk\history.py:816`+`#: tortoisehg\hgtk\history.py:1262` `msgid "Export Patches from here to selected..."` `msgstr ""` -`#: tortoisehg\hgtk\history.py:835`+`#: tortoisehg\hgtk\history.py:1280` `msgid "Transplant Revision range to local"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:840`+`#: tortoisehg\hgtk\history.py:1285` `msgid "Rebase on top of selected"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:845`-`msgid "qimport from here to selected"`-`msgstr ""`--`#: tortoisehg\hgtk\history.py:876`+`#: tortoisehg\hgtk\history.py:1290`+`msgid "Import from here to selected to MQ"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:1294`+`msgid "Select common ancestor revision"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:1348` `msgid "Load more"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:876`+`#: tortoisehg\hgtk\history.py:1348` `msgid "load more revisions"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:879`+`#: tortoisehg\hgtk\history.py:1351` `msgid "Load all"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:879`+`#: tortoisehg\hgtk\history.py:1351` `msgid "load all revisions"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:921`+`#: tortoisehg\hgtk\history.py:1396` `msgid "Download and view incoming changesets"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:923`+`#: tortoisehg\hgtk\history.py:1398` `msgid "Accept changes from Bundle preview"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:925`+`#: tortoisehg\hgtk\history.py:1401` `msgid "Reject changes from Bundle preview"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:927`+`#: tortoisehg\hgtk\history.py:1404` `msgid "Pull incoming changesets"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:930`+`#: tortoisehg\hgtk\history.py:1406`+`msgid "Import patches"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:1409` `msgid "Determine and mark outgoing changesets"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:932`+`#: tortoisehg\hgtk\history.py:1411` `msgid "Push outgoing changesets"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:934`+`#: tortoisehg\hgtk\history.py:1413` `msgid "Email outgoing changesets"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:937`+`#: tortoisehg\hgtk\history.py:1416` `msgid "Stop current transaction"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:960`+`#: tortoisehg\hgtk\history.py:1448` `msgid "After Pull:"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:961 tortoisehg\hgtk\synch.py:155`+`#: tortoisehg\hgtk\history.py:1449 tortoisehg\hgtk\synch.py:154` `msgid "Nothing"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:961 tortoisehg\hgtk\synch.py:155`-`#: tortoisehg\hgtk\update.py:45`+`#: tortoisehg\hgtk\history.py:1449 tortoisehg\hgtk\synch.py:154`+`#: tortoisehg\hgtk\update.py:128` `msgid "Update"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:964 tortoisehg\hgtk\synch.py:158`+`#: tortoisehg\hgtk\history.py:1452 tortoisehg\hgtk\synch.py:157` `msgid "Fetch"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:966 tortoisehg\hgtk\synch.py:160`+`#: tortoisehg\hgtk\history.py:1454 tortoisehg\hgtk\synch.py:159` `msgid "Rebase"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:984`+`#: tortoisehg\hgtk\history.py:1473` `msgid "Configure aliases and after pull behavior"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:1000`-`msgid "All"`-`msgstr ""`--`#: tortoisehg\hgtk\history.py:1005`-`msgid "Tagged"`-`msgstr ""`--`#: tortoisehg\hgtk\history.py:1009`-`msgid "Ancestry"`-`msgstr ""`--`#: tortoisehg\hgtk\history.py:1022`-`msgid "Merges"`-`msgstr ""`--`#: tortoisehg\hgtk\history.py:1026`-`msgid "Hide Merges"`-`msgstr ""`--`#: tortoisehg\hgtk\history.py:1033`-`msgid "Branch Filter"`-`msgstr ""`--`#: tortoisehg\hgtk\history.py:1040`-`msgid "Branches..."`-`msgstr ""`--`#: tortoisehg\hgtk\history.py:1050`-`msgid "Custom Filter"`-`msgstr ""`--`#: tortoisehg\hgtk\history.py:1056`-`msgid "File Patterns"`-`msgstr ""`--`#: tortoisehg\hgtk\history.py:1056`-`msgid "Rev Range"`-`msgstr ""`--`#: tortoisehg\hgtk\history.py:1057`-`msgid "Date"`-`msgstr ""`--`#: tortoisehg\hgtk\history.py:1057`-`msgid "Keywords"`-`msgstr ""`--`#: tortoisehg\hgtk\history.py:1189 tortoisehg\hgtk\history.py:1303`-`#: tortoisehg\hgtk\history.py:1325 tortoisehg\hgtk\history.py:1391`-`#: tortoisehg\hgtk\history.py:1776`+`#: tortoisehg\hgtk\history.py:1618`+`msgid "Applying bundle..."`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:1619`+`msgid "Applying bundle"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:1664 tortoisehg\hgtk\history.py:1803`+`#: tortoisehg\hgtk\history.py:1836 tortoisehg\hgtk\history.py:1889`+`#: tortoisehg\hgtk\history.py:2469` `msgid "No remote path specified"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:1190 tortoisehg\hgtk\history.py:1304`-`#: tortoisehg\hgtk\history.py:1326 tortoisehg\hgtk\history.py:1392`-`#: tortoisehg\hgtk\history.py:1777`+`#: tortoisehg\hgtk\history.py:1665 tortoisehg\hgtk\history.py:1804`+`#: tortoisehg\hgtk\history.py:1837 tortoisehg\hgtk\history.py:1890`+`#: tortoisehg\hgtk\history.py:2470` `msgid "Please enter or select a remote path"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:1227`+`#: tortoisehg\hgtk\history.py:1689`+`msgid "%d incoming changesets"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:1691`+`msgid "Aborted incoming"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:1693`+`msgid "No incoming changesets"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:1697`+`msgid "Checking incoming changesets..."`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:1716` `msgid "Accept incoming previewed changesets"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:1228`+`#: tortoisehg\hgtk\history.py:1717` `msgid "Accept"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:1233`+`#: tortoisehg\hgtk\history.py:1722` `msgid "Reject incoming previewed changesets"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:1234`+`#: tortoisehg\hgtk\history.py:1723` `msgid "Reject"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:1275`+`#: tortoisehg\hgtk\history.py:1765` `msgid "Bundle Preview"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:1280`+`#: tortoisehg\hgtk\history.py:1770`+`msgid "Failed to preview, a bundle file unrelated to this repository"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:1775`+`msgid "Failed to preview, not a Mercurial bundle file"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:1779` `msgid "Open Bundle"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:1355`+`#: tortoisehg\hgtk\history.py:1817`+`msgid "Finished pull with rebase"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:1820`+`msgid "Finished pull"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:1822`+`msgid "No changesets to pull"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:1824 tortoisehg\hgtk\history.py:2522`+`msgid "Aborted pull"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:1827`+`msgid "Pulling changesets..."`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:1860` `msgid "%d outgoing changesets"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:1374 tortoisehg\hgtk\synch.py:495`+`#: tortoisehg\hgtk\history.py:1862`+`msgid "Aborted outgoing"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:1864`+`msgid "No outgoing changesets"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:1867`+`msgid "Checking outgoing changesets..."`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:1876 tortoisehg\hgtk\synch.py:495` `msgid "No repository selected"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:1375 tortoisehg\hgtk\synch.py:496`+`#: tortoisehg\hgtk\history.py:1877 tortoisehg\hgtk\synch.py:496` `msgid "Select a peer repository to compare with"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:1402`+`#: tortoisehg\hgtk\history.py:1898` `msgid "Confirm Forced Push to Remote Repository"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:1403`+`#: tortoisehg\hgtk\history.py:1899` `msgid ""` `"Forced push to remote repository\n"` `"%s\n"` `"(creating new heads in remote if needed)?"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:1405 tortoisehg\hgtk\history.py:1415`+`#: tortoisehg\hgtk\history.py:1901 tortoisehg\hgtk\history.py:1911` `msgid "Forced &Push"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:1407`+`#: tortoisehg\hgtk\history.py:1903` `msgid "Confirm Push to remote Repository"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:1408`+`#: tortoisehg\hgtk\history.py:1904` `msgid ""` `"Push to remote repository\n"` `"%s\n"` `"?"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:1409`+`#: tortoisehg\hgtk\history.py:1905` `msgid "&Push"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:1412`+`#: tortoisehg\hgtk\history.py:1908` `msgid "Confirm Forced Push"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:1413`+`#: tortoisehg\hgtk\history.py:1909` `msgid ""` `"Forced push to repository\n"` `"%s\n"` `"(creating new heads if needed)?"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:1423`-`msgid "Invalid Remote Repository"`-`msgstr ""`--`#: tortoisehg\hgtk\history.py:1592`+`#: tortoisehg\hgtk\history.py:1929`+`msgid "Finished push"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:1931 tortoisehg\hgtk\history.py:2494`+`msgid "Aborted push"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:1934`+`msgid "Pushing changesets..."`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:2046`+`msgid "unknown dnd dest: %s"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:2163` `msgid "Confirm Revert All Files"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:1593`+`#: tortoisehg\hgtk\history.py:2164` `msgid ""` `"Revert all files to revision %d?\n"` `"This will overwrite your local changes"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:1644`+`#: tortoisehg\hgtk\history.py:2214` `msgid "Save patches to"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:1667 tortoisehg\hgtk\history.py:1836`+`#: tortoisehg\hgtk\history.py:2250` `msgid "Write bundle to"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:1703`+`#: tortoisehg\hgtk\history.py:2263`+`msgid "Bundling from %(base)s to %(rev)s..."`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:2265`+`msgid "Bundling from %(base)s to tip..."`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:2270`+`msgid "Finish bundling"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:2272`+`msgid "Aborted bundling"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:2274`+`msgid "Failed to bundle"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:2276`+`msgid "Bundling"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:2299`+`msgid "Finish importing"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:2301`+`msgid "Aborted importing"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:2303 tortoisehg\hgtk\thgimport.py:184`+`msgid "Failed to import"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:2305`+`msgid "Importing"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:2306`+`msgid "Importing to Patch Queue..."`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:2314` `msgid "Confirm Rebase Revision"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:1704`+`#: tortoisehg\hgtk\history.py:2315` `msgid "Rebase revision %d on top of %d?"` `msgstr ""` -`#: tortoisehg\hgtk\history.py:1815 tortoisehg\hgtk\status.py:1194`+`#: tortoisehg\hgtk\history.py:2492`+`msgid "Finished push to revision %s"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:2497`+`msgid "Pushing changesets to revision %s..."`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:2498`+`msgid "Push to %s"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:2520`+`msgid "Finished pull to revision %s"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:2525`+`msgid "Pulling changesets to revision %s..."`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:2526`+`msgid "Pull to %s"`+`msgstr ""`++`#: tortoisehg\hgtk\history.py:2539 tortoisehg\hgtk\status.py:1312` `msgid "Save patch to"` `msgstr ""` -`#: tortoisehg\hgtk\logview\treeview.py:256`+`#: tortoisehg\hgtk\logview\treeview.py:269` `msgid "%(count)d of %(total)d Revisions"` `msgstr ""` -`#: tortoisehg\hgtk\logview\treeview.py:363`+`#: tortoisehg\hgtk\logview\treeview.py:382` `msgid "Repository is empty"` `msgstr ""` -`#: tortoisehg\hgtk\logview\treeview.py:408`+`#: tortoisehg\hgtk\logview\treeview.py:428` `msgid "ID"` `msgstr ""` -`#: tortoisehg\hgtk\logview\treeview.py:420`-`msgid "Branch"`-`msgstr ""`--`#: tortoisehg\hgtk\logview\treeview.py:467`+`#: tortoisehg\hgtk\logview\treeview.py:440`+`msgid "Rev/ID"`+`msgstr ""`++`#: tortoisehg\hgtk\logview\treeview.py:509` `msgid "Universal Date"` `msgstr ""` -`#: tortoisehg\hgtk\merge.py:44`+`#: tortoisehg\hgtk\merge.py:36` `msgid "Merging in %s"` `msgstr ""` -`#: tortoisehg\hgtk\merge.py:50 tortoisehg\hgtk\merge.py:63`+`#: tortoisehg\hgtk\merge.py:47 tortoisehg\hgtk\merge.py:60` `msgid "Unable to merge"` `msgstr ""` -`#: tortoisehg\hgtk\merge.py:51`+`#: tortoisehg\hgtk\merge.py:48` `msgid "Must supply a target revision"` `msgstr ""` -`#: tortoisehg\hgtk\merge.py:64`+`#: tortoisehg\hgtk\merge.py:61` `msgid "Outstanding uncommitted changes"` `msgstr ""` -`#: tortoisehg\hgtk\merge.py:76`+`#: tortoisehg\hgtk\merge.py:73` `msgid "Not a head revision!"` `msgstr ""` -`#: tortoisehg\hgtk\merge.py:82`+`#: tortoisehg\hgtk\merge.py:79` `msgid "Merge target (other)"` `msgstr ""` -`#: tortoisehg\hgtk\merge.py:87`+`#: tortoisehg\hgtk\merge.py:84` `msgid "Current revision (local)"` `msgstr ""` -`#: tortoisehg\hgtk\merge.py:93`+`#: tortoisehg\hgtk\merge.py:89`+`msgid "Discard all changes from merge target (other) revision"`+`msgstr ""`++`#: tortoisehg\hgtk\merge.py:100`+`msgid "Merge tools:"`+`msgstr ""`++`#: tortoisehg\hgtk\merge.py:129` `msgid "Merge"` `msgstr ""` -`#: tortoisehg\hgtk\merge.py:95`+`#: tortoisehg\hgtk\merge.py:131` `msgid "Undo"` `msgstr ""` -`#: tortoisehg\hgtk\merge.py:104`-`msgid "Merge tools:"`+`#: tortoisehg\hgtk\merge.py:159`+`msgid "Merged successfully"`+`msgstr ""`++`#: tortoisehg\hgtk\merge.py:161`+`msgid "Canceled merging"`+`msgstr ""`++`#: tortoisehg\hgtk\merge.py:163`+`msgid "Failed to merge"` `msgstr ""` `#: tortoisehg\hgtk\merge.py:170`+`msgid "Undo successfully"`+`msgstr ""`++`#: tortoisehg\hgtk\merge.py:172`+`msgid "Canceled undo"`+`msgstr ""`++`#: tortoisehg\hgtk\merge.py:174`+`msgid "Failed to undo"`+`msgstr ""`++`#: tortoisehg\hgtk\merge.py:191` `msgid ""` `"To complete merging, you need to commit merged files in working directory.\n"` `"\n"` `"Do you want to exit?"` `msgstr ""` -`#: tortoisehg\hgtk\merge.py:226`-`msgid "Merged successfully"`-`msgstr ""`--`#: tortoisehg\hgtk\merge.py:228`-`msgid "Canceled merging"`-`msgstr ""`--`#: tortoisehg\hgtk\merge.py:230`-`msgid "Failed to merge"`-`msgstr ""`--`#: tortoisehg\hgtk\merge.py:266`+`#: tortoisehg\hgtk\merge.py:204`+`msgid "Cannot merge"`+`msgstr ""`++`#: tortoisehg\hgtk\merge.py:205`+`msgid "Uncommitted local changes"`+`msgstr ""`++`#: tortoisehg\hgtk\merge.py:240` `msgid "Confirm undo merge"` `msgstr ""` -`#: tortoisehg\hgtk\merge.py:267`+`#: tortoisehg\hgtk\merge.py:241` `msgid "Clean checkout of original revision?"` `msgstr ""` -`#: tortoisehg\hgtk\merge.py:277`-`msgid "Undo successfully"`-`msgstr ""`--`#: tortoisehg\hgtk\merge.py:279`-`msgid "Canceled undo"`-`msgstr ""`--`#: tortoisehg\hgtk\merge.py:281`-`msgid "Failed to undo"`-`msgstr ""`--`#: tortoisehg\hgtk\quickop.py:50`+`#: tortoisehg\hgtk\p4pending.py:30`+`msgid "Pending Perforce Changelists - %s"`+`msgstr ""`++`#: tortoisehg\hgtk\p4pending.py:43`+`msgid "Changelist:"`+`msgstr ""`++`#: tortoisehg\hgtk\p4pending.py:66`+`msgid "Submit"`+`msgstr ""`++`#: tortoisehg\hgtk\p4pending.py:67 tortoisehg\hgtk\quickop.py:21`+`msgid "Revert"`+`msgstr ""`++`#: tortoisehg\hgtk\p4pending.py:98`+`msgid "Finished"`+`msgstr ""`++`#: tortoisehg\hgtk\p4pending.py:100 tortoisehg\hgtk\quickop.py:203`+`#: tortoisehg\hgtk\thgmq.py:863`+`msgid "Canceled"`+`msgstr ""`++`#: tortoisehg\hgtk\p4pending.py:102 tortoisehg\hgtk\quickop.py:205`+`#: tortoisehg\hgtk\thgmq.py:865`+`msgid "Failed"`+`msgstr ""`++`#: tortoisehg\hgtk\quickop.py:19` `msgid "Select files to add"` `msgstr ""` -`#: tortoisehg\hgtk\quickop.py:51`+`#: tortoisehg\hgtk\quickop.py:20` `msgid "Forget"` `msgstr ""` -`#: tortoisehg\hgtk\quickop.py:51`+`#: tortoisehg\hgtk\quickop.py:20` `msgid "Select files to forget"` `msgstr ""` -`#: tortoisehg\hgtk\quickop.py:52`-`msgid "Revert"`-`msgstr ""`--`#: tortoisehg\hgtk\quickop.py:52`+`#: tortoisehg\hgtk\quickop.py:21` `msgid "Select files to revert"` `msgstr ""` -`#: tortoisehg\hgtk\quickop.py:53`+`#: tortoisehg\hgtk\quickop.py:22` `msgid "Select files to remove"` `msgstr ""` -`#: tortoisehg\hgtk\quickop.py:53 tortoisehg\hgtk\tagadd.py:42`-`msgid "Remove"`-`msgstr ""`--`#: tortoisehg\hgtk\quickop.py:100 tortoisehg\hgtk\status.py:138`-`msgid "status"`-`msgstr ""`--`#: tortoisehg\hgtk\quickop.py:103 tortoisehg\hgtk\status.py:271`-`msgid "path"`-`msgstr ""`--`#: tortoisehg\hgtk\quickop.py:116`+`#: tortoisehg\hgtk\quickop.py:121` `msgid "Toggle all selections"` `msgstr ""` -`#: tortoisehg\hgtk\quickop.py:141`+`#: tortoisehg\hgtk\quickop.py:127`+`msgid "Do not save backup files (.orig)"`+`msgstr ""`++`#: tortoisehg\hgtk\quickop.py:153` `msgid "modified"` `msgstr ""` -`#: tortoisehg\hgtk\quickop.py:144`+`#: tortoisehg\hgtk\quickop.py:156` `msgid "added"` `msgstr ""` -`#: tortoisehg\hgtk\quickop.py:147`+`#: tortoisehg\hgtk\quickop.py:159` `msgid "removed"` `msgstr ""` -`#: tortoisehg\hgtk\quickop.py:150`+`#: tortoisehg\hgtk\quickop.py:162` `msgid "missing"` `msgstr ""` -`#: tortoisehg\hgtk\quickop.py:153 tortoisehg\hgtk\quickop.py:236`-`#: tortoisehg\hgtk\serve.py:126 tortoisehg\util\shlib.py:26`-`#: tortoisehg\util\version.py:15`+`#: tortoisehg\hgtk\quickop.py:165 tortoisehg\hgtk\quickop.py:215`+`#: tortoisehg\hgtk\serve.py:127 tortoisehg\util\version.py:47`+`#: tortoisehg\util\version.py:65` `msgid "unknown"` `msgstr ""` -`#: tortoisehg\hgtk\quickop.py:157 tortoisehg\hgtk\quickop.py:236`+`#: tortoisehg\hgtk\quickop.py:169 tortoisehg\hgtk\quickop.py:215` `msgid "ignored"` `msgstr ""` -`#: tortoisehg\hgtk\quickop.py:161`+`#: tortoisehg\hgtk\quickop.py:173` `msgid "clean"` `msgstr ""` -`#: tortoisehg\hgtk\quickop.py:164`+`#: tortoisehg\hgtk\quickop.py:176` `msgid "No appropriate files"` `msgstr ""` -`#: tortoisehg\hgtk\quickop.py:165`+`#: tortoisehg\hgtk\quickop.py:177` `msgid "No files found for this operation"` `msgstr ""` -`#: tortoisehg\hgtk\quickop.py:242`+`#: tortoisehg\hgtk\quickop.py:201`+`msgid "Successfully"`+`msgstr ""`++`#: tortoisehg\hgtk\quickop.py:221` `msgid "No files selected"` `msgstr ""` -`#: tortoisehg\hgtk\quickop.py:243`+`#: tortoisehg\hgtk\quickop.py:222` `msgid "No operation to perform"` `msgstr ""` -`#: tortoisehg\hgtk\quickop.py:264`-`msgid "Successfully"`-`msgstr ""`--`#: tortoisehg\hgtk\quickop.py:266 tortoisehg\hgtk\thgmq.py:644`-`msgid "Canceled"`-`msgstr ""`--`#: tortoisehg\hgtk\quickop.py:268 tortoisehg\hgtk\thgmq.py:646`-`msgid "Failed"`-`msgstr ""`- `#: tortoisehg\hgtk\recovery.py:40` `msgid "%s - recovery"` `msgstr ""`@@ -2703,517 +3328,605 @@ `msgid "Validate repository consistency"` `msgstr ""` -`#: tortoisehg\hgtk\recovery.py:102 tortoisehg\hgtk\synch.py:394`+`#: tortoisehg\hgtk\recovery.py:103 tortoisehg\hgtk\synch.py:394` `msgid "Cannot close now"` `msgstr ""` -`#: tortoisehg\hgtk\recovery.py:103 tortoisehg\hgtk\synch.py:395`+`#: tortoisehg\hgtk\recovery.py:104 tortoisehg\hgtk\synch.py:395` `msgid "command is running"` `msgstr ""` -`#: tortoisehg\hgtk\recovery.py:122`+`#: tortoisehg\hgtk\recovery.py:123` `msgid "Confirm clean repository"` `msgstr ""` -`#: tortoisehg\hgtk\recovery.py:123`+`#: tortoisehg\hgtk\recovery.py:124` `msgid "Clean repository '%s' ?"` `msgstr ""` -`#: tortoisehg\hgtk\recovery.py:135`+`#: tortoisehg\hgtk\recovery.py:136` `msgid "Confirm rollback repository"` `msgstr ""` -`#: tortoisehg\hgtk\recovery.py:136`+`#: tortoisehg\hgtk\recovery.py:137` `msgid "Rollback repository '%s' ?"` `msgstr ""` -`#: tortoisehg\hgtk\recovery.py:157 tortoisehg\hgtk\synch.py:537`-`msgid "Cannot run now"`-`msgstr ""`--`#: tortoisehg\hgtk\recovery.py:158 tortoisehg\hgtk\synch.py:538`+`#: tortoisehg\hgtk\recovery.py:162 tortoisehg\hgtk\synch.py:541` `msgid "Please try again after the previous command is completed"` `msgstr ""` -`#: tortoisehg\hgtk\recovery.py:220 tortoisehg\hgtk\synch.py:632`+`#: tortoisehg\hgtk\recovery.py:224 tortoisehg\hgtk\synch.py:631` `msgid "[command interrupted]"` `msgstr ""` -`#: tortoisehg\hgtk\rename.py:31`+`#: tortoisehg\hgtk\rename.py:38` `msgid "Rename "` `msgstr ""` -`#: tortoisehg\hgtk\rename.py:64 tortoisehg\hgtk\rename.py:71`+`#: tortoisehg\hgtk\rename.py:76 tortoisehg\hgtk\rename.py:83` `msgid "rename error"` `msgstr ""` -`#: tortoisehg\hgtk\serve.py:58`+`#: tortoisehg\hgtk\serve.py:61` `msgid "Start"` `msgstr ""` -`#: tortoisehg\hgtk\serve.py:60`+`#: tortoisehg\hgtk\serve.py:63` `msgid "Start server"` `msgstr ""` -`#: tortoisehg\hgtk\serve.py:64`+`#: tortoisehg\hgtk\serve.py:67` `msgid "Stop server"` `msgstr ""` -`#: tortoisehg\hgtk\serve.py:66`+`#: tortoisehg\hgtk\serve.py:69` `msgid "Browse"` `msgstr ""` -`#: tortoisehg\hgtk\serve.py:68`+`#: tortoisehg\hgtk\serve.py:71` `msgid "Launch browser to view repository"` `msgstr ""` -`#: tortoisehg\hgtk\serve.py:72`+`#: tortoisehg\hgtk\serve.py:75` `msgid "Configure web settings"` `msgstr ""` -`#: tortoisehg\hgtk\serve.py:91`+`#: tortoisehg\hgtk\serve.py:96` `msgid "HTTP Port:"` `msgstr ""` -`#: tortoisehg\hgtk\serve.py:127`+`#: tortoisehg\hgtk\serve.py:128` `msgid "%s - serve"` `msgstr ""` -`#: tortoisehg\hgtk\serve.py:130`+`#: tortoisehg\hgtk\serve.py:131` `msgid "%s serve - %s"` `msgstr ""` -`#: tortoisehg\hgtk\serve.py:133`+`#: tortoisehg\hgtk\serve.py:134` `msgid " - serve"` `msgstr ""` -`#: tortoisehg\hgtk\serve.py:164`+`#: tortoisehg\hgtk\serve.py:165` `msgid "Confirm Really Exit?"` `msgstr ""` -`#: tortoisehg\hgtk\serve.py:165`+`#: tortoisehg\hgtk\serve.py:166` `msgid ""` `"Server process is still running\n"` `"Exiting will stop the server."` `msgstr ""` -`#: tortoisehg\hgtk\serve.py:228`+`#: tortoisehg\hgtk\serve.py:229` `msgid "Abort: %s\n"` `msgstr ""` -`#: tortoisehg\hgtk\serve.py:236`+`#: tortoisehg\hgtk\serve.py:237` `msgid "Invalid port 2048..65535"` `msgstr ""` -`#: tortoisehg\hgtk\serve.py:237`+`#: tortoisehg\hgtk\serve.py:238` `msgid "Defaulting to "` `msgstr ""` -`#: tortoisehg\hgtk\serve.py:316`+`#: tortoisehg\hgtk\serve.py:317` `msgid "cannot start server: "` `msgstr ""` -`#: tortoisehg\hgtk\serve.py:327`+`#: tortoisehg\hgtk\serve.py:328` `msgid "listening at http://%s%s/%s (%s:%d)\n"` `msgstr ""` -`#: tortoisehg\hgtk\serve.py:352`+`#: tortoisehg\hgtk\serve.py:353` `msgid "name of access log file to write to"` `msgstr ""` -`#: tortoisehg\hgtk\serve.py:353`+`#: tortoisehg\hgtk\serve.py:354` `msgid "run server in background"` `msgstr ""` -`#: tortoisehg\hgtk\serve.py:354`+`#: tortoisehg\hgtk\serve.py:355` `msgid "used internally by daemon mode"` `msgstr ""` -`#: tortoisehg\hgtk\serve.py:355`+`#: tortoisehg\hgtk\serve.py:356` `msgid "name of error log file to write to"` `msgstr ""` -`#: tortoisehg\hgtk\serve.py:356`+`#: tortoisehg\hgtk\serve.py:357` `msgid "port to use (default: 8000)"` `msgstr ""` -`#: tortoisehg\hgtk\serve.py:357`+`#: tortoisehg\hgtk\serve.py:358` `msgid "address to use"` `msgstr ""` -`#: tortoisehg\hgtk\serve.py:358`+`#: tortoisehg\hgtk\serve.py:359` `msgid "prefix path to serve from (default: server root)"` `msgstr ""` -`#: tortoisehg\hgtk\serve.py:360`+`#: tortoisehg\hgtk\serve.py:361` `msgid "name to show in web pages (default: working dir)"` `msgstr ""` -`#: tortoisehg\hgtk\serve.py:361`+`#: tortoisehg\hgtk\serve.py:362` `msgid "name of the webdir config file (serve more than one repo)"` `msgstr ""` -`#: tortoisehg\hgtk\serve.py:363`+`#: tortoisehg\hgtk\serve.py:364` `msgid "name of file to write process ID to"` `msgstr ""` -`#: tortoisehg\hgtk\serve.py:364`+`#: tortoisehg\hgtk\serve.py:365` `msgid "for remote clients"` `msgstr ""` -`#: tortoisehg\hgtk\serve.py:365`+`#: tortoisehg\hgtk\serve.py:366` `msgid "web templates to use"` `msgstr ""` -`#: tortoisehg\hgtk\serve.py:366`+`#: tortoisehg\hgtk\serve.py:367` `msgid "template style to use"` `msgstr ""` -`#: tortoisehg\hgtk\serve.py:367`+`#: tortoisehg\hgtk\serve.py:368` `msgid "use IPv6 in addition to IPv4"` `msgstr ""` -`#: tortoisehg\hgtk\serve.py:368`+`#: tortoisehg\hgtk\serve.py:369` `msgid "SSL certificate file"` `msgstr ""` -`#: tortoisehg\hgtk\serve.py:369`+`#: tortoisehg\hgtk\serve.py:370` `msgid "hg serve [OPTION]..."` `msgstr ""` -`#: tortoisehg\hgtk\status.py:138`+`#: tortoisehg\hgtk\shellconf.py:25`+`msgid "TortoiseHg Shell Configuration"`+`msgstr ""`++`#: tortoisehg\hgtk\shellconf.py:27`+`msgid "OK"`+`msgstr ""`++`#: tortoisehg\hgtk\shellconf.py:28 tortoisehg\hgtk\thgshelve.py:157`+`msgid "Cancel"`+`msgstr ""`++`#: tortoisehg\hgtk\shellconf.py:29`+`msgid "Apply"`+`msgstr ""`++`#: tortoisehg\hgtk\shellconf.py:38`+`msgid "Overlays"`+`msgstr ""`++`#: tortoisehg\hgtk\shellconf.py:45`+`msgid "Enable overlays"`+`msgstr ""`++`#: tortoisehg\hgtk\shellconf.py:47`+`msgid "Local disks only"`+`msgstr ""`++`#: tortoisehg\hgtk\shellconf.py:51`+`msgid "Context Menu"`+`msgstr ""`++`#: tortoisehg\hgtk\shellconf.py:67`+`msgid "Sub menu items:"`+`msgstr ""`++`#: tortoisehg\hgtk\shellconf.py:86`+`msgid "Top menu items:"`+`msgstr ""`++`#: tortoisehg\hgtk\shellconf.py:108`+`msgid "<- Top"`+`msgstr ""`++`#: tortoisehg\hgtk\shellconf.py:111`+`msgid "Sub ->"`+`msgstr ""`++`#: tortoisehg\hgtk\shellconf.py:116`+`msgid "Taskbar"`+`msgstr ""`++`#: tortoisehg\hgtk\shellconf.py:123`+`msgid "Show Icon"`+`msgstr ""`++`#: tortoisehg\hgtk\shellconf.py:125`+`msgid "Highlight Icon"`+`msgstr ""`++`#: tortoisehg\hgtk\shellconf.py:131`+`msgid "Enable/Disable the overlay icons globally"`+`msgstr ""`++`#: tortoisehg\hgtk\shellconf.py:134`+`msgid "Only enable overlays on local disks"`+`msgstr ""`++`#: tortoisehg\hgtk\shellconf.py:138`+`msgid "Show the taskbar icon (restart needed)"`+`msgstr ""`++`#: tortoisehg\hgtk\shellconf.py:141`+`msgid "Highlight the taskbar icon during activity"`+`msgstr ""`++`#: tortoisehg\hgtk\status.py:134` `msgid "filtered status"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:154`+`#: tortoisehg\hgtk\status.py:150` `msgid "Save As"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:155`+`#: tortoisehg\hgtk\status.py:151` `msgid "Save selected changes"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:160`+`#: tortoisehg\hgtk\status.py:156` `msgid "Visual diff checked files"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:163`+`#: tortoisehg\hgtk\status.py:159` `msgid "Revert checked files"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:166`+`#: tortoisehg\hgtk\status.py:162` `msgid "Add checked files"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:169`+`#: tortoisehg\hgtk\status.py:165` `msgid "Move checked files to other directory"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:172`+`#: tortoisehg\hgtk\status.py:168` `msgid "Remove or delete checked files"` `msgstr ""` +`#: tortoisehg\hgtk\status.py:171`+`msgid "Forget checked files on next commit"`+`msgstr ""`+ `#: tortoisehg\hgtk\status.py:175`-`msgid "Forget checked files on next commit"`-`msgstr ""`--`#: tortoisehg\hgtk\status.py:179` `msgid "refresh"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:255 tortoisehg\hgtk\thgmq.py:185`+`#: tortoisehg\hgtk\status.py:306 tortoisehg\hgtk\thgmq.py:201` `msgid "st"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:263`+`#: tortoisehg\hgtk\status.py:314` `msgid "ms"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:285`+`#: tortoisehg\hgtk\status.py:336` `msgid "View"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:304`+`#: tortoisehg\hgtk\status.py:359` `msgid "Remove filter, show root"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:330`+`#: tortoisehg\hgtk\status.py:385` `msgid "Text Diff"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:383`+`#: tortoisehg\hgtk\status.py:432` `msgid "Hunk Selection"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:456`+`#: tortoisehg\hgtk\status.py:510` `msgid "%d selected, %d total"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:478`+`#: tortoisehg\hgtk\status.py:532` `msgid "Save Preview"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:482`+`#: tortoisehg\hgtk\status.py:536` `msgid "Shelf Preview"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:504`+`#: tortoisehg\hgtk\status.py:558` `msgid "?: unknown"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:505`+`#: tortoisehg\hgtk\status.py:559` `msgid "M: modified"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:506`+`#: tortoisehg\hgtk\status.py:560` `msgid "I: ignored"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:507`+`#: tortoisehg\hgtk\status.py:561` `msgid "A: added"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:508`+`#: tortoisehg\hgtk\status.py:562` `msgid "C: clean"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:509`+`#: tortoisehg\hgtk\status.py:563` `msgid "R: removed"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:510`+`#: tortoisehg\hgtk\status.py:564` `msgid "!: deleted"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:801`+`#: tortoisehg\hgtk\status.py:565`+`msgid "S: subrepo"`+`msgstr ""`++`#: tortoisehg\hgtk\status.py:891` `msgid "View '%s'"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:846`+`#: tortoisehg\hgtk\status.py:937` `msgid "Rename file to:"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:855`+`#: tortoisehg\hgtk\status.py:947` `msgid "Copy file to"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:868 tortoisehg\hgtk\status.py:1332`+`#: tortoisehg\hgtk\status.py:960 tortoisehg\hgtk\status.py:1450` `msgid "Nothing Removed"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:869`+`#: tortoisehg\hgtk\status.py:961` `msgid "Remove is not enabled when multiple revisions are specified."` `msgstr ""` -`#: tortoisehg\hgtk\status.py:886`+`#: tortoisehg\hgtk\status.py:978` `msgid "Move is not enabled when multiple revisions are specified."` `msgstr ""` -`#: tortoisehg\hgtk\status.py:886 tortoisehg\hgtk\status.py:1350`-`#: tortoisehg\hgtk\status.py:1358`+`#: tortoisehg\hgtk\status.py:978 tortoisehg\hgtk\status.py:1468`+`#: tortoisehg\hgtk\status.py:1476` `msgid "Nothing Moved"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:904`+`#: tortoisehg\hgtk\status.py:996` `msgid "Copy is not enabled when multiple revisions are specified."` `msgstr ""` -`#: tortoisehg\hgtk\status.py:904`+`#: tortoisehg\hgtk\status.py:996` `msgid "Nothing Copied"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:963 tortoisehg\hgtk\status.py:1024`-`msgid "===== Diff to first parent =====\n"`-`msgstr ""`--`#: tortoisehg\hgtk\status.py:968 tortoisehg\hgtk\status.py:1031`+`#: tortoisehg\hgtk\status.py:1059 tortoisehg\hgtk\status.py:1133`+`msgid "===== Diff to first parent %d:%s =====\n"`+`msgstr ""`++`#: tortoisehg\hgtk\status.py:1063 tortoisehg\hgtk\status.py:1138` `msgid ""` `"\n"`-`"===== Diff to second parent =====\n"`-`msgstr ""`--`#: tortoisehg\hgtk\status.py:1060`+`"===== Diff to second parent %d:%s =====\n"`+`msgstr ""`++`#: tortoisehg\hgtk\status.py:1170` `msgid "File is larger than the specified max size.\n"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:1061`+`#: tortoisehg\hgtk\status.py:1171` `msgid "Hunk selection is disabled for this file.\n"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:1232`+`#: tortoisehg\hgtk\status.py:1350` `msgid "Nothing Diffed"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:1233`+`#: tortoisehg\hgtk\status.py:1351` `msgid "No diffable files selected"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:1241 tortoisehg\hgtk\status.py:1249`+`#: tortoisehg\hgtk\status.py:1359 tortoisehg\hgtk\status.py:1367` `msgid "Nothing Reverted"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:1242`+`#: tortoisehg\hgtk\status.py:1360` `msgid "No revertable files selected"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:1250`+`#: tortoisehg\hgtk\status.py:1368` `msgid "Revert not allowed when viewing revision range."` `msgstr ""` -`#: tortoisehg\hgtk\status.py:1268`+`#: tortoisehg\hgtk\status.py:1386` `msgid "Uncommited merge - please select a parent revision"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:1269`+`#: tortoisehg\hgtk\status.py:1387` `msgid "Revert files to local or other parent?"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:1270`+`#: tortoisehg\hgtk\status.py:1388` `msgid "&Local"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:1270`+`#: tortoisehg\hgtk\status.py:1388` `msgid "&Other"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:1285`+`#: tortoisehg\hgtk\status.py:1403` `msgid "Confirm Revert"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:1286`+`#: tortoisehg\hgtk\status.py:1404` `msgid ""` `"Revert files to revision %s?\n"` `"\n"` `"%s"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:1287`+`#: tortoisehg\hgtk\status.py:1405` `msgid "&Yes (backup changes)"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:1288`+`#: tortoisehg\hgtk\status.py:1406` `msgid "Yes (&discard changes)"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:1308`+`#: tortoisehg\hgtk\status.py:1426` `msgid "Nothing Added"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:1309`+`#: tortoisehg\hgtk\status.py:1427` `msgid "No addable files selected"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:1333`+`#: tortoisehg\hgtk\status.py:1451` `msgid "No removable files selected"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:1341`+`#: tortoisehg\hgtk\status.py:1459` `msgid "Move files to directory..."` `msgstr ""` -`#: tortoisehg\hgtk\status.py:1351`+`#: tortoisehg\hgtk\status.py:1469` `msgid "Cannot move outside repo!"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:1358`+`#: tortoisehg\hgtk\status.py:1476` `msgid ""` `"No movable files selected\n"` `"\n"` `"Note: only clean files can be moved."` `msgstr ""` -`#: tortoisehg\hgtk\status.py:1367`+`#: tortoisehg\hgtk\status.py:1485` `msgid "Nothing Forgotten"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:1368`+`#: tortoisehg\hgtk\status.py:1486` `msgid "No clean files selected"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:1371`+`#: tortoisehg\hgtk\status.py:1489` `msgid "Confirm Delete Unrevisioned"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:1372`+`#: tortoisehg\hgtk\status.py:1490` `msgid "Delete the following unrevisioned files?"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:1385`+`#: tortoisehg\hgtk\status.py:1503` `msgid "Delete Errors"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:1506`+`#: tortoisehg\hgtk\status.py:1656` `msgid "Edit"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:1507`+`#: tortoisehg\hgtk\status.py:1657` `msgid "View missing"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:1508`+`#: tortoisehg\hgtk\status.py:1658` `msgid "View other"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:1512`+`#: tortoisehg\hgtk\status.py:1662` `msgid "L_og"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:1516`+`#: tortoisehg\hgtk\status.py:1666` `msgid "_Guess Rename..."` `msgstr ""` -`#: tortoisehg\hgtk\status.py:1517`+`#: tortoisehg\hgtk\status.py:1667` `msgid "_Ignore"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:1518`+`#: tortoisehg\hgtk\status.py:1668` `msgid "Remove versioned"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:1519`+`#: tortoisehg\hgtk\status.py:1669` `msgid "_Delete unversioned"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:1522`+`#: tortoisehg\hgtk\status.py:1672` `msgid "_Copy..."` `msgstr ""` -`#: tortoisehg\hgtk\status.py:1523`+`#: tortoisehg\hgtk\status.py:1673` `msgid "Rename..."` `msgstr ""` -`#: tortoisehg\hgtk\status.py:1525`+`#: tortoisehg\hgtk\status.py:1675` `msgid "Restart Merge..."` `msgstr ""` -`#: tortoisehg\hgtk\status.py:1526`+`#: tortoisehg\hgtk\status.py:1676` `msgid "Mark unresolved"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:1527`+`#: tortoisehg\hgtk\status.py:1677` `msgid "Mark resolved"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:1535`+`#: tortoisehg\hgtk\status.py:1685` `msgid "Restart merge with"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:1579`+`#: tortoisehg\hgtk\status.py:1728` `msgid "not up to date"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:1580`+`#: tortoisehg\hgtk\status.py:1729` `msgid ""` `"The parents have changed since the last refresh.\n"` `"Continue anyway?"` `msgstr ""` -`#: tortoisehg\hgtk\status.py:1582`+`#: tortoisehg\hgtk\status.py:1731` `msgid "&Refresh"` `msgstr ""` -`#: tortoisehg\hgtk\statusbar.py:44`-`msgid "Running"`+`#: tortoisehg\hgtk\statusbar.py:39`+`msgid "Running..."`+`msgstr ""`++`#: tortoisehg\hgtk\statusbar.py:67`+`msgid "unknown field name: %s"`+`msgstr ""`++`#: tortoisehg\hgtk\statusbar.py:94`+`msgid "invalid pack direction: %s"`+`msgstr ""`++`#: tortoisehg\hgtk\statusbar.py:103`+`msgid "invalid alignment value: %s"` `msgstr ""` `#: tortoisehg\hgtk\synch.py:51`@@ -3240,7 +3953,7 @@ `msgid "Push local changes to selected repository"` `msgstr ""` -`#: tortoisehg\hgtk\synch.py:84 tortoisehg\hgtk\thgconfig.py:616`+`#: tortoisehg\hgtk\synch.py:84 tortoisehg\hgtk\thgconfig.py:671` `msgid "Email"` `msgstr ""` @@ -3264,47 +3977,47 @@ `msgid "Bundle:"` `msgstr ""` -`#: tortoisehg\hgtk\synch.py:164`+`#: tortoisehg\hgtk\synch.py:163` `msgid "Post Pull: "` `msgstr ""` -`#: tortoisehg\hgtk\synch.py:174`+`#: tortoisehg\hgtk\synch.py:173` `msgid "Advanced Options"` `msgstr ""` +`#: tortoisehg\hgtk\synch.py:180`+`msgid "Force pull or push"`+`msgstr ""`+ `#: tortoisehg\hgtk\synch.py:181`-`msgid "Force pull or push"`-`msgstr ""`--`#: tortoisehg\hgtk\synch.py:182` `msgid "Run even when remote repository is unrelated."` `msgstr ""` -`#: tortoisehg\hgtk\synch.py:195`+`#: tortoisehg\hgtk\synch.py:194` `msgid "Target revision:"` `msgstr ""` -`#: tortoisehg\hgtk\synch.py:199`+`#: tortoisehg\hgtk\synch.py:198` `msgid "A specific revision up to which you would like to push or pull."` `msgstr ""` -`#: tortoisehg\hgtk\synch.py:209`+`#: tortoisehg\hgtk\synch.py:208` `msgid "Name of hg executable on remote machine."` `msgstr ""` -`#: tortoisehg\hgtk\synch.py:219`+`#: tortoisehg\hgtk\synch.py:218` `msgid "Incoming/Outgoing"` `msgstr ""` +`#: tortoisehg\hgtk\synch.py:221`+`msgid "Show patches"`+`msgstr ""`+ `#: tortoisehg\hgtk\synch.py:222`-`msgid "Show patches"`+`msgid "Show newest first"` `msgstr ""` `#: tortoisehg\hgtk\synch.py:223`-`msgid "Show newest first"`-`msgstr ""`--`#: tortoisehg\hgtk\synch.py:224` `msgid "Show no merges"` `msgstr ""` @@ -3332,11 +4045,15 @@ `msgid "Bundle ()"` `msgstr ""` -`#: tortoisehg\hgtk\tagadd.py:29`+`#: tortoisehg\hgtk\synch.py:671`+`msgid "Toggle _Wordwrap"`+`msgstr ""`++`#: tortoisehg\hgtk\tagadd.py:31` `msgid "Tag - %s"` `msgstr ""` -`#: tortoisehg\hgtk\tagadd.py:59`+`#: tortoisehg\hgtk\tagadd.py:57` `msgid "Tag:"` `msgstr ""` @@ -3348,144 +4065,88 @@ `msgid "Replace existing tag"` `msgstr ""` -`#: tortoisehg\hgtk\tagadd.py:79`+`#: tortoisehg\hgtk\tagadd.py:81` `msgid "Use English commit message"` `msgstr ""` -`#: tortoisehg\hgtk\tagadd.py:85`+`#: tortoisehg\hgtk\tagadd.py:87` `msgid "Use custom commit message:"` `msgstr ""` -`#: tortoisehg\hgtk\tagadd.py:161`+`#: tortoisehg\hgtk\tagadd.py:218` `msgid "Tag input is empty"` `msgstr ""` -`#: tortoisehg\hgtk\tagadd.py:162`+`#: tortoisehg\hgtk\tagadd.py:219` `msgid "Please enter tag name"` `msgstr ""` -`#: tortoisehg\hgtk\tagadd.py:166`+`#: tortoisehg\hgtk\tagadd.py:223` `msgid "Custom commit message is empty"` `msgstr ""` -`#: tortoisehg\hgtk\tagadd.py:175 tortoisehg\hgtk\tagadd.py:207`+`#: tortoisehg\hgtk\tagadd.py:232 tortoisehg\hgtk\tagadd.py:264` `msgid "Tagging completed"` `msgstr ""` -`#: tortoisehg\hgtk\tagadd.py:176`+`#: tortoisehg\hgtk\tagadd.py:233` `msgid "Tag \"%s\" has been added"` `msgstr ""` -`#: tortoisehg\hgtk\tagadd.py:179 tortoisehg\hgtk\tagadd.py:182`-`#: tortoisehg\hgtk\tagadd.py:211 tortoisehg\hgtk\tagadd.py:214`+`#: tortoisehg\hgtk\tagadd.py:236 tortoisehg\hgtk\tagadd.py:239`+`#: tortoisehg\hgtk\tagadd.py:268 tortoisehg\hgtk\tagadd.py:271` `msgid "Error in tagging"` `msgstr ""` -`#: tortoisehg\hgtk\tagadd.py:195`+`#: tortoisehg\hgtk\tagadd.py:252` `msgid "Tag name is empty"` `msgstr ""` -`#: tortoisehg\hgtk\tagadd.py:196`+`#: tortoisehg\hgtk\tagadd.py:253` `msgid "Please select tag name to remove"` `msgstr ""` -`#: tortoisehg\hgtk\tagadd.py:208`+`#: tortoisehg\hgtk\tagadd.py:265` `msgid "Tag \"%s\" has been removed"` `msgstr ""` -`#: tortoisehg\hgtk\tagadd.py:222`+`#: tortoisehg\hgtk\tagadd.py:278` `msgid "a tag named \"%s\" already exists"` `msgstr ""` -`#: tortoisehg\hgtk\tagadd.py:228`+`#: tortoisehg\hgtk\tagadd.py:284` `msgid "Added tag %s for changeset %s"` `msgstr ""` -`#: tortoisehg\hgtk\tagadd.py:232`+`#: tortoisehg\hgtk\tagadd.py:288` `msgid "Tag '%s' already exist"` `msgstr ""` -`#: tortoisehg\hgtk\tagadd.py:239`-`msgid "Tag '%s' does not exist"`-`msgstr ""`--`#: tortoisehg\hgtk\tagadd.py:242`+`#: tortoisehg\hgtk\tagadd.py:299`+`msgid "tag '%s' does not exist"`+`msgstr ""`++`#: tortoisehg\hgtk\tagadd.py:302`+`msgid "tag '%s' is not a local tag"`+`msgstr ""`++`#: tortoisehg\hgtk\tagadd.py:305`+`msgid "tag '%s' is not a global tag"`+`msgstr ""`++`#: tortoisehg\hgtk\tagadd.py:308` `msgid "Removed tag %s"` `msgstr ""` -`#: tortoisehg\hgtk\taskbarui.py:29`-`msgid "TortoiseHg Taskbar"`-`msgstr ""`--`#: tortoisehg\hgtk\taskbarui.py:32`-`msgid "Apply"`-`msgstr ""`--`#: tortoisehg\hgtk\taskbarui.py:52`-`msgid "Overlays"`-`msgstr ""`--`#: tortoisehg\hgtk\taskbarui.py:59`-`msgid "Enable overlays"`-`msgstr ""`--`#: tortoisehg\hgtk\taskbarui.py:61`-`msgid "Local disks only"`-`msgstr ""`--`#: tortoisehg\hgtk\taskbarui.py:65`-`msgid "Context Menu"`-`msgstr ""`--`#: tortoisehg\hgtk\taskbarui.py:81`-`msgid "Sub menu items:"`-`msgstr ""`--`#: tortoisehg\hgtk\taskbarui.py:100`-`msgid "Top menu items:"`-`msgstr ""`--`#: tortoisehg\hgtk\taskbarui.py:122`-`msgid "Top ->"`-`msgstr ""`--`#: tortoisehg\hgtk\taskbarui.py:125`-`msgid "<- Sub"`-`msgstr ""`--`#: tortoisehg\hgtk\taskbarui.py:130`-`msgid "Taskbar"`-`msgstr ""`--`#: tortoisehg\hgtk\taskbarui.py:137`-`msgid "Highlight Icon"`-`msgstr ""`--`#: tortoisehg\hgtk\taskbarui.py:143`-`msgid "Enable/Disable the overlay icons globally"`-`msgstr ""`--`#: tortoisehg\hgtk\taskbarui.py:146`-`msgid "Only enable overlays on local disks"`-`msgstr ""`--`#: tortoisehg\hgtk\taskbarui.py:150`-`msgid "Highlight the taskbar icon during activity"`-`msgstr ""`--`#: tortoisehg\hgtk\taskbarui.py:157`-`msgid "Event Log"`-`msgstr ""`--`#: tortoisehg\hgtk\thgconfig.py:22`+`#: tortoisehg\hgtk\thgconfig.py:21` `msgid "<unspecified>"` `msgstr ""` +`#: tortoisehg\hgtk\thgconfig.py:27`+`msgid "Three-way Merge Tool"`+`msgstr ""`+ `#: tortoisehg\hgtk\thgconfig.py:28`-`msgid "Three-way Merge Tool"`-`msgstr ""`--`#: tortoisehg\hgtk\thgconfig.py:29` `msgid ""` `"Graphical merge program for resolving merge conflicts. If left unspecified, "` `"Mercurial will use the first applicable tool it finds on your system or use "`@@ -3495,220 +4156,203 @@ `"manual merging"` `msgstr ""` +`#: tortoisehg\hgtk\thgconfig.py:34`+`msgid "Visual Diff Tool"`+`msgstr ""`+ `#: tortoisehg\hgtk\thgconfig.py:35`-`msgid "Visual Diff Command"`-`msgstr ""`--`#: tortoisehg\hgtk\thgconfig.py:36`-`msgid "Specify visual diff tool; must be an extdiff command"`-`msgstr ""`--`#: tortoisehg\hgtk\thgconfig.py:37`-`msgid "Skip Diff Window"`-`msgstr ""`--`#: tortoisehg\hgtk\thgconfig.py:38` `msgid ""`-`"Bypass the builtin visual diff dialog and directly use your visual diff "`-`"tool's directory diff feature. Only enable this feature if you know your "`-`"diff tool has a valid extdiff configuration. Default: False"`+`"Specify visual diff tool, as described in the [merge-tools] section of your "`+`"Mercurial configuration files. If left unspecified, TortoiseHg will use the "`+`"selected merge tool. Failing that it uses the first applicable tool it finds."`+`msgstr ""`++`#: tortoisehg\hgtk\thgconfig.py:39`+`msgid "Visual Editor"`+`msgstr ""`++`#: tortoisehg\hgtk\thgconfig.py:40`+`msgid "Specify the visual editor used to view files, etc"`+`msgstr ""`++`#: tortoisehg\hgtk\thgconfig.py:41`+`msgid "CLI Editor"` `msgstr ""` `#: tortoisehg\hgtk\thgconfig.py:42`-`msgid "Visual Editor"`-`msgstr ""`--`#: tortoisehg\hgtk\thgconfig.py:43`-`msgid "Specify the visual editor used to view files, etc"`-`msgstr ""`--`#: tortoisehg\hgtk\thgconfig.py:44`-`msgid "CLI Editor"`-`msgstr ""`--`#: tortoisehg\hgtk\thgconfig.py:45` `msgid ""` `"The editor to use during a commit and other instances where Mercurial needs "`-`"multiline input from the user. Only used by command line interface commands."`-`msgstr ""`--`#: tortoisehg\hgtk\thgconfig.py:48`+`"multiline input from the user. Used by command line commands, including "`+`"patch import."`+`msgstr ""`++`#: tortoisehg\hgtk\thgconfig.py:45` `msgid "Tab Width"` `msgstr ""` +`#: tortoisehg\hgtk\thgconfig.py:46`+`msgid ""`+`"Specify the number of spaces that tabs expand to in various TortoiseHg "`+`"windows. Default: Not expanded"`+`msgstr ""`+ `#: tortoisehg\hgtk\thgconfig.py:49`-`msgid ""`-`"Specify the number of spaces that tabs expand to in various TortoiseHG "`-`"windows. Default: Not expanded"`-`msgstr ""`--`#: tortoisehg\hgtk\thgconfig.py:52` `msgid "Max Diff Size"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:53`+`#: tortoisehg\hgtk\thgconfig.py:50` `msgid ""` `"The maximum size file (in KB) that TortoiseHg will show changes for in the "` `"changelog, status, and commit windows. A value of zero implies no limit. "` `"Default: 1024 (1MB)"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:56`+`#: tortoisehg\hgtk\thgconfig.py:53` `msgid "Bottom Diffs"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:57`+`#: tortoisehg\hgtk\thgconfig.py:54` `msgid ""` `"Show the diff panel below the file list in status, shelve, and commit "` `"dialogs. Default: False (show diffs to right of file list)"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:60`-`msgid "Capture Stderr"`-`msgstr ""`--`#: tortoisehg\hgtk\thgconfig.py:61`+`#: tortoisehg\hgtk\thgconfig.py:57`+`msgid "Capture stderr"`+`msgstr ""`++`#: tortoisehg\hgtk\thgconfig.py:58` `msgid ""` `"Redirect stderr to a buffer which is parsed at the end of the process for "` `"runtime errors. Default: True"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:63`+`#: tortoisehg\hgtk\thgconfig.py:60` `msgid "Fork hgtk"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:64`+`#: tortoisehg\hgtk\thgconfig.py:61` `msgid ""` `"When running hgtk from the command line, fork a background process to run "` `"graphical dialogs. Default: True"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:66`-`msgid "Full path title"`-`msgstr ""`--`#: tortoisehg\hgtk\thgconfig.py:67`+`#: tortoisehg\hgtk\thgconfig.py:63`+`msgid "Full Path Title"`+`msgstr ""`++`#: tortoisehg\hgtk\thgconfig.py:64` `msgid ""` `"Show a full directory path of the repository in the dialog title instead of "` `"just the root directory name. Default: False"` `msgstr ""` +`#: tortoisehg\hgtk\thgconfig.py:68`+`msgid "Username"`+`msgstr ""`++`#: tortoisehg\hgtk\thgconfig.py:69`+`msgid "Name associated with commits"`+`msgstr ""`++`#: tortoisehg\hgtk\thgconfig.py:70`+`msgid "Summary Line Length"`+`msgstr ""`+ `#: tortoisehg\hgtk\thgconfig.py:71`-`msgid "Username"`-`msgstr ""`--`#: tortoisehg\hgtk\thgconfig.py:72`-`msgid "Name associated with commits"`-`msgstr ""`--`#: tortoisehg\hgtk\thgconfig.py:73`-`msgid "Summary Line Length"`-`msgstr ""`--`#: tortoisehg\hgtk\thgconfig.py:74` `msgid ""`-`"Maximum length of the commit message summary line. If set, TortoiseHG will "`+`"Maximum length of the commit message summary line. If set, TortoiseHg will "` `"issue a warning if the summary line is too long or not separated by a blank "` `"line. Default: 0 (unenforced)"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:78`+`#: tortoisehg\hgtk\thgconfig.py:75` `msgid "Message Line Length"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:79`+`#: tortoisehg\hgtk\thgconfig.py:76` `msgid ""` `"Word wrap length of the commit message. If set, the popup menu can be used "` `"to format the message and a warning will be issued if any lines are too long "` `"at commit. Default: 0 (unenforced)"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:84`+`#: tortoisehg\hgtk\thgconfig.py:81` `msgid "Push After Commit"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:85`+`#: tortoisehg\hgtk\thgconfig.py:82` `msgid ""` `"Attempt to push to default push target after every successful commit. "` `"Default: False"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:87`+`#: tortoisehg\hgtk\thgconfig.py:84` `msgid "Auto Commit List"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:88`+`#: tortoisehg\hgtk\thgconfig.py:85` `msgid ""` `"Comma separated list of files that are automatically included in every "` `"commit. Intended for use only as a repository setting. Default: None"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:91`+`#: tortoisehg\hgtk\thgconfig.py:88` `msgid "Auto Exclude List"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:92`+`#: tortoisehg\hgtk\thgconfig.py:89` `msgid ""` `"Comma separated list of files that are automatically unchecked when the "` `"status, commit, and shelve dialogs are opened. Default: None"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:98`+`#: tortoisehg\hgtk\thgconfig.py:95` `msgid "Author Coloring"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:99`+`#: tortoisehg\hgtk\thgconfig.py:96` `msgid ""` `"Color changesets by author name. If not enabled, the changes are colored "` `"green for merge, red for non-trivial parents, black for normal. Default: "` `"False"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:103`+`#: tortoisehg\hgtk\thgconfig.py:100` `msgid "Long Summary"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:104`+`#: tortoisehg\hgtk\thgconfig.py:101` `msgid ""` `"If true, concatenate multiple lines of changeset summary until they reach 80 "` `"characters. Default: False"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:107`+`#: tortoisehg\hgtk\thgconfig.py:104` `msgid "Log Batch Size"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:108`+`#: tortoisehg\hgtk\thgconfig.py:105` `msgid ""` `"The number of revisions to read and display in the changelog viewer in a "` `"single batch. Default: 500"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:111`-`msgid "Copy Hash"`-`msgstr ""`--`#: tortoisehg\hgtk\thgconfig.py:112`-`msgid ""`-`"Allow the changelog viewer to copy the changeset hash of the currently "`-`"selected changeset into the clipboard. DEPRECATED. Default: False"`-`msgstr ""`--`#: tortoisehg\hgtk\thgconfig.py:115`+`#: tortoisehg\hgtk\thgconfig.py:108` `msgid "Dead Branches"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:116`+`#: tortoisehg\hgtk\thgconfig.py:109` `msgid ""` `"Comma separated list of branch names that should be ignored when building a "` `"list of branch names for a repository. Default: None"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:119`+`#: tortoisehg\hgtk\thgconfig.py:112` `msgid "Branch Colors"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:120`+`#: tortoisehg\hgtk\thgconfig.py:113` `msgid ""` `"Space separated list of branch names and colors of the form branch:#XXXXXX. "` `"Spaces and colons in the branch name must be escaped using a backslash (\\). "`@@ -3716,127 +4360,137 @@ `"be decoded to the @ character, and \\n to a linefeed. Default: None"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:126`+`#: tortoisehg\hgtk\thgconfig.py:119` `msgid "Hide Tags"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:127`+`#: tortoisehg\hgtk\thgconfig.py:120` `msgid ""` `"Space separated list of tags that will not be shown. Useful example: Specify "` `"\"qbase qparent qtip\" to hide the standard tags inserted by the Mercurial "` `"Queues Extension. Default: None"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:131`+`#: tortoisehg\hgtk\thgconfig.py:124` `msgid "Use Expander"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:132`+`#: tortoisehg\hgtk\thgconfig.py:125` `msgid "Show changeset details with an expander"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:136`-`msgid "After pull operation"`-`msgstr ""`--`#: tortoisehg\hgtk\thgconfig.py:138`+`#: tortoisehg\hgtk\thgconfig.py:126`+`msgid "Toolbar Style"`+`msgstr ""`++`#: tortoisehg\hgtk\thgconfig.py:128`+`msgid ""`+`"Adjust the display of the main toolbar in the Repository Explorer. Values: "`+`"small, large, or theme. Default: theme"`+`msgstr ""`++`#: tortoisehg\hgtk\thgconfig.py:133`+`msgid "After Pull Operation"`+`msgstr ""`++`#: tortoisehg\hgtk\thgconfig.py:135` `msgid ""` `"Operation which is performed directly after a successful pull. update "` `"equates to pull --update, fetch equates to the fetch extension, rebase "` `"equates to pull --rebase. Default: none"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:143 tortoisehg\hgtk\thgmq.py:186`+`#: tortoisehg\hgtk\thgconfig.py:140` `msgid "Name"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:144`+`#: tortoisehg\hgtk\thgconfig.py:141` `msgid ""` `"Repository name to use in the web interface. Default is the working "` `"directory."` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:146 tortoisehg\hgtk\thgconfig.py:939`+`#: tortoisehg\hgtk\thgconfig.py:143 tortoisehg\hgtk\thgconfig.py:680` `msgid "Description"` `msgstr ""` +`#: tortoisehg\hgtk\thgconfig.py:144`+`msgid "Textual description of the repository's purpose or contents."`+`msgstr ""`++`#: tortoisehg\hgtk\thgconfig.py:146`+`msgid "Contact"`+`msgstr ""`+ `#: tortoisehg\hgtk\thgconfig.py:147`-`msgid "Textual description of the repository's purpose or contents."`+`msgid "Name or email address of the person in charge of the repository."` `msgstr ""` `#: tortoisehg\hgtk\thgconfig.py:149`-`msgid "Contact"`-`msgstr ""`--`#: tortoisehg\hgtk\thgconfig.py:150`-`msgid "Name or email address of the person in charge of the repository."`+`msgid "Style"`+`msgstr ""`++`#: tortoisehg\hgtk\thgconfig.py:151`+`msgid "Which template map style to use"` `msgstr ""` `#: tortoisehg\hgtk\thgconfig.py:152`-`msgid "Style"`-`msgstr ""`--`#: tortoisehg\hgtk\thgconfig.py:154`-`msgid "Which template map style to use"`+`msgid "Archive Formats"`+`msgstr ""`++`#: tortoisehg\hgtk\thgconfig.py:153`+`msgid "Comma separated list of archive formats allowed for downloading"` `msgstr ""` `#: tortoisehg\hgtk\thgconfig.py:155`-`msgid "Archive Formats"`+`msgid "Port to listen on"`+`msgstr ""`++`#: tortoisehg\hgtk\thgconfig.py:155 tortoisehg\hgtk\thgconfig.py:297`+`msgid "Port"` `msgstr ""` `#: tortoisehg\hgtk\thgconfig.py:156`-`msgid "Comma separated list of archive formats allowed for downloading"`-`msgstr ""`--`#: tortoisehg\hgtk\thgconfig.py:158`-`msgid "Port to listen on"`-`msgstr ""`--`#: tortoisehg\hgtk\thgconfig.py:158 tortoisehg\hgtk\thgconfig.py:275`-`msgid "Port"`-`msgstr ""`--`#: tortoisehg\hgtk\thgconfig.py:159` `msgid "Push Requires SSL"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:160`+`#: tortoisehg\hgtk\thgconfig.py:157` `msgid ""` `"Whether to require that inbound pushes be transported over SSL to prevent "` `"password sniffing."` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:162`+`#: tortoisehg\hgtk\thgconfig.py:159` `msgid "Stripes"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:163`+`#: tortoisehg\hgtk\thgconfig.py:160` `msgid ""` `"How many lines a \"zebra stripe\" should span in multiline output. Default "` `"is 1; set to 0 to disable."` `msgstr ""` +`#: tortoisehg\hgtk\thgconfig.py:162`+`msgid "Max Files"`+`msgstr ""`++`#: tortoisehg\hgtk\thgconfig.py:163`+`msgid "Maximum number of files to list per changeset."`+`msgstr ""`++`#: tortoisehg\hgtk\thgconfig.py:164`+`msgid "Max Changes"`+`msgstr ""`+ `#: tortoisehg\hgtk\thgconfig.py:165`-`msgid "Max Files"`+`msgid "Maximum number of changes to list on the changelog."` `msgstr ""` `#: tortoisehg\hgtk\thgconfig.py:166`-`msgid "Maximum number of files to list per changeset."`+`msgid "Allow Push"` `msgstr ""` `#: tortoisehg\hgtk\thgconfig.py:167`-`msgid "Max Changes"`-`msgstr ""`--`#: tortoisehg\hgtk\thgconfig.py:168`-`msgid "Maximum number of changes to list on the changelog."`-`msgstr ""`--`#: tortoisehg\hgtk\thgconfig.py:169`-`msgid "Allow Push"`-`msgstr ""`--`#: tortoisehg\hgtk\thgconfig.py:170` `msgid ""` `"Whether to allow pushing to the repository. If empty or not set, push is not "` `"allowed. If the special value \"\", any remote user can push, including "`@@ -3846,11 +4500,11 @@ `"examined after the deny_push list."` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:177`+`#: tortoisehg\hgtk\thgconfig.py:174` `msgid "Deny Push"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:178`+`#: tortoisehg\hgtk\thgconfig.py:175` `msgid ""` `"Whether to deny pushing to the repository. If empty or not set, push is not "` `"denied. If the special value \"*\", all remote users are denied push. "`@@ -3859,81 +4513,81 @@ `"The contents of the deny_push list are examined before the allow_push list."` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:184`+`#: tortoisehg\hgtk\thgconfig.py:181` `msgid "Encoding"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:185`+`#: tortoisehg\hgtk\thgconfig.py:182` `msgid "Character encoding name"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:188 tortoisehg\hgtk\thgconfig.py:276`+`#: tortoisehg\hgtk\thgconfig.py:185 tortoisehg\hgtk\thgconfig.py:298` `msgid "Host"` `msgstr ""` +`#: tortoisehg\hgtk\thgconfig.py:186`+`msgid ""`+`"Host name and (optional) port of proxy server, for example \"myproxy:8000\""`+`msgstr ""`++`#: tortoisehg\hgtk\thgconfig.py:188`+`msgid "Bypass List"`+`msgstr ""`+ `#: tortoisehg\hgtk\thgconfig.py:189` `msgid ""`-`"Host name and (optional) port of proxy server, for example \"myproxy:8000\""`-`msgstr ""`--`#: tortoisehg\hgtk\thgconfig.py:191`-`msgid "Bypass List"`+`"Optional. Comma-separated list of host names that should bypass the proxy"` `msgstr ""` `#: tortoisehg\hgtk\thgconfig.py:192`-`msgid ""`-`"Optional. Comma-separated list of host names that should bypass the proxy"`+`msgid "Optional. User name to authenticate with at the proxy server"`+`msgstr ""`++`#: tortoisehg\hgtk\thgconfig.py:194 tortoisehg\hgtk\thgconfig.py:299`+`msgid "Password"` `msgstr ""` `#: tortoisehg\hgtk\thgconfig.py:195`-`msgid "Optional. User name to authenticate with at the proxy server"`-`msgstr ""`--`#: tortoisehg\hgtk\thgconfig.py:197 tortoisehg\hgtk\thgconfig.py:277`-`msgid "Password"`-`msgstr ""`--`#: tortoisehg\hgtk\thgconfig.py:198` `msgid "Optional. Password to authenticate with at the proxy server"` `msgstr ""` +`#: tortoisehg\hgtk\thgconfig.py:199`+`msgid "From"`+`msgstr ""`++`#: tortoisehg\hgtk\thgconfig.py:200`+`msgid "Email address to use in the \"From\" header and for the SMTP envelope"`+`msgstr ""`++`#: tortoisehg\hgtk\thgconfig.py:201`+`msgid "To"`+`msgstr ""`+ `#: tortoisehg\hgtk\thgconfig.py:202`-`msgid "From"`+`msgid "Comma-separated list of recipient email addresses"` `msgstr ""` `#: tortoisehg\hgtk\thgconfig.py:203`-`msgid "Email address to use in the \"From\" header and for the SMTP envelope"`+`msgid "Cc"` `msgstr ""` `#: tortoisehg\hgtk\thgconfig.py:204`-`msgid "To"`-`msgstr ""`--`#: tortoisehg\hgtk\thgconfig.py:205`-`msgid "Comma-separated list of recipient email addresses"`+`msgid "Comma-separated list of carbon copy recipient email addresses"` `msgstr ""` `#: tortoisehg\hgtk\thgconfig.py:206`-`msgid "Cc"`+`msgid "Bcc"` `msgstr ""` `#: tortoisehg\hgtk\thgconfig.py:207`-`msgid "Comma-separated list of carbon copy recipient email addresses"`+`msgid "Comma-separated list of blind carbon copy recipient email addresses"` `msgstr ""` `#: tortoisehg\hgtk\thgconfig.py:209`-`msgid "Bcc"`+`msgid "method"` `msgstr ""` `#: tortoisehg\hgtk\thgconfig.py:210`-`msgid "Comma-separated list of blind carbon copy recipient email addresses"`-`msgstr ""`--`#: tortoisehg\hgtk\thgconfig.py:212`-`msgid "method"`-`msgstr ""`--`#: tortoisehg\hgtk\thgconfig.py:213` `msgid ""` `"Optional. Method to use to send email messages. If value is \"smtp\" "` `"(default), use SMTP (configured below). Otherwise, use as name of program "`@@ -3943,395 +4597,552 @@ `"messages."` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:218`+`#: tortoisehg\hgtk\thgconfig.py:215` `msgid "Host name of mail server"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:218`+`#: tortoisehg\hgtk\thgconfig.py:215` `msgid "SMTP Host"` `msgstr ""` +`#: tortoisehg\hgtk\thgconfig.py:216`+`msgid "SMTP Port"`+`msgstr ""`++`#: tortoisehg\hgtk\thgconfig.py:217`+`msgid "Port to connect to on mail server. Default: 25"`+`msgstr ""`+ `#: tortoisehg\hgtk\thgconfig.py:219`-`msgid "SMTP Port"`+`msgid "SMTP TLS"` `msgstr ""` `#: tortoisehg\hgtk\thgconfig.py:220`-`msgid "Port to connect to on mail server. Default: 25"`+`msgid "Connect to mail server using TLS. Default: False"` `msgstr ""` `#: tortoisehg\hgtk\thgconfig.py:222`-`msgid "SMTP TLS"`+`msgid "SMTP Username"` `msgstr ""` `#: tortoisehg\hgtk\thgconfig.py:223`-`msgid "Connect to mail server using TLS. Default: False"`+`msgid "Username to authenticate to mail server with"`+`msgstr ""`++`#: tortoisehg\hgtk\thgconfig.py:224`+`msgid "SMTP Password"` `msgstr ""` `#: tortoisehg\hgtk\thgconfig.py:225`-`msgid "SMTP Username"`+`msgid "Password to authenticate to mail server with"` `msgstr ""` `#: tortoisehg\hgtk\thgconfig.py:226`-`msgid "Username to authenticate to mail server with"`+`msgid "Local Hostname"` `msgstr ""` `#: tortoisehg\hgtk\thgconfig.py:227`-`msgid "SMTP Password"`-`msgstr ""`--`#: tortoisehg\hgtk\thgconfig.py:228`-`msgid "Password to authenticate to mail server with"`-`msgstr ""`--`#: tortoisehg\hgtk\thgconfig.py:229`-`msgid "Local Hostname"`+`msgid "Hostname the sender can use to identify itself to the mail server."` `msgstr ""` `#: tortoisehg\hgtk\thgconfig.py:230`-`msgid "Hostname the sender can use to identify itself to the mail server."`-`msgstr ""`--`#: tortoisehg\hgtk\thgconfig.py:233` `msgid "Patch EOL"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:234`+`#: tortoisehg\hgtk\thgconfig.py:231` `msgid ""` `"Normalize file line endings during and after patch to lf or crlf. Strict "` `"does no normalization. Default: strict"` `msgstr ""` +`#: tortoisehg\hgtk\thgconfig.py:234`+`msgid "Git Format"`+`msgstr ""`++`#: tortoisehg\hgtk\thgconfig.py:235`+`msgid "Use git extended diff header format. Default: False"`+`msgstr ""`+ `#: tortoisehg\hgtk\thgconfig.py:237`-`msgid "Git Format"`+`msgid "No Dates"` `msgstr ""` `#: tortoisehg\hgtk\thgconfig.py:238`-`msgid "Use git extended diff header format. Default: False"`+`msgid "Do not include modification dates in diff headers. Default: False"` `msgstr ""` `#: tortoisehg\hgtk\thgconfig.py:240`-`msgid "No Dates"`+`msgid "Show Function"` `msgstr ""` `#: tortoisehg\hgtk\thgconfig.py:241`-`msgid "Do not include modification dates in diff headers. Default: False"`+`msgid "Show which function each change is in. Default: False"` `msgstr ""` `#: tortoisehg\hgtk\thgconfig.py:243`-`msgid "Show Function"`+`msgid "Ignore White Space"` `msgstr ""` `#: tortoisehg\hgtk\thgconfig.py:244`-`msgid "Show which function each change is in. Default: False"`+`msgid "Ignore white space when comparing lines. Default: False"` `msgstr ""` `#: tortoisehg\hgtk\thgconfig.py:246`-`msgid "Ignore White Space"`+`msgid "Ignore WS Amount"` `msgstr ""` `#: tortoisehg\hgtk\thgconfig.py:247`-`msgid "Ignore white space when comparing lines. Default: False"`+`msgid "Ignore changes in the amount of white space. Default: False"` `msgstr ""` `#: tortoisehg\hgtk\thgconfig.py:249`-`msgid "Ignore WS Amount"`+`msgid "Ignore Blank Lines"` `msgstr ""` `#: tortoisehg\hgtk\thgconfig.py:250`-`msgid "Ignore changes in the amount of white space. Default: False"`+`msgid "Ignore changes whose lines are all blank. Default: False"` `msgstr ""` `#: tortoisehg\hgtk\thgconfig.py:252`-`msgid "Ignore Blank Lines"`-`msgstr ""`--`#: tortoisehg\hgtk\thgconfig.py:253`-`msgid "Ignore changes whose lines are all blank. Default: False"`-`msgstr ""`--`#: tortoisehg\hgtk\thgconfig.py:257`+`msgid "Coloring Style"`+`msgstr ""`++`#: tortoisehg\hgtk\thgconfig.py:254`+`msgid ""`+`"Adjust the coloring style of diff lines in the changeset viewer. Default: "`+`"foreground"`+`msgstr ""`++`#: tortoisehg\hgtk\thgconfig.py:258`+`msgid "Commit Message"`+`msgstr ""`++`#: tortoisehg\hgtk\thgconfig.py:259`+`msgid ""`+`"Font used in changeset viewer and commit log text. Default: monospace 10"`+`msgstr ""`++`#: tortoisehg\hgtk\thgconfig.py:261`+`msgid "Diff Text"`+`msgstr ""`++`#: tortoisehg\hgtk\thgconfig.py:262`+`msgid "Font used for diffs in status and commit tools. Default: monospace 10"`+`msgstr ""`++`#: tortoisehg\hgtk\thgconfig.py:264`+`msgid "File List"`+`msgstr ""`++`#: tortoisehg\hgtk\thgconfig.py:265`+`msgid "Font used in file lists in status and commit tools. Default: sans 9"`+`msgstr ""`++`#: tortoisehg\hgtk\thgconfig.py:267`+`msgid "Command Output"`+`msgstr ""`++`#: tortoisehg\hgtk\thgconfig.py:268`+`msgid "Font used in command output window. Default: monospace 10"`+`msgstr ""`++`#: tortoisehg\hgtk\thgconfig.py:272`+`msgid "Japanese on Windows"`+`msgstr ""`++`#: tortoisehg\hgtk\thgconfig.py:279` `msgid "http"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:257`+`#: tortoisehg\hgtk\thgconfig.py:279` `msgid "ssh"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:258`+`#: tortoisehg\hgtk\thgconfig.py:280` `msgid "https"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:258`+`#: tortoisehg\hgtk\thgconfig.py:280` `msgid "local"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:267`+`#: tortoisehg\hgtk\thgconfig.py:289` `msgid "Edit remote repository path"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:275`+`#: tortoisehg\hgtk\thgconfig.py:297` `msgid "URL"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:276`+`#: tortoisehg\hgtk\thgconfig.py:298` `msgid "Folder"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:278 tortoisehg\hgtk\thgconfig.py:892`+`#: tortoisehg\hgtk\thgconfig.py:300 tortoisehg\hgtk\thgconfig.py:998` `msgid "Alias"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:310`+`#: tortoisehg\hgtk\thgconfig.py:332` `msgid "URL Details"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:321`+`#: tortoisehg\hgtk\thgconfig.py:343` `msgid "Type"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:451`+`#: tortoisehg\hgtk\thgconfig.py:473` `msgid "Select Local Folder"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:476`+`#: tortoisehg\hgtk\thgconfig.py:498` `msgid "Alias name is empty"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:477`+`#: tortoisehg\hgtk\thgconfig.py:499` `msgid "Please enter alias name"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:482 tortoisehg\hgtk\thgconfig.py:832`+`#: tortoisehg\hgtk\thgconfig.py:504 tortoisehg\hgtk\thgconfig.py:932` `msgid "Overwrite existing '%s' path?"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:540`+`#: tortoisehg\hgtk\thgconfig.py:564` `msgid "No repository found"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:541`+`#: tortoisehg\hgtk\thgconfig.py:565` `msgid "no repo at "` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:550`+`#: tortoisehg\hgtk\thgconfig.py:574` `msgid "Iniparse package not found"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:551`-`msgid ""`-`"Please install iniparse package\n"`-`"Settings are only shown, no changing is possible"`-`msgstr ""`--`#: tortoisehg\hgtk\thgconfig.py:562`+`#: tortoisehg\hgtk\thgconfig.py:575`+`msgid "Can't change settings without iniparse package - view is readonly."`+`msgstr ""`++`#: tortoisehg\hgtk\thgconfig.py:592` `msgid "User global settings"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:564`+`#: tortoisehg\hgtk\thgconfig.py:594` `msgid "%s repository settings"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:569`-`msgid "Edit File"`-`msgstr ""`--`#: tortoisehg\hgtk\thgconfig.py:592`+`#: tortoisehg\hgtk\thgconfig.py:658` `msgid ""` `"Default language for spell check. System language is used if not specified. "` `"Examples: en, en_GB, en_US"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:606`-`msgid "Sync"`-`msgstr ""`--`#: tortoisehg\hgtk\thgconfig.py:610`-`msgid "Web"`-`msgstr ""`--`#: tortoisehg\hgtk\thgconfig.py:613`+`#: tortoisehg\hgtk\thgconfig.py:669 tortoisehg\util\menuthg.py:58`+`msgid "Web Server"`+`msgstr ""`++`#: tortoisehg\hgtk\thgconfig.py:670` `msgid "Proxy"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:619`+`#: tortoisehg\hgtk\thgconfig.py:672` `msgid "Diff"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:632`+`#: tortoisehg\hgtk\thgconfig.py:673`+`msgid "Font"`+`msgstr ""`++`#: tortoisehg\hgtk\thgconfig.py:707` `msgid "Unapplied changes"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:633`+`#: tortoisehg\hgtk\thgconfig.py:708` `msgid "Lose changes and switch files?."` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:652`+`#: tortoisehg\hgtk\thgconfig.py:719` `msgid "TortoiseHg Configure Repository - "` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:656`+`#: tortoisehg\hgtk\thgconfig.py:723` `msgid "TortoiseHg Configure User-Global Settings"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:713`+`#: tortoisehg\hgtk\thgconfig.py:799` `msgid "Exit after saving changes?"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:714`+`#: tortoisehg\hgtk\thgconfig.py:800` `msgid "&No (discard changes)"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:807`+`#: tortoisehg\hgtk\thgconfig.py:907` `msgid "No Repository Found"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:808`+`#: tortoisehg\hgtk\thgconfig.py:908` `msgid "Path testing cannot work without a repository"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:874`+`#: tortoisehg\hgtk\thgconfig.py:981` `msgid "Remote repository paths"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:896`+`#: tortoisehg\hgtk\thgconfig.py:1002` `msgid "Repository Path"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:910`+`#: tortoisehg\hgtk\thgconfig.py:1024` `msgid "_Edit"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:920`+`#: tortoisehg\hgtk\thgconfig.py:1034` `msgid "_Test"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:925`+`#: tortoisehg\hgtk\thgconfig.py:1039` `msgid "Set as _default"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:1011`+`#: tortoisehg\hgtk\thgconfig.py:1051`+`msgid "Theme default fonts"`+`msgstr ""`++`#: tortoisehg\hgtk\thgconfig.py:1052`+`msgid "Preset fonts:"`+`msgstr ""`++`#: tortoisehg\hgtk\thgconfig.py:1053`+`msgid "Custom fonts:"`+`msgstr ""`++`#: tortoisehg\hgtk\thgconfig.py:1061`+`msgid " - Select Preset -"`+`msgstr ""`++`#: tortoisehg\hgtk\thgconfig.py:1171` `msgid "Suggested"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:1021`+`#: tortoisehg\hgtk\thgconfig.py:1181` `msgid "History"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:1059`+`#: tortoisehg\hgtk\thgconfig.py:1233` `msgid "# Generated by tortoisehg-config\n"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:1113`+`#: tortoisehg\hgtk\thgconfig.py:1239`+`msgid "Unable to create a Mercurial.ini file"`+`msgstr ""`++`#: tortoisehg\hgtk\thgconfig.py:1240`+`msgid "Insufficient access rights, reverting to read-onlymode."`+`msgstr ""`++`#: tortoisehg\hgtk\thgconfig.py:1262`+`msgid "Unable to parse a config file"`+`msgstr ""`++`#: tortoisehg\hgtk\thgconfig.py:1263`+`msgid ""`+`"%s\n"`+`"Reverting to read-only mode."`+`msgstr ""`++`#: tortoisehg\hgtk\thgconfig.py:1308` `msgid "Skipped saving path with no alias"` `msgstr ""` -`#: tortoisehg\hgtk\thgconfig.py:1141`+`#: tortoisehg\hgtk\thgconfig.py:1336` `msgid "Unable to write configuration file"` `msgstr ""` -`#: tortoisehg\hgtk\thgmq.py:95`+`#: tortoisehg\hgtk\thgimport.py:44`+`msgid "Import - %s"`+`msgstr ""`++`#: tortoisehg\hgtk\thgimport.py:76`+`msgid "Browse Directory..."`+`msgstr ""`++`#: tortoisehg\hgtk\thgimport.py:78`+`msgid "Import from Clipboard"`+`msgstr ""`++`#: tortoisehg\hgtk\thgimport.py:82`+`msgid "Source:"`+`msgstr ""`++`#: tortoisehg\hgtk\thgimport.py:101 tortoisehg\hgtk\thgstrip.py:76`+`msgid "Preview:"`+`msgstr ""`++`#: tortoisehg\hgtk\thgimport.py:106`+`msgid "Repository"`+`msgstr ""`++`#: tortoisehg\hgtk\thgimport.py:160`+`msgid "Import"`+`msgstr ""`++`#: tortoisehg\hgtk\thgimport.py:180`+`msgid "Imported successfully"`+`msgstr ""`++`#: tortoisehg\hgtk\thgimport.py:182`+`msgid "Canceled importing"`+`msgstr ""`++`#: tortoisehg\hgtk\thgimport.py:188`+`msgid "Confirm Close"`+`msgstr ""`++`#: tortoisehg\hgtk\thgimport.py:189`+`msgid "Do you want to close?"`+`msgstr ""`++`#: tortoisehg\hgtk\thgimport.py:199`+`msgid "Select Patches"`+`msgstr ""`++`#: tortoisehg\hgtk\thgimport.py:210`+`msgid "Select Directory contains patches:"`+`msgstr ""`++`#: tortoisehg\hgtk\thgimport.py:277`+`msgid "%s patches"`+`msgstr ""`++`#: tortoisehg\hgtk\thgimport.py:279`+`msgid "%s will be imported to the"`+`msgstr ""`++`#: tortoisehg\hgtk\thgimport.py:281`+`msgid "%s will be imported to the repository"`+`msgstr ""`++`#: tortoisehg\hgtk\thgimport.py:283`+`msgid "Nothing to import"`+`msgstr ""`++`#: tortoisehg\hgtk\thgimport.py:341`+`msgid "unexpected destination name: %s"`+`msgstr ""`++`#: tortoisehg\hgtk\thgmq.py:102` `msgid "Unapply all patches"` `msgstr ""` -`#: tortoisehg\hgtk\thgmq.py:100`+`#: tortoisehg\hgtk\thgmq.py:107` `msgid "Unapply last patch"` `msgstr ""` -`#: tortoisehg\hgtk\thgmq.py:106`+`#: tortoisehg\hgtk\thgmq.py:112` `msgid "Apply next patch"` `msgstr ""` -`#: tortoisehg\hgtk\thgmq.py:111`+`#: tortoisehg\hgtk\thgmq.py:117` `msgid "Apply all patches"` `msgstr ""` -`#: tortoisehg\hgtk\thgmq.py:184`+`#: tortoisehg\hgtk\thgmq.py:200` `msgid "#"` `msgstr ""` -`#: tortoisehg\hgtk\thgmq.py:268`-`msgid "%(count)d of %(total)d Patches applied"`-`msgstr ""`--`#: tortoisehg\hgtk\thgmq.py:272`-`msgid "Patch '%s' applied"`-`msgstr ""`--`#: tortoisehg\hgtk\thgmq.py:325`+`#: tortoisehg\hgtk\thgmq.py:202`+`msgid "Patch"`+`msgstr ""`++`#: tortoisehg\hgtk\thgmq.py:345`+`msgid "Yes (&keep)"`+`msgstr ""`++`#: tortoisehg\hgtk\thgmq.py:348 tortoisehg\hgtk\thgmq.py:352` `msgid "Confirm Delete"` `msgstr ""` -`#: tortoisehg\hgtk\thgmq.py:326`-`msgid "Do you want to delete?"`-`msgstr ""`--`#: tortoisehg\hgtk\thgmq.py:327`-`msgid "Yes (&keep)"`-`msgstr ""`--`#: tortoisehg\hgtk\thgmq.py:409`+`#: tortoisehg\hgtk\thgmq.py:349`+`msgid "Do you want to delete '%(name)s'?"`+`msgstr ""`++`#: tortoisehg\hgtk\thgmq.py:353`+`msgid "Do you want to delete these patches?"`+`msgstr ""`++`#: tortoisehg\hgtk\thgmq.py:442 tortoisehg\hgtk\thgmq.py:446` `msgid "Confirm Fold"` `msgstr ""` -`#: tortoisehg\hgtk\thgmq.py:410`+`#: tortoisehg\hgtk\thgmq.py:443` `msgid ""` `"Do you want to fold un-applied patch '%(target)s' into current patch "` `"'%(qtip)s'?"` `msgstr ""` -`#: tortoisehg\hgtk\thgmq.py:567`-`msgid "_goto"`-`msgstr ""`--`#: tortoisehg\hgtk\thgmq.py:569`-`msgid "_rename"`-`msgstr ""`--`#: tortoisehg\hgtk\thgmq.py:571`-`msgid "_finish applied"`-`msgstr ""`--`#: tortoisehg\hgtk\thgmq.py:573`-`msgid "_delete"`-`msgstr ""`--`#: tortoisehg\hgtk\thgmq.py:574`-`msgid "delete --keep"`-`msgstr ""`--`#: tortoisehg\hgtk\thgmq.py:576`-`msgid "f_old"`-`msgstr ""`--`#: tortoisehg\hgtk\thgmq.py:578`-`msgid "make it _next"`-`msgstr ""`--`#: tortoisehg\hgtk\thgmq.py:612`-`msgid "Show index"`-`msgstr ""`--`#: tortoisehg\hgtk\thgmq.py:613`-`msgid "Show status"`-`msgstr ""`--`#: tortoisehg\hgtk\thgmq.py:614`-`msgid "Show name"`-`msgstr ""`--`#: tortoisehg\hgtk\thgmq.py:615`-`msgid "Show summary"`-`msgstr ""`--`#: tortoisehg\hgtk\thgmq.py:621`+`#: tortoisehg\hgtk\thgmq.py:447`+`msgid ""`+`"Do you want to fold following un-applied patches into the current patch "`+`"'%(qtip)s'?"`+`msgstr ""`++`#: tortoisehg\hgtk\thgmq.py:502`+`msgid "invalid reorder operation: %s"`+`msgstr ""`++`#: tortoisehg\hgtk\thgmq.py:741`+`msgid "Top"`+`msgstr ""`++`#: tortoisehg\hgtk\thgmq.py:743`+`msgid "Up"`+`msgstr ""`++`#: tortoisehg\hgtk\thgmq.py:745`+`msgid "Down"`+`msgstr ""`++`#: tortoisehg\hgtk\thgmq.py:747`+`msgid "Bottom"`+`msgstr ""`++`#: tortoisehg\hgtk\thgmq.py:768`+`msgid "_Goto"`+`msgstr ""`++`#: tortoisehg\hgtk\thgmq.py:770`+`msgid "_Rename"`+`msgstr ""`++`#: tortoisehg\hgtk\thgmq.py:772`+`msgid "_Finish Applied"`+`msgstr ""`++`#: tortoisehg\hgtk\thgmq.py:775 tortoisehg\hgtk\thgmq.py:805`+`msgid "_Delete"`+`msgstr ""`++`#: tortoisehg\hgtk\thgmq.py:777 tortoisehg\hgtk\thgmq.py:808`+`msgid "F_old"`+`msgstr ""`++`#: tortoisehg\hgtk\thgmq.py:780 tortoisehg\hgtk\thgmq.py:812`+`msgid "Reorder"`+`msgstr ""`++`#: tortoisehg\hgtk\thgmq.py:832`+`msgid "Status"`+`msgstr ""`++`#: tortoisehg\hgtk\thgmq.py:839` `msgid "Enable editable cells"` `msgstr ""` -`#: tortoisehg\hgtk\thgmq.py:624`+`#: tortoisehg\hgtk\thgmq.py:842` `msgid "Show 'qparent'"` `msgstr ""` -`#: tortoisehg\hgtk\thgmq.py:642`+`#: tortoisehg\hgtk\thgmq.py:861` `msgid "Succeed"` `msgstr ""` @@ -4352,7 +5163,7 @@ `msgstr ""` `#: tortoisehg\hgtk\thgshelve.py:107`-`msgid "_shelve"`+`msgid "_Shelve"` `msgstr ""` `#: tortoisehg\hgtk\thgshelve.py:140`@@ -4375,604 +5186,689 @@ `msgid "Append"` `msgstr ""` -`#: tortoisehg\hgtk\thgshelve.py:157`-`msgid "Cancel"`-`msgstr ""`- `#: tortoisehg\hgtk\thgshelve.py:209` `msgid "Unshelve Error"` `msgstr ""` -`#: tortoisehg\hgtk\thgstrip.py:39`+`#: tortoisehg\hgtk\thgstrip.py:36`+`msgid "Strip - %s"`+`msgstr ""`++`#: tortoisehg\hgtk\thgstrip.py:51`+`msgid "Strip:"`+`msgstr ""`++`#: tortoisehg\hgtk\thgstrip.py:85 tortoisehg\hgtk\update.py:94`+`msgid "Options:"`+`msgstr ""`++`#: tortoisehg\hgtk\thgstrip.py:89`+`msgid "Discard local changes, no backup (-f/--force)"`+`msgstr ""`++`#: tortoisehg\hgtk\thgstrip.py:111`+`msgid "Backup all (default)"`+`msgstr ""`++`#: tortoisehg\hgtk\thgstrip.py:112`+`msgid "Backup unrelated changesets (-b/--backup)"`+`msgstr ""`++`#: tortoisehg\hgtk\thgstrip.py:114`+`msgid "No backup (-n/--nobackup)"`+`msgstr ""`++`#: tortoisehg\hgtk\thgstrip.py:121` `msgid "Strip"` `msgstr ""` -`#: tortoisehg\hgtk\thgstrip.py:48`-`msgid "Strip - %s"`-`msgstr ""`--`#: tortoisehg\hgtk\thgstrip.py:64`-`msgid "Strip:"`-`msgstr ""`--`#: tortoisehg\hgtk\thgstrip.py:79`-`msgid "Preview:"`-`msgstr ""`--`#: tortoisehg\hgtk\thgstrip.py:98`-`msgid "Show all"`-`msgstr ""`--`#: tortoisehg\hgtk\thgstrip.py:101`-`msgid "Use compact view"`-`msgstr ""`--`#: tortoisehg\hgtk\thgstrip.py:117`-`msgid "Options:"`-`msgstr ""`--`#: tortoisehg\hgtk\thgstrip.py:121`-`msgid "Discard local changes, no backup (-f/--force)"`-`msgstr ""`--`#: tortoisehg\hgtk\thgstrip.py:152`-`msgid "Backup all (default)"`-`msgstr ""`--`#: tortoisehg\hgtk\thgstrip.py:153`-`msgid "Backup unrelated changesets (-b/--backup)"`-`msgstr ""`--`#: tortoisehg\hgtk\thgstrip.py:155`-`msgid "No backup (-n/--nobackup)"`-`msgstr ""`--`#: tortoisehg\hgtk\thgstrip.py:182`+`#: tortoisehg\hgtk\thgstrip.py:140`+`msgid "Stripped successfully"`+`msgstr ""`++`#: tortoisehg\hgtk\thgstrip.py:143`+`msgid "Canceled stripping"`+`msgstr ""`++`#: tortoisehg\hgtk\thgstrip.py:145`+`msgid "Failed to strip"`+`msgstr ""`++`#: tortoisehg\hgtk\thgstrip.py:176` `msgid "Unknown revision!"` `msgstr ""` -`#: tortoisehg\hgtk\thgstrip.py:184`-`msgid "<span weight=\"bold\">%s changesets</span> will be stripped"`-`msgstr ""`--`#: tortoisehg\hgtk\thgstrip.py:190`-`msgid "No changesets to display"`-`msgstr ""`--`#: tortoisehg\hgtk\thgstrip.py:194`-`msgid "Displaying all changesets"`-`msgstr ""`--`#: tortoisehg\hgtk\thgstrip.py:196`-`msgid "Displaying %(count)d of %(total)d changesets"`-`msgstr ""`--`#: tortoisehg\hgtk\thgstrip.py:359`+`#: tortoisehg\hgtk\thgstrip.py:179`+`msgid "%s changesets"`+`msgstr ""`++`#: tortoisehg\hgtk\thgstrip.py:180`+`msgid "%s will be stripped"`+`msgstr ""`++`#: tortoisehg\hgtk\thgstrip.py:214` `msgid "Confirm Strip"` `msgstr ""` -`#: tortoisehg\hgtk\thgstrip.py:360`+`#: tortoisehg\hgtk\thgstrip.py:215` `msgid ""` `"Detected uncommitted local changes.\n"` `"Do you want to discard them and continue?"` `msgstr ""` -`#: tortoisehg\hgtk\thgstrip.py:362`+`#: tortoisehg\hgtk\thgstrip.py:217` `msgid "&Yes (--force)"` `msgstr ""` -`#: tortoisehg\hgtk\thgstrip.py:380`-`msgid "Stripped successfully"`-`msgstr ""`--`#: tortoisehg\hgtk\thgstrip.py:383`-`msgid "Canceled stripping"`-`msgstr ""`--`#: tortoisehg\hgtk\thgstrip.py:385`-`msgid "Failed to strip"`-`msgstr ""`--`#: tortoisehg\hgtk\thgstrip.py:404`+`#: tortoisehg\hgtk\thgstrip.py:252` `msgid "Saved at: %s"` `msgstr ""` -`#: tortoisehg\hgtk\thgstrip.py:408`+`#: tortoisehg\hgtk\thgstrip.py:256` `msgid "Open..."` `msgstr ""` -`#: tortoisehg\hgtk\update.py:42`+`#: tortoisehg\hgtk\update.py:27` `msgid "Update - %s"` `msgstr ""` -`#: tortoisehg\hgtk\update.py:58`+`#: tortoisehg\hgtk\update.py:46` `msgid "Update to:"` `msgstr ""` -`#: tortoisehg\hgtk\update.py:61`+`#: tortoisehg\hgtk\update.py:78`+`msgid "Target:"`+`msgstr ""`++`#: tortoisehg\hgtk\update.py:86`+`msgid "Parent 1:"`+`msgstr ""`++`#: tortoisehg\hgtk\update.py:88`+`msgid "Parent 2:"`+`msgstr ""`++`#: tortoisehg\hgtk\update.py:98` `msgid "Discard local changes, no backup (-C/--clean)"` `msgstr ""` -`#: tortoisehg\hgtk\update.py:91`-`msgid "Target:"`-`msgstr ""`--`#: tortoisehg\hgtk\update.py:99`-`msgid "Parent 1:"`-`msgstr ""`--`#: tortoisehg\hgtk\update.py:101`-`msgid "Parent 2:"`-`msgstr ""`--`#: tortoisehg\hgtk\update.py:181`+`#: tortoisehg\hgtk\update.py:104`+`msgid "Always merge (when possible)"`+`msgstr ""`++`#: tortoisehg\hgtk\update.py:107`+`msgid "Always show log"`+`msgstr ""`++`#: tortoisehg\hgtk\update.py:149`+`msgid "Updated successfully"`+`msgstr ""`++`#: tortoisehg\hgtk\update.py:153`+`msgid "Failed to update"`+`msgstr ""`++`#: tortoisehg\hgtk\update.py:186` `msgid "(same as parent)"` `msgstr ""` -`#: tortoisehg\hgtk\update.py:187`+`#: tortoisehg\hgtk\update.py:193` `msgid "unknown revision!"` `msgstr ""` -`#: tortoisehg\hgtk\update.py:223`+`#: tortoisehg\hgtk\update.py:228` `msgid ""` `"Detected uncommitted local changes in working tree.\n"` `"Please select to continue:\n"` `"\n"` `msgstr ""` -`#: tortoisehg\hgtk\update.py:225`+`#: tortoisehg\hgtk\update.py:230` `msgid "&Discard"` `msgstr ""` -`#: tortoisehg\hgtk\update.py:226`+`#: tortoisehg\hgtk\update.py:231` `msgid "Discard - discard local changes, no backup"` `msgstr ""` -`#: tortoisehg\hgtk\update.py:227`+`#: tortoisehg\hgtk\update.py:232` `msgid "&Shelve"` `msgstr ""` -`#: tortoisehg\hgtk\update.py:228`+`#: tortoisehg\hgtk\update.py:233` `msgid "Shelve - launch Shelve tool and continue"` `msgstr ""` -`#: tortoisehg\hgtk\update.py:229`+`#: tortoisehg\hgtk\update.py:234` `msgid "&Merge"` `msgstr ""` -`#: tortoisehg\hgtk\update.py:230`+`#: tortoisehg\hgtk\update.py:235` `msgid "Merge - allow to merge with local changes"` `msgstr ""` -`#: tortoisehg\hgtk\update.py:243`+`#: tortoisehg\hgtk\update.py:248` `msgid "Confirm Update"` `msgstr ""` -`#: tortoisehg\hgtk\update.py:267`+`#: tortoisehg\hgtk\update.py:277` `msgid "[canceled by user]\n"` `msgstr ""` -`#: tortoisehg\hgtk\update.py:272`+`#: tortoisehg\hgtk\update.py:282` `msgid "invalid dialog result: %s"` `msgstr ""` -`#: tortoisehg\hgtk\update.py:281`-`msgid "Updated successfully"`-`msgstr ""`--`#: tortoisehg\hgtk\update.py:283`-`msgid "Canceled updating"`-`msgstr ""`--`#: tortoisehg\hgtk\update.py:285`-`msgid "Failed to update"`-`msgstr ""`--`#: tortoisehg\hgtk\visdiff.py:60`+`#: tortoisehg\hgtk\visdiff.py:34`+`msgid "[non-existant]"`+`msgstr ""`++`#: tortoisehg\hgtk\visdiff.py:81`+`msgid "Tool launch failure"`+`msgstr ""`++`#: tortoisehg\hgtk\visdiff.py:82`+`msgid "%s : %s"`+`msgstr ""`++`#: tortoisehg\hgtk\visdiff.py:88 tortoisehg\hgtk\visdiff.py:156`+`msgid "No diff tool found"`+`msgstr ""`++`#: tortoisehg\hgtk\visdiff.py:89 tortoisehg\hgtk\visdiff.py:157`+`msgid "No visual diff tools were detected"`+`msgstr ""`++`#: tortoisehg\hgtk\visdiff.py:94`+`msgid "[working copy]"`+`msgstr ""`++`#: tortoisehg\hgtk\visdiff.py:95`+`msgid "[original]"`+`msgstr ""`++`#: tortoisehg\hgtk\visdiff.py:132`+`msgid "Unable to find changeset"`+`msgstr ""`++`#: tortoisehg\hgtk\visdiff.py:133`+`msgid "You likely need to refresh this application"`+`msgstr ""`++`#: tortoisehg\hgtk\visdiff.py:150`+`msgid "No file changes"`+`msgstr ""`++`#: tortoisehg\hgtk\visdiff.py:151`+`msgid "There are no file changes to view"`+`msgstr ""`++`#: tortoisehg\hgtk\visdiff.py:284`+`msgid "cleaning up temp directory\n"`+`msgstr ""`++`#: tortoisehg\hgtk\visdiff.py:301` `msgid "Visual Diffs"` `msgstr ""` -`#: tortoisehg\hgtk\visdiff.py:68`+`#: tortoisehg\hgtk\visdiff.py:306`+`msgid "working changes"`+`msgstr ""`++`#: tortoisehg\hgtk\visdiff.py:308`+`msgid "changeset "`+`msgstr ""`++`#: tortoisehg\hgtk\visdiff.py:310`+`msgid "revisions %d to %d"`+`msgstr ""`++`#: tortoisehg\hgtk\visdiff.py:311`+`msgid "Visual Diffs - "`+`msgstr ""`++`#: tortoisehg\hgtk\visdiff.py:313`+`msgid " filtered"`+`msgstr ""`++`#: tortoisehg\hgtk\visdiff.py:327` `msgid "Temporary files are removed when this dialog is closed"` `msgstr ""` -`#: tortoisehg\hgtk\visdiff.py:86`-`msgid "Always launch single files"`-`msgstr ""`--`#: tortoisehg\hgtk\visdiff.py:101`-`msgid "No repository"`-`msgstr ""`--`#: tortoisehg\hgtk\visdiff.py:102 tortoisehg\hgtk\visdiff.py:373`+`#: tortoisehg\hgtk\visdiff.py:381`+`msgid "Dir diff to p1"`+`msgstr ""`++`#: tortoisehg\hgtk\visdiff.py:383`+`msgid "Dir diff to p2"`+`msgstr ""`++`#: tortoisehg\hgtk\visdiff.py:385`+`msgid "3-way dir diff"`+`msgstr ""`++`#: tortoisehg\hgtk\visdiff.py:391`+`msgid "Directory diff"`+`msgstr ""`++`#: tortoisehg\hgtk\visdiff.py:524`+`msgid "Unable to delete temp files"`+`msgstr ""`++`#: tortoisehg\hgtk\visdiff.py:525`+`msgid "Close diff tools and try again, or quit to leak files?"`+`msgstr ""`++`#: tortoisehg\hgtk\visdiff.py:526`+`msgid "&Quit"`+`msgstr ""`++`#: tortoisehg\hgtk\visdiff.py:526`+`msgid "Try &Again"`+`msgstr ""`++`#: tortoisehg\hgtk\visdiff.py:622` `msgid "No repository found here"` `msgstr ""` -`#: tortoisehg\hgtk\visdiff.py:109`-`msgid "Select diff tool"`-`msgstr ""`--`#: tortoisehg\hgtk\visdiff.py:148`-`msgid "No visual diff tool"`-`msgstr ""`--`#: tortoisehg\hgtk\visdiff.py:149`-`msgid "No visual diff tool has been configured"`-`msgstr ""`--`#: tortoisehg\hgtk\visdiff.py:177`-`msgid "changeset "`-`msgstr ""`--`#: tortoisehg\hgtk\visdiff.py:183`-`msgid "working changes"`-`msgstr ""`--`#: tortoisehg\hgtk\visdiff.py:186`-`msgid "revisions "`-`msgstr ""`--`#: tortoisehg\hgtk\visdiff.py:193`-`msgid "Visual Diffs - "`-`msgstr ""`--`#: tortoisehg\hgtk\visdiff.py:207 tortoisehg\hgtk\visdiff.py:398`-`msgid "No file changes"`-`msgstr ""`--`#: tortoisehg\hgtk\visdiff.py:208 tortoisehg\hgtk\visdiff.py:399`-`msgid "There are no file changes to view"`-`msgstr ""`--`#: tortoisehg\hgtk\visdiff.py:277`-`msgid "Unable to delete temp files"`-`msgstr ""`--`#: tortoisehg\hgtk\visdiff.py:278`-`msgid "Close diff tools and try again, or quit to leak files?"`-`msgstr ""`--`#: tortoisehg\hgtk\visdiff.py:279`-`msgid "&Quit"`-`msgstr ""`--`#: tortoisehg\hgtk\visdiff.py:279`-`msgid "Try &Again"`-`msgstr ""`--`#: tortoisehg\hgtk\visdiff.py:340`-`msgid "Tool launch failure"`-`msgstr ""`--`#: tortoisehg\hgtk\visdiff.py:341`-`msgid "%s : %s"`-`msgstr ""`--`#: tortoisehg\hgtk\visdiff.py:380`-`msgid "Extdiff command not recognized\n"`-`msgstr ""`--`#: tortoisehg\util\hgshelve.py:46`+`#: tortoisehg\util\hgshelve.py:51` `msgid "Unsupported line endings type: %s"` `msgstr ""` -`#: tortoisehg\util\hgshelve.py:97`+`#: tortoisehg\util\hgshelve.py:105` `msgid "unknown patch content: %r"` `msgstr ""` -`#: tortoisehg\util\hgshelve.py:118 tortoisehg\util\hgshelve.py:145`+`#: tortoisehg\util\hgshelve.py:126 tortoisehg\util\hgshelve.py:153` `msgid "this modifies a binary file (all or nothing)\n"` `msgstr ""` -`#: tortoisehg\util\hgshelve.py:123 tortoisehg\util\hgshelve.py:150`+`#: tortoisehg\util\hgshelve.py:131 tortoisehg\util\hgshelve.py:158` `msgid "this is a binary file\n"` `msgstr ""` -`#: tortoisehg\util\hgshelve.py:134`+`#: tortoisehg\util\hgshelve.py:142` `msgid ""` `"total: %d hunks (%d changed lines); selected: %d hunks (%d changed lines)"` `msgstr ""` -`#: tortoisehg\util\hgshelve.py:153`+`#: tortoisehg\util\hgshelve.py:161` `msgid "%d hunks, %d lines changed\n"` `msgstr ""` -`#: tortoisehg\util\hgshelve.py:299`+`#: tortoisehg\util\hgshelve.py:307` `msgid "unhandled transition: %s -> %s"` `msgstr ""` -`#: tortoisehg\util\hgshelve.py:325`+`#: tortoisehg\util\hgshelve.py:333` `msgid " [Ynsfdaq?] "` `msgstr ""` -`#: tortoisehg\util\hgshelve.py:341`+`#: tortoisehg\util\hgshelve.py:349` `msgid "user quit"` `msgstr ""` -`#: tortoisehg\util\hgshelve.py:355`+`#: tortoisehg\util\hgshelve.py:363` `msgid "shelve changes to %s?"` `msgstr ""` -`#: tortoisehg\util\hgshelve.py:356`+`#: tortoisehg\util\hgshelve.py:364` `msgid " and "` `msgstr ""` -`#: tortoisehg\util\hgshelve.py:366`+`#: tortoisehg\util\hgshelve.py:374` `msgid "shelve this change to %r?"` `msgstr ""` -`#: tortoisehg\util\hgshelve.py:405`+`#: tortoisehg\util\hgshelve.py:413` `msgid "backup %r as %r\n"` `msgstr ""` -`#: tortoisehg\util\hgshelve.py:438`+`#: tortoisehg\util\hgshelve.py:446` `msgid "shelve can only be run interactively"` `msgstr ""` -`#: tortoisehg\util\hgshelve.py:442`+`#: tortoisehg\util\hgshelve.py:450` `msgid "shelve data already exists"` `msgstr ""` -`#: tortoisehg\util\hgshelve.py:473`+`#: tortoisehg\util\hgshelve.py:481` `msgid "no changes to shelve\n"` `msgstr ""` -`#: tortoisehg\util\hgshelve.py:507`+`#: tortoisehg\util\hgshelve.py:515` `msgid "applying patch\n"` `msgstr ""` -`#: tortoisehg\util\hgshelve.py:514`+`#: tortoisehg\util\hgshelve.py:522` `msgid "saving patch to shelve\n"` `msgstr ""` -`#: tortoisehg\util\hgshelve.py:525 tortoisehg\util\hgshelve.py:576`+`#: tortoisehg\util\hgshelve.py:533 tortoisehg\util\hgshelve.py:584` `msgid "restoring %r to %r\n"` `msgstr ""` -`#: tortoisehg\util\hgshelve.py:527`+`#: tortoisehg\util\hgshelve.py:535` `msgid "removing shelve file\n"` `msgstr ""` -`#: tortoisehg\util\hgshelve.py:536`+`#: tortoisehg\util\hgshelve.py:544` `msgid "removing backup for %r : %r\n"` `msgstr ""` -`#: tortoisehg\util\hgshelve.py:561`+`#: tortoisehg\util\hgshelve.py:569` `msgid "applying shelved patch\n"` `msgstr ""` -`#: tortoisehg\util\hgshelve.py:574`+`#: tortoisehg\util\hgshelve.py:582` `msgid "restoring backup files\n"` `msgstr ""` -`#: tortoisehg\util\hgshelve.py:581`+`#: tortoisehg\util\hgshelve.py:589` `msgid "removing backup files\n"` `msgstr ""` -`#: tortoisehg\util\hgshelve.py:587`+`#: tortoisehg\util\hgshelve.py:595` `msgid "removing shelved patches\n"` `msgstr ""` -`#: tortoisehg\util\hgshelve.py:589`+`#: tortoisehg\util\hgshelve.py:597` `msgid "unshelve completed\n"` `msgstr ""` -`#: tortoisehg\util\hgshelve.py:591`+`#: tortoisehg\util\hgshelve.py:599` `msgid "nothing to unshelve\n"` `msgstr ""` -`#: tortoisehg\util\hgshelve.py:597`+`#: tortoisehg\util\hgshelve.py:605` `msgid "mark new/missing files as added/removed before shelving"` `msgstr ""` -`#: tortoisehg\util\hgshelve.py:599`+`#: tortoisehg\util\hgshelve.py:607` `msgid "overwrite existing shelve data"` `msgstr ""` -`#: tortoisehg\util\hgshelve.py:601`+`#: tortoisehg\util\hgshelve.py:609` `msgid "append to existing shelve data"` `msgstr ""` -`#: tortoisehg\util\hgshelve.py:603`+`#: tortoisehg\util\hgshelve.py:611` `msgid "hg shelve [OPTION]... [FILE]..."` `msgstr ""` -`#: tortoisehg\util\hgshelve.py:606`+`#: tortoisehg\util\hgshelve.py:614` `msgid "inspect shelved changes only"` `msgstr ""` -`#: tortoisehg\util\hgshelve.py:608`+`#: tortoisehg\util\hgshelve.py:616` `msgid "proceed even if patches do not unshelve cleanly"` `msgstr ""` -`#: tortoisehg\util\hgshelve.py:610`+`#: tortoisehg\util\hgshelve.py:618` `msgid "hg unshelve [OPTION]... [FILE]..."` `msgstr ""` +`#: tortoisehg\util\menuthg.py:19`+`msgid "Commit..."`+`msgstr ""`++`#: tortoisehg\util\menuthg.py:20`+`msgid "Commit changes in repository"`+`msgstr ""`++`#: tortoisehg\util\menuthg.py:22`+`msgid "Create Repository Here"`+`msgstr ""`++`#: tortoisehg\util\menuthg.py:23`+`msgid "Create a new repository"`+`msgstr ""`++`#: tortoisehg\util\menuthg.py:25`+`msgid "Clone..."`+`msgstr ""`++`#: tortoisehg\util\menuthg.py:26`+`msgid "Create clone here from source"`+`msgstr ""`++`#: tortoisehg\util\menuthg.py:28`+`msgid "File Status"`+`msgstr ""`++`#: tortoisehg\util\menuthg.py:29`+`msgid "Repository status & changes"`+`msgstr ""`++`#: tortoisehg\util\menuthg.py:31`+`msgid "Shelve Changes"`+`msgstr ""`++`#: tortoisehg\util\menuthg.py:32`+`msgid "Shelve or unshelve file changes"`+`msgstr ""`++`#: tortoisehg\util\menuthg.py:34`+`msgid "Add Files..."`+`msgstr ""`++`#: tortoisehg\util\menuthg.py:35`+`msgid "Add files to version control"`+`msgstr ""`++`#: tortoisehg\util\menuthg.py:37`+`msgid "Revert Files..."`+`msgstr ""`+ `#: tortoisehg\util\menuthg.py:38`-`msgid "Commit..."`-`msgstr ""`--`#: tortoisehg\util\menuthg.py:39`-`msgid "Commit changes in repository"`-`msgstr ""`--`#: tortoisehg\util\menuthg.py:41`-`msgid "Create Repository Here"`-`msgstr ""`--`#: tortoisehg\util\menuthg.py:44`-`msgid "Clone..."`-`msgstr ""`--`#: tortoisehg\util\menuthg.py:45`-`msgid "Create clone here from source"`+`msgid "Revert file changes"`+`msgstr ""`++`#: tortoisehg\util\menuthg.py:40`+`msgid "Forget Files..."`+`msgstr ""`++`#: tortoisehg\util\menuthg.py:41 tortoisehg\util\menuthg.py:44`+`msgid "Remove files from version control"`+`msgstr ""`++`#: tortoisehg\util\menuthg.py:43`+`msgid "Remove Files..."`+`msgstr ""`++`#: tortoisehg\util\menuthg.py:46`+`msgid "Rename File"` `msgstr ""` `#: tortoisehg\util\menuthg.py:47`-`msgid "File Status"`-`msgstr ""`--`#: tortoisehg\util\menuthg.py:48`-`msgid "Repository status & changes"`+`msgid "Rename file or directory"` `msgstr ""` `#: tortoisehg\util\menuthg.py:50`-`msgid "Shelve Changes"`-`msgstr ""`--`#: tortoisehg\util\menuthg.py:51`-`msgid "Shelve or unshelve file changes"`+`msgid "View change history in repository"`+`msgstr ""`++`#: tortoisehg\util\menuthg.py:52`+`msgid "File History"` `msgstr ""` `#: tortoisehg\util\menuthg.py:53`-`msgid "Add Files..."`-`msgstr ""`--`#: tortoisehg\util\menuthg.py:54`-`msgid "Add files to version control"`+`msgid "View change history of selected files"` `msgstr ""` `#: tortoisehg\util\menuthg.py:56`-`msgid "Revert Files..."`-`msgstr ""`--`#: tortoisehg\util\menuthg.py:57`-`msgid "Revert file changes"`+`msgid "Synchronize with remote repository"` `msgstr ""` `#: tortoisehg\util\menuthg.py:59`-`msgid "Forget Files..."`-`msgstr ""`--`#: tortoisehg\util\menuthg.py:60 tortoisehg\util\menuthg.py:63`-`msgid "Remove files from version control"`+`msgid "Start web server for this repository"`+`msgstr ""`++`#: tortoisehg\util\menuthg.py:61`+`msgid "Update..."` `msgstr ""` `#: tortoisehg\util\menuthg.py:62`-`msgid "Remove Files..."`+`msgid "Update working directory"`+`msgstr ""`++`#: tortoisehg\util\menuthg.py:64`+`msgid "Recovery..."` `msgstr ""` `#: tortoisehg\util\menuthg.py:65`-`msgid "Rename File"`-`msgstr ""`--`#: tortoisehg\util\menuthg.py:66`-`msgid "Rename file or directory"`+`msgid "Repair and recovery of repository"`+`msgstr ""`++`#: tortoisehg\util\menuthg.py:67`+`msgid "Update Icons"` `msgstr ""` `#: tortoisehg\util\menuthg.py:68`-`msgid "Repository Explorer"`-`msgstr ""`--`#: tortoisehg\util\menuthg.py:69`-`msgid "View change history in repository"`-`msgstr ""`--`#: tortoisehg\util\menuthg.py:72`-`msgid "Synchronize with remote repository"`+`msgid "Update icons for this repository"`+`msgstr ""`++`#: tortoisehg\util\menuthg.py:70`+`msgid "Global Settings"`+`msgstr ""`++`#: tortoisehg\util\menuthg.py:71`+`msgid "Configure user wide settings"`+`msgstr ""`++`#: tortoisehg\util\menuthg.py:73`+`msgid "Repository Settings"` `msgstr ""` `#: tortoisehg\util\menuthg.py:74`-`msgid "Web Server"`-`msgstr ""`--`#: tortoisehg\util\menuthg.py:75`-`msgid "Start web server for this repository"`+`msgid "Configure repository settings"`+`msgstr ""`++`#: tortoisehg\util\menuthg.py:76`+`msgid "Explorer Extension Settings"` `msgstr ""` `#: tortoisehg\util\menuthg.py:77`-`msgid "Update..."`-`msgstr ""`--`#: tortoisehg\util\menuthg.py:78`-`msgid "Update working directory"`-`msgstr ""`--`#: tortoisehg\util\menuthg.py:80`-`msgid "Recovery..."`-`msgstr ""`--`#: tortoisehg\util\menuthg.py:81`-`msgid "Repair and recovery of repository"`-`msgstr ""`--`#: tortoisehg\util\menuthg.py:83`-`msgid "Update Icons"`-`msgstr ""`--`#: tortoisehg\util\menuthg.py:84`-`msgid "Update icons for this repository"`-`msgstr ""`--`#: tortoisehg\util\menuthg.py:86`-`msgid "Global Settings"`-`msgstr ""`--`#: tortoisehg\util\menuthg.py:87`-`msgid "Configure user wide settings"`-`msgstr ""`--`#: tortoisehg\util\menuthg.py:89`-`msgid "Repository Settings"`-`msgstr ""`--`#: tortoisehg\util\menuthg.py:90`-`msgid "Configure repository settings"`-`msgstr ""`--`#: tortoisehg\util\menuthg.py:92`+`msgid "Configure Explorer extension"`+`msgstr ""`++`#: tortoisehg\util\menuthg.py:79` `msgid "About TortoiseHg"` `msgstr "O TortoiseHG"` -`#: tortoisehg\util\menuthg.py:93`+`#: tortoisehg\util\menuthg.py:80` `msgid "Show About Dialog"` `msgstr ""` +`#: tortoisehg\util\menuthg.py:82`+`msgid "Annotate Files"`+`msgstr ""`++`#: tortoisehg\util\menuthg.py:83`+`msgid "Changeset information per file line"`+`msgstr ""`++`#: tortoisehg\util\menuthg.py:85`+`msgid "Visual Diff"`+`msgstr ""`++`#: tortoisehg\util\menuthg.py:86`+`msgid "View changes using GUI diff tool"`+`msgstr ""`++`#: tortoisehg\util\menuthg.py:88`+`msgid "Edit Ignore Filter"`+`msgstr ""`++`#: tortoisehg\util\menuthg.py:89`+`msgid "Edit repository ignore filter"`+`msgstr ""`++`#: tortoisehg\util\menuthg.py:91`+`msgid "Guess Renames"`+`msgstr ""`++`#: tortoisehg\util\menuthg.py:92`+`msgid "Detect renames and copies"`+`msgstr ""`++`#: tortoisehg\util\menuthg.py:94`+`msgid "Search History"`+`msgstr ""`+ `#: tortoisehg\util\menuthg.py:95`-`msgid "Annotate Files"`-`msgstr ""`--`#: tortoisehg\util\menuthg.py:96`-`msgid "Changeset information per file line"`+`msgid "Search file revisions for patterns"`+`msgstr ""`++`#: tortoisehg\util\menuthg.py:97`+`msgid "DnD Synchronize"` `msgstr ""` `#: tortoisehg\util\menuthg.py:98`-`msgid "Visual Diff"`-`msgstr ""`--`#: tortoisehg\util\menuthg.py:99`-`msgid "View changes using GUI diff tool"`-`msgstr ""`--`#: tortoisehg\util\menuthg.py:101`-`msgid "Edit Ignore Filter"`-`msgstr ""`--`#: tortoisehg\util\menuthg.py:102`-`msgid "Edit repository ignore filter"`-`msgstr ""`--`#: tortoisehg\util\menuthg.py:104`-`msgid "Guess Renames"`-`msgstr ""`--`#: tortoisehg\util\menuthg.py:105`-`msgid "Detect renames and copies"`-`msgstr ""`--`#: tortoisehg\util\menuthg.py:107`-`msgid "Search History"`-`msgstr ""`--`#: tortoisehg\util\menuthg.py:108`-`msgid "Search file revisions for patterns"`-`msgstr ""`--`#: tortoisehg\util\menuthg.py:110`-`msgid "DnD Synchronize"`-`msgstr ""`--`#: tortoisehg\util\menuthg.py:111` `msgid "Synchronize with dragged repository"` `msgstr ""`++`#: tortoisehg\util\prej.py:143`+`msgid "patching file %s\n"`+`msgstr ""`++`#: tortoisehg\util\prej.py:190`+`msgid "%d out of %d hunk%s FAILED -- saving rejects to file %s\n"`+`msgstr ""`++`#: tortoisehg\util\prej.py:226`+`msgid "bad hunk #%d %s (%d %d %d %d)"`+`msgstr ""`++`#: tortoisehg\util\prej.py:235`+`msgid "file %s already exists\n"`+`msgstr ""`++`#: tortoisehg\util\prej.py:287`+`msgid "Hunk #%d succeeded at %d with fuzz %d (offset %d lines).\n"`+`msgstr ""`++`#: tortoisehg\util\prej.py:294`+`msgid "Hunk #%d succeeded at %d (offset %d lines).\n"`+`msgstr ""`++`#: tortoisehg\util\prej.py:299`+`msgid "Hunk #%d FAILED at %d\n"`+`msgstr ""`++`#: tortoisehg\util\prej.py:318 tortoisehg\util\prej.py:344`+`#: tortoisehg\util\prej.py:376`+`msgid "bad hunk #%d"`+`msgstr ""`++`#: tortoisehg\util\prej.py:363 tortoisehg\util\prej.py:405`+`msgid "bad hunk #%d old text line %d"`+`msgstr ""`++`#: tortoisehg\util\prej.py:550`+`msgid "could not extract binary patch"`+`msgstr ""`++`#: tortoisehg\util\prej.py:566`+`msgid "binary patch is %d bytes, not %d"`+`msgstr ""`++`#: tortoisehg\util\prej.py:591`+`msgid "unable to strip away %d dirs from %s"`+`msgstr ""`++`#: tortoisehg\util\prej.py:613`+`msgid "unable to find %s or %s for patching"`+`msgstr ""`++`#: tortoisehg\util\prej.py:792`+`msgid "malformed patch %s %s"`+`msgstr ""`++`#: tortoisehg\util\prej.py:803`+`msgid "No valid hunks found"`+`msgstr ""`++`#: tortoisehg\util\version.py:17`+`msgid "repository %s not found"`+`msgstr ""`

Change 1 of 1 Show Changes Only Show Entire File Loading... i18n/tortoisehg/ru.po Stacked
8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25	8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25	@@ -8,18 +8,18 @@ `"Project-Id-Version: tortoisehg\n"` `"Report-Msgid-Bugs-To: Alil Adamov <diagiman@gmail.com>\n"` `"POT-Creation-Date: 2010-02-22 23:55+0000\n"`-`"PO-Revision-Date: 2010-02-27 08:13+0000\n"`+`"PO-Revision-Date: 2010-03-05 14:05+0000\n"` `"Last-Translator: Alil Adamov <diagiman@gmail.com>\n"` `"Language-Team: Russian <ru@li.org>\n"` `"MIME-Version: 1.0\n"` `"Content-Type: text/plain; charset=UTF-8\n"` `"Content-Transfer-Encoding: 8bit\n"`-`"X-Launchpad-Export-Date: 2010-02-28 04:58+0000\n"`+`"X-Launchpad-Export-Date: 2010-03-06 05:13+0000\n"` `"X-Generator: Launchpad (build Unknown)\n"` `#: thgtaskbar.py:36` `msgid "TortoiseHg Overlay Icon Server"`-`msgstr "TortoiseHg Сервер Наложений Иконок"`+`msgstr "TortoiseHg Сервер Наложений Значков"` `#: thgtaskbar.py:117` `msgid "Exit"`

Change 1 of 109 Show Changes Only Show Entire File Loading... i18n/tortoisehg/uk.po Stacked
8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 252 253 254 255 256 257 258 274 275 276 277 278 279 280 284 285 286 287 288 289 290 295 296 297 298 299 300 301 307 308 309 310 311 312 313 323 324 325 326 327 328 329 330 331 332 333 347 348 349 350 351 352 353 487 488 489 490 491 492 493 495 496 497 498 499 500 501 502 503 504 505 519 520 521 522 523 524 525 560 561 562 563 564 565 566 652 653 654 655 656 657 658 753 754 755 756 757 758 759 804 805 806 807 808 809 810 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 993 994 995 996 997 998 999 1005 1006 1007 1008 1009 1010 1011 1065 1066 1067 1068 1069 1070 1071 1081 1082 1083 1084 1085 1086 1087 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1101 1102 1103 1104 1105 1106 1107 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1600 1601 1602 1603 1604 1605 1606 1608 1609 1610 1611 1612 1613 1624 1625 1626 1627 1628 1629 1630 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 2006 2007 2008 2009 2010 2011 2012 2134 2135 2136 2137 2138 2139 2140 2170 2171 2172 2173 2174 2175 2176 2198 2199 2200 2201 2202 2203 2204 2205 2206 2207 2208 2209 2210 2211 2212 2213 2214 2215 2216 2243 2244 2245 2246 2247 2248 2249 2318 2319 2320 2321 2322 2323 2324 2325 2326 2327 2328 2329 2330 2331 2332 2333 2334 2335 2336 2337 2338 2339 2340 2341 2342 2343 2344 2345 2346 2347 2348 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 2411 2412 2413 2414 2415 2416 2417 2466 2467 2468 2469 2470 2471 2472 2482 2483 2484 2485 2486 2487 2488 2491 2492 2493 2494 2495 2496 2497 2498 2499 2500 2501 2502 2503 2504 2505 2506 2507 2508 2509 2510 2511 2512 2513 2514 2515 2516 2517 2518 2519 2520 2521 2522 2523 2524 2525 2526 2527 2528 2529 2530 2531 2532 2533 2534 2535 2536 2537 2538 2539 2540 2541 2542 2543 2544 2545 2555 2556 2557 2558 2559 2560 2561 2616 2617 2618 2619 2620 2621 2622 2640 2641 2642 2643 2644 2645 2646 2652 2653 2654 2655 2656 2657 2658 2660 2661 2662 2663 2664 2665 2666 2667 2668 2669 2670 2671 2672 2673 2674 2675 2676 2677 2678 2684 2685 2686 2687 2688 2689 2690 2700 2701 2702 2703 2704 2705 2706 2707 2708 2709 2710 2711 2712 2713 2714 2720 2721 2722 2723 2724 2725 2726 2732 2733 2734 2735 2736 2737 2738 2740 2741 2742 2743 2744 2745 2746 2747 2748 2749 2750 2756 2757 2758 2759 2760 2761 2762 2763 2764 2765 2766 2767 2768 2769 2770 2796 2797 2798 2799 2800 2801 2802 2836 2837 2838 2839 2840 2841 2842 2881 2882 2883 2884 2885 2886 2887 2888 2889 2890 2891 2901 2902 2903 2904 2905 2906 2907 2908 2909 2910 2911 2912 2913 2914 2915 2916 2917 2918 2919 2937 2938 2939 2940 2941 2942 2943 2944 2945 2946 2947 2949 2950 2951 2952 2953 2954 2955 2956 2957 2958 2959 2960 2961 2962 2963 2964 2965 2966 2967 2968 2969 2970 2971 2973 2974 2975 2976 2977 2978 2979 2980 2981 2982 2983 2984 2985 2986 2987 3043 3044 3045 3046 3047 3048 3049 3050 3051 3052 3053 3054 3055 3056 3057 3058 3059 3060 3061 3079 3080 3081 3082 3083 3084 3085 3086 3087 3088 3089 3090 3091 3092 3093 3094 3095 3096 3097 3098 3099 3100 3101 3102 3103 3104 3105 3106 3107 3108 3109 3110 3111 3112 3113 3114 3115 3116 3117 3119 3120 3121 3122 3123 3124 3125 3131 3132 3133 3134 3135 3136 3137 3138 3139 3140 3141 3142 3143 3144 3145 3146 3147 3148 3149 3150 3151 3152 3153 3154 3155 3156 3157 3171 3172 3173 3174 3175 3176 3177 3207 3208 3209 3210 3211 3212 3213 3257 3258 3259 3260 3261 3262 3263 3264 3265 3266 3267 3273 3274 3275 3276 3277 3278 3279 3280 3281 3282 3283 3327 3328 3329 3330 3331 3332 3333 3601 3602 3603 3604 3605 3606 3607 3641 3642 3643 3644 3645 3646 3647 3648 3649 3650 3651 3669 3670 3671 3672 3673 3674 3675 3781 3782 3783 3784 3785 3786 3787 3822 3823 3824 3825 3826 3827 3828 3829 3830 3831 3832 3833 3834 4024 4025 4026 4027 4028 4029 4030 4031 4032 4033 4034 4035 4036 4037 4038 4229 4230 4231 4232 4233 4234 4235 4236 4237 4238 4239 4240 4241 4242 4243 4270 4271 4272 4273 4274 4275 4276 4278 4279 4280 4281 4282 4283 4298 4299 4300 4301 4302 4303 4308 4309 4310 4311 4312 4313 4338 4339 4340 4341 4342 4343 4344 4362 4363 4364 4365 4366 4367 4368 4390 4391 4392 4393 4394 4395 4539 4540 4541 4542 4543 4544 4545 4546 4547 4548 4896 4897 4898 4899 4900 4901 4902 4903 4904 4905 4906 4907 4908 4909 4910 4911 4912 4913 4914 4915 4916 4917 4918 4919 4920 4921 4922 4923 4924 4925 4927 4928 4929 4930 4931 4932 4933 4935 4936 4937 4938 4939 4940 4941 4942 4943 4944 4945 5011 5012 5013 5014 5015 5016 5017 5099 5100 5101 5102 5103 5104 5105 5106 5107 5108 5109 5110 5111 5112 5113 5114 5115 5116 5117 5131 5132 5133 5134 5135 5136 5137 5138 5139 5140 5141 5142 5143 5144 5145 5146 5147 5161 5162 5163 5164 5165 5166 5167 5181 5182 5183 5184 5185 5186 5187 5193 5194 5195 5196 5197 5198 5199 5200 5201 5202 5203 5204 5205 5206 5207 5208 5209 5210 5211 5212 5213 5214 5215 5216 5217 5218 5219 5220 5221 5222 5223 5224 5225 5226 5227 5245 5246 5247 5248 5249 5250 5251 5257 5258 5259 5260 5261 5262 5263 5264 5265 5266 5267 5279 5280 5281 5282 5283 5284 5285 5286 5287 5288 5310 5311 5312 5313 5314 5315 5316 5318 5319 5320 5321 5322 5323 5324 5325 5326 5327 5328 5358 5359 5360 5361 5362 5363 5364 5434 5435 5436 5437 5438 5439 5440 5441 5442 5443 5444 5490 5491 5492 5493 5494 5495 5496 5497 5498 5499 5500 5561 5562 5563 5564 5565 5566 5567 5573 5574 5575 5576 5577 5578 5579 5580 5581 5582 5583 5593 5594 5595 5596 5597 5598 5599 5605 5606 5607 5608 5609 5610 5611 5621 5622 5623 5624 5625 5626 5627 5629 5630 5631 5632 5633 5634 5635 5637 5638 5639 5640 5641 5642 5643 5644 5645 5646 5647 5648 5649 5650 5651 5652 5653 5654 5655 5896 5897 5898 5899 5900 5901 5902 5903 5904 5905 5906 5952 5953 5954 5955 5956 5957 5958 5959 5960 5961 5962 6016 6017 6018 6019 6020 6021 6022 6023 6024 6025 6026 6027 6028 6029 6030 6032 6033 6034 6035 6036 6037 6038 6039 6040 6041 6042 6043 6044 6045 6046 6047 6048 6049 6050 6051 6052 6053 6054 6055 6056 6057 6058 6059 6060 6061 6062 6063 6064 6065 6066 6067 6068 6069 6070 6071 6072 6073 6074 6075 6076 6077 6078 6079	8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 252 253 254 255 256 257 258 274 275 276 277 278 279 280 284 285 286 287 288 289 290 295 296 297 298 299 300 301 307 308 309 310 311 312 313 323 324 325 326 327 328 329 330 331 332 333 347 348 349 350 351 352 353 487 488 489 490 491 492 493 495 496 497 498 499 500 501 502 503 504 505 519 520 521 522 523 524 525 560 561 562 563 564 565 566 652 653 654 655 656 657 658 753 754 755 756 757 758 759 804 805 806 807 808 809 810 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 993 994 995 996 997 998 999 1005 1006 1007 1008 1009 1010 1011 1065 1066 1067 1068 1069 1070 1071 1081 1082 1083 1084 1085 1086 1087 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1101 1102 1103 1104 1105 1106 1107 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1600 1601 1602 1603 1604 1605 1606 1608 1609 1610 1611 1612 1613 1614 1615 1616 1627 1628 1629 1630 1631 1632 1633 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 2011 2012 2013 2014 2015 2016 2017 2139 2140 2141 2142 2143 2144 2145 2175 2176 2177 2178 2179 2180 2181 2203 2204 2205 2206 2207 2208 2209 2210 2211 2212 2213 2214 2215 2216 2217 2218 2219 2220 2221 2248 2249 2250 2251 2252 2253 2254 2323 2324 2325 2326 2327 2328 2329 2330 2331 2332 2333 2334 2335 2336 2337 2338 2339 2340 2341 2342 2343 2344 2345 2346 2347 2348 2349 2350 2351 2352 2353 2364 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 2416 2417 2418 2419 2420 2421 2422 2471 2472 2473 2474 2475 2476 2477 2487 2488 2489 2490 2491 2492 2493 2496 2497 2498 2499 2500 2501 2502 2503 2504 2505 2506 2507 2508 2509 2510 2511 2512 2513 2514 2515 2516 2517 2518 2519 2520 2521 2522 2523 2524 2525 2526 2527 2528 2529 2530 2531 2532 2533 2534 2535 2536 2537 2538 2539 2540 2541 2542 2543 2544 2545 2546 2547 2548 2549 2550 2560 2561 2562 2563 2564 2565 2566 2621 2622 2623 2624 2625 2626 2627 2645 2646 2647 2648 2649 2650 2651 2657 2658 2659 2660 2661 2662 2663 2665 2666 2667 2668 2669 2670 2671 2672 2673 2674 2675 2676 2677 2678 2679 2680 2681 2682 2683 2689 2690 2691 2692 2693 2694 2695 2705 2706 2707 2708 2709 2710 2711 2712 2713 2714 2715 2716 2717 2718 2719 2725 2726 2727 2728 2729 2730 2731 2737 2738 2739 2740 2741 2742 2743 2745 2746 2747 2748 2749 2750 2751 2752 2753 2754 2755 2761 2762 2763 2764 2765 2766 2767 2768 2769 2770 2771 2772 2773 2774 2775 2801 2802 2803 2804 2805 2806 2807 2841 2842 2843 2844 2845 2846 2847 2886 2887 2888 2889 2890 2891 2892 2893 2894 2895 2896 2906 2907 2908 2909 2910 2911 2912 2913 2914 2915 2916 2917 2918 2919 2920 2921 2922 2923 2924 2942 2943 2944 2945 2946 2947 2948 2949 2950 2951 2952 2954 2955 2956 2957 2958 2959 2960 2961 2962 2963 2964 2965 2966 2967 2968 2969 2970 2971 2972 2973 2974 2975 2976 2978 2979 2980 2981 2982 2983 2984 2985 2986 2987 2988 2989 2990 2991 2992 3048 3049 3050 3051 3052 3053 3054 3055 3056 3057 3058 3059 3060 3061 3062 3063 3064 3065 3066 3084 3085 3086 3087 3088 3089 3090 3091 3092 3093 3094 3095 3096 3097 3098 3099 3100 3101 3102 3103 3104 3105 3106 3107 3108 3109 3110 3111 3112 3113 3114 3115 3116 3117 3118 3119 3120 3121 3122 3124 3125 3126 3127 3128 3129 3130 3136 3137 3138 3139 3140 3141 3142 3143 3144 3145 3146 3147 3148 3149 3150 3151 3152 3153 3154 3155 3156 3157 3158 3159 3160 3161 3162 3176 3177 3178 3179 3180 3181 3182 3212 3213 3214 3215 3216 3217 3218 3262 3263 3264 3265 3266 3267 3268 3269 3270 3271 3272 3278 3279 3280 3281 3282 3283 3284 3285 3286 3287 3288 3332 3333 3334 3335 3336 3337 3338 3606 3607 3608 3609 3610 3611 3612 3646 3647 3648 3649 3650 3651 3652 3653 3654 3655 3656 3674 3675 3676 3677 3678 3679 3680 3786 3787 3788 3789 3790 3791 3792 3827 3828 3829 3830 3831 3832 3833 3834 3835 3836 3837 3838 3839 3840 3841 4031 4032 4033 4034 4035 4036 4037 4038 4039 4040 4041 4042 4043 4044 4045 4236 4237 4238 4239 4240 4241 4242 4243 4244 4245 4246 4247 4248 4249 4250 4277 4278 4279 4280 4281 4282 4283 4285 4286 4287 4288 4289 4290 4291 4292 4293 4308 4309 4310 4311 4312 4313 4314 4315 4316 4321 4322 4323 4324 4325 4326 4327 4328 4353 4354 4355 4356 4357 4358 4359 4377 4378 4379 4380 4381 4382 4383 4405 4406 4407 4408 4409 4410 4411 4412 4413 4557 4558 4559 4560 4561 4562 4563 4564 4565 4566 4567 4568 4916 4917 4918 4919 4920 4921 4922 4923 4924 4925 4926 4927 4928 4929 4930 4931 4932 4933 4934 4935 4936 4937 4938 4939 4940 4941 4942 4943 4944 4945 4946 4947 4948 4949 4951 4952 4953 4954 4955 4956 4957 4959 4960 4961 4962 4963 4964 4965 4966 4967 4968 4969 5035 5036 5037 5038 5039 5040 5041 5123 5124 5125 5126 5127 5128 5129 5130 5131 5132 5133 5134 5135 5136 5137 5138 5139 5140 5141 5155 5156 5157 5158 5159 5160 5161 5162 5163 5164 5165 5166 5167 5168 5169 5170 5171 5172 5173 5187 5188 5189 5190 5191 5192 5193 5207 5208 5209 5210 5211 5212 5213 5219 5220 5221 5222 5223 5224 5225 5226 5227 5228 5229 5230 5231 5232 5233 5234 5235 5236 5237 5238 5239 5240 5241 5242 5243 5244 5245 5246 5247 5248 5249 5250 5251 5252 5253 5271 5272 5273 5274 5275 5276 5277 5283 5284 5285 5286 5287 5288 5289 5290 5291 5292 5293 5305 5306 5307 5308 5309 5310 5311 5312 5313 5314 5315 5316 5338 5339 5340 5341 5342 5343 5344 5346 5347 5348 5349 5350 5351 5352 5353 5354 5355 5356 5386 5387 5388 5389 5390 5391 5392 5462 5463 5464 5465 5466 5467 5468 5469 5470 5471 5472 5518 5519 5520 5521 5522 5523 5524 5525 5526 5527 5528 5589 5590 5591 5592 5593 5594 5595 5601 5602 5603 5604 5605 5606 5607 5608 5609 5610 5611 5621 5622 5623 5624 5625 5626 5627 5633 5634 5635 5636 5637 5638 5639 5649 5650 5651 5652 5653 5654 5655 5657 5658 5659 5660 5661 5662 5663 5665 5666 5667 5668 5669 5670 5671 5672 5673 5674 5675 5676 5677 5678 5679 5680 5681 5682 5683 5924 5925 5926 5927 5928 5929 5930 5931 5932 5933 5934 5980 5981 5982 5983 5984 5985 5986 5987 5988 5989 5990 6044 6045 6046 6047 6048 6049 6050 6051 6052 6053 6054 6055 6056 6057 6058 6060 6061 6062 6063 6064 6065 6066 6067 6068 6069 6070 6071 6072 6073 6074 6075 6076 6077 6078 6079 6080 6081 6082 6083 6084 6085 6086 6087 6088 6089 6090 6091 6092 6093 6094 6095 6096 6097 6098 6099 6100 6101 6102 6103 6104 6105 6106 6107	@@ -8,18 +8,18 @@ `"Project-Id-Version: tortoisehg\n"` `"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"` `"POT-Creation-Date: 2010-02-22 23:55+0000\n"`-`"PO-Revision-Date: 2010-02-22 06:51+0000\n"`+`"PO-Revision-Date: 2010-03-08 14:06+0000\n"` `"Last-Translator: kosha <Unknown>\n"` `"Language-Team: Ukrainian <uk@li.org>\n"` `"MIME-Version: 1.0\n"` `"Content-Type: text/plain; charset=UTF-8\n"` `"Content-Transfer-Encoding: 8bit\n"`-`"X-Launchpad-Export-Date: 2010-02-23 05:11+0000\n"`+`"X-Launchpad-Export-Date: 2010-03-09 04:37+0000\n"` `"X-Generator: Launchpad (build Unknown)\n"` `#: thgtaskbar.py:36` `msgid "TortoiseHg Overlay Icon Server"`-`msgstr ""`+`msgstr "TortoiseHg перекриває значки сервера"` `#: thgtaskbar.py:117` `msgid "Exit"`@@ -252,7 +252,7 @@ `#: tortoisehg\hgtk\bookmark.py:56 tortoisehg\hgtk\bookmark.py:182` `#: tortoisehg\hgtk\merge.py:178` `msgid "unexpected type: %s"`-`msgstr ""`+`msgstr "невідомий тип: %s"` `#: tortoisehg\hgtk\bookmark.py:69` `msgid "Old name:"`@@ -274,7 +274,7 @@ `#: tortoisehg\hgtk\bookmark.py:92` `msgid "Make new/moved bookmark current"`-`msgstr ""`+`msgstr "Make new/moved bookmark current"` `#: tortoisehg\hgtk\bookmark.py:167 tortoisehg\hgtk\gdialog.py:902` `#: tortoisehg\hgtk\hginit.py:83 tortoisehg\hgtk\tagadd.py:202`@@ -284,7 +284,7 @@ `#: tortoisehg\hgtk\bookmark.py:208 tortoisehg\hgtk\bookmark.py:238` `#: tortoisehg\hgtk\bookmark.py:292 tortoisehg\hgtk\bookmark.py:324` `msgid "Bookmark input is empty"`-`msgstr ""`+`msgstr "Bookmark input is empty"` `#: tortoisehg\hgtk\bookmark.py:209 tortoisehg\hgtk\bookmark.py:239` `#: tortoisehg\hgtk\bookmark.py:293 tortoisehg\hgtk\bookmark.py:325`@@ -295,7 +295,7 @@ `#: tortoisehg\hgtk\bookmark.py:274 tortoisehg\hgtk\bookmark.py:306` `#: tortoisehg\hgtk\bookmark.py:332` `msgid "Bookmarking completed"`-`msgstr ""`+`msgstr "Bookmarking completed"` `#: tortoisehg\hgtk\bookmark.py:217` `msgid "Bookmark \"%s\" has been added"`@@ -307,7 +307,7 @@ `#: tortoisehg\hgtk\bookmark.py:311 tortoisehg\hgtk\bookmark.py:314` `#: tortoisehg\hgtk\bookmark.py:337 tortoisehg\hgtk\bookmark.py:340` `msgid "Error in bookmarking"`-`msgstr ""`+`msgstr "Помилка закладку"` `#: tortoisehg\hgtk\bookmark.py:247` `msgid "Bookmark \"%s\" has been moved"`@@ -323,11 +323,11 @@ `#: tortoisehg\hgtk\bookmark.py:275` `msgid "Bookmark \"%s\" has been removed"`-`msgstr ""`+`msgstr "Закладку \"%s\" було видалено"` `#: tortoisehg\hgtk\bookmark.py:298` `msgid "Bookmark new name input is empty"`-`msgstr ""`+`msgstr "Назва закладки введено як пуста"` `#: tortoisehg\hgtk\bookmark.py:299` `msgid "Please enter new bookmark name"`@@ -347,7 +347,7 @@ `#: tortoisehg\hgtk\bookmark.py:355 tortoisehg\hgtk\bookmark.py:382` `msgid "No bookmark named \"%s\" exists"`-`msgstr ""`+`msgstr "Закладки з назвоб \"%s\" не існує"` `#: tortoisehg\hgtk\bookmark.py:364` `msgid "Bookmark '%s' does not exist"`@@ -487,7 +487,7 @@ `#: tortoisehg\hgtk\changeset.py:1011` `msgid "Enable _Wordwrap"`-`msgstr ""`+`msgstr "Ввімкнути _Wordwrap"` `#: tortoisehg\hgtk\clone.py:37` `msgid "TortoiseHg Clone"`@@ -495,11 +495,11 @@ `#: tortoisehg\hgtk\clone.py:75` `msgid "Bundle..."`-`msgstr ""`+`msgstr "Пакунок..."` `#: tortoisehg\hgtk\clone.py:77` `msgid "Select a Mercurial Bundle"`-`msgstr ""`+`msgstr "Оберіть пакунок Mercurial"` `#: tortoisehg\hgtk\clone.py:90` `msgid "Source path:"`@@ -519,7 +519,7 @@ `#: tortoisehg\hgtk\clone.py:135` `msgid "Starting P4 Changelist:"`-`msgstr ""`+`msgstr "Початок P4 список змін:"` `#: tortoisehg\hgtk\clone.py:141` `msgid "Do not update the new working directory"`@@ -560,7 +560,7 @@ `#: tortoisehg\hgtk\clone.py:220` `msgid "Mercurial bundles"`-`msgstr ""`+`msgstr "Пакунки Mercurial"` `#: tortoisehg\hgtk\clone.py:282` `msgid "Source path is empty"`@@ -652,7 +652,7 @@ `#: tortoisehg\hgtk\commit.py:235 tortoisehg\hgtk\history.py:355` `msgid "Always Show Output"`-`msgstr ""`+`msgstr "Always Show Output"` `#: tortoisehg\hgtk\commit.py:238` `msgid "_Operations"`@@ -753,7 +753,7 @@ `#: tortoisehg\hgtk\commit.py:494` `msgid "Not at head"`-`msgstr ""`+`msgstr "Не головна"` `#: tortoisehg\hgtk\commit.py:519 tortoisehg\hgtk\status.py:534` `msgid "Patch Preview"`@@ -804,7 +804,7 @@ `#: tortoisehg\hgtk\commit.py:648` `msgid "neither parent is a head, commit to add a new head"`-`msgstr ""`+`msgstr "neither parent is a head, commit to add a new head"` `#: tortoisehg\hgtk\commit.py:653` `msgid "parent is not a head, commit to add a new head"`@@ -962,15 +962,15 @@ `#: tortoisehg\hgtk\commit.py:1173` `msgid "Finish committing"`-`msgstr ""`+`msgstr "Фіксація закінчена"` `#: tortoisehg\hgtk\commit.py:1175` `msgid "Aborted committing"`-`msgstr ""`+`msgstr "Фіксація перервана"` `#: tortoisehg\hgtk\commit.py:1177` `msgid "Failed to commit"`-`msgstr ""`+`msgstr "Не вдалося зробити"` `#: tortoisehg\hgtk\commit.py:1181` `msgid "Committing changes..."`@@ -993,7 +993,7 @@ `#: tortoisehg\hgtk\history.py:2278 tortoisehg\hgtk\history.py:2308` `#: tortoisehg\hgtk\history.py:2500 tortoisehg\hgtk\history.py:2528` `msgid "Please try again after running operation is completed"`-`msgstr ""`+`msgstr "Будь-ласка, спробуйте завершити після завершення операції"` `#: tortoisehg\hgtk\commit.py:1210` `msgid "Paste _Filenames"`@@ -1005,7 +1005,7 @@ `#: tortoisehg\hgtk\commit.py:1212` `msgid "C_onfigure Format..."`-`msgstr ""`+`msgstr "C_onfigure Format..."` `#: tortoisehg\hgtk\commit.py:1257` `msgid "Info Required"`@@ -1065,7 +1065,7 @@ `#: tortoisehg\hgtk\csinfo.py:204` `msgid "Perforce:"`-`msgstr ""`+`msgstr "Вимушено:"` `#: tortoisehg\hgtk\csinfo.py:204` `msgid "Subversion:"`@@ -1081,7 +1081,7 @@ `#: tortoisehg\hgtk\cslist.py:384` `msgid "No items to display"`-`msgstr ""`+`msgstr "Елементи для показу"` `#: tortoisehg\hgtk\cslist.py:397` `msgid "Updating..."`@@ -1089,11 +1089,11 @@ `#: tortoisehg\hgtk\cslist.py:400` `msgid "Selecting %(sel)d of %(total)d, displaying all items"`-`msgstr ""`+`msgstr "Selecting %(sel)d of %(total)d, displaying all items"` `#: tortoisehg\hgtk\cslist.py:403` `msgid "Selecting %(sel)d, displaying %(count)d of %(total)d items"`-`msgstr ""`+`msgstr "Selecting %(sel)d, displaying %(count)d of %(total)d items"` `#: tortoisehg\hgtk\cslist.py:407` `msgid "Displaying all items"`@@ -1101,7 +1101,7 @@ `#: tortoisehg\hgtk\cslist.py:409` `msgid "Displaying %(count)d of %(total)d items"`-`msgstr ""`+`msgstr "Показати %(кількість)d з %(загалом)d елементів"` `#: tortoisehg\hgtk\datamine.py:45` `msgid "%s - datamine"`@@ -1152,15 +1152,15 @@ `#: tortoisehg\hgtk\datamine.py:148 tortoisehg\hgtk\datamine.py:161` `msgid "_View File at Revision"`-`msgstr ""`+`msgstr "_View File at Revision"` `#: tortoisehg\hgtk\datamine.py:155` `msgid "_Zoom to Change"`-`msgstr ""`+`msgstr "_Zoom to Change"` `#: tortoisehg\hgtk\datamine.py:159` `msgid "_Annotate Parent"`-`msgstr ""`+`msgstr "_Annotate Parent"` `#: tortoisehg\hgtk\datamine.py:186` `msgid "No parent file"`@@ -1600,7 +1600,7 @@ `#: tortoisehg\hgtk\hgemail.py:99` `msgid "Send changesets as Hg patches"`-`msgstr ""`+`msgstr "Send changesets as Hg patches"` `#: tortoisehg\hgtk\hgemail.py:102` `msgid ""`@@ -1608,6 +1608,9 @@ `"programs. They include a header which contains the most important changeset "` `"metadata."` `msgstr ""`+`"Hg patches (as generated by export command) are compatible with most patch "`+`"programs. They include a header which contains the most important changeset "`+`"metadata."` `#: tortoisehg\hgtk\hgemail.py:107` `msgid "Use extended (git) patch format"`@@ -1624,7 +1627,7 @@ `#: tortoisehg\hgtk\hgemail.py:115` `msgid "Plain, do not prepend Hg header"`-`msgstr ""`+`msgstr "Plain, do not prepend Hg header"` `#: tortoisehg\hgtk\hgemail.py:118` `msgid ""`@@ -1879,13 +1882,15 @@ `#: tortoisehg\hgtk\hgtk.py:274` `msgid "unrecognized profiling format '%s' - Ignored\n"`-`msgstr ""`+`msgstr "unrecognized profiling format '%s' - Ignored\n"` `#: tortoisehg\hgtk\hgtk.py:289` `msgid ""` `"lsprof not available - install from "` `"http://codespeak.net/svn/user/arigo/hack/misc/lsprof/"` `msgstr ""`+`"lsprof not available - install from "`+`"http://codespeak.net/svn/user/arigo/hack/misc/lsprof/"` `#: tortoisehg\hgtk\hgtk.py:395` `msgid "Rename error"`@@ -1897,11 +1902,11 @@ `#: tortoisehg\hgtk\hgtk.py:503` `msgid "mpatch error"`-`msgstr ""`+`msgstr "mpatch помилка"` `#: tortoisehg\hgtk\hgtk.py:506` `msgid "mpatch expects .rej file argument\n"`-`msgstr ""`+`msgstr "mpatch expects .rej file argument\n"` `#: tortoisehg\hgtk\hgtk.py:508 tortoisehg\hgtk\hgtk.py:515` `msgid "%s does not exist\n"`@@ -2006,7 +2011,7 @@ `#: tortoisehg\hgtk\hgtk.py:731` `msgid "print command execution profile"`-`msgstr ""`+`msgstr "print command execution profile"` `#: tortoisehg\hgtk\hgtk.py:732` `msgid "do not fork GUI process"`@@ -2134,7 +2139,7 @@ `#: tortoisehg\hgtk\hgtk.py:776` `msgid "wait until the second ticks over"`-`msgstr "wait until the second ticks over"`+`msgstr "почекайте хвильку"` `#: tortoisehg\hgtk\hgtk.py:777` `msgid "notify the shell for paths given"`@@ -2170,7 +2175,7 @@ `#: tortoisehg\hgtk\hgtk.py:789` `msgid "bundle file to preview"`-`msgstr "зв'язка файлів для попереднього перегляду"`+`msgstr "комплект файлів для попереднього перегляду"` `#: tortoisehg\hgtk\hgtk.py:790` `msgid "launch visual diff tool"`@@ -2198,19 +2203,19 @@ `#: tortoisehg\hgtk\hgtk.py:805` `msgid "import to the repository"`-`msgstr ""`+`msgstr "імпортувати у сховище"` `#: tortoisehg\hgtk\hgtk.py:806` `msgid "import to the patch queue (MQ)"`-`msgstr ""`+`msgstr "імпорт патчу для черги"` `#: tortoisehg\hgtk\hgtk.py:807` `msgid "hgtk import [OPTION] [SOURCE]..."`-`msgstr ""`+`msgstr "hgtk import [ПАРАМЕТРИ] [ДЖЕРЕЛО]..."` `#: tortoisehg\hgtk\hgtk.py:812` `msgid "hgtk shellconfig"`-`msgstr ""`+`msgstr "hgtk shellconfig"` `#: tortoisehg\hgtk\histdetails.py:35` `msgid "Log Details"`@@ -2243,7 +2248,7 @@ `#: tortoisehg\hgtk\history.py:68 tortoisehg\hgtk\history.py:416` `#: tortoisehg\hgtk\history.py:1094` `msgid "Heads"`-`msgstr "Голови"`+`msgstr "Глава"` `#: tortoisehg\hgtk\history.py:72 tortoisehg\hgtk\history.py:418` `msgid "Merges"`@@ -2318,31 +2323,31 @@ `#: tortoisehg\hgtk\history.py:207` `msgid "Reset _Marks"`-`msgstr ""`+`msgstr "Reset _Marks"` `#: tortoisehg\hgtk\history.py:209` `msgid "Reset revision marks"`-`msgstr ""`+`msgstr "Очистити знак редакції"` `#: tortoisehg\hgtk\history.py:226` `msgid "Launch commit tool"`-`msgstr ""`+`msgstr "Запустити інструмент фіксації"` `#: tortoisehg\hgtk\history.py:229` `msgid "Launch data mining tool"`-`msgstr ""`+`msgstr "Запустити інструмент інтелектуального аналізу даних"` `#: tortoisehg\hgtk\history.py:232` `msgid "Launch recovery tool"`-`msgstr ""`+`msgstr "Запустити інструмент відновлення даних"` `#: tortoisehg\hgtk\history.py:235` `msgid "Launch web server"`-`msgstr ""`+`msgstr "Запустити web server"` `#: tortoisehg\hgtk\history.py:238` `msgid "Launch shelve tool"`-`msgstr ""`+`msgstr "Запустити shelve інструмент"` `#: tortoisehg\hgtk\history.py:283` `msgid "Branches"`@@ -2359,11 +2364,11 @@ `#: tortoisehg\hgtk\history.py:316` `msgid "_Perforce"`-`msgstr ""`+`msgstr "_Вимушено"` `#: tortoisehg\hgtk\history.py:317` `msgid "Identify"`-`msgstr ""`+`msgstr "Ідентифікація"` `#: tortoisehg\hgtk\history.py:319` `msgid "Pending"`@@ -2411,7 +2416,7 @@ `#: tortoisehg\hgtk\history.py:365` `msgid "Previously Selected"`-`msgstr ""`+`msgstr "Раніше вибрані"` `#: tortoisehg\hgtk\history.py:368` `msgid "Revision..."`@@ -2466,7 +2471,7 @@ `#: tortoisehg\hgtk\history.py:404` `msgid "Force push"`-`msgstr "Примусово віддати"`+`msgstr "Віддати попри все"` `#: tortoisehg\hgtk\history.py:407` `msgid "_Filter"`@@ -2482,7 +2487,7 @@ `#: tortoisehg\hgtk\history.py:423` `msgid "Revision Range"`-`msgstr ""`+`msgstr "Діапазон редакцій"` `#: tortoisehg\hgtk\history.py:515 tortoisehg\hgtk\p4pending.py:83` `#: tortoisehg\hgtk\p4pending.py:105 tortoisehg\hgtk\p4pending.py:110`@@ -2491,55 +2496,55 @@ `#: tortoisehg\hgtk\history.py:519` `msgid "Unable to parse p4pending output"`-`msgstr ""`+`msgstr "Не вдалося розібрати p4pending вихідний"` `#: tortoisehg\hgtk\history.py:521` `msgid "%d pending changelists found"`-`msgstr ""`+`msgstr "%d переліку змін знайдено"` `#: tortoisehg\hgtk\history.py:523` `msgid "No pending Perforce changelists"`-`msgstr ""`+`msgstr "No pending Perforce changelists"` `#: tortoisehg\hgtk\history.py:525` `msgid "Aborted p4pending"`-`msgstr ""`+`msgstr "Aborted p4pending"` `#: tortoisehg\hgtk\history.py:527` `msgid "Unable to determine pending changesets"`-`msgstr ""`+`msgstr "Unable to determine pending changesets"` `#: tortoisehg\hgtk\history.py:535` `msgid "Finding pending Perforce changelists..."`-`msgstr ""`+`msgstr "Finding pending Perforce changelists..."` `#: tortoisehg\hgtk\history.py:536` `msgid "Pending Perforce changelists"`-`msgstr ""`+`msgstr "Pending Perforce changelists"` `#: tortoisehg\hgtk\history.py:548` `msgid "Perforce changelist %s"`-`msgstr ""`+`msgstr "Perforce changelist %s"` `#: tortoisehg\hgtk\history.py:553` `msgid "Unable to find rev %s"`-`msgstr ""`+`msgstr "Неможливо знайти редакцію %s"` `#: tortoisehg\hgtk\history.py:555` `msgid "Aborted p4identify"`-`msgstr ""`+`msgstr "Aborted p4identify"` `#: tortoisehg\hgtk\history.py:557` `msgid "Unable to identify Perforce tip"`-`msgstr ""`+`msgstr "Unable to identify Perforce tip"` `#: tortoisehg\hgtk\history.py:560` `msgid "Finding tip Perforce changelist..."`-`msgstr ""`+`msgstr "Finding tip Perforce changelist..."` `#: tortoisehg\hgtk\history.py:561` `msgid "Identifying Perforce tip"`-`msgstr ""`+`msgstr "Identifying Perforce tip"` `#: tortoisehg\hgtk\history.py:606 tortoisehg\hgtk\logview\treeview.py:400` `msgid "Graph"`@@ -2555,7 +2560,7 @@ `#: tortoisehg\hgtk\history.py:615` `msgid "Revision Number/ID"`-`msgstr ""`+`msgstr "Редакція Номер/ID"` `#: tortoisehg\hgtk\history.py:616` `msgid "Branch Name"`@@ -2616,7 +2621,7 @@ `#: tortoisehg\hgtk\history.py:1065` `msgid "only Merges"`-`msgstr "тільки об'єднує"`+`msgstr "тільки об'єднання"` `#: tortoisehg\hgtk\history.py:1067` `msgid "revision ancestry"`@@ -2640,7 +2645,7 @@ `#: tortoisehg\hgtk\history.py:1090` `msgid "heads"`-`msgstr "головки"`+`msgstr "глави"` `#: tortoisehg\hgtk\history.py:1096` `msgid "no Merges"`@@ -2652,7 +2657,7 @@ `#: tortoisehg\hgtk\history.py:1117` `msgid "%(count)d of %(total)d applied patches"`-`msgstr ""`+`msgstr "%(кількість)d з %(загалом)d прийнято патчів"` `#: tortoisehg\hgtk\history.py:1126` `msgid "Visualize Change"`@@ -2660,19 +2665,19 @@ `#: tortoisehg\hgtk\history.py:1129` `msgid "Diff to Local"`-`msgstr ""`+`msgstr "Різниця в порівнянні з поточним"` `#: tortoisehg\hgtk\history.py:1131` `msgid "_Copy Hash"`-`msgstr ""`+`msgstr "_Copy Hash"` `#: tortoisehg\hgtk\history.py:1135` `msgid "Pull to Here"`-`msgstr ""`+`msgstr "Отримати сюди"` `#: tortoisehg\hgtk\history.py:1143` `msgid "Push to Here"`-`msgstr ""`+`msgstr "Відправити туди"` `#: tortoisehg\hgtk\history.py:1145` `msgid "_Update..."`@@ -2684,7 +2689,7 @@ `#: tortoisehg\hgtk\history.py:1147` `msgid "Backout..."`-`msgstr ""`+`msgstr "Копії..."` `#: tortoisehg\hgtk\history.py:1148 tortoisehg\hgtk\status.py:1660` `msgid "_Revert"`@@ -2700,15 +2705,15 @@ `#: tortoisehg\hgtk\history.py:1171` `msgid "Mercurial Queues"`-`msgstr ""`+`msgstr "Mercurial Queues"` `#: tortoisehg\hgtk\history.py:1176` `msgid "Transp_lant to Local"`-`msgstr ""`+`msgstr "Трансплантант до поточного"` `#: tortoisehg\hgtk\history.py:1180` `msgid "Bisect"`-`msgstr ""`+`msgstr "Розрізати навпіл"` `#: tortoisehg\hgtk\history.py:1188` `msgid "_Export Patch..."`@@ -2720,7 +2725,7 @@ `#: tortoisehg\hgtk\history.py:1190` `msgid "_Bundle rev:tip..."`-`msgstr "_Пакет редакція:підказка..."`+`msgstr "_Комплект редакція:підказка..."` `#: tortoisehg\hgtk\history.py:1192` `msgid "_Archive..."`@@ -2732,7 +2737,7 @@ `#: tortoisehg\hgtk\history.py:1199` `msgid "Add/Move/Remove B_ookmark..."`-`msgstr ""`+`msgstr "Додати/Перемістити/Видалити закладку..."` `#: tortoisehg\hgtk\history.py:1200` `msgid "Rename Bookmark..."`@@ -2740,11 +2745,11 @@ `#: tortoisehg\hgtk\history.py:1203` `msgid "Set Current Bookmark..."`-`msgstr ""`+`msgstr "Встановити поточну закладку..."` `#: tortoisehg\hgtk\history.py:1209` `msgid "Import Revision to MQ"`-`msgstr ""`+`msgstr "Import Revision to MQ"` `#: tortoisehg\hgtk\history.py:1211` `msgid "Strip Revision..."`@@ -2756,15 +2761,15 @@ `#: tortoisehg\hgtk\history.py:1235` `msgid "Mark as Good"`-`msgstr ""`+`msgstr "Mark as Good"` `#: tortoisehg\hgtk\history.py:1236` `msgid "Mark as Bad"`-`msgstr ""`+`msgstr "Mark as Bad"` `#: tortoisehg\hgtk\history.py:1237` `msgid "Skip Testing"`-`msgstr ""`+`msgstr "Пропустити тестування"` `#: tortoisehg\hgtk\history.py:1248` `msgid "_Diff with selected"`@@ -2796,7 +2801,7 @@ `#: tortoisehg\hgtk\history.py:1290` `msgid "Import from here to selected to MQ"`-`msgstr ""`+`msgstr "Import from here to selected to MQ"` `#: tortoisehg\hgtk\history.py:1294` `msgid "Select common ancestor revision"`@@ -2836,7 +2841,7 @@ `#: tortoisehg\hgtk\history.py:1406` `msgid "Import patches"`-`msgstr ""`+`msgstr "Імпорт патчів"` `#: tortoisehg\hgtk\history.py:1409` `msgid "Determine and mark outgoing changesets"`@@ -2881,11 +2886,11 @@ `#: tortoisehg\hgtk\history.py:1618` `msgid "Applying bundle..."`-`msgstr ""`+`msgstr "Застосувати пакунки..."` `#: tortoisehg\hgtk\history.py:1619` `msgid "Applying bundle"`-`msgstr ""`+`msgstr "Застосувати пакунки"` `#: tortoisehg\hgtk\history.py:1664 tortoisehg\hgtk\history.py:1803` `#: tortoisehg\hgtk\history.py:1836 tortoisehg\hgtk\history.py:1889`@@ -2901,19 +2906,19 @@ `#: tortoisehg\hgtk\history.py:1689` `msgid "%d incoming changesets"`-`msgstr ""`+`msgstr "%d incoming changesets"` `#: tortoisehg\hgtk\history.py:1691` `msgid "Aborted incoming"`-`msgstr ""`+`msgstr "Перервано вхідні"` `#: tortoisehg\hgtk\history.py:1693` `msgid "No incoming changesets"`-`msgstr ""`+`msgstr "No incoming changesets"` `#: tortoisehg\hgtk\history.py:1697` `msgid "Checking incoming changesets..."`-`msgstr ""`+`msgstr "Checking incoming changesets..."` `#: tortoisehg\hgtk\history.py:1716` `msgid "Accept incoming previewed changesets"`@@ -2937,11 +2942,11 @@ `#: tortoisehg\hgtk\history.py:1770` `msgid "Failed to preview, a bundle file unrelated to this repository"`-`msgstr ""`+`msgstr "Failed to preview, a bundle file unrelated to this repository"` `#: tortoisehg\hgtk\history.py:1775` `msgid "Failed to preview, not a Mercurial bundle file"`-`msgstr ""`+`msgstr "Failed to preview, not a Mercurial bundle file"` `#: tortoisehg\hgtk\history.py:1779` `msgid "Open Bundle"`@@ -2949,23 +2954,23 @@ `#: tortoisehg\hgtk\history.py:1817` `msgid "Finished pull with rebase"`-`msgstr ""`+`msgstr "Finished pull with rebase"` `#: tortoisehg\hgtk\history.py:1820` `msgid "Finished pull"`-`msgstr ""`+`msgstr "Finished pull"` `#: tortoisehg\hgtk\history.py:1822` `msgid "No changesets to pull"`-`msgstr ""`+`msgstr "No changesets to pull"` `#: tortoisehg\hgtk\history.py:1824 tortoisehg\hgtk\history.py:2522` `msgid "Aborted pull"`-`msgstr ""`+`msgstr "Aborted pull"` `#: tortoisehg\hgtk\history.py:1827` `msgid "Pulling changesets..."`-`msgstr ""`+`msgstr "Pulling changesets..."` `#: tortoisehg\hgtk\history.py:1860` `msgid "%d outgoing changesets"`@@ -2973,15 +2978,15 @@ `#: tortoisehg\hgtk\history.py:1862` `msgid "Aborted outgoing"`-`msgstr ""`+`msgstr "Aborted outgoing"` `#: tortoisehg\hgtk\history.py:1864` `msgid "No outgoing changesets"`-`msgstr ""`+`msgstr "No outgoing changesets"` `#: tortoisehg\hgtk\history.py:1867` `msgid "Checking outgoing changesets..."`-`msgstr ""`+`msgstr "Checking outgoing changesets..."` `#: tortoisehg\hgtk\history.py:1876 tortoisehg\hgtk\synch.py:495` `msgid "No repository selected"`@@ -3043,19 +3048,19 @@ `#: tortoisehg\hgtk\history.py:1929` `msgid "Finished push"`-`msgstr ""`+`msgstr "Finished push"` `#: tortoisehg\hgtk\history.py:1931 tortoisehg\hgtk\history.py:2494` `msgid "Aborted push"`-`msgstr ""`+`msgstr "Aborted push"` `#: tortoisehg\hgtk\history.py:1934` `msgid "Pushing changesets..."`-`msgstr ""`+`msgstr "Pushing changesets..."` `#: tortoisehg\hgtk\history.py:2046` `msgid "unknown dnd dest: %s"`-`msgstr ""`+`msgstr "unknown dnd dest: %s"` `#: tortoisehg\hgtk\history.py:2163` `msgid "Confirm Revert All Files"`@@ -3079,39 +3084,39 @@ `#: tortoisehg\hgtk\history.py:2263` `msgid "Bundling from %(base)s to %(rev)s..."`-`msgstr ""`+`msgstr "Bundling from %(base)s to %(rev)s..."` `#: tortoisehg\hgtk\history.py:2265` `msgid "Bundling from %(base)s to tip..."`-`msgstr ""`+`msgstr "Bundling from %(base)s to tip..."` `#: tortoisehg\hgtk\history.py:2270` `msgid "Finish bundling"`-`msgstr ""`+`msgstr "Finish bundling"` `#: tortoisehg\hgtk\history.py:2272` `msgid "Aborted bundling"`-`msgstr ""`+`msgstr "Aborted bundling"` `#: tortoisehg\hgtk\history.py:2274` `msgid "Failed to bundle"`-`msgstr ""`+`msgstr "Failed to bundle"` `#: tortoisehg\hgtk\history.py:2276` `msgid "Bundling"`-`msgstr ""`+`msgstr "Комплектація"` `#: tortoisehg\hgtk\history.py:2299` `msgid "Finish importing"`-`msgstr ""`+`msgstr "Імпорт закінчено"` `#: tortoisehg\hgtk\history.py:2301` `msgid "Aborted importing"`-`msgstr ""`+`msgstr "Імпорт перервано"` `#: tortoisehg\hgtk\history.py:2303 tortoisehg\hgtk\thgimport.py:184` `msgid "Failed to import"`-`msgstr ""`+`msgstr "Помилка під час імпорту"` `#: tortoisehg\hgtk\history.py:2305` `msgid "Importing"`@@ -3119,7 +3124,7 @@ `#: tortoisehg\hgtk\history.py:2306` `msgid "Importing to Patch Queue..."`-`msgstr ""`+`msgstr "Importing to Patch Queue..."` `#: tortoisehg\hgtk\history.py:2314` `msgid "Confirm Rebase Revision"`@@ -3131,27 +3136,27 @@ `#: tortoisehg\hgtk\history.py:2492` `msgid "Finished push to revision %s"`-`msgstr ""`+`msgstr "Finished push to revision %s"` `#: tortoisehg\hgtk\history.py:2497` `msgid "Pushing changesets to revision %s..."`-`msgstr ""`+`msgstr "Pushing changesets to revision %s..."` `#: tortoisehg\hgtk\history.py:2498` `msgid "Push to %s"`-`msgstr ""`+`msgstr "Push to %s"` `#: tortoisehg\hgtk\history.py:2520` `msgid "Finished pull to revision %s"`-`msgstr ""`+`msgstr "Finished pull to revision %s"` `#: tortoisehg\hgtk\history.py:2525` `msgid "Pulling changesets to revision %s..."`-`msgstr ""`+`msgstr "Pulling changesets to revision %s..."` `#: tortoisehg\hgtk\history.py:2526` `msgid "Pull to %s"`-`msgstr ""`+`msgstr "Pull to %s"` `#: tortoisehg\hgtk\history.py:2539 tortoisehg\hgtk\status.py:1312` `msgid "Save patch to"`@@ -3171,7 +3176,7 @@ `#: tortoisehg\hgtk\logview\treeview.py:440` `msgid "Rev/ID"`-`msgstr ""`+`msgstr "Rev/ID"` `#: tortoisehg\hgtk\logview\treeview.py:509` `msgid "Universal Date"`@@ -3207,7 +3212,7 @@ `#: tortoisehg\hgtk\merge.py:89` `msgid "Discard all changes from merge target (other) revision"`-`msgstr ""`+`msgstr "Discard all changes from merge target (other) revision"` `#: tortoisehg\hgtk\merge.py:100` `msgid "Merge tools:"`@@ -3257,11 +3262,11 @@ `#: tortoisehg\hgtk\merge.py:204` `msgid "Cannot merge"`-`msgstr ""`+`msgstr "Обєднання неможливе"` `#: tortoisehg\hgtk\merge.py:205` `msgid "Uncommitted local changes"`-`msgstr ""`+`msgstr "Uncommitted local changes"` `#: tortoisehg\hgtk\merge.py:240` `msgid "Confirm undo merge"`@@ -3273,11 +3278,11 @@ `#: tortoisehg\hgtk\p4pending.py:30` `msgid "Pending Perforce Changelists - %s"`-`msgstr ""`+`msgstr "Pending Perforce Changelists - %s"` `#: tortoisehg\hgtk\p4pending.py:43` `msgid "Changelist:"`-`msgstr ""`+`msgstr "Набір змін:"` `#: tortoisehg\hgtk\p4pending.py:66` `msgid "Submit"`@@ -3327,7 +3332,7 @@ `#: tortoisehg\hgtk\quickop.py:127` `msgid "Do not save backup files (.orig)"`-`msgstr ""`+`msgstr "Не зберігати копії файлів (.orig)"` `#: tortoisehg\hgtk\quickop.py:153` `msgid "modified"`@@ -3601,7 +3606,7 @@ `#: tortoisehg\hgtk\shellconf.py:25` `msgid "TortoiseHg Shell Configuration"`-`msgstr ""`+`msgstr "TortoiseHg Shell Configuration"` `#: tortoisehg\hgtk\shellconf.py:27` `msgid "OK"`@@ -3641,11 +3646,11 @@ `#: tortoisehg\hgtk\shellconf.py:108` `msgid "<- Top"`-`msgstr ""`+`msgstr "<- до верху"` `#: tortoisehg\hgtk\shellconf.py:111` `msgid "Sub ->"`-`msgstr ""`+`msgstr "до низу ->"` `#: tortoisehg\hgtk\shellconf.py:116` `msgid "Taskbar"`@@ -3669,7 +3674,7 @@ `#: tortoisehg\hgtk\shellconf.py:138` `msgid "Show the taskbar icon (restart needed)"`-`msgstr ""`+`msgstr "Show the taskbar icon (потрібний перезапуск)"` `#: tortoisehg\hgtk\shellconf.py:141` `msgid "Highlight the taskbar icon during activity"`@@ -3781,7 +3786,7 @@ `#: tortoisehg\hgtk\status.py:565` `msgid "S: subrepo"`-`msgstr ""`+`msgstr "S: subrepo"` `#: tortoisehg\hgtk\status.py:891` `msgid "View '%s'"`@@ -3822,13 +3827,15 @@ `#: tortoisehg\hgtk\status.py:1059 tortoisehg\hgtk\status.py:1133` `msgid "===== Diff to first parent %d:%s =====\n"`-`msgstr ""`+`msgstr "===== Diff to first parent %d:%s =====\n"` `#: tortoisehg\hgtk\status.py:1063 tortoisehg\hgtk\status.py:1138` `msgid ""` `"\n"` `"===== Diff to second parent %d:%s =====\n"` `msgstr ""`+`"\n"`+`"===== Diff to second parent %d:%s =====\n"` `#: tortoisehg\hgtk\status.py:1170` `msgid "File is larger than the specified max size.\n"`@@ -4024,15 +4031,15 @@ `#: tortoisehg\hgtk\statusbar.py:67` `msgid "unknown field name: %s"`-`msgstr ""`+`msgstr "unknown field name: %s"` `#: tortoisehg\hgtk\statusbar.py:94` `msgid "invalid pack direction: %s"`-`msgstr ""`+`msgstr "invalid pack direction: %s"` `#: tortoisehg\hgtk\statusbar.py:103` `msgid "invalid alignment value: %s"`-`msgstr ""`+`msgstr "invalid alignment value: %s"` `#: tortoisehg\hgtk\synch.py:51` `msgid "%s - synchronize"`@@ -4229,15 +4236,15 @@ `#: tortoisehg\hgtk\tagadd.py:299` `msgid "tag '%s' does not exist"`-`msgstr ""`+`msgstr "tag '%s' does not exist"` `#: tortoisehg\hgtk\tagadd.py:302` `msgid "tag '%s' is not a local tag"`-`msgstr ""`+`msgstr "tag '%s' is not a local tag"` `#: tortoisehg\hgtk\tagadd.py:305` `msgid "tag '%s' is not a global tag"`-`msgstr ""`+`msgstr "tag '%s' is not a global tag"` `#: tortoisehg\hgtk\tagadd.py:308` `msgid "Removed tag %s"`@@ -4270,7 +4277,7 @@ `#: tortoisehg\hgtk\thgconfig.py:34` `msgid "Visual Diff Tool"`-`msgstr ""`+`msgstr "Visual Diff Tool"` `#: tortoisehg\hgtk\thgconfig.py:35` `msgid ""`@@ -4278,6 +4285,9 @@ `"Mercurial configuration files. If left unspecified, TortoiseHg will use the "` `"selected merge tool. Failing that it uses the first applicable tool it finds."` `msgstr ""`+`"Specify visual diff tool, as described in the [merge-tools] section of your "`+`"Mercurial configuration files. If left unspecified, TortoiseHg will use the "`+`"selected merge tool. Failing that it uses the first applicable tool it finds."` `#: tortoisehg\hgtk\thgconfig.py:39` `msgid "Visual Editor"`@@ -4298,6 +4308,9 @@ `"multiline input from the user. Used by command line commands, including "` `"patch import."` `msgstr ""`+`"The editor to use during a commit and other instances where Mercurial needs "`+`"multiline input from the user. Used by command line commands, including "`+`"patch import."` `#: tortoisehg\hgtk\thgconfig.py:45` `msgid "Tab Width"`@@ -4308,6 +4321,8 @@ `"Specify the number of spaces that tabs expand to in various TortoiseHg "` `"windows. Default: Not expanded"` `msgstr ""`+`"Specify the number of spaces that tabs expand to in various TortoiseHg "`+`"windows. Default: Not expanded"` `#: tortoisehg\hgtk\thgconfig.py:49` `msgid "Max Diff Size"`@@ -4338,7 +4353,7 @@ `#: tortoisehg\hgtk\thgconfig.py:57` `msgid "Capture stderr"`-`msgstr ""`+`msgstr "Capture stderr"` `#: tortoisehg\hgtk\thgconfig.py:58` `msgid ""`@@ -4362,7 +4377,7 @@ `#: tortoisehg\hgtk\thgconfig.py:63` `msgid "Full Path Title"`-`msgstr ""`+`msgstr "Full Path Title"` `#: tortoisehg\hgtk\thgconfig.py:64` `msgid ""`@@ -4390,6 +4405,9 @@ `"issue a warning if the summary line is too long or not separated by a blank "` `"line. Default: 0 (unenforced)"` `msgstr ""`+`"Maximum length of the commit message summary line. If set, TortoiseHg will "`+`"issue a warning if the summary line is too long or not separated by a blank "`+`"line. Default: 0 (unenforced)"` `#: tortoisehg\hgtk\thgconfig.py:75` `msgid "Message Line Length"`@@ -4539,10 +4557,12 @@ `"Adjust the display of the main toolbar in the Repository Explorer. Values: "` `"small, large, or theme. Default: theme"` `msgstr ""`+`"Adjust the display of the main toolbar in the Repository Explorer. Values: "`+`"small, large, or theme. Default: theme"` `#: tortoisehg\hgtk\thgconfig.py:133` `msgid "After Pull Operation"`-`msgstr ""`+`msgstr "After Pull Operation"` `#: tortoisehg\hgtk\thgconfig.py:135` `msgid ""`@@ -4896,30 +4916,34 @@ `#: tortoisehg\hgtk\thgconfig.py:252` `msgid "Coloring Style"`-`msgstr ""`+`msgstr "Coloring Style"` `#: tortoisehg\hgtk\thgconfig.py:254` `msgid ""` `"Adjust the coloring style of diff lines in the changeset viewer. Default: "` `"foreground"` `msgstr ""`+`"Adjust the coloring style of diff lines in the changeset viewer. Default: "`+`"foreground"` `#: tortoisehg\hgtk\thgconfig.py:258` `msgid "Commit Message"`-`msgstr ""`+`msgstr "Commit Message"` `#: tortoisehg\hgtk\thgconfig.py:259` `msgid ""` `"Font used in changeset viewer and commit log text. Default: monospace 10"` `msgstr ""`+`"Font used in changeset viewer and commit log text. Default: monospace 10"` `#: tortoisehg\hgtk\thgconfig.py:261` `msgid "Diff Text"`-`msgstr ""`+`msgstr "Diff Text"` `#: tortoisehg\hgtk\thgconfig.py:262` `msgid "Font used for diffs in status and commit tools. Default: monospace 10"` `msgstr ""`+`"Font used for diffs in status and commit tools. Default: monospace 10"` `#: tortoisehg\hgtk\thgconfig.py:264` `msgid "File List"`@@ -4927,7 +4951,7 @@ `#: tortoisehg\hgtk\thgconfig.py:265` `msgid "Font used in file lists in status and commit tools. Default: sans 9"`-`msgstr ""`+`msgstr "Font used in file lists in status and commit tools. Default: sans 9"` `#: tortoisehg\hgtk\thgconfig.py:267` `msgid "Command Output"`@@ -4935,11 +4959,11 @@ `#: tortoisehg\hgtk\thgconfig.py:268` `msgid "Font used in command output window. Default: monospace 10"`-`msgstr ""`+`msgstr "Font used in command output window. Default: monospace 10"` `#: tortoisehg\hgtk\thgconfig.py:272` `msgid "Japanese on Windows"`-`msgstr ""`+`msgstr "Japanese on Windows"` `#: tortoisehg\hgtk\thgconfig.py:279` `msgid "http"`@@ -5011,7 +5035,7 @@ `#: tortoisehg\hgtk\thgconfig.py:575` `msgid "Can't change settings without iniparse package - view is readonly."`-`msgstr ""`+`msgstr "Can't change settings without iniparse package - view is readonly."` `#: tortoisehg\hgtk\thgconfig.py:592` `msgid "User global settings"`@@ -5099,19 +5123,19 @@ `#: tortoisehg\hgtk\thgconfig.py:1051` `msgid "Theme default fonts"`-`msgstr ""`+`msgstr "Типова тема шрифтів"` `#: tortoisehg\hgtk\thgconfig.py:1052` `msgid "Preset fonts:"`-`msgstr ""`+`msgstr "Preset fonts:"` `#: tortoisehg\hgtk\thgconfig.py:1053` `msgid "Custom fonts:"`-`msgstr ""`+`msgstr "Користувальницькі шрифти:"` `#: tortoisehg\hgtk\thgconfig.py:1061` `msgid " - Select Preset -"`-`msgstr ""`+`msgstr " - Select Preset -"` `#: tortoisehg\hgtk\thgconfig.py:1171` `msgid "Suggested"`@@ -5131,17 +5155,19 @@ `#: tortoisehg\hgtk\thgconfig.py:1240` `msgid "Insufficient access rights, reverting to read-onlymode."`-`msgstr ""`+`msgstr "Insufficient access rights, reverting to read-onlymode."` `#: tortoisehg\hgtk\thgconfig.py:1262` `msgid "Unable to parse a config file"`-`msgstr ""`+`msgstr "Неможливо розібрати конфігураційний файл"` `#: tortoisehg\hgtk\thgconfig.py:1263` `msgid ""` `"%s\n"` `"Reverting to read-only mode."` `msgstr ""`+`"%s\n"`+`"Reverting to read-only mode."` `#: tortoisehg\hgtk\thgconfig.py:1308` `msgid "Skipped saving path with no alias"`@@ -5161,7 +5187,7 @@ `#: tortoisehg\hgtk\thgimport.py:78` `msgid "Import from Clipboard"`-`msgstr ""`+`msgstr "Import from Clipboard"` `#: tortoisehg\hgtk\thgimport.py:82` `msgid "Source:"`@@ -5181,7 +5207,7 @@ `#: tortoisehg\hgtk\thgimport.py:180` `msgid "Imported successfully"`-`msgstr ""`+`msgstr "Imported successfully"` `#: tortoisehg\hgtk\thgimport.py:182` `msgid "Canceled importing"`@@ -5193,35 +5219,35 @@ `#: tortoisehg\hgtk\thgimport.py:189` `msgid "Do you want to close?"`-`msgstr ""`+`msgstr "Ви хочете, закрити?"` `#: tortoisehg\hgtk\thgimport.py:199` `msgid "Select Patches"`-`msgstr ""`+`msgstr "Select Patches"` `#: tortoisehg\hgtk\thgimport.py:210` `msgid "Select Directory contains patches:"`-`msgstr ""`+`msgstr "Select Directory contains patches:"` `#: tortoisehg\hgtk\thgimport.py:277` `msgid "%s patches"`-`msgstr ""`+`msgstr "%s патчів"` `#: tortoisehg\hgtk\thgimport.py:279` `msgid "%s will be imported to the"`-`msgstr ""`+`msgstr "%s will be imported to the"` `#: tortoisehg\hgtk\thgimport.py:281` `msgid "%s will be imported to the repository"`-`msgstr ""`+`msgstr "%s will be imported to the repository"` `#: tortoisehg\hgtk\thgimport.py:283` `msgid "Nothing to import"`-`msgstr ""`+`msgstr "Нічого імпортувати"` `#: tortoisehg\hgtk\thgimport.py:341` `msgid "unexpected destination name: %s"`-`msgstr ""`+`msgstr "unexpected destination name: %s"` `#: tortoisehg\hgtk\thgmq.py:102` `msgid "Unapply all patches"`@@ -5245,7 +5271,7 @@ `#: tortoisehg\hgtk\thgmq.py:202` `msgid "Patch"`-`msgstr ""`+`msgstr "Патч"` `#: tortoisehg\hgtk\thgmq.py:345` `msgid "Yes (&keep)"`@@ -5257,11 +5283,11 @@ `#: tortoisehg\hgtk\thgmq.py:349` `msgid "Do you want to delete '%(name)s'?"`-`msgstr ""`+`msgstr "Do you want to delete '%(name)s'?"` `#: tortoisehg\hgtk\thgmq.py:353` `msgid "Do you want to delete these patches?"`-`msgstr ""`+`msgstr "Do you want to delete these patches?"` `#: tortoisehg\hgtk\thgmq.py:442 tortoisehg\hgtk\thgmq.py:446` `msgid "Confirm Fold"`@@ -5279,10 +5305,12 @@ `"Do you want to fold following un-applied patches into the current patch "` `"'%(qtip)s'?"` `msgstr ""`+`"Do you want to fold following un-applied patches into the current patch "`+`"'%(qtip)s'?"` `#: tortoisehg\hgtk\thgmq.py:502` `msgid "invalid reorder operation: %s"`-`msgstr ""`+`msgstr "invalid reorder operation: %s"` `#: tortoisehg\hgtk\thgmq.py:741` `msgid "Top"`@@ -5310,7 +5338,7 @@ `#: tortoisehg\hgtk\thgmq.py:772` `msgid "_Finish Applied"`-`msgstr ""`+`msgstr "_Finish Applied"` `#: tortoisehg\hgtk\thgmq.py:775 tortoisehg\hgtk\thgmq.py:805` `msgid "_Delete"`@@ -5318,11 +5346,11 @@ `#: tortoisehg\hgtk\thgmq.py:777 tortoisehg\hgtk\thgmq.py:808` `msgid "F_old"`-`msgstr ""`+`msgstr "F_old"` `#: tortoisehg\hgtk\thgmq.py:780 tortoisehg\hgtk\thgmq.py:812` `msgid "Reorder"`-`msgstr ""`+`msgstr "Reorder"` `#: tortoisehg\hgtk\thgmq.py:832` `msgid "Status"`@@ -5358,7 +5386,7 @@ `#: tortoisehg\hgtk\thgshelve.py:107` `msgid "_Shelve"`-`msgstr ""`+`msgstr "_Shelve"` `#: tortoisehg\hgtk\thgshelve.py:140` `msgid "No changes to shelve"`@@ -5434,11 +5462,11 @@ `#: tortoisehg\hgtk\thgstrip.py:179` `msgid "%s changesets"`-`msgstr ""`+`msgstr "%s changesets"` `#: tortoisehg\hgtk\thgstrip.py:180` `msgid "%s will be stripped"`-`msgstr ""`+`msgstr "%s will be stripped"` `#: tortoisehg\hgtk\thgstrip.py:214` `msgid "Confirm Strip"`@@ -5490,11 +5518,11 @@ `#: tortoisehg\hgtk\update.py:104` `msgid "Always merge (when possible)"`-`msgstr ""`+`msgstr "Always merge (when possible)"` `#: tortoisehg\hgtk\update.py:107` `msgid "Always show log"`-`msgstr ""`+`msgstr "Always show log"` `#: tortoisehg\hgtk\update.py:149` `msgid "Updated successfully"`@@ -5561,7 +5589,7 @@ `#: tortoisehg\hgtk\visdiff.py:34` `msgid "[non-existant]"`-`msgstr ""`+`msgstr "[non-existant]"` `#: tortoisehg\hgtk\visdiff.py:81` `msgid "Tool launch failure"`@@ -5573,11 +5601,11 @@ `#: tortoisehg\hgtk\visdiff.py:88 tortoisehg\hgtk\visdiff.py:156` `msgid "No diff tool found"`-`msgstr ""`+`msgstr "No diff tool found"` `#: tortoisehg\hgtk\visdiff.py:89 tortoisehg\hgtk\visdiff.py:157` `msgid "No visual diff tools were detected"`-`msgstr ""`+`msgstr "No visual diff tools were detected"` `#: tortoisehg\hgtk\visdiff.py:94` `msgid "[working copy]"`@@ -5593,7 +5621,7 @@ `#: tortoisehg\hgtk\visdiff.py:133` `msgid "You likely need to refresh this application"`-`msgstr ""`+`msgstr "You likely need to refresh this application"` `#: tortoisehg\hgtk\visdiff.py:150` `msgid "No file changes"`@@ -5605,7 +5633,7 @@ `#: tortoisehg\hgtk\visdiff.py:284` `msgid "cleaning up temp directory\n"`-`msgstr ""`+`msgstr "cleaning up temp directory\n"` `#: tortoisehg\hgtk\visdiff.py:301` `msgid "Visual Diffs"`@@ -5621,7 +5649,7 @@ `#: tortoisehg\hgtk\visdiff.py:310` `msgid "revisions %d to %d"`-`msgstr ""`+`msgstr "revisions %d to %d"` `#: tortoisehg\hgtk\visdiff.py:311` `msgid "Visual Diffs - "`@@ -5629,7 +5657,7 @@ `#: tortoisehg\hgtk\visdiff.py:313` `msgid " filtered"`-`msgstr ""`+`msgstr " filtered"` `#: tortoisehg\hgtk\visdiff.py:327` `msgid "Temporary files are removed when this dialog is closed"`@@ -5637,19 +5665,19 @@ `#: tortoisehg\hgtk\visdiff.py:381` `msgid "Dir diff to p1"`-`msgstr ""`+`msgstr "Dir diff to p1"` `#: tortoisehg\hgtk\visdiff.py:383` `msgid "Dir diff to p2"`-`msgstr ""`+`msgstr "Dir diff to p2"` `#: tortoisehg\hgtk\visdiff.py:385` `msgid "3-way dir diff"`-`msgstr ""`+`msgstr "3-way dir diff"` `#: tortoisehg\hgtk\visdiff.py:391` `msgid "Directory diff"`-`msgstr ""`+`msgstr "Directory diff"` `#: tortoisehg\hgtk\visdiff.py:524` `msgid "Unable to delete temp files"`@@ -5896,11 +5924,11 @@ `#: tortoisehg\util\menuthg.py:52` `msgid "File History"`-`msgstr ""`+`msgstr "File History"` `#: tortoisehg\util\menuthg.py:53` `msgid "View change history of selected files"`-`msgstr ""`+`msgstr "View change history of selected files"` `#: tortoisehg\util\menuthg.py:56` `msgid "Synchronize with remote repository"`@@ -5952,11 +5980,11 @@ `#: tortoisehg\util\menuthg.py:76` `msgid "Explorer Extension Settings"`-`msgstr ""`+`msgstr "Explorer Extension Settings"` `#: tortoisehg\util\menuthg.py:77` `msgid "Configure Explorer extension"`-`msgstr ""`+`msgstr "Configure Explorer extension"` `#: tortoisehg\util\menuthg.py:79` `msgid "About TortoiseHg"`@@ -6016,15 +6044,15 @@ `#: tortoisehg\util\prej.py:143` `msgid "patching file %s\n"`-`msgstr ""`+`msgstr "patching file %s\n"` `#: tortoisehg\util\prej.py:190` `msgid "%d out of %d hunk%s FAILED -- saving rejects to file %s\n"`-`msgstr ""`+`msgstr "%d out of %d hunk%s FAILED -- saving rejects to file %s\n"` `#: tortoisehg\util\prej.py:226` `msgid "bad hunk #%d %s (%d %d %d %d)"`-`msgstr ""`+`msgstr "bad hunk #%d %s (%d %d %d %d)"` `#: tortoisehg\util\prej.py:235` `msgid "file %s already exists\n"`@@ -6032,48 +6060,48 @@ `#: tortoisehg\util\prej.py:287` `msgid "Hunk #%d succeeded at %d with fuzz %d (offset %d lines).\n"`-`msgstr ""`+`msgstr "Hunk #%d succeeded at %d with fuzz %d (offset %d lines).\n"` `#: tortoisehg\util\prej.py:294` `msgid "Hunk #%d succeeded at %d (offset %d lines).\n"`-`msgstr ""`+`msgstr "Hunk #%d succeeded at %d (offset %d lines).\n"` `#: tortoisehg\util\prej.py:299` `msgid "Hunk #%d FAILED at %d\n"`-`msgstr ""`+`msgstr "Hunk #%d FAILED at %d\n"` `#: tortoisehg\util\prej.py:318 tortoisehg\util\prej.py:344` `#: tortoisehg\util\prej.py:376` `msgid "bad hunk #%d"`-`msgstr ""`+`msgstr "bad hunk #%d"` `#: tortoisehg\util\prej.py:363 tortoisehg\util\prej.py:405` `msgid "bad hunk #%d old text line %d"`-`msgstr ""`+`msgstr "bad hunk #%d old text line %d"` `#: tortoisehg\util\prej.py:550` `msgid "could not extract binary patch"`-`msgstr ""`+`msgstr "could not extract binary patch"` `#: tortoisehg\util\prej.py:566` `msgid "binary patch is %d bytes, not %d"`-`msgstr ""`+`msgstr "binary patch is %d bytes, not %d"` `#: tortoisehg\util\prej.py:591` `msgid "unable to strip away %d dirs from %s"`-`msgstr ""`+`msgstr "unable to strip away %d dirs from %s"` `#: tortoisehg\util\prej.py:613` `msgid "unable to find %s or %s for patching"`-`msgstr ""`+`msgstr "unable to find %s or %s for patching"` `#: tortoisehg\util\prej.py:792` `msgid "malformed patch %s %s"`-`msgstr ""`+`msgstr "malformed patch %s %s"` `#: tortoisehg\util\prej.py:803` `msgid "No valid hunks found"`-`msgstr ""`+`msgstr "No valid hunks found"` `#: tortoisehg\util\version.py:17` `msgid "repository %s not found"`

Diff Options

stable i18n: update translations

Attach a Trello Card

Your session has expired

Diff Options

Add a bookmark

stable i18n: update translations

Diff to f09e44ba74ac

Attach a Trello Card

Add a tag

Your session has expired