Mercurial Repositories > Pyramid Project / changeset
changeset
Some streamlining and fixes.
Fri, 31 Aug 2012 17:44:10 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Fri, 31 Aug 2012 17:44:10 +0200
- changeset 21
- e58828e9a847
- parent 20
- 3c98d944e673
- child 22
- c358b356b214
- child 23
- acc3c6cfbe38
Some streamlining and fixes.
--- a/ChangeLog Thu Aug 30 17:19:35 2012 +0200 +++ b/ChangeLog Fri Aug 31 17:44:10 2012 +0200 @@ -1,4 +1,7 @@ ChangeLog --------- +Version 0.2.0 +- bug fixes + Version 0.1.0 - first development release
--- a/PluginProjectPyramid.py Thu Aug 30 17:19:35 2012 +0200 +++ b/PluginProjectPyramid.py Fri Aug 31 17:44:10 2012 +0200 @@ -29,7 +29,7 @@ author = "Detlev Offenbach <detlev@die-offenbachs.de>" autoactivate = True deactivateable = True -version = "0.1.0" +version = "0.2.0" className = "ProjectPyramidPlugin" packageName = "ProjectPyramid" shortDescription = "Project support for Pyramid projects." @@ -126,13 +126,10 @@ "PyramidDocUrl": "http://docs.pylonsproject.org/en/latest/docs/pyramid.html", } if isWindowsPlatform(): - self.__defaults["ConsoleCommandNoClose"] = "cmd.exe /k" self.__defaults["ConsoleCommand"] = "cmd.exe /c" elif isMacPlatform(): - self.__defaults["ConsoleCommandNoClose"] = "xterm -hold -e" self.__defaults["ConsoleCommand"] = "xterm -e" else: - self.__defaults["ConsoleCommandNoClose"] = "konsole --noclose -e" self.__defaults["ConsoleCommand"] = "konsole -e" self.__translator = None
--- a/ProjectPyramid/ConfigurationPage/PyramidPage.py Thu Aug 30 17:19:35 2012 +0200 +++ b/ProjectPyramid/ConfigurationPage/PyramidPage.py Fri Aug 31 17:44:10 2012 +0200 @@ -41,26 +41,14 @@ consoleList.append("cmd.exe /c") elif isMacPlatform(): consoleList.append("xterm -e") + consoleList.append("/opt/X11/bin/xterm -e") else: consoleList.append("konsole -e") consoleList.append("@konsole --workdir . -e") # KDE4 konsole spawns consoleList.append("gnome-terminal -x") consoleList.append("xterm -e") - - consoleNoCloseList = [] - if isWindowsPlatform(): - consoleNoCloseList.append("cmd.exe /k") - elif isMacPlatform(): - consoleNoCloseList.append("xterm -hold -e") - else: - consoleNoCloseList.append("konsole --noclose -e") - consoleNoCloseList.append("@konsole --noclose --workdir . -e") - # KDE4 konsole spawns - consoleNoCloseList.append("xterm -hold -e") - self.consoleCommandCombo.addItems(consoleList) - self.consoleCommandNoCloseCombo.addItems(consoleNoCloseList) self.virtualEnvPy2Completer = E5DirCompleter(self.virtualEnvPy2Edit) self.virtualEnvPy3Completer = E5DirCompleter(self.virtualEnvPy3Edit) @@ -76,8 +64,6 @@ # set initial values self.consoleCommandCombo.setEditText( self.__plugin.getPreferences("ConsoleCommand")) - self.consoleCommandNoCloseCombo.setEditText( - self.__plugin.getPreferences("ConsoleCommandNoClose")) self.virtualEnvPy2Edit.setText( self.__plugin.getPreferences("VirtualEnvironmentPy2")) @@ -98,8 +84,6 @@ """ self.__plugin.setPreferences("ConsoleCommand", self.consoleCommandCombo.currentText()) - self.__plugin.setPreferences("ConsoleCommandNoClose", - self.consoleCommandNoCloseCombo.currentText()) self.__plugin.setPreferences("VirtualEnvironmentPy2", self.virtualEnvPy2Edit.text())
--- a/ProjectPyramid/ConfigurationPage/PyramidPage.ui Thu Aug 30 17:19:35 2012 +0200 +++ b/ProjectPyramid/ConfigurationPage/PyramidPage.ui Fri Aug 31 17:44:10 2012 +0200 @@ -34,7 +34,7 @@ <item> <widget class="QGroupBox" name="pyramidConsoleGroup"> <property name="title"> - <string>Console Commands</string> + <string>Console Command</string> </property> <layout class="QGridLayout" name="gridLayout"> <item row="0" column="0"> @@ -60,30 +60,7 @@ </property> </widget> </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_2"> - <property name="text"> - <string>Console Command (non-closing):</string> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QComboBox" name="consoleCommandNoCloseCombo"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="toolTip"> - <string>Enter the console command for a non-closing console</string> - </property> - <property name="editable"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="2" column="0" colspan="2"> + <item row="1" column="0" colspan="2"> <widget class="QLabel" name="label_5"> <property name="text"> <string><b>Note:</b> The console command for a console, that is spawning (i.e. exits before the console window is closed), should be prefixed by an '@' character.</string> @@ -258,7 +235,6 @@ </widget> <tabstops> <tabstop>consoleCommandCombo</tabstop> - <tabstop>consoleCommandNoCloseCombo</tabstop> <tabstop>virtualEnvPy3Edit</tabstop> <tabstop>virtualEnvPy3Button</tabstop> <tabstop>py3ShellCombo</tabstop>
--- a/ProjectPyramid/i18n/pyramid_de.ts Thu Aug 30 17:19:35 2012 +0200 +++ b/ProjectPyramid/i18n/pyramid_de.ts Fri Aug 31 17:44:10 2012 +0200 @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS><TS version="2.0" language="de_DE" sourcelanguage=""> +<!DOCTYPE TS> +<TS version="2.0" language="de_DE"> <context> <name>CreateParametersDialog</name> <message> @@ -129,10 +130,20 @@ <translation>Standard HTML 5 Template</translation> </message> <message> - <location filename="ProjectPyramid/FormSelectionDialog.py" line="42"/> + <location filename="ProjectPyramid/FormSelectionDialog.py" line="99"/> <source>Mako template with sections</source> <translation>Mako Template mit Abschnitten</translation> </message> + <message> + <location filename="ProjectPyramid/FormSelectionDialog.py" line="42"/> + <source>Standard HTML template</source> + <translation>Standard HTML Template</translation> + </message> + <message> + <location filename="ProjectPyramid/FormSelectionDialog.py" line="55"/> + <source>Chameleon template</source> + <translation>Chameleon Template</translation> + </message> </context> <context> <name>Project</name> @@ -272,7 +283,7 @@ <translation><b>Entwicklungsumgebung einrichten</b><p>Richtet das Pyramid Projekt im Entwicklungsmodus mittels "python setup.py develop" ein.</p></translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="894"/> + <location filename="ProjectPyramid/Project.py" line="892"/> <source>Initialize Database</source> <translation>Datenbank initialisieren</translation> </message> @@ -292,7 +303,7 @@ <translation><b>Datenbank initialisieren</b><p>Initialisiert (oder reinitialisiert) die Datenbank des aktuellen Pyramid Projektes.</p></translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="933"/> + <location filename="ProjectPyramid/Project.py" line="930"/> <source>Show Matching Views</source> <translation>Passende Ansichten anzeigen</translation> </message> @@ -312,7 +323,7 @@ <translation><b>Passende Ansichten anzeigen</b><p>Zeigt Ansichten zu einer gegebenen URL an.</p></translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="956"/> + <location filename="ProjectPyramid/Project.py" line="953"/> <source>Show Routes</source> <translation>Routen anzeigen</translation> </message> @@ -332,7 +343,7 @@ <translation><b>Routen anzeigen</b><p>Zeigt alle durch eine Pyramid Anwendung verwendete URL Routen in der Reihenfolge ihrer Auswertung an.</p></translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="975"/> + <location filename="ProjectPyramid/Project.py" line="972"/> <source>Show Tween Objects</source> <translation>Tween Objekte anzeigen</translation> </message> @@ -492,7 +503,7 @@ <translation>&Aktuelles Pyramid Projekt ({0})</translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="1259"/> + <location filename="ProjectPyramid/Project.py" line="1251"/> <source>No current Pyramid project selected or no Pyramid project created yet. Aborting...</source> <translation>Kein aktuelles Pyramid Projekt ausgewählt oder noch keines erstellt. Abbruch...</translation> </message> @@ -522,74 +533,74 @@ <translation>Die Pyramid Entwicklungsumgebung wurde erfolgreich eingerichtet.</translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="843"/> + <location filename="ProjectPyramid/Project.py" line="842"/> <source>Build Distribution File</source> <translation>Distributionsdateien erzeugen</translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="863"/> + <location filename="ProjectPyramid/Project.py" line="862"/> <source>Python distribution file built successfully.</source> <translation>Python Distributionsdateien erfolgreich erzeugt.</translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="908"/> + <location filename="ProjectPyramid/Project.py" line="906"/> <source>Database initialized successfully.</source> <translation>Datenbank erfolgreich initialisiert.</translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="933"/> + <location filename="ProjectPyramid/Project.py" line="930"/> <source>Enter the URL to be matched:</source> <translation>Gib die zu überprüfende URL ein:</translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="1065"/> + <location filename="ProjectPyramid/Project.py" line="1062"/> <source>Extract messages</source> <translation>Texte extrahieren</translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="1080"/> + <location filename="ProjectPyramid/Project.py" line="1077"/> <source> Messages extracted successfully.</source> <translation>Texte erfolgreich extrahiert.</translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="1128"/> + <location filename="ProjectPyramid/Project.py" line="1124"/> <source> Message catalog initialized successfully.</source> <translation> Textkatalog erfolgreich initialisiert.</translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="1179"/> + <location filename="ProjectPyramid/Project.py" line="1173"/> <source>Compiling message catalogs</source> <translation>Übersetze Textkataloge</translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="1208"/> + <location filename="ProjectPyramid/Project.py" line="1202"/> <source> Message catalogs compiled successfully.</source> <translation> Textkataloge erfolgreich übersetzt.</translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="1279"/> + <location filename="ProjectPyramid/Project.py" line="1271"/> <source>No locales detected. Aborting...</source> <translation>Keine Sprachen erkannt. Abbruch...</translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="1255"/> + <location filename="ProjectPyramid/Project.py" line="1247"/> <source>Updating message catalogs</source> <translation>Aktualisiere Textkataloge</translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="1284"/> + <location filename="ProjectPyramid/Project.py" line="1276"/> <source> Message catalogs updated successfully.</source> <translation> Textkataloge erfolgreich aktualisiert.</translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="1111"/> + <location filename="ProjectPyramid/Project.py" line="1107"/> <source>Initializing message catalog for '{0}'</source> <translation>Initialisiere Textkatalog für '{0}'</translation> </message> @@ -597,12 +608,12 @@ <context> <name>ProjectPyramidPlugin</name> <message> - <location filename="PluginProjectPyramid.py" line="183"/> + <location filename="PluginProjectPyramid.py" line="184"/> <source>Pyramid</source> <translation>Pyramid</translation> </message> <message> - <location filename="PluginProjectPyramid.py" line="159"/> + <location filename="PluginProjectPyramid.py" line="160"/> <source>eric5 version is too old, {0}, {1} or newer needed.</source> <translation>Die eric5 Version ist zu alt; {0}, {1} oder neuer wird benötigt.</translation> </message> @@ -683,11 +694,6 @@ <translation><b>Pyramid einstellen</b></translation> </message> <message> - <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="37"/> - <source>Console Commands</source> - <translation>Konsolenbefehle</translation> - </message> - <message> <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="43"/> <source>Console Command:</source> <translation>Konsole:</translation> @@ -699,99 +705,94 @@ </message> <message> <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="66"/> - <source>Console Command (non-closing):</source> - <translation>Konsole (nicht schließend):</translation> - </message> - <message> - <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="79"/> - <source>Enter the console command for a non-closing console</source> - <translation>Gib den Befehl für das nicht schließende Konsolenfenster ein</translation> - </message> - <message> - <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="89"/> <source><b>Note:</b> The console command for a console, that is spawning (i.e. exits before the console window is closed), should be prefixed by an '@' character.</source> <translation><b>Hinweis:</b> Der Konsolenbefehl für eine Konsole, die verzweigt (d.h. sie wird beendet bevor das Fenster geschlossen wurde), muss mit einem '@'-Zeichen beginnen.</translation> </message> <message> - <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="102"/> + <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="79"/> <source>Python 3</source> <translation>Python 3</translation> </message> <message> - <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="169"/> + <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="146"/> <source>Pyramid Virtual Environment</source> <translation>Virtuelle Pyramid Umgebung</translation> </message> <message> - <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="175"/> + <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="152"/> <source>Enter the path of the Pyramid virtual environment. Leave empty to not use a virtual environment setup.</source> <translation>Gib den Pfad der virtuellen Pyramid Umgebung ein. Leer lassen, um keine virtuelle Umgebung zu verwenden.</translation> </message> <message> - <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="188"/> + <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="165"/> <source>Select the virtual environment directory via a selection dialog</source> <translation>Select the virtual environment directory via a selection dialog</translation> </message> <message> - <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="191"/> + <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="168"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="201"/> + <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="178"/> <source>Pyramid Python Console:</source> <translation>Pyramid Python Konsole:</translation> </message> <message> - <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="214"/> + <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="191"/> <source>Select the Python console type</source> <translation>Wähle den Typ der Python Konsole</translation> </message> <message> - <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="163"/> + <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="140"/> <source>Python 2</source> <translation>Python 2</translation> </message> <message> - <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="224"/> + <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="201"/> <source>Pyramid Documentation</source> <translation>Pyramid Dokumentation</translation> </message> <message> - <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="230"/> + <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="207"/> <source>URL:</source> <translation>URL:</translation> </message> <message> - <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="237"/> + <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="214"/> <source>Enter the URL of the Pyramid documentation</source> <translation>Gib die URL für die Pyramid Dokumentation ein</translation> </message> <message> - <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.py" line="72"/> + <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.py" line="60"/> <source>Plain Python</source> <translation>Normales Python</translation> </message> <message> - <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.py" line="73"/> + <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.py" line="61"/> <source>IPython</source> <translation>IPython</translation> </message> <message> - <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.py" line="74"/> + <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.py" line="62"/> <source>bpython</source> <translation>bpython</translation> </message> <message> - <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.py" line="126"/> + <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.py" line="110"/> <source>Select Virtual Environment for Python 3</source> <translation>Wähle die virtuelle Umgebung für Python 3</translation> </message> <message> - <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.py" line="144"/> + <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.py" line="128"/> <source>Select Virtual Environment for Python 2</source> <translation>Wähle die virtuelle Umgebung für Python 2</translation> </message> + <message> + <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="37"/> + <source>Console Command</source> + <translation>Konsole</translation> + </message> </context> <context> <name>PyramidRoutesDialog</name>
--- a/ProjectPyramid/i18n/pyramid_en.ts Thu Aug 30 17:19:35 2012 +0200 +++ b/ProjectPyramid/i18n/pyramid_en.ts Fri Aug 31 17:44:10 2012 +0200 @@ -129,8 +129,18 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="ProjectPyramid/FormSelectionDialog.py" line="99"/> + <source>Mako template with sections</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="ProjectPyramid/FormSelectionDialog.py" line="42"/> - <source>Mako template with sections</source> + <source>Standard HTML template</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="ProjectPyramid/FormSelectionDialog.py" line="55"/> + <source>Chameleon template</source> <translation type="unfinished"></translation> </message> </context> @@ -272,7 +282,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="894"/> + <location filename="ProjectPyramid/Project.py" line="892"/> <source>Initialize Database</source> <translation type="unfinished"></translation> </message> @@ -292,7 +302,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="933"/> + <location filename="ProjectPyramid/Project.py" line="930"/> <source>Show Matching Views</source> <translation type="unfinished"></translation> </message> @@ -312,7 +322,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="956"/> + <location filename="ProjectPyramid/Project.py" line="953"/> <source>Show Routes</source> <translation type="unfinished"></translation> </message> @@ -332,7 +342,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="975"/> + <location filename="ProjectPyramid/Project.py" line="972"/> <source>Show Tween Objects</source> <translation type="unfinished"></translation> </message> @@ -492,7 +502,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="1259"/> + <location filename="ProjectPyramid/Project.py" line="1251"/> <source>No current Pyramid project selected or no Pyramid project created yet. Aborting...</source> <translation type="unfinished"></translation> </message> @@ -522,71 +532,71 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="843"/> + <location filename="ProjectPyramid/Project.py" line="842"/> <source>Build Distribution File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="863"/> + <location filename="ProjectPyramid/Project.py" line="862"/> <source>Python distribution file built successfully.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="908"/> + <location filename="ProjectPyramid/Project.py" line="906"/> <source>Database initialized successfully.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="933"/> + <location filename="ProjectPyramid/Project.py" line="930"/> <source>Enter the URL to be matched:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="1065"/> + <location filename="ProjectPyramid/Project.py" line="1062"/> <source>Extract messages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="1080"/> + <location filename="ProjectPyramid/Project.py" line="1077"/> <source> Messages extracted successfully.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="1128"/> + <location filename="ProjectPyramid/Project.py" line="1124"/> <source> Message catalog initialized successfully.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="1179"/> + <location filename="ProjectPyramid/Project.py" line="1173"/> <source>Compiling message catalogs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="1208"/> + <location filename="ProjectPyramid/Project.py" line="1202"/> <source> Message catalogs compiled successfully.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="1279"/> + <location filename="ProjectPyramid/Project.py" line="1271"/> <source>No locales detected. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="1255"/> + <location filename="ProjectPyramid/Project.py" line="1247"/> <source>Updating message catalogs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="1284"/> + <location filename="ProjectPyramid/Project.py" line="1276"/> <source> Message catalogs updated successfully.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="1111"/> + <location filename="ProjectPyramid/Project.py" line="1107"/> <source>Initializing message catalog for '{0}'</source> <translation type="unfinished"></translation> </message> @@ -594,12 +604,12 @@ <context> <name>ProjectPyramidPlugin</name> <message> - <location filename="PluginProjectPyramid.py" line="183"/> + <location filename="PluginProjectPyramid.py" line="184"/> <source>Pyramid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="PluginProjectPyramid.py" line="159"/> + <location filename="PluginProjectPyramid.py" line="160"/> <source>eric5 version is too old, {0}, {1} or newer needed.</source> <translation type="unfinished"></translation> </message> @@ -680,11 +690,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="37"/> - <source>Console Commands</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="43"/> <source>Console Command:</source> <translation type="unfinished"></translation> @@ -696,99 +701,94 @@ </message> <message> <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="66"/> - <source>Console Command (non-closing):</source> + <source><b>Note:</b> The console command for a console, that is spawning (i.e. exits before the console window is closed), should be prefixed by an '@' character.</source> <translation type="unfinished"></translation> </message> <message> <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="79"/> - <source>Enter the console command for a non-closing console</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="89"/> - <source><b>Note:</b> The console command for a console, that is spawning (i.e. exits before the console window is closed), should be prefixed by an '@' character.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="102"/> <source>Python 3</source> <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="169"/> + <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="146"/> <source>Pyramid Virtual Environment</source> <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="175"/> + <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="152"/> <source>Enter the path of the Pyramid virtual environment. Leave empty to not use a virtual environment setup.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="188"/> + <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="165"/> <source>Select the virtual environment directory via a selection dialog</source> <translation type="unfinished"></translation> </message> <message> + <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="168"/> + <source>...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="178"/> + <source>Pyramid Python Console:</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="191"/> - <source>...</source> + <source>Select the Python console type</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="140"/> + <source>Python 2</source> <translation type="unfinished"></translation> </message> <message> <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="201"/> - <source>Pyramid Python Console:</source> + <source>Pyramid Documentation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="207"/> + <source>URL:</source> <translation type="unfinished"></translation> </message> <message> <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="214"/> - <source>Select the Python console type</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="163"/> - <source>Python 2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="224"/> - <source>Pyramid Documentation</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="230"/> - <source>URL:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="237"/> <source>Enter the URL of the Pyramid documentation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.py" line="72"/> + <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.py" line="60"/> <source>Plain Python</source> <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.py" line="73"/> + <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.py" line="61"/> <source>IPython</source> <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.py" line="74"/> + <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.py" line="62"/> <source>bpython</source> <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.py" line="126"/> + <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.py" line="110"/> <source>Select Virtual Environment for Python 3</source> <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.py" line="144"/> + <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.py" line="128"/> <source>Select Virtual Environment for Python 2</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="37"/> + <source>Console Command</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>PyramidRoutesDialog</name>
--- a/ProjectPyramid/i18n/pyramid_es.ts Thu Aug 30 17:19:35 2012 +0200 +++ b/ProjectPyramid/i18n/pyramid_es.ts Fri Aug 31 17:44:10 2012 +0200 @@ -129,8 +129,18 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="ProjectPyramid/FormSelectionDialog.py" line="99"/> + <source>Mako template with sections</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="ProjectPyramid/FormSelectionDialog.py" line="42"/> - <source>Mako template with sections</source> + <source>Standard HTML template</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="ProjectPyramid/FormSelectionDialog.py" line="55"/> + <source>Chameleon template</source> <translation type="unfinished"></translation> </message> </context> @@ -272,7 +282,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="894"/> + <location filename="ProjectPyramid/Project.py" line="892"/> <source>Initialize Database</source> <translation type="unfinished"></translation> </message> @@ -292,7 +302,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="933"/> + <location filename="ProjectPyramid/Project.py" line="930"/> <source>Show Matching Views</source> <translation type="unfinished"></translation> </message> @@ -312,7 +322,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="956"/> + <location filename="ProjectPyramid/Project.py" line="953"/> <source>Show Routes</source> <translation type="unfinished"></translation> </message> @@ -332,7 +342,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="975"/> + <location filename="ProjectPyramid/Project.py" line="972"/> <source>Show Tween Objects</source> <translation type="unfinished"></translation> </message> @@ -492,7 +502,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="1259"/> + <location filename="ProjectPyramid/Project.py" line="1251"/> <source>No current Pyramid project selected or no Pyramid project created yet. Aborting...</source> <translation type="unfinished"></translation> </message> @@ -522,71 +532,71 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="843"/> + <location filename="ProjectPyramid/Project.py" line="842"/> <source>Build Distribution File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="863"/> + <location filename="ProjectPyramid/Project.py" line="862"/> <source>Python distribution file built successfully.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="908"/> + <location filename="ProjectPyramid/Project.py" line="906"/> <source>Database initialized successfully.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="933"/> + <location filename="ProjectPyramid/Project.py" line="930"/> <source>Enter the URL to be matched:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="1065"/> + <location filename="ProjectPyramid/Project.py" line="1062"/> <source>Extract messages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="1080"/> + <location filename="ProjectPyramid/Project.py" line="1077"/> <source> Messages extracted successfully.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="1128"/> + <location filename="ProjectPyramid/Project.py" line="1124"/> <source> Message catalog initialized successfully.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="1179"/> + <location filename="ProjectPyramid/Project.py" line="1173"/> <source>Compiling message catalogs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="1208"/> + <location filename="ProjectPyramid/Project.py" line="1202"/> <source> Message catalogs compiled successfully.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="1279"/> + <location filename="ProjectPyramid/Project.py" line="1271"/> <source>No locales detected. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="1255"/> + <location filename="ProjectPyramid/Project.py" line="1247"/> <source>Updating message catalogs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="1284"/> + <location filename="ProjectPyramid/Project.py" line="1276"/> <source> Message catalogs updated successfully.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/Project.py" line="1111"/> + <location filename="ProjectPyramid/Project.py" line="1107"/> <source>Initializing message catalog for '{0}'</source> <translation type="unfinished"></translation> </message> @@ -594,12 +604,12 @@ <context> <name>ProjectPyramidPlugin</name> <message> - <location filename="PluginProjectPyramid.py" line="183"/> + <location filename="PluginProjectPyramid.py" line="184"/> <source>Pyramid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="PluginProjectPyramid.py" line="159"/> + <location filename="PluginProjectPyramid.py" line="160"/> <source>eric5 version is too old, {0}, {1} or newer needed.</source> <translation type="unfinished"></translation> </message> @@ -680,11 +690,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="37"/> - <source>Console Commands</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="43"/> <source>Console Command:</source> <translation type="unfinished"></translation> @@ -696,99 +701,94 @@ </message> <message> <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="66"/> - <source>Console Command (non-closing):</source> + <source><b>Note:</b> The console command for a console, that is spawning (i.e. exits before the console window is closed), should be prefixed by an '@' character.</source> <translation type="unfinished"></translation> </message> <message> <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="79"/> - <source>Enter the console command for a non-closing console</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="89"/> - <source><b>Note:</b> The console command for a console, that is spawning (i.e. exits before the console window is closed), should be prefixed by an '@' character.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="102"/> <source>Python 3</source> <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="169"/> + <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="146"/> <source>Pyramid Virtual Environment</source> <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="175"/> + <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="152"/> <source>Enter the path of the Pyramid virtual environment. Leave empty to not use a virtual environment setup.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="188"/> + <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="165"/> <source>Select the virtual environment directory via a selection dialog</source> <translation type="unfinished"></translation> </message> <message> + <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="168"/> + <source>...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="178"/> + <source>Pyramid Python Console:</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="191"/> - <source>...</source> + <source>Select the Python console type</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="140"/> + <source>Python 2</source> <translation type="unfinished"></translation> </message> <message> <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="201"/> - <source>Pyramid Python Console:</source> + <source>Pyramid Documentation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="207"/> + <source>URL:</source> <translation type="unfinished"></translation> </message> <message> <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="214"/> - <source>Select the Python console type</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="163"/> - <source>Python 2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="224"/> - <source>Pyramid Documentation</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="230"/> - <source>URL:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="237"/> <source>Enter the URL of the Pyramid documentation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.py" line="72"/> + <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.py" line="60"/> <source>Plain Python</source> <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.py" line="73"/> + <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.py" line="61"/> <source>IPython</source> <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.py" line="74"/> + <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.py" line="62"/> <source>bpython</source> <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.py" line="126"/> + <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.py" line="110"/> <source>Select Virtual Environment for Python 3</source> <translation type="unfinished"></translation> </message> <message> - <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.py" line="144"/> + <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.py" line="128"/> <source>Select Virtual Environment for Python 2</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="ProjectPyramid/ConfigurationPage/PyramidPage.ui" line="37"/> + <source>Console Command</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>PyramidRoutesDialog</name>
