Mercurial Repositories > eric / changeset
changeset
Added some more search engines to the web browser.
Sat, 04 Jun 2011 11:53:15 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sat, 04 Jun 2011 11:53:15 +0200
- changeset 1109
- 9552b5e16a07
- parent 1106
- 3e57cd52e0f6
- child 1112
- 8a7d1b9d18db
Added some more search engines to the web browser.
--- a/APIs/Python3/eric5.api Fri Jun 03 13:01:16 2011 +0200 +++ b/APIs/Python3/eric5.api Sat Jun 04 11:53:15 2011 +0200 @@ -2274,14 +2274,12 @@ eric5.Helpviewer.OpenSearch.OpenSearchDialog.OpenSearchDialog?1(parent=None) eric5.Helpviewer.OpenSearch.OpenSearchEditDialog.OpenSearchEditDialog.accept?4() eric5.Helpviewer.OpenSearch.OpenSearchEditDialog.OpenSearchEditDialog?1(engine, parent=None) -eric5.Helpviewer.OpenSearch.OpenSearchEngine.OpenSearchEngine._language?8 eric5.Helpviewer.OpenSearch.OpenSearchEngine.OpenSearchEngine.description?4() eric5.Helpviewer.OpenSearch.OpenSearchEngine.OpenSearchEngine.image?4() eric5.Helpviewer.OpenSearch.OpenSearchEngine.OpenSearchEngine.imageChanged?7 eric5.Helpviewer.OpenSearch.OpenSearchEngine.OpenSearchEngine.imageUrl?4() eric5.Helpviewer.OpenSearch.OpenSearchEngine.OpenSearchEngine.isValid?4() eric5.Helpviewer.OpenSearch.OpenSearchEngine.OpenSearchEngine.loadImage?4() -eric5.Helpviewer.OpenSearch.OpenSearchEngine.OpenSearchEngine.loc?7 eric5.Helpviewer.OpenSearch.OpenSearchEngine.OpenSearchEngine.name?4() eric5.Helpviewer.OpenSearch.OpenSearchEngine.OpenSearchEngine.networkAccessManager?4() eric5.Helpviewer.OpenSearch.OpenSearchEngine.OpenSearchEngine.parseTemplate?4(searchTerm, searchTemplate) @@ -4587,6 +4585,7 @@ eric5.Preferences.ConfigurationPages.HelpAppearancePage.HelpAppearancePage.on_standardFontButton_clicked?4() eric5.Preferences.ConfigurationPages.HelpAppearancePage.HelpAppearancePage.on_styleSheetButton_clicked?4() eric5.Preferences.ConfigurationPages.HelpAppearancePage.HelpAppearancePage.save?4() +eric5.Preferences.ConfigurationPages.HelpAppearancePage.HelpAppearancePage.setMode?4(displayMode) eric5.Preferences.ConfigurationPages.HelpAppearancePage.HelpAppearancePage?1() eric5.Preferences.ConfigurationPages.HelpAppearancePage.create?4(dlg) eric5.Preferences.ConfigurationPages.HelpDocumentationPage.HelpDocumentationPage.on_pyqt4DocDirButton_clicked?4() @@ -6612,6 +6611,7 @@ eric5.Utilities.configDir?7 eric5.Utilities.convertLineEnds?4(text, eol) eric5.Utilities.decode?4(text) +eric5.Utilities.decodeBytes?4(buffer) eric5.Utilities.decodeString?4(text) eric5.Utilities.direntries?4(path, filesonly=False, pattern=None, followsymlinks=True, checkStop=None) eric5.Utilities.encode?4(text, orig_coding)
--- a/Documentation/Help/source.qhp Fri Jun 03 13:01:16 2011 +0200 +++ b/Documentation/Help/source.qhp Sat Jun 04 11:53:15 2011 +0200 @@ -2410,6 +2410,7 @@ <keyword name="compile" id="compile" ref="eric5.Utilities.__init__.html#compile" /> <keyword name="convertLineEnds" id="convertLineEnds" ref="eric5.Utilities.__init__.html#convertLineEnds" /> <keyword name="decode" id="decode" ref="eric5.Utilities.__init__.html#decode" /> + <keyword name="decodeBytes" id="decodeBytes" ref="eric5.Utilities.__init__.html#decodeBytes" /> <keyword name="decodeString" id="decodeString" ref="eric5.Utilities.__init__.html#decodeString" /> <keyword name="direntries" id="direntries" ref="eric5.Utilities.__init__.html#direntries" /> <keyword name="encode" id="encode" ref="eric5.Utilities.__init__.html#encode" /> @@ -7887,6 +7888,7 @@ <keyword name="HelpAppearancePage.on_standardFontButton_clicked" id="HelpAppearancePage.on_standardFontButton_clicked" ref="eric5.Preferences.ConfigurationPages.HelpAppearancePage.html#HelpAppearancePage.on_standardFontButton_clicked" /> <keyword name="HelpAppearancePage.on_styleSheetButton_clicked" id="HelpAppearancePage.on_styleSheetButton_clicked" ref="eric5.Preferences.ConfigurationPages.HelpAppearancePage.html#HelpAppearancePage.on_styleSheetButton_clicked" /> <keyword name="HelpAppearancePage.save" id="HelpAppearancePage.save" ref="eric5.Preferences.ConfigurationPages.HelpAppearancePage.html#HelpAppearancePage.save" /> + <keyword name="HelpAppearancePage.setMode" id="HelpAppearancePage.setMode" ref="eric5.Preferences.ConfigurationPages.HelpAppearancePage.html#HelpAppearancePage.setMode" /> <keyword name="EditorFilePage (Module)" id="EditorFilePage (Module)" ref="eric5.Preferences.ConfigurationPages.EditorFilePage.html" /> <keyword name="EditorFilePage" id="EditorFilePage" ref="eric5.Preferences.ConfigurationPages.EditorFilePage.html#EditorFilePage" /> <keyword name="create" id="create" ref="eric5.Preferences.ConfigurationPages.EditorFilePage.html#create" />
--- a/Documentation/Source/eric5.Helpviewer.OpenSearch.OpenSearchEngine.html Fri Jun 03 13:01:16 2011 +0200 +++ b/Documentation/Source/eric5.Helpviewer.OpenSearch.OpenSearchEngine.html Sat Jun 04 11:53:15 2011 +0200 @@ -59,7 +59,7 @@ QObject <h3>Class Attributes</h3> <table> -<tr><td>_language</td></tr><tr><td>loc</td></tr> +<tr><td>None</td></tr> </table> <h3>Methods</h3> <table>
--- a/Documentation/Source/eric5.Preferences.ConfigurationPages.HelpAppearancePage.html Fri Jun 03 13:01:16 2011 +0200 +++ b/Documentation/Source/eric5.Preferences.ConfigurationPages.HelpAppearancePage.html Sat Jun 04 11:53:15 2011 +0200 @@ -74,6 +74,9 @@ </tr><tr> <td><a href="#HelpAppearancePage.save">save</a></td> <td>Public slot to save the Help Viewers configuration.</td> +</tr><tr> +<td><a href="#HelpAppearancePage.setMode">setMode</a></td> +<td>Public method to perform mode dependent setups.</td> </tr> </table> <a NAME="HelpAppearancePage.__init__" ID="HelpAppearancePage.__init__"></a> @@ -106,7 +109,19 @@ <b>save</b>(<i></i>) <p> Public slot to save the Help Viewers configuration. -</p> +</p><a NAME="HelpAppearancePage.setMode" ID="HelpAppearancePage.setMode"></a> +<h4>HelpAppearancePage.setMode</h4> +<b>setMode</b>(<i>displayMode</i>) +<p> + Public method to perform mode dependent setups. +</p><dl> +<dt><i>displayMode</i></dt> +<dd> +mode of the configuration dialog + (ConfigurationWidget.DefaultMode, ConfigurationWidget.HelpBrowserMode, + ConfigurationWidget.TrayStarterMode) +</dd> +</dl> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> <a NAME="create" ID="create"></a>
--- a/Documentation/Source/eric5.Utilities.__init__.html Fri Jun 03 13:01:16 2011 +0200 +++ b/Documentation/Source/eric5.Utilities.__init__.html Sat Jun 04 11:53:15 2011 +0200 @@ -59,6 +59,9 @@ <td><a href="#decode">decode</a></td> <td>Function to decode some byte text into a string.</td> </tr><tr> +<td><a href="#decodeBytes">decodeBytes</a></td> +<td>Function to decode some byte text into a string.</td> +</tr><tr> <td><a href="#decodeString">decodeString</a></td> <td>Function to decode a string containing Unicode encoded characters.</td> </tr><tr> @@ -426,6 +429,24 @@ </dl> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> +<a NAME="decodeBytes" ID="decodeBytes"></a> +<h2>decodeBytes</h2> +<b>decodeBytes</b>(<i>buffer</i>) +<p> + Function to decode some byte text into a string. +</p><dl> +<dt><i>buffer</i></dt> +<dd> +byte buffer to decode (bytes) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +decoded text (string) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> <a NAME="decodeString" ID="decodeString"></a> <h2>decodeString</h2> <b>decodeString</b>(<i>text</i>)
--- a/Helpviewer/OpenSearch/OpenSearchEngine.py Fri Jun 03 13:01:16 2011 +0200 +++ b/Helpviewer/OpenSearch/OpenSearchEngine.py Sat Jun 04 11:53:15 2011 +0200 @@ -31,20 +31,6 @@ imageChanged = pyqtSignal() suggestions = pyqtSignal(list) - loc = Preferences.getUILanguage() - if loc == "System": - loc = QLocale.system().name() - if loc is None: - _language = "en" - elif loc == "C": - _language = "" - else: - _language = loc[:2] - _language = _language.replace("_", "-") - _country = _language - if "-" in _country: - _country = _country[_county.index["-"] + 1:] - def __init__(self, parent=None): """ Constructor @@ -82,12 +68,16 @@ @param searchTemplate template to be parsed (string) @return parsed template (string) """ + locale = QLocale(Preferences.getHelp("SearchLanguage")) + language = locale.name().split("_")[0] + country = language.lower() + result = searchTemplate result = result.replace("{count}", "20") result = result.replace("{startIndex}", "0") result = result.replace("{startPage}", "0") - result = result.replace("{language}", cls._language) - result = result.replace("{country}", cls._country.lower()) + result = result.replace("{language}", language) + result = result.replace("{country}", country) result = result.replace("{inputEncoding}", "UTF-8") result = result.replace("{outputEncoding}", "UTF-8") result = result.replace("{searchTerms}", @@ -448,7 +438,7 @@ Private slot to receive the suggestions. """ buffer = bytes(self.__suggestionsReply.readAll()) - response = Utilities.decode(buffer)[0] + response = Utilities.decodeBytes(buffer) response = response.strip() self.__suggestionsReply.close()
--- a/Preferences/ConfigurationDialog.py Fri Jun 03 13:01:16 2011 +0200 +++ b/Preferences/ConfigurationDialog.py Sat Jun 04 11:53:15 2011 +0200 @@ -292,9 +292,9 @@ "networkPage": \ [self.trUtf8("Network"), "preferences-network.png", "NetworkPage", None, None], - "pythonPage": \ - [self.trUtf8("Python"), "preferences-python.png", - "PythonPage", None, None], + "printerPage": \ + [self.trUtf8("Printer"), "preferences-printer.png", + "PrinterPage", None, None], "0helpPage": \ [self.trUtf8("Help"), "preferences-help.png", @@ -492,6 +492,10 @@ if page is not None: self.configStack.addWidget(page) pageData[-1] = page + try: + page.setMode(self.displayMode) + except AttributeError: + pass return page def showConfigurationPageByName(self, pageName, setCurrent=True):
--- a/Preferences/ConfigurationPages/HelpAppearancePage.py Fri Jun 03 13:01:16 2011 +0200 +++ b/Preferences/ConfigurationPages/HelpAppearancePage.py Sat Jun 04 11:53:15 2011 +0200 @@ -15,6 +15,8 @@ from .ConfigurationPageBase import ConfigurationPageBase from .Ui_HelpAppearancePage import Ui_HelpAppearancePage +from ..ConfigurationDialog import ConfigurationWidget + import Preferences import Utilities @@ -34,6 +36,7 @@ self.styleSheetCompleter = E5FileCompleter(self.styleSheetEdit) self.helpColours = {} + self.__displayMode = None # set initial values self.standardFont = Preferences.getHelp("StandardFont") @@ -55,6 +58,28 @@ self.autoLoadImagesCheckBox.setChecked(Preferences.getHelp("AutoLoadImages")) self.styleSheetEdit.setText(Preferences.getHelp("UserStyleSheet")) + + self.tabsCloseButtonCheckBox.setChecked(Preferences.getUI("SingleCloseButton")) + + def setMode(self, displayMode): + """ + Public method to perform mode dependent setups. + + @param displayMode mode of the configuration dialog + (ConfigurationWidget.DefaultMode, ConfigurationWidget.HelpBrowserMode, + ConfigurationWidget.TrayStarterMode) + """ + assert displayMode in ( + ConfigurationWidget.DefaultMode, + ConfigurationWidget.HelpBrowserMode, + ConfigurationWidget.TrayStarterMode + ) + + self.__displayMode = displayMode + if self.__displayMode != ConfigurationWidget.HelpBrowserMode: + self.separatorLine.hide() + self.nextStartupNoteLabel.hide() + self.tabsGroupBox.hide() def save(self): """ @@ -70,6 +95,10 @@ for key in list(self.helpColours.keys()): Preferences.setHelp(key, self.helpColours[key]) + + if self.__displayMode == ConfigurationWidget.HelpBrowserMode: + Preferences.setUI("SingleCloseButton", + self.tabsCloseButtonCheckBox.isChecked()) @pyqtSlot() def on_standardFontButton_clicked(self):
--- a/Preferences/ConfigurationPages/HelpAppearancePage.ui Fri Jun 03 13:01:16 2011 +0200 +++ b/Preferences/ConfigurationPages/HelpAppearancePage.ui Sat Jun 04 11:53:15 2011 +0200 @@ -1,89 +1,90 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>HelpAppearancePage</class> - <widget class="QWidget" name="HelpAppearancePage" > - <property name="geometry" > + <widget class="QWidget" name="HelpAppearancePage"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> <width>497</width> - <height>440</height> + <height>458</height> </rect> </property> - <layout class="QVBoxLayout" name="verticalLayout_2" > + <layout class="QVBoxLayout" name="verticalLayout_3"> <item> - <widget class="QLabel" name="headerLabel" > - <property name="text" > - <string><b>Configure help viewer appearance</b></string> + <widget class="QLabel" name="headerLabel"> + <property name="text"> + <string><b>Configure help viewer appearance</b></string> </property> </widget> </item> <item> - <widget class="Line" name="line17" > - <property name="frameShape" > + <widget class="Line" name="line17"> + <property name="frameShape"> <enum>QFrame::HLine</enum> </property> - <property name="frameShadow" > + <property name="frameShadow"> <enum>QFrame::Sunken</enum> </property> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_5" > - <property name="title" > + <widget class="QGroupBox" name="groupBox_5"> + <property name="title"> <string>Fonts</string> </property> - <layout class="QGridLayout" name="gridLayout" > - <item row="0" column="0" > - <widget class="QPushButton" name="standardFontButton" > - <property name="toolTip" > + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QPushButton" name="standardFontButton"> + <property name="toolTip"> <string>Press to select the standard font</string> </property> - <property name="text" > + <property name="text"> <string>Standard Font</string> </property> </widget> </item> - <item row="0" column="1" > - <widget class="QLineEdit" name="standardFontSample" > - <property name="focusPolicy" > + <item row="0" column="1"> + <widget class="QLineEdit" name="standardFontSample"> + <property name="focusPolicy"> <enum>Qt::NoFocus</enum> </property> - <property name="text" > + <property name="text"> <string>Times 16</string> </property> - <property name="alignment" > + <property name="alignment"> <set>Qt::AlignHCenter</set> </property> - <property name="readOnly" > + <property name="readOnly"> <bool>true</bool> </property> </widget> </item> - <item row="1" column="0" > - <widget class="QPushButton" name="fixedFontButton" > - <property name="toolTip" > + <item row="1" column="0"> + <widget class="QPushButton" name="fixedFontButton"> + <property name="toolTip"> <string>Press to select the fixed-width font</string> </property> - <property name="text" > + <property name="text"> <string>Fixed-Width Font</string> </property> </widget> </item> - <item row="1" column="1" > - <widget class="QLineEdit" name="fixedFontSample" > - <property name="focusPolicy" > + <item row="1" column="1"> + <widget class="QLineEdit" name="fixedFontSample"> + <property name="focusPolicy"> <enum>Qt::NoFocus</enum> </property> - <property name="text" > + <property name="text"> <string>Courier 13</string> </property> - <property name="alignment" > + <property name="alignment"> <set>Qt::AlignHCenter</set> </property> - <property name="readOnly" > + <property name="readOnly"> <bool>true</bool> </property> </widget> @@ -92,40 +93,40 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_3" > - <property name="title" > + <widget class="QGroupBox" name="groupBox_3"> + <property name="title"> <string>Colours</string> </property> - <layout class="QGridLayout" name="gridLayout_2" > - <item row="0" column="0" > - <widget class="QLabel" name="textLabel1_3" > - <property name="text" > + <layout class="QGridLayout" name="gridLayout_2"> + <item row="0" column="0"> + <widget class="QLabel" name="textLabel1_3"> + <property name="text"> <string>Background colour of secure URLs:</string> </property> </widget> </item> - <item row="0" column="1" > - <widget class="QPushButton" name="secureURLsColourButton" > - <property name="minimumSize" > + <item row="0" column="1"> + <widget class="QPushButton" name="secureURLsColourButton"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> </size> </property> - <property name="toolTip" > + <property name="toolTip"> <string>Select the background colour for secure URLs.</string> </property> - <property name="text" > + <property name="text"> <string/> </property> </widget> </item> - <item row="0" column="2" > - <spacer name="horizontalSpacer" > - <property name="orientation" > + <item row="0" column="2"> + <spacer name="horizontalSpacer"> + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>141</width> <height>20</height> @@ -137,17 +138,17 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox" > - <property name="title" > + <widget class="QGroupBox" name="groupBox"> + <property name="title"> <string>Images</string> </property> - <layout class="QVBoxLayout" name="verticalLayout" > + <layout class="QVBoxLayout" name="verticalLayout"> <item> - <widget class="QCheckBox" name="autoLoadImagesCheckBox" > - <property name="toolTip" > + <widget class="QCheckBox" name="autoLoadImagesCheckBox"> + <property name="toolTip"> <string>Select to load images</string> </property> - <property name="text" > + <property name="text"> <string>Load images</string> </property> </widget> @@ -156,31 +157,31 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_2" > - <property name="title" > + <widget class="QGroupBox" name="groupBox_2"> + <property name="title"> <string>Style Sheet</string> </property> - <layout class="QHBoxLayout" name="horizontalLayout" > + <layout class="QHBoxLayout" name="horizontalLayout"> <item> - <widget class="QLabel" name="label" > - <property name="text" > + <widget class="QLabel" name="label"> + <property name="text"> <string>User Style Sheet:</string> </property> </widget> </item> <item> - <widget class="QLineEdit" name="styleSheetEdit" > - <property name="toolTip" > + <widget class="QLineEdit" name="styleSheetEdit"> + <property name="toolTip"> <string>Enter the file name of a user style sheet</string> </property> </widget> </item> <item> - <widget class="QPushButton" name="styleSheetButton" > - <property name="toolTip" > + <widget class="QPushButton" name="styleSheetButton"> + <property name="toolTip"> <string>Select the user style sheet via a file selection dialog</string> </property> - <property name="text" > + <property name="text"> <string>...</string> </property> </widget> @@ -189,11 +190,47 @@ </widget> </item> <item> + <widget class="Line" name="separatorLine"> + <property name="frameShape"> + <enum>QFrame::HLine</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Sunken</enum> + </property> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="nextStartupNoteLabel"> + <property name="text"> + <string><font color="#FF0000"><b>Note:</b> All settings below are activated at the next startup of the application.</font></string> + </property> + </widget> + </item> + <item> + <widget class="QGroupBox" name="tabsGroupBox"> + <property name="title"> + <string>Tabs</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <widget class="QCheckBox" name="tabsCloseButtonCheckBox"> + <property name="text"> + <string>Show only one close button instead of one for each tab</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> <spacer> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>479</width> <height>121</height>
--- a/Preferences/ConfigurationPages/HelpWebBrowserPage.py Fri Jun 03 13:01:16 2011 +0200 +++ b/Preferences/ConfigurationPages/HelpWebBrowserPage.py Sat Jun 04 11:53:15 2011 +0200 @@ -7,7 +7,7 @@ Module implementing the Help web browser configuration page. """ -from PyQt4.QtCore import pyqtSlot +from PyQt4.QtCore import pyqtSlot, QLocale from PyQt4.QtWebKit import QWebSettings from PyQt4.QtNetwork import QNetworkRequest @@ -94,8 +94,9 @@ self.homePageEdit.setText( Preferences.getHelp("HomePage")) - self.defaultSchemeCombo.setEditText( - Preferences.getHelp("DefaultScheme")) + self.defaultSchemeCombo.setCurrentIndex( + self.defaultSchemeCombo.findText( + Preferences.getHelp("DefaultScheme"))) historyLimit = Preferences.getHelp("HistoryLimit") idx = 0 @@ -117,6 +118,16 @@ idx = 5 self.expireHistory.setCurrentIndex(idx) + for language in range(2, QLocale.LastLanguage + 1): + if len(QLocale.countriesForLanguage(language)) > 0: + self.languageCombo.addItem(QLocale.languageToString(language), language) + self.languageCombo.model().sort(0) + self.languageCombo.insertSeparator(0) + self.languageCombo.insertItem(0, QLocale.languageToString(0), 0) + index = self.languageCombo.findData(Preferences.getHelp("SearchLanguage")) + if index > -1: + self.languageCombo.setCurrentIndex(index) + def save(self): """ Public slot to save the Help Viewers configuration. @@ -190,6 +201,14 @@ elif idx == 6: historyLimit = -2 Preferences.setHelp("HistoryLimit", historyLimit) + + languageIndex = self.languageCombo.currentIndex() + if languageIndex > -1: + language = self.languageCombo.itemData(languageIndex) + else: + # fall back to system default + language = QLocale.system().language() + Preferences.setHelp("SearchLanguage", language) @pyqtSlot() def on_setCurrentPageButton_clicked(self):
--- a/Preferences/ConfigurationPages/HelpWebBrowserPage.ui Fri Jun 03 13:01:16 2011 +0200 +++ b/Preferences/ConfigurationPages/HelpWebBrowserPage.ui Sat Jun 04 11:53:15 2011 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>613</width> - <height>982</height> + <height>1021</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_4"> @@ -447,6 +447,45 @@ </widget> </item> <item> + <widget class="QGroupBox" name="groupBox_5"> + <property name="title"> + <string>Web Search</string> + </property> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <item> + <widget class="QLabel" name="label_5"> + <property name="text"> + <string>Language:</string> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="languageCombo"> + <property name="toolTip"> + <string>Select the language to be used for web searches</string> + </property> + <property name="sizeAdjustPolicy"> + <enum>QComboBox::AdjustToContents</enum> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer_3"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>450</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + </item> + <item> <widget class="QGroupBox" name="printGroup"> <property name="title"> <string>Printing</string> @@ -504,6 +543,7 @@ <tabstop>cachePreferButton</tabstop> <tabstop>cacheOfflineButton</tabstop> <tabstop>cacheSizeSpinBox</tabstop> + <tabstop>languageCombo</tabstop> <tabstop>printBackgroundsCheckBox</tabstop> </tabstops> <resources/>
--- a/Preferences/__init__.py Fri Jun 03 13:01:16 2011 +0200 +++ b/Preferences/__init__.py Sat Jun 04 11:53:15 2011 +0200 @@ -633,6 +633,7 @@ "VirusTotalEnabled": False, "VirusTotalServiceKey": "", "VirusTotalSecure": False, + "SearchLanguage": QtCore.QLocale().language(), } websettings = QWebSettings.globalSettings() @@ -1931,7 +1932,8 @@ elif key in ["HelpViewerType", "DiskCacheSize", "AcceptCookies", "KeepCookiesUntil", "StartupBehavior", "HistoryLimit", "OfflineStorageDatabaseQuota", "OfflineWebApplicationCacheQuota", - "CachePolicy", "DownloadManagerRemovePolicy"]: + "CachePolicy", "DownloadManagerRemovePolicy", + "SearchLanguage"]: return int(prefClass.settings.value("Help/" + key, prefClass.helpDefaults[key])) elif key in ["SingleHelpWindow", "SaveGeometry", "WebSearchSuggestions",
--- a/Utilities/__init__.py Fri Jun 03 13:01:16 2011 +0200 +++ b/Utilities/__init__.py Sat Jun 04 11:53:15 2011 +0200 @@ -331,26 +331,48 @@ buf += bytes(text[index], encoding="ascii") index += 1 buf = buf.replace(b"\x00", b"") + return decodeBytes(buf) + +def decodeBytes(buffer): + """ + Function to decode some byte text into a string. + + @param buffer byte buffer to decode (bytes) + @return decoded text (string) + """ + # try UTF with BOM + try: + if buffer.startswith(BOM_UTF8): + # UTF-8 with BOM + return str(buffer[len(BOM_UTF8):], encoding='utf-8') + elif buffer.startswith(BOM_UTF16): + # UTF-16 with BOM + return str(buffer[len(BOM_UTF16):], encoding='utf-16') + elif buffer.startswith(BOM_UTF32): + # UTF-32 with BOM + return str(buffer[len(BOM_UTF32):], encoding='utf-32') + except (UnicodeError, LookupError): + pass # try UTF-8 try: - return str(buf, encoding="utf-8") + return str(buffer, encoding="utf-8") except UnicodeError: pass # try codec detection try: import ThirdParty.CharDet.chardet - guess = ThirdParty.CharDet.chardet.detect(buf) + guess = ThirdParty.CharDet.chardet.detect(buffer) if guess and guess['encoding'] is not None: codec = guess['encoding'].lower() - return str(buf, codec) + return str(buffer, encoding=codec) except (UnicodeError, LookupError): pass except ImportError: pass - return str(text, "utf-8", "ignore") + return str(buffer, encoding="utf-8", errors="ignore") _escape = re.compile("[&<>\"\u0080-\uffff]")
--- a/changelog Fri Jun 03 13:01:16 2011 +0200 +++ b/changelog Sat Jun 04 11:53:15 2011 +0200 @@ -13,6 +13,7 @@ - added function to test the login data to the Email config page - added a pause button to the web browser download - added some more user agent strings to the web browser +- added some more search engines to the web browser Version 5.2-snapshot-20110501: - bug fixes
--- a/i18n/eric5_cs.ts Fri Jun 03 13:01:16 2011 +0200 +++ b/i18n/eric5_cs.ts Sat Jun 04 11:53:15 2011 +0200 @@ -1823,7 +1823,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="194"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="195"/> <source>Bookmarks</source> <translation type="unfinished">Záložky</translation> </message> @@ -2893,12 +2893,12 @@ <translation>Plugin Manažer</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="133"/> + <location filename="Preferences/ConfigurationDialog.py" line="296"/> <source>Printer</source> <translation>Tiskárna</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="296"/> + <location filename="Preferences/ConfigurationDialog.py" line="170"/> <source>Python</source> <translation>Python</translation> </message> @@ -5765,22 +5765,22 @@ <context> <name>DownloadItem</name> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="20"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="26"/> <source>Icon</source> <translation type="unfinished">Ikona</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="35"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="41"/> <source>Filename</source> <translation type="unfinished">Jméno souboru</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="57"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="63"/> <source>Info</source> <translation type="unfinished">Info</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="72"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="78"/> <source>Press to repeat the download</source> <translation type="unfinished"></translation> </message> @@ -5790,12 +5790,12 @@ <translation type="obsolete">...</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="95"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="101"/> <source>Press to cancel the download</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="105"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="111"/> <source>Press to open the downloaded file</source> <translation type="unfinished"></translation> </message> @@ -5810,65 +5810,73 @@ <translation type="obsolete"><p>Chystáte se stáhnout soubor <b>{0}</b>.</p><p>Co chcete udělat?</p></translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="203"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="206"/> <source>Download canceled: {0}</source> <translation type="unfinished">Download zrušen: {0}</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="193"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="196"/> <source>Save File</source> <translation type="unfinished">Uložit soubor</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="222"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="225"/> <source>Download directory ({0}) couldn't be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="390"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="395"/> <source>Error opening save file: {0}</source> <translation type="unfinished">Chyba při otvírání uloženého souboru: {0}</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="399"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="407"/> <source>Error saving: {0}</source> <translation type="unfinished">Chyba při ukládání: {0}</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="411"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="419"/> <source>Network Error: {0}</source> <translation type="unfinished">Chyba sítě: {0}</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="519"/> - <source>{0} of {1} ({2}/sec) - {3}</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="520"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="528"/> <source>?</source> <translation type="unfinished">?</translation> </message> <message> <location filename="Helpviewer/Download/DownloadItem.py" line="528"/> <source>{0} downloaded</source> - <translation type="unfinished">{0} staženo</translation> - </message> - <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="531"/> + <translation type="obsolete">{0} staženo</translation> + </message> + <message> + <location filename="Helpviewer/Download/DownloadItem.py" line="541"/> <source>{0} of {1} - Stopped</source> <translation type="unfinished">{0} z {1} - zastaveno</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="181"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="184"/> <source>VirusTotal scan scheduled: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="82"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="88"/> <source>Press to pause the download</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/Download/DownloadItem.py" line="527"/> + <source>{0} of {1} ({2}/sec) +{3}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Download/DownloadItem.py" line="536"/> + <source>{0} downloaded +SHA1: {1} +MD5: {2}</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>DownloadManager</name> @@ -11685,12 +11693,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="81"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="82"/> <source>Fetch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="81"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="82"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Projekt bude znovu načten. Má se provést?</translation> </message> @@ -12547,7 +12555,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="98"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="99"/> <source>GPG</source> <translation type="unfinished"></translation> </message> @@ -12573,105 +12581,120 @@ <context> <name>HelpAppearancePage</name> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="16"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="17"/> <source><b>Configure help viewer appearance</b></source> <translation><b>Konfigurace vzhledu prohlížeče nápovědy</b></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="36"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="37"/> <source>Fonts</source> <translation>Fonty</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="42"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="43"/> <source>Press to select the standard font</source> <translation>Stisknout pro výběr standardního fontu</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="45"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="46"/> <source>Standard Font</source> <translation>Standardní font</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="55"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="56"/> <source>Times 16</source> <translation></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="68"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="69"/> <source>Press to select the fixed-width font</source> <translation>Stisknout pro výběr fontu pevné šířky</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="71"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="72"/> <source>Fixed-Width Font</source> <translation>Font pevné šířky</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="81"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="82"/> <source>Courier 13</source> <translation></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="142"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="143"/> <source>Images</source> <translation>Obrázky</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="148"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="149"/> <source>Select to load images</source> <translation>Vybrat pro nahrání obrázků</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="151"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="152"/> <source>Load images</source> <translation>Nahrát obrázky</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="161"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="162"/> <source>Style Sheet</source> <translation>Sada stylů</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="167"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="168"/> <source>User Style Sheet:</source> <translation>Uživatelský list stylů:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="174"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="175"/> <source>Enter the file name of a user style sheet</source> <translation>Zadejte jméno souboru uživatelských stylů</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="181"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="182"/> <source>Select the user style sheet via a file selection dialog</source> <translation>Vybrat uživatelské styly přes dialog výběru souborů</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="184"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="185"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.py" line="104"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.py" line="133"/> <source>Select Style Sheet</source> <translation>Vybrat sadu stylů</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="97"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="98"/> <source>Colours</source> <translation>Barvy</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="103"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="104"/> <source>Background colour of secure URLs:</source> <translation>Barva pozadí pro bezpečné URL:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="116"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="117"/> <source>Select the background colour for secure URLs.</source> <translation>Vybrat barvu pozadí pro bezpečné URL.</translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="208"/> + <source><font color="#FF0000"><b>Note:</b> All settings below are activated at the next startup of the application.</font></source> + <translation type="unfinished"><font color="#FF0000"><b>Poznámka:</b> Tato nastavení budou aktivována až po novém spuštění aplikace.</font></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="215"/> + <source>Tabs</source> + <translation type="unfinished">Taby</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="221"/> + <source>Show only one close button instead of one for each tab</source> + <translation type="unfinished">Zobrazit pouze jedno tlačítko Zavřít místo jednoho v každém tabu</translation> + </message> </context> <context> <name>HelpBrowser</name> @@ -13637,17 +13660,17 @@ <translation> MB</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="452"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="491"/> <source>Printing</source> <translation>Tisk</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="458"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="497"/> <source>Select to print background colours and images</source> <translation>Vybrat pro tisk barev pozadí a obrázků</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="461"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="500"/> <source>Print background colours and images</source> <translation>Tisknout barvy pozadí a obrázky</translation> </message> @@ -13856,6 +13879,21 @@ <source>Enable access keys</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="452"/> + <source>Web Search</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="458"/> + <source>Language:</source> + <translation type="unfinished">Jazyk:</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="465"/> + <source>Select the language to be used for web searches</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HelpWebPage</name> @@ -19478,132 +19516,132 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="239"/> <source>Select to specify a revision by number</source> <translation type="unfinished">Vybrat pro zadání revize číslem</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="225"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="242"/> <source>Number</source> <translation type="unfinished">Číslo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="235"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="252"/> <source>Enter a revision number</source> <translation type="unfinished">Zadejte číslo revize</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="264"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="281"/> <source>Select to specify a revision by changeset id</source> <translation type="unfinished">Vybrat pro zadání revize přes id množiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="267"/> - <source>Id:</source> - <translation type="unfinished">Id:</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="277"/> - <source>Enter a changeset id</source> - <translation type="unfinished">Zadejte id množiny změn</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="284"/> + <source>Id:</source> + <translation type="unfinished">Id:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="294"/> + <source>Enter a changeset id</source> + <translation type="unfinished">Zadejte id množiny změn</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="301"/> <source>Select to specify a revision by a tag</source> <translation type="unfinished">Vybrat pro specifikaci revize tagem</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="304"/> <source>Tag:</source> <translation type="unfinished">Tag:</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="297"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="314"/> <source>Enter a tag name</source> <translation type="unfinished">Zadejte jméno tagu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="307"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="324"/> <source>Select to specify a revision by a branch</source> <translation type="unfinished">Vybrat pro specifikaci revize přes větev</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="310"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="327"/> <source>Branch:</source> <translation type="unfinished">Větev:</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="320"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="337"/> <source>Enter a branch name</source> <translation type="unfinished">Zadejte jméno větve</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="330"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="347"/> <source>Select to specify a revision by a bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="333"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="350"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="349"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="366"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="216"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="233"/> <source>&Destination Revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="359"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="376"/> <source>Select tip revision of repository</source> <translation type="unfinished">Vybrat poslední revizi (tip) v repozitáři</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="362"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="379"/> <source>TIP</source> <translation type="unfinished">TIP</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="375"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="392"/> <source>Select to collapse the rebased changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="378"/> - <source>Collapse Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="385"/> - <source>Select to keep the original changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="388"/> - <source>Keep Original Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="395"/> + <source>Collapse Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="402"/> + <source>Select to keep the original changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="405"/> + <source>Keep Original Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="412"/> <source>Select to keep the original branch names</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="398"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="415"/> <source>Keep Original Branch Name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="418"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="422"/> <source>Select to detach the source from its original branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="421"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="425"/> <source>Detach Source</source> <translation type="unfinished"></translation> </message> @@ -25590,7 +25628,7 @@ <context> <name>OpenSearchEngineModel</name> <message> - <location filename="Helpviewer/OpenSearch/OpenSearchEngineModel.py" line="135"/> + <location filename="Helpviewer/OpenSearch/OpenSearchEngineModel.py" line="136"/> <source><strong>Provides contextual suggestions</strong></source> <translation><strong>Poskytuje kontextové návrhy</strong></translation> </message> @@ -26908,17 +26946,17 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="936"/> + <location filename="Preferences/__init__.py" line="937"/> <source>Export Preferences</source> <translation>Předvolby exportu</translation> </message> <message> - <location filename="Preferences/__init__.py" line="963"/> + <location filename="Preferences/__init__.py" line="964"/> <source>Import Preferences</source> <translation>Předvolby importu</translation> </message> <message> - <location filename="Preferences/__init__.py" line="963"/> + <location filename="Preferences/__init__.py" line="964"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> @@ -30074,7 +30112,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="123"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="124"/> <source>Purge</source> <translation type="unfinished"></translation> </message> @@ -32856,7 +32894,7 @@ <context> <name>RebaseProjectHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="107"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="108"/> <source>Rebase Changesets</source> <translation type="unfinished"></translation> </message> @@ -32901,22 +32939,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="98"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="99"/> <source>Rebase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="135"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="136"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Projekt bude znovu načten. Má se provést?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="121"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="122"/> <source>Rebase Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="135"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="136"/> <source>Rebase Changesets (Abort)</source> <translation type="unfinished"></translation> </message> @@ -41908,7 +41946,7 @@ <context> <name>TransplantProjectHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="93"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="94"/> <source>Transplant Changesets</source> <translation type="unfinished"></translation> </message> @@ -41933,17 +41971,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="84"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="85"/> <source>Transplant</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="107"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="108"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Projekt bude znovu načten. Má se provést?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="107"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="108"/> <source>Transplant Changesets (Continue)</source> <translation type="unfinished"></translation> </message> @@ -42878,35 +42916,40 @@ <context> <name>UserAgentMenu</name> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="43"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="45"/> <source>Default</source> <translation type="unfinished">Výchozí</translation> </message> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="55"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="59"/> <source>Other...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="78"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="76"/> <source>Custom user agent</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="78"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="76"/> <source>User agent:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="123"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="147"/> <source>Parsing default user agents</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="123"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="147"/> <source><p>Error parsing default user agents.</p><p>{0}</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="136"/> + <source>Various</source> + <translation type="unfinished">Různé</translation> + </message> </context> <context> <name>UserInterface</name> @@ -44893,17 +44936,17 @@ <context> <name>Utilities</name> <message> - <location filename="Utilities/__init__.py" line="1001"/> + <location filename="Utilities/__init__.py" line="1023"/> <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="1187"/> + <location filename="Utilities/__init__.py" line="1209"/> <source>Python2 interpreter not configured.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Utilities/__init__.py" line="1233"/> + <location filename="Utilities/__init__.py" line="1255"/> <source>Python2 interpreter did not finish within 30s.</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_de.ts Fri Jun 03 13:01:16 2011 +0200 +++ b/i18n/eric5_de.ts Sat Jun 04 11:53:15 2011 +0200 @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="de"> +<!DOCTYPE TS><TS version="2.0" language="de" sourcelanguage=""> <context> <name>AboutDialog</name> <message> @@ -1641,8 +1640,8 @@ </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="140"/> - <source>Open in New &Tab Ctrl+LMB</source> - <translation>In neuem &Register öffnen Strg+LMK</translation> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>In neuem &Register öffnen<byte value="x9"/>Strg+LMK</translation> </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="146"/> @@ -1826,7 +1825,7 @@ <translation><b>Lesezeichen hochladen</b><p>Dies lädt ein Lesezeichen vom lokalen Repository an ein entferntes Repository hoch.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="194"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="195"/> <source>Bookmarks</source> <translation>Lesezeichen</translation> </message> @@ -1860,7 +1859,7 @@ </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksToolBar.py" line="73"/> - <source>Open in New &Tab Ctrl+LMB</source> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> <translation>In neuem &Register öffnen\tStrg+LMK</translation> </message> </context> @@ -2889,12 +2888,12 @@ <translation>Plugin Manager</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="133"/> + <location filename="Preferences/ConfigurationDialog.py" line="296"/> <source>Printer</source> <translation>Drucker</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="296"/> + <location filename="Preferences/ConfigurationDialog.py" line="170"/> <source>Python</source> <translation>Python</translation> </message> @@ -5669,100 +5668,101 @@ <context> <name>DownloadItem</name> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="20"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="26"/> <source>Icon</source> <translation>Symbol</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="35"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="41"/> <source>Filename</source> <translation>Dateiname</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="57"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="63"/> <source>Info</source> <translation>Info</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="72"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="78"/> <source>Press to repeat the download</source> <translation>Drücken, um den Download zu wiederholen</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="98"/> - <source>...</source> - <translation type="obsolete">...</translation> - </message> - <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="95"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="101"/> <source>Press to cancel the download</source> <translation>Drücken, um den Download abzubrechen</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="105"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="111"/> <source>Press to open the downloaded file</source> <translation>Drücken, um die geladenen Datei zu öffnen</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="203"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="206"/> <source>Download canceled: {0}</source> <translation>Download abgebrochen: {0}</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="193"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="196"/> <source>Save File</source> <translation>Datei speichern</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="222"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="225"/> <source>Download directory ({0}) couldn't be created.</source> <translation>Das Downloadverzeichnis ({0}) konnte nicht erzeugt werden.</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="390"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="395"/> <source>Error opening save file: {0}</source> <translation>Fehler beim Öffnen der zu speichernden Datei: {0}</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="399"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="407"/> <source>Error saving: {0}</source> <translation>Fehler beim Speichern: {0}</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="411"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="419"/> <source>Network Error: {0}</source> <translation>Netzwerkfehler: {0}</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="519"/> - <source>{0} of {1} ({2}/sec) - {3}</source> - <translation>{0} von {1} ({2}/s) - {3}</translation> - </message> - <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="520"/> - <source>?</source> - <translation>?</translation> - </message> - <message> <location filename="Helpviewer/Download/DownloadItem.py" line="528"/> - <source>{0} downloaded</source> - <translation>{0} heruntergeladen</translation> - </message> - <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="531"/> + <source>?</source> + <translation>?</translation> + </message> + <message> + <location filename="Helpviewer/Download/DownloadItem.py" line="541"/> <source>{0} of {1} - Stopped</source> <translation>{0} von {1} - Angehalten</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="181"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="184"/> <source>VirusTotal scan scheduled: {0}</source> <translation>Prüfung mit VirusTotal beauftragt: {0}</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="82"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="88"/> <source>Press to pause the download</source> <translation>Drücken, um den Download zu pausieren</translation> </message> + <message> + <location filename="Helpviewer/Download/DownloadItem.py" line="527"/> + <source>{0} of {1} ({2}/sec) +{3}</source> + <translation>{0} von {1} ({2}/s) +{3}</translation> + </message> + <message> + <location filename="Helpviewer/Download/DownloadItem.py" line="536"/> + <source>{0} downloaded +SHA1: {1} +MD5: {2}</source> + <translation>{0} heruntergeladen +SHA1: {1} +MD5: {2}</translation> + </message> </context> <context> <name>DownloadManager</name> @@ -11507,12 +11507,12 @@ <translation><b>Änderungen herunterladen</b><p>Dies lädt Änderungen von einem entfernten Repository in das lokale Repository herunter. Wenn die heruntergeladenen Änderungen einen neuen Kopf erzeugen, so werden die Köpfe automatisch zusammengeführt und das Ergebnis eingepflegt. Abschließend wird das Arbeitsverzeichnis mit den neuen Änderungen aktualisiert.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="81"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="82"/> <source>Fetch</source> <translation>Fetch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="81"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="82"/> <source>The project should be reread. Do this now?</source> <translation>Das Projekt sollte neu gelesen werde. Jetzt durchführen?</translation> </message> @@ -12370,7 +12370,7 @@ <translation><b>Revision signieren</b><p>Dies fügt einer ausgewählten Revision eine Signatur hinzu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="98"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="99"/> <source>GPG</source> <translation>GPG</translation> </message> @@ -12396,105 +12396,120 @@ <context> <name>HelpAppearancePage</name> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="16"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="17"/> <source><b>Configure help viewer appearance</b></source> <translation><b>Erscheinung der Hilfeanzeige einstellen</b></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="36"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="37"/> <source>Fonts</source> <translation>Schriftarten</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="42"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="43"/> <source>Press to select the standard font</source> <translation>Drücken, um die Standardschriftart auszuwählen</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="45"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="46"/> <source>Standard Font</source> <translation>Standard Schrift</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="55"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="56"/> <source>Times 16</source> <translation>Times 16</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="68"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="69"/> <source>Press to select the fixed-width font</source> <translation>Drücken, um die Schriftart fester Breite auszuwählen</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="71"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="72"/> <source>Fixed-Width Font</source> <translation>Schriftart fester Breite</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="81"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="82"/> <source>Courier 13</source> <translation>Courier 13</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="142"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="143"/> <source>Images</source> <translation>Grafiken</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="148"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="149"/> <source>Select to load images</source> <translation>Auswählen, um Grafiken zu laden</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="151"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="152"/> <source>Load images</source> <translation>Grafiken laden</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="161"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="162"/> <source>Style Sheet</source> <translation>Style Sheet</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="167"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="168"/> <source>User Style Sheet:</source> <translation>Benutzer Style Sheet:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="174"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="175"/> <source>Enter the file name of a user style sheet</source> <translation>Gib den Namen einer Benutzer Style Sheet Datei ein</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="181"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="182"/> <source>Select the user style sheet via a file selection dialog</source> <translation>Wähle ein Benutzer Style Sheet mittels eines Dateiauswahldialoges</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="184"/> - <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.py" line="104"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="185"/> + <source>...</source> + <translation>...</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.py" line="133"/> <source>Select Style Sheet</source> <translation>Wähle Style Sheet</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="97"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="98"/> <source>Colours</source> <translation>Farben</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="103"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="104"/> <source>Background colour of secure URLs:</source> <translation>Hintergrundfarbe für sichere URLs:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="116"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="117"/> <source>Select the background colour for secure URLs.</source> <translation>Wähle die Hintergrundfarbe für sichere URLs.</translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="208"/> + <source><font color="#FF0000"><b>Note:</b> All settings below are activated at the next startup of the application.</font></source> + <translation><font color="#FF0000"><b>Hinweis:</b> Alle folgenden Einstellungen werden erst beim nächsten Programmstart aktiv.</font></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="215"/> + <source>Tabs</source> + <translation>Tabs</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="221"/> + <source>Show only one close button instead of one for each tab</source> + <translation>Nur einen Schließen-Knopf anzeigen anstelle von einem pro Tab</translation> + </message> </context> <context> <name>HelpBrowser</name> @@ -12505,7 +12520,7 @@ </message> <message> <location filename="Helpviewer/HelpBrowserWV.py" line="799"/> - <source>Open Link in New Tab Ctrl+LMB</source> + <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> <translation>Link in neuem Fenster öffnen\tStrg+LMK</translation> </message> <message> @@ -13436,17 +13451,17 @@ <translation>MB</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="452"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="491"/> <source>Printing</source> <translation>Drucken</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="458"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="497"/> <source>Select to print background colours and images</source> <translation>Auswählen, um Hintergrundfarben und -bilder zu drucken</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="461"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="500"/> <source>Print background colours and images</source> <translation>Hintergrundfarben und -bilder drucken</translation> </message> @@ -13655,6 +13670,21 @@ <source>Enable access keys</source> <translation>Auswahlmarken aktivieren</translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="452"/> + <source>Web Search</source> + <translation>Online Suche</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="458"/> + <source>Language:</source> + <translation>Sprache:</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="465"/> + <source>Select the language to be used for web searches</source> + <translation>Wähle die für die Online Suche zu verwendende Sprache</translation> + </message> </context> <context> <name>HelpWebPage</name> @@ -19183,132 +19213,132 @@ <translation>&Revision</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="239"/> <source>Select to specify a revision by number</source> <translation>Auswählen, um eine Revision per Nummer zu wählen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="225"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="242"/> <source>Number</source> <translation>Nummer</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="235"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="252"/> <source>Enter a revision number</source> <translation>Gib eine Revisionsnummer ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="264"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="281"/> <source>Select to specify a revision by changeset id</source> <translation>Auswählen, um eine Revision mit ihrer Änderungssatz ID anzugeben</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="267"/> - <source>Id:</source> - <translation>Id:</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="277"/> - <source>Enter a changeset id</source> - <translation>Gib die Änderungssatz ID ein</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="284"/> + <source>Id:</source> + <translation>Id:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="294"/> + <source>Enter a changeset id</source> + <translation>Gib die Änderungssatz ID ein</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="301"/> <source>Select to specify a revision by a tag</source> <translation>Auswählen, um eine Revision per Marke zu wählen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="304"/> <source>Tag:</source> <translation>Marke:</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="297"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="314"/> <source>Enter a tag name</source> <translation>Gib den Namen der Marke ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="307"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="324"/> <source>Select to specify a revision by a branch</source> <translation>Auswählen, um eine Revision per Zweig zu wählen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="310"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="327"/> <source>Branch:</source> <translation>Zweig:</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="320"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="337"/> <source>Enter a branch name</source> <translation>Gib einen Zweignamen ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="330"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="347"/> <source>Select to specify a revision by a bookmark</source> <translation>Auswählen, um eine Revision per Lesezeichen zu wählen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="333"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="350"/> <source>Bookmark:</source> <translation>Lesezeichen:</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="349"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="366"/> <source>Enter a bookmark name</source> <translation>Gib einen Lesezeichennamen ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="216"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="233"/> <source>&Destination Revision</source> <translation>&Zielrevision</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="359"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="376"/> <source>Select tip revision of repository</source> <translation>Wähle neueste Revision des Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="362"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="379"/> <source>TIP</source> <translation>TIP</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="375"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="392"/> <source>Select to collapse the rebased changesets</source> <translation>Auswählen, um die umgruppierten Änderungssätze zusammenzufassen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="378"/> - <source>Collapse Changesets</source> - <translation>Änderungssätze zusammenfassen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="385"/> - <source>Select to keep the original changesets</source> - <translation>Auswählen, um die originalen Änderungssätze zu behalten</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="388"/> - <source>Keep Original Changesets</source> - <translation>Originale Änderungssätze behalten</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="395"/> + <source>Collapse Changesets</source> + <translation>Änderungssätze zusammenfassen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="402"/> + <source>Select to keep the original changesets</source> + <translation>Auswählen, um die originalen Änderungssätze zu behalten</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="405"/> + <source>Keep Original Changesets</source> + <translation>Originale Änderungssätze behalten</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="412"/> <source>Select to keep the original branch names</source> <translation>Auswählen, um die originalen Zweignamen zu behalten</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="398"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="415"/> <source>Keep Original Branch Name</source> <translation>Originale Zweignamen behalten</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="418"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="422"/> <source>Select to detach the source from its original branch</source> <translation>Auswählen, um die Quelle vom originalen Zweig zu trennen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="421"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="425"/> <source>Detach Source</source> <translation>Quelle trennen</translation> </message> @@ -25126,7 +25156,7 @@ <translation><strong>Beschreibung:</strong> {0}</translation> </message> <message> - <location filename="Helpviewer/OpenSearch/OpenSearchEngineModel.py" line="135"/> + <location filename="Helpviewer/OpenSearch/OpenSearchEngineModel.py" line="136"/> <source><strong>Provides contextual suggestions</strong></source> <translation><strong>Unterstützt Kontext sensitive Vorschläge</strong></translation> </message> @@ -26438,17 +26468,17 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="936"/> + <location filename="Preferences/__init__.py" line="937"/> <source>Export Preferences</source> <translation>Konfiguration exportieren</translation> </message> <message> - <location filename="Preferences/__init__.py" line="963"/> + <location filename="Preferences/__init__.py" line="964"/> <source>Import Preferences</source> <translation>Konfiguration importieren</translation> </message> <message> - <location filename="Preferences/__init__.py" line="963"/> + <location filename="Preferences/__init__.py" line="964"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>Properties Dateien (*.ini);;Alle Dateien (*)</translation> </message> @@ -29505,7 +29535,7 @@ <translation>Liste Dateien und Verzeichnisse, die Mercurial nicht bekannt sind, inklusive ignorierter Dateien auf</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="123"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="124"/> <source>Purge</source> <translation>Purge</translation> </message> @@ -32318,7 +32348,7 @@ <context> <name>RebaseProjectHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="107"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="108"/> <source>Rebase Changesets</source> <translation>Änderungssätze umgruppieren</translation> </message> @@ -32363,22 +32393,22 @@ <translation><b>Umgruppierungssitzung abbrechen</b><p>Dies bricht die letzte Umgruppierungssitzung ab.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="98"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="99"/> <source>Rebase</source> <translation>Umgruppieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="135"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="136"/> <source>The project should be reread. Do this now?</source> <translation>Das Projekt sollte neu gelesen werde. Jetzt durchführen?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="121"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="122"/> <source>Rebase Changesets (Continue)</source> <translation>Änderungssätze umgruppieren (Fortsetzung)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="135"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="136"/> <source>Rebase Changesets (Abort)</source> <translation>Änderungssätze umgruppieren (Abbruch)</translation> </message> @@ -41400,7 +41430,7 @@ <context> <name>TransplantProjectHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="93"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="94"/> <source>Transplant Changesets</source> <translation>Änderungssätze transplantieren</translation> </message> @@ -41420,17 +41450,17 @@ <translation>Setzt die letzte Transplantationssitzung nach Reparatur fort</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="84"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="85"/> <source>Transplant</source> <translation>Transplantation</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="107"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="108"/> <source>The project should be reread. Do this now?</source> <translation>Das Projekt sollte neu gelesen werde. Jetzt durchführen?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="107"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="108"/> <source>Transplant Changesets (Continue)</source> <translation>Änderungssätze transplantieren (Fortsetzung)</translation> </message> @@ -42363,35 +42393,40 @@ <context> <name>UserAgentMenu</name> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="43"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="45"/> <source>Default</source> <translation>Standard</translation> </message> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="55"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="59"/> <source>Other...</source> <translation>Anderer...</translation> </message> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="78"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="76"/> <source>Custom user agent</source> <translation>Spezieller User Agent</translation> </message> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="78"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="76"/> <source>User agent:</source> <translation>User Agent:</translation> </message> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="123"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="147"/> <source>Parsing default user agents</source> <translation>Parsen der standard User Agenten</translation> </message> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="123"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="147"/> <source><p>Error parsing default user agents.</p><p>{0}</p></source> <translation><p>Fehler beim Parsen der standard User Agenten.</p><p>{0}</p></translation> </message> + <message> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="136"/> + <source>Various</source> + <translation>Verschiedenes</translation> + </message> </context> <context> <name>UserInterface</name> @@ -44335,17 +44370,17 @@ <context> <name>Utilities</name> <message> - <location filename="Utilities/__init__.py" line="1001"/> + <location filename="Utilities/__init__.py" line="1023"/> <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="1187"/> + <location filename="Utilities/__init__.py" line="1209"/> <source>Python2 interpreter not configured.</source> <translation>Kein Python2 Interpreter konfiguriert.</translation> </message> <message> - <location filename="Utilities/__init__.py" line="1233"/> + <location filename="Utilities/__init__.py" line="1255"/> <source>Python2 interpreter did not finish within 30s.</source> <translation>Python2 Interpreter wurde nicht innerhalb von 30s beendet.</translation> </message>
--- a/i18n/eric5_en.ts Fri Jun 03 13:01:16 2011 +0200 +++ b/i18n/eric5_en.ts Sat Jun 04 11:53:15 2011 +0200 @@ -1797,7 +1797,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="194"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="195"/> <source>Bookmarks</source> <translation type="unfinished"></translation> </message> @@ -2863,12 +2863,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="133"/> + <location filename="Preferences/ConfigurationDialog.py" line="296"/> <source>Printer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="296"/> + <location filename="Preferences/ConfigurationDialog.py" line="170"/> <source>Python</source> <translation type="unfinished"></translation> </message> @@ -5615,95 +5615,98 @@ <context> <name>DownloadItem</name> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="20"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="26"/> <source>Icon</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="35"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="41"/> <source>Filename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="57"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="63"/> <source>Info</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="72"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="78"/> <source>Press to repeat the download</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="95"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="101"/> <source>Press to cancel the download</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="105"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="111"/> <source>Press to open the downloaded file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="203"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="206"/> <source>Download canceled: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="193"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="196"/> <source>Save File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="222"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="225"/> <source>Download directory ({0}) couldn't be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="390"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="395"/> <source>Error opening save file: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="399"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="407"/> <source>Error saving: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="411"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="419"/> <source>Network Error: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="519"/> - <source>{0} of {1} ({2}/sec) - {3}</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="520"/> - <source>?</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Helpviewer/Download/DownloadItem.py" line="528"/> - <source>{0} downloaded</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="531"/> + <source>?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Download/DownloadItem.py" line="541"/> <source>{0} of {1} - Stopped</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="181"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="184"/> <source>VirusTotal scan scheduled: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="82"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="88"/> <source>Press to pause the download</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/Download/DownloadItem.py" line="527"/> + <source>{0} of {1} ({2}/sec) +{3}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Download/DownloadItem.py" line="536"/> + <source>{0} downloaded +SHA1: {1} +MD5: {2}</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>DownloadManager</name> @@ -11423,12 +11426,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="81"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="82"/> <source>Fetch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="81"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="82"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -12284,7 +12287,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="98"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="99"/> <source>GPG</source> <translation type="unfinished"></translation> </message> @@ -12310,105 +12313,120 @@ <context> <name>HelpAppearancePage</name> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="16"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="17"/> <source><b>Configure help viewer appearance</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="36"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="37"/> <source>Fonts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="42"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="43"/> <source>Press to select the standard font</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="45"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="46"/> <source>Standard Font</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="55"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="56"/> <source>Times 16</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="68"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="69"/> <source>Press to select the fixed-width font</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="71"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="72"/> <source>Fixed-Width Font</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="81"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="82"/> <source>Courier 13</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="97"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="98"/> <source>Colours</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="103"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="104"/> <source>Background colour of secure URLs:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="116"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="117"/> <source>Select the background colour for secure URLs.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="142"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="143"/> <source>Images</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="148"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="149"/> <source>Select to load images</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="151"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="152"/> <source>Load images</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="161"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="162"/> <source>Style Sheet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="167"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="168"/> <source>User Style Sheet:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="174"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="175"/> <source>Enter the file name of a user style sheet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="181"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="182"/> <source>Select the user style sheet via a file selection dialog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="184"/> - <source>...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.py" line="104"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="185"/> + <source>...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.py" line="133"/> <source>Select Style Sheet</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="208"/> + <source><font color="#FF0000"><b>Note:</b> All settings below are activated at the next startup of the application.</font></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="215"/> + <source>Tabs</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="221"/> + <source>Show only one close button instead of one for each tab</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HelpBrowser</name> @@ -13545,17 +13563,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="452"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="491"/> <source>Printing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="458"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="497"/> <source>Select to print background colours and images</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="461"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="500"/> <source>Print background colours and images</source> <translation type="unfinished"></translation> </message> @@ -13569,6 +13587,21 @@ <source>Enable access keys</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="452"/> + <source>Web Search</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="458"/> + <source>Language:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="465"/> + <source>Select the language to be used for web searches</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HelpWebPage</name> @@ -19067,132 +19100,132 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="239"/> <source>Select to specify a revision by number</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="225"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="242"/> <source>Number</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="235"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="252"/> <source>Enter a revision number</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="264"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="281"/> <source>Select to specify a revision by changeset id</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="267"/> - <source>Id:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="277"/> - <source>Enter a changeset id</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="284"/> + <source>Id:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="294"/> + <source>Enter a changeset id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="301"/> <source>Select to specify a revision by a tag</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="304"/> <source>Tag:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="297"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="314"/> <source>Enter a tag name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="307"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="324"/> <source>Select to specify a revision by a branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="310"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="327"/> <source>Branch:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="320"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="337"/> <source>Enter a branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="330"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="347"/> <source>Select to specify a revision by a bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="333"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="350"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="349"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="366"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="216"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="233"/> <source>&Destination Revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="359"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="376"/> <source>Select tip revision of repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="362"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="379"/> <source>TIP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="375"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="392"/> <source>Select to collapse the rebased changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="378"/> - <source>Collapse Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="385"/> - <source>Select to keep the original changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="388"/> - <source>Keep Original Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="395"/> + <source>Collapse Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="402"/> + <source>Select to keep the original changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="405"/> + <source>Keep Original Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="412"/> <source>Select to keep the original branch names</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="398"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="415"/> <source>Keep Original Branch Name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="418"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="422"/> <source>Select to detach the source from its original branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="421"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="425"/> <source>Detach Source</source> <translation type="unfinished"></translation> </message> @@ -25008,7 +25041,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/OpenSearch/OpenSearchEngineModel.py" line="135"/> + <location filename="Helpviewer/OpenSearch/OpenSearchEngineModel.py" line="136"/> <source><strong>Provides contextual suggestions</strong></source> <translation type="unfinished"></translation> </message> @@ -26299,17 +26332,17 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="936"/> + <location filename="Preferences/__init__.py" line="937"/> <source>Export Preferences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="963"/> + <location filename="Preferences/__init__.py" line="964"/> <source>Import Preferences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="963"/> + <location filename="Preferences/__init__.py" line="964"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> @@ -29353,7 +29386,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="123"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="124"/> <source>Purge</source> <translation type="unfinished"></translation> </message> @@ -32061,7 +32094,7 @@ <context> <name>RebaseProjectHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="107"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="108"/> <source>Rebase Changesets</source> <translation type="unfinished"></translation> </message> @@ -32106,22 +32139,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="98"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="99"/> <source>Rebase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="135"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="136"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="121"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="122"/> <source>Rebase Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="135"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="136"/> <source>Rebase Changesets (Abort)</source> <translation type="unfinished"></translation> </message> @@ -41019,7 +41052,7 @@ <context> <name>TransplantProjectHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="93"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="94"/> <source>Transplant Changesets</source> <translation type="unfinished"></translation> </message> @@ -41039,17 +41072,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="84"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="85"/> <source>Transplant</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="107"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="108"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="107"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="108"/> <source>Transplant Changesets (Continue)</source> <translation type="unfinished"></translation> </message> @@ -41975,35 +42008,40 @@ <context> <name>UserAgentMenu</name> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="43"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="45"/> <source>Default</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="55"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="59"/> <source>Other...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="78"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="76"/> <source>Custom user agent</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="78"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="76"/> <source>User agent:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="123"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="147"/> <source>Parsing default user agents</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="123"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="147"/> <source><p>Error parsing default user agents.</p><p>{0}</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="136"/> + <source>Various</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserInterface</name> @@ -43943,17 +43981,17 @@ <context> <name>Utilities</name> <message> - <location filename="Utilities/__init__.py" line="1001"/> + <location filename="Utilities/__init__.py" line="1023"/> <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="1187"/> + <location filename="Utilities/__init__.py" line="1209"/> <source>Python2 interpreter not configured.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Utilities/__init__.py" line="1233"/> + <location filename="Utilities/__init__.py" line="1255"/> <source>Python2 interpreter did not finish within 30s.</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_es.ts Fri Jun 03 13:01:16 2011 +0200 +++ b/i18n/eric5_es.ts Sat Jun 04 11:53:15 2011 +0200 @@ -1822,7 +1822,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="194"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="195"/> <source>Bookmarks</source> <translation type="unfinished">Marcadores</translation> </message> @@ -2888,12 +2888,12 @@ <translation>Gestor de Plugins</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="133"/> + <location filename="Preferences/ConfigurationDialog.py" line="296"/> <source>Printer</source> <translation>Impresora</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="296"/> + <location filename="Preferences/ConfigurationDialog.py" line="170"/> <source>Python</source> <translation>Python</translation> </message> @@ -5666,22 +5666,22 @@ <context> <name>DownloadItem</name> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="20"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="26"/> <source>Icon</source> <translation>Icono</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="35"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="41"/> <source>Filename</source> <translation>Nombre de archivo</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="57"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="63"/> <source>Info</source> <translation>Información</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="72"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="78"/> <source>Press to repeat the download</source> <translation>Pulse para repetir la descarga</translation> </message> @@ -5691,12 +5691,12 @@ <translation type="obsolete">...</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="95"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="101"/> <source>Press to cancel the download</source> <translation>Pulse para cancelar la descarga</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="105"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="111"/> <source>Press to open the downloaded file</source> <translation>Pulse para abrir el archivo descargado</translation> </message> @@ -5711,65 +5711,78 @@ <translation type="obsolete"><p>Está a punto de descargar el archivo <b>{0}</b>.</p><p>¿Qué desea hacer?</p></translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="203"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="206"/> <source>Download canceled: {0}</source> <translation>Descarga cancelada: {0}</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="193"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="196"/> <source>Save File</source> <translation>Guardar archivo</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="222"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="225"/> <source>Download directory ({0}) couldn't be created.</source> <translation>El directorio de descargas ({0}) no ha podido ser creado.</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="390"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="395"/> <source>Error opening save file: {0}</source> <translation>Error al abrir el fichero a guardar: {0}</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="399"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="407"/> <source>Error saving: {0}</source> <translation>Error al guardar: {0}</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="411"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="419"/> <source>Network Error: {0}</source> <translation>Error de Red: {0}</translation> </message> <message> <location filename="Helpviewer/Download/DownloadItem.py" line="519"/> <source>{0} of {1} ({2}/sec) - {3}</source> - <translation>{0} de {1} ({2}/sec) - {3}</translation> - </message> - <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="520"/> + <translation type="obsolete">{0} de {1} ({2}/sec) - {3}</translation> + </message> + <message> + <location filename="Helpviewer/Download/DownloadItem.py" line="528"/> <source>?</source> <translation>?</translation> </message> <message> <location filename="Helpviewer/Download/DownloadItem.py" line="528"/> <source>{0} downloaded</source> - <translation>{0} descargado</translation> - </message> - <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="531"/> + <translation type="obsolete">{0} descargado</translation> + </message> + <message> + <location filename="Helpviewer/Download/DownloadItem.py" line="541"/> <source>{0} of {1} - Stopped</source> <translation>{0} de {1} - Parado</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="181"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="184"/> <source>VirusTotal scan scheduled: {0}</source> <translation>Scan de VirusTotal programado: {0}</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="82"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="88"/> <source>Press to pause the download</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/Download/DownloadItem.py" line="527"/> + <source>{0} of {1} ({2}/sec) +{3}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Download/DownloadItem.py" line="536"/> + <source>{0} downloaded +SHA1: {1} +MD5: {2}</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>DownloadManager</name> @@ -11571,12 +11584,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="81"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="82"/> <source>Fetch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="81"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="82"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation> </message> @@ -12434,7 +12447,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="98"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="99"/> <source>GPG</source> <translation type="unfinished"></translation> </message> @@ -12460,105 +12473,120 @@ <context> <name>HelpAppearancePage</name> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="16"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="17"/> <source><b>Configure help viewer appearance</b></source> <translation><b>Configurar apariencia del visor de ayuda</b></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="36"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="37"/> <source>Fonts</source> <translation>Fuentes</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="42"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="43"/> <source>Press to select the standard font</source> <translation>Pulse para seleccionar la fuente estándar</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="45"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="46"/> <source>Standard Font</source> <translation>Fuente Estándar</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="55"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="56"/> <source>Times 16</source> <translation>Times 16</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="68"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="69"/> <source>Press to select the fixed-width font</source> <translation>Pulse para seleccionar la fuente de ancho fijo</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="71"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="72"/> <source>Fixed-Width Font</source> <translation>Fuente de Ancho Fijo</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="81"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="82"/> <source>Courier 13</source> <translation>Courier 13</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="142"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="143"/> <source>Images</source> <translation>Imágenes</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="148"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="149"/> <source>Select to load images</source> <translation>Seleccione para cargar imágenes</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="151"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="152"/> <source>Load images</source> <translation>Cargar imágenes</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="161"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="162"/> <source>Style Sheet</source> <translation>Hoja de Estilo</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="167"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="168"/> <source>User Style Sheet:</source> <translation>Hoja de Estilo de Usuario:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="174"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="175"/> <source>Enter the file name of a user style sheet</source> <translation>Introduzca el nombre del archivo de la hoja de estilos de usuario</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="181"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="182"/> <source>Select the user style sheet via a file selection dialog</source> <translation>Seleccione el archivo de hoja de estilos de usuario utilizando un diálogo de selección de archivo</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="184"/> - <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.py" line="104"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="185"/> + <source>...</source> + <translation>...</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.py" line="133"/> <source>Select Style Sheet</source> <translation>Seleccionar Hoja de Estilos</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="97"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="98"/> <source>Colours</source> <translation>Colores</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="103"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="104"/> <source>Background colour of secure URLs:</source> <translation>Color de fondo de URLs seguras:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="116"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="117"/> <source>Select the background colour for secure URLs.</source> <translation>Seleccione el color de fondo para las URLs seguras.</translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="208"/> + <source><font color="#FF0000"><b>Note:</b> All settings below are activated at the next startup of the application.</font></source> + <translation type="unfinished"><font color="#FF0000"><b>Nota:</b> Estas opciones de configuración se activarán la siguiente vez que se ejecute la aplicacion.</font></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="215"/> + <source>Tabs</source> + <translation type="unfinished">Pestañas</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="221"/> + <source>Show only one close button instead of one for each tab</source> + <translation type="unfinished">Mostrar solamente un boton de cerrar en lugar de uno por cada pestaña</translation> + </message> </context> <context> <name>HelpBrowser</name> @@ -13500,17 +13528,17 @@ <translation> MB</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="452"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="491"/> <source>Printing</source> <translation>Imprimiendo</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="458"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="497"/> <source>Select to print background colours and images</source> <translation>Seleccionar para imprimir los colores de fondo y las imágenes</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="461"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="500"/> <source>Print background colours and images</source> <translation>Imprimir colores de fondo e imágenes</translation> </message> @@ -13719,6 +13747,21 @@ <source>Enable access keys</source> <translation>Habilitar claves de acceso</translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="452"/> + <source>Web Search</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="458"/> + <source>Language:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="465"/> + <source>Select the language to be used for web searches</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HelpWebPage</name> @@ -19287,132 +19330,132 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="239"/> <source>Select to specify a revision by number</source> <translation type="unfinished">Seleccionar para especificar una revisión por número</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="225"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="242"/> <source>Number</source> <translation type="unfinished">Número</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="235"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="252"/> <source>Enter a revision number</source> <translation type="unfinished">Introduzca un número de revisión</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="264"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="281"/> <source>Select to specify a revision by changeset id</source> <translation type="unfinished">Seleccionar para especificar una revisión por changeset id</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="267"/> - <source>Id:</source> - <translation type="unfinished">Id:</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="277"/> - <source>Enter a changeset id</source> - <translation type="unfinished">Introduzca un changeset id</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="284"/> + <source>Id:</source> + <translation type="unfinished">Id:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="294"/> + <source>Enter a changeset id</source> + <translation type="unfinished">Introduzca un changeset id</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="301"/> <source>Select to specify a revision by a tag</source> <translation type="unfinished">Seleccionar para especificar una revisión por tag</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="304"/> <source>Tag:</source> <translation type="unfinished">Tag:</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="297"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="314"/> <source>Enter a tag name</source> <translation type="unfinished">Introduzca un nombre de tag</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="307"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="324"/> <source>Select to specify a revision by a branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="310"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="327"/> <source>Branch:</source> <translation type="unfinished">Branch:</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="320"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="337"/> <source>Enter a branch name</source> <translation type="unfinished">Introducir un nombre de branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="330"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="347"/> <source>Select to specify a revision by a bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="333"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="350"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="349"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="366"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="216"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="233"/> <source>&Destination Revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="359"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="376"/> <source>Select tip revision of repository</source> <translation type="unfinished">Seleccionar revisión tip del repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="362"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="379"/> <source>TIP</source> <translation type="unfinished">TIP</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="375"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="392"/> <source>Select to collapse the rebased changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="378"/> - <source>Collapse Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="385"/> - <source>Select to keep the original changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="388"/> - <source>Keep Original Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="395"/> + <source>Collapse Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="402"/> + <source>Select to keep the original changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="405"/> + <source>Keep Original Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="412"/> <source>Select to keep the original branch names</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="398"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="415"/> <source>Keep Original Branch Name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="418"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="422"/> <source>Select to detach the source from its original branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="421"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="425"/> <source>Detach Source</source> <translation type="unfinished"></translation> </message> @@ -25245,7 +25288,7 @@ <context> <name>OpenSearchEngineModel</name> <message> - <location filename="Helpviewer/OpenSearch/OpenSearchEngineModel.py" line="135"/> + <location filename="Helpviewer/OpenSearch/OpenSearchEngineModel.py" line="136"/> <source><strong>Provides contextual suggestions</strong></source> <translation><strong>Proporciona sugerencias contextuales</strong></translation> </message> @@ -26559,17 +26602,17 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="936"/> + <location filename="Preferences/__init__.py" line="937"/> <source>Export Preferences</source> <translation>Exportar Preferencias</translation> </message> <message> - <location filename="Preferences/__init__.py" line="963"/> + <location filename="Preferences/__init__.py" line="964"/> <source>Import Preferences</source> <translation>Importar Preferencias</translation> </message> <message> - <location filename="Preferences/__init__.py" line="963"/> + <location filename="Preferences/__init__.py" line="964"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>Archivo de Propiedades (*.ini);;Todos los archivos (*)</translation> </message> @@ -29634,7 +29677,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="123"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="124"/> <source>Purge</source> <translation type="unfinished"></translation> </message> @@ -32420,7 +32463,7 @@ <context> <name>RebaseProjectHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="107"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="108"/> <source>Rebase Changesets</source> <translation type="unfinished"></translation> </message> @@ -32465,22 +32508,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="98"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="99"/> <source>Rebase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="135"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="136"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="121"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="122"/> <source>Rebase Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="135"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="136"/> <source>Rebase Changesets (Abort)</source> <translation type="unfinished"></translation> </message> @@ -41490,7 +41533,7 @@ <context> <name>TransplantProjectHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="93"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="94"/> <source>Transplant Changesets</source> <translation type="unfinished"></translation> </message> @@ -41515,17 +41558,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="84"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="85"/> <source>Transplant</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="107"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="108"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="107"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="108"/> <source>Transplant Changesets (Continue)</source> <translation type="unfinished"></translation> </message> @@ -42457,35 +42500,40 @@ <context> <name>UserAgentMenu</name> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="43"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="45"/> <source>Default</source> <translation>Por defecto</translation> </message> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="55"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="59"/> <source>Other...</source> <translation>Otro...</translation> </message> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="78"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="76"/> <source>Custom user agent</source> <translation>Agente de usuario personalizado</translation> </message> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="78"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="76"/> <source>User agent:</source> <translation>Agente de Usuario:</translation> </message> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="123"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="147"/> <source>Parsing default user agents</source> <translation>Interpretando agentes de usuario por defecto</translation> </message> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="123"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="147"/> <source><p>Error parsing default user agents.</p><p>{0}</p></source> <translation><p>Error al interpretar agentes de usuario por defecto.</p><p>{0}</p></translation> </message> + <message> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="136"/> + <source>Various</source> + <translation type="unfinished">Varios</translation> + </message> </context> <context> <name>UserInterface</name> @@ -44427,17 +44475,17 @@ <context> <name>Utilities</name> <message> - <location filename="Utilities/__init__.py" line="1001"/> + <location filename="Utilities/__init__.py" line="1023"/> <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="1187"/> + <location filename="Utilities/__init__.py" line="1209"/> <source>Python2 interpreter not configured.</source> <translation>Intérprete de Python2 no configurado.</translation> </message> <message> - <location filename="Utilities/__init__.py" line="1233"/> + <location filename="Utilities/__init__.py" line="1255"/> <source>Python2 interpreter did not finish within 30s.</source> <translation>El intérprete de Python2 no terminó en un plazo de 30s.</translation> </message>
--- a/i18n/eric5_fr.ts Fri Jun 03 13:01:16 2011 +0200 +++ b/i18n/eric5_fr.ts Sat Jun 04 11:53:15 2011 +0200 @@ -2011,7 +2011,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="194"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="195"/> <source>Bookmarks</source> <translation type="unfinished">Signets</translation> </message> @@ -3120,12 +3120,12 @@ <translation>Gestionnaire de plugins</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="133"/> + <location filename="Preferences/ConfigurationDialog.py" line="296"/> <source>Printer</source> <translation>Impression</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="296"/> + <location filename="Preferences/ConfigurationDialog.py" line="170"/> <source>Python</source> <translation>Python</translation> </message> @@ -6181,22 +6181,22 @@ <context> <name>DownloadItem</name> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="20"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="26"/> <source>Icon</source> <translation type="unfinished">Icône</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="35"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="41"/> <source>Filename</source> <translation type="unfinished">Nom de fichier</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="57"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="63"/> <source>Info</source> <translation type="unfinished">Info</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="72"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="78"/> <source>Press to repeat the download</source> <translation type="unfinished"></translation> </message> @@ -6206,75 +6206,78 @@ <translation type="obsolete">...</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="95"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="101"/> <source>Press to cancel the download</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="105"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="111"/> <source>Press to open the downloaded file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="203"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="206"/> <source>Download canceled: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="193"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="196"/> <source>Save File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="222"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="225"/> <source>Download directory ({0}) couldn't be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="390"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="395"/> <source>Error opening save file: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="399"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="407"/> <source>Error saving: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="411"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="419"/> <source>Network Error: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="519"/> - <source>{0} of {1} ({2}/sec) - {3}</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="520"/> - <source>?</source> - <translation type="unfinished">?</translation> - </message> - <message> <location filename="Helpviewer/Download/DownloadItem.py" line="528"/> - <source>{0} downloaded</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="531"/> + <source>?</source> + <translation type="unfinished">?</translation> + </message> + <message> + <location filename="Helpviewer/Download/DownloadItem.py" line="541"/> <source>{0} of {1} - Stopped</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="181"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="184"/> <source>VirusTotal scan scheduled: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="82"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="88"/> <source>Press to pause the download</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/Download/DownloadItem.py" line="527"/> + <source>{0} of {1} ({2}/sec) +{3}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Download/DownloadItem.py" line="536"/> + <source>{0} downloaded +SHA1: {1} +MD5: {2}</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>DownloadManager</name> @@ -12581,12 +12584,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="81"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="82"/> <source>Fetch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="81"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="82"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -13478,7 +13481,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="98"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="99"/> <source>GPG</source> <translation type="unfinished"></translation> </message> @@ -13504,105 +13507,120 @@ <context> <name>HelpAppearancePage</name> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="16"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="17"/> <source><b>Configure help viewer appearance</b></source> <translation><b>Configuration de l'apparence du visualiseur d'aide</b></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="36"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="37"/> <source>Fonts</source> <translation>Polices</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="42"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="43"/> <source>Press to select the standard font</source> <translation>Cliquer pour sélectionner une police standard</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="45"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="46"/> <source>Standard Font</source> <translation>Polices standards</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="55"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="56"/> <source>Times 16</source> <translation>Times 16</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="68"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="69"/> <source>Press to select the fixed-width font</source> <translation>Cliquer pour sélectionner une police monospacée</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="71"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="72"/> <source>Fixed-Width Font</source> <translation>Polices monospacées</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="81"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="82"/> <source>Courier 13</source> <translation>Courier 13</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="142"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="143"/> <source>Images</source> <translation>Images</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="148"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="149"/> <source>Select to load images</source> <translation>Cocher pour charger les images</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="151"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="152"/> <source>Load images</source> <translation>Charger les images</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="161"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="162"/> <source>Style Sheet</source> <translation>Feuille de style</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="167"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="168"/> <source>User Style Sheet:</source> <translation>Feuille de style utilisateur:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="174"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="175"/> <source>Enter the file name of a user style sheet</source> <translation>Entrer le nom d'une feuille de styles</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="181"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="182"/> <source>Select the user style sheet via a file selection dialog</source> <translation>Sélectionne une feuille de styles via une boite de sélection</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="184"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="185"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.py" line="104"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.py" line="133"/> <source>Select Style Sheet</source> <translation>Sélection d'une feuille de styles</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="97"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="98"/> <source>Colours</source> <translation>Couleurs</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="103"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="104"/> <source>Background colour of secure URLs:</source> <translation>Couleur de fond pour les URLs sécurisées:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="116"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="117"/> <source>Select the background colour for secure URLs.</source> <translation>Sélectionne une couleur de fond pour les URLs sécurisées.</translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="208"/> + <source><font color="#FF0000"><b>Note:</b> All settings below are activated at the next startup of the application.</font></source> + <translation type="unfinished"><font color="#FF0000"><b>Note:</b> Les paramètres seront activés au prochain lancement de l'application.</font></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="215"/> + <source>Tabs</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="221"/> + <source>Show only one close button instead of one for each tab</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HelpBrowser</name> @@ -14750,17 +14768,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="452"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="491"/> <source>Printing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="458"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="497"/> <source>Select to print background colours and images</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="461"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="500"/> <source>Print background colours and images</source> <translation type="unfinished"></translation> </message> @@ -14969,6 +14987,21 @@ <source>Enable access keys</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="452"/> + <source>Web Search</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="458"/> + <source>Language:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="465"/> + <source>Select the language to be used for web searches</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HelpWebPage</name> @@ -20667,132 +20700,132 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="239"/> <source>Select to specify a revision by number</source> <translation type="unfinished">Sélectionner pour spécifier une révision par son numéro</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="225"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="242"/> <source>Number</source> <translation type="unfinished">Numéro</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="235"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="252"/> <source>Enter a revision number</source> <translation type="unfinished">Entrer un numéro de révision</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="264"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="281"/> <source>Select to specify a revision by changeset id</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="267"/> - <source>Id:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="277"/> - <source>Enter a changeset id</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="284"/> + <source>Id:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="294"/> + <source>Enter a changeset id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="301"/> <source>Select to specify a revision by a tag</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="304"/> <source>Tag:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="297"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="314"/> <source>Enter a tag name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="307"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="324"/> <source>Select to specify a revision by a branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="310"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="327"/> <source>Branch:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="320"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="337"/> <source>Enter a branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="330"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="347"/> <source>Select to specify a revision by a bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="333"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="350"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="349"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="366"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="216"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="233"/> <source>&Destination Revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="359"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="376"/> <source>Select tip revision of repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="362"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="379"/> <source>TIP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="375"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="392"/> <source>Select to collapse the rebased changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="378"/> - <source>Collapse Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="385"/> - <source>Select to keep the original changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="388"/> - <source>Keep Original Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="395"/> + <source>Collapse Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="402"/> + <source>Select to keep the original changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="405"/> + <source>Keep Original Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="412"/> <source>Select to keep the original branch names</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="398"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="415"/> <source>Keep Original Branch Name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="418"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="422"/> <source>Select to detach the source from its original branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="421"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="425"/> <source>Detach Source</source> <translation type="unfinished"></translation> </message> @@ -27155,7 +27188,7 @@ <context> <name>OpenSearchEngineModel</name> <message> - <location filename="Helpviewer/OpenSearch/OpenSearchEngineModel.py" line="135"/> + <location filename="Helpviewer/OpenSearch/OpenSearchEngineModel.py" line="136"/> <source><strong>Provides contextual suggestions</strong></source> <translation type="unfinished"></translation> </message> @@ -28635,17 +28668,17 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="936"/> + <location filename="Preferences/__init__.py" line="937"/> <source>Export Preferences</source> <translation>Export des préférences</translation> </message> <message> - <location filename="Preferences/__init__.py" line="963"/> + <location filename="Preferences/__init__.py" line="964"/> <source>Import Preferences</source> <translation>Import des préférences</translation> </message> <message> - <location filename="Preferences/__init__.py" line="963"/> + <location filename="Preferences/__init__.py" line="964"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> @@ -32272,7 +32305,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="123"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="124"/> <source>Purge</source> <translation type="unfinished"></translation> </message> @@ -35231,7 +35264,7 @@ <context> <name>RebaseProjectHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="107"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="108"/> <source>Rebase Changesets</source> <translation type="unfinished"></translation> </message> @@ -35276,22 +35309,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="98"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="99"/> <source>Rebase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="135"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="136"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="121"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="122"/> <source>Rebase Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="135"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="136"/> <source>Rebase Changesets (Abort)</source> <translation type="unfinished"></translation> </message> @@ -45297,7 +45330,7 @@ <context> <name>TransplantProjectHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="93"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="94"/> <source>Transplant Changesets</source> <translation type="unfinished"></translation> </message> @@ -45322,17 +45355,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="84"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="85"/> <source>Transplant</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="107"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="108"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="107"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="108"/> <source>Transplant Changesets (Continue)</source> <translation type="unfinished"></translation> </message> @@ -46372,35 +46405,40 @@ <context> <name>UserAgentMenu</name> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="43"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="45"/> <source>Default</source> <translation type="unfinished">Défaut</translation> </message> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="55"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="59"/> <source>Other...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="78"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="76"/> <source>Custom user agent</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="78"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="76"/> <source>User agent:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="123"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="147"/> <source>Parsing default user agents</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="123"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="147"/> <source><p>Error parsing default user agents.</p><p>{0}</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="136"/> + <source>Various</source> + <translation type="unfinished">Divers</translation> + </message> </context> <context> <name>UserInterface</name> @@ -48728,17 +48766,17 @@ <context> <name>Utilities</name> <message> - <location filename="Utilities/__init__.py" line="1001"/> + <location filename="Utilities/__init__.py" line="1023"/> <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="1187"/> + <location filename="Utilities/__init__.py" line="1209"/> <source>Python2 interpreter not configured.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Utilities/__init__.py" line="1233"/> + <location filename="Utilities/__init__.py" line="1255"/> <source>Python2 interpreter did not finish within 30s.</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_it.ts Fri Jun 03 13:01:16 2011 +0200 +++ b/i18n/eric5_it.ts Sat Jun 04 11:53:15 2011 +0200 @@ -1824,7 +1824,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="194"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="195"/> <source>Bookmarks</source> <translation type="unfinished">Segnalibri</translation> </message> @@ -2888,12 +2888,12 @@ <translation>Gestore plugin</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="133"/> + <location filename="Preferences/ConfigurationDialog.py" line="296"/> <source>Printer</source> <translation>Stampante</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="296"/> + <location filename="Preferences/ConfigurationDialog.py" line="170"/> <source>Python</source> <translation>Python</translation> </message> @@ -5662,22 +5662,22 @@ <context> <name>DownloadItem</name> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="20"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="26"/> <source>Icon</source> <translation>Icona</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="35"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="41"/> <source>Filename</source> <translation>Nome file</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="57"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="63"/> <source>Info</source> <translation>Info</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="72"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="78"/> <source>Press to repeat the download</source> <translation>Premi per ripetere il download</translation> </message> @@ -5687,75 +5687,88 @@ <translation type="obsolete">...</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="95"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="101"/> <source>Press to cancel the download</source> <translation>Premi per cancellare il download</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="105"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="111"/> <source>Press to open the downloaded file</source> <translation>Premi per aprire il file scaricato</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="203"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="206"/> <source>Download canceled: {0}</source> <translation>Download cancellato: {0}</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="193"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="196"/> <source>Save File</source> <translation>Salva file</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="222"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="225"/> <source>Download directory ({0}) couldn't be created.</source> <translation>La directory ({0}) per il download non può essere creata.</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="390"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="395"/> <source>Error opening save file: {0}</source> <translation>Errore nell'apertura del file: {0}</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="399"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="407"/> <source>Error saving: {0}</source> <translation>Errore nel salvataggio di: {0}</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="411"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="419"/> <source>Network Error: {0}</source> <translation>Errore di rete: {0}</translation> </message> <message> <location filename="Helpviewer/Download/DownloadItem.py" line="519"/> <source>{0} of {1} ({2}/sec) - {3}</source> - <translation>{0} di {1} ({2}/sec) - {3}</translation> - </message> - <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="520"/> + <translation type="obsolete">{0} di {1} ({2}/sec) - {3}</translation> + </message> + <message> + <location filename="Helpviewer/Download/DownloadItem.py" line="528"/> <source>?</source> <translation>?</translation> </message> <message> <location filename="Helpviewer/Download/DownloadItem.py" line="528"/> <source>{0} downloaded</source> - <translation>{0} scaricato</translation> - </message> - <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="531"/> + <translation type="obsolete">{0} scaricato</translation> + </message> + <message> + <location filename="Helpviewer/Download/DownloadItem.py" line="541"/> <source>{0} of {1} - Stopped</source> <translation>{0} di {1} - Fermati</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="181"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="184"/> <source>VirusTotal scan scheduled: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="82"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="88"/> <source>Press to pause the download</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/Download/DownloadItem.py" line="527"/> + <source>{0} of {1} ({2}/sec) +{3}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Download/DownloadItem.py" line="536"/> + <source>{0} downloaded +SHA1: {1} +MD5: {2}</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>DownloadManager</name> @@ -11514,12 +11527,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="81"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="82"/> <source>Fetch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="81"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="82"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Il progetto deve essere riletto. Farlo ora ?</translation> </message> @@ -12377,7 +12390,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="98"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="99"/> <source>GPG</source> <translation type="unfinished"></translation> </message> @@ -12403,105 +12416,120 @@ <context> <name>HelpAppearancePage</name> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="16"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="17"/> <source><b>Configure help viewer appearance</b></source> <translation><b>Configura l'apparenza del visualizzatore dell'help</b></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="36"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="37"/> <source>Fonts</source> <translation>Fonts</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="42"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="43"/> <source>Press to select the standard font</source> <translation>Premi per selezionare il font standard</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="45"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="46"/> <source>Standard Font</source> <translation>Font standard</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="55"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="56"/> <source>Times 16</source> <translation>Times 16</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="68"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="69"/> <source>Press to select the fixed-width font</source> <translation>Premi per selezionare il font a larghezza fissa</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="71"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="72"/> <source>Fixed-Width Font</source> <translation>Font a larghezza fisa</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="81"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="82"/> <source>Courier 13</source> <translation>Courier 13</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="142"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="143"/> <source>Images</source> <translation>Immagini</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="148"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="149"/> <source>Select to load images</source> <translation>Seleziona per caricare le immagini</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="151"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="152"/> <source>Load images</source> <translation>Carica immagini</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="161"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="162"/> <source>Style Sheet</source> <translation>Fogli di stile</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="167"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="168"/> <source>User Style Sheet:</source> <translation>Fogli di stile dell'utente:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="174"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="175"/> <source>Enter the file name of a user style sheet</source> <translation>Inserisci il nome del foglio di stile dell'utente</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="181"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="182"/> <source>Select the user style sheet via a file selection dialog</source> <translation>Seleziona il file di stile dell'utente con un dialogo di selezione</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="184"/> - <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.py" line="104"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="185"/> + <source>...</source> + <translation>...</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.py" line="133"/> <source>Select Style Sheet</source> <translation>Seleziona foglio di stile</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="97"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="98"/> <source>Colours</source> <translation>Colori</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="103"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="104"/> <source>Background colour of secure URLs:</source> <translation>Colore di sfondo degli URS sicuri:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="116"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="117"/> <source>Select the background colour for secure URLs.</source> <translation>Seleziona lo sfondo per gli URL sicuri.</translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="208"/> + <source><font color="#FF0000"><b>Note:</b> All settings below are activated at the next startup of the application.</font></source> + <translation type="unfinished"><font color="#FF0000"><b>Nota:</b> Tutte queste impostazioni saranno attivate al prossimo avvio dell'applicazione.</font></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="215"/> + <source>Tabs</source> + <translation type="unfinished">Schede</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="221"/> + <source>Show only one close button instead of one for each tab</source> + <translation type="unfinished">Mostra solo un pulsante di chiusura invece di uno per ogni linguetta</translation> + </message> </context> <context> <name>HelpBrowser</name> @@ -13443,17 +13471,17 @@ <translation>MB</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="452"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="491"/> <source>Printing</source> <translation>Stampa in corso</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="458"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="497"/> <source>Select to print background colours and images</source> <translation>Seleziona per stampare i colori di background e le immagini</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="461"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="500"/> <source>Print background colours and images</source> <translation>Stampa colori di background e le immagini</translation> </message> @@ -13662,6 +13690,21 @@ <source>Enable access keys</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="452"/> + <source>Web Search</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="458"/> + <source>Language:</source> + <translation type="unfinished">Linguaggio:</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="465"/> + <source>Select the language to be used for web searches</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HelpWebPage</name> @@ -19223,132 +19266,132 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="239"/> <source>Select to specify a revision by number</source> <translation type="unfinished">Seleziona per specificare una revisione con un numero</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="225"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="242"/> <source>Number</source> <translation type="unfinished">Numero</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="235"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="252"/> <source>Enter a revision number</source> <translation type="unfinished">Inserisci un numero di revisione</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="264"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="281"/> <source>Select to specify a revision by changeset id</source> <translation type="unfinished">Seleziona per specificare la revisione dall'id del changeset</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="267"/> - <source>Id:</source> - <translation type="unfinished">Id:</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="277"/> - <source>Enter a changeset id</source> - <translation type="unfinished">Inserisci id del changeset</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="284"/> + <source>Id:</source> + <translation type="unfinished">Id:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="294"/> + <source>Enter a changeset id</source> + <translation type="unfinished">Inserisci id del changeset</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="301"/> <source>Select to specify a revision by a tag</source> <translation type="unfinished">Seleziona per specificare una revisione con un tag</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="304"/> <source>Tag:</source> <translation type="unfinished">Tag:</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="297"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="314"/> <source>Enter a tag name</source> <translation type="unfinished">Inserisci il nome del tag</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="307"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="324"/> <source>Select to specify a revision by a branch</source> <translation type="unfinished">Seleziona per specificare una revisione con un branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="310"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="327"/> <source>Branch:</source> <translation type="unfinished">Branch:</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="320"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="337"/> <source>Enter a branch name</source> <translation type="unfinished">Inserisci un nome di branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="330"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="347"/> <source>Select to specify a revision by a bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="333"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="350"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="349"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="366"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="216"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="233"/> <source>&Destination Revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="359"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="376"/> <source>Select tip revision of repository</source> <translation type="unfinished">Seleziona la revisione tip del reposutory</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="362"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="379"/> <source>TIP</source> <translation type="unfinished">TIP</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="375"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="392"/> <source>Select to collapse the rebased changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="378"/> - <source>Collapse Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="385"/> - <source>Select to keep the original changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="388"/> - <source>Keep Original Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="395"/> + <source>Collapse Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="402"/> + <source>Select to keep the original changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="405"/> + <source>Keep Original Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="412"/> <source>Select to keep the original branch names</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="398"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="415"/> <source>Keep Original Branch Name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="418"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="422"/> <source>Select to detach the source from its original branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="421"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="425"/> <source>Detach Source</source> <translation type="unfinished"></translation> </message> @@ -25171,7 +25214,7 @@ <context> <name>OpenSearchEngineModel</name> <message> - <location filename="Helpviewer/OpenSearch/OpenSearchEngineModel.py" line="135"/> + <location filename="Helpviewer/OpenSearch/OpenSearchEngineModel.py" line="136"/> <source><strong>Provides contextual suggestions</strong></source> <translation><strong>Fornisce suggetimenti contestuali</strong></translation> </message> @@ -26487,17 +26530,17 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="936"/> + <location filename="Preferences/__init__.py" line="937"/> <source>Export Preferences</source> <translation>Esporta Preferenze</translation> </message> <message> - <location filename="Preferences/__init__.py" line="963"/> + <location filename="Preferences/__init__.py" line="964"/> <source>Import Preferences</source> <translation>Importa Preferenze</translation> </message> <message> - <location filename="Preferences/__init__.py" line="963"/> + <location filename="Preferences/__init__.py" line="964"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>File proprietà (*.ini);;Tutti i file(*)</translation> </message> @@ -29554,7 +29597,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="123"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="124"/> <source>Purge</source> <translation type="unfinished"></translation> </message> @@ -32341,7 +32384,7 @@ <context> <name>RebaseProjectHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="107"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="108"/> <source>Rebase Changesets</source> <translation type="unfinished"></translation> </message> @@ -32386,22 +32429,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="98"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="99"/> <source>Rebase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="135"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="136"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Il progetto deve essere riletto. Farlo ora ?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="121"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="122"/> <source>Rebase Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="135"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="136"/> <source>Rebase Changesets (Abort)</source> <translation type="unfinished"></translation> </message> @@ -41421,7 +41464,7 @@ <context> <name>TransplantProjectHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="93"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="94"/> <source>Transplant Changesets</source> <translation type="unfinished"></translation> </message> @@ -41446,17 +41489,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="84"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="85"/> <source>Transplant</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="107"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="108"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Il progetto deve essere riletto. Farlo ora ?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="107"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="108"/> <source>Transplant Changesets (Continue)</source> <translation type="unfinished"></translation> </message> @@ -42388,35 +42431,40 @@ <context> <name>UserAgentMenu</name> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="43"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="45"/> <source>Default</source> <translation>Default</translation> </message> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="55"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="59"/> <source>Other...</source> <translation>Altro...</translation> </message> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="78"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="76"/> <source>Custom user agent</source> <translation>User agent personalizzato</translation> </message> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="78"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="76"/> <source>User agent:</source> <translation>User agent:</translation> </message> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="123"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="147"/> <source>Parsing default user agents</source> <translation>Analisi user agent di default</translation> </message> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="123"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="147"/> <source><p>Error parsing default user agents.</p><p>{0}</p></source> <translation><p>Errore nell'analisi delluser agent di default.</p><p>{0}</p></translation> </message> + <message> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="136"/> + <source>Various</source> + <translation type="unfinished">Vari</translation> + </message> </context> <context> <name>UserInterface</name> @@ -44358,17 +44406,17 @@ <context> <name>Utilities</name> <message> - <location filename="Utilities/__init__.py" line="1001"/> + <location filename="Utilities/__init__.py" line="1023"/> <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="1187"/> + <location filename="Utilities/__init__.py" line="1209"/> <source>Python2 interpreter not configured.</source> <translation>Interprete Python2 non configurato.</translation> </message> <message> - <location filename="Utilities/__init__.py" line="1233"/> + <location filename="Utilities/__init__.py" line="1255"/> <source>Python2 interpreter did not finish within 30s.</source> <translation>L'interprete Python2 non ha finito entro i 30s.</translation> </message>
--- a/i18n/eric5_ru.ts Fri Jun 03 13:01:16 2011 +0200 +++ b/i18n/eric5_ru.ts Sat Jun 04 11:53:15 2011 +0200 @@ -1821,7 +1821,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="194"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="195"/> <source>Bookmarks</source> <translation type="unfinished">Закладки</translation> </message> @@ -2896,12 +2896,12 @@ <translation>Менеджер плагинов</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="133"/> + <location filename="Preferences/ConfigurationDialog.py" line="296"/> <source>Printer</source> <translation>Принтер</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="296"/> + <location filename="Preferences/ConfigurationDialog.py" line="170"/> <source>Python</source> <translation>Python</translation> </message> @@ -5694,22 +5694,22 @@ <context> <name>DownloadItem</name> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="20"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="26"/> <source>Icon</source> <translation>Иконка</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="35"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="41"/> <source>Filename</source> <translation>Имя файла</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="57"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="63"/> <source>Info</source> <translation>Информация</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="72"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="78"/> <source>Press to repeat the download</source> <translation>Повторить закачку</translation> </message> @@ -5719,12 +5719,12 @@ <translation type="obsolete">...</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="95"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="101"/> <source>Press to cancel the download</source> <translation>Отменить закачку</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="105"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="111"/> <source>Press to open the downloaded file</source> <translation>Открыть скачанный файл</translation> </message> @@ -5739,65 +5739,78 @@ <translation type="obsolete"><p>Начинается загрузка файла <b>{0}</b>.</p><p>Что Вы хотите с ним сделать?</p></translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="203"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="206"/> <source>Download canceled: {0}</source> <translation>Скачивание прервано: {0}</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="193"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="196"/> <source>Save File</source> <translation>Сохранить файл</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="222"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="225"/> <source>Download directory ({0}) couldn't be created.</source> <translation>Невозможно создать каталог ({0}) для загрузки.</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="390"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="395"/> <source>Error opening save file: {0}</source> <translation>Ошибка сохранения файла: {0}</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="399"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="407"/> <source>Error saving: {0}</source> <translation>Ошибка при сохранении: {0}</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="411"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="419"/> <source>Network Error: {0}</source> <translation>Сетевая ошибка: {0}</translation> </message> <message> <location filename="Helpviewer/Download/DownloadItem.py" line="519"/> <source>{0} of {1} ({2}/sec) - {3}</source> - <translation>{0} of {1} ({2}/sec) - {3}</translation> - </message> - <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="520"/> + <translation type="obsolete">{0} of {1} ({2}/sec) - {3}</translation> + </message> + <message> + <location filename="Helpviewer/Download/DownloadItem.py" line="528"/> <source>?</source> <translation>?</translation> </message> <message> <location filename="Helpviewer/Download/DownloadItem.py" line="528"/> <source>{0} downloaded</source> - <translation>{0} скачано</translation> - </message> - <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="531"/> + <translation type="obsolete">{0} скачано</translation> + </message> + <message> + <location filename="Helpviewer/Download/DownloadItem.py" line="541"/> <source>{0} of {1} - Stopped</source> <translation>{0} из {1} - остановлено</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="181"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="184"/> <source>VirusTotal scan scheduled: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="82"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="88"/> <source>Press to pause the download</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/Download/DownloadItem.py" line="527"/> + <source>{0} of {1} ({2}/sec) +{3}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Download/DownloadItem.py" line="536"/> + <source>{0} downloaded +SHA1: {1} +MD5: {2}</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>DownloadManager</name> @@ -11610,12 +11623,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="81"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="82"/> <source>Fetch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="81"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="82"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Необходимо перезагрузить проект. Сделать это?</translation> </message> @@ -12475,7 +12488,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="98"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="99"/> <source>GPG</source> <translation type="unfinished"></translation> </message> @@ -12501,105 +12514,120 @@ <context> <name>HelpAppearancePage</name> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="16"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="17"/> <source><b>Configure help viewer appearance</b></source> <translation><b>Настроить просмотрщик справки</b></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="36"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="37"/> <source>Fonts</source> <translation>Шрифты</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="42"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="43"/> <source>Press to select the standard font</source> <translation>Выбрать стандартный шрифт</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="45"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="46"/> <source>Standard Font</source> <translation>Стандартный шрифт</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="55"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="56"/> <source>Times 16</source> <translation>Times 16</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="68"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="69"/> <source>Press to select the fixed-width font</source> <translation>Выбрать моноширинный шрифт</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="71"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="72"/> <source>Fixed-Width Font</source> <translation>Моноширинный шрифт</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="81"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="82"/> <source>Courier 13</source> <translation>Courier 13</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="142"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="143"/> <source>Images</source> <translation>Изображения</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="148"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="149"/> <source>Select to load images</source> <translation>Загрузить изображения</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="151"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="152"/> <source>Load images</source> <translation>Загрузить изображения</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="161"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="162"/> <source>Style Sheet</source> <translation>Стили</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="167"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="168"/> <source>User Style Sheet:</source> <translation>Стиль пользователя:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="174"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="175"/> <source>Enter the file name of a user style sheet</source> <translation>Задайте имя файла, содержащего стиль пользователя</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="181"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="182"/> <source>Select the user style sheet via a file selection dialog</source> <translation>Выберите файл, содержащий стиль пользователя с помощью файлового диалога</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="184"/> - <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.py" line="104"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="185"/> + <source>...</source> + <translation>...</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.py" line="133"/> <source>Select Style Sheet</source> <translation>Выберите стиль CSS</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="97"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="98"/> <source>Colours</source> <translation>Цвета</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="103"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="104"/> <source>Background colour of secure URLs:</source> <translation>Цвет фона https URL:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="116"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="117"/> <source>Select the background colour for secure URLs.</source> <translation>Задайте цвет фона https URL.</translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="208"/> + <source><font color="#FF0000"><b>Note:</b> All settings below are activated at the next startup of the application.</font></source> + <translation type="unfinished"><font color="#FF0000"><b>Примечание:</b> Эти изменения вступят в силу при следующем запуске приложения.</font></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="215"/> + <source>Tabs</source> + <translation type="unfinished">Закладки</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="221"/> + <source>Show only one close button instead of one for each tab</source> + <translation type="unfinished">Показывать только одну общую закрывающую кнопку</translation> + </message> </context> <context> <name>HelpBrowser</name> @@ -13543,17 +13571,17 @@ <translation>MB</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="452"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="491"/> <source>Printing</source> <translation>Печать</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="458"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="497"/> <source>Select to print background colours and images</source> <translation>Печатать фон и изображения</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="461"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="500"/> <source>Print background colours and images</source> <translation>Печатать фон и изображения</translation> </message> @@ -13762,6 +13790,21 @@ <source>Enable access keys</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="452"/> + <source>Web Search</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="458"/> + <source>Language:</source> + <translation type="unfinished">Язык:</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="465"/> + <source>Select the language to be used for web searches</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HelpWebPage</name> @@ -19340,132 +19383,132 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="239"/> <source>Select to specify a revision by number</source> <translation type="unfinished">Задать ревизию порядковым номером</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="225"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="242"/> <source>Number</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="235"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="252"/> <source>Enter a revision number</source> <translation type="unfinished">Задайте номер ревизии</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="264"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="281"/> <source>Select to specify a revision by changeset id</source> <translation type="unfinished">Задать ревизию идентификатором изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="267"/> - <source>Id:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="277"/> - <source>Enter a changeset id</source> - <translation type="unfinished">Задайте идентификатор изменений</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="284"/> + <source>Id:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="294"/> + <source>Enter a changeset id</source> + <translation type="unfinished">Задайте идентификатор изменений</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="301"/> <source>Select to specify a revision by a tag</source> <translation type="unfinished">Задать ревизию с помощью метки</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="304"/> <source>Tag:</source> <translation type="unfinished">Метка:</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="297"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="314"/> <source>Enter a tag name</source> <translation type="unfinished">Введите имя метки</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="307"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="324"/> <source>Select to specify a revision by a branch</source> <translation type="unfinished">Задать ревизию с помощью имени ветви</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="310"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="327"/> <source>Branch:</source> <translation type="unfinished">Ветвь:</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="320"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="337"/> <source>Enter a branch name</source> <translation type="unfinished">Введите имя ветви</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="330"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="347"/> <source>Select to specify a revision by a bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="333"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="350"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="349"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="366"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="216"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="233"/> <source>&Destination Revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="359"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="376"/> <source>Select tip revision of repository</source> <translation type="unfinished">Головная ревизия репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="362"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="379"/> <source>TIP</source> <translation type="unfinished">TIP</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="375"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="392"/> <source>Select to collapse the rebased changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="378"/> - <source>Collapse Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="385"/> - <source>Select to keep the original changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="388"/> - <source>Keep Original Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="395"/> + <source>Collapse Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="402"/> + <source>Select to keep the original changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="405"/> + <source>Keep Original Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="412"/> <source>Select to keep the original branch names</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="398"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="415"/> <source>Keep Original Branch Name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="418"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="422"/> <source>Select to detach the source from its original branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="421"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="425"/> <source>Detach Source</source> <translation type="unfinished"></translation> </message> @@ -25313,7 +25356,7 @@ <translation><strong>Описание:</strong> {0}</translation> </message> <message> - <location filename="Helpviewer/OpenSearch/OpenSearchEngineModel.py" line="135"/> + <location filename="Helpviewer/OpenSearch/OpenSearchEngineModel.py" line="136"/> <source><strong>Provides contextual suggestions</strong></source> <translation><strong>Показывает контекстные подсказки</strong></translation> </message> @@ -26632,17 +26675,17 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="936"/> + <location filename="Preferences/__init__.py" line="937"/> <source>Export Preferences</source> <translation>Экспорт предпочтений</translation> </message> <message> - <location filename="Preferences/__init__.py" line="963"/> + <location filename="Preferences/__init__.py" line="964"/> <source>Import Preferences</source> <translation>Импорт предпочтений</translation> </message> <message> - <location filename="Preferences/__init__.py" line="963"/> + <location filename="Preferences/__init__.py" line="964"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>Файлы свойств (*.ini);;Все файлы (*)</translation> </message> @@ -29732,7 +29775,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="123"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="124"/> <source>Purge</source> <translation type="unfinished"></translation> </message> @@ -32493,7 +32536,7 @@ <context> <name>RebaseProjectHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="107"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="108"/> <source>Rebase Changesets</source> <translation type="unfinished"></translation> </message> @@ -32538,22 +32581,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="98"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="99"/> <source>Rebase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="135"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="136"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Необходимо перезагрузить проект. Сделать это?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="121"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="122"/> <source>Rebase Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="135"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="136"/> <source>Rebase Changesets (Abort)</source> <translation type="unfinished"></translation> </message> @@ -41598,7 +41641,7 @@ <context> <name>TransplantProjectHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="93"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="94"/> <source>Transplant Changesets</source> <translation type="unfinished"></translation> </message> @@ -41623,17 +41666,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="84"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="85"/> <source>Transplant</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="107"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="108"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Необходимо перезагрузить проект. Сделать это?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="107"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="108"/> <source>Transplant Changesets (Continue)</source> <translation type="unfinished"></translation> </message> @@ -42568,35 +42611,40 @@ <context> <name>UserAgentMenu</name> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="43"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="45"/> <source>Default</source> <translation>По умолчанию</translation> </message> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="55"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="59"/> <source>Other...</source> <translation>Другой...</translation> </message> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="78"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="76"/> <source>Custom user agent</source> <translation>Специальный агент пользователя</translation> </message> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="78"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="76"/> <source>User agent:</source> <translation>Агент пользователя:</translation> </message> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="123"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="147"/> <source>Parsing default user agents</source> <translation>Анализирую агентов пользователя</translation> </message> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="123"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="147"/> <source><p>Error parsing default user agents.</p><p>{0}</p></source> <translation><p>Ошибка при анализе агентов пользователя.</p><p>{0}</p></translation> </message> + <message> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="136"/> + <source>Various</source> + <translation type="unfinished">Разное</translation> + </message> </context> <context> <name>UserInterface</name> @@ -44562,7 +44610,7 @@ <context> <name>Utilities</name> <message> - <location filename="Utilities/__init__.py" line="1001"/> + <location filename="Utilities/__init__.py" line="1023"/> <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> @@ -44577,12 +44625,12 @@ <tr><td>%%</td><td>знак процента</td></tr></table></p></translation> </message> <message> - <location filename="Utilities/__init__.py" line="1187"/> + <location filename="Utilities/__init__.py" line="1209"/> <source>Python2 interpreter not configured.</source> <translation>Интерпретатор Python2 не настроен.</translation> </message> <message> - <location filename="Utilities/__init__.py" line="1233"/> + <location filename="Utilities/__init__.py" line="1255"/> <source>Python2 interpreter did not finish within 30s.</source> <translation>Интерпретатор Python2 не завершился в течение 30 секунд.</translation> </message>
--- a/i18n/eric5_tr.ts Fri Jun 03 13:01:16 2011 +0200 +++ b/i18n/eric5_tr.ts Sat Jun 04 11:53:15 2011 +0200 @@ -1822,7 +1822,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="194"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="195"/> <source>Bookmarks</source> <translation type="unfinished">Yerimleri</translation> </message> @@ -2902,7 +2902,7 @@ <translation>Eklenti Yöneticisi</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="133"/> + <location filename="Preferences/ConfigurationDialog.py" line="296"/> <source>Printer</source> <translation>Yazıcı</translation> </message> @@ -2912,7 +2912,7 @@ <translation type="obsolete">Py3Parçaları</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="296"/> + <location filename="Preferences/ConfigurationDialog.py" line="170"/> <source>Python</source> <translation>Python</translation> </message> @@ -5773,22 +5773,22 @@ <context> <name>DownloadItem</name> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="20"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="26"/> <source>Icon</source> <translation>İcon</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="35"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="41"/> <source>Filename</source> <translation>Dosyaadı</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="57"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="63"/> <source>Info</source> <translation>Bilgi</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="72"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="78"/> <source>Press to repeat the download</source> <translation type="unfinished"></translation> </message> @@ -5798,12 +5798,12 @@ <translation type="obsolete">...</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="95"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="101"/> <source>Press to cancel the download</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="105"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="111"/> <source>Press to open the downloaded file</source> <translation type="unfinished"></translation> </message> @@ -5818,65 +5818,73 @@ <translation type="obsolete"><p>İndirdiğiniz <b>{0}</b> doyası hakkında bilgin var.</p><p>Bununla ne yapmak istiyorsunuz?</p></translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="203"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="206"/> <source>Download canceled: {0}</source> <translation>İndirme iptal edildi: {0}</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="193"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="196"/> <source>Save File</source> <translation>Dosyayı Kaydet</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="222"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="225"/> <source>Download directory ({0}) couldn't be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="390"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="395"/> <source>Error opening save file: {0}</source> <translation>kaydedilen dosyanın açılışında hata:{0}</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="399"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="407"/> <source>Error saving: {0}</source> <translation>Kaydederken hata: {0}</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="411"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="419"/> <source>Network Error: {0}</source> <translation>Ağ hatası: {0}</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="519"/> - <source>{0} of {1} ({2}/sec) - {3}</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="520"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="528"/> <source>?</source> <translation>?</translation> </message> <message> <location filename="Helpviewer/Download/DownloadItem.py" line="528"/> <source>{0} downloaded</source> - <translation>{0} indirildi</translation> - </message> - <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="531"/> + <translation type="obsolete">{0} indirildi</translation> + </message> + <message> + <location filename="Helpviewer/Download/DownloadItem.py" line="541"/> <source>{0} of {1} - Stopped</source> <translation>{0} nın{1} - Durdu</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="181"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="184"/> <source>VirusTotal scan scheduled: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="82"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="88"/> <source>Press to pause the download</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/Download/DownloadItem.py" line="527"/> + <source>{0} of {1} ({2}/sec) +{3}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Download/DownloadItem.py" line="536"/> + <source>{0} downloaded +SHA1: {1} +MD5: {2}</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>DownloadManager</name> @@ -11697,12 +11705,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="81"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="82"/> <source>Fetch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="81"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="82"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Projenin yeniden okunması gerekiyor. Şimdi yapılsın mı?</translation> </message> @@ -12559,7 +12567,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="98"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="99"/> <source>GPG</source> <translation type="unfinished"></translation> </message> @@ -12585,105 +12593,120 @@ <context> <name>HelpAppearancePage</name> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="16"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="17"/> <source><b>Configure help viewer appearance</b></source> <translation><b>Yardım göstericinin dış görünüşünü ayarla</b></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="36"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="37"/> <source>Fonts</source> <translation>Yazı Tipleri</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="42"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="43"/> <source>Press to select the standard font</source> <translation>Standart yazı tipini seçmek için basınız</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="45"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="46"/> <source>Standard Font</source> <translation>Standart Yazı Tipi</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="55"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="56"/> <source>Times 16</source> <translation>Times 16</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="68"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="69"/> <source>Press to select the fixed-width font</source> <translation>Yazı tipinde Sabit-Genişliği seçmek için basınız</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="71"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="72"/> <source>Fixed-Width Font</source> <translation>Yazı Tipi Sabit-Genişliği</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="81"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="82"/> <source>Courier 13</source> <translation>Courier 13</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="97"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="98"/> <source>Colours</source> <translation>Renkler</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="103"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="104"/> <source>Background colour of secure URLs:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="116"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="117"/> <source>Select the background colour for secure URLs.</source> <translation>Güvenli URL'nin arkaalan rengini seçiniz.</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="142"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="143"/> <source>Images</source> <translation>Görüntüler</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="148"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="149"/> <source>Select to load images</source> <translation>Yüklenecek görüntüleri seç</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="151"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="152"/> <source>Load images</source> <translation>Görüntüleri yükle</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="161"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="162"/> <source>Style Sheet</source> <translation>Sayfa Stili</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="167"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="168"/> <source>User Style Sheet:</source> <translation>Kullanıcı Sayfa Stili:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="174"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="175"/> <source>Enter the file name of a user style sheet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="181"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="182"/> <source>Select the user style sheet via a file selection dialog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="184"/> - <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.py" line="104"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="185"/> + <source>...</source> + <translation>...</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.py" line="133"/> <source>Select Style Sheet</source> <translation>Sayfa Stilini seç</translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="208"/> + <source><font color="#FF0000"><b>Note:</b> All settings below are activated at the next startup of the application.</font></source> + <translation type="unfinished"><font color="#FF0000"><b>Not:</b> Bu ayarlamalar uygulamanın bir sonraki çalıştırılmasında aktif hale geçecektir.</font></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="215"/> + <source>Tabs</source> + <translation type="unfinished">Sekmeler</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="221"/> + <source>Show only one close button instead of one for each tab</source> + <translation type="unfinished">Her bir sekmede bir tane yerine tek bir kapatma düğmesi göster</translation> + </message> </context> <context> <name>HelpBrowser</name> @@ -13783,17 +13806,17 @@ <translation>MB</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="452"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="491"/> <source>Printing</source> <translation>Yazılıyor</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="458"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="497"/> <source>Select to print background colours and images</source> <translation>Arkaalan rengini ve görüntülerini yazdırmak için seçiniz</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="461"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="500"/> <source>Print background colours and images</source> <translation>Arkaalan rengini ve görüntülerini yazdır</translation> </message> @@ -13862,6 +13885,21 @@ <source>Enable access keys</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="452"/> + <source>Web Search</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="458"/> + <source>Language:</source> + <translation type="unfinished">Dil:</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="465"/> + <source>Select the language to be used for web searches</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HelpWebPage</name> @@ -19435,132 +19473,132 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="239"/> <source>Select to specify a revision by number</source> <translation type="unfinished">Gözden geçirme numarasının açıkça belirtmeyi seç</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="225"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="242"/> <source>Number</source> <translation type="unfinished">Numara</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="235"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="252"/> <source>Enter a revision number</source> <translation type="unfinished">Gözden geçirme numarası gir</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="264"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="281"/> <source>Select to specify a revision by changeset id</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="267"/> - <source>Id:</source> - <translation type="unfinished">Id:</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="277"/> - <source>Enter a changeset id</source> - <translation type="unfinished">Değişiklik set kimliğini gir</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="284"/> + <source>Id:</source> + <translation type="unfinished">Id:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="294"/> + <source>Enter a changeset id</source> + <translation type="unfinished">Değişiklik set kimliğini gir</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="301"/> <source>Select to specify a revision by a tag</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="304"/> <source>Tag:</source> <translation type="unfinished">Etiket:</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="297"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="314"/> <source>Enter a tag name</source> <translation type="unfinished">Etiket adı gir</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="307"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="324"/> <source>Select to specify a revision by a branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="310"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="327"/> <source>Branch:</source> <translation type="unfinished">Sınıf(Branş):</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="320"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="337"/> <source>Enter a branch name</source> <translation type="unfinished">Bir branş adı giriniz</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="330"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="347"/> <source>Select to specify a revision by a bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="333"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="350"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="349"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="366"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="216"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="233"/> <source>&Destination Revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="359"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="376"/> <source>Select tip revision of repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="362"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="379"/> <source>TIP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="375"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="392"/> <source>Select to collapse the rebased changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="378"/> - <source>Collapse Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="385"/> - <source>Select to keep the original changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="388"/> - <source>Keep Original Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="395"/> + <source>Collapse Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="402"/> + <source>Select to keep the original changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="405"/> + <source>Keep Original Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="412"/> <source>Select to keep the original branch names</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="398"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="415"/> <source>Keep Original Branch Name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="418"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="422"/> <source>Select to detach the source from its original branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="421"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="425"/> <source>Detach Source</source> <translation type="unfinished"></translation> </message> @@ -25541,7 +25579,7 @@ <translation><strong>Açıklama:</strong> {0}</translation> </message> <message> - <location filename="Helpviewer/OpenSearch/OpenSearchEngineModel.py" line="135"/> + <location filename="Helpviewer/OpenSearch/OpenSearchEngineModel.py" line="136"/> <source><strong>Provides contextual suggestions</strong></source> <translation type="unfinished"></translation> </message> @@ -26837,17 +26875,17 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="936"/> + <location filename="Preferences/__init__.py" line="937"/> <source>Export Preferences</source> <translation>Seçenekleri Dışa Aktar</translation> </message> <message> - <location filename="Preferences/__init__.py" line="963"/> + <location filename="Preferences/__init__.py" line="964"/> <source>Import Preferences</source> <translation>Seçenekleri İçe Aktar</translation> </message> <message> - <location filename="Preferences/__init__.py" line="963"/> + <location filename="Preferences/__init__.py" line="964"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> @@ -29958,7 +29996,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="123"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="124"/> <source>Purge</source> <translation type="unfinished"></translation> </message> @@ -32690,7 +32728,7 @@ <context> <name>RebaseProjectHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="107"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="108"/> <source>Rebase Changesets</source> <translation type="unfinished"></translation> </message> @@ -32735,22 +32773,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="98"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="99"/> <source>Rebase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="135"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="136"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Projenin yeniden okunması gerekiyor. Şimdi yapılsın mı?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="121"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="122"/> <source>Rebase Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="135"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="136"/> <source>Rebase Changesets (Abort)</source> <translation type="unfinished"></translation> </message> @@ -41715,7 +41753,7 @@ <context> <name>TransplantProjectHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="93"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="94"/> <source>Transplant Changesets</source> <translation type="unfinished"></translation> </message> @@ -41740,17 +41778,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="84"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="85"/> <source>Transplant</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="107"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="108"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Projenin yeniden okunması gerekiyor. Şimdi yapılsın mı?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="107"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="108"/> <source>Transplant Changesets (Continue)</source> <translation type="unfinished"></translation> </message> @@ -42681,35 +42719,40 @@ <context> <name>UserAgentMenu</name> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="43"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="45"/> <source>Default</source> <translation>Varsayılan</translation> </message> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="55"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="59"/> <source>Other...</source> <translation>Diğer...</translation> </message> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="78"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="76"/> <source>Custom user agent</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="78"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="76"/> <source>User agent:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="123"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="147"/> <source>Parsing default user agents</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="123"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="147"/> <source><p>Error parsing default user agents.</p><p>{0}</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="136"/> + <source>Various</source> + <translation type="unfinished">Çeşitli</translation> + </message> </context> <context> <name>UserInterface</name> @@ -44670,17 +44713,17 @@ <context> <name>Utilities</name> <message> - <location filename="Utilities/__init__.py" line="1001"/> + <location filename="Utilities/__init__.py" line="1023"/> <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="1187"/> + <location filename="Utilities/__init__.py" line="1209"/> <source>Python2 interpreter not configured.</source> <translation>Python2 yorumlayıcı ayarlanmadı.</translation> </message> <message> - <location filename="Utilities/__init__.py" line="1233"/> + <location filename="Utilities/__init__.py" line="1255"/> <source>Python2 interpreter did not finish within 30s.</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_zh_CN.GB2312.ts Fri Jun 03 13:01:16 2011 +0200 +++ b/i18n/eric5_zh_CN.GB2312.ts Sat Jun 04 11:53:15 2011 +0200 @@ -2004,7 +2004,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="194"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="195"/> <source>Bookmarks</source> <translation type="unfinished">书签</translation> </message> @@ -3118,12 +3118,12 @@ <translation>插件管理器</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="133"/> + <location filename="Preferences/ConfigurationDialog.py" line="296"/> <source>Printer</source> <translation>打印机</translation> </message> <message> - <location filename="Preferences/ConfigurationDialog.py" line="296"/> + <location filename="Preferences/ConfigurationDialog.py" line="170"/> <source>Python</source> <translation>Python</translation> </message> @@ -6175,22 +6175,22 @@ <context> <name>DownloadItem</name> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="20"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="26"/> <source>Icon</source> <translation type="unfinished">图标</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="35"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="41"/> <source>Filename</source> <translation type="unfinished">文件名</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="57"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="63"/> <source>Info</source> <translation type="unfinished">信息</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="72"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="78"/> <source>Press to repeat the download</source> <translation type="unfinished"></translation> </message> @@ -6200,75 +6200,78 @@ <translation type="obsolete">……</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="95"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="101"/> <source>Press to cancel the download</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="105"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="111"/> <source>Press to open the downloaded file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="203"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="206"/> <source>Download canceled: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="193"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="196"/> <source>Save File</source> <translation type="unfinished">保存文件</translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="222"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="225"/> <source>Download directory ({0}) couldn't be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="390"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="395"/> <source>Error opening save file: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="399"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="407"/> <source>Error saving: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="411"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="419"/> <source>Network Error: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="519"/> - <source>{0} of {1} ({2}/sec) - {3}</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="520"/> - <source>?</source> - <translation type="unfinished">?</translation> - </message> - <message> <location filename="Helpviewer/Download/DownloadItem.py" line="528"/> - <source>{0} downloaded</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="531"/> + <source>?</source> + <translation type="unfinished">?</translation> + </message> + <message> + <location filename="Helpviewer/Download/DownloadItem.py" line="541"/> <source>{0} of {1} - Stopped</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.py" line="181"/> + <location filename="Helpviewer/Download/DownloadItem.py" line="184"/> <source>VirusTotal scan scheduled: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Download/DownloadItem.ui" line="82"/> + <location filename="Helpviewer/Download/DownloadItem.ui" line="88"/> <source>Press to pause the download</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/Download/DownloadItem.py" line="527"/> + <source>{0} of {1} ({2}/sec) +{3}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Download/DownloadItem.py" line="536"/> + <source>{0} downloaded +SHA1: {1} +MD5: {2}</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>DownloadManager</name> @@ -12533,12 +12536,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="81"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="82"/> <source>Fetch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="81"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="82"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -13430,7 +13433,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="98"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="99"/> <source>GPG</source> <translation type="unfinished"></translation> </message> @@ -13456,105 +13459,120 @@ <context> <name>HelpAppearancePage</name> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="16"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="17"/> <source><b>Configure help viewer appearance</b></source> <translation><b>配置帮助浏览器外观</b></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="36"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="37"/> <source>Fonts</source> <translation>字体</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="42"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="43"/> <source>Press to select the standard font</source> <translation>点击选择标准字体</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="45"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="46"/> <source>Standard Font</source> <translation>标准字体</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="55"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="56"/> <source>Times 16</source> <translation>Times 16</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="68"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="69"/> <source>Press to select the fixed-width font</source> <translation>点击选择定宽字体</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="71"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="72"/> <source>Fixed-Width Font</source> <translation>固定宽度字体</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="81"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="82"/> <source>Courier 13</source> <translation>Courier 13</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="97"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="98"/> <source>Colours</source> <translation>颜色</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="103"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="104"/> <source>Background colour of secure URLs:</source> <translation>安全 URL 的背景色：</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="116"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="117"/> <source>Select the background colour for secure URLs.</source> <translation>为安全的 URL 选择背景色。</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="142"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="143"/> <source>Images</source> <translation>图像</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="148"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="149"/> <source>Select to load images</source> <translation>选择输入图像</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="151"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="152"/> <source>Load images</source> <translation>输入图像</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="161"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="162"/> <source>Style Sheet</source> <translation>样式表</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="167"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="168"/> <source>User Style Sheet:</source> <translation>用户样式表：</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="174"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="175"/> <source>Enter the file name of a user style sheet</source> <translation>输入用户样式表的文件名</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="181"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="182"/> <source>Select the user style sheet via a file selection dialog</source> <translation>通过文件选择对话框选择用户样式表</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="184"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="185"/> <source>...</source> <translation>……</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.py" line="104"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.py" line="133"/> <source>Select Style Sheet</source> <translation>选择样式表</translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="208"/> + <source><font color="#FF0000"><b>Note:</b> All settings below are activated at the next startup of the application.</font></source> + <translation type="unfinished"><font color="#FF0000"><b>注意：</b> 以上所有设置将在下次启动应用程序时生效。</font></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="215"/> + <source>Tabs</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="221"/> + <source>Show only one close button instead of one for each tab</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HelpBrowser</name> @@ -14716,17 +14734,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="452"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="491"/> <source>Printing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="458"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="497"/> <source>Select to print background colours and images</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="461"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="500"/> <source>Print background colours and images</source> <translation type="unfinished"></translation> </message> @@ -14935,6 +14953,21 @@ <source>Enable access keys</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="452"/> + <source>Web Search</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="458"/> + <source>Language:</source> + <translation type="unfinished">语言：</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="465"/> + <source>Select the language to be used for web searches</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HelpWebPage</name> @@ -20633,132 +20666,132 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="239"/> <source>Select to specify a revision by number</source> <translation type="unfinished">选择通过号码指定一个修订</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="225"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="242"/> <source>Number</source> <translation type="unfinished">号码</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="235"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="252"/> <source>Enter a revision number</source> <translation type="unfinished">输入一个修订号</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="264"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="281"/> <source>Select to specify a revision by changeset id</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="267"/> - <source>Id:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="277"/> - <source>Enter a changeset id</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="284"/> + <source>Id:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="294"/> + <source>Enter a changeset id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="301"/> <source>Select to specify a revision by a tag</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="304"/> <source>Tag:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="297"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="314"/> <source>Enter a tag name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="307"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="324"/> <source>Select to specify a revision by a branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="310"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="327"/> <source>Branch:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="320"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="337"/> <source>Enter a branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="330"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="347"/> <source>Select to specify a revision by a bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="333"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="350"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="349"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="366"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="216"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="233"/> <source>&Destination Revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="359"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="376"/> <source>Select tip revision of repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="362"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="379"/> <source>TIP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="375"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="392"/> <source>Select to collapse the rebased changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="378"/> - <source>Collapse Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="385"/> - <source>Select to keep the original changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="388"/> - <source>Keep Original Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="395"/> + <source>Collapse Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="402"/> + <source>Select to keep the original changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="405"/> + <source>Keep Original Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="412"/> <source>Select to keep the original branch names</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="398"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="415"/> <source>Keep Original Branch Name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="418"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="422"/> <source>Select to detach the source from its original branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="421"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="425"/> <source>Detach Source</source> <translation type="unfinished"></translation> </message> @@ -27127,7 +27160,7 @@ <context> <name>OpenSearchEngineModel</name> <message> - <location filename="Helpviewer/OpenSearch/OpenSearchEngineModel.py" line="135"/> + <location filename="Helpviewer/OpenSearch/OpenSearchEngineModel.py" line="136"/> <source><strong>Provides contextual suggestions</strong></source> <translation type="unfinished"></translation> </message> @@ -28601,17 +28634,17 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="936"/> + <location filename="Preferences/__init__.py" line="937"/> <source>Export Preferences</source> <translation>导出首选项</translation> </message> <message> - <location filename="Preferences/__init__.py" line="963"/> + <location filename="Preferences/__init__.py" line="964"/> <source>Import Preferences</source> <translation>导入首选项</translation> </message> <message> - <location filename="Preferences/__init__.py" line="963"/> + <location filename="Preferences/__init__.py" line="964"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> @@ -32235,7 +32268,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="123"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="124"/> <source>Purge</source> <translation type="unfinished"></translation> </message> @@ -35199,7 +35232,7 @@ <context> <name>RebaseProjectHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="107"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="108"/> <source>Rebase Changesets</source> <translation type="unfinished"></translation> </message> @@ -35244,22 +35277,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="98"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="99"/> <source>Rebase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="135"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="136"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="121"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="122"/> <source>Rebase Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="135"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="136"/> <source>Rebase Changesets (Abort)</source> <translation type="unfinished"></translation> </message> @@ -45266,7 +45299,7 @@ <context> <name>TransplantProjectHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="93"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="94"/> <source>Transplant Changesets</source> <translation type="unfinished"></translation> </message> @@ -45291,17 +45324,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="84"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="85"/> <source>Transplant</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="107"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="108"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="107"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="108"/> <source>Transplant Changesets (Continue)</source> <translation type="unfinished"></translation> </message> @@ -46342,35 +46375,40 @@ <context> <name>UserAgentMenu</name> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="43"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="45"/> <source>Default</source> <translation type="unfinished">默认</translation> </message> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="55"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="59"/> <source>Other...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="78"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="76"/> <source>Custom user agent</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="78"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="76"/> <source>User agent:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="123"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="147"/> <source>Parsing default user agents</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="123"/> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="147"/> <source><p>Error parsing default user agents.</p><p>{0}</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="136"/> + <source>Various</source> + <translation type="unfinished">其它</translation> + </message> </context> <context> <name>UserInterface</name> @@ -48700,17 +48738,17 @@ <context> <name>Utilities</name> <message> - <location filename="Utilities/__init__.py" line="1001"/> + <location filename="Utilities/__init__.py" line="1023"/> <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="1187"/> + <location filename="Utilities/__init__.py" line="1209"/> <source>Python2 interpreter not configured.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Utilities/__init__.py" line="1233"/> + <location filename="Utilities/__init__.py" line="1255"/> <source>Python2 interpreter did not finish within 30s.</source> <translation type="unfinished"></translation> </message>
