--- a/ProjectDjango/i18n/django_en.ts Mon Dec 19 19:26:40 2016 +0100 +++ b/ProjectDjango/i18n/django_en.ts Mon Dec 19 20:22:37 2016 +0100 @@ -218,32 +218,32 @@ <context> <name>DjangoMigrationsListDialog</name> <message> - <location filename="../DjangoMigrationsListDialog.py" line="67"/> + <location filename="../DjangoMigrationsListDialog.py" line="69"/> <source>Name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../DjangoMigrationsListDialog.py" line="74"/> + <location filename="../DjangoMigrationsListDialog.py" line="76"/> <source>Migration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../DjangoMigrationsListDialog.py" line="74"/> + <location filename="../DjangoMigrationsListDialog.py" line="76"/> <source>Dependencies</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../DjangoMigrationsListDialog.py" line="174"/> + <location filename="../DjangoMigrationsListDialog.py" line="176"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../DjangoMigrationsListDialog.py" line="174"/> + <location filename="../DjangoMigrationsListDialog.py" line="176"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../DjangoMigrationsListDialog.py" line="66"/> + <location filename="../DjangoMigrationsListDialog.py" line="68"/> <source>Available Migrations</source> <translation type="unfinished"></translation> </message> @@ -253,47 +253,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../DjangoMigrationsListDialog.py" line="73"/> + <location filename="../DjangoMigrationsListDialog.py" line="75"/> <source>Migrations Plan</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../DjangoMigrationsListDialog.py" line="81"/> + <location filename="../DjangoMigrationsListDialog.py" line="83"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../DjangoMigrationsListDialog.py" line="83"/> + <location filename="../DjangoMigrationsListDialog.py" line="85"/> <source>Press to refresh the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../DjangoMigrationsListDialog.py" line="286"/> + <location filename="../DjangoMigrationsListDialog.py" line="288"/> <source>Apply All Migrations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../DjangoMigrationsListDialog.py" line="312"/> + <location filename="../DjangoMigrationsListDialog.py" line="314"/> <source>Apply Selected Migrations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../DjangoMigrationsListDialog.py" line="300"/> + <location filename="../DjangoMigrationsListDialog.py" line="302"/> <source>Unapply Migrations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../DjangoMigrationsListDialog.py" line="370"/> + <location filename="../DjangoMigrationsListDialog.py" line="372"/> <source>Make Migrations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../DjangoMigrationsListDialog.py" line="307"/> + <location filename="../DjangoMigrationsListDialog.py" line="309"/> <source>Make Migrations (dry-run)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../DjangoMigrationsListDialog.py" line="370"/> + <location filename="../DjangoMigrationsListDialog.py" line="372"/> <source>Enter a name for the migrations (leave empty to use system supplied name):</source> <translation type="unfinished"></translation> </message> @@ -467,6 +467,49 @@ </message> </context> <context> + <name>DjangoSquashMigrationSelectionDialog</name> + <message> + <location filename="../DjangoSquashMigrationSelectionDialog.ui" line="14"/> + <source>Squash Migrations</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../DjangoSquashMigrationSelectionDialog.ui" line="23"/> + <source>Application:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../DjangoSquashMigrationSelectionDialog.ui" line="36"/> + <source>Select the application</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../DjangoSquashMigrationSelectionDialog.ui" line="43"/> + <source>Start Migration:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../DjangoSquashMigrationSelectionDialog.ui" line="76"/> + <source>Select a migration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../DjangoSquashMigrationSelectionDialog.ui" line="63"/> + <source>End Migration:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../DjangoSquashMigrationSelectionDialog.ui" line="83"/> + <source>Select to not optimize the squashed migration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../DjangoSquashMigrationSelectionDialog.ui" line="86"/> + <source>Dont' optimize</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>Project</name> <message> <location filename="../Project.py" line="115"/> @@ -564,7 +607,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="1938"/> + <location filename="../Project.py" line="1954"/> <source>Run Web-Browser</source> <translation type="unfinished"></translation> </message> @@ -584,7 +627,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="2460"/> + <location filename="../Project.py" line="2519"/> <source>Create Cache Tables</source> <translation type="unfinished"></translation> </message> @@ -624,7 +667,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="1389"/> + <location filename="../Project.py" line="1405"/> <source>About Django</source> <translation type="unfinished"></translation> </message> @@ -724,7 +767,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="2095"/> + <location filename="../Project.py" line="2111"/> <source>Create Tables</source> <translation type="unfinished"></translation> </message> @@ -744,7 +787,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="2102"/> + <location filename="../Project.py" line="2118"/> <source>Create Indexes</source> <translation type="unfinished"></translation> </message> @@ -764,7 +807,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="2109"/> + <location filename="../Project.py" line="2125"/> <source>Create Everything</source> <translation type="unfinished"></translation> </message> @@ -784,7 +827,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="2116"/> + <location filename="../Project.py" line="2132"/> <source>Custom Statements</source> <translation type="unfinished"></translation> </message> @@ -804,7 +847,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="2123"/> + <location filename="../Project.py" line="2139"/> <source>Drop Tables</source> <translation type="unfinished"></translation> </message> @@ -824,7 +867,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="2137"/> + <location filename="../Project.py" line="2153"/> <source>Flush Database</source> <translation type="unfinished"></translation> </message> @@ -844,7 +887,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="2144"/> + <location filename="../Project.py" line="2160"/> <source>Reset Sequences</source> <translation type="unfinished"></translation> </message> @@ -864,7 +907,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="2361"/> + <location filename="../Project.py" line="2420"/> <source>Diff Settings</source> <translation type="unfinished"></translation> </message> @@ -884,7 +927,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="2382"/> + <location filename="../Project.py" line="2441"/> <source>Cleanup</source> <translation type="unfinished"></translation> </message> @@ -904,7 +947,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="2405"/> + <location filename="../Project.py" line="2464"/> <source>Validate</source> <translation type="unfinished"></translation> </message> @@ -944,7 +987,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="2497"/> + <location filename="../Project.py" line="2556"/> <source>Dump Data</source> <translation type="unfinished"></translation> </message> @@ -964,7 +1007,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="2536"/> + <location filename="../Project.py" line="2595"/> <source>Load Data</source> <translation type="unfinished"></translation> </message> @@ -1024,295 +1067,295 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="762"/> + <location filename="../Project.py" line="776"/> <source>D&jango</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="802"/> + <location filename="../Project.py" line="816"/> <source>&Database</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="826"/> + <location filename="../Project.py" line="840"/> <source>Show &SQL</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="876"/> + <location filename="../Project.py" line="892"/> <source>&Tools</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="896"/> + <location filename="../Project.py" line="912"/> <source>T&esting</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="990"/> + <location filename="../Project.py" line="1006"/> <source>New template...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="999"/> + <location filename="../Project.py" line="1015"/> <source>Update all catalogs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="1002"/> + <location filename="../Project.py" line="1018"/> <source>Update selected catalogs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="1006"/> + <location filename="../Project.py" line="1022"/> <source>Update all catalogs (with obsolete)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="1009"/> + <location filename="../Project.py" line="1025"/> <source>Update selected catalogs (with obsolete)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="1013"/> + <location filename="../Project.py" line="1029"/> <source>Compile all catalogs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="1016"/> + <location filename="../Project.py" line="1032"/> <source>Compile selected catalogs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="1110"/> + <location filename="../Project.py" line="1126"/> <source>New Form</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="1077"/> + <location filename="../Project.py" line="1093"/> <source>The file already exists! Overwrite it?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="1460"/> + <location filename="../Project.py" line="1476"/> <source>Select Applications</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="1460"/> + <location filename="../Project.py" line="1476"/> <source>Enter the list of applications separated by spaces.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="1815"/> + <location filename="../Project.py" line="1831"/> <source>Project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="1555"/> + <location filename="../Project.py" line="1571"/> <source>Application</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="1557"/> + <location filename="../Project.py" line="1573"/> <source>Start Django</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="1557"/> + <location filename="../Project.py" line="1573"/> <source>Select if this project should be a Django Project or Application.<br />Select the empty entry for none.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="1634"/> + <location filename="../Project.py" line="1650"/> <source>Start Django Project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="1610"/> + <location filename="../Project.py" line="1626"/> <source>Django project created successfully.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="1634"/> + <location filename="../Project.py" line="1650"/> <source>Enter the name of the new Django project.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="1662"/> + <location filename="../Project.py" line="1678"/> <source>Start Django Application</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="1696"/> + <location filename="../Project.py" line="1712"/> <source>Django application created successfully.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="1708"/> + <location filename="../Project.py" line="1724"/> <source>Start Global Django Application</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="1708"/> + <location filename="../Project.py" line="1724"/> <source>Enter the name of the new global Django application.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="1730"/> + <location filename="../Project.py" line="1746"/> <source>Start Local Django Application</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="1730"/> + <location filename="../Project.py" line="1746"/> <source>Enter the name of the new local Django application.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="1779"/> + <location filename="../Project.py" line="1795"/> <source>Select Project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="1779"/> + <location filename="../Project.py" line="1795"/> <source>Select the Django project to work with.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="1813"/> + <location filename="../Project.py" line="1829"/> <source>None</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="1818"/> + <location filename="../Project.py" line="1834"/> <source>&Current Django project ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="3089"/> + <location filename="../Project.py" line="3148"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="1892"/> + <location filename="../Project.py" line="1908"/> <source>The Django server could not be started.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="1938"/> + <location filename="../Project.py" line="1954"/> <source>Could not start the web-browser for the url "{0}".</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="2698"/> + <location filename="../Project.py" line="2757"/> <source>The Django process could not be started.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="1979"/> + <location filename="../Project.py" line="1995"/> <source>Introspect Database</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="2008"/> + <location filename="../Project.py" line="2024"/> <source>Flushing the database will destroy all data. Are you sure?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="2020"/> + <location filename="../Project.py" line="2036"/> <source>Database tables flushed successfully.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="2082"/> + <location filename="../Project.py" line="2098"/> <source>SQL Files (*.sql)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="2394"/> + <location filename="../Project.py" line="2453"/> <source>Database cleaned up successfully.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="2467"/> + <location filename="../Project.py" line="2526"/> <source>Enter the names of the cache tables separated by spaces.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="2482"/> + <location filename="../Project.py" line="2541"/> <source>Cache tables created successfully.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="2520"/> + <location filename="../Project.py" line="2579"/> <source>JSON Files (*.json)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="2522"/> + <location filename="../Project.py" line="2581"/> <source>XML Files (*.xml)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="2524"/> + <location filename="../Project.py" line="2583"/> <source>YAML Files (*.yaml)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="2627"/> + <location filename="../Project.py" line="2686"/> <source>The Django test server could not be started.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="2794"/> + <location filename="../Project.py" line="2853"/> <source>Initializing message catalog for '{0}'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="3053"/> + <location filename="../Project.py" line="3112"/> <source>No current site selected or no site created yet. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="2814"/> + <location filename="../Project.py" line="2873"/> <source> Message catalog initialized successfully.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="2926"/> + <location filename="../Project.py" line="2985"/> <source>Updating message catalogs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="3017"/> + <location filename="../Project.py" line="3076"/> <source>No locales detected. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="2977"/> + <location filename="../Project.py" line="3036"/> <source> Message catalogs updated successfully.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="2958"/> + <location filename="../Project.py" line="3017"/> <source>Updating message catalogs (keeping obsolete messages)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="3043"/> + <location filename="../Project.py" line="3102"/> <source>Compiling message catalogs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="3060"/> + <location filename="../Project.py" line="3119"/> <source> Message catalogs compiled successfully.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="2657"/> + <location filename="../Project.py" line="2716"/> <source>Change Password</source> <translation type="unfinished"></translation> </message> @@ -1352,7 +1395,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="2713"/> + <location filename="../Project.py" line="2772"/> <source>Clear Sessions</source> <translation type="unfinished"></translation> </message> @@ -1372,52 +1415,52 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="916"/> + <location filename="../Project.py" line="932"/> <source>&Authorization</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="933"/> + <location filename="../Project.py" line="949"/> <source>&Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="2657"/> + <location filename="../Project.py" line="2716"/> <source>Enter the name of the user:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="2725"/> + <location filename="../Project.py" line="2784"/> <source>Expired sessions cleared successfully.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="1389"/> + <location filename="../Project.py" line="1405"/> <source><p>Django is a high-level Python Web framework that encourages rapid development and clean, pragmatic design.</p><p><table><tr><td>Version:</td><td>{0}</td></tr><tr><td>URL:</td><td><a href="{1}">{1}</a></td></tr></table></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="1679"/> + <location filename="../Project.py" line="1695"/> <source><p>The <b>django-admin.py</b> script is not in the path. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="975"/> + <location filename="../Project.py" line="991"/> <source>Open with {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="3089"/> + <location filename="../Project.py" line="3148"/> <source>The translations editor process ({0}) could not be started.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="1110"/> + <location filename="../Project.py" line="1126"/> <source><p>The new form file <b>{0}</b> could not be created.<br> Problem: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="2130"/> + <location filename="../Project.py" line="2146"/> <source>Drop Indexes</source> <translation type="unfinished"></translation> </message> @@ -1477,7 +1520,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="853"/> + <location filename="../Project.py" line="867"/> <source>&Migrations</source> <translation type="unfinished"></translation> </message> @@ -1502,7 +1545,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="2192"/> + <location filename="../Project.py" line="2208"/> <source>Apply Selected Migrations</source> <translation type="unfinished"></translation> </message> @@ -1517,7 +1560,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="2251"/> + <location filename="../Project.py" line="2267"/> <source>Unapply Migrations</source> <translation type="unfinished"></translation> </message> @@ -1537,7 +1580,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="2328"/> + <location filename="../Project.py" line="2344"/> <source>Make Migrations</source> <translation type="unfinished"></translation> </message> @@ -1557,20 +1600,40 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="2245"/> + <location filename="../Project.py" line="2375"/> <source>No migrations available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="2217"/> + <location filename="../Project.py" line="2233"/> <source>Apply Migrations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project.py" line="2251"/> + <location filename="../Project.py" line="2267"/> <source>Select an application:</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Project.py" line="2388"/> + <source>Squash Migrations</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project.py" line="750"/> + <source>S&quash Migrations</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project.py" line="755"/> + <source>Squash migrations of an application of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project.py" line="757"/> + <source><b>Squash Migrations</b><p>This squashes migrations of an application of the Django project.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ProjectDjangoPlugin</name>