Mercurial Repositories > eric / changeset
changeset
Merged remote changes.
Thu, 25 Apr 2013 19:53:25 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Thu, 25 Apr 2013 19:53:25 +0200
- changeset 2621
- ab5918079c38
- parent 2620
- a3be952f2ae4 (current diff)
- parent 2619
- 55f6484ad1c3 (diff)
- child 2622
- 08cc2f31c983
Merged remote changes.
--- a/APIs/Python3/eric5.api Thu Apr 25 19:52:40 2013 +0200 +++ b/APIs/Python3/eric5.api Thu Apr 25 19:53:25 2013 +0200 @@ -5771,7 +5771,6 @@ eric5.Preferences.ConfigurationPages.PythonPage.PythonPage.save?4() eric5.Preferences.ConfigurationPages.PythonPage.PythonPage?1() eric5.Preferences.ConfigurationPages.PythonPage.create?4(dlg) -eric5.Preferences.ConfigurationPages.QtPage.QtPage.on_qt4Button_clicked?4() eric5.Preferences.ConfigurationPages.QtPage.QtPage.on_qt4PostfixEdit_textChanged?4(txt) eric5.Preferences.ConfigurationPages.QtPage.QtPage.on_qt4PrefixEdit_textChanged?4(txt) eric5.Preferences.ConfigurationPages.QtPage.QtPage.on_qt4TransButton_clicked?4()
--- a/Documentation/Help/source.qhp Thu Apr 25 19:52:40 2013 +0200 +++ b/Documentation/Help/source.qhp Thu Apr 25 19:53:25 2013 +0200 @@ -9033,7 +9033,6 @@ <keyword name="QtPage (Constructor)" id="QtPage (Constructor)" ref="eric5.Preferences.ConfigurationPages.QtPage.html#QtPage.__init__" /> <keyword name="QtPage (Module)" id="QtPage (Module)" ref="eric5.Preferences.ConfigurationPages.QtPage.html" /> <keyword name="QtPage.__updateQt4Sample" id="QtPage.__updateQt4Sample" ref="eric5.Preferences.ConfigurationPages.QtPage.html#QtPage.__updateQt4Sample" /> - <keyword name="QtPage.on_qt4Button_clicked" id="QtPage.on_qt4Button_clicked" ref="eric5.Preferences.ConfigurationPages.QtPage.html#QtPage.on_qt4Button_clicked" /> <keyword name="QtPage.on_qt4PostfixEdit_textChanged" id="QtPage.on_qt4PostfixEdit_textChanged" ref="eric5.Preferences.ConfigurationPages.QtPage.html#QtPage.on_qt4PostfixEdit_textChanged" /> <keyword name="QtPage.on_qt4PrefixEdit_textChanged" id="QtPage.on_qt4PrefixEdit_textChanged" ref="eric5.Preferences.ConfigurationPages.QtPage.html#QtPage.on_qt4PrefixEdit_textChanged" /> <keyword name="QtPage.on_qt4TransButton_clicked" id="QtPage.on_qt4TransButton_clicked" ref="eric5.Preferences.ConfigurationPages.QtPage.html#QtPage.on_qt4TransButton_clicked" />
--- a/Documentation/Source/eric5.Preferences.ConfigurationPages.QtPage.html Thu Apr 25 19:52:40 2013 +0200 +++ b/Documentation/Source/eric5.Preferences.ConfigurationPages.QtPage.html Thu Apr 25 19:53:25 2013 +0200 @@ -66,9 +66,6 @@ <td><a href="#QtPage.__updateQt4Sample">__updateQt4Sample</a></td> <td>Private slot to update the Qt4 tools sample label.</td> </tr><tr> -<td><a href="#QtPage.on_qt4Button_clicked">on_qt4Button_clicked</a></td> -<td>Private slot to handle the Qt4 directory selection.</td> -</tr><tr> <td><a href="#QtPage.on_qt4PostfixEdit_textChanged">on_qt4PostfixEdit_textChanged</a></td> <td>Private slot to handle a change in the entered Qt directory.</td> </tr><tr> @@ -96,11 +93,6 @@ <b>__updateQt4Sample</b>(<i></i>) <p> Private slot to update the Qt4 tools sample label. -</p><a NAME="QtPage.on_qt4Button_clicked" ID="QtPage.on_qt4Button_clicked"></a> -<h4>QtPage.on_qt4Button_clicked</h4> -<b>on_qt4Button_clicked</b>(<i></i>) -<p> - Private slot to handle the Qt4 directory selection. </p><a NAME="QtPage.on_qt4PostfixEdit_textChanged" ID="QtPage.on_qt4PostfixEdit_textChanged"></a> <h4>QtPage.on_qt4PostfixEdit_textChanged</h4> <b>on_qt4PostfixEdit_textChanged</b>(<i>txt</i>)
--- a/Preferences/ConfigurationPages/QtPage.py Thu Apr 25 19:52:40 2013 +0200 +++ b/Preferences/ConfigurationPages/QtPage.py Thu Apr 25 19:53:25 2013 +0200 @@ -31,14 +31,9 @@ self.setupUi(self) self.setObjectName("QtPage") - self.qt4Completer = E5DirCompleter(self.qt4Edit) self.qt4TransCompleter = E5DirCompleter(self.qt4TransEdit) - if not Utilities.isMacPlatform(): - self.qt4Group.hide() - # set initial values - self.qt4Edit.setText(Preferences.getQt("Qt4Dir")) self.qt4TransEdit.setText(Preferences.getQt("Qt4TranslationsDir")) self.qt4PrefixEdit.setText(Preferences.getQt("QtToolsPrefix4")) self.qt4PostfixEdit.setText(Preferences.getQt("QtToolsPostfix4")) @@ -48,26 +43,11 @@ """ Public slot to save the Qt configuration. """ - Preferences.setQt("Qt4Dir", self.qt4Edit.text()) Preferences.setQt("Qt4TranslationsDir", self.qt4TransEdit.text()) Preferences.setQt("QtToolsPrefix4", self.qt4PrefixEdit.text()) Preferences.setQt("QtToolsPostfix4", self.qt4PostfixEdit.text()) @pyqtSlot() - def on_qt4Button_clicked(self): - """ - Private slot to handle the Qt4 directory selection. - """ - dir = E5FileDialog.getExistingDirectory( - self, - self.trUtf8("Select Qt4 Directory"), - self.qt4Edit.text(), - E5FileDialog.Options(E5FileDialog.ShowDirsOnly)) - - if dir: - self.qt4Edit.setText(Utilities.toNativeSeparators(dir)) - - @pyqtSlot() def on_qt4TransButton_clicked(self): """ Private slot to handle the Qt4 translations directory selection.
--- a/Preferences/ConfigurationPages/QtPage.ui Thu Apr 25 19:52:40 2013 +0200 +++ b/Preferences/ConfigurationPages/QtPage.ui Thu Apr 25 19:53:25 2013 +0200 @@ -32,39 +32,6 @@ </widget> </item> <item> - <widget class="QGroupBox" name="qt4Group"> - <property name="title"> - <string>Qt Directory</string> - </property> - <layout class="QGridLayout" name="_2"> - <item row="0" column="0" colspan="2"> - <widget class="QLabel" name="TextLabel1_2_2_4"> - <property name="text"> - <string><font color="#FF0000"><b>Note:</b> This setting is activated at the next startup of the application.</font></string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLineEdit" name="qt4Edit"> - <property name="toolTip"> - <string>Enter the path of the Qt directory.</string> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QPushButton" name="qt4Button"> - <property name="toolTip"> - <string>Press to select the Qt directory via a directory selection dialog</string> - </property> - <property name="text"> - <string>...</string> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> <widget class="QGroupBox" name="groupBox_3"> <property name="title"> <string>Qt Translations Directory</string> @@ -186,8 +153,6 @@ </layout> </widget> <tabstops> - <tabstop>qt4Edit</tabstop> - <tabstop>qt4Button</tabstop> <tabstop>qt4TransEdit</tabstop> <tabstop>qt4TransButton</tabstop> <tabstop>qt4PrefixEdit</tabstop>
--- a/Preferences/__init__.py Thu Apr 25 19:52:40 2013 +0200 +++ b/Preferences/__init__.py Thu Apr 25 19:53:25 2013 +0200 @@ -33,8 +33,7 @@ from E5Network.E5Ftp import E5FtpProxyType from Globals import settingsNameOrganization, settingsNameGlobal, settingsNameRecent, \ - isWindowsPlatform, findPython2Interpreters, getPyQt4ModulesDirectory, \ - getQtBinariesPath + isWindowsPlatform, findPython2Interpreters, getPyQt4ModulesDirectory from Project.ProjectBrowserFlags import SourcesBrowserFlag, FormsBrowserFlag, \ ResourcesBrowserFlag, TranslationsBrowserFlag, InterfacesBrowserFlag, \ @@ -854,7 +853,6 @@ "Qt4TranslationsDir": "", "QtToolsPrefix4": "", "QtToolsPostfix4": "", - "Qt4Dir": "", } # defaults for corba related stuff @@ -2349,11 +2347,6 @@ """ if key == "Qt4TranslationsDir": return getQt4TranslationsDir(prefClass) - elif key == "Qt4Dir": - p = prefClass.settings.value("Qt/" + key, prefClass.qtDefaults[key]) - if p == "": - p = getQtBinariesPath() - return p else: return prefClass.settings.value("Qt/" + key, prefClass.qtDefaults[key])
--- a/Utilities/__init__.py Thu Apr 25 19:52:40 2013 +0200 +++ b/Utilities/__init__.py Thu Apr 25 19:53:25 2013 +0200 @@ -1457,7 +1457,7 @@ @param toolname plain name of the tool (e.g. "designer") (string) @return bundle name of the Qt tool (string) """ - qtDir = Preferences.getQt("Qt4Dir") + qtDir = getQtBinariesPath() bundles = [ os.path.join(qtDir, 'bin', generateQtToolName(toolname.capitalize())) + ".app", os.path.join(qtDir, 'bin', generateQtToolName(toolname)) + ".app",
--- a/i18n/eric5_cs.ts Thu Apr 25 19:52:40 2013 +0200 +++ b/i18n/eric5_cs.ts Thu Apr 25 19:53:25 2013 +0200 @@ -2480,17 +2480,17 @@ <context> <name>BrowserModel</name> <message> - <location filename="UI/BrowserModel.py" line="44"/> + <location filename="UI/BrowserModel.py" line="51"/> <source>Name</source> <translation>Jméno</translation> </message> <message> - <location filename="UI/BrowserModel.py" line="602"/> + <location filename="UI/BrowserModel.py" line="604"/> <source>Attributes</source> <translation>Atributy</translation> </message> <message> - <location filename="UI/BrowserModel.py" line="561"/> + <location filename="UI/BrowserModel.py" line="563"/> <source>Globals</source> <translation>Globální</translation> </message> @@ -2500,12 +2500,12 @@ <translation type="obsolete">Atributy (globální)</translation> </message> <message> - <location filename="UI/BrowserModel.py" line="556"/> + <location filename="UI/BrowserModel.py" line="558"/> <source>Coding: {0}</source> <translation>Kódování: {0}</translation> </message> <message> - <location filename="UI/BrowserModel.py" line="612"/> + <location filename="UI/BrowserModel.py" line="614"/> <source>Class Attributes</source> <translation type="unfinished"></translation> </message> @@ -3165,7 +3165,7 @@ <context> <name>CodingError</name> <message> - <location filename="Utilities/__init__.py" line="94"/> + <location filename="Utilities/__init__.py" line="96"/> <source>The coding '{0}' is wrong for the given text.</source> <translation>Nesprávné kódování '{0}' pro daný text.</translation> </message> @@ -13026,27 +13026,27 @@ <translation type="obsolete"><b>Generovat dokumentaci</b><p>Generovat API dokumentaci za použití eric5-doc.</p></translation> </message> <message> - <location filename="Plugins/PluginEricdoc.py" line="132"/> + <location filename="Plugins/PluginEricdoc.py" line="130"/> <source>Generate documentation (eric5_doc)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/PluginEricdoc.py" line="132"/> + <location filename="Plugins/PluginEricdoc.py" line="130"/> <source>Generate &documentation (eric5_doc)</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/PluginEricdoc.py" line="133"/> + <source>Generate API documentation using eric5_doc</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/PluginEricdoc.py" line="135"/> - <source>Generate API documentation using eric5_doc</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/PluginEricdoc.py" line="137"/> <source><b>Generate documentation</b><p>Generate API documentation using eric5_doc.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/PluginEricdoc.py" line="88"/> + <location filename="Plugins/PluginEricdoc.py" line="86"/> <source>Qt Help Tools</source> <translation type="unfinished"></translation> </message> @@ -23825,7 +23825,7 @@ <translation>Zapsat měny</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="661"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="663"/> <source>There are no uncommitted changes available/selected.</source> <translation>Nezapsné změny nejsou dostupné/vybrané.</translation> </message> @@ -23840,7 +23840,7 @@ <translation>Položky mimo verzi nejsou dostupné/vybrány.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="644"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="646"/> <source>Revert</source> <translation>Vrátit</translation> </message> @@ -23855,7 +23855,7 @@ <translation>Odebrat</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="644"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="646"/> <source>There are no missing entries available/selected.</source> <translation>Chybějící záznamy nejsou dostupné/vybrány.</translation> </message> @@ -23950,7 +23950,7 @@ <translation type="obsolete">Odlišnosti</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="661"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="663"/> <source>Differences</source> <translation type="unfinished"></translation> </message> @@ -33463,27 +33463,27 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="1132"/> + <location filename="Preferences/__init__.py" line="1131"/> <source>Export Preferences</source> <translation>Předvolby exportu</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1159"/> + <location filename="Preferences/__init__.py" line="1158"/> <source>Import Preferences</source> <translation>Předvolby importu</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1159"/> + <location filename="Preferences/__init__.py" line="1158"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1253"/> + <location filename="Preferences/__init__.py" line="1252"/> <source>Select Python2 Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1253"/> + <location filename="Preferences/__init__.py" line="1252"/> <source>Select the Python2 interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -39716,7 +39716,7 @@ <translation><b>Konfigurovat Qt</b></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="79"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="46"/> <source>...</source> <translation>...</translation> </message> @@ -39736,12 +39736,12 @@ <translation type="obsolete">Zadejte cestu adresáře s Qt4 překlady.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.py" line="75"/> + <location filename="Preferences/ConfigurationPages/QtPage.py" line="55"/> <source>Select Qt4 Translations Directory</source> <translation>Výběr adresáře s Qt4 překlady</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="113"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="80"/> <source>Qt Tools</source> <translation>Qt nástroje</translation> </message> @@ -39766,12 +39766,12 @@ <translation type="obsolete">Qt4-předpona:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="163"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="130"/> <source>This gives an example of the complete tool name</source> <translation>Příklad kompletního jména nástroje</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="166"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="133"/> <source>designer</source> <translation></translation> </message> @@ -39786,7 +39786,7 @@ <translation type="obsolete">Qt4 adresář</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="93"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="60"/> <source><font color="#FF0000"><b>Note:</b> This setting is activated at the next startup of the application.</font></source> <translation><font color="#FF0000"><b>Poznámka:</b> Tato nastavení budou aktivována až po novém spuštění aplikace.</font></translation> </message> @@ -39803,65 +39803,50 @@ <message> <location filename="Preferences/ConfigurationPages/QtPage.py" line="61"/> <source>Select Qt4 Directory</source> - <translation>Vybrat Qt4 adresář</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="119"/> + <translation type="obsolete">Vybrat Qt4 adresář</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="86"/> <source>The tool executable is composed of the prefix, the tool name and the postfix. For win, the extension is added automatically.</source> <translation>Spustitelný nástroj je složen z prefixu, jména nástroje a postfixu. Pro win je extenze připojena automaticky.</translation> </message> <message> <location filename="Preferences/ConfigurationPages/QtPage.ui" line="37"/> - <source>Qt Directory</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="50"/> - <source>Enter the path of the Qt directory.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="57"/> - <source>Press to select the Qt directory via a directory selection dialog</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="70"/> <source>Qt Translations Directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="76"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="43"/> <source>Press to select the Qt translations directory via a directory selection dialog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="86"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="53"/> <source>Enter the path of the Qt translations directory.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="100"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="67"/> <source><b>Note:</b> Leave this entry empty to use the QT4TRANSLATIONSDIR environment variable or the path compiled into the Qt library.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="129"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="96"/> <source>Qt-Prefix:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="136"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="103"/> <source>Enter the prefix for the Qt tools name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="143"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="110"/> <source>Qt-Postfix:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="150"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="117"/> <source>Enter the postfix for the Qt tools name</source> <translation type="unfinished"></translation> </message> @@ -46841,12 +46826,12 @@ <translation>Komitnout změny do repozitáře...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="703"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="705"/> <source>Lock</source> <translation>Zamknout</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="719"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="721"/> <source>Unlock</source> <translation>Odemknout</translation> </message> @@ -46966,27 +46951,27 @@ <translation>Commit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="683"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="685"/> <source>There are no uncommitted changes available/selected.</source> <translation>Nezapsané změny nejsou dostupné/vybrané.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="703"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="705"/> <source>There are no unlocked files available/selected.</source> <translation>Odemčené soubory nejsou dostupné/vybrané.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="753"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="755"/> <source>There are no locked files available/selected.</source> <translation>Zamčené soubory nejsou dostupné/vybrané.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="736"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="738"/> <source>Break Lock</source> <translation>Prolomit zámek</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="753"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="755"/> <source>Steal Lock</source> <translation>Scizit zámek</translation> </message> @@ -47011,7 +46996,7 @@ <translation>Položky mimo verzi nejsou dostupné/vybrány.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="666"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="668"/> <source>Revert</source> <translation>Vrátit</translation> </message> @@ -47026,17 +47011,17 @@ <translation>Přidat do seznamu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="787"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="789"/> <source>Remove from Changelist</source> <translation>Odebrat ze seznamu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="769"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="771"/> <source>There are no files available/selected not belonging to a changelist.</source> <translation>Nejsou dostupné/vybrány soubory, které nepatří do seznamu změn.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="787"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="789"/> <source>There are no files available/selected belonging to a changelist.</source> <translation>Nejsou dostupné/vybrány soubory, které patří do seznamu změn.</translation> </message> @@ -47126,7 +47111,7 @@ <translation type="obsolete">Odlišnosti</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="683"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="685"/> <source>Differences</source> <translation type="unfinished"></translation> </message> @@ -47136,7 +47121,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="666"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="668"/> <source>There are no missing entries available/selected.</source> <translation type="unfinished">Chybějící záznamy nejsou dostupné/vybrány.</translation> </message> @@ -55403,17 +55388,17 @@ <context> <name>Utilities</name> <message> - <location filename="Utilities/__init__.py" line="1145"/> + <location filename="Utilities/__init__.py" line="1147"/> <source><p>You may use %-codes as placeholders in the string. Supported codes are:<table><tr><td>%C</td><td>column of the cursor of the current editor</td></tr><tr><td>%D</td><td>directory of the current editor</td></tr><tr><td>%F</td><td>filename of the current editor</td></tr><tr><td>%H</td><td>home directory of the current user</td></tr><tr><td>%L</td><td>line of the cursor of the current editor</td></tr><tr><td>%P</td><td>path of the current project</td></tr><tr><td>%S</td><td>selected text of the current editor</td></tr><tr><td>%U</td><td>username of the current user</td></tr><tr><td>%%</td><td>the percent sign</td></tr></table></p></source> <translation><p>Můžete použít %-kódy a rezervovaná místa ve stringu. Podporované kódy jsou:<table><tr> <td>%C</td> <td>sloupec kurzoru v aktuálním editoru</td></tr><tr> <td>%D</td> <td>adresář v aktuálním editoru</td></tr><tr> <td>%F</td> <td>jméno souboru v aktuálním editoru</td></tr><tr> <td>%H</td> <td>home adresář aktuálního uživatele</td></tr><tr> <td>%L</td> <td>řádek s kurzorem v aktuálním editoru</td></tr><tr> <td>%P</td> <td>cesta aktuálního projektu</td></tr><tr> <td>%S</td> <td>vybraný text v aktuálním editoru</td></tr><tr> <td>%U</td> <td>uživatelské jméno aktuálního uživatele</td></tr><tr> <td>%%</td> <td>znak procenta</td></tr></table></p></translation> </message> <message> - <location filename="Utilities/__init__.py" line="1345"/> + <location filename="Utilities/__init__.py" line="1337"/> <source>Python2 interpreter not configured.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Utilities/__init__.py" line="1395"/> + <location filename="Utilities/__init__.py" line="1387"/> <source>Python2 interpreter did not finish within 30s.</source> <translation type="unfinished"></translation> </message> @@ -60088,12 +60073,12 @@ <translation type="obsolete">Importování balíčků...</translation> </message> <message> - <location filename="eric5.py" line="253"/> + <location filename="eric5.py" line="250"/> <source>Generating Main Window...</source> <translation>Generování hlavního okna...</translation> </message> <message> - <location filename="eric5.py" line="248"/> + <location filename="eric5.py" line="245"/> <source>Starting...</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_de.ts Thu Apr 25 19:52:40 2013 +0200 +++ b/i18n/eric5_de.ts Thu Apr 25 19:53:25 2013 +0200 @@ -2376,27 +2376,27 @@ <context> <name>BrowserModel</name> <message> - <location filename="UI/BrowserModel.py" line="44"/> + <location filename="UI/BrowserModel.py" line="51"/> <source>Name</source> <translation>Name</translation> </message> <message> - <location filename="UI/BrowserModel.py" line="602"/> + <location filename="UI/BrowserModel.py" line="604"/> <source>Attributes</source> <translation>Attribute</translation> </message> <message> - <location filename="UI/BrowserModel.py" line="556"/> + <location filename="UI/BrowserModel.py" line="558"/> <source>Coding: {0}</source> <translation>Kodierung: {0}</translation> </message> <message> - <location filename="UI/BrowserModel.py" line="561"/> + <location filename="UI/BrowserModel.py" line="563"/> <source>Globals</source> <translation>Globale Variablen</translation> </message> <message> - <location filename="UI/BrowserModel.py" line="612"/> + <location filename="UI/BrowserModel.py" line="614"/> <source>Class Attributes</source> <translation>Klassenattribute</translation> </message> @@ -3026,7 +3026,7 @@ <context> <name>CodingError</name> <message> - <location filename="Utilities/__init__.py" line="94"/> + <location filename="Utilities/__init__.py" line="96"/> <source>The coding '{0}' is wrong for the given text.</source> <translation>Die Kodierung '{0}' ist für den übergebenen Text falsch.</translation> </message> @@ -12617,27 +12617,27 @@ <translation>Eric5 Dokumentationsgenerator</translation> </message> <message> - <location filename="Plugins/PluginEricdoc.py" line="132"/> + <location filename="Plugins/PluginEricdoc.py" line="130"/> <source>Generate documentation (eric5_doc)</source> <translation>Erzeuge Dokumentation (eric5_doc)</translation> </message> <message> - <location filename="Plugins/PluginEricdoc.py" line="132"/> + <location filename="Plugins/PluginEricdoc.py" line="130"/> <source>Generate &documentation (eric5_doc)</source> <translation>Erzeuge &Dokumentation (eric5_doc)</translation> </message> <message> + <location filename="Plugins/PluginEricdoc.py" line="133"/> + <source>Generate API documentation using eric5_doc</source> + <translation>Erzeuge die API Dokumentation unter Verwendung von eric_doc</translation> + </message> + <message> <location filename="Plugins/PluginEricdoc.py" line="135"/> - <source>Generate API documentation using eric5_doc</source> - <translation>Erzeuge die API Dokumentation unter Verwendung von eric_doc</translation> - </message> - <message> - <location filename="Plugins/PluginEricdoc.py" line="137"/> <source><b>Generate documentation</b><p>Generate API documentation using eric5_doc.</p></source> <translation><b>Erzeuge Dokumentation</b><p>Erzeuge die API Dokumentation unter Verwendung von eric5_doc.</p></translation> </message> <message> - <location filename="Plugins/PluginEricdoc.py" line="88"/> + <location filename="Plugins/PluginEricdoc.py" line="86"/> <source>Qt Help Tools</source> <translation>Qt Help Werkzeuge</translation> </message> @@ -23051,7 +23051,7 @@ <translation>Einpflegen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="661"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="663"/> <source>There are no uncommitted changes available/selected.</source> <translation>Es sind keine nicht eingepflegten Änderungen vorhanden/ausgewählt.</translation> </message> @@ -23066,7 +23066,7 @@ <translation>Es sind keine unversionierten Einträge vorhanden/ausgewählt.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="644"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="646"/> <source>Revert</source> <translation>Rückgängig machen</translation> </message> @@ -23081,7 +23081,7 @@ <translation>Entfernen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="644"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="646"/> <source>There are no missing entries available/selected.</source> <translation>Es sind keine fehlenden Einträge vorhanden/ausgewählt.</translation> </message> @@ -23171,7 +23171,7 @@ <translation>alle</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="661"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="663"/> <source>Differences</source> <translation>Unterschiede</translation> </message> @@ -32139,27 +32139,27 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="1132"/> + <location filename="Preferences/__init__.py" line="1131"/> <source>Export Preferences</source> <translation>Einstellungen exportieren</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1159"/> + <location filename="Preferences/__init__.py" line="1158"/> <source>Import Preferences</source> <translation>Einstellungen importieren</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1159"/> + <location filename="Preferences/__init__.py" line="1158"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>Properties Dateien (*.ini);;Alle Dateien (*)</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1253"/> + <location filename="Preferences/__init__.py" line="1252"/> <source>Select Python2 Interpreter</source> <translation>Wähle den Python2 Interpreter</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1253"/> + <location filename="Preferences/__init__.py" line="1252"/> <source>Select the Python2 interpreter to be used:</source> <translation>Wähle den zu verwendenden Python2 Interpreter aus:</translation> </message> @@ -38054,12 +38054,12 @@ <context> <name>QtPage</name> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="79"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="46"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.py" line="75"/> + <location filename="Preferences/ConfigurationPages/QtPage.py" line="55"/> <source>Select Qt4 Translations Directory</source> <translation>Wähle Qt4 Übersetzungenverzeichnis</translation> </message> @@ -38069,87 +38069,67 @@ <translation><b>Qt Einstellungen</b></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="113"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="80"/> <source>Qt Tools</source> <translation>Qt Werkzeuge</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="163"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="130"/> <source>This gives an example of the complete tool name</source> <translation>Dies gibt ein Beispiel für den vollständigen Werkzeugnamen</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="166"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="133"/> <source>designer</source> <translation>designer</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="93"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="60"/> <source><font color="#FF0000"><b>Note:</b> This setting is activated at the next startup of the application.</font></source> <translation><font color="#FF0000"><b>Hinweis:</b> Diese Einstellung wird erst beim nächsten Programmstart aktiv.</font></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.py" line="61"/> - <source>Select Qt4 Directory</source> - <translation>Wähle das Qt4 Verzeichnis</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="119"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="86"/> <source>The tool executable is composed of the prefix, the tool name and the postfix. For win, the extension is added automatically.</source> <translation>Der Werkzeugname wird aus dem Präfix, dem Werkzeugnamen und dem Anhängsel gebildet. Für win wird die Erweiterung automatisch angehängt.</translation> </message> <message> <location filename="Preferences/ConfigurationPages/QtPage.ui" line="37"/> - <source>Qt Directory</source> - <translation>Qt Verzeichnis</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="50"/> - <source>Enter the path of the Qt directory.</source> - <translation>Gib den Pfad des Qt Verzeichnisses ein.</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="57"/> - <source>Press to select the Qt directory via a directory selection dialog</source> - <translation>Das Qt Verzeichnis mittels eines Verzeichnisauswahldialoges wählen</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="70"/> <source>Qt Translations Directory</source> <translation>Qt Übersetzungenverzeichnis</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="76"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="43"/> <source>Press to select the Qt translations directory via a directory selection dialog</source> <translation>Das Qt Übersetzungenverzeichnis mittels eines Verzeichnisauswahldialoges wählen</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="86"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="53"/> <source>Enter the path of the Qt translations directory.</source> <translation>Gib den Pfad des Qt Übersetzungenverzeichnisses ein.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="100"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="67"/> <source><b>Note:</b> Leave this entry empty to use the QT4TRANSLATIONSDIR environment variable or the path compiled into the Qt library.</source> <translation><b>Hinweis:</b> Lassen Sie diesen Eintrag leer, um die Umgebungsvariable QT4TRANSLATIONSDIR oder den in die Qt Bibliothek eincompilierten Pfad zu verwenden.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="129"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="96"/> <source>Qt-Prefix:</source> <translation>Qt-Präfix:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="136"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="103"/> <source>Enter the prefix for the Qt tools name</source> <translation>Gib das Präfix für den Qt Werkzeugnamen ein</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="143"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="110"/> <source>Qt-Postfix:</source> <translation>Qt-Anhängsel:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="150"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="117"/> <source>Enter the postfix for the Qt tools name</source> <translation>Gib das Anhängsel für den Qt Werkzeugnamen ein</translation> </message> @@ -44986,17 +44966,17 @@ <translation>Einpflegen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="683"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="685"/> <source>There are no uncommitted changes available/selected.</source> <translation>Es sind keine nicht eingepflegten Änderungen vorhanden/ausgewählt.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="703"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="705"/> <source>Lock</source> <translation>Sperren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="719"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="721"/> <source>Unlock</source> <translation>Entsperren</translation> </message> @@ -45041,22 +45021,22 @@ <translation>ersetzt</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="703"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="705"/> <source>There are no unlocked files available/selected.</source> <translation>Es sind keine ungesperrten Dateien vorhanden/ausgewählt.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="753"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="755"/> <source>There are no locked files available/selected.</source> <translation>Es sind keine gesperrten Dateien vorhanden/ausgewählt.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="736"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="738"/> <source>Break Lock</source> <translation>Sperre brechen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="753"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="755"/> <source>Steal Lock</source> <translation>Sperre stehlen</translation> </message> @@ -45208,7 +45188,7 @@ <translation>Es sind keine unversionierten Einträge vorhanden/ausgewählt.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="666"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="668"/> <source>Revert</source> <translation>Rückgängig machen</translation> </message> @@ -45228,17 +45208,17 @@ <translation>Zu Änderungsliste hinzufügen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="787"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="789"/> <source>Remove from Changelist</source> <translation>Von Änderungsliste entfernen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="769"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="771"/> <source>There are no files available/selected not belonging to a changelist.</source> <translation>Es sind keine Dateien vorhanden/ausgewählt, die nicht zu einer Änderungsliste gehören.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="787"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="789"/> <source>There are no files available/selected belonging to a changelist.</source> <translation>Es sind keine Dateien vorhanden/ausgewählt, die zu einer Änderungsliste gehören.</translation> </message> @@ -45318,7 +45298,7 @@ <translation>alle</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="683"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="685"/> <source>Differences</source> <translation>Unterschiede</translation> </message> @@ -45328,7 +45308,7 @@ <translation>Es sind keine Einträge zum Einpflegen ausgewählt.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="666"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="668"/> <source>There are no missing entries available/selected.</source> <translation>Es sind keine fehlenden Einträge vorhanden/ausgewählt.</translation> </message> @@ -52899,17 +52879,17 @@ <context> <name>Utilities</name> <message> - <location filename="Utilities/__init__.py" line="1145"/> + <location filename="Utilities/__init__.py" line="1147"/> <source><p>You may use %-codes as placeholders in the string. Supported codes are:<table><tr><td>%C</td><td>column of the cursor of the current editor</td></tr><tr><td>%D</td><td>directory of the current editor</td></tr><tr><td>%F</td><td>filename of the current editor</td></tr><tr><td>%H</td><td>home directory of the current user</td></tr><tr><td>%L</td><td>line of the cursor of the current editor</td></tr><tr><td>%P</td><td>path of the current project</td></tr><tr><td>%S</td><td>selected text of the current editor</td></tr><tr><td>%U</td><td>username of the current user</td></tr><tr><td>%%</td><td>the percent sign</td></tr></table></p></source> <translation><p>Sie können %-Codes als Platzhalter in der Eingabe verwenden. Unterstützte Codes sind:<table><tr><td>%C</td><td>Spalte des Cursor des aktuellen Editors</td></tr><tr><td>%D</td><td>Verzeichnis des aktuellen Editors</td></tr><tr><td>%F</td><td>Dateiname des aktuellen Editors</td></tr><tr><td>%H</td><td>Home-Verzeichnis des aktullen Nutzers</td></tr><tr><td>%L</td><td>Zeile des Cursor des aktuellen Editors</td></tr><tr><td>%P</td><td>Pfad des aktuellen Projektes</td></tr><tr><td>%S</td><td>selektierter Text des aktuellen Editors</td></tr><tr><td>%U</td><td>Nutzername des aktuellen Nutzers</td></tr><tr><td>%%</td><td>das Prozentzeichen</td></tr></table></p></translation> </message> <message> - <location filename="Utilities/__init__.py" line="1345"/> + <location filename="Utilities/__init__.py" line="1337"/> <source>Python2 interpreter not configured.</source> <translation>Kein Python2 Interpreter konfiguriert.</translation> </message> <message> - <location filename="Utilities/__init__.py" line="1395"/> + <location filename="Utilities/__init__.py" line="1387"/> <source>Python2 interpreter did not finish within 30s.</source> <translation>Python2 Interpreter wurde nicht innerhalb von 30s beendet.</translation> </message> @@ -57270,12 +57250,12 @@ <context> <name>eric5</name> <message> - <location filename="eric5.py" line="253"/> + <location filename="eric5.py" line="250"/> <source>Generating Main Window...</source> <translation>Erzeuge das Hauptfenster...</translation> </message> <message> - <location filename="eric5.py" line="248"/> + <location filename="eric5.py" line="245"/> <source>Starting...</source> <translation>Starte...</translation> </message>
--- a/i18n/eric5_en.ts Thu Apr 25 19:52:40 2013 +0200 +++ b/i18n/eric5_en.ts Thu Apr 25 19:53:25 2013 +0200 @@ -2349,27 +2349,27 @@ <context> <name>BrowserModel</name> <message> - <location filename="UI/BrowserModel.py" line="44"/> + <location filename="UI/BrowserModel.py" line="51"/> <source>Name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/BrowserModel.py" line="556"/> + <location filename="UI/BrowserModel.py" line="558"/> <source>Coding: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/BrowserModel.py" line="561"/> + <location filename="UI/BrowserModel.py" line="563"/> <source>Globals</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/BrowserModel.py" line="602"/> + <location filename="UI/BrowserModel.py" line="604"/> <source>Attributes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/BrowserModel.py" line="612"/> + <location filename="UI/BrowserModel.py" line="614"/> <source>Class Attributes</source> <translation type="unfinished"></translation> </message> @@ -2991,7 +2991,7 @@ <context> <name>CodingError</name> <message> - <location filename="Utilities/__init__.py" line="94"/> + <location filename="Utilities/__init__.py" line="96"/> <source>The coding '{0}' is wrong for the given text.</source> <translation type="unfinished"></translation> </message> @@ -12533,27 +12533,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/PluginEricdoc.py" line="132"/> + <location filename="Plugins/PluginEricdoc.py" line="130"/> <source>Generate documentation (eric5_doc)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/PluginEricdoc.py" line="132"/> + <location filename="Plugins/PluginEricdoc.py" line="130"/> <source>Generate &documentation (eric5_doc)</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/PluginEricdoc.py" line="133"/> + <source>Generate API documentation using eric5_doc</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/PluginEricdoc.py" line="135"/> - <source>Generate API documentation using eric5_doc</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/PluginEricdoc.py" line="137"/> <source><b>Generate documentation</b><p>Generate API documentation using eric5_doc.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/PluginEricdoc.py" line="88"/> + <location filename="Plugins/PluginEricdoc.py" line="86"/> <source>Qt Help Tools</source> <translation type="unfinished"></translation> </message> @@ -22917,7 +22917,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="661"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="663"/> <source>There are no uncommitted changes available/selected.</source> <translation type="unfinished"></translation> </message> @@ -22937,12 +22937,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="644"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="646"/> <source>There are no missing entries available/selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="644"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="646"/> <source>Revert</source> <translation type="unfinished"></translation> </message> @@ -23032,7 +23032,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="661"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="663"/> <source>Differences</source> <translation type="unfinished"></translation> </message> @@ -31976,27 +31976,27 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="1132"/> + <location filename="Preferences/__init__.py" line="1131"/> <source>Export Preferences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1159"/> + <location filename="Preferences/__init__.py" line="1158"/> <source>Import Preferences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1159"/> + <location filename="Preferences/__init__.py" line="1158"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1253"/> + <location filename="Preferences/__init__.py" line="1252"/> <source>Select Python2 Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1253"/> + <location filename="Preferences/__init__.py" line="1252"/> <source>Select the Python2 interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -37768,97 +37768,77 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="93"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="60"/> <source><font color="#FF0000"><b>Note:</b> This setting is activated at the next startup of the application.</font></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="79"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="46"/> <source>...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="113"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="80"/> <source>Qt Tools</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="119"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="86"/> <source>The tool executable is composed of the prefix, the tool name and the postfix. For win, the extension is added automatically.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="163"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="130"/> <source>This gives an example of the complete tool name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="166"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="133"/> <source>designer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.py" line="61"/> - <source>Select Qt4 Directory</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/QtPage.py" line="75"/> + <location filename="Preferences/ConfigurationPages/QtPage.py" line="55"/> <source>Select Qt4 Translations Directory</source> <translation type="unfinished"></translation> </message> <message> <location filename="Preferences/ConfigurationPages/QtPage.ui" line="37"/> - <source>Qt Directory</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="50"/> - <source>Enter the path of the Qt directory.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="57"/> - <source>Press to select the Qt directory via a directory selection dialog</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="70"/> <source>Qt Translations Directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="76"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="43"/> <source>Press to select the Qt translations directory via a directory selection dialog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="86"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="53"/> <source>Enter the path of the Qt translations directory.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="100"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="67"/> <source><b>Note:</b> Leave this entry empty to use the QT4TRANSLATIONSDIR environment variable or the path compiled into the Qt library.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="129"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="96"/> <source>Qt-Prefix:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="136"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="103"/> <source>Enter the prefix for the Qt tools name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="143"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="110"/> <source>Qt-Postfix:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="150"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="117"/> <source>Enter the postfix for the Qt tools name</source> <translation type="unfinished"></translation> </message> @@ -44651,17 +44631,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="787"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="789"/> <source>Remove from Changelist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="703"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="705"/> <source>Lock</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="719"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="721"/> <source>Unlock</source> <translation type="unfinished"></translation> </message> @@ -44786,7 +44766,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="683"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="685"/> <source>There are no uncommitted changes available/selected.</source> <translation type="unfinished"></translation> </message> @@ -44801,37 +44781,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="666"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="668"/> <source>Revert</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="703"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="705"/> <source>There are no unlocked files available/selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="753"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="755"/> <source>There are no locked files available/selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="736"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="738"/> <source>Break Lock</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="753"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="755"/> <source>Steal Lock</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="769"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="771"/> <source>There are no files available/selected not belonging to a changelist.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="787"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="789"/> <source>There are no files available/selected belonging to a changelist.</source> <translation type="unfinished"></translation> </message> @@ -44911,7 +44891,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="683"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="685"/> <source>Differences</source> <translation type="unfinished"></translation> </message> @@ -44921,7 +44901,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="666"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="668"/> <source>There are no missing entries available/selected.</source> <translation type="unfinished"></translation> </message> @@ -52430,17 +52410,17 @@ <context> <name>Utilities</name> <message> - <location filename="Utilities/__init__.py" line="1145"/> + <location filename="Utilities/__init__.py" line="1147"/> <source><p>You may use %-codes as placeholders in the string. Supported codes are:<table><tr><td>%C</td><td>column of the cursor of the current editor</td></tr><tr><td>%D</td><td>directory of the current editor</td></tr><tr><td>%F</td><td>filename of the current editor</td></tr><tr><td>%H</td><td>home directory of the current user</td></tr><tr><td>%L</td><td>line of the cursor of the current editor</td></tr><tr><td>%P</td><td>path of the current project</td></tr><tr><td>%S</td><td>selected text of the current editor</td></tr><tr><td>%U</td><td>username of the current user</td></tr><tr><td>%%</td><td>the percent sign</td></tr></table></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Utilities/__init__.py" line="1345"/> + <location filename="Utilities/__init__.py" line="1337"/> <source>Python2 interpreter not configured.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Utilities/__init__.py" line="1395"/> + <location filename="Utilities/__init__.py" line="1387"/> <source>Python2 interpreter did not finish within 30s.</source> <translation type="unfinished"></translation> </message> @@ -56794,12 +56774,12 @@ <context> <name>eric5</name> <message> - <location filename="eric5.py" line="253"/> + <location filename="eric5.py" line="250"/> <source>Generating Main Window...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="eric5.py" line="248"/> + <location filename="eric5.py" line="245"/> <source>Starting...</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_es.ts Thu Apr 25 19:52:40 2013 +0200 +++ b/i18n/eric5_es.ts Thu Apr 25 19:53:25 2013 +0200 @@ -2373,27 +2373,27 @@ <context> <name>BrowserModel</name> <message> - <location filename="UI/BrowserModel.py" line="44"/> + <location filename="UI/BrowserModel.py" line="51"/> <source>Name</source> <translation>Nombre</translation> </message> <message> - <location filename="UI/BrowserModel.py" line="602"/> + <location filename="UI/BrowserModel.py" line="604"/> <source>Attributes</source> <translation>Atributos</translation> </message> <message> - <location filename="UI/BrowserModel.py" line="561"/> + <location filename="UI/BrowserModel.py" line="563"/> <source>Globals</source> <translation>Globales</translation> </message> <message> - <location filename="UI/BrowserModel.py" line="556"/> + <location filename="UI/BrowserModel.py" line="558"/> <source>Coding: {0}</source> <translation>Codificación: {0}</translation> </message> <message> - <location filename="UI/BrowserModel.py" line="612"/> + <location filename="UI/BrowserModel.py" line="614"/> <source>Class Attributes</source> <translation></translation> </message> @@ -3026,7 +3026,7 @@ <context> <name>CodingError</name> <message> - <location filename="Utilities/__init__.py" line="94"/> + <location filename="Utilities/__init__.py" line="96"/> <source>The coding '{0}' is wrong for the given text.</source> <translation>La codificación '{0}' es incorrecta para el texto indicado.</translation> </message> @@ -12621,27 +12621,27 @@ <translation>Generador de Documentación de Eric5</translation> </message> <message> - <location filename="Plugins/PluginEricdoc.py" line="132"/> + <location filename="Plugins/PluginEricdoc.py" line="130"/> <source>Generate documentation (eric5_doc)</source> <translation>Generar documentación (eric5_doc)</translation> </message> <message> - <location filename="Plugins/PluginEricdoc.py" line="132"/> + <location filename="Plugins/PluginEricdoc.py" line="130"/> <source>Generate &documentation (eric5_doc)</source> <translation>Generar &documentación (eric5_doc)</translation> </message> <message> + <location filename="Plugins/PluginEricdoc.py" line="133"/> + <source>Generate API documentation using eric5_doc</source> + <translation>Generar documentación de API utilizando eric5_doc</translation> + </message> + <message> <location filename="Plugins/PluginEricdoc.py" line="135"/> - <source>Generate API documentation using eric5_doc</source> - <translation>Generar documentación de API utilizando eric5_doc</translation> - </message> - <message> - <location filename="Plugins/PluginEricdoc.py" line="137"/> <source><b>Generate documentation</b><p>Generate API documentation using eric5_doc.</p></source> <translation><b>Generar documentación</b><p>Generar documentación de API utilizando eric5_doc.</p></translation> </message> <message> - <location filename="Plugins/PluginEricdoc.py" line="88"/> + <location filename="Plugins/PluginEricdoc.py" line="86"/> <source>Qt Help Tools</source> <translation>Herramientas de Ayuda de Qt</translation> </message> @@ -23055,7 +23055,7 @@ <translation>Commit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="661"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="663"/> <source>There are no uncommitted changes available/selected.</source> <translation>No hay cambios pendientes de commit disponibles/seleccionados.</translation> </message> @@ -23070,7 +23070,7 @@ <translation>No hay entradas sin versionar disponibles/seleccionadas.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="644"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="646"/> <source>Revert</source> <translation>Revertir</translation> </message> @@ -23085,7 +23085,7 @@ <translation>Eliminar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="644"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="646"/> <source>There are no missing entries available/selected.</source> <translation>No hay entradas perdidas disponibles/seleccionadas.</translation> </message> @@ -23175,7 +23175,7 @@ <translation>todo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="661"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="663"/> <source>Differences</source> <translation>Diferencias</translation> </message> @@ -32140,27 +32140,27 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="1132"/> + <location filename="Preferences/__init__.py" line="1131"/> <source>Export Preferences</source> <translation>Exportar Preferencias</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1159"/> + <location filename="Preferences/__init__.py" line="1158"/> <source>Import Preferences</source> <translation>Importar Preferencias</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1159"/> + <location filename="Preferences/__init__.py" line="1158"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>Archivo de Propiedades (*.ini);;Todos los archivos (*)</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1253"/> + <location filename="Preferences/__init__.py" line="1252"/> <source>Select Python2 Interpreter</source> <translation>Seleccionar Intérprete de Python2</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1253"/> + <location filename="Preferences/__init__.py" line="1252"/> <source>Select the Python2 interpreter to be used:</source> <translation>Seleccionar el intérprete de Python2 a utilizar:</translation> </message> @@ -38028,97 +38028,97 @@ <translation><b>Configurar Qt</b></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="79"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="46"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="113"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="80"/> <source>Qt Tools</source> <translation>Herramientas Qt</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="163"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="130"/> <source>This gives an example of the complete tool name</source> <translation>Proporciona un ejemplo del nombre completo de la herramienta</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="166"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="133"/> <source>designer</source> <translation>designer</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.py" line="75"/> + <location filename="Preferences/ConfigurationPages/QtPage.py" line="55"/> <source>Select Qt4 Translations Directory</source> <translation>Seleccionar el directorio de Traducciones Qt4</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="93"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="60"/> <source><font color="#FF0000"><b>Note:</b> This setting is activated at the next startup of the application.</font></source> <translation><font color="#FF0000"><b>Nota:</b> Estas opciones de configuración serán activadas la siguiente vez que se inicie la aplicación.</font></translation> </message> <message> <location filename="Preferences/ConfigurationPages/QtPage.py" line="61"/> <source>Select Qt4 Directory</source> - <translation>Seleccione directorio de Qt4</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="119"/> + <translation type="obsolete">Seleccione directorio de Qt4</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="86"/> <source>The tool executable is composed of the prefix, the tool name and the postfix. For win, the extension is added automatically.</source> <translation>El ejecutable de la herramienta se compone del prefijo, el nombre de la herramienta y el postfijo. Para win, la extensión se añade automáticamente.</translation> </message> <message> <location filename="Preferences/ConfigurationPages/QtPage.ui" line="37"/> <source>Qt Directory</source> - <translation>Directorio de Qt</translation> + <translation type="obsolete">Directorio de Qt</translation> </message> <message> <location filename="Preferences/ConfigurationPages/QtPage.ui" line="50"/> <source>Enter the path of the Qt directory.</source> - <translation>Introducir la ruta del directorio de Qt.</translation> + <translation type="obsolete">Introducir la ruta del directorio de Qt.</translation> </message> <message> <location filename="Preferences/ConfigurationPages/QtPage.ui" line="57"/> <source>Press to select the Qt directory via a directory selection dialog</source> - <translation>Pulse para seleccionar el directorio de Qt a través de un diálogo de selección de directorio</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="70"/> + <translation type="obsolete">Pulse para seleccionar el directorio de Qt a través de un diálogo de selección de directorio</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="37"/> <source>Qt Translations Directory</source> <translation>Directorio de Traducciones de Qt</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="76"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="43"/> <source>Press to select the Qt translations directory via a directory selection dialog</source> <translation>Pulse para seleccionar el directorio de traducciones de Qt a través de un diálogo de selección de directorio</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="86"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="53"/> <source>Enter the path of the Qt translations directory.</source> <translation>Introeucir la ruta del directorio de traducciones de Qt.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="100"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="67"/> <source><b>Note:</b> Leave this entry empty to use the QT4TRANSLATIONSDIR environment variable or the path compiled into the Qt library.</source> <translation><b>Nota</b>: Dejar en blanco para utilizar la variable de entorno QT4TRANSLATIONSDIR o la ruta compilada en la biblioteca de Qt.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="129"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="96"/> <source>Qt-Prefix:</source> <translation>Prefijo de Qt:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="136"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="103"/> <source>Enter the prefix for the Qt tools name</source> <translation>Introducir el prefijo para nombre de las herramientas Qt</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="143"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="110"/> <source>Qt-Postfix:</source> <translation>Postfijo de Qt:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="150"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="117"/> <source>Enter the postfix for the Qt tools name</source> <translation>Introducir el postfijo para nombre de las herramientas Qt</translation> </message> @@ -45013,12 +45013,12 @@ <translation>Revertir cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="703"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="705"/> <source>Lock</source> <translation>Bloquear</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="719"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="721"/> <source>Unlock</source> <translation>Desbloquear</translation> </message> @@ -45138,7 +45138,7 @@ <translation>Commit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="683"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="685"/> <source>There are no uncommitted changes available/selected.</source> <translation>No hay cambios pendientes de commit disponibles/seleccionados.</translation> </message> @@ -45153,27 +45153,27 @@ <translation>No hay entradas sin versionar disponibles/seleccionadas.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="666"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="668"/> <source>Revert</source> <translation>Revertir</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="703"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="705"/> <source>There are no unlocked files available/selected.</source> <translation>No hay archivos desbloqueados disponibles/seleccionados.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="753"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="755"/> <source>There are no locked files available/selected.</source> <translation>No hay archivos bloqueados disponibles/seleccionados.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="736"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="738"/> <source>Break Lock</source> <translation>Romper Bloqueo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="753"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="755"/> <source>Steal Lock</source> <translation>Robar Bloqueo</translation> </message> @@ -45188,17 +45188,17 @@ <translation>Añadir a la lista de cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="787"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="789"/> <source>Remove from Changelist</source> <translation>Quitar de la lista de cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="769"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="771"/> <source>There are no files available/selected not belonging to a changelist.</source> <translation>No hay archivos disponibles/seleccionados que no pertenezcan a una lista de cambios.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="787"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="789"/> <source>There are no files available/selected belonging to a changelist.</source> <translation>No hay archivos disponibles/seleccionados que pertenezcan a una lista de cambios.</translation> </message> @@ -45283,7 +45283,7 @@ <translation>todo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="683"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="685"/> <source>Differences</source> <translation>Diferencias</translation> </message> @@ -45293,7 +45293,7 @@ <translation>No hay entradas seleccionads sobre las que hacer commit.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="666"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="668"/> <source>There are no missing entries available/selected.</source> <translation>No hay entradas perdidas disponibles/seleccionadas.</translation> </message> @@ -52870,17 +52870,17 @@ <context> <name>Utilities</name> <message> - <location filename="Utilities/__init__.py" line="1145"/> + <location filename="Utilities/__init__.py" line="1147"/> <source><p>You may use %-codes as placeholders in the string. Supported codes are:<table><tr><td>%C</td><td>column of the cursor of the current editor</td></tr><tr><td>%D</td><td>directory of the current editor</td></tr><tr><td>%F</td><td>filename of the current editor</td></tr><tr><td>%H</td><td>home directory of the current user</td></tr><tr><td>%L</td><td>line of the cursor of the current editor</td></tr><tr><td>%P</td><td>path of the current project</td></tr><tr><td>%S</td><td>selected text of the current editor</td></tr><tr><td>%U</td><td>username of the current user</td></tr><tr><td>%%</td><td>the percent sign</td></tr></table></p></source> <translation><p>Puede utilizar %-códigos como marcadores en la cadena. Los valores sportados son:<table><tr><td>%C</td><td>columna del cursos en el editor actual</td></tr><tr><td>%D</td><td>directorio del editor actual</td></tr><tr><td>%F</td><td>nombre de archivo del editor actual</td></tr><tr><td>%H</td><td>directorio home del usuario actual</td></tr><tr><td>%L</td><td>línea del cursor en el editor actual</td></tr><tr><td>%P</td><td>ruta del proyecto actual</td></tr><tr><td>%S</td><td>texto seleccionado en el editor actual</td></tr><tr><td>%U</td><td>nombre de usuario del usuario actual</td></tr><tr><td>%%</td><td>signo de porcentaje</td></tr></table></p></translation> </message> <message> - <location filename="Utilities/__init__.py" line="1345"/> + <location filename="Utilities/__init__.py" line="1337"/> <source>Python2 interpreter not configured.</source> <translation>Intérprete de Python2 no configurado.</translation> </message> <message> - <location filename="Utilities/__init__.py" line="1395"/> + <location filename="Utilities/__init__.py" line="1387"/> <source>Python2 interpreter did not finish within 30s.</source> <translation>El intérprete de Python2 no terminó en un plazo de 30s.</translation> </message> @@ -57240,12 +57240,12 @@ <context> <name>eric5</name> <message> - <location filename="eric5.py" line="253"/> + <location filename="eric5.py" line="250"/> <source>Generating Main Window...</source> <translation>Generando Ventana Principal...</translation> </message> <message> - <location filename="eric5.py" line="248"/> + <location filename="eric5.py" line="245"/> <source>Starting...</source> <translation>Comenzando...</translation> </message>
--- a/i18n/eric5_fr.ts Thu Apr 25 19:52:40 2013 +0200 +++ b/i18n/eric5_fr.ts Thu Apr 25 19:53:25 2013 +0200 @@ -2597,12 +2597,12 @@ <context> <name>BrowserModel</name> <message> - <location filename="UI/BrowserModel.py" line="44"/> + <location filename="UI/BrowserModel.py" line="51"/> <source>Name</source> <translation>Nom</translation> </message> <message> - <location filename="UI/BrowserModel.py" line="602"/> + <location filename="UI/BrowserModel.py" line="604"/> <source>Attributes</source> <translation>Attributs</translation> </message> @@ -2612,7 +2612,7 @@ <translation type="obsolete">Encodage: %1</translation> </message> <message> - <location filename="UI/BrowserModel.py" line="561"/> + <location filename="UI/BrowserModel.py" line="563"/> <source>Globals</source> <translation>Variables globales</translation> </message> @@ -2622,12 +2622,12 @@ <translation type="obsolete">Attributs globaux</translation> </message> <message> - <location filename="UI/BrowserModel.py" line="556"/> + <location filename="UI/BrowserModel.py" line="558"/> <source>Coding: {0}</source> <translation>Codage: {0}</translation> </message> <message> - <location filename="UI/BrowserModel.py" line="612"/> + <location filename="UI/BrowserModel.py" line="614"/> <source>Class Attributes</source> <translation>Attributs de classe</translation> </message> @@ -3287,7 +3287,7 @@ <translation type="obsolete">L'encodage '%1' n'est pas adapté pour le texte.</translation> </message> <message> - <location filename="Utilities/__init__.py" line="94"/> + <location filename="Utilities/__init__.py" line="96"/> <source>The coding '{0}' is wrong for the given text.</source> <translation>L'encodage '{0}' n'est pas adapté pour le texte.</translation> </message> @@ -13803,27 +13803,27 @@ <translation type="obsolete"><b>Générer la documentation</b><p>Génère la documentation API en utilisant eric4-doc.</p> {5-?}</translation> </message> <message> - <location filename="Plugins/PluginEricdoc.py" line="132"/> + <location filename="Plugins/PluginEricdoc.py" line="130"/> <source>Generate documentation (eric5_doc)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/PluginEricdoc.py" line="132"/> + <location filename="Plugins/PluginEricdoc.py" line="130"/> <source>Generate &documentation (eric5_doc)</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/PluginEricdoc.py" line="133"/> + <source>Generate API documentation using eric5_doc</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/PluginEricdoc.py" line="135"/> - <source>Generate API documentation using eric5_doc</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/PluginEricdoc.py" line="137"/> <source><b>Generate documentation</b><p>Generate API documentation using eric5_doc.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/PluginEricdoc.py" line="88"/> + <location filename="Plugins/PluginEricdoc.py" line="86"/> <source>Qt Help Tools</source> <translation type="unfinished"></translation> </message> @@ -24773,7 +24773,7 @@ <translation type="unfinished">Commit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="661"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="663"/> <source>There are no uncommitted changes available/selected.</source> <translation type="unfinished">Il n'y a pas de modification non commitée disponible/sélectionnée.</translation> </message> @@ -24788,7 +24788,7 @@ <translation type="unfinished">Aucune entrée "non-versionnée" disponible/sélectionnée.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="644"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="646"/> <source>Revert</source> <translation type="unfinished">Recouvrir</translation> </message> @@ -24803,7 +24803,7 @@ <translation type="unfinished">Supprimer</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="644"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="646"/> <source>There are no missing entries available/selected.</source> <translation type="unfinished"></translation> </message> @@ -24898,7 +24898,7 @@ <translation type="obsolete">Différence</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="661"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="663"/> <source>Differences</source> <translation type="unfinished"></translation> </message> @@ -34847,27 +34847,27 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="1132"/> + <location filename="Preferences/__init__.py" line="1131"/> <source>Export Preferences</source> <translation>Export des préférences</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1159"/> + <location filename="Preferences/__init__.py" line="1158"/> <source>Import Preferences</source> <translation>Import des préférences</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1159"/> + <location filename="Preferences/__init__.py" line="1158"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1253"/> + <location filename="Preferences/__init__.py" line="1252"/> <source>Select Python2 Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1253"/> + <location filename="Preferences/__init__.py" line="1252"/> <source>Select the Python2 interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -41755,7 +41755,7 @@ <translation type="obsolete">Cliquer pour choisir manuellement le répertoire Qt3</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="79"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="46"/> <source>...</source> <translation>...</translation> </message> @@ -41780,7 +41780,7 @@ <translation type="obsolete">Selection du répertoire Qt3</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.py" line="75"/> + <location filename="Preferences/ConfigurationPages/QtPage.py" line="55"/> <source>Select Qt4 Translations Directory</source> <translation>Sélection d'un répertoire de traductions Qt4</translation> </message> @@ -41805,7 +41805,7 @@ <translation type="obsolete">Désactiver le support Qt3</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="113"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="80"/> <source>Qt Tools</source> <translation>Outils Qt</translation> </message> @@ -41855,12 +41855,12 @@ <translation type="obsolete">Entrer le suffixe de l'outil Qt4</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="163"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="130"/> <source>This gives an example of the complete tool name</source> <translation>Ceci donne un exemple d'un nom complet d'outil Qt</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="166"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="133"/> <source>designer</source> <translation>designer</translation> </message> @@ -41880,7 +41880,7 @@ <translation type="obsolete">Répertoire Qt4</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="93"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="60"/> <source><font color="#FF0000"><b>Note:</b> This setting is activated at the next startup of the application.</font></source> <translation><font color="#FF0000"><b>Note:</b> Cette propriété sera activée au prochain démarrage de l'application.</font></translation> </message> @@ -41897,65 +41897,50 @@ <message> <location filename="Preferences/ConfigurationPages/QtPage.py" line="61"/> <source>Select Qt4 Directory</source> - <translation>Selection du répertoire Qt4</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="119"/> + <translation type="obsolete">Selection du répertoire Qt4</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="86"/> <source>The tool executable is composed of the prefix, the tool name and the postfix. For win, the extension is added automatically.</source> <translation type="unfinished"></translation> </message> <message> <location filename="Preferences/ConfigurationPages/QtPage.ui" line="37"/> - <source>Qt Directory</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="50"/> - <source>Enter the path of the Qt directory.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="57"/> - <source>Press to select the Qt directory via a directory selection dialog</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="70"/> <source>Qt Translations Directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="76"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="43"/> <source>Press to select the Qt translations directory via a directory selection dialog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="86"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="53"/> <source>Enter the path of the Qt translations directory.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="100"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="67"/> <source><b>Note:</b> Leave this entry empty to use the QT4TRANSLATIONSDIR environment variable or the path compiled into the Qt library.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="129"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="96"/> <source>Qt-Prefix:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="136"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="103"/> <source>Enter the prefix for the Qt tools name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="143"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="110"/> <source>Qt-Postfix:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="150"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="117"/> <source>Enter the postfix for the Qt tools name</source> <translation type="unfinished"></translation> </message> @@ -49720,17 +49705,17 @@ <translation>Commit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="683"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="685"/> <source>There are no uncommitted changes available/selected.</source> <translation>Il n'y a pas de modification non commitée disponible/sélectionnée.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="703"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="705"/> <source>Lock</source> <translation>Verrouillage</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="719"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="721"/> <source>Unlock</source> <translation>Déverrouillage</translation> </message> @@ -49775,22 +49760,22 @@ <translation>remplacé</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="703"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="705"/> <source>There are no unlocked files available/selected.</source> <translation>Il n'y a aucun fichier déverrouilé disponible/sélectionné.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="753"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="755"/> <source>There are no locked files available/selected.</source> <translation>Il n'y a aucun fichier verrouilé disponible/sélectionné.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="736"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="738"/> <source>Break Lock</source> <translation>Casser le verrouillage d'un autre utilisateur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="753"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="755"/> <source>Steal Lock</source> <translation>Voler le verrou</translation> </message> @@ -49942,7 +49927,7 @@ <translation>Aucune entrée "non-versionnée" disponible/sélectionnée.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="666"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="668"/> <source>Revert</source> <translation>Recouvrir</translation> </message> @@ -49962,17 +49947,17 @@ <translation>Ajouter à la liste des modifications</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="787"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="789"/> <source>Remove from Changelist</source> <translation>Supprimer de la liste des modifications</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="769"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="771"/> <source>There are no files available/selected not belonging to a changelist.</source> <translation>Il n'y a pas de fichiers disponibles ou sélectionnés n'appartenant pas à une liste.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="787"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="789"/> <source>There are no files available/selected belonging to a changelist.</source> <translation>Il n'y a pas de fichiers disponibles ou sélectionnés appartenant à une liste.</translation> </message> @@ -50062,7 +50047,7 @@ <translation type="obsolete">Différence</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="683"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="685"/> <source>Differences</source> <translation type="unfinished"></translation> </message> @@ -50072,7 +50057,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="666"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="668"/> <source>There are no missing entries available/selected.</source> <translation type="unfinished"></translation> </message> @@ -58890,17 +58875,17 @@ <context> <name>Utilities</name> <message> - <location filename="Utilities/__init__.py" line="1145"/> + <location filename="Utilities/__init__.py" line="1147"/> <source><p>You may use %-codes as placeholders in the string. Supported codes are:<table><tr><td>%C</td><td>column of the cursor of the current editor</td></tr><tr><td>%D</td><td>directory of the current editor</td></tr><tr><td>%F</td><td>filename of the current editor</td></tr><tr><td>%H</td><td>home directory of the current user</td></tr><tr><td>%L</td><td>line of the cursor of the current editor</td></tr><tr><td>%P</td><td>path of the current project</td></tr><tr><td>%S</td><td>selected text of the current editor</td></tr><tr><td>%U</td><td>username of the current user</td></tr><tr><td>%%</td><td>the percent sign</td></tr></table></p></source> <translation><p>Vous pouvez utiliser la syntaxe "%-code" dans la chaine de caractères. Les codes supportés sont :<table><tr><td>%C</td><td>colonne du curseur de l'éditeur courant</td></tr><tr><td>%D</td><td>répertoire de l'éditeur courant</td></tr><tr><td>%F</td><td>nom de fichier de l'éditeur courant</td></tr><tr><td>%H</td><td>répertoire 'home' de l'utilisateur courant</td></tr><tr><td>%L</td><td>ligne du curseur de l'éditeur courant</td></tr><tr><td>%P</td><td>chemin du projet courant</td></tr><tr><td>%S</td><td>texte sélectionné dans l'éditeur courant</td></tr><tr><td>%U</td><td>nom d'utilisateur de l'utilisateur courant</td></tr><tr><td>%%</td><td>le signe pourcent</td></tr></table></p></translation> </message> <message> - <location filename="Utilities/__init__.py" line="1345"/> + <location filename="Utilities/__init__.py" line="1337"/> <source>Python2 interpreter not configured.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Utilities/__init__.py" line="1395"/> + <location filename="Utilities/__init__.py" line="1387"/> <source>Python2 interpreter did not finish within 30s.</source> <translation type="unfinished"></translation> </message> @@ -63814,12 +63799,12 @@ <translation type="obsolete">Importation des packages...</translation> </message> <message> - <location filename="eric5.py" line="253"/> + <location filename="eric5.py" line="250"/> <source>Generating Main Window...</source> <translation>Création de la fenêtre principale...</translation> </message> <message> - <location filename="eric5.py" line="248"/> + <location filename="eric5.py" line="245"/> <source>Starting...</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_it.ts Thu Apr 25 19:52:40 2013 +0200 +++ b/i18n/eric5_it.ts Thu Apr 25 19:53:25 2013 +0200 @@ -2481,17 +2481,17 @@ <context> <name>BrowserModel</name> <message> - <location filename="UI/BrowserModel.py" line="44"/> + <location filename="UI/BrowserModel.py" line="51"/> <source>Name</source> <translation>Nome</translation> </message> <message> - <location filename="UI/BrowserModel.py" line="602"/> + <location filename="UI/BrowserModel.py" line="604"/> <source>Attributes</source> <translation>Attributi</translation> </message> <message> - <location filename="UI/BrowserModel.py" line="561"/> + <location filename="UI/BrowserModel.py" line="563"/> <source>Globals</source> <translation>Globali</translation> </message> @@ -2501,12 +2501,12 @@ <translation type="obsolete">Attributi (globali)</translation> </message> <message> - <location filename="UI/BrowserModel.py" line="556"/> + <location filename="UI/BrowserModel.py" line="558"/> <source>Coding: {0}</source> <translation>Codifica: {0}</translation> </message> <message> - <location filename="UI/BrowserModel.py" line="612"/> + <location filename="UI/BrowserModel.py" line="614"/> <source>Class Attributes</source> <translation type="unfinished"></translation> </message> @@ -3166,7 +3166,7 @@ <context> <name>CodingError</name> <message> - <location filename="Utilities/__init__.py" line="94"/> + <location filename="Utilities/__init__.py" line="96"/> <source>The coding '{0}' is wrong for the given text.</source> <translation>La codifica '{0}' è errata per questo testo.</translation> </message> @@ -12946,27 +12946,27 @@ <translation type="obsolete">Qt4 Help Tools</translation> </message> <message> - <location filename="Plugins/PluginEricdoc.py" line="132"/> + <location filename="Plugins/PluginEricdoc.py" line="130"/> <source>Generate documentation (eric5_doc)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/PluginEricdoc.py" line="132"/> + <location filename="Plugins/PluginEricdoc.py" line="130"/> <source>Generate &documentation (eric5_doc)</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/PluginEricdoc.py" line="133"/> + <source>Generate API documentation using eric5_doc</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/PluginEricdoc.py" line="135"/> - <source>Generate API documentation using eric5_doc</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/PluginEricdoc.py" line="137"/> <source><b>Generate documentation</b><p>Generate API documentation using eric5_doc.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/PluginEricdoc.py" line="88"/> + <location filename="Plugins/PluginEricdoc.py" line="86"/> <source>Qt Help Tools</source> <translation type="unfinished"></translation> </message> @@ -23720,7 +23720,7 @@ <translation>Commit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="661"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="663"/> <source>There are no uncommitted changes available/selected.</source> <translation>Non ci sono modifiche disponibili/selezionate da committare.</translation> </message> @@ -23735,7 +23735,7 @@ <translation>Non ci sono elementi non sotto controllo disponibili/selezionati.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="644"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="646"/> <source>Revert</source> <translation>Inverti</translation> </message> @@ -23750,7 +23750,7 @@ <translation>Rimuovi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="644"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="646"/> <source>There are no missing entries available/selected.</source> <translation>Non ci sono elementi mancati disponibili/selezionati.</translation> </message> @@ -23845,7 +23845,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="661"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="663"/> <source>Differences</source> <translation type="unfinished"></translation> </message> @@ -33240,27 +33240,27 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="1132"/> + <location filename="Preferences/__init__.py" line="1131"/> <source>Export Preferences</source> <translation>Esporta Preferenze</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1159"/> + <location filename="Preferences/__init__.py" line="1158"/> <source>Import Preferences</source> <translation>Importa Preferenze</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1159"/> + <location filename="Preferences/__init__.py" line="1158"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>File proprietà (*.ini);;Tutti i file(*)</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1253"/> + <location filename="Preferences/__init__.py" line="1252"/> <source>Select Python2 Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1253"/> + <location filename="Preferences/__init__.py" line="1252"/> <source>Select the Python2 interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -39466,7 +39466,7 @@ <context> <name>QtPage</name> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="79"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="46"/> <source>...</source> <translation>...</translation> </message> @@ -39486,7 +39486,7 @@ <translation type="obsolete">Inserisci il percorso della directory delle traduzioni di Qt4.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.py" line="75"/> + <location filename="Preferences/ConfigurationPages/QtPage.py" line="55"/> <source>Select Qt4 Translations Directory</source> <translation>Seleziona la directory delle traduzioni di Qt4</translation> </message> @@ -39496,7 +39496,7 @@ <translation><b>Configura Qt</b></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="113"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="80"/> <source>Qt Tools</source> <translation>Qt Tools</translation> </message> @@ -39521,12 +39521,12 @@ <translation type="obsolete">Inserisci suffisso per il nome dei tool di Qt4</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="163"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="130"/> <source>This gives an example of the complete tool name</source> <translation>Fa un esempio del nome completo del tool</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="166"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="133"/> <source>designer</source> <translation>designer</translation> </message> @@ -39541,7 +39541,7 @@ <translation type="obsolete">Directory Qt4</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="93"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="60"/> <source><font color="#FF0000"><b>Note:</b> This setting is activated at the next startup of the application.</font></source> <translation><font color="#FF0000"><b>Nota:</b> Queste impostazioni saranno attivate al prossimo avvio dell'applicazione.</font></translation> </message> @@ -39558,65 +39558,50 @@ <message> <location filename="Preferences/ConfigurationPages/QtPage.py" line="61"/> <source>Select Qt4 Directory</source> - <translation>Seleziona la directory di Qt4</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="119"/> + <translation type="obsolete">Seleziona la directory di Qt4</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="86"/> <source>The tool executable is composed of the prefix, the tool name and the postfix. For win, the extension is added automatically.</source> <translation>L'eseguibile del tool e' composto dal predisso, il nome del tool e il suffizzo. Per win, l'estensione è aggiunta automaticamente.</translation> </message> <message> <location filename="Preferences/ConfigurationPages/QtPage.ui" line="37"/> - <source>Qt Directory</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="50"/> - <source>Enter the path of the Qt directory.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="57"/> - <source>Press to select the Qt directory via a directory selection dialog</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="70"/> <source>Qt Translations Directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="76"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="43"/> <source>Press to select the Qt translations directory via a directory selection dialog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="86"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="53"/> <source>Enter the path of the Qt translations directory.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="100"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="67"/> <source><b>Note:</b> Leave this entry empty to use the QT4TRANSLATIONSDIR environment variable or the path compiled into the Qt library.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="129"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="96"/> <source>Qt-Prefix:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="136"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="103"/> <source>Enter the prefix for the Qt tools name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="143"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="110"/> <source>Qt-Postfix:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="150"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="117"/> <source>Enter the postfix for the Qt tools name</source> <translation type="unfinished"></translation> </message> @@ -46851,17 +46836,17 @@ <translation>Commit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="683"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="685"/> <source>There are no uncommitted changes available/selected.</source> <translation>Non ci sono modifiche disponibili/selezionate da committare.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="703"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="705"/> <source>Lock</source> <translation>Lock</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="719"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="721"/> <source>Unlock</source> <translation>Unlock</translation> </message> @@ -46906,22 +46891,22 @@ <translation>sostituito</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="703"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="705"/> <source>There are no unlocked files available/selected.</source> <translation>Non ci sono file sbloccati disponibili/selezionati.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="753"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="755"/> <source>There are no locked files available/selected.</source> <translation>Non ci sono file bloccati disponibili/selezionati.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="736"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="738"/> <source>Break Lock</source> <translation>Spezza lock</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="753"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="755"/> <source>Steal Lock</source> <translation>Ruba lock</translation> </message> @@ -47073,7 +47058,7 @@ <translation>Non ci sono elementi non sotto controllo disponibili/selezionati.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="666"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="668"/> <source>Revert</source> <translation>Inverti</translation> </message> @@ -47088,17 +47073,17 @@ <translation>Aggiungi alla Changelist</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="787"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="789"/> <source>Remove from Changelist</source> <translation>Rimuovi dalla Changelist</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="769"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="771"/> <source>There are no files available/selected not belonging to a changelist.</source> <translation>Non ci sono file disponibili/selezionati che non appartengono ad una changelist.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="787"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="789"/> <source>There are no files available/selected belonging to a changelist.</source> <translation>Non ci sono file disponibili/selezionati che appartengono ad una changelist.</translation> </message> @@ -47188,12 +47173,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="666"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="668"/> <source>There are no missing entries available/selected.</source> <translation type="unfinished">Non ci sono elementi mancati disponibili/selezionati.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="683"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="685"/> <source>Differences</source> <translation type="unfinished"></translation> </message> @@ -55583,17 +55568,17 @@ <context> <name>Utilities</name> <message> - <location filename="Utilities/__init__.py" line="1145"/> + <location filename="Utilities/__init__.py" line="1147"/> <source><p>You may use %-codes as placeholders in the string. Supported codes are:<table><tr><td>%C</td><td>column of the cursor of the current editor</td></tr><tr><td>%D</td><td>directory of the current editor</td></tr><tr><td>%F</td><td>filename of the current editor</td></tr><tr><td>%H</td><td>home directory of the current user</td></tr><tr><td>%L</td><td>line of the cursor of the current editor</td></tr><tr><td>%P</td><td>path of the current project</td></tr><tr><td>%S</td><td>selected text of the current editor</td></tr><tr><td>%U</td><td>username of the current user</td></tr><tr><td>%%</td><td>the percent sign</td></tr></table></p></source> <translation><p>Puoi usare i codici % come segnaposti nella stringa. I codici supportati sono: <table><tr><td>%C</td><td>colonna del cursore nell'editor attuale</td></tr><tr><td>%D</td><td>directory dell'editor attuale</td></tr><tr><td>%F</td><td>nome file dell'editor corrente</td></tr><tr><td>%H</td><td>directory home dell'utente attuale</td></tr><tr><td>%L</td><td>linea del cursore dell'editor attuale</td></tr><tr><td>%P</td><td>percorso del progetto attuale</td></tr><tr><td>%S</td><td>testo selezionato dell'editor attuale</td></tr><tr><td>%U</td><td>username dell'utente attuale</td></tr><tr><td>%%</td><td>Segno percentuale</td></tr></table></p></translation> </message> <message> - <location filename="Utilities/__init__.py" line="1345"/> + <location filename="Utilities/__init__.py" line="1337"/> <source>Python2 interpreter not configured.</source> <translation>Interprete Python2 non configurato.</translation> </message> <message> - <location filename="Utilities/__init__.py" line="1395"/> + <location filename="Utilities/__init__.py" line="1387"/> <source>Python2 interpreter did not finish within 30s.</source> <translation>L'interprete Python2 non ha finito entro i 30s.</translation> </message> @@ -60216,12 +60201,12 @@ <translation type="obsolete">Importazione packages...</translation> </message> <message> - <location filename="eric5.py" line="253"/> + <location filename="eric5.py" line="250"/> <source>Generating Main Window...</source> <translation>Generazione Main Window...</translation> </message> <message> - <location filename="eric5.py" line="248"/> + <location filename="eric5.py" line="245"/> <source>Starting...</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_ru.ts Thu Apr 25 19:52:40 2013 +0200 +++ b/i18n/eric5_ru.ts Thu Apr 25 19:53:25 2013 +0200 @@ -2486,22 +2486,22 @@ <context> <name>BrowserModel</name> <message> - <location filename="UI/BrowserModel.py" line="44"/> + <location filename="UI/BrowserModel.py" line="51"/> <source>Name</source> <translation>Имя</translation> </message> <message> - <location filename="UI/BrowserModel.py" line="602"/> + <location filename="UI/BrowserModel.py" line="604"/> <source>Attributes</source> <translation>Атрибуты</translation> </message> <message> - <location filename="UI/BrowserModel.py" line="556"/> + <location filename="UI/BrowserModel.py" line="558"/> <source>Coding: {0}</source> <translation>Кодировка: {0}</translation> </message> <message> - <location filename="UI/BrowserModel.py" line="561"/> + <location filename="UI/BrowserModel.py" line="563"/> <source>Globals</source> <translation>Глобальные переменные</translation> </message> @@ -2511,7 +2511,7 @@ <translation type="obsolete">Атрибуты (глобальные)</translation> </message> <message> - <location filename="UI/BrowserModel.py" line="612"/> + <location filename="UI/BrowserModel.py" line="614"/> <source>Class Attributes</source> <translation>Атрибуты класса</translation> </message> @@ -3179,7 +3179,7 @@ <context> <name>CodingError</name> <message> - <location filename="Utilities/__init__.py" line="94"/> + <location filename="Utilities/__init__.py" line="96"/> <source>The coding '{0}' is wrong for the given text.</source> <translation>Кодировка '{0}' не подходит для выбранного текста.</translation> </message> @@ -13057,27 +13057,27 @@ <translation type="obsolete">Утилиты помощи Qt4</translation> </message> <message> - <location filename="Plugins/PluginEricdoc.py" line="132"/> + <location filename="Plugins/PluginEricdoc.py" line="130"/> <source>Generate documentation (eric5_doc)</source> <translation>Создать документацию (eric5_doc)</translation> </message> <message> - <location filename="Plugins/PluginEricdoc.py" line="132"/> + <location filename="Plugins/PluginEricdoc.py" line="130"/> <source>Generate &documentation (eric5_doc)</source> <translation>Создать &документацию (eric5_doc)</translation> </message> <message> + <location filename="Plugins/PluginEricdoc.py" line="133"/> + <source>Generate API documentation using eric5_doc</source> + <translation>Создать документацию на API с помощью eric5_doc</translation> + </message> + <message> <location filename="Plugins/PluginEricdoc.py" line="135"/> - <source>Generate API documentation using eric5_doc</source> - <translation>Создать документацию на API с помощью eric5_doc</translation> - </message> - <message> - <location filename="Plugins/PluginEricdoc.py" line="137"/> <source><b>Generate documentation</b><p>Generate API documentation using eric5_doc.</p></source> <translation><b>Создать документацию</b><p>Создать документацию на API с помощью eric5_doc</p></translation> </message> <message> - <location filename="Plugins/PluginEricdoc.py" line="88"/> + <location filename="Plugins/PluginEricdoc.py" line="86"/> <source>Qt Help Tools</source> <translation>Утилиты помощи Qt</translation> </message> @@ -23849,7 +23849,7 @@ <translation>Зафиксировать</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="661"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="663"/> <source>There are no uncommitted changes available/selected.</source> <translation>Нет доступных/выбранных неотправленных изменений.</translation> </message> @@ -23864,7 +23864,7 @@ <translation>Нет/не выбраны неверсионные элементы.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="644"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="646"/> <source>Revert</source> <translation>Откатить</translation> </message> @@ -23879,7 +23879,7 @@ <translation>Удалить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="644"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="646"/> <source>There are no missing entries available/selected.</source> <translation>Нет/не выбраны пропущенных элементы.</translation> </message> @@ -23974,7 +23974,7 @@ <translation type="obsolete">Различие</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="661"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="663"/> <source>Differences</source> <translation>Различия</translation> </message> @@ -33395,27 +33395,27 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="1132"/> + <location filename="Preferences/__init__.py" line="1131"/> <source>Export Preferences</source> <translation>Экспорт предпочтений</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1159"/> + <location filename="Preferences/__init__.py" line="1158"/> <source>Import Preferences</source> <translation>Импорт предпочтений</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1159"/> + <location filename="Preferences/__init__.py" line="1158"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>Файлы свойств (*.ini);;Все файлы (*)</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1253"/> + <location filename="Preferences/__init__.py" line="1252"/> <source>Select Python2 Interpreter</source> <translation>Выбрать интерпретатор Python 2</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1253"/> + <location filename="Preferences/__init__.py" line="1252"/> <source>Select the Python2 interpreter to be used:</source> <translation>Выбрать интерпретатор Python 2 для использования:</translation> </message> @@ -39601,7 +39601,7 @@ <context> <name>QtPage</name> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="79"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="46"/> <source>...</source> <translation>...</translation> </message> @@ -39621,7 +39621,7 @@ <translation type="obsolete">Задайте путь для каталога переводов Qt4.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.py" line="75"/> + <location filename="Preferences/ConfigurationPages/QtPage.py" line="55"/> <source>Select Qt4 Translations Directory</source> <translation>Выберите каталог переводов Qt4</translation> </message> @@ -39631,7 +39631,7 @@ <translation><b>Настроить Qt</b></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="113"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="80"/> <source>Qt Tools</source> <translation>Утилиты Qt</translation> </message> @@ -39656,12 +39656,12 @@ <translation type="obsolete">Префикс Qt4:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="163"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="130"/> <source>This gives an example of the complete tool name</source> <translation>Предпросмотр полного имени утилиты</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="166"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="133"/> <source>designer</source> <translation>designer</translation> </message> @@ -39676,7 +39676,7 @@ <translation type="obsolete">Каталог Qt4</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="93"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="60"/> <source><font color="#FF0000"><b>Note:</b> This setting is activated at the next startup of the application.</font></source> <translation><font color="#FF0000"><b>Примечание:</b> Эти изменения вступят в силу при следующем запуске приложения.</font></translation> </message> @@ -39693,65 +39693,50 @@ <message> <location filename="Preferences/ConfigurationPages/QtPage.py" line="61"/> <source>Select Qt4 Directory</source> - <translation>Выберите каталог Qt4</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="119"/> + <translation type="obsolete">Выберите каталог Qt4</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="86"/> <source>The tool executable is composed of the prefix, the tool name and the postfix. For win, the extension is added automatically.</source> <translation>Имя исполняемого файла для утилиты состоит из префикса, имени утилиты и постфикса. В win32 автоматически добавляется расширение.</translation> </message> <message> <location filename="Preferences/ConfigurationPages/QtPage.ui" line="37"/> - <source>Qt Directory</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="50"/> - <source>Enter the path of the Qt directory.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="57"/> - <source>Press to select the Qt directory via a directory selection dialog</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="70"/> <source>Qt Translations Directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="76"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="43"/> <source>Press to select the Qt translations directory via a directory selection dialog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="86"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="53"/> <source>Enter the path of the Qt translations directory.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="100"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="67"/> <source><b>Note:</b> Leave this entry empty to use the QT4TRANSLATIONSDIR environment variable or the path compiled into the Qt library.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="129"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="96"/> <source>Qt-Prefix:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="136"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="103"/> <source>Enter the prefix for the Qt tools name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="143"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="110"/> <source>Qt-Postfix:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="150"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="117"/> <source>Enter the postfix for the Qt tools name</source> <translation type="unfinished"></translation> </message> @@ -47010,17 +46995,17 @@ <translation>Зафиксировать</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="683"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="685"/> <source>There are no uncommitted changes available/selected.</source> <translation>Нет доступных/выбранных неотправленных изменений.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="703"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="705"/> <source>Lock</source> <translation>Захватить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="719"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="721"/> <source>Unlock</source> <translation>Освободить</translation> </message> @@ -47065,22 +47050,22 @@ <translation>заменено</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="703"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="705"/> <source>There are no unlocked files available/selected.</source> <translation>Нет доступных/выбранных незахваченных файлов.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="753"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="755"/> <source>There are no locked files available/selected.</source> <translation>Нет доступных/выбранных захваченных файлов.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="736"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="738"/> <source>Break Lock</source> <translation>Нарушить захват</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="753"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="755"/> <source>Steal Lock</source> <translation>Украсть захват</translation> </message> @@ -47232,7 +47217,7 @@ <translation>Нет/не выбраны неверсионные элементы.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="666"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="668"/> <source>Revert</source> <translation>Откатить</translation> </message> @@ -47252,17 +47237,17 @@ <translation>Добавить к списку изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="787"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="789"/> <source>Remove from Changelist</source> <translation>Удалить из списка изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="769"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="771"/> <source>There are no files available/selected not belonging to a changelist.</source> <translation>Среди выбранных нет файлов не включенных в список изменений.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="787"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="789"/> <source>There are no files available/selected belonging to a changelist.</source> <translation>Среди выбранных нет файлов включенных в список изменений.</translation> </message> @@ -47347,7 +47332,7 @@ <translation type="obsolete">Различие</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="683"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="685"/> <source>Differences</source> <translation type="unfinished">Различия</translation> </message> @@ -47357,7 +47342,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="666"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="668"/> <source>There are no missing entries available/selected.</source> <translation>Нет/не выбраны пропущенных элементы.</translation> </message> @@ -55718,7 +55703,7 @@ <context> <name>Utilities</name> <message> - <location filename="Utilities/__init__.py" line="1145"/> + <location filename="Utilities/__init__.py" line="1147"/> <source><p>You may use %-codes as placeholders in the string. Supported codes are:<table><tr><td>%C</td><td>column of the cursor of the current editor</td></tr><tr><td>%D</td><td>directory of the current editor</td></tr><tr><td>%F</td><td>filename of the current editor</td></tr><tr><td>%H</td><td>home directory of the current user</td></tr><tr><td>%L</td><td>line of the cursor of the current editor</td></tr><tr><td>%P</td><td>path of the current project</td></tr><tr><td>%S</td><td>selected text of the current editor</td></tr><tr><td>%U</td><td>username of the current user</td></tr><tr><td>%%</td><td>the percent sign</td></tr></table></p></source> <translation><p>В строках вы можете использовать следующие %-коды:: <table> @@ -55733,12 +55718,12 @@ <tr><td>%%</td><td>знак процента</td></tr></table></p></translation> </message> <message> - <location filename="Utilities/__init__.py" line="1345"/> + <location filename="Utilities/__init__.py" line="1337"/> <source>Python2 interpreter not configured.</source> <translation>Интерпретатор Python2 не настроен.</translation> </message> <message> - <location filename="Utilities/__init__.py" line="1395"/> + <location filename="Utilities/__init__.py" line="1387"/> <source>Python2 interpreter did not finish within 30s.</source> <translation>Интерпретатор Python2 не завершился в течение 30 секунд.</translation> </message> @@ -60401,12 +60386,12 @@ <translation type="obsolete">Импорт пакетов...</translation> </message> <message> - <location filename="eric5.py" line="253"/> + <location filename="eric5.py" line="250"/> <source>Generating Main Window...</source> <translation>Создание главного окна...</translation> </message> <message> - <location filename="eric5.py" line="248"/> + <location filename="eric5.py" line="245"/> <source>Starting...</source> <translation>Запуск...</translation> </message>
--- a/i18n/eric5_tr.ts Thu Apr 25 19:52:40 2013 +0200 +++ b/i18n/eric5_tr.ts Thu Apr 25 19:53:25 2013 +0200 @@ -2479,22 +2479,22 @@ <context> <name>BrowserModel</name> <message> - <location filename="UI/BrowserModel.py" line="44"/> + <location filename="UI/BrowserModel.py" line="51"/> <source>Name</source> <translation>Adı</translation> </message> <message> - <location filename="UI/BrowserModel.py" line="556"/> + <location filename="UI/BrowserModel.py" line="558"/> <source>Coding: {0}</source> <translation>Kodlama: {0}</translation> </message> <message> - <location filename="UI/BrowserModel.py" line="561"/> + <location filename="UI/BrowserModel.py" line="563"/> <source>Globals</source> <translation>Evrensel</translation> </message> <message> - <location filename="UI/BrowserModel.py" line="602"/> + <location filename="UI/BrowserModel.py" line="604"/> <source>Attributes</source> <translation>Nitelikler</translation> </message> @@ -2504,7 +2504,7 @@ <translation type="obsolete">Nitelikler (Küresel)</translation> </message> <message> - <location filename="UI/BrowserModel.py" line="612"/> + <location filename="UI/BrowserModel.py" line="614"/> <source>Class Attributes</source> <translation type="unfinished"></translation> </message> @@ -3170,7 +3170,7 @@ <context> <name>CodingError</name> <message> - <location filename="Utilities/__init__.py" line="94"/> + <location filename="Utilities/__init__.py" line="96"/> <source>The coding '{0}' is wrong for the given text.</source> <translation>Verilen metin için '{0}'nun kodlaması hatalı.</translation> </message> @@ -13036,27 +13036,27 @@ <translation type="obsolete"><b>Belge Üretimi</b><p>Eric-5doc kullanılarak API belgelerini üret.</p></translation> </message> <message> - <location filename="Plugins/PluginEricdoc.py" line="132"/> + <location filename="Plugins/PluginEricdoc.py" line="130"/> <source>Generate documentation (eric5_doc)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/PluginEricdoc.py" line="132"/> + <location filename="Plugins/PluginEricdoc.py" line="130"/> <source>Generate &documentation (eric5_doc)</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/PluginEricdoc.py" line="133"/> + <source>Generate API documentation using eric5_doc</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/PluginEricdoc.py" line="135"/> - <source>Generate API documentation using eric5_doc</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/PluginEricdoc.py" line="137"/> <source><b>Generate documentation</b><p>Generate API documentation using eric5_doc.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/PluginEricdoc.py" line="88"/> + <location filename="Plugins/PluginEricdoc.py" line="86"/> <source>Qt Help Tools</source> <translation type="unfinished"></translation> </message> @@ -23718,7 +23718,7 @@ <translation>Teslimat</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="661"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="663"/> <source>There are no uncommitted changes available/selected.</source> <translation type="unfinished"></translation> </message> @@ -23738,12 +23738,12 @@ <translation>Kaldır</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="644"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="646"/> <source>There are no missing entries available/selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="644"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="646"/> <source>Revert</source> <translation>Başa Dönme</translation> </message> @@ -23838,7 +23838,7 @@ <translation type="obsolete">Farklılık</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="661"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="663"/> <source>Differences</source> <translation type="unfinished"></translation> </message> @@ -33301,27 +33301,27 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="1132"/> + <location filename="Preferences/__init__.py" line="1131"/> <source>Export Preferences</source> <translation>Seçenekleri Dışa Aktar</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1159"/> + <location filename="Preferences/__init__.py" line="1158"/> <source>Import Preferences</source> <translation>Seçenekleri İçe Aktar</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1159"/> + <location filename="Preferences/__init__.py" line="1158"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1253"/> + <location filename="Preferences/__init__.py" line="1252"/> <source>Select Python2 Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1253"/> + <location filename="Preferences/__init__.py" line="1252"/> <source>Select the Python2 interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -39340,7 +39340,7 @@ <translation type="obsolete">Qt4 Dizini</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="93"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="60"/> <source><font color="#FF0000"><b>Note:</b> This setting is activated at the next startup of the application.</font></source> <translation><font color="#FF0000"><b>Not:</b> Bu ayarlamalar uygulamanın bir sonraki çalıştırılmasında aktif hale geçecektir.</font></translation> </message> @@ -39355,7 +39355,7 @@ <translation type="obsolete">Dizin seçme diyaloğu ile Qt4 dizinini seçmek için basınız</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="79"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="46"/> <source>...</source> <translation>...</translation> </message> @@ -39380,12 +39380,12 @@ <translation type="obsolete"><b>Not:</b> Ayarlandığında Boş bıraktıysanız QT4TRANSLATIONSDIR ortam değişkeni veya Qt3 kütüphanesi için belirlenen yol kullanılır.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="113"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="80"/> <source>Qt Tools</source> <translation>QT Araçları</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="119"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="86"/> <source>The tool executable is composed of the prefix, the tool name and the postfix. For win, the extension is added automatically.</source> <translation>çalışabilen araçların kendiliğinden oluşan ön eki. başarı için, kendiliğinden eklenir.</translation> </message> @@ -39410,77 +39410,62 @@ <translation type="obsolete">Qt4 araç adlarının son ekini giriniz</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="163"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="130"/> <source>This gives an example of the complete tool name</source> <translation>Bu tüm araç isimlerinin bir örneğini verir</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="166"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="133"/> <source>designer</source> <translation>dizayncı</translation> </message> <message> <location filename="Preferences/ConfigurationPages/QtPage.py" line="61"/> <source>Select Qt4 Directory</source> - <translation>Qt4 Dizinini Seç</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/QtPage.py" line="75"/> + <translation type="obsolete">Qt4 Dizinini Seç</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/QtPage.py" line="55"/> <source>Select Qt4 Translations Directory</source> <translation>Qt4 Çeviri Dizinini Seç</translation> </message> <message> <location filename="Preferences/ConfigurationPages/QtPage.ui" line="37"/> - <source>Qt Directory</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="50"/> - <source>Enter the path of the Qt directory.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="57"/> - <source>Press to select the Qt directory via a directory selection dialog</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="70"/> <source>Qt Translations Directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="76"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="43"/> <source>Press to select the Qt translations directory via a directory selection dialog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="86"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="53"/> <source>Enter the path of the Qt translations directory.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="100"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="67"/> <source><b>Note:</b> Leave this entry empty to use the QT4TRANSLATIONSDIR environment variable or the path compiled into the Qt library.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="129"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="96"/> <source>Qt-Prefix:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="136"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="103"/> <source>Enter the prefix for the Qt tools name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="143"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="110"/> <source>Qt-Postfix:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="150"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="117"/> <source>Enter the postfix for the Qt tools name</source> <translation type="unfinished"></translation> </message> @@ -46429,17 +46414,17 @@ <translation>Değişiklik Listesine Ekle</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="787"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="789"/> <source>Remove from Changelist</source> <translation>DEğişiklik listesinden çıkar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="703"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="705"/> <source>Lock</source> <translation>Kilitli</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="719"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="721"/> <source>Unlock</source> <translation>Kilitsiz</translation> </message> @@ -46564,7 +46549,7 @@ <translation>Teslimat</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="683"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="685"/> <source>There are no uncommitted changes available/selected.</source> <translation type="unfinished"></translation> </message> @@ -46579,37 +46564,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="666"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="668"/> <source>Revert</source> <translation>Başa Dönme</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="703"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="705"/> <source>There are no unlocked files available/selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="753"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="755"/> <source>There are no locked files available/selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="736"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="738"/> <source>Break Lock</source> <translation>Kırma Kilidi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="753"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="755"/> <source>Steal Lock</source> <translation>Hırsızlık Kilidi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="769"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="771"/> <source>There are no files available/selected not belonging to a changelist.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="787"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="789"/> <source>There are no files available/selected belonging to a changelist.</source> <translation type="unfinished"></translation> </message> @@ -46694,7 +46679,7 @@ <translation type="obsolete">Farklılık</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="683"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="685"/> <source>Differences</source> <translation type="unfinished"></translation> </message> @@ -46704,7 +46689,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="666"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="668"/> <source>There are no missing entries available/selected.</source> <translation type="unfinished"></translation> </message> @@ -54884,17 +54869,17 @@ <context> <name>Utilities</name> <message> - <location filename="Utilities/__init__.py" line="1145"/> + <location filename="Utilities/__init__.py" line="1147"/> <source><p>You may use %-codes as placeholders in the string. Supported codes are:<table><tr><td>%C</td><td>column of the cursor of the current editor</td></tr><tr><td>%D</td><td>directory of the current editor</td></tr><tr><td>%F</td><td>filename of the current editor</td></tr><tr><td>%H</td><td>home directory of the current user</td></tr><tr><td>%L</td><td>line of the cursor of the current editor</td></tr><tr><td>%P</td><td>path of the current project</td></tr><tr><td>%S</td><td>selected text of the current editor</td></tr><tr><td>%U</td><td>username of the current user</td></tr><tr><td>%%</td><td>the percent sign</td></tr></table></p></source> <translation><p>%-alanlarda çeşitli kodları kullanabilirsiniz. Tanımlanan kodlar:<table><tr><td>%C</td><td>geçerli düzenleyicinin imlecinin sütunu</td></tr><tr><td>%D</td><td>geçerli düzenleyicinin dizini</td></tr><tr><td>%F</td><td>geçerli düzenleyicinin dosya adı</td></tr><tr><td>%H</td><td>geçerli kullancının ana dizini</td></tr><tr><td>%L</td><td>geçerli düzenleyicinin imlecinin satırı</td></tr><tr><td>%P</td><td>geçerli projenin yolu</td></tr><tr><td>%S</td><td>selected text of the current editor</td></tr><tr><td>%U</td><td>Geçici kullanıcının kullanıcı adı</td></tr><tr><td>%%</td><td>oran işareti</td></tr></table></p></translation> </message> <message> - <location filename="Utilities/__init__.py" line="1345"/> + <location filename="Utilities/__init__.py" line="1337"/> <source>Python2 interpreter not configured.</source> <translation>Python2 yorumlayıcı ayarlanmadı.</translation> </message> <message> - <location filename="Utilities/__init__.py" line="1395"/> + <location filename="Utilities/__init__.py" line="1387"/> <source>Python2 interpreter did not finish within 30s.</source> <translation type="unfinished">Python2 yorumlayıcı 15 s. de bitmedi. {2 ?} {30s?}</translation> </message> @@ -59567,12 +59552,12 @@ <translation type="obsolete">Paketler içeri aktarılıyor...</translation> </message> <message> - <location filename="eric5.py" line="253"/> + <location filename="eric5.py" line="250"/> <source>Generating Main Window...</source> <translation>Anapencere üretiliyor...</translation> </message> <message> - <location filename="eric5.py" line="248"/> + <location filename="eric5.py" line="245"/> <source>Starting...</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_zh_CN.GB2312.ts Thu Apr 25 19:52:40 2013 +0200 +++ b/i18n/eric5_zh_CN.GB2312.ts Thu Apr 25 19:53:25 2013 +0200 @@ -2589,7 +2589,7 @@ <context> <name>BrowserModel</name> <message> - <location filename="UI/BrowserModel.py" line="44"/> + <location filename="UI/BrowserModel.py" line="51"/> <source>Name</source> <translation>名称</translation> </message> @@ -2599,12 +2599,12 @@ <translation type="obsolete">代码：%1</translation> </message> <message> - <location filename="UI/BrowserModel.py" line="561"/> + <location filename="UI/BrowserModel.py" line="563"/> <source>Globals</source> <translation>全局</translation> </message> <message> - <location filename="UI/BrowserModel.py" line="602"/> + <location filename="UI/BrowserModel.py" line="604"/> <source>Attributes</source> <translation>属性</translation> </message> @@ -2614,12 +2614,12 @@ <translation type="obsolete">属性（全局）</translation> </message> <message> - <location filename="UI/BrowserModel.py" line="556"/> + <location filename="UI/BrowserModel.py" line="558"/> <source>Coding: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/BrowserModel.py" line="612"/> + <location filename="UI/BrowserModel.py" line="614"/> <source>Class Attributes</source> <translation type="unfinished"></translation> </message> @@ -3259,7 +3259,7 @@ <translation type="obsolete">给定文本编码 '%1' 错误。</translation> </message> <message> - <location filename="Utilities/__init__.py" line="94"/> + <location filename="Utilities/__init__.py" line="96"/> <source>The coding '{0}' is wrong for the given text.</source> <translation type="unfinished"></translation> </message> @@ -13730,27 +13730,27 @@ <translation type="obsolete"><b>生成文档</b><p>使用 eric4-doc 生成 API 文档。</p> {5-?}</translation> </message> <message> - <location filename="Plugins/PluginEricdoc.py" line="132"/> + <location filename="Plugins/PluginEricdoc.py" line="130"/> <source>Generate documentation (eric5_doc)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/PluginEricdoc.py" line="132"/> + <location filename="Plugins/PluginEricdoc.py" line="130"/> <source>Generate &documentation (eric5_doc)</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/PluginEricdoc.py" line="133"/> + <source>Generate API documentation using eric5_doc</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/PluginEricdoc.py" line="135"/> - <source>Generate API documentation using eric5_doc</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/PluginEricdoc.py" line="137"/> <source><b>Generate documentation</b><p>Generate API documentation using eric5_doc.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/PluginEricdoc.py" line="88"/> + <location filename="Plugins/PluginEricdoc.py" line="86"/> <source>Qt Help Tools</source> <translation type="unfinished"></translation> </message> @@ -24717,7 +24717,7 @@ <translation type="unfinished">提交</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="661"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="663"/> <source>There are no uncommitted changes available/selected.</source> <translation type="unfinished">没有未提交的更改可用或被选择。</translation> </message> @@ -24732,7 +24732,7 @@ <translation type="unfinished">没有未版本化的条目可用或被选择。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="644"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="646"/> <source>Revert</source> <translation type="unfinished">还原</translation> </message> @@ -24747,7 +24747,7 @@ <translation type="unfinished">移除</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="644"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="646"/> <source>There are no missing entries available/selected.</source> <translation type="unfinished"></translation> </message> @@ -24842,7 +24842,7 @@ <translation type="obsolete">差异</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="661"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="663"/> <source>Differences</source> <translation type="unfinished"></translation> </message> @@ -34784,27 +34784,27 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="1132"/> + <location filename="Preferences/__init__.py" line="1131"/> <source>Export Preferences</source> <translation>导出首选项</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1159"/> + <location filename="Preferences/__init__.py" line="1158"/> <source>Import Preferences</source> <translation>导入首选项</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1159"/> + <location filename="Preferences/__init__.py" line="1158"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1253"/> + <location filename="Preferences/__init__.py" line="1252"/> <source>Select Python2 Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1253"/> + <location filename="Preferences/__init__.py" line="1252"/> <source>Select the Python2 interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -41722,7 +41722,7 @@ <translation type="obsolete">点击通过文件夹选择对话框选择 Qt3 文件夹</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="79"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="46"/> <source>...</source> <translation>……</translation> </message> @@ -41747,7 +41747,7 @@ <translation type="obsolete"><b>注意：</b> 为空则使用 QT4TRANSLATIONSDIR 环境变量或者编译到 Qt4 库中的路径。</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="113"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="80"/> <source>Qt Tools</source> <translation>Qt 工具</translation> </message> @@ -41797,12 +41797,12 @@ <translation type="obsolete">输入 Qt4 工具名称的后缀</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="163"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="130"/> <source>This gives an example of the complete tool name</source> <translation>这里给出了完整工具名称的一个范例</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="166"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="133"/> <source>designer</source> <translation>设计师</translation> </message> @@ -41812,7 +41812,7 @@ <translation type="obsolete">选择 Qt3 文件夹</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.py" line="75"/> + <location filename="Preferences/ConfigurationPages/QtPage.py" line="55"/> <source>Select Qt4 Translations Directory</source> <translation>选择 Qt4 翻译文件夹</translation> </message> @@ -41827,7 +41827,7 @@ <translation type="obsolete">Qt3 文件夹 {4 ?}</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="93"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="60"/> <source><font color="#FF0000"><b>Note:</b> This setting is activated at the next startup of the application.</font></source> <translation type="unfinished"><font color="#FF0000"><b>注意：</b> 该设置将在下次启动应用程序时生效。</font></translation> </message> @@ -41844,65 +41844,50 @@ <message> <location filename="Preferences/ConfigurationPages/QtPage.py" line="61"/> <source>Select Qt4 Directory</source> - <translation type="unfinished">选择 Qt3 文件夹 {4 ?}</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="119"/> + <translation type="obsolete">选择 Qt3 文件夹 {4 ?}</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="86"/> <source>The tool executable is composed of the prefix, the tool name and the postfix. For win, the extension is added automatically.</source> <translation type="unfinished"></translation> </message> <message> <location filename="Preferences/ConfigurationPages/QtPage.ui" line="37"/> - <source>Qt Directory</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="50"/> - <source>Enter the path of the Qt directory.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="57"/> - <source>Press to select the Qt directory via a directory selection dialog</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="70"/> <source>Qt Translations Directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="76"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="43"/> <source>Press to select the Qt translations directory via a directory selection dialog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="86"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="53"/> <source>Enter the path of the Qt translations directory.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="100"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="67"/> <source><b>Note:</b> Leave this entry empty to use the QT4TRANSLATIONSDIR environment variable or the path compiled into the Qt library.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="129"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="96"/> <source>Qt-Prefix:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="136"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="103"/> <source>Enter the prefix for the Qt tools name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="143"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="110"/> <source>Qt-Postfix:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/QtPage.ui" line="150"/> + <location filename="Preferences/ConfigurationPages/QtPage.ui" line="117"/> <source>Enter the postfix for the Qt tools name</source> <translation type="unfinished"></translation> </message> @@ -49726,17 +49711,17 @@ <translation>添加更改列表</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="787"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="789"/> <source>Remove from Changelist</source> <translation>从更改列表中移除</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="703"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="705"/> <source>Lock</source> <translation>闭锁</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="719"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="721"/> <source>Unlock</source> <translation>解锁</translation> </message> @@ -49861,7 +49846,7 @@ <translation>提交</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="683"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="685"/> <source>There are no uncommitted changes available/selected.</source> <translation>没有未提交的更改可用或被选择。</translation> </message> @@ -49876,37 +49861,37 @@ <translation>没有未版本化的条目可用或被选择。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="666"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="668"/> <source>Revert</source> <translation>还原</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="703"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="705"/> <source>There are no unlocked files available/selected.</source> <translation>没有未解锁的文件可用或被选择。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="753"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="755"/> <source>There are no locked files available/selected.</source> <translation>没有闭锁的文件可用或被选择。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="736"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="738"/> <source>Break Lock</source> <translation>Break Lock</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="753"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="755"/> <source>Steal Lock</source> <translation>Steal Lock</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="769"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="771"/> <source>There are no files available/selected not belonging to a changelist.</source> <translation>没有不属于更改列表的文件可用或被选择。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="787"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="789"/> <source>There are no files available/selected belonging to a changelist.</source> <translation>没有属于更改列表的文件可用或被选择。</translation> </message> @@ -49996,7 +49981,7 @@ <translation type="obsolete">差异</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="683"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="685"/> <source>Differences</source> <translation type="unfinished"></translation> </message> @@ -50006,7 +49991,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="666"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="668"/> <source>There are no missing entries available/selected.</source> <translation type="unfinished"></translation> </message> @@ -58832,17 +58817,17 @@ <context> <name>Utilities</name> <message> - <location filename="Utilities/__init__.py" line="1145"/> + <location filename="Utilities/__init__.py" line="1147"/> <source><p>You may use %-codes as placeholders in the string. Supported codes are:<table><tr><td>%C</td><td>column of the cursor of the current editor</td></tr><tr><td>%D</td><td>directory of the current editor</td></tr><tr><td>%F</td><td>filename of the current editor</td></tr><tr><td>%H</td><td>home directory of the current user</td></tr><tr><td>%L</td><td>line of the cursor of the current editor</td></tr><tr><td>%P</td><td>path of the current project</td></tr><tr><td>%S</td><td>selected text of the current editor</td></tr><tr><td>%U</td><td>username of the current user</td></tr><tr><td>%%</td><td>the percent sign</td></tr></table></p></source> <translation><p>可以在字符串中使用“%-代码”作为占位符。支持的代码有：<table><tr><td>%C</td><td>当前编辑器的光标所在列</td></tr><tr><td>%D</td><td>当前编辑器的文件夹</td></tr><tr><td>%F</td><td>当前编辑器的文件名</td></tr><tr><td>%H</td><td>当前用户的根目录</td></tr><tr><td>%L</td><td>当前编辑器的光标所在行</td></tr><tr><td>%P</td><td>当前项目的路径</td></tr><tr><td>%S</td><td>当前编辑器中选择的文本</td></tr><tr><td>%U</td><td>当前用户的用户名</td></tr><tr><td>%%</td><td>百分比符号</td></tr></table></p></translation> </message> <message> - <location filename="Utilities/__init__.py" line="1345"/> + <location filename="Utilities/__init__.py" line="1337"/> <source>Python2 interpreter not configured.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Utilities/__init__.py" line="1395"/> + <location filename="Utilities/__init__.py" line="1387"/> <source>Python2 interpreter did not finish within 30s.</source> <translation type="unfinished"></translation> </message> @@ -63726,12 +63711,12 @@ <translation type="obsolete">正在导入程序包……</translation> </message> <message> - <location filename="eric5.py" line="253"/> + <location filename="eric5.py" line="250"/> <source>Generating Main Window...</source> <translation type="unfinished">正在产生主窗口……</translation> </message> <message> - <location filename="eric5.py" line="248"/> + <location filename="eric5.py" line="245"/> <source>Starting...</source> <translation type="unfinished"></translation> </message>
--- a/install.py Thu Apr 25 19:52:40 2013 +0200 +++ b/install.py Thu Apr 25 19:53:25 2013 +0200 @@ -224,12 +224,15 @@ # Mac OS X elif sys.platform == "darwin": + pyexec = "{0}/bin/pythonw3".format(sys.exec_prefix) + if not os.path.exists(pyexec): + pyexec = "{0}/bin/python3".format(sys.exec_prefix) wname = wfile wrapper = \ '''#!/bin/sh -exec "{0}/bin/pythonw3" "{1}/{2}.py" "$@" -'''.format(sys.exec_prefix, pydir, wfile) +exec "{0}" "{1}/{2}.py" "$@" +'''.format(pyexec, pydir, wfile) # *nix systems else:
