aboutsummaryrefslogtreecommitdiffstats
path: root/Resources
Commit message (Collapse)AuthorAgeFilesLines
* - Update version strings to 0.9.9 version and 2011 copyright datesrowanbeentje2011-06-1257-5/+144
| | | | | - Add German and Russian localisations
* * Add translators to creditsdmoagx2011-06-091-1/+21
|
* - Add tooltips to the previous/next tab menu items listing alternate ↵rowanbeentje2011-06-052-0/+0
| | | | | | | keyboard shortcuts - Update localizable strings
* * Fixes most parts of #1006 (Translation of file names)dmoagx2011-05-103-0/+0
| | | | * Update strings files
* - Fix a number of warnings for DBView.xib by moving some 10.6-only code ↵rowanbeentje2011-05-083-0/+0
| | | | | | | from a #ifndef SP_REFACTOR/#else/#endif to just a #ifdef SP_REFACTOR/<protocol declaration>/#endif, and remarking a few items as IBOutlets - Update localisable strings
* Re-add the ability the show the full process list in the server processes ↵stuconnolly2011-05-071-1/+3
| | | | panel. Fixes issue #1036.
* Implement a large number of minor fixes and improvements to export ↵rowanbeentje2011-05-071-0/+0
| | | | | | | | | | | | | | | | | | | | | | functionality, including an overhaul of filename NSTokenField functionality: - Improve the NSTokenField used for export filenames: only tokenise reserved tokens, don't tokenise reserved words which are parts of other words, allow the comma to be used, update tokenisation during typing, and prevent whitespace triming. - Save the last selected export path, and make the path selection button open a dialog to the selected directory - Save the export filename and restore on future uses of the export dialog (only if the name contains placeholder tokens, so one-off export names aren't saved) - If the advanced options are collapsed, display a summary of the selected options next to the disclosure triangle - Display a small warning in the corner of the window if the export file cannot be imported into Sequel Pro, to warn those people attempting to back up their databases in XML - Clarify and improve the export warning dialog if files already exist or could not be created; make the simpler file-exists cases reflect OS-style dialogs, alter wording based on the number of files that failed and how they failed, and only show the "replace" or "skip" type buttons if it makes sense to do so. - Fix a mutation-during-enumeration error when skipping files - If "Cancel" is chosen in the export file creation replace/error dialog, redisplay the export sheet with the previous selection still active - Add support for year, month and day tokens in the filename token list - Don't allow blank custom filenames, before or after tokenisation, as this can cause problems - instead fall back to default filenames in those cases - Only append the extension if one hasn't been set - on all export formats, extending r3284 - If exporting to multiple files option is enabled but only one table is selected, supply that table name for filename table tokens - Update the progress bar to reflect update progress when exporting CSV data - Fix a bug causing exports to hang if the low-memory advanced option was set and content was selected to export and any empty tables were encountered - Save memory use and compression advanced export settings across sessions - Update localisable strings
* * And this time actually with genstrings, sorrydmoagx2011-03-201-0/+0
|
* - Fix compiler warnings for MCPKit - largely typecast relatedrowanbeentje2011-03-024-0/+0
| | | | | | | | | - Fix further compiler warnings, including a couple of bugs - Disable the -wselector warnings (Multiple definition types for selector) as they're currently unsupported in LLVM - Disable the -wconversion warnings (Prototype conversion) warnings as we usually can't affect protocol declaration - Disable the -wstrict-selector-match (Strict selector matching) due to too many false positives
* • updated Credits.rtf re ShortcutRecorderBibiko2011-01-241-0/+11
|
* - Change shortcut for "Duplicate Connection Tab" to alt-T for increased ↵rowanbeentje2011-01-232-0/+0
| | | | | | | | discoverability - this improves on Issue #943 - Add alternate keybindings for tab switching - support command-shift-[ and -], and command-alt-left and right arrows to match behaviour of other applications - Update localisable strings
* • updated syntax highlighting and completion suggestions due to 5.5 additionsBibiko2011-01-211-0/+26
| | | | • improved "Format SQL" connection detection
* • implemented user-definable Soft IndentionBibiko2011-01-211-0/+4
| | | | | - instead of using \t as indention string the user can choose how many spaces should be used instead - addresses issue 956
* - When saving user changes to the database, catch errors and display them ↵rowanbeentje2011-01-203-0/+0
| | | | | | | | in a single sheet for review. This fixes a number of isGroupRow crashes on any error. - Track a host row's original host to allow host edits - Update localisable strings
* - Rework the Add Index indexes menu and the auto_increment index required ↵rowanbeentje2011-01-043-0/+0
| | | | | | | | | | | | | menu to use tag-based values when generating queries, allowing localisation of menu contents without using those localised values in queries. This addresses I$ - Remove the ability to specify a FULLTEXT auto_increment index, as I believe this isn't possible. - Prevent sheet reuse from specifying invalid storage types for PRIMARY KEYs - Fix exceptions when adding indexes to a table where every field is already indexed - Fix initialField/indexedFieldNames check to improve on r3061 - Fix toggling advanced index view after closing the sheet with the view open - Update localisable strings
* • changed the way to check for available update of Default BundlesBibiko2011-01-031-2/+0
| | | | - perform a check only if the revision number is greater as the last recorded one, in other words if an updated version of Sequel Pro was installed and runs for the very first time
* * Provide more context for Bundle Editor localizable messages (leaves one ↵dmoagx2010-12-262-0/+0
| | | | issue with genstrings, might need to set "-q")
* - Fix issues with user management and GRANT OPTION - when applying all ↵rowanbeentje2010-12-222-0/+0
| | | | | | | privileges (or removing all privileges) at once, the server treated the list of all options as 'GRANT ALL', instead of GRANT ALL WITH GRANT OPTION. - Update localisable strings files
* • preparations for managing default Bundles which will ship with SPBibiko2010-12-201-0/+4
| | | | • improved Bundle Editor to store only modified Bundles
* • HTML output windowBibiko2010-12-131-0/+2
| | | | | - enabled WebInspector in context menu for debugging - alert the user about JavaScript parsing errors and exceptions with some debug info
* * Fix a minor typo (reported by Sérgio Miranda) and update .stringsdmoagx2010-12-122-0/+0
|
* Apply a tweaked version of a patch by Aaron Linville ↵rowanbeentje2010-12-052-3/+5
| | | | | | | | | | (http://www.linville.org/) to handle table linking in .dot exports on case-insensitive servers: - Adds a new checkbox on the .dot export interface controlling the case sensitivty of link handling - Improve .dot export to use lowercase link references when the option is enabled, fixing .dot exports of table relations of table names with uppercase characters on case-insensitive servers - Check the server's case-sensitivity setting and use that to control the checkbox when using the export interface to select .dot export This addresses Issue #920.
* - Show and hide the custom query info area based on whether custom query ↵rowanbeentje2010-12-044-0/+0
| | | | | | | | | | errors occurred, starting off hidden - Add "errors"/"no errors" prefix to the custom query status area - Add an import cancelled line to the import error list when stopping imports after errors - Fix custom query error highlighting by scrolling to the error - Update localisable strings
* • added cancel operation images and set them to SPActivityTextFieldBibiko2010-12-026-0/+0
|
* - Change the CSV import accessory view to a general import accessory view, ↵rowanbeentje2010-11-292-0/+0
| | | | | | | | | based on a tab view - When importing SQL, use the accessory view to ask how to handle errors: Ask (the new default), which prompts the user on each error whether to continue, stop, or ignore all errors; and ignoring all errors, which matches the old behaviour. This addresses Issue #901. - When showing the reconnection dialog ensure the window isn't minimised - Update localisable strings
* - Fix issues right-clicking in the empty table area ( http://spbug.com/l/1726 )rowanbeentje2010-11-272-0/+0
| | | | | | | - Improve 10.5 compatibility when clearing menus ( http://spbug.com/l/1508 , http://spbug.com/l/1829 , http://spbug.com/l/1818 ) - Fix a possible crash when updating database lists - Update localisable strings
* - Abstract SPDatabaseDocument's Connection/.spf saving/loading ↵rowanbeentje2010-11-234-0/+0
| | | | | | | | | | functionality into state setting and getting functions, and refactor old commands to use them - Fix restoring of content sort column order and selected indexes - Add menu items for duplicating current tab (as an alternate), opening selected table in a new tab, or opening selected database in a new tab - Clean up file menu by making Connection/Session "Save as..." menu items alternates - Update localisable strings
* - Add the NewBSD-licensed ShortcutRecorder.framework to the project, for ↵rowanbeentje2010-11-164-0/+0
| | | | | | | initial use in the bundle editor (not implemented yet). Includes the .ibplugin within the framework. - Update localisable strings
* • Quicklook supportBibiko2010-11-1511-16/+32
| | | | | | | | | - used embedded icon image via cid and mime type image/tiff - sql view now wraps long lines - improved general stability - QL now runs on main thread note: there're still some issues for which QL crashed mostly due NSAutoReleasePool releases - more investigations are needed; most of this issues are releted to long lines, icon caching, releasing ...
* - Switch to explicit memory management of strings in the QuickLook plugin ↵rowanbeentje2010-11-152-2/+2
| | | | | | | when viewing SQL files - this fixes certain crashers, addressing Issue 896. - Tweak a misspelling in the templates
* Make sure the root favorite has a name key and value. Also, update string files.stuconnolly2010-11-111-0/+0
|
* • improved Bundle support; now it the passed input string will be saved as ↵Bibiko2010-11-102-2/+12
| | | | | | | temp file SP_BUNDLE_INPUT_FILE since stdin and shell vars are difficult to handle for a large amount of data • fixed AppleScript class definition since it was renamed • added support for the URL scheme 'sequel' to allow to interact with Sequel Pro eg via bash: open 'sequelpro://executequery=select%205' [not yet implemented ;)]
* Fix build errors.stuconnolly2010-11-091-0/+0
|
* • added spBundle file extensionBibiko2010-11-091-0/+49
|
* Rearchitect preferences, including:stuconnolly2010-11-032-0/+0
| | | | | | | | | - Split each preference pane into their own controller (subclass of SPPreferencePane, which is a subclass of NSViewController). - Each preference pane controller conforms to the protocol SPPreferencePaneProtocol to allow the main preference controller to build the toolbar. - Move the preferences upgrade function to it's own file. - Add SPFontPreviewTextField which is based on Colloquy's JVFontPreviewField to allow previewing of the selected font in the tables and editor preference panes. - Update localisable strings files.
* Add a new category to SPDatabaseDocument, allowing code cleanup and moving ↵rowanbeentje2010-11-034-0/+0
| | | | | | | | | | | central functionality out of SPTablesList: - Centralise control over table loading, moving it away from SPTablesList and into SPDatabaseDocument and the new SPDatabaseViewController category - Centralise control over the main tab view, moving control away from SPTablesList and into SPDatabaseDocument and the new SPDatabaseViewController category - Simplify and clean up view loading logic - Improve thread safety - Update localisable strings
* Split out all of SPTableStructure's delegate and datasource methods into ↵stuconnolly2010-10-261-0/+0
| | | | their own category.
* - Split out all of SPExportController's delegate methods to their own category.stuconnolly2010-10-242-0/+0
| | | | | | | | - Prepare for the implementation of PDF and HTML export by hiding the export options box for export types that don't need it. - Fix some spacing issues on the export dialog. - Create a new SPCategoryAdditions header that is included in the apps precompiled header, making all additions available to all classes. - Update strings files.
* Update credits.stuconnolly2010-10-211-6/+17
|
* Update credits.stuconnolly2010-10-201-2/+1
|
* Add a 'Edit Trigger' menu item to the trigger's table view context menu.stuconnolly2010-10-191-0/+0
|
* Because the process of editing a trigger involves droping and then ↵stuconnolly2010-10-191-0/+0
| | | | re-creating it, if an error occurs when attempting to re-create it remember to then re-create the original one. Fixes issue #795.
* Localize the header included in SQL and XML exports.stuconnolly2010-10-191-0/+0
|
* Remove use of multiple comments for localized strings.stuconnolly2010-10-191-0/+0
|
* Update strings files.stuconnolly2010-10-191-0/+0
|
* Add CFBundleShortVersionString property to MCPKit Info.plist.stuconnolly2010-10-161-0/+2
|
* Rename HTML print templates.stuconnolly2010-10-163-6/+6
|
* • implemented filter content type 'spatial' with general spatial operators ↵Bibiko2010-10-151-0/+89
| | | | for usage as filter of spatial fields
* Forgot to update Localizable.strings for previous commit.stuconnolly2010-10-101-0/+0
|
* Add support for adding SPATIAL indexes on MyISAM tables. Also, update ↵stuconnolly2010-10-081-0/+0
| | | | Localizable.strings.
id='n1261' href='#n1261'>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 1405 1406 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 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 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 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 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 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